n3 1.25.1 → 1.26.0

package/lib/BaseIRI.js

@@ -8,7 +8,8 @@ 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 BASE_UNSUPPORTED = /^:?[^:?#]*(?:[?#]|$)|^file:|^[^:]*:\/*[^?#]+?\/(?:\.\.?(?:\/|$)|\/)/i;
+const SUFFIX_SUPPORTED = /^(?:(?:[^/?#]{3,}|\.?[^/?#.]\.?)(?:\/[^/?#]{3,}|\.?[^/?#.]\.?)*\/?)?(?:[?#]|$)/;
 const CURRENT = './';
 const PARENT = '../';
 const QUERY = '?';
@@ -21,7 +22,7 @@ class BaseIRI {
     this._pathReplacements = new Array(base.length + 1);
   }
   static supports(base) {
-    return !INVALID_OR_UNSUPPORTED.test(base);
+    return !BASE_UNSUPPORTED.test(base);
   }
   _getBaseMatcher() {
     if (this._baseMatcher) return this._baseMatcher;
@@ -78,11 +79,7 @@ class BaseIRI {
     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;
+      if (parentPath !== QUERY && !SUFFIX_SUPPORTED.test(suffix)) return iri;
       // Omit ./ with fragment or query string
       if (parentPath === CURRENT && /^[^?#]/.test(suffix)) return suffix;
       // Append suffix to relative parent path

package/lib/N3Store.js

@@ -10,8 +10,7 @@ var _IRIs = _interopRequireDefault(require("./IRIs"));
 var _N3Util = require("./N3Util");
 var _N3Writer = _interopRequireDefault(require("./N3Writer"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // **N3Store** objects store N3 quads by graph in memory.
 
 const ITERATOR = Symbol('iter');

package/lib/N3Util.js

@@ -8,6 +8,7 @@ exports.isBlankNode = isBlankNode;
 exports.isDefaultGraph = isDefaultGraph;
 exports.isLiteral = isLiteral;
 exports.isNamedNode = isNamedNode;
+exports.isQuad = isQuad;
 exports.isVariable = isVariable;
 exports.prefix = prefix;
 exports.prefixes = prefixes;
@@ -35,6 +36,11 @@ function isVariable(term) {
   return !!term && term.termType === 'Variable';
 }
 
+// Tests whether the given term represents a quad
+function isQuad(term) {
+  return !!term && term.termType === 'Quad';
+}
+
 // Tests whether the given term represents the default graph
 function isDefaultGraph(term) {
   return !!term && term.termType === 'DefaultGraph';

package/lib/N3Writer.js

@@ -9,8 +9,7 @@ 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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // **N3Writer** writes N3 documents.
 

package/lib/index.js

@@ -149,8 +149,7 @@ 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; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Named exports
 // Export all named exports as a default object for backward compatibility

package/package.json

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

package/src/BaseIRI.js

@@ -3,7 +3,8 @@ 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 BASE_UNSUPPORTED = /^:?[^:?#]*(?:[?#]|$)|^file:|^[^:]*:\/*[^?#]+?\/(?:\.\.?(?:\/|$)|\/)/i;
+const SUFFIX_SUPPORTED = /^(?:(?:[^/?#]{3,}|\.?[^/?#.]\.?)(?:\/[^/?#]{3,}|\.?[^/?#.]\.?)*\/?)?(?:[?#]|$)/;
 const CURRENT = './';
 const PARENT = '../';
 const QUERY = '?';
@@ -18,7 +19,7 @@ export default class BaseIRI {
   }
 
   static supports(base) {
-    return !INVALID_OR_UNSUPPORTED.test(base);
+    return !BASE_UNSUPPORTED.test(base);
   }
 
   _getBaseMatcher() {
@@ -85,9 +86,7 @@ export default class BaseIRI {
     if (parentPath) {
       const suffix = iri.substring(length);
       // Don't abbreviate unsupported path
-      if (parentPath !== QUERY &&
-        /(?:^|\/)(?:\/|..?(?:[/#?]|$))/.test(suffix) && // fast test
-        /^(?:[^#?]*?\/)?(?:\/|\.\.?(?:[/#?]|$))/.test(suffix)) // rigorous test
+      if (parentPath !== QUERY && !SUFFIX_SUPPORTED.test(suffix))
         return iri;
       // Omit ./ with fragment or query string
       if (parentPath === CURRENT && /^[^?#]/.test(suffix))

package/src/N3Util.js

@@ -22,6 +22,11 @@ export function isVariable(term) {
   return !!term && term.termType === 'Variable';
 }
 
+// Tests whether the given term represents a quad
+export function isQuad(term) {
+  return !!term && term.termType === 'Quad';
+}
+
 // Tests whether the given term represents the default graph
 export function isDefaultGraph(term) {
   return !!term && term.termType === 'DefaultGraph';