n3 2.10.0 → 2.10.2

package/lib/N3DataFactory.js

@@ -23,6 +23,8 @@ const {
 // eslint-disable-next-line prefer-const
 let DEFAULTGRAPH;
 let _blankNodeCounter = 0;
+// The ID of the empty IRI, which cannot be '' as that is the ID of the default graph
+const EMPTY_IRI_ID = '<>';
 const escapedLiteral = /^"(.*".*)(?="[^"]*$)/;
 
 // ## DataFactory singleton
@@ -82,7 +84,10 @@ class NamedNode extends Term {
    * the constructor assumes an already-validated IRI.
    */
   constructor(iri) {
-    super(iri);
+    super(iri === '' ? EMPTY_IRI_ID : iri);
+    if (iri === '') Object.defineProperty(this, 'value', {
+      value: ''
+    });
   }
 
   // ### The term type of this term
@@ -291,6 +296,9 @@ function termFromId(id, factory, nested) {
     case '[':
       id = JSON.parse(id);
       break;
+    case '<':
+      if (id === EMPTY_IRI_ID) return factory.namedNode('');
+    // falls through
     default:
       if (!nested || !Array.isArray(id)) {
         return factory.namedNode(id);
@@ -312,7 +320,7 @@ function termToId(term, nested) {
   // Term instantiated with another library
   switch (term.termType) {
     case 'NamedNode':
-      return term.value;
+      return term.value || EMPTY_IRI_ID;
     case 'BlankNode':
       return `_:${term.value}`;
     case 'Variable':

package/lib/N3Parser.js

@@ -60,6 +60,8 @@ class N3Parser {
     });
     // Disable explicit quantifiers by default
     this._explicitQuantifiers = !!options.explicitQuantifiers;
+    // Disable formula-only blank node scoping by default
+    this._formulaScopedBlankNodes = !!options.formulaScopedBlankNodes;
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;
@@ -128,11 +130,15 @@ class N3Parser {
     // Every new scope resets the predicate direction
     this._inversePredicate = false;
     this._expectOf = false;
-    // In N3, blank nodes are scoped to a formula
-    // (using a dot as separator, as a blank node label cannot start with it)
-    this._prefixes._ = this._graph ? `${this._graph.value}.` : '.';
-    // Quantifiers are scoped to a formula
-    this._quantified = Object.create(this._quantified);
+    // In N3, blank nodes and quantifiers are scoped to a formula;
+    // with `formulaScopedBlankNodes`, lists and blank node property lists
+    // share the enclosing scope instead of rescoping
+    if (!this._formulaScopedBlankNodes || type === 'formula') {
+      // 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);
+    }
     // A formula starts empty and must not inherit its parent's subject
     if (type === 'formula') {
       this._subject = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -60,7 +60,7 @@
     "test": "jest",
     "lint": "eslint src perf test spec",
     "prepare": "npm run build",
-    "spec": "npm run spec-1-1 && npm run spec-1-2",
+    "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-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/",
@@ -81,7 +81,11 @@
     "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-clean": "rm -r .rdf-test-suite-cache/",
+    "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 .."
   },
   "repository": {

package/src/N3DataFactory.js

@@ -8,6 +8,8 @@ const { rdf, xsd } = namespaces;
 // eslint-disable-next-line prefer-const
 let DEFAULTGRAPH;
 let _blankNodeCounter = 0;
+// The ID of the empty IRI, which cannot be '' as that is the ID of the default graph
+const EMPTY_IRI_ID = '<>';
 
 const escapedLiteral = /^"(.*".*)(?="[^"]*$)/;
 
@@ -72,7 +74,9 @@ export class NamedNode extends Term {
    * the constructor assumes an already-validated IRI.
    */
   constructor(iri) {
-    super(iri);
+    super(iri === '' ? EMPTY_IRI_ID : iri);
+    if (iri === '')
+      Object.defineProperty(this, 'value', { value: '' });
   }
 
   // ### The term type of this term
@@ -285,6 +289,10 @@ export function termFromId(id, factory, nested) {
   case '[':
     id = JSON.parse(id);
     break;
+  case '<':
+    if (id === EMPTY_IRI_ID)
+      return factory.namedNode('');
+    // falls through
   default:
     if (!nested || !Array.isArray(id)) {
       return factory.namedNode(id);
@@ -313,7 +321,7 @@ export function termToId(term, nested) {
 
   // Term instantiated with another library
   switch (term.termType) {
-  case 'NamedNode':    return term.value;
+  case 'NamedNode':    return term.value || EMPTY_IRI_ID;
   case 'BlankNode':    return `_:${term.value}`;
   case 'Variable':     return `?${term.value}`;
   case 'DefaultGraph': return '';

package/src/N3Parser.js

@@ -49,6 +49,8 @@ export default class N3Parser {
     this._lexer = options.lexer || new N3Lexer({ lineMode: isLineMode, n3: isN3, isImpliedBy: this._isImpliedBy });
     // Disable explicit quantifiers by default
     this._explicitQuantifiers = !!options.explicitQuantifiers;
+    // Disable formula-only blank node scoping by default
+    this._formulaScopedBlankNodes = !!options.formulaScopedBlankNodes;
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;
@@ -111,11 +113,15 @@ export default class N3Parser {
     // Every new scope resets the predicate direction
     this._inversePredicate = false;
     this._expectOf = false;
-    // In N3, blank nodes are scoped to a formula
-    // (using a dot as separator, as a blank node label cannot start with it)
-    this._prefixes._ = (this._graph ? `${this._graph.value}.` : '.');
-    // Quantifiers are scoped to a formula
-    this._quantified = Object.create(this._quantified);
+    // In N3, blank nodes and quantifiers are scoped to a formula;
+    // with `formulaScopedBlankNodes`, lists and blank node property lists
+    // share the enclosing scope instead of rescoping
+    if (!this._formulaScopedBlankNodes || type === 'formula') {
+      // 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);
+    }
     // A formula starts empty and must not inherit its parent's subject
     if (type === 'formula') {
       this._subject = null;