n3 2.0.3 → 2.1.0

package/lib/N3Lexer.js

@@ -45,6 +45,9 @@ const escapeReplacements = {
   '%': '%'
 };
 const illegalIriChars = /[\x00-\x20<>\\"\{\}\|\^\`]/;
+function isSurrogateCodePoint(charCode) {
+  return charCode >= 0xD800 && charCode <= 0xDFFF;
+}
 const lineModeRegExps = {
   _iri: true,
   _unescapedIri: true,
@@ -414,10 +417,21 @@ class N3Lexer {
     let invalid = false;
     const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
       // 4-digit unicode character
-      if (typeof unicode4 === 'string') return String.fromCharCode(Number.parseInt(unicode4, 16));
+      if (typeof unicode4 === 'string') {
+        const charCode = Number.parseInt(unicode4, 16);
+        if (isSurrogateCodePoint(charCode)) {
+          invalid = true;
+          return '';
+        }
+        return String.fromCharCode(charCode);
+      }
       // 8-digit unicode character
       if (typeof unicode8 === 'string') {
         let charCode = Number.parseInt(unicode8, 16);
+        if (isSurrogateCodePoint(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

package/lib/N3Reasoner.js

@@ -36,8 +36,6 @@ class N3Reasoner {
     this._store._addToIndex(graphItem.objects, object, subject, predicate);
     cb();
   }
-
-  // eslint-disable-next-line no-warning-comments
   _evaluatePremise(rule, content, cb, i = 0) {
     let v1, v2, value, index1, index2;
     const [val0, val1, val2] = rule.premise[i].value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -37,20 +37,24 @@
     "browserify": "^17.0.0",
     "deep-taxonomy-benchmark": "^2.0.0",
     "docco": "^0.9.1",
-    "eslint": "^8.57.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^28.8.3",
-    "jest": "^29.7.0",
-    "pre-commit": "^1.2.2",
+    "esbuild": "^0.28.1",
+    "eslint": "^10.4.1",
+    "eslint-plugin-import-x": "^4.16.2",
+    "eslint-plugin-jest": "^29.15.0",
+    "globals": "^17.6.0",
+    "jest": "^30.4.2",
+    "pre-commit": "^2.0.0",
     "rdf-isomorphic": "^2.0.0",
-    "rdf-test-suite": "^1.25.0",
+    "rdf-test-suite": "^2.1.4",
     "streamify-string": "^1.0.1",
     "uglify-js": "^3.14.3"
   },
   "scripts": {
     "build": "npm run build:node && npm run build:browser",
     "build:node": "babel src -d lib",
-    "build:browser": "rm -rf browser && mkdir browser && browserify -s N3 lib/index.js | uglifyjs > browser/n3.min.js",
+    "build:browser": "rm -rf browser && mkdir browser && npm run build:browser:umd && npm run build:browser:esm",
+    "build:browser:umd": "browserify -s N3 lib/index.js | uglifyjs > browser/n3.min.js",
+    "build:browser:esm": "node scripts/build-esm.js",
     "test": "jest",
     "lint": "eslint src perf test spec",
     "prepare": "npm run build",
@@ -94,6 +98,10 @@
       "**/test/*-test.js"
     ],
     "collectCoverage": true,
+    "coveragePathIgnorePatterns": [
+      "/node_modules/",
+      "/browser/"
+    ],
     "coverageReporters": [
       "json-summary",
       "text",

package/src/N3Lexer.js

@@ -15,6 +15,10 @@ const escapeReplacements = {
 };
 const illegalIriChars = /[\x00-\x20<>\\"\{\}\|\^\`]/;
 
+function isSurrogateCodePoint(charCode) {
+  return charCode >= 0xD800 && charCode <= 0xDFFF;
+}
+
 const lineModeRegExps = {
   _iri: true,
   _unescapedIri: true,
@@ -419,11 +423,21 @@ export default class N3Lexer {
     let invalid = false;
     const replaced = item.replace(escapeSequence, (sequence, unicode4, unicode8, escapedChar) => {
       // 4-digit unicode character
-      if (typeof unicode4 === 'string')
-        return String.fromCharCode(Number.parseInt(unicode4, 16));
+      if (typeof unicode4 === 'string') {
+        const charCode = Number.parseInt(unicode4, 16);
+        if (isSurrogateCodePoint(charCode)) {
+          invalid = true;
+          return '';
+        }
+        return String.fromCharCode(charCode);
+      }
       // 8-digit unicode character
       if (typeof unicode8 === 'string') {
         let charCode = Number.parseInt(unicode8, 16);
+        if (isSurrogateCodePoint(charCode)) {
+          invalid = true;
+          return '';
+        }
         return charCode <= 0xFFFF ? String.fromCharCode(Number.parseInt(unicode8, 16)) :
           String.fromCharCode(0xD800 + ((charCode -= 0x10000) >> 10), 0xDC00 + (charCode & 0x3FF));
       }

package/src/N3Reasoner.js

@@ -26,7 +26,6 @@ export default class N3Reasoner {
     cb();
   }
 
-  // eslint-disable-next-line no-warning-comments
   _evaluatePremise(rule, content, cb, i = 0) {
     let v1, v2, value, index1, index2;
     const [val0, val1, val2] = rule.premise[i].value, index = content[rule.premise[i].content];