n3 2.9.2 → 2.10.1

package/lib/N3DataFactory.js

@@ -23,6 +23,8 @@ const {
 // eslint-disable-next-line prefer-const
 let DEFAULTGRAPH;
 let _blankNodeCounter = 0;
+// The ID of the empty IRI, which cannot be '' as that is the ID of the default graph
+const EMPTY_IRI_ID = '<>';
 const escapedLiteral = /^"(.*".*)(?="[^"]*$)/;
 
 // ## DataFactory singleton
@@ -82,7 +84,10 @@ class NamedNode extends Term {
    * the constructor assumes an already-validated IRI.
    */
   constructor(iri) {
-    super(iri);
+    super(iri === '' ? EMPTY_IRI_ID : iri);
+    if (iri === '') Object.defineProperty(this, 'value', {
+      value: ''
+    });
   }
 
   // ### The term type of this term
@@ -291,6 +296,9 @@ function termFromId(id, factory, nested) {
     case '[':
       id = JSON.parse(id);
       break;
+    case '<':
+      if (id === EMPTY_IRI_ID) return factory.namedNode('');
+    // falls through
     default:
       if (!nested || !Array.isArray(id)) {
         return factory.namedNode(id);
@@ -312,7 +320,7 @@ function termToId(term, nested) {
   // Term instantiated with another library
   switch (term.termType) {
     case 'NamedNode':
-      return term.value;
+      return term.value || EMPTY_IRI_ID;
     case 'BlankNode':
       return `_:${term.value}`;
     case 'Variable':

package/lib/N3Store.js

@@ -866,9 +866,14 @@ class N3Store {
 
   // ### `extractLists` finds and removes all list triples
   // and returns the items per list.
+  // With `allowExtraArcs`, lists whose nodes carry arcs other than
+  // rdf:first/rdf:rest are returned as well,
+  // but left intact when `remove` is set. Ambiguous unreferenced list heads
+  // with multiple non-list arcs remain errors.
   extractLists({
     remove = false,
-    ignoreErrors = false
+    ignoreErrors = false,
+    allowExtraArcs = false
   } = {}) {
     // Keys are the list heads' term values, so a null-prototype map keeps
     // them from colliding with inherited Object members such as `toString`
@@ -879,13 +884,15 @@ class N3Store {
 
     // Traverse each list from its tail
     const tails = this.getQuads(null, _IRIs.default.rdf.rest, _IRIs.default.rdf.nil, null);
-    const toRemove = remove ? [...tails] : [];
+    const toRemove = [];
     tails.forEach(tailQuad => {
       const items = []; // the members found as objects of rdf:first quads
       let malformed = false; // signals whether the current list is malformed
+      let extraArcs = false; // signals whether the current list has extra arcs
       let head; // the head of the list (_:b1 in above example)
       let headPos; // set to subject or object when head is set
       const graph = tailQuad.graph; // make sure list is in exactly one graph
+      const listQuads = []; // rdf:first/rdf:rest quads of this list
 
       // Traverse the list from tail to end
       let current = tailQuad.subject;
@@ -904,16 +911,20 @@ class N3Store {
 
           // one rdf:first
           else if (quad.predicate.value === _IRIs.default.rdf.first) {
-            if (first) malformed = onError(current, 'has multiple rdf:first arcs');else toRemove.push(first = quad);
+            if (first) malformed = onError(current, 'has multiple rdf:first arcs');else first = quad;
+            if (remove && first === quad) listQuads.push(quad);
           }
 
           // one rdf:rest
           else if (quad.predicate.value === _IRIs.default.rdf.rest) {
-            if (rest) malformed = onError(current, 'has multiple rdf:rest arcs');else toRemove.push(rest = quad);
+            if (rest) malformed = onError(current, 'has multiple rdf:rest arcs');else rest = quad;
+            if (remove && rest === quad) listQuads.push(quad);
           }
 
           // alien triple
-          else if (objectQuads.length) malformed = onError(current, 'can\'t be subject and object');else {
+          else if (objectQuads.length) {
+            if (allowExtraArcs) extraArcs = true;else malformed = onError(current, `has non-list arc ${quad.predicate.value}`);
+          } else {
             head = quad; // e.g. { (1 2 3) :p :o }
             headPos = 'subject';
           }
@@ -939,9 +950,12 @@ class N3Store {
       }
 
       // Don't remove any quads if the list is malformed
-      if (malformed) remove = false;
-      // Store the list under the value of its head
-      else if (head) lists[head[headPos].value] = items;
+      if (malformed) remove = false;else {
+        // Store the list under the value of its head
+        if (head) lists[head[headPos].value] = items;
+        // Leave lists with extra arcs fully intact; otherwise queue this list once.
+        if (remove && !extraArcs) toRemove.push(...listQuads);
+      }
     });
 
     // Remove list quads if requested

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.9.2",
+  "version": "2.10.1",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -60,7 +60,7 @@
     "test": "jest",
     "lint": "eslint src perf test spec",
     "prepare": "npm run build",
-    "spec": "npm run spec-1-1 && npm run spec-1-2",
+    "spec": "npm run spec-1-1 && npm run spec-1-2 && npm run spec-n3",
     "spec-1-1": "npm run spec-1-1-turtle && npm run spec-1-1-ntriples && npm run spec-1-1-nquads && npm run spec-1-1-trig",
     "spec-1-1-earl": "npm run spec-1-1-earl-turtle && npm run spec-1-1-earl-ntriples && npm run spec-1-1-earl-nquads && npm run spec-1-1-earl-trig",
     "spec-1-1-ntriples": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-n-triples/manifest.ttl -i '{ \"format\": \"n-triples\" }' -c .rdf-test-suite-cache/",
@@ -81,7 +81,11 @@
     "spec-1-2-earl-nquads": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-n-quads/syntax/manifest.ttl -i '{ \"format\": \"n-quads\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-nquads.ttl",
     "spec-1-2-earl-turtle": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-turtle/syntax/manifest.ttl -i '{ \"format\": \"turtle\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-turtle.ttl",
     "spec-1-2-earl-trig": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-trig/syntax/manifest.ttl -i '{ \"format\": \"trig\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-trig.ttl",
-    "spec-clean": "rm -r .rdf-test-suite-cache/",
+    "spec-n3": "npm run spec-n3-parser && npm run spec-n3-extended",
+    "spec-n3-fetch": "sh scripts/fetch-n3-tests.sh",
+    "spec-n3-parser": "npm run spec-n3-fetch && rdf-test-suite spec/parser.js https://w3c-cg.github.io/N3/tests/N3Tests/manifest-parser.ttl -i '{ \"format\": \"text/n3\" }' -m 'https://w3c-cg.github.io/N3/tests/~.n3-tests/tests/'",
+    "spec-n3-extended": "npm run spec-n3-fetch && rdf-test-suite spec/parser.js https://w3c-cg.github.io/N3/tests/N3Tests/manifest-extended.ttl -i '{ \"format\": \"text/n3\" }' -m 'https://w3c-cg.github.io/N3/tests/~.n3-tests/tests/'",
+    "spec-clean": "rm -rf .rdf-test-suite-cache/ .n3-tests/",
     "docs": "cd src && docco *.js -o ../docs && cd .."
   },
   "repository": {

package/src/N3DataFactory.js

@@ -8,6 +8,8 @@ const { rdf, xsd } = namespaces;
 // eslint-disable-next-line prefer-const
 let DEFAULTGRAPH;
 let _blankNodeCounter = 0;
+// The ID of the empty IRI, which cannot be '' as that is the ID of the default graph
+const EMPTY_IRI_ID = '<>';
 
 const escapedLiteral = /^"(.*".*)(?="[^"]*$)/;
 
@@ -72,7 +74,9 @@ export class NamedNode extends Term {
    * the constructor assumes an already-validated IRI.
    */
   constructor(iri) {
-    super(iri);
+    super(iri === '' ? EMPTY_IRI_ID : iri);
+    if (iri === '')
+      Object.defineProperty(this, 'value', { value: '' });
   }
 
   // ### The term type of this term
@@ -285,6 +289,10 @@ export function termFromId(id, factory, nested) {
   case '[':
     id = JSON.parse(id);
     break;
+  case '<':
+    if (id === EMPTY_IRI_ID)
+      return factory.namedNode('');
+    // falls through
   default:
     if (!nested || !Array.isArray(id)) {
       return factory.namedNode(id);
@@ -313,7 +321,7 @@ export function termToId(term, nested) {
 
   // Term instantiated with another library
   switch (term.termType) {
-  case 'NamedNode':    return term.value;
+  case 'NamedNode':    return term.value || EMPTY_IRI_ID;
   case 'BlankNode':    return `_:${term.value}`;
   case 'Variable':     return `?${term.value}`;
   case 'DefaultGraph': return '';

package/src/N3Store.js

@@ -916,7 +916,11 @@ export default class N3Store {
 
   // ### `extractLists` finds and removes all list triples
   // and returns the items per list.
-  extractLists({ remove = false, ignoreErrors = false } = {}) {
+  // With `allowExtraArcs`, lists whose nodes carry arcs other than
+  // rdf:first/rdf:rest are returned as well,
+  // but left intact when `remove` is set. Ambiguous unreferenced list heads
+  // with multiple non-list arcs remain errors.
+  extractLists({ remove = false, ignoreErrors = false, allowExtraArcs = false } = {}) {
     // Keys are the list heads' term values, so a null-prototype map keeps
     // them from colliding with inherited Object members such as `toString`
     const lists = Object.create(null);
@@ -925,13 +929,15 @@ export default class N3Store {
 
     // Traverse each list from its tail
     const tails = this.getQuads(null, namespaces.rdf.rest, namespaces.rdf.nil, null);
-    const toRemove = remove ? [...tails] : [];
+    const toRemove = [];
     tails.forEach(tailQuad => {
       const items = [];             // the members found as objects of rdf:first quads
       let malformed = false;      // signals whether the current list is malformed
+      let extraArcs = false;      // signals whether the current list has extra arcs
       let head;                   // the head of the list (_:b1 in above example)
       let headPos;                // set to subject or object when head is set
       const graph = tailQuad.graph; // make sure list is in exactly one graph
+      const listQuads = [];       // rdf:first/rdf:rest quads of this list
 
       // Traverse the list from tail to end
       let current = tailQuad.subject;
@@ -953,7 +959,9 @@ export default class N3Store {
             if (first)
               malformed = onError(current, 'has multiple rdf:first arcs');
             else
-              toRemove.push(first = quad);
+              first = quad;
+            if (remove && first === quad)
+              listQuads.push(quad);
           }
 
           // one rdf:rest
@@ -961,12 +969,18 @@ export default class N3Store {
             if (rest)
               malformed = onError(current, 'has multiple rdf:rest arcs');
             else
-              toRemove.push(rest = quad);
+              rest = quad;
+            if (remove && rest === quad)
+              listQuads.push(quad);
           }
 
           // alien triple
-          else if (objectQuads.length)
-            malformed = onError(current, 'can\'t be subject and object');
+          else if (objectQuads.length) {
+            if (allowExtraArcs)
+              extraArcs = true;
+            else
+              malformed = onError(current, `has non-list arc ${quad.predicate.value}`);
+          }
           else {
             head = quad; // e.g. { (1 2 3) :p :o }
             headPos = 'subject';
@@ -1003,9 +1017,14 @@ export default class N3Store {
       // Don't remove any quads if the list is malformed
       if (malformed)
         remove = false;
-      // Store the list under the value of its head
-      else if (head)
-        lists[head[headPos].value] = items;
+      else {
+        // Store the list under the value of its head
+        if (head)
+          lists[head[headPos].value] = items;
+        // Leave lists with extra arcs fully intact; otherwise queue this list once.
+        if (remove && !extraArcs)
+          toRemove.push(...listQuads);
+      }
     });
 
     // Remove list quads if requested