n3 1.24.2 → 1.25.0

package/lib/BaseIRI.js

@@ -0,0 +1,134 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+class BaseIRI {
+  constructor(iri) {
+    if (iri.startsWith('file://')) {
+      // Base IRIs starting with file:// are not supported. Silently fail.
+      return;
+    }
+
+    // Generate regex for baseIRI with optional groups for segments
+    // Stage 0: find the first scheme delimiter -> stage 1
+    // Stage 1: find the next /, ?, or #. '/' -> new segment -> stage 1, '?' -> stage 2, '#' -> update end to position before hash -> stage 3, none -> stage 3
+    // Stage 2: find the next #. '#' -> update end to position before hash -> stage 3, none -> stage 3
+    // Stage 3: find the end of the string, add '$' to this last segment
+    this._baseSubstitutions = {};
+    let baseIRIRegex = '';
+    let segmentsCount = 0;
+    let stage = 0;
+    const slashPositions = [];
+    let i = 0;
+    let containsQuery = false;
+    // Stage 0
+    const match = /:\/{0,2}/.exec(iri);
+    if (match) {
+      baseIRIRegex += escapeRegex(iri.substring(0, match.index + match[0].length));
+      i = match.index + match[0].length;
+      stage = 1;
+    } else {
+      // Base IRI should contain a scheme followed by its delimiter (e.g., http://). Silently fail.
+      return;
+    }
+    if (/\/\.{0,2}\//.test(iri.substring(i))) {
+      // Base IRIs containing `//`, `/./`, or `/../` are not supported. Silently fail.
+      return;
+    }
+    let end = iri.length;
+    while (stage === 1 && i < end) {
+      // Stage 1
+      const match = /[/?#]/.exec(iri.substring(i));
+      if (match) {
+        if (match[0] === '#') {
+          // Stop at this hash.
+          end = i + match.index;
+          stage = 3;
+        } else {
+          baseIRIRegex += escapeRegex(iri.substring(i, i + match.index + 1));
+          baseIRIRegex += '(';
+          segmentsCount++;
+          if (match[0] === '/') {
+            slashPositions.push(i + match.index);
+          } else {
+            this._baseSubstitutions[i + match.index] = '?';
+            containsQuery = true;
+            stage = 2;
+          }
+          i += match.index + 1;
+        }
+      } else {
+        stage = 3;
+      }
+    }
+    if (stage === 2) {
+      // Stage 2
+      const match = /#/.exec(iri.substring(i));
+      if (match) {
+        // Stop at this hash.
+        end = i + match.index;
+      }
+      stage = 3;
+    }
+    if (stage === 3) {
+      // Stage 3
+      baseIRIRegex += escapeRegex(iri.substring(i, end));
+      if (containsQuery) {
+        baseIRIRegex += '(#|$)';
+      } else {
+        baseIRIRegex += '([?#]|$)';
+      }
+      i = end;
+    }
+
+    // Complete the optional groups for the segments
+    baseIRIRegex += ')?'.repeat(segmentsCount);
+
+    // Precalculate the rest of the substitutions
+    if (this._baseSubstitutions[end - 1] === undefined) {
+      this._baseSubstitutions[end - 1] = '';
+    }
+    for (let i = 0; i < slashPositions.length; i++) {
+      this._baseSubstitutions[slashPositions[i]] = '../'.repeat(slashPositions.length - i - 1);
+    }
+    this._baseSubstitutions[slashPositions[slashPositions.length - 1]] = './';
+
+    // Set the baseMatcher
+    this._baseMatcher = new RegExp(baseIRIRegex);
+    this._baseLength = end;
+    this.value = iri.substring(0, end);
+  }
+  toRelative(iri) {
+    if (iri.startsWith('file://')) {
+      return iri;
+    }
+    const delimiterMatch = /:\/{0,2}/.exec(iri);
+    if (!delimiterMatch || /\/\.{0,2}\//.test(iri.substring(delimiterMatch.index + delimiterMatch[0].length))) {
+      return iri;
+    }
+    const match = this._baseMatcher.exec(iri);
+    if (!match) {
+      return iri;
+    }
+    const length = match[0].length;
+    if (length === this._baseLength && length === iri.length) {
+      return '';
+    }
+    let substitution = this._baseSubstitutions[length - 1];
+    if (substitution !== undefined) {
+      const substr = iri.substring(length);
+      if (substitution === './' && substr && (!substr.startsWith('#') && !substr.startsWith('?') || length === this._baseLength)) {
+        substitution = '';
+      }
+      return substitution + substr;
+    }
+    // Matched the [?#], so make sure to add the delimiter
+    return iri.substring(length - 1);
+  }
+}
+exports.default = BaseIRI;
+function escapeRegex(regex) {
+  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+}

package/lib/N3Lexer.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _buffer = require("buffer");
-var _queueMicrotask = _interopRequireDefault(require("queue-microtask"));
 var _IRIs = _interopRequireDefault(require("./IRIs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // **N3Lexer** tokenizes N3 documents.
@@ -475,7 +474,7 @@ class N3Lexer {
     if (typeof input === 'string') {
       this._input = this._readStartingBom(input);
       // If a callback was passed, asynchronously call it
-      if (typeof callback === 'function') (0, _queueMicrotask.default)(() => this._tokenizeToEnd(callback, true));
+      if (typeof callback === 'function') queueMicrotask(() => this._tokenizeToEnd(callback, true));
       // If no callback was passed, tokenize synchronously and return
       else {
         const tokens = [];

package/lib/N3Writer.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _IRIs = _interopRequireDefault(require("./IRIs"));
 var _N3DataFactory = _interopRequireWildcard(require("./N3DataFactory"));
 var _N3Util = require("./N3Util");
+var _BaseIRI = _interopRequireDefault(require("./BaseIRI"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -77,8 +78,7 @@ class N3Writer {
       this._prefixIRIs = Object.create(null);
       options.prefixes && this.addPrefixes(options.prefixes);
       if (options.baseIRI) {
-        this._baseMatcher = new RegExp(`^${escapeRegex(options.baseIRI)}${options.baseIRI.endsWith('/') ? '' : '[#?]'}`);
-        this._baseLength = options.baseIRI.length;
+        this._baseIri = new _BaseIRI.default(options.baseIRI);
       }
     } else {
       this._lineMode = true;
@@ -156,7 +156,9 @@ class N3Writer {
     }
     let iri = entity.value;
     // Use relative IRIs if requested and possible
-    if (this._baseMatcher && this._baseMatcher.test(iri)) iri = iri.substr(this._baseLength);
+    if (this._baseIri) {
+      iri = this._baseIri.toRelative(iri);
+    }
     // Escape special characters
     if (escape.test(iri)) iri = iri.replace(escapeAll, characterReplacer);
     // Try to represent the IRI as prefixed name

package/lib/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "BaseIRI", {
+  enumerable: true,
+  get: function () {
+    return _BaseIRI.default;
+  }
+});
 Object.defineProperty(exports, "BlankNode", {
   enumerable: true,
   get: function () {
@@ -141,6 +147,7 @@ var _N3StreamParser = _interopRequireDefault(require("./N3StreamParser"));
 var _N3StreamWriter = _interopRequireDefault(require("./N3StreamWriter"));
 var Util = _interopRequireWildcard(require("./N3Util"));
 exports.Util = Util;
+var _BaseIRI = _interopRequireDefault(require("./BaseIRI"));
 var _N3DataFactory = _interopRequireWildcard(require("./N3DataFactory"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -158,6 +165,7 @@ var _default = exports.default = {
   StreamWriter: _N3StreamWriter.default,
   Util,
   Reasoner: _N3Reasoner.default,
+  BaseIRI: _BaseIRI.default,
   DataFactory: _N3DataFactory.default,
   Term: _N3DataFactory.Term,
   NamedNode: _N3DataFactory.NamedNode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.24.2",
+  "version": "1.25.0",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -25,7 +25,6 @@
   ],
   "dependencies": {
     "buffer": "^6.0.3",
-    "queue-microtask": "^1.1.2",
     "readable-stream": "^4.0.0"
   },
   "devDependencies": {

package/src/BaseIRI.js

@@ -0,0 +1,136 @@
+export default class BaseIRI {
+  constructor(iri) {
+    if (iri.startsWith('file://')) {
+      // Base IRIs starting with file:// are not supported. Silently fail.
+      return;
+    }
+
+    // Generate regex for baseIRI with optional groups for segments
+    // Stage 0: find the first scheme delimiter -> stage 1
+    // Stage 1: find the next /, ?, or #. '/' -> new segment -> stage 1, '?' -> stage 2, '#' -> update end to position before hash -> stage 3, none -> stage 3
+    // Stage 2: find the next #. '#' -> update end to position before hash -> stage 3, none -> stage 3
+    // Stage 3: find the end of the string, add '$' to this last segment
+    this._baseSubstitutions = {};
+    let baseIRIRegex = '';
+    let segmentsCount = 0;
+    let stage = 0;
+    const slashPositions = [];
+    let i = 0;
+    let containsQuery = false;
+    // Stage 0
+    const match = /:\/{0,2}/.exec(iri);
+    if (match) {
+      baseIRIRegex += escapeRegex(iri.substring(0, match.index + match[0].length));
+      i = match.index + match[0].length;
+      stage = 1;
+    }
+    else {
+      // Base IRI should contain a scheme followed by its delimiter (e.g., http://). Silently fail.
+      return;
+    }
+
+    if (/\/\.{0,2}\//.test(iri.substring(i))) {
+      // Base IRIs containing `//`, `/./`, or `/../` are not supported. Silently fail.
+      return;
+    }
+
+    let end = iri.length;
+    while (stage === 1 && i < end) {
+      // Stage 1
+      const match = /[/?#]/.exec(iri.substring(i));
+      if (match) {
+        if (match[0] === '#') {
+          // Stop at this hash.
+          end = i + match.index;
+          stage = 3;
+        }
+        else {
+          baseIRIRegex += escapeRegex(iri.substring(i, i + match.index + 1));
+          baseIRIRegex += '(';
+          segmentsCount++;
+          if (match[0] === '/') {
+            slashPositions.push(i + match.index);
+          }
+          else {
+            this._baseSubstitutions[i + match.index] = '?';
+            containsQuery = true;
+            stage = 2;
+          }
+          i += match.index + 1;
+        }
+      }
+      else {
+        stage = 3;
+      }
+    }
+    if (stage === 2) {
+      // Stage 2
+      const match = /#/.exec(iri.substring(i));
+      if (match) {
+        // Stop at this hash.
+        end = i + match.index;
+      }
+      stage = 3;
+    }
+    if (stage === 3) {
+      // Stage 3
+      baseIRIRegex += escapeRegex(iri.substring(i, end));
+      if (containsQuery) {
+        baseIRIRegex += '(#|$)';
+      }
+      else {
+        baseIRIRegex += '([?#]|$)';
+      }
+      i = end;
+    }
+
+    // Complete the optional groups for the segments
+    baseIRIRegex += ')?'.repeat(segmentsCount);
+
+    // Precalculate the rest of the substitutions
+    if (this._baseSubstitutions[end - 1] === undefined) {
+      this._baseSubstitutions[end - 1] = '';
+    }
+    for (let i = 0; i < slashPositions.length; i++) {
+      this._baseSubstitutions[slashPositions[i]] = '../'.repeat(slashPositions.length - i - 1);
+    }
+    this._baseSubstitutions[slashPositions[slashPositions.length - 1]] = './';
+
+    // Set the baseMatcher
+    this._baseMatcher = new RegExp(baseIRIRegex);
+    this._baseLength = end;
+    this.value = iri.substring(0, end);
+  }
+
+  toRelative(iri) {
+    if (iri.startsWith('file://')) {
+      return iri;
+    }
+    const delimiterMatch = /:\/{0,2}/.exec(iri);
+    if (!delimiterMatch || /\/\.{0,2}\//.test(iri.substring(delimiterMatch.index + delimiterMatch[0].length))) {
+      return iri;
+    }
+    const match = this._baseMatcher.exec(iri);
+    if (!match) {
+      return iri;
+    }
+    const length = match[0].length;
+    if (length === this._baseLength && length === iri.length) {
+      return '';
+    }
+    let substitution = this._baseSubstitutions[length - 1];
+    if (substitution !== undefined) {
+      const substr = iri.substring(length);
+      if (substitution === './' && substr && ((!substr.startsWith('#') && !substr.startsWith('?')) || length === this._baseLength)) {
+        substitution = '';
+      }
+      return substitution + substr;
+    }
+    // Matched the [?#], so make sure to add the delimiter
+    return iri.substring(length - 1);
+  }
+}
+
+function escapeRegex(regex) {
+  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+}

package/src/N3Lexer.js

@@ -1,6 +1,5 @@
 // **N3Lexer** tokenizes N3 documents.
 import { Buffer } from 'buffer';
-import queueMicrotask from 'queue-microtask';
 import namespaces from './IRIs';
 
 const { xsd } = namespaces;

package/src/N3Writer.js

@@ -2,6 +2,7 @@
 import namespaces from './IRIs';
 import { default as N3DataFactory, Term } from './N3DataFactory';
 import { isDefaultGraph } from './N3Util';
+import BaseIRI from './BaseIRI';
 
 const DEFAULTGRAPH = N3DataFactory.defaultGraph();
 
@@ -58,9 +59,7 @@ export default class N3Writer {
       this._prefixIRIs = Object.create(null);
       options.prefixes && this.addPrefixes(options.prefixes);
       if (options.baseIRI) {
-        this._baseMatcher = new RegExp(`^${escapeRegex(options.baseIRI)
-            }${options.baseIRI.endsWith('/') ? '' : '[#?]'}`);
-        this._baseLength = options.baseIRI.length;
+        this._baseIri = new BaseIRI(options.baseIRI);
       }
     }
     else {
@@ -153,8 +152,9 @@ export default class N3Writer {
     }
     let iri = entity.value;
     // Use relative IRIs if requested and possible
-    if (this._baseMatcher && this._baseMatcher.test(iri))
-      iri = iri.substr(this._baseLength);
+    if (this._baseIri) {
+      iri = this._baseIri.toRelative(iri);
+    }
     // Escape special characters
     if (escape.test(iri))
       iri = iri.replace(escapeAll, characterReplacer);

package/src/index.js

@@ -7,6 +7,7 @@ import Reasoner, { getRulesFromDataset } from './N3Reasoner';
 import StreamParser from './N3StreamParser';
 import StreamWriter from './N3StreamWriter';
 import * as Util from './N3Util';
+import BaseIRI from './BaseIRI';
 
 import {
   default as DataFactory,
@@ -36,6 +37,7 @@ export {
   StreamWriter,
   Util,
   Reasoner,
+  BaseIRI,
 
   DataFactory,
 
@@ -65,6 +67,7 @@ export default {
   StreamWriter,
   Util,
   Reasoner,
+  BaseIRI,
 
   DataFactory,