eyeling 1.24.26 → 1.24.27

package/dist/browser/eyeling.browser.js

@@ -844,6 +844,62 @@ function compileSwapRegex(pattern, extraFlags) {
   }
 }
 
+function expandSwapRegexReplacement(template, captures) {
+  // SWAP/N3 examples use $1-style capture references, but tests also rely on
+  // Perl-ish escaping in replacement strings: \\$ means a literal dollar sign
+  // and \\ means a literal backslash.  JavaScript's replacement strings do not
+  // interpret those escapes, so expand the replacement explicitly in a callback.
+  let out = '';
+  const text = String(template);
+
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+
+    if (ch === '\\') {
+      if (i + 1 < text.length && (text[i + 1] === '$' || text[i + 1] === '\\')) {
+        out += text[++i];
+      } else {
+        out += ch;
+      }
+      continue;
+    }
+
+    if (ch === '$') {
+      if (i + 1 < text.length && text[i + 1] === '$') {
+        out += '$';
+        i++;
+        continue;
+      }
+
+      let j = i + 1;
+      while (j < text.length && /[0-9]/.test(text[j])) j++;
+      if (j > i + 1) {
+        const digits = text.slice(i + 1, j);
+        let chosen = null;
+        for (let k = digits.length; k > 0; k--) {
+          const n = Number(digits.slice(0, k));
+          if (n > 0 && n < captures.length) {
+            chosen = { n, len: k };
+            break;
+          }
+        }
+        if (chosen) {
+          out += captures[chosen.n] == null ? '' : String(captures[chosen.n]);
+          out += digits.slice(chosen.len);
+        } else {
+          out += '$' + digits;
+        }
+        i = j - 1;
+        continue;
+      }
+    }
+
+    out += ch;
+  }
+
+  return out;
+}
+
 // -----------------------------------------------------------------------------
 // Strict numeric literal parsing for math: builtins
 // -----------------------------------------------------------------------------
@@ -4222,7 +4278,11 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     const re = compileSwapRegex(searchStr, 'g');
     if (!re) return [];
 
-    const outStr = dataStr.replace(re, replStr);
+    const outStr = dataStr.replace(re, (...args) => {
+      const captureEnd = args.length - (typeof args.at(-1) === 'object' ? 3 : 2);
+      const captures = args.slice(0, Math.max(1, captureEnd));
+      return expandSwapRegexReplacement(replStr, captures);
+    });
     const lit = makeStringLiteral(outStr);
 
     if (g.o instanceof Var) {

package/eyeling.js

@@ -844,6 +844,62 @@ function compileSwapRegex(pattern, extraFlags) {
   }
 }
 
+function expandSwapRegexReplacement(template, captures) {
+  // SWAP/N3 examples use $1-style capture references, but tests also rely on
+  // Perl-ish escaping in replacement strings: \\$ means a literal dollar sign
+  // and \\ means a literal backslash.  JavaScript's replacement strings do not
+  // interpret those escapes, so expand the replacement explicitly in a callback.
+  let out = '';
+  const text = String(template);
+
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+
+    if (ch === '\\') {
+      if (i + 1 < text.length && (text[i + 1] === '$' || text[i + 1] === '\\')) {
+        out += text[++i];
+      } else {
+        out += ch;
+      }
+      continue;
+    }
+
+    if (ch === '$') {
+      if (i + 1 < text.length && text[i + 1] === '$') {
+        out += '$';
+        i++;
+        continue;
+      }
+
+      let j = i + 1;
+      while (j < text.length && /[0-9]/.test(text[j])) j++;
+      if (j > i + 1) {
+        const digits = text.slice(i + 1, j);
+        let chosen = null;
+        for (let k = digits.length; k > 0; k--) {
+          const n = Number(digits.slice(0, k));
+          if (n > 0 && n < captures.length) {
+            chosen = { n, len: k };
+            break;
+          }
+        }
+        if (chosen) {
+          out += captures[chosen.n] == null ? '' : String(captures[chosen.n]);
+          out += digits.slice(chosen.len);
+        } else {
+          out += '$' + digits;
+        }
+        i = j - 1;
+        continue;
+      }
+    }
+
+    out += ch;
+  }
+
+  return out;
+}
+
 // -----------------------------------------------------------------------------
 // Strict numeric literal parsing for math: builtins
 // -----------------------------------------------------------------------------
@@ -4222,7 +4278,11 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     const re = compileSwapRegex(searchStr, 'g');
     if (!re) return [];
 
-    const outStr = dataStr.replace(re, replStr);
+    const outStr = dataStr.replace(re, (...args) => {
+      const captureEnd = args.length - (typeof args.at(-1) === 'object' ? 3 : 2);
+      const captures = args.slice(0, Math.max(1, captureEnd));
+      return expandSwapRegexReplacement(replStr, captures);
+    });
     const lit = makeStringLiteral(outStr);
 
     if (g.o instanceof Var) {

package/lib/builtins.js

@@ -833,6 +833,62 @@ function compileSwapRegex(pattern, extraFlags) {
   }
 }
 
+function expandSwapRegexReplacement(template, captures) {
+  // SWAP/N3 examples use $1-style capture references, but tests also rely on
+  // Perl-ish escaping in replacement strings: \\$ means a literal dollar sign
+  // and \\ means a literal backslash.  JavaScript's replacement strings do not
+  // interpret those escapes, so expand the replacement explicitly in a callback.
+  let out = '';
+  const text = String(template);
+
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+
+    if (ch === '\\') {
+      if (i + 1 < text.length && (text[i + 1] === '$' || text[i + 1] === '\\')) {
+        out += text[++i];
+      } else {
+        out += ch;
+      }
+      continue;
+    }
+
+    if (ch === '$') {
+      if (i + 1 < text.length && text[i + 1] === '$') {
+        out += '$';
+        i++;
+        continue;
+      }
+
+      let j = i + 1;
+      while (j < text.length && /[0-9]/.test(text[j])) j++;
+      if (j > i + 1) {
+        const digits = text.slice(i + 1, j);
+        let chosen = null;
+        for (let k = digits.length; k > 0; k--) {
+          const n = Number(digits.slice(0, k));
+          if (n > 0 && n < captures.length) {
+            chosen = { n, len: k };
+            break;
+          }
+        }
+        if (chosen) {
+          out += captures[chosen.n] == null ? '' : String(captures[chosen.n]);
+          out += digits.slice(chosen.len);
+        } else {
+          out += '$' + digits;
+        }
+        i = j - 1;
+        continue;
+      }
+    }
+
+    out += ch;
+  }
+
+  return out;
+}
+
 // -----------------------------------------------------------------------------
 // Strict numeric literal parsing for math: builtins
 // -----------------------------------------------------------------------------
@@ -4211,7 +4267,11 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     const re = compileSwapRegex(searchStr, 'g');
     if (!re) return [];
 
-    const outStr = dataStr.replace(re, replStr);
+    const outStr = dataStr.replace(re, (...args) => {
+      const captureEnd = args.length - (typeof args.at(-1) === 'object' ? 3 : 2);
+      const captures = args.slice(0, Math.max(1, captureEnd));
+      return expandSwapRegexReplacement(replStr, captures);
+    });
     const lit = makeStringLiteral(outStr);
 
     if (g.o instanceof Var) {

package/package.json

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

package/test/api.test.js

@@ -1533,6 +1533,35 @@ res:CITY_Chañaral rdfs:label "Chañaral".
     expect: [/:result\s+:has\s+:success-literal-30\s*\./, /:test\s+:is\s+true\s*\./],
   },
 
+  {
+    name: '52g regression: string:replace honors escaped dollar and backslash in replacement',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/> .
+@prefix string: <http://www.w3.org/2000/10/swap/string#> .
+
+{
+    ("abcd" "b" "\\$\\\\") string:replace "a$\\cd".
+}
+=>
+{
+    :result :has :success-literal-8.
+}.
+
+{} => {
+    :test :contains :success-literal-8.
+}.
+
+{
+    :result :has :success-literal-8.
+}
+=>
+{
+    :test :is true.
+}.
+`,
+    expect: [/:result\s+:has\s+:success-literal-8\s*\./, /:test\s+:is\s+true\s*\./],
+  },
+
   {
     name: '53 --stream: prints prefixes used in input (not just derived output) before streaming triples',
     opt: ['--stream', '-n'],