n3 2.9.1 → 2.10.0

package/lib/N3Store.js

@@ -368,12 +368,15 @@ class N3Store {
         if (!(index2 = index1[key1])) return 0;
         return key2 ? key2 in index2 ? 1 : 0 : index2[SIZE];
       }
-      for (const value1 in index1) count += index1[value1][SIZE];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++) count += index1[keys1[i1]][SIZE];
       return count;
     }
-    for (const value0 in index0) {
-      index1 = index0[value0];
-      for (const value1 in index1) count += index1[value1][SIZE];
+    const keys0 = Object.keys(index0);
+    for (let i0 = 0; i0 < keys0.length; i0++) {
+      index1 = index0[keys0[i0]];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++) count += index1[keys1[i1]][SIZE];
     }
     return count;
   }
@@ -863,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`
@@ -876,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;
@@ -901,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';
           }
@@ -936,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.1",
+  "version": "2.10.0",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [

package/src/N3Store.js

@@ -394,15 +394,18 @@ export default class N3Store {
         return key2 ? (key2 in index2 ? 1 : 0) : index2[SIZE];
       }
 
-      for (const value1 in index1)
-        count += index1[value1][SIZE];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++)
+        count += index1[keys1[i1]][SIZE];
       return count;
     }
 
-    for (const value0 in index0) {
-      index1 = index0[value0];
-      for (const value1 in index1)
-        count += index1[value1][SIZE];
+    const keys0 = Object.keys(index0);
+    for (let i0 = 0; i0 < keys0.length; i0++) {
+      index1 = index0[keys0[i0]];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++)
+        count += index1[keys1[i1]][SIZE];
     }
     return count;
   }
@@ -913,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);
@@ -922,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;
@@ -950,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
@@ -958,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';
@@ -1000,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