n3 1.21.3 → 1.22.1

package/lib/N3DataFactory.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Variable = exports.Triple = exports.Term = exports.Quad = exports.NamedNode = exports.Literal = exports.DefaultGraph = exports.BlankNode = void 0;
 exports.escapeQuotes = escapeQuotes;
+exports.fromQuad = fromQuad;
+exports.fromTerm = fromTerm;
 exports.termFromId = termFromId;
 exports.termToId = termToId;
 exports.unescapeQuotes = unescapeQuotes;
@@ -31,7 +33,9 @@ const DataFactory = {
   literal,
   defaultGraph,
   quad,
-  triple: quad
+  triple: quad,
+  fromTerm,
+  fromQuad
 };
 var _default = exports.default = DataFactory; // ## Term constructor
 class Term {
@@ -366,4 +370,30 @@ function defaultGraph() {
 // ### Creates a quad
 function quad(subject, predicate, object, graph) {
   return new Quad(subject, predicate, object, graph);
+}
+function fromTerm(term) {
+  if (term instanceof Term) return term;
+
+  // Term instantiated with another library
+  switch (term.termType) {
+    case 'NamedNode':
+      return namedNode(term.value);
+    case 'BlankNode':
+      return blankNode(term.value);
+    case 'Variable':
+      return variable(term.value);
+    case 'DefaultGraph':
+      return DEFAULTGRAPH;
+    case 'Literal':
+      return literal(term.value, term.language || term.datatype);
+    case 'Quad':
+      return fromQuad(term);
+    default:
+      throw new Error(`Unexpected termType: ${term.termType}`);
+  }
+}
+function fromQuad(inQuad) {
+  if (inQuad instanceof Quad) return inQuad;
+  if (inQuad.termType !== 'Quad') throw new Error(`Unexpected termType: ${inQuad.termType}`);
+  return quad(fromTerm(inQuad.subject), fromTerm(inQuad.predicate), fromTerm(inQuad.object), fromTerm(inQuad.graph));
 }

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 = {}) {
@@ -842,6 +873,17 @@ class N3Store {
     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));
   }
 

package/package.json

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

package/src/N3DataFactory.js

@@ -20,6 +20,8 @@ const DataFactory = {
   defaultGraph,
   quad,
   triple: quad,
+  fromTerm,
+  fromQuad,
 };
 export default DataFactory;
 
@@ -386,3 +388,29 @@ function defaultGraph() {
 function quad(subject, predicate, object, graph) {
   return new Quad(subject, predicate, object, graph);
 }
+
+export function fromTerm(term) {
+  if (term instanceof Term)
+    return term;
+
+  // Term instantiated with another library
+  switch (term.termType) {
+  case 'NamedNode':    return namedNode(term.value);
+  case 'BlankNode':    return blankNode(term.value);
+  case 'Variable':     return variable(term.value);
+  case 'DefaultGraph': return DEFAULTGRAPH;
+  case 'Literal':      return literal(term.value, term.language || term.datatype);
+  case 'Quad':         return fromQuad(term);
+  default:             throw new Error(`Unexpected termType: ${term.termType}`);
+  }
+}
+
+export function fromQuad(inQuad) {
+  if (inQuad instanceof Quad)
+    return inQuad;
+
+  if (inQuad.termType !== 'Quad')
+    throw new Error(`Unexpected termType: ${inQuad.termType}`);
+
+  return quad(fromTerm(inQuad.subject), fromTerm(inQuad.predicate), fromTerm(inQuad.object), fromTerm(inQuad.graph));
+}

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 = {}) {
@@ -896,6 +930,16 @@ export default class N3Store {
     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));
   }