n3 1.22.0 → 1.22.2

package/lib/N3Store.js

@@ -47,6 +47,37 @@ function intersect(s1, s2, depth = 4) {
   return target;
 }
 
+/**
+ * Determines the difference 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 difference; this should
+ * *not* be set as the value for an index.
+ */
+function difference(s1, s2, depth = 4) {
+  let target = false;
+  for (const key in s1) {
+    // When the key is not in the index, then none of the triples defined by s1[key] are
+    // in s2 and so we want to copy them over to the resultant store.
+    if (!(key in s2)) {
+      target = target || Object.create(null);
+      target[key] = depth === 0 ? null : merge({}, s1[key], depth - 1);
+    } else if (depth !== 0) {
+      const diff = difference(s1[key], s2[key], depth - 1);
+      if (diff !== false) {
+        target = target || Object.create(null);
+        target[key] = diff;
+      }
+      // 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 = {}) {
@@ -782,6 +813,7 @@ class N3Store {
    * Blank Nodes will be normalized.
    */
   addAll(quads) {
+    if (quads instanceof DatasetCoreAndReadableStream) quads = quads.filtered;
     if (Array.isArray(quads)) this.addQuads(quads);else if (quads instanceof N3Store && quads._entityIndex === this._entityIndex) {
       if (quads._size !== 0) {
         this._graphs = merge(this._graphs, quads._graphs);
@@ -800,6 +832,7 @@ class N3Store {
    * Blank Nodes will be normalized.
    */
   contains(other) {
+    if (other instanceof DatasetCoreAndReadableStream) other = other.filtered;
     if (other === this) return true;
     if (!(other instanceof N3Store) || this._entityIndex !== other._entityIndex) return other.every(quad => this.has(quad));
     const g1 = this._graphs,
@@ -839,9 +872,21 @@ class N3Store {
    * Returns a new dataset that contains all quads from the current dataset that are not included in the given dataset.
    */
   difference(other) {
+    if (other && other instanceof DatasetCoreAndReadableStream) other = other.filtered;
     if (other === this) return new N3Store({
       entityIndex: this._entityIndex
     });
+    if (other instanceof N3Store && other._entityIndex === this._entityIndex) {
+      const store = new N3Store({
+        entityIndex: this._entityIndex
+      });
+      const graphs = difference(this._graphs, other._graphs);
+      if (graphs) {
+        store._graphs = graphs;
+        store._size = null;
+      }
+      return store;
+    }
     return this.filter(quad => !other.has(quad));
   }
 
@@ -851,6 +896,7 @@ class N3Store {
    * Blank Nodes will be normalized.
    */
   equals(other) {
+    if (other instanceof DatasetCoreAndReadableStream) other = other.filtered;
     return other === this || this.size === other.size && this.contains(other);
   }
 
@@ -871,6 +917,7 @@ class N3Store {
    * Returns a new dataset containing all quads from the current dataset that are also included in the given dataset.
    */
   intersection(other) {
+    if (other instanceof DatasetCoreAndReadableStream) other = other.filtered;
     if (other === this) {
       const store = new N3Store({
         entityIndex: this._entityIndex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -40,6 +40,7 @@
     "docco": "^0.9.1",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^28.8.3",
     "jest": "^29.7.0",
     "pre-commit": "^1.2.2",
     "rdf-isomorphic": "^1.3.1",

package/src/N3Store.js

@@ -45,6 +45,40 @@ function intersect(s1, s2, depth = 4) {
   return target;
 }
 
+/**
+ * Determines the difference 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 difference; this should
+ * *not* be set as the value for an index.
+ */
+function difference(s1, s2, depth = 4) {
+  let target = false;
+
+  for (const key in s1) {
+    // When the key is not in the index, then none of the triples defined by s1[key] are
+    // in s2 and so we want to copy them over to the resultant store.
+    if (!(key in s2)) {
+      target = target || Object.create(null);
+      target[key] = depth === 0 ? null : merge({}, s1[key], depth - 1);
+    }
+    else if (depth !== 0) {
+      const diff = difference(s1[key], s2[key], depth - 1);
+      if (diff !== false) {
+        target = target || Object.create(null);
+        target[key] = diff;
+      }
+      // 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 = {}) {
@@ -827,6 +861,9 @@ export default class N3Store {
    * Blank Nodes will be normalized.
    */
   addAll(quads) {
+    if (quads instanceof DatasetCoreAndReadableStream)
+      quads = quads.filtered;
+
     if (Array.isArray(quads))
       this.addQuads(quads);
     else if (quads instanceof N3Store && quads._entityIndex === this._entityIndex) {
@@ -849,6 +886,9 @@ export default class N3Store {
    * Blank Nodes will be normalized.
    */
   contains(other) {
+    if (other instanceof DatasetCoreAndReadableStream)
+      other = other.filtered;
+
     if (other === this)
       return true;
 
@@ -893,9 +933,22 @@ export default class N3Store {
    * Returns a new dataset that contains all quads from the current dataset that are not included in the given dataset.
    */
   difference(other) {
+    if (other && other instanceof DatasetCoreAndReadableStream)
+      other = other.filtered;
+
     if (other === this)
       return new N3Store({ entityIndex: this._entityIndex });
 
+    if ((other instanceof N3Store) && other._entityIndex === this._entityIndex) {
+      const store = new N3Store({ entityIndex: this._entityIndex });
+      const graphs = difference(this._graphs, other._graphs);
+      if (graphs) {
+        store._graphs = graphs;
+        store._size = null;
+      }
+      return store;
+    }
+
     return this.filter(quad => !other.has(quad));
   }
 
@@ -905,6 +958,9 @@ export default class N3Store {
    * Blank Nodes will be normalized.
    */
   equals(other) {
+    if (other instanceof DatasetCoreAndReadableStream)
+      other = other.filtered;
+
     return other === this || (this.size === other.size && this.contains(other));
   }
 
@@ -925,6 +981,9 @@ export default class N3Store {
    * Returns a new dataset containing all quads from the current dataset that are also included in the given dataset.
    */
   intersection(other) {
+    if (other instanceof DatasetCoreAndReadableStream)
+      other = other.filtered;
+
     if (other === this) {
       const store = new N3Store({ entityIndex: this._entityIndex });
       store._graphs = merge(Object.create(null), this._graphs);