n3 1.15.0 → 1.16.2

package/lib/N3Parser.js

@@ -83,11 +83,11 @@ class N3Parser {
     const n3Mode = this._n3Mode;
 
     this._contextStack.push({
-      subject: subject,
-      predicate: predicate,
-      object: object,
-      graph: graph,
-      type: type,
+      type,
+      subject,
+      predicate,
+      object,
+      graph,
       inverse: n3Mode ? this._inversePredicate : false,
       blankPrefix: n3Mode ? this._prefixes._ : '',
       quantified: n3Mode ? this._quantified : null
@@ -107,16 +107,18 @@ class N3Parser {
   // when leaving a scope (list, blank node, formula)
 
 
-  _restoreContext() {
-    const context = this._contextStack.pop(),
-          n3Mode = this._n3Mode;
+  _restoreContext(type, token) {
+    // Obtain the previous context
+    const context = this._contextStack.pop();
+
+    if (!context || context.type !== type) return this._error(`Unexpected ${token.type}`, token); // Restore the quad of the previous context
 
     this._subject = context.subject;
     this._predicate = context.predicate;
     this._object = context.object;
-    this._graph = context.graph; // The settings below only apply to N3 streams
+    this._graph = context.graph; // Restore N3 context settings
 
-    if (n3Mode) {
+    if (this._n3Mode) {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
@@ -406,7 +408,7 @@ class N3Parser {
 
     const empty = this._predicate === null;
 
-    this._restoreContext(); // If the blank node was the object, restore previous context and read punctuation
+    this._restoreContext('blank', token); // If the blank node was the object, restore previous context and read punctuation
 
 
     if (this._object !== null) return this._getContextEndReader(); // If the blank node was the predicate, continue reading the object
@@ -460,7 +462,7 @@ class N3Parser {
 
       case ')':
         // Closing the list; restore the parent context
-        this._restoreContext(); // If this list is contained within a parent list, return the membership quad here.
+        this._restoreContext('list', token); // If this list is contained within a parent list, return the membership quad here.
         // This will be `<parent list element> rdf:first <this list>.`.
 
 
@@ -606,7 +608,7 @@ class N3Parser {
 
     if (this._subject !== null) this._emit(this._subject, this._predicate, this._object, this._graph); // Restore the parent context containing this formula
 
-    this._restoreContext(); // If the formula was the subject, continue reading the predicate.
+    this._restoreContext('formula', token); // If the formula was the subject, continue reading the predicate.
     // If the formula was the object, read punctuation.
 
 
@@ -830,7 +832,7 @@ class N3Parser {
           // The list item is the remaining subejct after reading the path
           const item = this._subject; // Switch back to the context of the list
 
-          this._restoreContext(); // Output the list item
+          this._restoreContext('item', token); // Output the list item
 
 
           this._emit(this._subject, this.RDF_FIRST, item, this._graph);
@@ -890,7 +892,7 @@ class N3Parser {
 
     const quad = this._quad(this._subject, this._predicate, this._object, this._graph || this.DEFAULTGRAPH);
 
-    this._restoreContext(); // If the triple was the subject, continue by reading the predicate.
+    this._restoreContext('<<', token); // If the triple was the subject, continue by reading the predicate.
 
 
     if (this._subject === null) {

package/lib/N3Store.js

@@ -92,54 +92,41 @@ class N3Store {
   // `name0`, `name1`, and `name2` are the names of the keys at each level,
   // used when reconstructing the resulting quad
   // (for instance: _subject_, _predicate_, and _object_).
-  // Finally, `graph` will be the graph of the created quads.
-  // If `callback` is given, each result is passed through it
-  // and iteration halts when it returns truthy for any quad.
-  // If instead `array` is given, each result is added to the array.
+  // Finally, `graphId` will be the graph of the created quads.
 
 
-  _findInIndex(index0, key0, key1, key2, name0, name1, name2, graph, callback, array) {
-    let tmp, index1, index2; // Depending on the number of variables, keys or reverse index are faster
-
-    const varCount = !key0 + !key1 + !key2,
-          entityKeys = varCount > 1 ? Object.keys(this._ids) : this._entities; // If a key is specified, use only that part of index 0.
+  *_findInIndex(index0, key0, key1, key2, name0, name1, name2, graphId) {
+    let tmp, index1, index2;
+    const entityKeys = this._entities;
+    const graph = (0, _N3DataFactory.termFromId)(graphId, this._factory);
+    const parts = {
+      subject: null,
+      predicate: null,
+      object: null
+    }; // If a key is specified, use only that part of index 0.
 
     if (key0) (tmp = index0, index0 = {})[key0] = tmp[key0];
 
     for (const value0 in index0) {
-      const entity0 = entityKeys[value0];
-
       if (index1 = index0[value0]) {
-        // If a key is specified, use only that part of index 1.
+        parts[name0] = (0, _N3DataFactory.termFromId)(entityKeys[value0], this._factory); // If a key is specified, use only that part of index 1.
+
         if (key1) (tmp = index1, index1 = {})[key1] = tmp[key1];
 
         for (const value1 in index1) {
-          const entity1 = entityKeys[value1];
-
           if (index2 = index1[value1]) {
-            // If a key is specified, use only that part of index 2, if it exists.
+            parts[name1] = (0, _N3DataFactory.termFromId)(entityKeys[value1], this._factory); // If a key is specified, use only that part of index 2, if it exists.
+
             const values = key2 ? key2 in index2 ? [key2] : [] : Object.keys(index2); // Create quads for all items found in index 2.
 
             for (let l = 0; l < values.length; l++) {
-              const parts = {
-                subject: null,
-                predicate: null,
-                object: null
-              };
-              parts[name0] = (0, _N3DataFactory.termFromId)(entity0, this._factory);
-              parts[name1] = (0, _N3DataFactory.termFromId)(entity1, this._factory);
               parts[name2] = (0, _N3DataFactory.termFromId)(entityKeys[values[l]], this._factory);
-
-              const quad = this._factory.quad(parts.subject, parts.predicate, parts.object, (0, _N3DataFactory.termFromId)(graph, this._factory));
-
-              if (array) array.push(quad);else if (callback(quad)) return true;
+              yield this._factory.quad(parts.subject, parts.predicate, parts.object, graph);
             }
           }
         }
       }
     }
-
-    return array;
   } // ### `_loop` executes the callback on all keys of index 0
 
 
@@ -288,13 +275,17 @@ class N3Store {
   delete(quad) {
     this.removeQuad(quad);
     return this;
-  } // ### `has` determines whether a dataset includes a certain quad.
-  // Returns true or false as appropriate.
+  } // ### `has` determines whether a dataset includes a certain quad or quad pattern.
 
 
-  has(quad) {
-    const quads = this.getQuads(quad.subject, quad.predicate, quad.object, quad.graph);
-    return quads.length !== 0;
+  has(subjectOrQuad, predicate, object, graph) {
+    if (subjectOrQuad && subjectOrQuad.subject) ({
+      subject: subjectOrQuad,
+      predicate,
+      object,
+      graph
+    } = subjectOrQuad);
+    return !this.readQuads(subjectOrQuad, predicate, object, graph).next().done;
   } // ### `import` adds a stream of quads to the store
 
 
@@ -356,7 +347,7 @@ class N3Store {
     });
 
     stream._read = () => {
-      for (const quad of this.getQuads(subject, predicate, object, graph)) stream.push(quad);
+      for (const quad of this.readQuads(subject, predicate, object, graph)) stream.push(quad);
 
       stream.push(null);
     };
@@ -372,19 +363,24 @@ class N3Store {
 
 
   getQuads(subject, predicate, object, graph) {
+    return [...this.readQuads(subject, predicate, object, graph)];
+  } // ### `readQuads` returns an generator of quads matching a pattern.
+  // Setting any field to `undefined` or `null` indicates a wildcard.
+
+
+  *readQuads(subject, predicate, object, graph) {
     // Convert terms to internal string representation
     subject = subject && (0, _N3DataFactory.termToId)(subject);
     predicate = predicate && (0, _N3DataFactory.termToId)(predicate);
     object = object && (0, _N3DataFactory.termToId)(object);
     graph = graph && (0, _N3DataFactory.termToId)(graph);
 
-    const quads = [],
-          graphs = this._getGraphs(graph),
+    const graphs = this._getGraphs(graph),
           ids = this._ids;
 
     let content, subjectId, predicateId, objectId; // Translate IRIs to internal index keys.
 
-    if (isString(subject) && !(subjectId = ids[subject]) || isString(predicate) && !(predicateId = ids[predicate]) || isString(object) && !(objectId = ids[object])) return quads;
+    if (isString(subject) && !(subjectId = ids[subject]) || isString(predicate) && !(predicateId = ids[predicate]) || isString(object) && !(objectId = ids[object])) return;
 
     for (const graphId in graphs) {
       // Only if the specified graph contains triples, there can be results
@@ -392,16 +388,14 @@ class N3Store {
         // Choose the optimal index, based on what fields are present
         if (subjectId) {
           if (objectId) // If subject and object are given, the object index will be the fastest
-            this._findInIndex(content.objects, objectId, subjectId, predicateId, 'object', 'subject', 'predicate', graphId, null, quads);else // If only subject and possibly predicate are given, the subject index will be the fastest
-            this._findInIndex(content.subjects, subjectId, predicateId, null, 'subject', 'predicate', 'object', graphId, null, quads);
+            yield* this._findInIndex(content.objects, objectId, subjectId, predicateId, 'object', 'subject', 'predicate', graphId);else // If only subject and possibly predicate are given, the subject index will be the fastest
+            yield* this._findInIndex(content.subjects, subjectId, predicateId, null, 'subject', 'predicate', 'object', graphId);
         } else if (predicateId) // If only predicate and possibly object are given, the predicate index will be the fastest
-          this._findInIndex(content.predicates, predicateId, objectId, null, 'predicate', 'object', 'subject', graphId, null, quads);else if (objectId) // If only object is given, the object index will be the fastest
-          this._findInIndex(content.objects, objectId, null, null, 'object', 'subject', 'predicate', graphId, null, quads);else // If nothing is given, iterate subjects and predicates first
-          this._findInIndex(content.subjects, null, null, null, 'subject', 'predicate', 'object', graphId, null, quads);
+          yield* this._findInIndex(content.predicates, predicateId, objectId, null, 'predicate', 'object', 'subject', graphId);else if (objectId) // If only object is given, the object index will be the fastest
+          yield* this._findInIndex(content.objects, objectId, null, null, 'object', 'subject', 'predicate', graphId);else // If nothing is given, iterate subjects and predicates first
+          yield* this._findInIndex(content.subjects, null, null, null, 'subject', 'predicate', 'object', graphId);
       }
     }
-
-    return quads;
   } // ### `match` returns a new dataset that is comprised of all quads in the current instance matching the given arguments.
   // The logic described in Quad Matching is applied for each quad in this dataset to check if it should be included in the output dataset.
   // Note: This method always returns a new DatasetCore, even if that dataset contains no quads.
@@ -480,45 +474,7 @@ class N3Store {
 
 
   some(callback, subject, predicate, object, graph) {
-    // Convert terms to internal string representation
-    subject = subject && (0, _N3DataFactory.termToId)(subject);
-    predicate = predicate && (0, _N3DataFactory.termToId)(predicate);
-    object = object && (0, _N3DataFactory.termToId)(object);
-    graph = graph && (0, _N3DataFactory.termToId)(graph);
-
-    const graphs = this._getGraphs(graph),
-          ids = this._ids;
-
-    let content, subjectId, predicateId, objectId; // Translate IRIs to internal index keys.
-
-    if (isString(subject) && !(subjectId = ids[subject]) || isString(predicate) && !(predicateId = ids[predicate]) || isString(object) && !(objectId = ids[object])) return false;
-
-    for (const graphId in graphs) {
-      // Only if the specified graph contains triples, there can be results
-      if (content = graphs[graphId]) {
-        // Choose the optimal index, based on what fields are present
-        if (subjectId) {
-          if (objectId) {
-            // If subject and object are given, the object index will be the fastest
-            if (this._findInIndex(content.objects, objectId, subjectId, predicateId, 'object', 'subject', 'predicate', graphId, callback, null)) return true;
-          } else // If only subject and possibly predicate are given, the subject index will be the fastest
-            if (this._findInIndex(content.subjects, subjectId, predicateId, null, 'subject', 'predicate', 'object', graphId, callback, null)) return true;
-        } else if (predicateId) {
-          // If only predicate and possibly object are given, the predicate index will be the fastest
-          if (this._findInIndex(content.predicates, predicateId, objectId, null, 'predicate', 'object', 'subject', graphId, callback, null)) {
-            return true;
-          }
-        } else if (objectId) {
-          // If only object is given, the object index will be the fastest
-          if (this._findInIndex(content.objects, objectId, null, null, 'object', 'subject', 'predicate', graphId, callback, null)) {
-            return true;
-          }
-        } else // If nothing is given, iterate subjects and predicates first
-          if (this._findInIndex(content.subjects, null, null, null, 'subject', 'predicate', 'object', graphId, callback, null)) {
-            return true;
-          }
-      }
-    }
+    for (const quad of this.readQuads(subject, predicate, object, graph)) if (callback(quad)) return true;
 
     return false;
   } // ### `getSubjects` returns all subjects that match the pattern.
@@ -772,7 +728,7 @@ class N3Store {
 
 
   *[Symbol.iterator]() {
-    yield* this.getQuads();
+    yield* this.readQuads();
   }
 
 } // Determines whether the argument is a string
@@ -811,10 +767,11 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
         predicate,
         subject
       } = this;
-      const quads = n3Store.getQuads(subject, predicate, object, graph);
-      this._filtered = new N3Store(quads, {
+      const newStore = this._filtered = new N3Store({
         factory: n3Store._factory
       });
+
+      for (const quad of n3Store.readQuads(subject, predicate, object, graph)) newStore.addQuad(quad);
     }
 
     return this._filtered;
@@ -825,7 +782,7 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
   }
 
   _read() {
-    for (const quad of this.filtered.getQuads()) this.push(quad);
+    for (const quad of this) this.push(quad);
 
     this.push(null);
   }
@@ -847,7 +804,7 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
   }
 
   *[Symbol.iterator]() {
-    yield* this.filtered.getQuads();
+    yield* this._filtered || this.n3Store.readQuads(this.subject, this.predicate, this.object, this.graph);
   }
 
 }

package/lib/N3Util.js

@@ -50,7 +50,7 @@ function inDefaultGraph(quad) {
 
 function prefix(iri, factory) {
   return prefixes({
-    '': iri
+    '': iri.value || iri
   }, factory)('');
 } // Creates a function that allows registering and expanding prefixes
 

package/package.json

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

package/src/N3Parser.js

@@ -74,8 +74,8 @@ export default class N3Parser {
   _saveContext(type, graph, subject, predicate, object) {
     const n3Mode = this._n3Mode;
     this._contextStack.push({
-      subject: subject, predicate: predicate, object: object,
-      graph: graph, type: type,
+      type,
+      subject, predicate, object, graph,
       inverse: n3Mode ? this._inversePredicate : false,
       blankPrefix: n3Mode ? this._prefixes._ : '',
       quantified: n3Mode ? this._quantified : null,
@@ -94,14 +94,20 @@ export default class N3Parser {
 
   // ### `_restoreContext` restores the parent context
   // when leaving a scope (list, blank node, formula)
-  _restoreContext() {
-    const context = this._contextStack.pop(), n3Mode = this._n3Mode;
+  _restoreContext(type, token) {
+    // Obtain the previous context
+    const context = this._contextStack.pop();
+    if (!context || context.type !== type)
+      return this._error(`Unexpected ${token.type}`, token);
+
+    // Restore the quad of the previous context
     this._subject   = context.subject;
     this._predicate = context.predicate;
     this._object    = context.object;
     this._graph     = context.graph;
-    // The settings below only apply to N3 streams
-    if (n3Mode) {
+
+    // Restore N3 context settings
+    if (this._n3Mode) {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
@@ -374,7 +380,7 @@ export default class N3Parser {
 
     // Restore the parent context containing this blank node
     const empty = this._predicate === null;
-    this._restoreContext();
+    this._restoreContext('blank', token);
     // If the blank node was the object, restore previous context and read punctuation
     if (this._object !== null)
       return this._getContextEndReader();
@@ -425,7 +431,7 @@ export default class N3Parser {
       break;
     case ')':
       // Closing the list; restore the parent context
-      this._restoreContext();
+      this._restoreContext('list', token);
       // If this list is contained within a parent list, return the membership quad here.
       // This will be `<parent list element> rdf:first <this list>.`.
       if (stack.length !== 0 && stack[stack.length - 1].type === 'list')
@@ -576,7 +582,7 @@ export default class N3Parser {
       this._emit(this._subject, this._predicate, this._object, this._graph);
 
     // Restore the parent context containing this formula
-    this._restoreContext();
+    this._restoreContext('formula', token);
     // If the formula was the subject, continue reading the predicate.
     // If the formula was the object, read punctuation.
     return this._object === null ? this._readPredicate : this._getContextEndReader();
@@ -785,7 +791,7 @@ export default class N3Parser {
         // The list item is the remaining subejct after reading the path
         const item = this._subject;
         // Switch back to the context of the list
-        this._restoreContext();
+        this._restoreContext('item', token);
         // Output the list item
         this._emit(this._subject, this.RDF_FIRST, item, this._graph);
       }
@@ -847,7 +853,7 @@ export default class N3Parser {
     // Read the quad and restore the previous context
     const quad = this._quad(this._subject, this._predicate, this._object,
       this._graph || this.DEFAULTGRAPH);
-    this._restoreContext();
+    this._restoreContext('<<', token);
     // If the triple was the subject, continue by reading the predicate.
     if (this._subject === null) {
       this._subject = quad;