n3 1.22.1 → 1.22.3

package/lib/N3Store.js

@@ -813,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);
@@ -831,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,
@@ -870,6 +872,7 @@ 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
     });
@@ -893,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);
   }
 
@@ -913,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
@@ -1072,20 +1077,32 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
         factory: n3Store._factory,
         entityIndex: this.options.entityIndex
       });
-      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])
-          };
+      const graphs = n3Store._getGraphs(graph);
+      for (const graphKey in graphs) {
+        let subjects, predicates, objects;
+        if (!subjectId && predicateId) {
+          if (predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId])) {
+            subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId]);
+            objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId]);
+          }
+        } else if (objectId) {
+          if (objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId])) {
+            subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId]);
+            predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId]);
+          }
+        } else if (subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId])) {
+          predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId]);
+          objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId]);
         }
+        if (subjects) newStore._graphs[graphKey] = {
+          subjects,
+          predicates,
+          objects
+        };
       }
       newStore._size = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.22.1",
+  "version": "1.22.3",
   "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

@@ -861,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) {
@@ -883,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;
 
@@ -927,6 +933,9 @@ 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 });
 
@@ -949,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));
   }
 
@@ -969,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);
@@ -1108,7 +1123,6 @@ 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 });
-      const graphs = n3Store._getGraphs(graph);
 
       let subjectId, predicateId, objectId;
 
@@ -1118,15 +1132,29 @@ class DatasetCoreAndReadableStream extends Readable {
           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]),
-          };
+      const graphs = n3Store._getGraphs(graph);
+      for (const graphKey in graphs) {
+        let subjects, predicates, objects;
+
+        if (!subjectId && predicateId) {
+          if (predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId])) {
+            subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId]);
+            objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId]);
+          }
+        }
+        else if (objectId) {
+          if (objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId])) {
+            subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId]);
+            predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId]);
+          }
+        }
+        else if (subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId])) {
+          predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId]);
+          objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId]);
         }
+
+        if (subjects)
+          newStore._graphs[graphKey] = { subjects, predicates, objects };
       }
       newStore._size = null;
     }