n3 1.16.1 → 1.16.3

package/lib/N3Store.js

@@ -96,36 +96,30 @@ class N3Store {
 
 
   *_findInIndex(index0, key0, key1, key2, name0, name1, name2, graphId) {
-    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;
-    const graph = (0, _N3DataFactory.termFromId)(graphId, this._factory); // If a key is specified, use only that part of index 0.
+    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);
               yield this._factory.quad(parts.subject, parts.predicate, parts.object, graph);
             }
@@ -394,12 +388,12 @@ 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
-            yield* this._findInIndex(content.objects, objectId, subjectId, predicateId, 'object', 'subject', 'predicate', graphId, null, true);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, null, true);
+            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
-          yield* this._findInIndex(content.predicates, predicateId, objectId, null, 'predicate', 'object', 'subject', graphId, null, true);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, null, true);else // If nothing is given, iterate subjects and predicates first
-          yield* this._findInIndex(content.subjects, null, null, null, 'subject', 'predicate', 'object', graphId, null, true);
+          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);
       }
     }
   } // ### `match` returns a new dataset that is comprised of all quads in the current instance matching the given arguments.
@@ -773,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;

package/lib/N3Writer.js

@@ -301,7 +301,7 @@ class N3Writer {
       }
 
       IRIlist = escapeRegex(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
-      this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` + `^(${IRIlist})([a-zA-Z][\\-_a-zA-Z0-9]*)$`);
+      this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` + `^(${IRIlist})([_a-zA-Z][\\-_a-zA-Z0-9]*)$`);
     } // End a prefix block with a newline
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -15,7 +15,7 @@
   "module": "./src/index.js",
   "sideEffects": false,
   "engines": {
-    "node": ">=8.0"
+    "node": ">=12.0"
   },
   "files": [
     ".babelrc",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "queue-microtask": "^1.1.2",
-    "readable-stream": "^3.6.0"
+    "readable-stream": "^4.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
@@ -42,7 +42,7 @@
     "mocha": "^8.0.0",
     "nyc": "^14.1.1",
     "pre-commit": "^1.2.2",
-    "rdf-test-suite": "^1.2.0",
+    "rdf-test-suite": "^1.19.2",
     "streamify-string": "^1.0.1",
     "uglify-js": "^3.14.3"
   },

package/src/N3Store.js

@@ -87,30 +87,24 @@ export default class N3Store {
   // Finally, `graphId` will be the graph of the created quads.
   *_findInIndex(index0, key0, key1, key2, name0, name1, name2, graphId) {
     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;
+    const entityKeys = this._entities;
     const graph = 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]) {
+        parts[name0] = 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]) {
+            parts[name1] = 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] = termFromId(entity0, this._factory);
-              parts[name1] = termFromId(entity1, this._factory);
               parts[name2] = termFromId(entityKeys[values[l]], this._factory);
               yield this._factory.quad(parts.subject, parts.predicate, parts.object, graph);
             }
@@ -378,24 +372,24 @@ export default class N3Store {
           if (objectId)
             // If subject and object are given, the object index will be the fastest
             yield* this._findInIndex(content.objects, objectId, subjectId, predicateId,
-                              'object', 'subject', 'predicate', graphId, null, true);
+                              '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, null, true);
+                              'subject', 'predicate', 'object', graphId);
         }
         else if (predicateId)
           // If only predicate and possibly object are given, the predicate index will be the fastest
           yield* this._findInIndex(content.predicates, predicateId, objectId, null,
-                            'predicate', 'object', 'subject', graphId, null, true);
+                            '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, null, true);
+                            '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, null, true);
+                            'subject', 'predicate', 'object', graphId);
       }
     }
   }
@@ -787,11 +781,13 @@ class DatasetCoreAndReadableStream extends Readable {
   get filtered() {
     if (!this._filtered) {
       const { n3Store, graph, object, predicate, subject } = this;
-      const quads = n3Store.getQuads(subject, predicate, object, graph);
-      this._filtered = new N3Store(quads, { factory: n3Store._factory });
+      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;
   }
+
   get size() {
     return this.filtered.size;
   }

package/src/N3Writer.js

@@ -296,7 +296,7 @@ export default class N3Writer {
       }
       IRIlist = escapeRegex(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
       this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` +
-                                     `^(${IRIlist})([a-zA-Z][\\-_a-zA-Z0-9]*)$`);
+                                     `^(${IRIlist})([_a-zA-Z][\\-_a-zA-Z0-9]*)$`);
     }
     // End a prefix block with a newline
     this._write(hasPrefixes ? '\n' : '', done);