n3 1.20.3 → 1.20.4

package/lib/N3Store.js

@@ -15,6 +15,11 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 // **N3Store** objects store N3 quads by graph in memory.
 
 const ITERATOR = Symbol('iter');
+function merge(target, source, depth = 4) {
+  if (depth === 0) return Object.assign(target, source);
+  for (const key in source) target[key] = merge(target[key] || Object.create(null), source[key], depth - 1);
+  return target;
+}
 
 // ## Constructor
 class N3EntityIndex {
@@ -125,7 +130,7 @@ class N3Store {
     const index1 = index0[key0] || (index0[key0] = {});
     const index2 = index1[key1] || (index1[key1] = {});
     // Setting the key to _any_ value signals the presence of the quad
-    const existed = (key2 in index2);
+    const existed = key2 in index2;
     if (!existed) index2[key2] = null;
     return !existed;
   }
@@ -746,7 +751,12 @@ class N3Store {
    * Blank Nodes will be normalized.
    */
   addAll(quads) {
-    if (Array.isArray(quads)) this.addQuads(quads);else {
+    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);
+        this._size = null; // Invalidate the cached size
+      }
+    } else {
       for (const quad of quads) this.add(quad);
     }
     return this;
@@ -759,6 +769,7 @@ class N3Store {
    * Blank Nodes will be normalized.
    */
   contains(other) {
+    if (other === this) return true;
     if (!(other instanceof N3Store) || this._entityIndex !== other._entityIndex) return other.every(quad => this.has(quad));
     const g1 = this._graphs,
       g2 = other._graphs;
@@ -797,6 +808,9 @@ 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 === this) return new N3Store({
+      entityIndex: this._entityIndex
+    });
     return this.filter(quad => !other.has(quad));
   }
 
@@ -826,6 +840,13 @@ 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 === this) {
+      const store = new N3Store({
+        entityIndex: this._entityIndex
+      });
+      store._graphs = merge(Object.create(null), this._graphs);
+      store._size = this._size;
+    }
     return this.filter(quad => other.has(quad));
   }
 
@@ -898,7 +919,8 @@ class N3Store {
     const store = new N3Store({
       entityIndex: this._entityIndex
     });
-    store.addAll(this);
+    store._graphs = merge(Object.create(null), this._graphs);
+    store._size = this._size;
     store.addAll(quads);
     return store;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.20.3",
+  "version": "1.20.4",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -36,10 +36,9 @@
     "@rdfjs/data-model": "^1",
     "arrayify-stream": "^1.0.0",
     "browserify": "^17.0.0",
-    "colors": "^1.1.2",
     "deep-taxonomy-benchmark": "^1.2.0",
     "docco": "^0.9.1",
-    "eslint": "^5.14.1",
+    "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
     "jest": "^29.7.0",
     "pre-commit": "^1.2.2",

package/src/N3DataFactory.js

@@ -229,7 +229,7 @@ export function termFromId(id, factory, nested) {
     termFromId(id[0], factory, true),
     termFromId(id[1], factory, true),
     termFromId(id[2], factory, true),
-    id[3] && termFromId(id[3], factory, true)
+    id[3] && termFromId(id[3], factory, true),
   );
 }
 

package/src/N3Store.js

@@ -7,6 +7,16 @@ import N3Writer from './N3Writer';
 
 const ITERATOR = Symbol('iter');
 
+function merge(target, source, depth = 4) {
+  if (depth === 0)
+    return Object.assign(target, source);
+
+  for (const key in source)
+    target[key] = merge(target[key] || Object.create(null), source[key], depth - 1);
+
+  return target;
+}
+
 // ## Constructor
 export class N3EntityIndex {
   constructor(options = {}) {
@@ -31,7 +41,7 @@ export class N3EntityIndex {
         this._termFromId(entities[terms[1]]),
         this._termFromId(entities[terms[2]]),
         this._termFromId(entities[terms[3]]),
-        terms[4] && this._termFromId(entities[terms[4]])
+        terms[4] && this._termFromId(entities[terms[4]]),
       );
       return q;
     }
@@ -792,6 +802,12 @@ export default class N3Store {
   addAll(quads) {
     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);
+        this._size = null; // Invalidate the cached size
+      }
+    }
     else {
       for (const quad of quads)
         this.add(quad);
@@ -799,7 +815,6 @@ export default class N3Store {
     return this;
   }
 
-
   /**
    * Returns `true` if the current dataset is a superset of the given dataset; in other words, returns `true` if
    * the given dataset is a subset of, i.e., is contained within, the current dataset.
@@ -807,6 +822,9 @@ export default class N3Store {
    * Blank Nodes will be normalized.
    */
   contains(other) {
+    if (other === this)
+      return true;
+
     if (!(other instanceof N3Store) || this._entityIndex !== other._entityIndex)
       return other.every(quad => this.has(quad));
 
@@ -848,6 +866,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 === this)
+      return new N3Store({ entityIndex: this._entityIndex });
+
     return this.filter(quad => !other.has(quad));
   }
 
@@ -877,6 +898,11 @@ 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 === this) {
+      const store = new N3Store({ entityIndex: this._entityIndex });
+      store._graphs = merge(Object.create(null), this._graphs);
+      store._size = this._size;
+    }
     return this.filter(quad => other.has(quad));
   }
 
@@ -947,7 +973,9 @@ export default class N3Store {
    */
   union(quads) {
     const store = new N3Store({ entityIndex: this._entityIndex });
-    store.addAll(this);
+    store._graphs = merge(Object.create(null), this._graphs);
+    store._size = this._size;
+
     store.addAll(quads);
     return store;
   }

package/src/N3StreamParser.js

@@ -22,7 +22,7 @@ export default class N3StreamParser extends Transform {
       // Handle quads by pushing them down the pipeline
       (error, quad) => { error && this.emit('error', error) || quad && this.push(quad); },
       // Emit prefixes through the `prefix` event
-      (prefix, uri) => { this.emit('prefix', prefix, uri); }
+      (prefix, uri) => { this.emit('prefix', prefix, uri); },
     );
 
     // Implement Transform methods through parser callbacks