eyeling 1.23.4 → 1.23.5

package/HANDBOOK.md

@@ -1967,7 +1967,7 @@ It deliberately does **not** expose `loadBuiltinModule(...)`, because loading bu
 
 For browser apps, prefer running Eyeling in a **Web Worker** and importing `eyeling/browser` there.
 
-### 14.3 `lib/entry.js`: bundler-friendly exports
+### 14.4 `lib/entry.js`: bundler-friendly exports
 
 `lib/entry.js` exports:
 
@@ -1976,14 +1976,14 @@ For browser apps, prefer running Eyeling in a **Web Worker** and importing `eyel
 
 `rdfjs` is a small built-in RDF/JS `DataFactory`, so browser / worker code can construct quads without pulling in another package first.
 
-### 14.4 JavaScript API
+### 14.5 JavaScript API
 
 Eyeling exposes two JavaScript entry styles:
 
 - `reason(...)` from `index.js` when you want the same text output as the CLI
 - `reasonStream(...)` / `reasonRdfJs(...)` from the Node bundle or `eyeling/browser` when you want in-process reasoning and structured RDF/JS results
 
-#### 14.4.1 npm helper: `reason(...)`
+#### 14.5.1 npm helper: `reason(...)`
 
 The npm `reason(...)` function does something intentionally simple and robust:
 
@@ -2036,7 +2036,7 @@ Notes:
 - By default, the npm helper keeps output machine-friendly (`proofComments: false`).
 - Use this path when you want CLI-equivalent behavior inside JavaScript.
 
-#### 14.4.2 RDF-JS and Eyeling rule-object interoperability
+#### 14.5.2 RDF-JS and Eyeling rule-object interoperability
 
 The JavaScript APIs accept four input styles:
 
@@ -2114,7 +2114,7 @@ console.log(out);
 
 You can also pass a full AST bundle directly, for example `[prefixes, triples, forwardRules, backwardRules]`.
 
-#### 14.4.3 In-process bundle API: `reasonStream(...)` and `reasonRdfJs(...)`
+#### 14.5.3 In-process bundle API: `reasonStream(...)` and `reasonRdfJs(...)`
 
 Use the bundle entry if you want structured results while the engine is running instead of final CLI text after the fact.
 
@@ -2153,7 +2153,7 @@ Use these entry points when you need one or more of the following:
 - derived results consumed as RDF/JS quads
 - streaming derived RDF/JS quads during reasoning
 
-### 14.5 Choosing the right entry point
+### 14.6 Choosing the right entry point
 
 A practical rule of thumb:
 

package/dist/browser/eyeling.browser.js

@@ -11158,6 +11158,37 @@ ${triples.map((tr) => `  ${tripleToN3(tr, prefixes)}`).join('\n')}
 
     const __literalPartsCache = new Map(); // lit string -> [lex, dt]
 
+    function quotedLiteralEndIndex(str) {
+      if (typeof str !== 'string' || str.length < 2) return -1;
+
+      const quote = str[0];
+      if (quote !== '"' && quote !== "'") return -1;
+
+      const delimLen = str.startsWith(quote.repeat(3)) ? 3 : 1;
+      const delim = quote.repeat(delimLen);
+
+      let i = delimLen;
+      while (i < str.length) {
+        // Stored literals may contain escaped quotes, e.g. \"...\"^^xsd:dateTime
+        // inside a plain string. Those must not terminate the outer lexical form.
+        if (str[i] === '\\') {
+          i += 2;
+          continue;
+        }
+
+        if (delimLen === 1) {
+          if (str[i] === quote) return i + 1;
+          i += 1;
+          continue;
+        }
+
+        if (str.startsWith(delim, i)) return i + delimLen;
+        i += 1;
+      }
+
+      return -1;
+    }
+
     function literalParts(lit) {
       // Avoid caching extremely large literals (notably huge numeric intermediates)
       // to prevent unbounded memory growth.
@@ -11175,24 +11206,21 @@ ${triples.map((tr) => `  ${tripleToN3(tr, prefixes)}`).join('\n')}
       let lex = lit;
       let dt = null;
 
-      const re = /^(['"]{1,3})([\s\S]*?)\1\^\^(.+)$/;
-      const match = lit.match(re);
-      if (match) {
-        lex = match[1] + match[2] + match[1];
-        dt = match[3];
+      const lexEnd = quotedLiteralEndIndex(lit);
+      if (lexEnd > 0 && lit.startsWith('^^', lexEnd)) {
+        lex = lit.slice(0, lexEnd);
+        dt = lit.slice(lexEnd + 2);
         if (dt.startsWith('<') && dt.endsWith('>')) {
           dt = dt.slice(1, -1);
         }
       }
 
       // Strip LANGTAG from the lexical form when present.
-      if (lex.length >= 2 && lex[0] === '"') {
-        const lastQuote = lex.lastIndexOf('"');
-        if (lastQuote > 0 && lastQuote < lex.length - 1 && lex[lastQuote + 1] === '@') {
-          const lang = lex.slice(lastQuote + 2);
-          if (/^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/.test(lang)) {
-            lex = lex.slice(0, lastQuote + 1);
-          }
+      const langLexEnd = quotedLiteralEndIndex(lex);
+      if (langLexEnd > 0 && lex[0] === '"' && langLexEnd < lex.length && lex[langLexEnd] === '@') {
+        const lang = lex.slice(langLexEnd + 1);
+        if (/^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/.test(lang)) {
+          lex = lex.slice(0, langLexEnd);
         }
       }
 

package/eyeling.js

@@ -11130,6 +11130,37 @@ const MAX_LITERAL_PARTS_CACHE_LEN = 1024;
 
 const __literalPartsCache = new Map(); // lit string -> [lex, dt]
 
+function quotedLiteralEndIndex(str) {
+  if (typeof str !== 'string' || str.length < 2) return -1;
+
+  const quote = str[0];
+  if (quote !== '"' && quote !== "'") return -1;
+
+  const delimLen = str.startsWith(quote.repeat(3)) ? 3 : 1;
+  const delim = quote.repeat(delimLen);
+
+  let i = delimLen;
+  while (i < str.length) {
+    // Stored literals may contain escaped quotes, e.g. \"...\"^^xsd:dateTime
+    // inside a plain string. Those must not terminate the outer lexical form.
+    if (str[i] === '\\') {
+      i += 2;
+      continue;
+    }
+
+    if (delimLen === 1) {
+      if (str[i] === quote) return i + 1;
+      i += 1;
+      continue;
+    }
+
+    if (str.startsWith(delim, i)) return i + delimLen;
+    i += 1;
+  }
+
+  return -1;
+}
+
 function literalParts(lit) {
   // Avoid caching extremely large literals (notably huge numeric intermediates)
   // to prevent unbounded memory growth.
@@ -11147,24 +11178,21 @@ function literalParts(lit) {
   let lex = lit;
   let dt = null;
 
-  const re = /^(['"]{1,3})([\s\S]*?)\1\^\^(.+)$/;
-  const match = lit.match(re);
-  if (match) {
-    lex = match[1] + match[2] + match[1];
-    dt = match[3];
+  const lexEnd = quotedLiteralEndIndex(lit);
+  if (lexEnd > 0 && lit.startsWith('^^', lexEnd)) {
+    lex = lit.slice(0, lexEnd);
+    dt = lit.slice(lexEnd + 2);
     if (dt.startsWith('<') && dt.endsWith('>')) {
       dt = dt.slice(1, -1);
     }
   }
 
   // Strip LANGTAG from the lexical form when present.
-  if (lex.length >= 2 && lex[0] === '"') {
-    const lastQuote = lex.lastIndexOf('"');
-    if (lastQuote > 0 && lastQuote < lex.length - 1 && lex[lastQuote + 1] === '@') {
-      const lang = lex.slice(lastQuote + 2);
-      if (/^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/.test(lang)) {
-        lex = lex.slice(0, lastQuote + 1);
-      }
+  const langLexEnd = quotedLiteralEndIndex(lex);
+  if (langLexEnd > 0 && lex[0] === '"' && langLexEnd < lex.length && lex[langLexEnd] === '@') {
+    const lang = lex.slice(langLexEnd + 1);
+    if (/^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/.test(lang)) {
+      lex = lex.slice(0, langLexEnd);
     }
   }
 

package/lib/prelude.js

@@ -43,6 +43,37 @@ const MAX_LITERAL_PARTS_CACHE_LEN = 1024;
 
 const __literalPartsCache = new Map(); // lit string -> [lex, dt]
 
+function quotedLiteralEndIndex(str) {
+  if (typeof str !== 'string' || str.length < 2) return -1;
+
+  const quote = str[0];
+  if (quote !== '"' && quote !== "'") return -1;
+
+  const delimLen = str.startsWith(quote.repeat(3)) ? 3 : 1;
+  const delim = quote.repeat(delimLen);
+
+  let i = delimLen;
+  while (i < str.length) {
+    // Stored literals may contain escaped quotes, e.g. \"...\"^^xsd:dateTime
+    // inside a plain string. Those must not terminate the outer lexical form.
+    if (str[i] === '\\') {
+      i += 2;
+      continue;
+    }
+
+    if (delimLen === 1) {
+      if (str[i] === quote) return i + 1;
+      i += 1;
+      continue;
+    }
+
+    if (str.startsWith(delim, i)) return i + delimLen;
+    i += 1;
+  }
+
+  return -1;
+}
+
 function literalParts(lit) {
   // Avoid caching extremely large literals (notably huge numeric intermediates)
   // to prevent unbounded memory growth.
@@ -60,24 +91,21 @@ function literalParts(lit) {
   let lex = lit;
   let dt = null;
 
-  const re = /^(['"]{1,3})([\s\S]*?)\1\^\^(.+)$/;
-  const match = lit.match(re);
-  if (match) {
-    lex = match[1] + match[2] + match[1];
-    dt = match[3];
+  const lexEnd = quotedLiteralEndIndex(lit);
+  if (lexEnd > 0 && lit.startsWith('^^', lexEnd)) {
+    lex = lit.slice(0, lexEnd);
+    dt = lit.slice(lexEnd + 2);
     if (dt.startsWith('<') && dt.endsWith('>')) {
       dt = dt.slice(1, -1);
     }
   }
 
   // Strip LANGTAG from the lexical form when present.
-  if (lex.length >= 2 && lex[0] === '"') {
-    const lastQuote = lex.lastIndexOf('"');
-    if (lastQuote > 0 && lastQuote < lex.length - 1 && lex[lastQuote + 1] === '@') {
-      const lang = lex.slice(lastQuote + 2);
-      if (/^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/.test(lang)) {
-        lex = lex.slice(0, lastQuote + 1);
-      }
+  const langLexEnd = quotedLiteralEndIndex(lex);
+  if (langLexEnd > 0 && lex[0] === '"' && langLexEnd < lex.length && lex[langLexEnd] === '@') {
+    const lang = lex.slice(langLexEnd + 1);
+    if (/^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/.test(lang)) {
+      lex = lex.slice(0, langLexEnd);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [

package/test/api.test.js

@@ -288,6 +288,33 @@ const cases = [
       assert.equal(String(out).trimEnd(), '^^');
     },
   },
+  {
+    name: '00c quoted string containing typed literal syntax remains plain string',
+    opt: { proofComments: false },
+    input: `
+@prefix : <http://example.org/>.
+
+:s :p """
+@prefix : <http://example.org/>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
+
+:Let :param \"2023-04-01T18:06:04Z\"^^xsd:dateTime .
+""".
+
+{
+  :s :p ?O.
+}
+=>
+{
+  :test :is ?O.
+}.
+`,
+    expect: [/^:test\s+:is\s+/m],
+    notExpect: [/\^\^<xsd:dateTime/],
+    check(out) {
+      assert.match(out, /\\"2023-04-01T18:06:04Z\\"\^\^xsd:dateTime \./);
+    },
+  },
   {
     name: '01 forward rule: p -> q',
     opt: { proofComments: false },