n3 2.2.11 → 2.2.13

package/lib/N3Lexer.js

@@ -13,9 +13,10 @@ const {
   xsd
 } = _IRIs.default;
 
-// Regular expression and replacement string to escape N3 strings
+// Regular expression and replacement strings to unescape N3 strings
 const escapeSequence = /\\u([a-fA-F0-9]{4})|\\U([a-fA-F0-9]{8})|\\([^])/g;
-const escapeReplacements = {
+// Fixed escape sequences allowed in string literals (ECHAR)
+const stringEscapeReplacements = {
   '\\': '\\',
   "'": "'",
   '"': '"',
@@ -23,7 +24,10 @@ const escapeReplacements = {
   'r': '\r',
   't': '\t',
   'f': '\f',
-  'b': '\b',
+  'b': '\b'
+};
+// Fixed escape sequences allowed in local names of prefixed names (PN_LOCAL_ESC)
+const localNameEscapeReplacements = {
   '_': '_',
   '~': '~',
   '.': '.',
@@ -31,6 +35,7 @@ const escapeReplacements = {
   '!': '!',
   '$': '$',
   '&': '&',
+  "'": "'",
   '(': '(',
   ')': ')',
   '*': '*',
@@ -181,7 +186,7 @@ class N3Lexer {
           if (match = this._unescapedIri.exec(input)) type = 'IRI', value = match[1];
           // Try to find a full IRI with escape sequences
           else if (match = this._iri.exec(input)) {
-            value = this._unescape(match[1]);
+            value = this._unescape(match[1], stringEscapeReplacements);
             if (value === null || illegalIriChars.test(value)) return reportSyntaxError(this);
             type = 'IRI';
           }
@@ -364,7 +369,7 @@ class N3Lexer {
         // Try to find a prefixed name. Since it can contain (but not end with) a dot,
         // we always need a non-dot character before deciding it is a prefixed name.
         // Therefore, try inserting a space if we're at the end of the input.
-        else if ((match = this._prefixed.exec(input)) || inputFinished && (match = this._prefixed.exec(`${input} `))) type = 'prefixed', prefix = match[1] || '', value = this._unescape(match[2]);
+        else if ((match = this._prefixed.exec(input)) || inputFinished && (match = this._prefixed.exec(`${input} `))) type = 'prefixed', prefix = match[1] || '', value = this._unescape(match[2], localNameEscapeReplacements);
       }
 
       // A type token is special: it can only be emitted after an IRI or prefixed name is read
@@ -420,8 +425,9 @@ class N3Lexer {
     }
   }
 
-  // ### `_unescape` replaces N3 escape codes by their corresponding characters
-  _unescape(item) {
+  // ### `_unescape` replaces N3 escape codes by their corresponding characters,
+  // allowing only the fixed escape sequences from the given replacement table
+  _unescape(item, replacements) {
     let invalid = false;
     const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
       // 4-digit unicode character
@@ -443,7 +449,7 @@ class N3Lexer {
         return charCode <= 0xFFFF ? String.fromCharCode(Number.parseInt(unicode8, 16)) : String.fromCharCode(0xD800 + ((charCode -= 0x10000) >> 10), 0xDC00 + (charCode & 0x3FF));
       }
       // fixed escape sequence
-      if (escapedChar in escapeReplacements) return escapeReplacements[escapedChar];
+      if (escapedChar in replacements) return replacements[escapedChar];
       // invalid escape sequence
       invalid = true;
       return '';
@@ -477,7 +483,7 @@ class N3Lexer {
           if (openingLength === 1 && lines !== 0 || openingLength === 3 && this._lineMode) break;
           this._line += lines;
           return {
-            value: this._unescape(raw),
+            value: this._unescape(raw, stringEscapeReplacements),
             matchLength
           };
         }

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
@@ -508,7 +522,23 @@ class N3Parser {
       case '{':
         // Start a new formula
         if (!this._n3Mode) return this._error('Unexpected graph', token);
-        this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._factory.blankNode());
+        // The formula is an item of the list,
+        // so it must be linked in the list's graph before the graph changes
+        list = this._factory.blankNode();
+        item = this._factory.blankNode();
+        // Is this the first element of the list?
+        if (previousList === null) {
+          // This list is either the subject or the object of its parent
+          if (parent.predicate === null) parent.subject = list;else parent.object = list;
+        } else {
+          // Continue the previous list with the current list
+          this._emit(previousList, this.RDF_REST, list, this._graph);
+        }
+        // Output the item
+        this._emit(list, this.RDF_FIRST, item, this._graph);
+        // Stack the current list quad and start the formula
+        this._saveContext('formula', this._graph, list, this.RDF_FIRST, this._graph = item);
+        this._subject = null;
         return this._readSubject;
       case '<<(':
         this._saveContext('<<(', this._graph, null, null, null);
@@ -694,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();
@@ -1277,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) {
@@ -1329,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.11",
+  "version": "2.2.13",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [

package/src/N3Lexer.js

@@ -4,14 +4,18 @@ import namespaces from './IRIs';
 
 const { xsd } = namespaces;
 
-// Regular expression and replacement string to escape N3 strings
+// Regular expression and replacement strings to unescape N3 strings
 const escapeSequence = /\\u([a-fA-F0-9]{4})|\\U([a-fA-F0-9]{8})|\\([^])/g;
-const escapeReplacements = {
+// Fixed escape sequences allowed in string literals (ECHAR)
+const stringEscapeReplacements = {
   '\\': '\\', "'": "'", '"': '"',
   'n': '\n', 'r': '\r', 't': '\t', 'f': '\f', 'b': '\b',
+};
+// Fixed escape sequences allowed in local names of prefixed names (PN_LOCAL_ESC)
+const localNameEscapeReplacements = {
   '_': '_', '~': '~', '.': '.', '-': '-', '!': '!', '$': '$', '&': '&',
-  '(': '(', ')': ')', '*': '*', '+': '+', ',': ',', ';': ';', '=': '=',
-  '/': '/', '?': '?', '#': '#', '@': '@', '%': '%',
+  "'": "'", '(': '(', ')': ')', '*': '*', '+': '+', ',': ',', ';': ';',
+  '=': '=', '/': '/', '?': '?', '#': '#', '@': '@', '%': '%',
 };
 const illegalIriChars = /[\x00-\x20<>\\"\{\}\|\^\`]/;
 
@@ -152,7 +156,7 @@ export default class N3Lexer {
           type = 'IRI', value = match[1];
         // Try to find a full IRI with escape sequences
         else if (match = this._iri.exec(input)) {
-          value = this._unescape(match[1]);
+          value = this._unescape(match[1], stringEscapeReplacements);
           if (value === null || illegalIriChars.test(value))
             return reportSyntaxError(this);
           type = 'IRI';
@@ -382,7 +386,7 @@ export default class N3Lexer {
         // Therefore, try inserting a space if we're at the end of the input.
         else if ((match = this._prefixed.exec(input)) ||
                  inputFinished && (match = this._prefixed.exec(`${input} `)))
-          type = 'prefixed', prefix = match[1] || '', value = this._unescape(match[2]);
+          type = 'prefixed', prefix = match[1] || '', value = this._unescape(match[2], localNameEscapeReplacements);
       }
 
       // A type token is special: it can only be emitted after an IRI or prefixed name is read
@@ -427,8 +431,9 @@ export default class N3Lexer {
     function reportSyntaxError(self) { callback(self._syntaxError(/^\S*/.exec(input)[0])); }
   }
 
-  // ### `_unescape` replaces N3 escape codes by their corresponding characters
-  _unescape(item) {
+  // ### `_unescape` replaces N3 escape codes by their corresponding characters,
+  // allowing only the fixed escape sequences from the given replacement table
+  _unescape(item, replacements) {
     let invalid = false;
     const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
       // 4-digit unicode character
@@ -451,8 +456,8 @@ export default class N3Lexer {
           String.fromCharCode(0xD800 + ((charCode -= 0x10000) >> 10), 0xDC00 + (charCode & 0x3FF));
       }
       // fixed escape sequence
-      if (escapedChar in escapeReplacements)
-        return escapeReplacements[escapedChar];
+      if (escapedChar in replacements)
+        return replacements[escapedChar];
       // invalid escape sequence
       invalid = true;
       return '';
@@ -488,7 +493,7 @@ export default class N3Lexer {
               openingLength === 3 && this._lineMode)
             break;
           this._line += lines;
-          return { value: this._unescape(raw), matchLength };
+          return { value: this._unescape(raw, stringEscapeReplacements), matchLength };
         }
         closingPos++;
       }

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
@@ -538,8 +553,28 @@ export default class N3Parser {
       // Start a new formula
       if (!this._n3Mode)
         return this._error('Unexpected graph', token);
-      this._saveContext('formula', this._graph, this._subject, this._predicate,
-                        this._graph = this._factory.blankNode());
+      // The formula is an item of the list,
+      // so it must be linked in the list's graph before the graph changes
+      list = this._factory.blankNode();
+      item = this._factory.blankNode();
+      // Is this the first element of the list?
+      if (previousList === null) {
+        // This list is either the subject or the object of its parent
+        if (parent.predicate === null)
+          parent.subject = list;
+        else
+          parent.object = list;
+      }
+      else {
+        // Continue the previous list with the current list
+        this._emit(previousList, this.RDF_REST, list, this._graph);
+      }
+      // Output the item
+      this._emit(list, this.RDF_FIRST, item, this._graph);
+      // Stack the current list quad and start the formula
+      this._saveContext('formula', this._graph, list, this.RDF_FIRST,
+                        this._graph = item);
+      this._subject = null;
       return this._readSubject;
     case '<<(':
       this._saveContext('<<(', this._graph, null, null, null);
@@ -754,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();
@@ -1372,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) {
@@ -1431,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),