n3 2.2.12 → 2.2.13

package/lib/N3Parser.js

@@ -36,6 +36,9 @@ class N3Parser {
     this._supportsQuads = !(isTurtle || isTriG || isNTriples || isN3);
     // Whether the log:isImpliedBy predicate is supported
     this._isImpliedBy = options.isImpliedBy;
+    // Whether an empty formula is read as the boolean literal true,
+    // as in the N3 spec tests (opt-in until the next major version)
+    this._emptyFormulaAsTrue = !!options.emptyFormulaAsTrue;
     // Disable relative IRIs in N-Triples or N-Quads mode
     if (isLineMode) this._resolveRelativeIRI = iri => {
       return null;
@@ -92,7 +95,8 @@ class N3Parser {
       graph,
       inverse: n3Mode ? this._inversePredicate : false,
       blankPrefix: n3Mode ? this._prefixes._ : '',
-      quantified: n3Mode ? this._quantified : null
+      quantified: n3Mode ? this._quantified : null,
+      emptyFormula: n3Mode ? this._emptyFormula : false
     });
     // The settings below only apply to N3 streams
     if (n3Mode) {
@@ -103,6 +107,13 @@ class N3Parser {
       this._prefixes._ = this._graph ? `${this._graph.value}.` : '.';
       // Quantifiers are scoped to a formula
       this._quantified = Object.create(this._quantified);
+      // A formula starts a new statement, so the subject of the
+      // enclosing statement must not leak into it,
+      // and it is empty until a statement has been read
+      if (type === 'formula') {
+        this._subject = null;
+        this._emptyFormula = true;
+      }
     }
   }
 
@@ -124,6 +135,7 @@ class N3Parser {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
+      this._emptyFormula = context.emptyFormula;
     }
   }
 
@@ -209,6 +221,8 @@ class N3Parser {
   // ### `_readSubject` reads a quad's subject
   _readSubject(token) {
     this._predicate = null;
+    // Any statement token means the enclosing formula is not empty
+    if (token.type !== '}') this._emptyFormula = false;
     switch (token.type) {
       case '[':
         // Start a new quad with a new blank node as subject
@@ -710,9 +724,18 @@ class N3Parser {
 
     // Store the last quad of the formula
     if (this._subject !== null) this._emit(this._subject, this._predicate, this._object, this._graph);
-
+    const formula = this._graph,
+      empty = this._emptyFormula;
     // Restore the parent context containing this formula
     this._restoreContext('formula', token);
+
+    // When the emptyFormulaAsTrue option is set, an empty formula
+    // is read as the boolean literal true, following the N3 spec tests
+    // and the direction discussed in https://github.com/w3c-cg/N3/issues/185
+    if (empty && this._emptyFormulaAsTrue) {
+      if (this._subject === formula) this._subject = this.N3_TRUE;else this._object = this.N3_TRUE;
+    }
+
     // If the formula was the subject, continue reading the predicate.
     // If the formula was the object, read punctuation.
     return this._object === null ? this._readPredicate : this._getContextEndReader();
@@ -1293,6 +1316,7 @@ class N3Parser {
     this._versionCallback = onVersion || noop;
     this._inversePredicate = false;
     this._quantified = Object.create(null);
+    this._emptyFormula = false;
 
     // Parse synchronously if no quad callback is given
     if (!onQuad) {
@@ -1345,6 +1369,7 @@ function initDataFactory(parser, factory) {
   parser.RDF_REIFIES = factory.namedNode(_IRIs.default.rdf.reifies);
   parser.N3_FORALL = factory.namedNode(_IRIs.default.r.forAll);
   parser.N3_FORSOME = factory.namedNode(_IRIs.default.r.forSome);
+  parser.N3_TRUE = factory.literal('true', factory.namedNode(_IRIs.default.xsd.boolean));
   parser.ABBREVIATIONS = {
     'a': factory.namedNode(_IRIs.default.rdf.type),
     '=': factory.namedNode(_IRIs.default.owl.sameAs),

package/package.json

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

package/src/N3Parser.js

@@ -29,6 +29,9 @@ export default class N3Parser {
     this._supportsQuads = !(isTurtle || isTriG || isNTriples || isN3);
     // Whether the log:isImpliedBy predicate is supported
     this._isImpliedBy = options.isImpliedBy;
+    // Whether an empty formula is read as the boolean literal true,
+    // as in the N3 spec tests (opt-in until the next major version)
+    this._emptyFormulaAsTrue = !!options.emptyFormulaAsTrue;
     // Disable relative IRIs in N-Triples or N-Quads mode
     if (isLineMode)
       this._resolveRelativeIRI = iri => { return null; };
@@ -82,6 +85,7 @@ export default class N3Parser {
       inverse: n3Mode ? this._inversePredicate : false,
       blankPrefix: n3Mode ? this._prefixes._ : '',
       quantified: n3Mode ? this._quantified : null,
+      emptyFormula: n3Mode ? this._emptyFormula : false,
     });
     // The settings below only apply to N3 streams
     if (n3Mode) {
@@ -92,6 +96,13 @@ export default class N3Parser {
       this._prefixes._ = (this._graph ? `${this._graph.value}.` : '.');
       // Quantifiers are scoped to a formula
       this._quantified = Object.create(this._quantified);
+      // A formula starts a new statement, so the subject of the
+      // enclosing statement must not leak into it,
+      // and it is empty until a statement has been read
+      if (type === 'formula') {
+        this._subject = null;
+        this._emptyFormula = true;
+      }
     }
   }
 
@@ -114,6 +125,7 @@ export default class N3Parser {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
+      this._emptyFormula = context.emptyFormula;
     }
   }
 
@@ -205,6 +217,9 @@ export default class N3Parser {
   // ### `_readSubject` reads a quad's subject
   _readSubject(token) {
     this._predicate = null;
+    // Any statement token means the enclosing formula is not empty
+    if (token.type !== '}')
+      this._emptyFormula = false;
     switch (token.type) {
     case '[':
       // Start a new quad with a new blank node as subject
@@ -774,8 +789,20 @@ export default class N3Parser {
     if (this._subject !== null)
       this._emit(this._subject, this._predicate, this._object, this._graph);
 
+    const formula = this._graph, empty = this._emptyFormula;
     // Restore the parent context containing this formula
     this._restoreContext('formula', token);
+
+    // When the emptyFormulaAsTrue option is set, an empty formula
+    // is read as the boolean literal true, following the N3 spec tests
+    // and the direction discussed in https://github.com/w3c-cg/N3/issues/185
+    if (empty && this._emptyFormulaAsTrue) {
+      if (this._subject === formula)
+        this._subject = this.N3_TRUE;
+      else
+        this._object = this.N3_TRUE;
+    }
+
     // If the formula was the subject, continue reading the predicate.
     // If the formula was the object, read punctuation.
     return this._object === null ? this._readPredicate : this._getContextEndReader();
@@ -1392,6 +1419,7 @@ export default class N3Parser {
     this._versionCallback = onVersion || noop;
     this._inversePredicate = false;
     this._quantified = Object.create(null);
+    this._emptyFormula = false;
 
     // Parse synchronously if no quad callback is given
     if (!onQuad) {
@@ -1451,6 +1479,7 @@ function initDataFactory(parser, factory) {
   parser.RDF_REIFIES = factory.namedNode(namespaces.rdf.reifies);
   parser.N3_FORALL   = factory.namedNode(namespaces.r.forAll);
   parser.N3_FORSOME  = factory.namedNode(namespaces.r.forSome);
+  parser.N3_TRUE     = factory.literal('true', factory.namedNode(namespaces.xsd.boolean));
   parser.ABBREVIATIONS = {
     'a': factory.namedNode(namespaces.rdf.type),
     '=': factory.namedNode(namespaces.owl.sameAs),