n3 1.21.2 → 1.22.0

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

@@ -424,7 +424,7 @@ class N3Store {
     });
     const iterable = this.readQuads(subject, predicate, object, graph);
     stream._read = size => {
-      while (size-- > 0) {
+      while (--size >= 0) {
         const {
           done,
           value
@@ -1055,7 +1055,7 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
   _read(size) {
     if (size > 0 && !this[ITERATOR]) this[ITERATOR] = this[Symbol.iterator]();
     const iterable = this[ITERATOR];
-    while (size-- > 0) {
+    while (--size >= 0) {
       const {
         done,
         value

package/package.json

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

@@ -430,7 +430,7 @@ export default class N3Store {
 
     const iterable = this.readQuads(subject, predicate, object, graph);
     stream._read = size => {
-      while (size-- > 0) {
+      while (--size >= 0) {
         const { done, value } = iterable.next();
         if (done) {
           stream.push(null);
@@ -1097,7 +1097,7 @@ class DatasetCoreAndReadableStream extends Readable {
     if (size > 0 && !this[ITERATOR])
       this[ITERATOR] = this[Symbol.iterator]();
     const iterable = this[ITERATOR];
-    while (size-- > 0) {
+    while (--size >= 0) {
       const { done, value } = iterable.next();
       if (done) {
         this.push(null);