n3 2.10.4 → 2.10.6

package/lib/N3DataFactory.js

@@ -84,10 +84,14 @@ class NamedNode extends Term {
    * the constructor assumes an already-validated IRI.
    */
   constructor(iri) {
-    super(iri === '' ? EMPTY_IRI_ID : iri);
-    if (iri === '') Object.defineProperty(this, 'value', {
-      value: ''
-    });
+    if (iri !== '') super(iri);
+    // The empty IRI gets a distinct ID, since '' is the ID of the default graph
+    else {
+      super(EMPTY_IRI_ID);
+      Object.defineProperty(this, 'value', {
+        value: ''
+      });
+    }
   }
 
   // ### The term type of this term
@@ -320,7 +324,10 @@ function termToId(term, nested) {
   // Term instantiated with another library
   switch (term.termType) {
     case 'NamedNode':
-      return term.value || EMPTY_IRI_ID;
+      {
+        const iri = term.value;
+        return iri !== '' ? iri : EMPTY_IRI_ID;
+      }
     case 'BlankNode':
       return `_:${term.value}`;
     case 'Variable':

package/lib/N3Parser.js

@@ -1218,6 +1218,8 @@ class N3Parser {
 
   // ### `_readReifier` reads the triple term identifier after a tilde when in a reifying triple.
   _readReifier(token) {
+    // Without an identifier, the reifier is a fresh blank node
+    if (token.type === '>>') return this._readReifiedTripleTail(token);
     this._reifier = this._readEntity(token);
     return this._readReifiedTripleTail;
   }

package/lib/N3Writer.js

@@ -164,7 +164,9 @@ class N3Writer {
     if (entity.termType !== 'NamedNode') {
       // If it is a list head, pretty-print it
       if (this._lists && entity.value in this._lists) entity = this.list(this._lists[entity.value]);
-      return entity.termType === 'Variable' ? `?${entity.value}` : 'id' in entity ? entity.id : `_:${entity.value}`;
+      // Terms from this library already hold their serialization as id
+      if (entity instanceof _N3DataFactory.Term) return entity.id;
+      return entity.termType === 'Variable' ? `?${entity.value}` : `_:${entity.value}`;
     }
     let iri = entity.value;
     // Use relative IRIs if requested and possible

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.10.4",
+  "version": "2.10.6",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -71,12 +71,14 @@
     "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",
+    "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",

package/src/N3DataFactory.js

@@ -74,9 +74,13 @@ export class NamedNode extends Term {
    * the constructor assumes an already-validated IRI.
    */
   constructor(iri) {
-    super(iri === '' ? EMPTY_IRI_ID : iri);
-    if (iri === '')
+    if (iri !== '')
+      super(iri);
+    // The empty IRI gets a distinct ID, since '' is the ID of the default graph
+    else {
+      super(EMPTY_IRI_ID);
       Object.defineProperty(this, 'value', { value: '' });
+    }
   }
 
   // ### The term type of this term
@@ -321,7 +325,10 @@ export function termToId(term, nested) {
 
   // Term instantiated with another library
   switch (term.termType) {
-  case 'NamedNode':    return term.value || EMPTY_IRI_ID;
+  case 'NamedNode': {
+    const iri = term.value;
+    return iri !== '' ? iri : EMPTY_IRI_ID;
+  }
   case 'BlankNode':    return `_:${term.value}`;
   case 'Variable':     return `?${term.value}`;
   case 'DefaultGraph': return '';

package/src/N3Parser.js

@@ -1323,6 +1323,9 @@ export default class N3Parser {
 
   // ### `_readReifier` reads the triple term identifier after a tilde when in a reifying triple.
   _readReifier(token) {
+    // Without an identifier, the reifier is a fresh blank node
+    if (token.type === '>>')
+      return this._readReifiedTripleTail(token);
     this._reifier = this._readEntity(token);
     return this._readReifiedTripleTail;
   }

package/src/N3Writer.js

@@ -163,8 +163,10 @@ export default class N3Writer {
       // If it is a list head, pretty-print it
       if (this._lists && (entity.value in this._lists))
         entity = this.list(this._lists[entity.value]);
-      return entity.termType === 'Variable' ? `?${entity.value}` :
-             'id' in entity ? entity.id : `_:${entity.value}`;
+      // Terms from this library already hold their serialization as id
+      if (entity instanceof Term)
+        return entity.id;
+      return entity.termType === 'Variable' ? `?${entity.value}` : `_:${entity.value}`;
     }
     let iri = entity.value;
     // Use relative IRIs if requested and possible