n3 1.12.2 → 1.15.0

package/lib/N3DataFactory.js

@@ -48,12 +48,6 @@ class Term {
 
   get value() {
     return this.id;
-  } // ### Implement hashCode for Immutable.js, since we implement `equals`
-  // https://immutable-js.com/docs/v4.0.0/ValueObject/#hashCode()
-
-
-  get hashCode() {
-    return 0;
   } // ### Returns whether this object represents the same term as the other
 
 
@@ -63,6 +57,12 @@ class Term {
     if (other instanceof Term) return this.id === other.id; // Otherwise, compare term type and value
 
     return !!other && this.termType === other.termType && this.value === other.value;
+  } // ### Implement hashCode for Immutable.js, since we implement `equals`
+  // https://immutable-js.com/docs/v4.0.0/ValueObject/#hashCode()
+
+
+  hashCode() {
+    return 0;
   } // ### Returns a plain object representation of this term
 
 

package/lib/N3Lexer.js

@@ -109,7 +109,7 @@ class N3Lexer {
   _tokenizeToEnd(callback, inputFinished) {
     // Continue parsing as far as possible; the loop will return eventually
     let input = this._input;
-    const outputComments = this._comments;
+    let currentLineLength = input.length;
 
     while (true) {
       // Count and skip whitespace lines
@@ -117,14 +117,10 @@ class N3Lexer {
 
       while (whiteSpaceMatch = this._newline.exec(input)) {
         // Try to find a comment
-        if (outputComments && (comment = this._comment.exec(whiteSpaceMatch[0]))) callback(null, {
-          line: this._line,
-          type: 'comment',
-          value: comment[1],
-          prefix: ''
-        }); // Advance the input
+        if (this._comments && (comment = this._comment.exec(whiteSpaceMatch[0]))) emitToken('comment', comment[1], '', this._line, whiteSpaceMatch[0].length); // Advance the input
 
         input = input.substr(whiteSpaceMatch[0].length, input.length);
+        currentLineLength = input.length;
         this._line++;
       } // Skip whitespace on current line
 
@@ -135,18 +131,9 @@ class N3Lexer {
         // If the input is finished, emit EOF
         if (inputFinished) {
           // Try to find a final comment
-          if (outputComments && (comment = this._comment.exec(input))) callback(null, {
-            line: this._line,
-            type: 'comment',
-            value: comment[1],
-            prefix: ''
-          });
-          callback(input = null, {
-            line: this._line,
-            type: 'eof',
-            value: '',
-            prefix: ''
-          });
+          if (this._comments && (comment = this._comment.exec(input))) emitToken('comment', comment[1], '', this._line, input.length);
+          input = null;
+          emitToken('eof', '', '', this._line, 0);
         }
 
         return this._input = input;
@@ -376,17 +363,28 @@ class N3Lexer {
       } // Emit the parsed token
 
 
-      const token = {
-        line: line,
-        type: type,
-        value: value,
-        prefix: prefix
-      };
-      callback(null, token);
+      const length = matchLength || match[0].length;
+      const token = emitToken(type, value, prefix, line, length);
       this.previousToken = token;
       this._previousMarker = type; // Advance to next part to tokenize
 
-      input = input.substr(matchLength || match[0].length, input.length);
+      input = input.substr(length, input.length);
+    } // Emits the token through the callback
+
+
+    function emitToken(type, value, prefix, line, length) {
+      const start = input ? currentLineLength - input.length : currentLineLength;
+      const end = start + length;
+      const token = {
+        type,
+        value,
+        prefix,
+        line,
+        start,
+        end
+      };
+      callback(null, token);
+      return token;
     } // Signals the syntax error through the callback
 
 

package/lib/index.js

@@ -94,6 +94,7 @@ Object.defineProperty(exports, "Writer", {
     return _N3Writer.default;
   }
 });
+exports.default = void 0;
 Object.defineProperty(exports, "termFromId", {
   enumerable: true,
   get: function () {
@@ -129,4 +130,28 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Named exports
+// Export all named exports as a default object for backward compatibility
+var _default = {
+  Lexer: _N3Lexer.default,
+  Parser: _N3Parser.default,
+  Writer: _N3Writer.default,
+  Store: _N3Store.default,
+  StreamParser: _N3StreamParser.default,
+  StreamWriter: _N3StreamWriter.default,
+  Util,
+  DataFactory: _N3DataFactory.default,
+  Term: _N3DataFactory.Term,
+  NamedNode: _N3DataFactory.NamedNode,
+  Literal: _N3DataFactory.Literal,
+  BlankNode: _N3DataFactory.BlankNode,
+  Variable: _N3DataFactory.Variable,
+  DefaultGraph: _N3DataFactory.DefaultGraph,
+  Quad: _N3DataFactory.Quad,
+  Triple: _N3DataFactory.Triple,
+  termFromId: _N3DataFactory.termFromId,
+  termToId: _N3DataFactory.termToId
+};
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.12.2",
+  "version": "1.15.0",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -39,7 +39,7 @@
     "colors": "^1.1.2",
     "docco": "^0.8.0",
     "eslint": "^5.14.1",
-    "mocha": "^7.1.2",
+    "mocha": "^8.0.0",
     "nyc": "^14.1.1",
     "pre-commit": "^1.2.2",
     "rdf-test-suite": "^1.2.0",

package/src/N3DataFactory.js

@@ -35,12 +35,6 @@ export class Term {
     return this.id;
   }
 
-  // ### Implement hashCode for Immutable.js, since we implement `equals`
-  // https://immutable-js.com/docs/v4.0.0/ValueObject/#hashCode()
-  get hashCode() {
-    return 0;
-  }
-
   // ### Returns whether this object represents the same term as the other
   equals(other) {
     // If both terms were created by this library,
@@ -52,6 +46,12 @@ export class Term {
                       this.value    === other.value;
   }
 
+  // ### Implement hashCode for Immutable.js, since we implement `equals`
+  // https://immutable-js.com/docs/v4.0.0/ValueObject/#hashCode()
+  hashCode() {
+    return 0;
+  }
+
   // ### Returns a plain object representation of this term
   toJSON() {
     return {

package/src/N3Lexer.js

@@ -78,16 +78,17 @@ export default class N3Lexer {
   _tokenizeToEnd(callback, inputFinished) {
     // Continue parsing as far as possible; the loop will return eventually
     let input = this._input;
-    const outputComments = this._comments;
+    let currentLineLength = input.length;
     while (true) {
       // Count and skip whitespace lines
       let whiteSpaceMatch, comment;
       while (whiteSpaceMatch = this._newline.exec(input)) {
         // Try to find a comment
-        if (outputComments && (comment = this._comment.exec(whiteSpaceMatch[0])))
-          callback(null, { line: this._line, type: 'comment', value: comment[1], prefix: '' });
+        if (this._comments && (comment = this._comment.exec(whiteSpaceMatch[0])))
+          emitToken('comment', comment[1], '', this._line, whiteSpaceMatch[0].length);
         // Advance the input
         input = input.substr(whiteSpaceMatch[0].length, input.length);
+        currentLineLength = input.length;
         this._line++;
       }
       // Skip whitespace on current line
@@ -99,9 +100,10 @@ export default class N3Lexer {
         // If the input is finished, emit EOF
         if (inputFinished) {
           // Try to find a final comment
-          if (outputComments && (comment = this._comment.exec(input)))
-            callback(null, { line: this._line, type: 'comment', value: comment[1], prefix: '' });
-          callback(input = null, { line: this._line, type: 'eof', value: '', prefix: '' });
+          if (this._comments && (comment = this._comment.exec(input)))
+            emitToken('comment', comment[1], '', this._line, input.length);
+          input = null;
+          emitToken('eof', '', '', this._line, 0);
         }
         return this._input = input;
       }
@@ -345,14 +347,23 @@ export default class N3Lexer {
       }
 
       // Emit the parsed token
-      const token = { line: line, type: type, value: value, prefix: prefix };
-      callback(null, token);
+      const length = matchLength || match[0].length;
+      const token = emitToken(type, value, prefix, line, length);
       this.previousToken = token;
       this._previousMarker = type;
+
       // Advance to next part to tokenize
-      input = input.substr(matchLength || match[0].length, input.length);
+      input = input.substr(length, input.length);
     }
 
+    // Emits the token through the callback
+    function emitToken(type, value, prefix, line, length) {
+      const start = input ? currentLineLength - input.length : currentLineLength;
+      const end = start + length;
+      const token = { type, value, prefix, line, start, end };
+      callback(null, token);
+      return token;
+    }
     // Signals the syntax error through the callback
     function reportSyntaxError(self) { callback(self._syntaxError(/^\S*/.exec(input)[0])); }
   }

package/src/index.js

@@ -22,6 +22,7 @@ import {
   termToId,
 } from './N3DataFactory';
 
+// Named exports
 export {
   Lexer,
   Parser,
@@ -45,3 +46,28 @@ export {
   termFromId,
   termToId,
 };
+
+// Export all named exports as a default object for backward compatibility
+export default {
+  Lexer,
+  Parser,
+  Writer,
+  Store,
+  StreamParser,
+  StreamWriter,
+  Util,
+
+  DataFactory,
+
+  Term,
+  NamedNode,
+  Literal,
+  BlankNode,
+  Variable,
+  DefaultGraph,
+  Quad,
+  Triple,
+
+  termFromId,
+  termToId,
+};