n3 2.7.3 → 2.7.5

package/lib/N3Lexer.js

@@ -555,13 +555,18 @@ class N3Lexer {
   // ### `tokenize` starts the transformation of an N3 document into an array of tokens.
   // The input can be a string or a stream.
   tokenize(input, callback) {
+    // Deferred tokenization and stream events can outlive their invocation.
+    // Ignore them once a later call takes ownership of the lexer state.
+    const tokenization = this._tokenization = {};
     this._line = 1;
 
     // If the input is a string, continuously emit tokens through the callback until the end
     if (typeof input === 'string') {
       this._input = this._readStartingBom(input);
       // If a callback was passed, asynchronously call it
-      if (typeof callback === 'function') queueMicrotask(() => this._tokenizeToEnd(callback, true));
+      if (typeof callback === 'function') queueMicrotask(() => {
+        if (this._tokenization === tokenization) this._tokenizeToEnd(callback, true);
+      });
       // If no callback was passed, tokenize synchronously and return
       else {
         const tokens = [];
@@ -577,7 +582,7 @@ class N3Lexer {
       if (typeof input.setEncoding === 'function') input.setEncoding('utf8');
       // Adds the data chunk to the buffer and parses as far as possible
       input.on('data', data => {
-        if (this._input !== null && data.length !== 0) {
+        if (this._tokenization === tokenization && this._input !== null && data.length !== 0) {
           // Prepend any previous pending writes
           if (this._pendingBuffer) {
             data = _buffer.Buffer.concat([this._pendingBuffer, data]);
@@ -597,9 +602,11 @@ class N3Lexer {
       });
       // Parses until the end
       input.on('end', () => {
-        if (typeof this._input === 'string') this._tokenizeToEnd(callback, true);
+        if (this._tokenization === tokenization && typeof this._input === 'string') this._tokenizeToEnd(callback, true);
+      });
+      input.on('error', error => {
+        if (this._tokenization === tokenization) callback(error);
       });
-      input.on('error', callback);
     }
   }
 }

package/lib/N3Store.js

@@ -278,12 +278,15 @@ class N3Store {
     // A null key list stops after visiting a bound key, avoiding a one-item array.
     const keys0 = key0 ? null : Object.keys(index0);
     for (let i0 = 0, value0 = key0 || keys0[0]; value0; value0 = keys0 && keys0[++i0]) {
+      // Mutations can remove keys captured before an earlier yield.
       const index1 = index0[value0];
+      if (!index1) continue; // eslint-disable-line no-continue
       parts[name0] = this._termFromId(entityKeys[value0]);
       if (key1 && !(key1 in index1)) return;
       const keys1 = key1 ? null : Object.keys(index1);
       for (let i1 = 0, value1 = key1 || keys1[0]; value1; value1 = keys1 && keys1[++i1]) {
         const index2 = index1[value1];
+        if (!index2) continue; // eslint-disable-line no-continue
         parts[name1] = this._termFromId(entityKeys[value1]);
         const values = Object.keys(index2);
         for (let l = 0; l < values.length; l++) {

package/package.json

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

package/src/N3Lexer.js

@@ -575,6 +575,9 @@ export default class N3Lexer {
   // ### `tokenize` starts the transformation of an N3 document into an array of tokens.
   // The input can be a string or a stream.
   tokenize(input, callback) {
+    // Deferred tokenization and stream events can outlive their invocation.
+    // Ignore them once a later call takes ownership of the lexer state.
+    const tokenization = this._tokenization = {};
     this._line = 1;
 
     // If the input is a string, continuously emit tokens through the callback until the end
@@ -582,7 +585,10 @@ export default class N3Lexer {
       this._input = this._readStartingBom(input);
       // If a callback was passed, asynchronously call it
       if (typeof callback === 'function')
-        queueMicrotask(() => this._tokenizeToEnd(callback, true));
+        queueMicrotask(() => {
+          if (this._tokenization === tokenization)
+            this._tokenizeToEnd(callback, true);
+        });
       // If no callback was passed, tokenize synchronously and return
       else {
         const tokens = [];
@@ -599,7 +605,7 @@ export default class N3Lexer {
         input.setEncoding('utf8');
       // Adds the data chunk to the buffer and parses as far as possible
       input.on('data', data => {
-        if (this._input !== null && data.length !== 0) {
+        if (this._tokenization === tokenization && this._input !== null && data.length !== 0) {
           // Prepend any previous pending writes
           if (this._pendingBuffer) {
             data = Buffer.concat([this._pendingBuffer, data]);
@@ -622,10 +628,13 @@ export default class N3Lexer {
       });
       // Parses until the end
       input.on('end', () => {
-        if (typeof this._input === 'string')
+        if (this._tokenization === tokenization && typeof this._input === 'string')
           this._tokenizeToEnd(callback, true);
       });
-      input.on('error', callback);
+      input.on('error', error => {
+        if (this._tokenization === tokenization)
+          callback(error);
+      });
     }
   }
 }

package/src/N3Store.js

@@ -297,7 +297,9 @@ export default class N3Store {
     const keys0 = key0 ? null : Object.keys(index0);
     for (let i0 = 0, value0 = key0 || keys0[0]; value0;
          value0 = keys0 && keys0[++i0]) {
+      // Mutations can remove keys captured before an earlier yield.
       const index1 = index0[value0];
+      if (!index1) continue; // eslint-disable-line no-continue
       parts[name0] = this._termFromId(entityKeys[value0]);
 
       if (key1 && !(key1 in index1))
@@ -306,6 +308,7 @@ export default class N3Store {
       for (let i1 = 0, value1 = key1 || keys1[0]; value1;
            value1 = keys1 && keys1[++i1]) {
         const index2 = index1[value1];
+        if (!index2) continue; // eslint-disable-line no-continue
         parts[name1] = this._termFromId(entityKeys[value1]);
         const values = Object.keys(index2);
         for (let l = 0; l < values.length; l++) {