n3 2.1.1 → 2.1.2

package/lib/N3Lexer.js

@@ -242,8 +242,14 @@ class N3Lexer {
           if (this._n3Mode && (match = this._variable.exec(input))) type = 'var', value = match[0];
           break;
         case '@':
-          // Try to find a language code
-          if (this._previousMarker === 'literal' && (match = this._langcode.exec(input)) && match[1] !== 'version') type = 'langcode', value = match[1];
+          // Try to find a language code. A language code can contain dash-separated
+          // subtags, so if the match is immediately followed by a single dash and the
+          // input is not finished, another subtag may still arrive in a later chunk and
+          // the match would be premature; wait for more input in that case.
+          // A double dash starts a direction code, which cannot extend the language code.
+          if (this._previousMarker === 'literal' && (match = this._langcode.exec(input)) && match[1] !== 'version') {
+            if (!inputFinished && input[match[0].length] === '-' && input[match[0].length + 1] !== '-') match = null;else type = 'langcode', value = match[1];
+          }
           // Try to find a keyword
           else if (match = this._atKeyword.exec(input)) type = match[0];
           break;

package/lib/N3Store.js

@@ -728,7 +728,9 @@ class N3Store {
     remove = false,
     ignoreErrors = false
   } = {}) {
-    const lists = {}; // has scalar keys so could be a simple Object
+    // Keys are the list heads' term values, so a null-prototype map keeps
+    // them from colliding with inherited Object members such as `toString`
+    const lists = Object.create(null);
     const onError = ignoreErrors ? () => true : (node, message) => {
       throw new Error(`${node.value} ${message}`);
     };

package/package.json

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

package/src/N3Lexer.js

@@ -226,9 +226,17 @@ export default class N3Lexer {
         break;
 
       case '@':
-        // Try to find a language code
-        if (this._previousMarker === 'literal' && (match = this._langcode.exec(input)) && match[1] !== 'version')
-          type = 'langcode', value = match[1];
+        // Try to find a language code. A language code can contain dash-separated
+        // subtags, so if the match is immediately followed by a single dash and the
+        // input is not finished, another subtag may still arrive in a later chunk and
+        // the match would be premature; wait for more input in that case.
+        // A double dash starts a direction code, which cannot extend the language code.
+        if (this._previousMarker === 'literal' && (match = this._langcode.exec(input)) && match[1] !== 'version') {
+          if (!inputFinished && input[match[0].length] === '-' && input[match[0].length + 1] !== '-')
+            match = null;
+          else
+            type = 'langcode', value = match[1];
+        }
         // Try to find a keyword
         else if (match = this._atKeyword.exec(input))
           type = match[0];

package/src/N3Store.js

@@ -759,7 +759,9 @@ export default class N3Store {
   // ### `extractLists` finds and removes all list triples
   // and returns the items per list.
   extractLists({ remove = false, ignoreErrors = false } = {}) {
-    const lists = {}; // has scalar keys so could be a simple Object
+    // Keys are the list heads' term values, so a null-prototype map keeps
+    // them from colliding with inherited Object members such as `toString`
+    const lists = Object.create(null);
     const onError = ignoreErrors ? (() => true) :
                   ((node, message) => { throw new Error(`${node.value} ${message}`); });