n3 1.24.2 → 1.25.1

package/lib/BaseIRI.js

@@ -0,0 +1,96 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Util = require("./Util");
+// Do not handle base IRIs without scheme, and currently unsupported cases:
+// - file: IRIs (which could also use backslashes)
+// - IRIs containing /. or /.. or //
+const INVALID_OR_UNSUPPORTED = /^:?[^:?#]*(?:[?#]|$)|^file:|^[^:]*:\/*[^?#]+?\/(?:\.\.?(?:\/|$)|\/)/i;
+const CURRENT = './';
+const PARENT = '../';
+const QUERY = '?';
+const FRAGMENT = '#';
+class BaseIRI {
+  constructor(base) {
+    this.base = base;
+    this._baseLength = 0;
+    this._baseMatcher = null;
+    this._pathReplacements = new Array(base.length + 1);
+  }
+  static supports(base) {
+    return !INVALID_OR_UNSUPPORTED.test(base);
+  }
+  _getBaseMatcher() {
+    if (this._baseMatcher) return this._baseMatcher;
+    if (!BaseIRI.supports(this.base)) return this._baseMatcher = /.^/;
+
+    // Extract the scheme
+    const scheme = /^[^:]*:\/*/.exec(this.base)[0];
+    const regexHead = ['^', (0, _Util.escapeRegex)(scheme)];
+    const regexTail = [];
+
+    // Generate a regex for every path segment
+    const segments = [],
+      segmenter = /[^/?#]*([/?#])/y;
+    let segment,
+      query = 0,
+      fragment = 0,
+      last = segmenter.lastIndex = scheme.length;
+    while (!query && !fragment && (segment = segmenter.exec(this.base))) {
+      // Truncate base resolution path at fragment start
+      if (segment[1] === FRAGMENT) fragment = segmenter.lastIndex - 1;else {
+        // Create regex that matches the segment
+        regexHead.push((0, _Util.escapeRegex)(segment[0]), '(?:');
+        regexTail.push(')?');
+
+        // Create dedicated query string replacement
+        if (segment[1] !== QUERY) segments.push(last = segmenter.lastIndex);else {
+          query = last = segmenter.lastIndex;
+          fragment = this.base.indexOf(FRAGMENT, query);
+          this._pathReplacements[query] = QUERY;
+        }
+      }
+    }
+
+    // Precalculate parent path substitutions
+    for (let i = 0; i < segments.length; i++) this._pathReplacements[segments[i]] = PARENT.repeat(segments.length - i - 1);
+    this._pathReplacements[segments[segments.length - 1]] = CURRENT;
+
+    // Add the remainder of the base IRI (without fragment) to the regex
+    this._baseLength = fragment > 0 ? fragment : this.base.length;
+    regexHead.push((0, _Util.escapeRegex)(this.base.substring(last, this._baseLength)), query ? '(?:#|$)' : '(?:[?#]|$)');
+    return this._baseMatcher = new RegExp([...regexHead, ...regexTail].join(''));
+  }
+  toRelative(iri) {
+    // Unsupported or non-matching base IRI
+    const match = this._getBaseMatcher().exec(iri);
+    if (!match) return iri;
+
+    // Exact base IRI match
+    const length = match[0].length;
+    if (length === this._baseLength && length === iri.length) return '';
+
+    // Parent path match
+    const parentPath = this._pathReplacements[length];
+    if (parentPath) {
+      const suffix = iri.substring(length);
+      // Don't abbreviate unsupported path
+      if (parentPath !== QUERY && /(?:^|\/)(?:\/|..?(?:[/#?]|$))/.test(suffix) &&
+      // fast test
+      /^(?:[^#?]*?\/)?(?:\/|\.\.?(?:[/#?]|$))/.test(suffix))
+        // rigorous test
+        return iri;
+      // Omit ./ with fragment or query string
+      if (parentPath === CURRENT && /^[^?#]/.test(suffix)) return suffix;
+      // Append suffix to relative parent path
+      return parentPath + suffix;
+    }
+
+    // Fragment or query string, so include delimiter
+    return iri.substring(length - 1);
+  }
+}
+exports.default = BaseIRI;

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,8 @@ exports.default = void 0;
 var _IRIs = _interopRequireDefault(require("./IRIs"));
 var _N3DataFactory = _interopRequireWildcard(require("./N3DataFactory"));
 var _N3Util = require("./N3Util");
+var _BaseIRI = _interopRequireDefault(require("./BaseIRI"));
+var _Util = require("./Util");
 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 +79,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 +157,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
@@ -283,7 +286,7 @@ class N3Writer {
         IRIlist += IRIlist ? `|${prefixIRI}` : prefixIRI;
         prefixList += (prefixList ? '|' : '') + this._prefixIRIs[prefixIRI];
       }
-      IRIlist = escapeRegex(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+      IRIlist = (0, _Util.escapeRegex)(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
       this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` + `^(${IRIlist})([_a-zA-Z0-9][\\-_a-zA-Z0-9]*)$`);
     }
     // End a prefix block with a newline
@@ -379,7 +382,4 @@ function characterReplacer(character) {
     }
   }
   return result;
-}
-function escapeRegex(regex) {
-  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
 }

package/lib/Util.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.escapeRegex = escapeRegex;
+function escapeRegex(regex) {
+  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+}

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.1",
   "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,102 @@
+import { escapeRegex } from './Util';
+
+// Do not handle base IRIs without scheme, and currently unsupported cases:
+// - file: IRIs (which could also use backslashes)
+// - IRIs containing /. or /.. or //
+const INVALID_OR_UNSUPPORTED = /^:?[^:?#]*(?:[?#]|$)|^file:|^[^:]*:\/*[^?#]+?\/(?:\.\.?(?:\/|$)|\/)/i;
+const CURRENT = './';
+const PARENT = '../';
+const QUERY = '?';
+const FRAGMENT = '#';
+
+export default class BaseIRI {
+  constructor(base) {
+    this.base = base;
+    this._baseLength = 0;
+    this._baseMatcher = null;
+    this._pathReplacements = new Array(base.length + 1);
+  }
+
+  static supports(base) {
+    return !INVALID_OR_UNSUPPORTED.test(base);
+  }
+
+  _getBaseMatcher() {
+    if (this._baseMatcher)
+      return this._baseMatcher;
+    if (!BaseIRI.supports(this.base))
+      return this._baseMatcher = /.^/;
+
+    // Extract the scheme
+    const scheme = /^[^:]*:\/*/.exec(this.base)[0];
+    const regexHead = ['^', escapeRegex(scheme)];
+    const regexTail = [];
+
+    // Generate a regex for every path segment
+    const segments = [], segmenter = /[^/?#]*([/?#])/y;
+    let segment, query = 0, fragment = 0, last = segmenter.lastIndex = scheme.length;
+    while (!query && !fragment && (segment = segmenter.exec(this.base))) {
+      // Truncate base resolution path at fragment start
+      if (segment[1] === FRAGMENT)
+        fragment = segmenter.lastIndex - 1;
+      else {
+        // Create regex that matches the segment
+        regexHead.push(escapeRegex(segment[0]), '(?:');
+        regexTail.push(')?');
+
+        // Create dedicated query string replacement
+        if (segment[1] !== QUERY)
+          segments.push(last = segmenter.lastIndex);
+        else {
+          query = last = segmenter.lastIndex;
+          fragment = this.base.indexOf(FRAGMENT, query);
+          this._pathReplacements[query] = QUERY;
+        }
+      }
+    }
+
+    // Precalculate parent path substitutions
+    for (let i = 0; i < segments.length; i++)
+      this._pathReplacements[segments[i]] = PARENT.repeat(segments.length - i - 1);
+    this._pathReplacements[segments[segments.length - 1]] = CURRENT;
+
+    // Add the remainder of the base IRI (without fragment) to the regex
+    this._baseLength = fragment > 0 ? fragment : this.base.length;
+    regexHead.push(
+      escapeRegex(this.base.substring(last, this._baseLength)),
+      query ? '(?:#|$)' : '(?:[?#]|$)',
+    );
+    return this._baseMatcher = new RegExp([...regexHead, ...regexTail].join(''));
+  }
+
+  toRelative(iri) {
+    // Unsupported or non-matching base IRI
+    const match = this._getBaseMatcher().exec(iri);
+    if (!match)
+      return iri;
+
+    // Exact base IRI match
+    const length = match[0].length;
+    if (length === this._baseLength && length === iri.length)
+      return '';
+
+    // Parent path match
+    const parentPath = this._pathReplacements[length];
+    if (parentPath) {
+      const suffix = iri.substring(length);
+      // Don't abbreviate unsupported path
+      if (parentPath !== QUERY &&
+        /(?:^|\/)(?:\/|..?(?:[/#?]|$))/.test(suffix) && // fast test
+        /^(?:[^#?]*?\/)?(?:\/|\.\.?(?:[/#?]|$))/.test(suffix)) // rigorous test
+        return iri;
+      // Omit ./ with fragment or query string
+      if (parentPath === CURRENT && /^[^?#]/.test(suffix))
+        return suffix;
+      // Append suffix to relative parent path
+      return parentPath + suffix;
+    }
+
+    // Fragment or query string, so include delimiter
+    return iri.substring(length - 1);
+  }
+}

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,8 @@
 import namespaces from './IRIs';
 import { default as N3DataFactory, Term } from './N3DataFactory';
 import { isDefaultGraph } from './N3Util';
+import BaseIRI from './BaseIRI';
+import { escapeRegex } from './Util';
 
 const DEFAULTGRAPH = N3DataFactory.defaultGraph();
 
@@ -58,9 +60,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 +153,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);
@@ -394,7 +395,3 @@ function characterReplacer(character) {
   }
   return result;
 }
-
-function escapeRegex(regex) {
-  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
-}

package/src/Util.js

@@ -0,0 +1,3 @@
+export function escapeRegex(regex) {
+  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+}

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,