Add and test fromRDF event support.

- Add another langage check.
- Add tests.

Author: davidlehn

lib/fromRdf.js

@@ -6,7 +6,11 @@
 const JsonLdError = require('./JsonLdError');
 const graphTypes = require('./graphTypes');
 const types = require('./types');
-const util = require('./util');
+
+const {
+  REGEX_BCP47,
+  addValue: _addValue
+} = require('./util');
 
 const {
   handleEvent: _handleEvent
@@ -33,8 +37,6 @@ const {
   XSD_STRING,
 } = require('./constants');
 
-const REGEX_BCP47 = /^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$/;
-
 const api = {};
 module.exports = api;
 
@@ -88,12 +90,12 @@ api.fromRDF = async (
     }
 
     if(p === RDF_TYPE && !useRdfType && objectIsNode) {
-      util.addValue(node, '@type', o.value, {propertyIsArray: true});
+      _addValue(node, '@type', o.value, {propertyIsArray: true});
       continue;
     }
 
     const value = _RDFToObject(o, useNativeTypes, rdfDirection, options);
-    util.addValue(node, p, value, {propertyIsArray: true});
+    _addValue(node, p, value, {propertyIsArray: true});
 
     // object may be an RDF list/partial list node but we can't know easily
     // until all triples are read
@@ -152,12 +154,12 @@ api.fromRDF = async (
       }
 
       if(p === RDF_TYPE && !useRdfType && objectIsId) {
-        util.addValue(node, '@type', o.value, {propertyIsArray: true});
+        _addValue(node, '@type', o.value, {propertyIsArray: true});
         continue;
       }
 
       const value = _RDFToObject(o, useNativeTypes);
-      util.addValue(node, p, value, {propertyIsArray: true});
+      _addValue(node, p, value, {propertyIsArray: true});
 
       // object may be an RDF list/partial list node but we can't know easily
       // until all triples are read
@@ -296,6 +298,22 @@ function _RDFToObject(o, useNativeTypes, rdfDirection, options) {
 
   // add language
   if(o.language) {
+    if(!o.language.match(REGEX_BCP47)) {
+      if(options.eventHandler) {
+        _handleEvent({
+          event: {
+            type: ['JsonLdEvent'],
+            code: 'invalid @language value',
+            level: 'warning',
+            message: '@language value must be valid BCP47.',
+            details: {
+              language: o.language
+            }
+          },
+          options
+        });
+      }
+    }
     rval['@language'] = o.language;
   } else {
     let type = o.datatype.value;

tests/misc.js

@@ -601,13 +601,16 @@ describe('events', () => {
     if(eventCounts || eventLog) {
       opts.eventHandler = eventHandler;
     }
-    if(!['expand'].includes(type)) {
+    if(!['expand', 'fromRDF'].includes(type)) {
       throw new Error(`Unknown test type: "${type}"`);
     }
     try {
       if(type === 'expand') {
         result = await jsonld.expand(input, opts);
       }
+      if(type === 'fromRDF') {
+        result = await jsonld.fromRDF(input, opts);
+      }
     } catch(e) {
       error = e;
     }
@@ -2765,4 +2768,106 @@ describe('events', () => {
       });
     });
   });
+
+  describe('fromRDF', () => {
+    it('should emit for invalid N-Quads @language value', async () => {
+      // N-Quads with invalid language tag (too long)
+      // FIXME: should N-Quads parser catch this instead?
+      const input =
+'_:b0 <urn:property> "test"@abcdefghi .'
+;
+      const expected =
+[
+  {
+    "@id": "_:b0",
+    "urn:property": [
+      {
+        "@language": "abcdefghi",
+        "@value": "test"
+      }
+    ]
+  }
+]
+;
+
+      console.error('FIXME');
+      await _test({
+        type: 'fromRDF',
+        input,
+        expected,
+        mapCounts: {},
+        eventCounts: {
+          codes: {
+            'invalid @language value': 1
+          },
+          events: 1
+        },
+        testNotSafe: true
+      });
+    });
+
+    it('should emit for invalid Dataset @language value', async () => {
+      // dataset with invalid language tag (too long)
+      // Equivalent N-Quads:
+      // '<ex:s> <ex:p> "test"^^<https://www.w3.org/ns/i18n#abcdefghi_rtl> .'
+      // Using JSON dataset to bypass N-Quads parser checks.
+      const input =
+[
+  {
+    "subject": {
+      "termType": "NamedNode",
+      "value": "ex:s"
+    },
+    "predicate": {
+      "termType": "NamedNode",
+      "value": "ex:p"
+    },
+    "object": {
+      "termType": "Literal",
+      "value": "test",
+      "datatype": {
+        "termType": "NamedNode",
+        "value": "https://www.w3.org/ns/i18n#abcdefghi_rtl"
+      }
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  }
+]
+;
+      const expected =
+[
+  {
+    "@id": "ex:s",
+    "ex:p": [
+      {
+        "@value": "test",
+        "@language": "abcdefghi",
+        "@direction": "rtl"
+      }
+    ]
+  }
+]
+;
+
+      await _test({
+        type: 'fromRDF',
+        input,
+        options: {
+          rdfDirection: 'i18n-datatype',
+        },
+        expected,
+        mapCounts: {},
+        eventCounts: {
+          codes: {
+            'invalid @language value': 1
+          },
+          events: 1
+        },
+        testNotSafe: true
+      });
+    });
+  });
 });