n3 2.9.0 → 2.9.2

package/lib/N3Lexer.js

@@ -18,8 +18,6 @@ const SPACE = 0x20,
   CR = 0x0D,
   HASH = 0x23;
 
-// Regular expression and replacement strings to unescape N3 strings
-const escapeSequence = /\\u([a-fA-F0-9]{4})|\\U([a-fA-F0-9]{8})|\\([^])/g;
 // Fixed escape sequences allowed in string literals (ECHAR)
 const stringEscapeReplacements = {
   '\\': '\\',
@@ -549,34 +547,42 @@ class N3Lexer {
   // ### `_unescape` replaces N3 escape codes by their corresponding characters,
   // allowing only the fixed escape sequences from the given replacement table
   _unescape(item, replacements) {
-    if (item.indexOf('\\') < 0) return item;
-    let invalid = false;
-    const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
-      // 4-digit unicode character
-      if (typeof unicode4 === 'string') {
-        const charCode = Number.parseInt(unicode4, 16);
-        if (!isValidCodePoint(charCode)) {
-          invalid = true;
-          return '';
+    let backslash = item.indexOf('\\');
+    if (backslash < 0) return item;
+    let result = '',
+      start = 0;
+    // A trailing lone backslash is not an escape sequence.
+    while (backslash >= 0 && backslash + 1 < item.length) {
+      const escapedChar = item[backslash + 1];
+      let end = backslash + 2,
+        replacement;
+      if (escapedChar === 'u' || escapedChar === 'U') {
+        end += escapedChar === 'u' ? 4 : 8;
+        if (end > item.length) return null;
+        let charCode = 0;
+        for (let i = backslash + 2; i < end; i++) {
+          let digit = item.charCodeAt(i);
+          if (digit >= 0x30 && digit <= 0x39)
+            // 0–9
+            digit -= 0x30;else if (digit >= 0x41 && digit <= 0x46)
+            // A–F
+            digit -= 0x41 - 10;else if (digit >= 0x61 && digit <= 0x66)
+            // a–f
+            digit -= 0x61 - 10;else return null;
+          // Eight digits can exceed a signed 32-bit integer; avoid bitwise shifts.
+          charCode = charCode * 16 + digit;
         }
-        return String.fromCharCode(charCode);
+        if (!isValidCodePoint(charCode)) return null;
+        replacement = String.fromCodePoint(charCode);
+      } else {
+        if (!(escapedChar in replacements)) return null;
+        replacement = replacements[escapedChar];
       }
-      // 8-digit unicode character
-      if (typeof unicode8 === 'string') {
-        let charCode = Number.parseInt(unicode8, 16);
-        if (!isValidCodePoint(charCode)) {
-          invalid = true;
-          return '';
-        }
-        return charCode <= 0xFFFF ? String.fromCharCode(Number.parseInt(unicode8, 16)) : String.fromCharCode(0xD800 + ((charCode -= 0x10000) >> 10), 0xDC00 + (charCode & 0x3FF));
-      }
-      // fixed escape sequence
-      if (escapedChar in replacements) return replacements[escapedChar];
-      // invalid escape sequence
-      invalid = true;
-      return '';
-    });
-    return invalid ? null : replaced;
+      result += item.slice(start, backslash) + replacement;
+      start = end;
+      backslash = item.indexOf('\\', start);
+    }
+    return result + item.slice(start);
   }
 
   // ### `_parseLiteral` parses a literal into an unescaped value

package/lib/N3Store.js

@@ -368,12 +368,15 @@ class N3Store {
         if (!(index2 = index1[key1])) return 0;
         return key2 ? key2 in index2 ? 1 : 0 : index2[SIZE];
       }
-      for (const value1 in index1) count += index1[value1][SIZE];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++) count += index1[keys1[i1]][SIZE];
       return count;
     }
-    for (const value0 in index0) {
-      index1 = index0[value0];
-      for (const value1 in index1) count += index1[value1][SIZE];
+    const keys0 = Object.keys(index0);
+    for (let i0 = 0; i0 < keys0.length; i0++) {
+      index1 = index0[keys0[i0]];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++) count += index1[keys1[i1]][SIZE];
     }
     return count;
   }

package/package.json

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

package/src/N3Lexer.js

@@ -5,8 +5,6 @@ import namespaces from './IRIs';
 const { xsd } = namespaces;
 const SPACE = 0x20, TAB = 0x09, LF = 0x0A, CR = 0x0D, HASH = 0x23;
 
-// Regular expression and replacement strings to unescape N3 strings
-const escapeSequence = /\\u([a-fA-F0-9]{4})|\\U([a-fA-F0-9]{8})|\\([^])/g;
 // Fixed escape sequences allowed in string literals (ECHAR)
 const stringEscapeReplacements = {
   '\\': '\\', "'": "'", '"': '"',
@@ -561,37 +559,48 @@ export default class N3Lexer {
   // ### `_unescape` replaces N3 escape codes by their corresponding characters,
   // allowing only the fixed escape sequences from the given replacement table
   _unescape(item, replacements) {
-    if (item.indexOf('\\') < 0)
+    let backslash = item.indexOf('\\');
+    if (backslash < 0)
       return item;
-    let invalid = false;
-    const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
-      // 4-digit unicode character
-      if (typeof unicode4 === 'string') {
-        const charCode = Number.parseInt(unicode4, 16);
-        if (!isValidCodePoint(charCode)) {
-          invalid = true;
-          return '';
+
+    let result = '', start = 0;
+    // A trailing lone backslash is not an escape sequence.
+    while (backslash >= 0 && backslash + 1 < item.length) {
+      const escapedChar = item[backslash + 1];
+      let end = backslash + 2, replacement;
+      if (escapedChar === 'u' || escapedChar === 'U') {
+        end += escapedChar === 'u' ? 4 : 8;
+        if (end > item.length)
+          return null;
+
+        let charCode = 0;
+        for (let i = backslash + 2; i < end; i++) {
+          let digit = item.charCodeAt(i);
+          if (digit >= 0x30 && digit <= 0x39) // 0–9
+            digit -= 0x30;
+          else if (digit >= 0x41 && digit <= 0x46) // A–F
+            digit -= 0x41 - 10;
+          else if (digit >= 0x61 && digit <= 0x66) // a–f
+            digit -= 0x61 - 10;
+          else
+            return null;
+          // Eight digits can exceed a signed 32-bit integer; avoid bitwise shifts.
+          charCode = charCode * 16 + digit;
         }
-        return String.fromCharCode(charCode);
+        if (!isValidCodePoint(charCode))
+          return null;
+        replacement = String.fromCodePoint(charCode);
       }
-      // 8-digit unicode character
-      if (typeof unicode8 === 'string') {
-        let charCode = Number.parseInt(unicode8, 16);
-        if (!isValidCodePoint(charCode)) {
-          invalid = true;
-          return '';
-        }
-        return charCode <= 0xFFFF ? String.fromCharCode(Number.parseInt(unicode8, 16)) :
-          String.fromCharCode(0xD800 + ((charCode -= 0x10000) >> 10), 0xDC00 + (charCode & 0x3FF));
+      else {
+        if (!(escapedChar in replacements))
+          return null;
+        replacement = replacements[escapedChar];
       }
-      // fixed escape sequence
-      if (escapedChar in replacements)
-        return replacements[escapedChar];
-      // invalid escape sequence
-      invalid = true;
-      return '';
-    });
-    return invalid ? null : replaced;
+      result += item.slice(start, backslash) + replacement;
+      start = end;
+      backslash = item.indexOf('\\', start);
+    }
+    return result + item.slice(start);
   }
 
   // ### `_parseLiteral` parses a literal into an unescaped value

package/src/N3Store.js

@@ -394,15 +394,18 @@ export default class N3Store {
         return key2 ? (key2 in index2 ? 1 : 0) : index2[SIZE];
       }
 
-      for (const value1 in index1)
-        count += index1[value1][SIZE];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++)
+        count += index1[keys1[i1]][SIZE];
       return count;
     }
 
-    for (const value0 in index0) {
-      index1 = index0[value0];
-      for (const value1 in index1)
-        count += index1[value1][SIZE];
+    const keys0 = Object.keys(index0);
+    for (let i0 = 0; i0 < keys0.length; i0++) {
+      index1 = index0[keys0[i0]];
+      const keys1 = Object.keys(index1);
+      for (let i1 = 0; i1 < keys1.length; i1++)
+        count += index1[keys1[i1]][SIZE];
     }
     return count;
   }