n3 2.11.0 → 2.11.2

package/lib/N3Parser.js

@@ -24,7 +24,7 @@ class N3Parser {
     options.factory && initDataFactory(this, options.factory);
 
     // Set supported features depending on the format
-    const format = typeof options.format === 'string' ? options.format.match(/\w*$/)[0].toLowerCase() : '',
+    const format = typeof options.format === 'string' ? options.format.match(/(?:^|\W)(\w*)$/)[1].toLowerCase() : '',
       isTurtle = /turtle/.test(format),
       isTriG = /trig/.test(format),
       isNTriples = /triple/.test(format),
@@ -87,7 +87,9 @@ class N3Parser {
       if (fragmentPos >= 0) baseIRI = baseIRI.substr(0, fragmentPos);
       // Set base IRI and its components
       this._base = baseIRI;
-      this._basePath = baseIRI.indexOf('/') < 0 ? baseIRI : baseIRI.replace(/[^\/?]*(?:\?.*)?$/, '');
+      const queryPos = baseIRI.indexOf('?');
+      const path = queryPos < 0 ? baseIRI : baseIRI.substr(0, queryPos);
+      this._basePath = baseIRI.indexOf('/') < 0 ? baseIRI : path.substr(0, path.lastIndexOf('/') + 1);
       baseIRI = baseIRI.match(/^(?:([a-z][a-z0-9+.-]*:))?(?:\/\/[^\/]*)?/i);
       this._baseRoot = baseIRI[0];
       this._baseScheme = baseIRI[1];
@@ -117,14 +119,15 @@ class N3Parser {
       inverse: this._inversePredicate,
       expectOf: this._expectOf,
       blankPrefix: this._prefixes._,
-      quantified: this._quantified,
+      prefixChanges: this._prefixChanges,
+      quantifiedChanges: this._quantifiedChanges,
       emptyFormula: this._emptyFormula
     };
-    // Prefix and base declarations are scoped to their formula
+    // Prefix and base declarations are scoped to their formula,
+    // so record prefix changes to undo them when the formula ends
     if (type === 'formula') {
-      context.prefixes = this._prefixes;
       context.base = [this._base, this._basePath, this._baseRoot, this._baseScheme];
-      this._prefixes = Object.create(this._prefixes);
+      this._prefixChanges = [];
     }
     this._contextStack.push(context);
     // Every new scope resets the predicate direction
@@ -137,7 +140,7 @@ class N3Parser {
       // Label the scope with the enclosing formula's blank node
       // (using a dot as separator, as a blank node label cannot start with it)
       this._prefixes._ = this._graph ? `${this._graph.value}.` : '.';
-      this._quantified = Object.create(this._quantified);
+      this._quantifiedChanges = [];
     }
     // A formula starts empty and must not inherit its parent's subject
     if (type === 'formula') {
@@ -163,11 +166,16 @@ class N3Parser {
     if (this._n3Mode) {
       this._inversePredicate = context.inverse;
       this._expectOf = context.expectOf;
-      if (type === 'formula') {
-        this._prefixes = context.prefixes;
-        [this._base, this._basePath, this._baseRoot, this._baseScheme] = context.base;
-      } else this._prefixes._ = context.blankPrefix;
-      this._quantified = context.quantified;
+      if (type === 'formula') [this._base, this._basePath, this._baseRoot, this._baseScheme] = context.base;
+      if (this._prefixChanges !== context.prefixChanges) {
+        undoChanges(this._prefixes, this._prefixChanges);
+        this._prefixChanges = context.prefixChanges;
+      }
+      this._prefixes._ = context.blankPrefix;
+      if (this._quantifiedChanges !== context.quantifiedChanges) {
+        undoChanges(this._quantified, this._quantifiedChanges);
+        this._quantifiedChanges = context.quantifiedChanges;
+      }
       this._emptyFormula = context.emptyFormula;
     }
   }
@@ -976,6 +984,7 @@ class N3Parser {
   _readPrefixIRI(token) {
     if (token.type !== 'IRI') return this._error(`Expected IRI to follow prefix "${this._prefix}:"`, token);
     const prefixNode = this._readEntity(token);
+    if (this._prefixChanges !== null) this._prefixChanges.push(this._prefix, this._prefixes[this._prefix]);
     this._prefixes[this._prefix] = prefixNode.value;
     this._prefixCallback(this._prefix, prefixNode);
     return this._readDeclarationPunctuation;
@@ -1046,7 +1055,10 @@ class N3Parser {
         return this._error(`Unexpected ${token.type}`, token);
     }
     // Without explicit quantifiers, map entities to a quantified entity
-    if (!this._explicitQuantifiers) this._quantified[entity.id] = this._factory[this._quantifier](this._factory.blankNode().value);
+    if (!this._explicitQuantifiers) {
+      if (this._quantifiedChanges !== null) this._quantifiedChanges.push(entity.id, this._quantified[entity.id]);
+      this._quantified[entity.id] = this._factory[this._quantifier](this._factory.blankNode().value);
+    }
     // With explicit quantifiers, output the reified quantifier
     else {
       // If this is the first item, start a new quantifier list
@@ -1407,7 +1419,10 @@ class N3Parser {
         return this._base + iri;
       // Resolve relative query string IRIs by replacing the query string
       case '?':
-        return this._base.replace(/(?:\?.*)?$/, iri);
+        {
+          const queryPos = this._base.indexOf('?');
+          return (queryPos < 0 ? this._base : this._base.substr(0, queryPos)) + iri;
+        }
       // Resolve root-relative IRIs at the root of the base IRI
       case '/':
         // Resolve scheme-relative IRIs to the scheme
@@ -1513,6 +1528,9 @@ class N3Parser {
     this._inversePredicate = false;
     this._expectOf = false;
     this._quantified = Object.create(null);
+    // Changes to prefixes and quantifiers in nested scopes, to undo when leaving them
+    this._prefixChanges = null;
+    this._quantifiedChanges = null;
     this._emptyFormula = false;
     let readToken = token => {
       return this._readCallback = this._readCallback(token);
@@ -1569,8 +1587,15 @@ class N3Parser {
   }
 }
 
-// The empty function
+// ### `undoChanges` restores the entries of a map from a list of key and previous value pairs
 exports.default = N3Parser;
+function undoChanges(map, changes) {
+  for (let i = changes.length - 2; i >= 0; i -= 2) {
+    if (changes[i + 1] === undefined) delete map[changes[i]];else map[changes[i]] = changes[i + 1];
+  }
+}
+
+// The empty function
 function noop() {}
 
 // Initializes the parser with the given data factory

package/lib/N3Store.js

@@ -37,7 +37,10 @@ function merge(target, source, depth = 4) {
     if (!(key in target)) {
       size++;
       target[key] = depth === 0 ? null : merge(Object.create(null), source[key], depth - 1);
-    } else if (depth !== 0) target[key] = merge(target[key], source[key], depth - 1);
+    }
+    // Merge into the existing object in place,
+    // as graph objects are frozen and cannot be reassigned
+    else if (depth !== 0) merge(target[key], source[key], depth - 1);
   }
   // Depth 2 is the level of the `subjects`, `predicates`, and `objects` indexes.
   if (depth <= 2) target[SIZE] = size;
@@ -945,16 +948,20 @@ class N3Store {
         }
 
         // Store the list item and continue with parent
-        if (!first) malformed = onError(current, 'has no list head');else items.unshift(first.object);
+        if (!first) malformed = onError(current, 'has no list head');else items.push(first.object);
         current = parent && parent.subject;
       }
 
       // Don't remove any quads if the list is malformed
       if (malformed) remove = false;else {
+        // Items were collected from the tail to the head
+        items.reverse();
         // Store the list under the value of its head
         if (head) lists[head[headPos].value] = items;
         // Leave lists with extra arcs fully intact; otherwise queue this list once.
-        if (remove && !extraArcs) toRemove.push(...listQuads);
+        if (remove && !extraArcs) {
+          for (let i = 0; i < listQuads.length; i++) toRemove.push(listQuads[i]);
+        }
       }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -60,33 +60,17 @@
     "test": "jest",
     "lint": "eslint src perf test spec",
     "prepare": "npm run build",
-    "spec": "npm run spec-1-1 && npm run spec-1-2 && npm run spec-n3",
-    "spec-1-1": "npm run spec-1-1-turtle && npm run spec-1-1-ntriples && npm run spec-1-1-nquads && npm run spec-1-1-trig",
+    "spec": "node spec/run.js",
     "spec-1-1-earl": "npm run spec-1-1-earl-turtle && npm run spec-1-1-earl-ntriples && npm run spec-1-1-earl-nquads && npm run spec-1-1-earl-trig",
-    "spec-1-1-ntriples": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-n-triples/manifest.ttl -i '{ \"format\": \"n-triples\" }' -c .rdf-test-suite-cache/",
-    "spec-1-1-nquads": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-n-quads/manifest.ttl -i '{ \"format\": \"n-quads\" }' -c .rdf-test-suite-cache/",
-    "spec-1-1-turtle": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-turtle/manifest.ttl -i '{ \"format\": \"turtle\" }' -c .rdf-test-suite-cache/ --skip \"(bad-numeric-escape|bareword_decimal)\"",
-    "spec-1-1-trig": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-trig/manifest.ttl -i '{ \"format\": \"trig\" }' -c .rdf-test-suite-cache/  --skip \"(bad-numeric-escape|IRI-resolution-01)\"",
     "spec-1-1-earl-ntriples": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-n-triples/manifest.ttl -i '{ \"format\": \"n-triples\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-ntriples.ttl",
     "spec-1-1-earl-nquads": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-n-quads/manifest.ttl -i '{ \"format\": \"n-quads\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-nquads.ttl",
     "spec-1-1-earl-turtle": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-turtle/manifest.ttl -i '{ \"format\": \"turtle\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-turtle.ttl",
     "spec-1-1-earl-trig": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-trig/manifest.ttl -i '{ \"format\": \"trig\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-trig.ttl",
-    "spec-1-2": "npm run spec-1-2-turtle && npm run spec-1-2-ntriples && npm run spec-1-2-nquads && npm run spec-1-2-trig && npm run spec-1-2-turtle-eval && npm run spec-1-2-trig-eval",
     "spec-1-2-earl": "npm run spec-1-2-earl-turtle && npm run spec-1-2-earl-ntriples && npm run spec-1-2-earl-nquads && npm run spec-1-2-earl-trig",
-    "spec-1-2-ntriples": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-n-triples/syntax/manifest.ttl -i '{ \"format\": \"n-triples\" }' -c .rdf-test-suite-cache/",
-    "spec-1-2-nquads": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-n-quads/syntax/manifest.ttl -i '{ \"format\": \"n-quads\" }' -c .rdf-test-suite-cache/",
-    "spec-1-2-turtle": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-turtle/syntax/manifest.ttl -i '{ \"format\": \"turtle\" }' -c .rdf-test-suite-cache/",
-    "spec-1-2-trig": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-trig/syntax/manifest.ttl -i '{ \"format\": \"trig\" }' -c .rdf-test-suite-cache/",
-    "spec-1-2-turtle-eval": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-turtle/eval/manifest.ttl -i '{ \"format\": \"turtle\" }' -c .rdf-test-suite-cache/",
-    "spec-1-2-trig-eval": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-trig/eval/manifest.ttl -i '{ \"format\": \"trig\" }' -c .rdf-test-suite-cache/",
     "spec-1-2-earl-ntriples": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-n-triples/syntax/manifest.ttl -i '{ \"format\": \"n-triples\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-ntriples.ttl",
     "spec-1-2-earl-nquads": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-n-quads/syntax/manifest.ttl -i '{ \"format\": \"n-quads\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-nquads.ttl",
     "spec-1-2-earl-turtle": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-turtle/syntax/manifest.ttl -i '{ \"format\": \"turtle\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-turtle.ttl",
     "spec-1-2-earl-trig": "rdf-test-suite spec/parser.js https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-trig/syntax/manifest.ttl -i '{ \"format\": \"trig\" }' -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-trig.ttl",
-    "spec-n3": "npm run spec-n3-parser && npm run spec-n3-extended",
-    "spec-n3-fetch": "sh scripts/fetch-n3-tests.sh",
-    "spec-n3-parser": "npm run spec-n3-fetch && rdf-test-suite spec/parser.js https://w3c-cg.github.io/N3/tests/N3Tests/manifest-parser.ttl -i '{ \"format\": \"text/n3\" }' -m 'https://w3c-cg.github.io/N3/tests/~.n3-tests/tests/'",
-    "spec-n3-extended": "npm run spec-n3-fetch && rdf-test-suite spec/parser.js https://w3c-cg.github.io/N3/tests/N3Tests/manifest-extended.ttl -i '{ \"format\": \"text/n3\" }' -m 'https://w3c-cg.github.io/N3/tests/~.n3-tests/tests/'",
     "spec-clean": "rm -rf .rdf-test-suite-cache/ .n3-tests/",
     "docs": "cd src && docco *.js -o ../docs && cd .."
   },
@@ -126,7 +110,28 @@
   },
   "release": {
     "branches": [
-      "main"
+      "main",
+      {
+        "name": "next-major",
+        "prerelease": "alpha",
+        "channel": "alpha"
+      }
+    ],
+    "plugins": [
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "preset": "conventionalcommits"
+        }
+      ],
+      [
+        "@semantic-release/release-notes-generator",
+        {
+          "preset": "conventionalcommits"
+        }
+      ],
+      "@semantic-release/npm",
+      "@semantic-release/github"
     ]
   },
   "publishConfig": {

package/src/BaseIRI.js

@@ -4,7 +4,9 @@ import { escapeRegex } from './Util';
 // - file: IRIs (which could also use backslashes)
 // - IRIs containing /. or /.. or //
 const BASE_UNSUPPORTED = /^:?[^:?#]*(?:[?#]|$)|^file:|^[^:]*:\/*[^?#]+?\/(?:\.\.?(?:\/|$)|\/)/i;
-const SUFFIX_SUPPORTED = /^(?:(?:[^/?#]{3,}|\.?[^/?#.]\.?)(?:\/[^/?#]{3,}|\.?[^/?#.]\.?)*\/?)?(?:[?#]|$)/;
+// Supported suffixes have a first path segment other than . or ..,
+// and further path segments of at least 3 characters
+const SUFFIX_SUPPORTED = /^(?:(?!\.\.?(?:[/?#]|$))[^/?#]+(?:\/[^/?#]{3,})*\/?)?(?:[?#]|$)/;
 const CURRENT = './';
 const PARENT = '../';
 const QUERY = '?';
@@ -88,8 +90,10 @@ export default class BaseIRI {
       // Don't abbreviate unsupported path
       if (parentPath !== QUERY && !SUFFIX_SUPPORTED.test(suffix))
         return iri;
-      // Omit ./ with fragment or query string
-      if (parentPath === CURRENT && /^[^?#]/.test(suffix))
+      // Omit ./ with fragment or query string,
+      // unless the first segment has a colon and would be read as a scheme
+      if (parentPath === CURRENT && /^[^?#]/.test(suffix) &&
+          (suffix.indexOf(':') < 0 || !/^[^/?#]*:/.test(suffix)))
         return suffix;
       // Append suffix to relative parent path
       return parentPath + suffix;

package/src/N3DataFactory.js

@@ -499,7 +499,8 @@ export function fromTerm(term) {
   case 'BlankNode':    return blankNode(term.value);
   case 'Variable':     return variable(term.value);
   case 'DefaultGraph': return DEFAULTGRAPH;
-  case 'Literal':      return literal(term.value, term.language || term.datatype);
+  case 'Literal':      return literal(term.value, !term.language ? term.datatype :
+    term.direction ? { language: term.language, direction: term.direction } : term.language);
   case 'Quad':         return fromQuad(term);
   default:             throw new Error(`Unexpected termType: ${term.termType}`);
   }