n3 1.20.0 → 1.20.2

package/lib/N3DataFactory.js

@@ -11,7 +11,7 @@ exports.unescapeQuotes = unescapeQuotes;
 var _IRIs = _interopRequireDefault(require("./IRIs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // N3.js implementations of the RDF/JS core data types
-// See https://github.com/rdfjs/representation-task-force/blob/master/interface-spec.md
+// See http://rdf.js.org/data-model-spec/
 
 const {
   rdf,

package/lib/N3Store.js

@@ -302,13 +302,13 @@ class N3Store {
     subject = this._termToNewNumericId(subject);
     predicate = this._termToNewNumericId(predicate);
     object = this._termToNewNumericId(object);
-    const changed = this._addToIndex(graphItem.subjects, subject, predicate, object);
+    if (!this._addToIndex(graphItem.subjects, subject, predicate, object)) return false;
     this._addToIndex(graphItem.predicates, predicate, object, subject);
     this._addToIndex(graphItem.objects, object, subject, predicate);
 
     // The cached quad count is now invalid
     this._size = null;
-    return changed;
+    return true;
   }
 
   // ### `addQuads` adds multiple quads to the store
@@ -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;
   }
 
   /**

package/package.json

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

package/src/N3DataFactory.js

@@ -1,5 +1,5 @@
 // N3.js implementations of the RDF/JS core data types
-// See https://github.com/rdfjs/representation-task-force/blob/master/interface-spec.md
+// See http://rdf.js.org/data-model-spec/
 
 import namespaces from './IRIs';
 

package/src/N3Store.js

@@ -306,13 +306,14 @@ export default class N3Store {
     predicate = this._termToNewNumericId(predicate);
     object    = this._termToNewNumericId(object);
 
-    const changed = this._addToIndex(graphItem.subjects,   subject,   predicate, object);
+    if (!this._addToIndex(graphItem.subjects,   subject,   predicate, object))
+      return false;
     this._addToIndex(graphItem.predicates, predicate, object,    subject);
     this._addToIndex(graphItem.objects,    object,    subject,   predicate);
 
     // The cached quad count is now invalid
     this._size = null;
-    return changed;
+    return true;
   }
 
   // ### `addQuads` adds multiple quads to the store
@@ -806,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;
   }
 
   /**