n3 2.13.9 → 2.13.11

package/lib/N3DataFactory.js

@@ -137,10 +137,10 @@ class Literal extends Term {
 
   // ### The direction of this literal
   get direction() {
-    // Find the last double dash after the closing quote (e.g., '"abc"@en-us--ltr')
+    // Find the last double dash after the closing quote and language tag (e.g., '"abc"@en-us--ltr')
     const id = this.id;
     const endPos = id.lastIndexOf('"');
-    const dirPos = id.lastIndexOf('--');
+    const dirPos = id[endPos + 1] === '@' ? id.lastIndexOf('--') : -1;
     return dirPos > endPos && dirPos + 2 < id.length ? id.substr(dirPos + 2).toLowerCase() : '';
   }
 

package/lib/N3Store.js

@@ -37,8 +37,11 @@ function hasInIndex(index0, key0, key1, key2) {
 // that starts with such a marker (as relative IRIs can) is wrapped in < and >.
 const markedIRI = /^[?_"[.<]/;
 function entityKey(term) {
-  // Strings are term ids, which only need wrapping when they are IRIs starting with <
-  if (typeof term === 'string') return term.charCodeAt(0) !== 0x3C || term === '<>' ? term : `<${term}>`;
+  // Strings are term ids, which only need wrapping when they are IRIs starting with < or .
+  if (typeof term === 'string') {
+    const first = term.charCodeAt(0);
+    return first !== 0x3C && first !== 0x2E || term === '<>' ? term : `<${term}>`;
+  }
   // IDs of IRIs usually start with a lowercase scheme letter, which never marks a term type
   const id = (0, _N3DataFactory.termToId)(term);
   if (id.charCodeAt(0) >= 0x61 || !term) return id;
@@ -97,10 +100,12 @@ class N3EntityIndex {
 
   // Returns the numeric id of a term given as a string id
   _stringToNumericId(term) {
-    // The string is the key unless it is an IRI starting with <. Read the first character
+    // The string is the key unless it is an IRI starting with < (which starts the keys of
+    // wrapped IRIs) or . (which starts the keys of quoted triples). Read the first character
     // from the stored key after a match, which is cheaper than from a concatenated string.
     const id = this._ids[term];
-    if (id ? this._entities[id].charCodeAt(0) !== 0x3C : term.charCodeAt(0) !== 0x3C) return id;
+    const first = id ? this._entities[id].charCodeAt(0) : term.charCodeAt(0);
+    if (first !== 0x3C && first !== 0x2E) return id;
     return term === '<>' ? id : this._ids[`<${term}>`];
   }
   _termToNewNumericId(term) {

package/package.json

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

package/src/N3DataFactory.js

@@ -125,10 +125,10 @@ export class Literal extends Term {
 
   // ### The direction of this literal
   get direction() {
-    // Find the last double dash after the closing quote (e.g., '"abc"@en-us--ltr')
+    // Find the last double dash after the closing quote and language tag (e.g., '"abc"@en-us--ltr')
     const id = this.id;
     const endPos = id.lastIndexOf('"');
-    const dirPos = id.lastIndexOf('--');
+    const dirPos = id[endPos + 1] === '@' ? id.lastIndexOf('--') : -1;
     return dirPos > endPos && dirPos + 2 < id.length ? id.substr(dirPos + 2).toLowerCase() : '';
   }
 

package/src/N3Store.js

@@ -28,9 +28,11 @@ function hasInIndex(index0, key0, key1, key2) {
 // that starts with such a marker (as relative IRIs can) is wrapped in < and >.
 const markedIRI = /^[?_"[.<]/;
 function entityKey(term) {
-  // Strings are term ids, which only need wrapping when they are IRIs starting with <
-  if (typeof term === 'string')
-    return term.charCodeAt(0) !== 0x3C || term === '<>' ? term : `<${term}>`;
+  // Strings are term ids, which only need wrapping when they are IRIs starting with < or .
+  if (typeof term === 'string') {
+    const first = term.charCodeAt(0);
+    return first !== 0x3C && first !== 0x2E || term === '<>' ? term : `<${term}>`;
+  }
   // IDs of IRIs usually start with a lowercase scheme letter, which never marks a term type
   const id = termToId(term);
   if (id.charCodeAt(0) >= 0x61 || !term)
@@ -102,10 +104,12 @@ export class N3EntityIndex {
 
   // Returns the numeric id of a term given as a string id
   _stringToNumericId(term) {
-    // The string is the key unless it is an IRI starting with <. Read the first character
+    // The string is the key unless it is an IRI starting with < (which starts the keys of
+    // wrapped IRIs) or . (which starts the keys of quoted triples). Read the first character
     // from the stored key after a match, which is cheaper than from a concatenated string.
     const id = this._ids[term];
-    if (id ? this._entities[id].charCodeAt(0) !== 0x3C : term.charCodeAt(0) !== 0x3C)
+    const first = id ? this._entities[id].charCodeAt(0) : term.charCodeAt(0);
+    if (first !== 0x3C && first !== 0x2E)
       return id;
     return term === '<>' ? id : this._ids[`<${term}>`];
   }