n3 2.7.4 → 2.7.6

package/lib/N3Lexer.js

@@ -464,6 +464,7 @@ class N3Lexer {
   // ### `_unescape` replaces N3 escape codes by their corresponding characters,
   // allowing only the fixed escape sequences from the given replacement table
   _unescape(item, replacements) {
+    if (item.indexOf('\\') < 0) return item;
     let invalid = false;
     const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
       // 4-digit unicode character
@@ -555,13 +556,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 +583,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 +603,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/N3StreamParser.js

@@ -59,15 +59,17 @@ class N3StreamParser extends _readableStream.Transform {
 
   // ### Parses a stream of strings
   import(stream) {
-    stream.on('data', chunk => {
-      this.write(chunk);
-    });
-    stream.on('end', () => {
-      this.end();
-    });
     stream.on('error', error => {
       this.emit('error', error);
     });
+    if (typeof stream.pipe === 'function') stream.pipe(this);else {
+      stream.on('data', chunk => {
+        this.write(chunk);
+      });
+      stream.on('end', () => {
+        this.end();
+      });
+    }
     return this;
   }
 }

package/package.json

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

package/src/N3Lexer.js

@@ -485,6 +485,8 @@ export default class N3Lexer {
   // ### `_unescape` replaces N3 escape codes by their corresponding characters,
   // allowing only the fixed escape sequences from the given replacement table
   _unescape(item, replacements) {
+    if (item.indexOf('\\') < 0)
+      return item;
     let invalid = false;
     const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
       // 4-digit unicode character
@@ -575,6 +577,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 +587,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 +607,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 +630,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/N3StreamParser.js

@@ -38,9 +38,13 @@ export default class N3StreamParser extends Transform {
 
   // ### Parses a stream of strings
   import(stream) {
-    stream.on('data',  chunk => { this.write(chunk); });
-    stream.on('end',   ()      => { this.end(); });
     stream.on('error', error => { this.emit('error', error); });
+    if (typeof stream.pipe === 'function')
+      stream.pipe(this);
+    else {
+      stream.on('data', chunk => { this.write(chunk); });
+      stream.on('end',  ()    => { this.end(); });
+    }
     return this;
   }
 }