n3 2.2.12 → 2.2.14

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;
@@ -83,26 +86,39 @@ class N3Parser {
   // ### `_saveContext` stores the current parsing context
   // when entering a new scope (list, blank node, formula)
   _saveContext(type, graph, subject, predicate, object) {
-    const n3Mode = this._n3Mode;
+    // Only N3 contexts need the extra parser state.
+    if (!this._n3Mode) {
+      this._contextStack.push({
+        type,
+        subject,
+        predicate,
+        object,
+        graph
+      });
+      return;
+    }
     this._contextStack.push({
       type,
       subject,
       predicate,
       object,
       graph,
-      inverse: n3Mode ? this._inversePredicate : false,
-      blankPrefix: n3Mode ? this._prefixes._ : '',
-      quantified: n3Mode ? this._quantified : null
+      inverse: this._inversePredicate,
+      blankPrefix: this._prefixes._,
+      quantified: this._quantified,
+      emptyFormula: this._emptyFormula
     });
-    // The settings below only apply to N3 streams
-    if (n3Mode) {
-      // Every new scope resets the predicate direction
-      this._inversePredicate = 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);
+    // Every new scope resets the predicate direction
+    this._inversePredicate = 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);
+    // A formula starts empty and must not inherit its parent's subject
+    if (type === 'formula') {
+      this._subject = null;
+      this._emptyFormula = true;
     }
   }
 
@@ -124,6 +140,7 @@ class N3Parser {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
+      this._emptyFormula = context.emptyFormula;
     }
   }
 
@@ -209,6 +226,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
@@ -581,10 +600,10 @@ class N3Parser {
   }
 
   // ### `_completeLiteral` completes a literal with an optional datatype or language
+  // Defers possible direction tags without allocating bound callbacks.
   _completeLiteral(token, component) {
-    // Create a simple string literal by default
-    let literal = this._factory.literal(this._literalValue);
-    let readCb;
+    let literal,
+      readCb = false;
     switch (token.type) {
       // Create a datatyped literal
       case 'type':
@@ -603,8 +622,13 @@ class N3Parser {
         literal = this._factory.literal(this._literalValue, token.value);
         this._literalLanguage = token.value;
         token = null;
-        readCb = this._readDirCode.bind(this, component);
+        // Save state for a possible direction tag
+        this._literalComponent = component;
+        readCb = true;
         break;
+      // Create a simple string literal by default
+      default:
+        literal = this._factory.literal(this._literalValue);
     }
     return {
       token,
@@ -612,7 +636,11 @@ class N3Parser {
       readCb
     };
   }
-  _readDirCode(component, listItem, token) {
+
+  // ### `_readDirCode` reads an optional directional language tag
+  _readDirCode(token) {
+    const component = this._literalComponent,
+      listItem = this._literalListItem;
     // Attempt to read a dircode
     if (token.type === 'dircode') {
       const term = this._factory.literal(this._literalValue, {
@@ -647,7 +675,10 @@ class N3Parser {
     }
 
     // Postpone completion if the literal is only partially completed (such as lang+dir).
-    if (completed.readCb) return completed.readCb.bind(this, false);
+    if (completed.readCb) {
+      this._literalListItem = false;
+      return this._readDirCode;
+    }
 
     // A subject literal implies N3 mode, so it might start a path.
     if (component === 'subject') {
@@ -677,7 +708,10 @@ class N3Parser {
     this._object = completed.literal;
 
     // Postpone completion if the literal is only partially completed (such as lang+dir).
-    if (completed.readCb) return completed.readCb.bind(this, listItem);
+    if (completed.readCb) {
+      this._literalListItem = listItem;
+      return this._readDirCode;
+    }
     return this._completeObjectLiteralPost(completed.token, listItem);
   }
   _completeObjectLiteralPost(token, listItem) {
@@ -710,9 +744,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 +1336,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 +1389,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.14",
   "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; };
@@ -75,23 +78,30 @@ export default class N3Parser {
   // ### `_saveContext` stores the current parsing context
   // when entering a new scope (list, blank node, formula)
   _saveContext(type, graph, subject, predicate, object) {
-    const n3Mode = this._n3Mode;
+    // Only N3 contexts need the extra parser state.
+    if (!this._n3Mode) {
+      this._contextStack.push({ type, subject, predicate, object, graph });
+      return;
+    }
     this._contextStack.push({
       type,
       subject, predicate, object, graph,
-      inverse: n3Mode ? this._inversePredicate : false,
-      blankPrefix: n3Mode ? this._prefixes._ : '',
-      quantified: n3Mode ? this._quantified : null,
+      inverse: this._inversePredicate,
+      blankPrefix: this._prefixes._,
+      quantified: this._quantified,
+      emptyFormula: this._emptyFormula,
     });
-    // The settings below only apply to N3 streams
-    if (n3Mode) {
-      // Every new scope resets the predicate direction
-      this._inversePredicate = 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);
+    // Every new scope resets the predicate direction
+    this._inversePredicate = 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);
+    // A formula starts empty and must not inherit its parent's subject
+    if (type === 'formula') {
+      this._subject = null;
+      this._emptyFormula = true;
     }
   }
 
@@ -114,6 +124,7 @@ export default class N3Parser {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
+      this._emptyFormula = context.emptyFormula;
     }
   }
 
@@ -205,6 +216,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
@@ -626,10 +640,9 @@ export default class N3Parser {
   }
 
   // ### `_completeLiteral` completes a literal with an optional datatype or language
+  // Defers possible direction tags without allocating bound callbacks.
   _completeLiteral(token, component) {
-    // Create a simple string literal by default
-    let literal = this._factory.literal(this._literalValue);
-    let readCb;
+    let literal, readCb = false;
 
     switch (token.type) {
     // Create a datatyped literal
@@ -650,14 +663,21 @@ export default class N3Parser {
       literal = this._factory.literal(this._literalValue, token.value);
       this._literalLanguage = token.value;
       token = null;
-      readCb = this._readDirCode.bind(this, component);
+      // Save state for a possible direction tag
+      this._literalComponent = component;
+      readCb = true;
       break;
+    // Create a simple string literal by default
+    default:
+      literal = this._factory.literal(this._literalValue);
     }
 
     return { token, literal, readCb };
   }
 
-  _readDirCode(component, listItem, token) {
+  // ### `_readDirCode` reads an optional directional language tag
+  _readDirCode(token) {
+    const component = this._literalComponent, listItem = this._literalListItem;
     // Attempt to read a dircode
     if (token.type === 'dircode') {
       const term = this._factory.literal(this._literalValue, { language: this._literalLanguage, direction: token.value });
@@ -699,8 +719,10 @@ export default class N3Parser {
     }
 
     // Postpone completion if the literal is only partially completed (such as lang+dir).
-    if (completed.readCb)
-      return completed.readCb.bind(this, false);
+    if (completed.readCb) {
+      this._literalListItem = false;
+      return this._readDirCode;
+    }
 
     // A subject literal implies N3 mode, so it might start a path.
     if (component === 'subject') {
@@ -733,8 +755,10 @@ export default class N3Parser {
     this._object = completed.literal;
 
     // Postpone completion if the literal is only partially completed (such as lang+dir).
-    if (completed.readCb)
-      return completed.readCb.bind(this, listItem);
+    if (completed.readCb) {
+      this._literalListItem = listItem;
+      return this._readDirCode;
+    }
 
     return this._completeObjectLiteralPost(completed.token, listItem);
   }
@@ -774,8 +798,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 +1428,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 +1488,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),