n3 1.20.1 → 1.20.3

package/lib/N3Store.js

@@ -759,7 +759,22 @@ class N3Store {
    * Blank Nodes will be normalized.
    */
   contains(other) {
-    return other.every(quad => this.has(quad));
+    if (!(other instanceof N3Store) || this._entityIndex !== other._entityIndex) return other.every(quad => this.has(quad));
+    const g1 = this._graphs,
+      g2 = other._graphs;
+    let s1, s2, p1, p2, o1;
+    for (const graph in g2) {
+      if (!(s1 = g1[graph])) return false;
+      s1 = s1.subjects;
+      for (const subject in s2 = g2[graph].subjects) {
+        if (!(p1 = s1[subject])) return false;
+        for (const predicate in p2 = s2[subject]) {
+          if (!(o1 = p1[predicate])) return false;
+          for (const object in p2[predicate]) if (!(object in o1)) return false;
+        }
+      }
+    }
+    return true;
   }
 
   /**
@@ -800,7 +815,9 @@ class N3Store {
    * This method is aligned with Array.prototype.filter() in ECMAScript-262.
    */
   filter(iteratee) {
-    const store = new N3Store();
+    const store = new N3Store({
+      entityIndex: this._entityIndex
+    });
     for (const quad of this) if (iteratee(quad, this)) store.add(quad);
     return store;
   }
@@ -816,7 +833,9 @@ class N3Store {
    * Returns a new dataset containing all quads returned by applying `iteratee` to each quad in the current dataset.
    */
   map(iteratee) {
-    const store = new N3Store();
+    const store = new N3Store({
+      entityIndex: this._entityIndex
+    });
     for (const quad of this) store.add(iteratee(quad, this));
     return store;
   }
@@ -876,7 +895,9 @@ class N3Store {
    * Returns a new `Dataset` that is a concatenation of this dataset and the quads given as an argument.
    */
   union(quads) {
-    const store = new N3Store();
+    const store = new N3Store({
+      entityIndex: this._entityIndex
+    });
     store.addAll(this);
     store.addAll(quads);
     return store;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.20.1",
+  "version": "1.20.3",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [

package/src/N3Store.js

@@ -807,7 +807,24 @@ export default class N3Store {
    * Blank Nodes will be normalized.
    */
   contains(other) {
-    return other.every(quad => this.has(quad));
+    if (!(other instanceof N3Store) || this._entityIndex !== other._entityIndex)
+      return other.every(quad => this.has(quad));
+
+    const g1 = this._graphs, g2 = other._graphs;
+    let s1, s2, p1, p2, o1;
+    for (const graph in g2) {
+      if (!(s1 = g1[graph])) return false;
+      s1 = s1.subjects;
+      for (const subject in (s2 = g2[graph].subjects)) {
+        if (!(p1 = s1[subject])) return false;
+        for (const predicate in (p2 = s2[subject])) {
+          if (!(o1 = p1[predicate])) return false;
+          for (const object in p2[predicate])
+            if (!(object in o1)) return false;
+        }
+      }
+    }
+    return true;
   }
 
   /**
@@ -849,7 +866,7 @@ export default class N3Store {
    * This method is aligned with Array.prototype.filter() in ECMAScript-262.
    */
   filter(iteratee) {
-    const store = new N3Store();
+    const store = new N3Store({ entityIndex: this._entityIndex });
     for (const quad of this)
       if (iteratee(quad, this))
         store.add(quad);
@@ -867,7 +884,7 @@ export default class N3Store {
    * Returns a new dataset containing all quads returned by applying `iteratee` to each quad in the current dataset.
    */
   map(iteratee) {
-    const store = new N3Store();
+    const store = new N3Store({ entityIndex: this._entityIndex });
     for (const quad of this)
       store.add(iteratee(quad, this));
     return store;
@@ -929,7 +946,7 @@ export default class N3Store {
    * Returns a new `Dataset` that is a concatenation of this dataset and the quads given as an argument.
    */
   union(quads) {
-    const store = new N3Store();
+    const store = new N3Store({ entityIndex: this._entityIndex });
     store.addAll(this);
     store.addAll(quads);
     return store;