n3 1.21.0 → 1.21.2

package/lib/N3Store.js

@@ -21,6 +21,32 @@ function merge(target, source, depth = 4) {
   return target;
 }
 
+/**
+ * Determines the intersection of the `_graphs` index s1 and s2.
+ * s1 and s2 *must* belong to Stores that share an `_entityIndex`.
+ *
+ * False is returned when there is no intersection; this should
+ * *not* be set as the value for an index.
+ */
+function intersect(s1, s2, depth = 4) {
+  let target = false;
+  for (const key in s1) {
+    if (key in s2) {
+      const intersection = depth === 0 ? null : intersect(s1[key], s2[key], depth - 1);
+      if (intersection !== false) {
+        target = target || Object.create(null);
+        target[key] = intersection;
+      }
+      // Depth 3 is the 'subjects', 'predicates' and 'objects' keys.
+      // If the 'subjects' index is empty, so will the 'predicates' and 'objects' index.
+      else if (depth === 3) {
+        return false;
+      }
+    }
+  }
+  return target;
+}
+
 // ## Constructor
 class N3EntityIndex {
   constructor(options = {}) {
@@ -851,6 +877,17 @@ class N3Store {
       });
       store._graphs = merge(Object.create(null), this._graphs);
       store._size = this._size;
+      return store;
+    } else if (other instanceof N3Store && this._entityIndex === other._entityIndex) {
+      const store = new N3Store({
+        entityIndex: this._entityIndex
+      });
+      const graphs = intersect(other._graphs, this._graphs);
+      if (graphs) {
+        store._graphs = graphs;
+        store._size = null;
+      }
+      return store;
     }
     return this.filter(quad => other.has(quad));
   }
@@ -939,9 +976,33 @@ class N3Store {
 }
 
 /**
- * A class that implements both DatasetCore and Readable.
+ * Returns a subset of the `index` with that part of the index
+ * matching the `ids` array. `ids` contains 3 elements that are
+ * either numerical ids; or `null`.
+ *
+ * `false` is returned when there are no matching indices; this should
+ * *not* be set as the value for an index.
  */
 exports.default = N3Store;
+function indexMatch(index, ids, depth = 0) {
+  const ind = ids[depth];
+  if (ind && !(ind in index)) return false;
+  let target = false;
+  for (const key in ind ? {
+    [ind]: index[ind]
+  } : index) {
+    const result = depth === 2 ? null : indexMatch(index[key], ids, depth + 1);
+    if (result !== false) {
+      target = target || Object.create(null);
+      target[key] = result;
+    }
+  }
+  return target;
+}
+
+/**
+ * A class that implements both DatasetCore and Readable.
+ */
 class DatasetCoreAndReadableStream extends _readableStream.Readable {
   constructor(n3Store, subject, predicate, object, graph, options) {
     super({
@@ -969,7 +1030,22 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
         factory: n3Store._factory,
         entityIndex: this.options.entityIndex
       });
-      for (const quad of n3Store.readQuads(subject, predicate, object, graph)) newStore.addQuad(quad);
+      const graphs = n3Store._getGraphs(graph);
+      let subjectId, predicateId, objectId;
+
+      // Translate IRIs to internal index keys.
+      if (subject && !(subjectId = newStore._termToNumericId(subject)) || predicate && !(predicateId = newStore._termToNumericId(predicate)) || object && !(objectId = newStore._termToNumericId(object))) return newStore;
+      for (const graph in graphs) {
+        const subjects = indexMatch(graphs[graph].subjects, [subjectId, predicateId, objectId]);
+        if (subjects) {
+          newStore._graphs[graph] = {
+            subjects,
+            predicates: indexMatch(graphs[graph].predicates, [predicateId, objectId, subjectId]),
+            objects: indexMatch(graphs[graph].objects, [objectId, subjectId, predicateId])
+          };
+        }
+      }
+      newStore._size = null;
     }
     return this._filtered;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -34,9 +34,9 @@
     "@babel/preset-env": "^7.16.0",
     "@babel/register": "^7.16.0",
     "@rdfjs/data-model": "^1",
-    "arrayify-stream": "^1.0.0",
+    "arrayify-stream": "^3.0.0",
     "browserify": "^17.0.0",
-    "deep-taxonomy-benchmark": "^1.2.0",
+    "deep-taxonomy-benchmark": "^2.0.0",
     "docco": "^0.9.1",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",

package/src/N3Store.js

@@ -17,6 +17,34 @@ function merge(target, source, depth = 4) {
   return target;
 }
 
+/**
+ * Determines the intersection of the `_graphs` index s1 and s2.
+ * s1 and s2 *must* belong to Stores that share an `_entityIndex`.
+ *
+ * False is returned when there is no intersection; this should
+ * *not* be set as the value for an index.
+ */
+function intersect(s1, s2, depth = 4) {
+  let target = false;
+
+  for (const key in s1) {
+    if (key in s2) {
+      const intersection = depth === 0 ? null : intersect(s1[key], s2[key], depth - 1);
+      if (intersection !== false) {
+        target = target || Object.create(null);
+        target[key] = intersection;
+      }
+      // Depth 3 is the 'subjects', 'predicates' and 'objects' keys.
+      // If the 'subjects' index is empty, so will the 'predicates' and 'objects' index.
+      else if (depth === 3) {
+        return false;
+      }
+    }
+  }
+
+  return target;
+}
+
 // ## Constructor
 export class N3EntityIndex {
   constructor(options = {}) {
@@ -901,7 +929,18 @@ export default class N3Store {
       const store = new N3Store({ entityIndex: this._entityIndex });
       store._graphs = merge(Object.create(null), this._graphs);
       store._size = this._size;
+      return store;
+    }
+    else if ((other instanceof N3Store) && this._entityIndex === other._entityIndex) {
+      const store = new N3Store({ entityIndex: this._entityIndex });
+      const graphs = intersect(other._graphs, this._graphs);
+      if (graphs) {
+        store._graphs = graphs;
+        store._size = null;
+      }
+      return store;
     }
+
     return this.filter(quad => other.has(quad));
   }
 
@@ -987,6 +1026,31 @@ export default class N3Store {
   }
 }
 
+/**
+ * Returns a subset of the `index` with that part of the index
+ * matching the `ids` array. `ids` contains 3 elements that are
+ * either numerical ids; or `null`.
+ *
+ * `false` is returned when there are no matching indices; this should
+ * *not* be set as the value for an index.
+ */
+function indexMatch(index, ids, depth = 0) {
+  const ind = ids[depth];
+  if (ind && !(ind in index))
+    return false;
+
+  let target = false;
+  for (const key in (ind ? { [ind]: index[ind] } : index)) {
+    const result = depth === 2 ? null : indexMatch(index[key], ids, depth + 1);
+
+    if (result !== false) {
+      target = target || Object.create(null);
+      target[key] = result;
+    }
+  }
+  return target;
+}
+
 /**
  * A class that implements both DatasetCore and Readable.
  */
@@ -1000,8 +1064,27 @@ class DatasetCoreAndReadableStream extends Readable {
     if (!this._filtered) {
       const { n3Store, graph, object, predicate, subject } = this;
       const newStore = this._filtered = new N3Store({ factory: n3Store._factory, entityIndex: this.options.entityIndex });
-      for (const quad of n3Store.readQuads(subject, predicate, object, graph))
-        newStore.addQuad(quad);
+      const graphs = n3Store._getGraphs(graph);
+
+      let subjectId, predicateId, objectId;
+
+      // Translate IRIs to internal index keys.
+      if (subject   && !(subjectId   = newStore._termToNumericId(subject))   ||
+          predicate && !(predicateId = newStore._termToNumericId(predicate)) ||
+          object    && !(objectId    = newStore._termToNumericId(object)))
+        return newStore;
+
+      for (const graph in graphs) {
+        const subjects = indexMatch(graphs[graph].subjects, [subjectId, predicateId, objectId]);
+        if (subjects) {
+          newStore._graphs[graph] = {
+            subjects,
+            predicates: indexMatch(graphs[graph].predicates, [predicateId, objectId, subjectId]),
+            objects: indexMatch(graphs[graph].objects, [objectId, subjectId, predicateId]),
+          };
+        }
+      }
+      newStore._size = null;
     }
     return this._filtered;
   }