@poe-platform/safe-bash 0.1.747 → 0.1.748

package/dist/safe-bash/shell/runtime.js

@@ -1,6 +1,6 @@
 import { splitSyncJqExpression } from "./sync-jq-expression.js";
 import { wcDisplayWidth } from "../commands/wc-width.js";
-import { text as awkValueText, compare as awkCompare, inputValue as awkInputValue, numeric as awkNumeric, string as awkString } from "../commands/text-programs/awk-values.js";
+import { text as awkValueText, compare as awkCompare, inputValue as awkInputValue, numeric as awkNumeric, number as awkNumber, string as awkString } from "../commands/text-programs/awk-values.js";
 import { bytesToHex, latin1Text } from "../byte-encoding.js";
 const sharedCaptureDecoder = new TextDecoder();
 const cachedCaptureAsciiBytes = new Uint8Array(4096);
@@ -13637,60 +13637,11 @@ export class Runtime {
                     // command. A late fallback would replay effects already performed.
                     return false;
                 }
-                const sel = getArraySelector(part);
-                if (sel !== undefined) {
-                    if (rawState.nounset)
-                        return false;
-                    if (sel.kind === "members" || sel.kind === "keys") {
-                        if (part.operator !== undefined) {
-                            if (sel.kind === "members" &&
-                                !part.keys &&
-                                !part.length &&
-                                !part.substring &&
-                                part.quoted &&
-                                (sel.separator === "*" || (allowAt && sel.separator === "@")) &&
-                                this.budget.limits.maxExpansionBytes === Infinity &&
-                                !rawState.nocasematch) {
-                                if ((part.operator === "#" || part.operator === "##" || part.operator === "%" || part.operator === "%%") && part.alternate && part.alternate.parts.length === 1 && part.alternate.parts[0].kind === "text" && (!hasGlobOrEscape(part.alternate.parts[0].value, true) || (!part.alternate.parts[0].quoted && Boolean(tryCompileTrimGlobToRegex(part.alternate.parts[0].value, part.operator, !!rawState.extglob)))))
-                                    continue;
-                                if ((part.operator === "/" || part.operator === "//" || part.operator === "/#" || part.operator === "/%") && part.alternate && part.alternate.parts.length === 1 && part.alternate.parts[0].kind === "text" && part.alternate.parts[0].value.length > 0 && (!hasGlobOrEscape(part.alternate.parts[0].value, true) || (!part.alternate.parts[0].quoted && Boolean(tryCompileFixedGlobToRegex(part.alternate.parts[0].value, part.operator, !!rawState.extglob)))) && (!part.replacement || part.replacement.parts.length === 0 || (part.replacement.parts.length === 1 && part.replacement.parts[0].kind === "text" && !part.replacement.parts[0].value.includes("&") && !part.replacement.parts[0].value.includes("\\") && !part.replacement.parts[0].value.startsWith("~"))))
-                                    continue;
-                                if ((part.operator === "^" || part.operator === "^^" || part.operator === "," || part.operator === ",,") && (!part.alternate || part.alternate.parts.length === 0))
-                                    continue;
-                            }
-                            return false;
-                        }
-                        if (part.length) {
-                            if (part.substring)
-                                return false;
-                            continue;
-                        }
-                        if (part.quoted && (sel.separator === "*" || (allowAt && sel.separator === "@")) && this.budget.limits.maxExpansionBytes === Infinity && (!part.substring || (sel.kind === "members" && part.substring.offset.parts.every(p => p.kind === "text" || (p.kind === "variable" && !p.operator && !p.substring && !p.length)) && (!part.substring.length || part.substring.length.parts.every(p => p.kind === "text" || (p.kind === "variable" && !p.operator && !p.substring && !p.length)))))) {
-                            continue;
-                        }
-                        return false;
-                    }
-                    if (sel.kind === "element") {
-                        if (part.substring) {
-                            // Bindings, indices and character widths can change each
-                            // iteration. The limited element slicer may then need fallback;
-                            // do not speculate after earlier compound effects have run.
-                            return false;
-                        }
-                        if (part.operator === undefined)
-                            continue;
-                        if ((part.operator === "-" || part.operator === ":-" || part.operator === "+" || part.operator === ":+") && part.alternate && !part.length)
-                            continue;
-                        if ((part.operator === "^" || part.operator === "^^" || part.operator === "," || part.operator === ",,") && (!part.alternate || part.alternate.parts.length === 0) && !part.length)
-                            continue;
-                        if (!part.length && !rawState.nocasematch && this.budget.limits.maxExpansionBytes === Infinity) {
-                            if ((part.operator === "#" || part.operator === "##" || part.operator === "%" || part.operator === "%%") && part.alternate && part.alternate.parts.length === 1 && part.alternate.parts[0].kind === "text" && !hasGlobOrEscape(part.alternate.parts[0].value, true))
-                                continue;
-                            if ((part.operator === "/" || part.operator === "//" || part.operator === "/#" || part.operator === "/%") && part.alternate && part.alternate.parts.length === 1 && part.alternate.parts[0].kind === "text" && part.alternate.parts[0].value.length > 0 && !hasGlobOrEscape(part.alternate.parts[0].value, true) && (!part.replacement || part.replacement.parts.length === 0 || (part.replacement.parts.length === 1 && part.replacement.parts[0].kind === "text" && !part.replacement.parts[0].value.includes("&") && !part.replacement.parts[0].value.includes("\\") && !part.replacement.parts[0].value.startsWith("~"))))
-                                continue;
-                        }
-                        return false;
-                    }
+                if (getArraySelector(part) !== undefined) {
+                    // A loop can change the binding or subscript after preflight. The
+                    // limited fast evaluator may then return undefined, after earlier
+                    // effects have already run. Use normal expansion for selectors and
+                    // their alternates rather than risking corruption or replay.
                     return false;
                 }
                 if (part.length || part.substring || part.operator !== undefined) {
@@ -13925,13 +13876,19 @@ export class Runtime {
                                 return false;
                         }
                         else if (w0Plain === "awk") {
-                            if (plainOps.length !== opCount || this.evalSyncAwk([], plainOps) === undefined)
+                            const input = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
+                            if (plainOps.length !== opCount || input === undefined)
+                                return false;
+                            const lines = input.length === 0 ? [] : input.split("\n");
+                            if (input.endsWith("\n"))
+                                lines.pop();
+                            if (this.evalSyncAwk(lines, plainOps) === undefined)
                                 return false;
                         }
                         else if (w0Plain === "jq") {
                             if (plainOps.length !== opCount)
                                 return false;
-                            const jqIn = this.extractLoopInvariantJqInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
+                            const jqIn = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
                             if (jqIn === undefined || this.evalSyncJq(jqIn, plainOps) === undefined)
                                 return false;
                         }
@@ -13964,7 +13921,7 @@ export class Runtime {
                                 return false;
                         }
                         else if (w0Plain === "numfmt") {
-                            const nmCheck = this.extractLoopInvariantJqInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
+                            const nmCheck = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
                             if (nmCheck === undefined || plainOps.length !== opCount || this.evalSyncNumfmt(nmCheck.split("\n"), plainOps) === undefined)
                                 return false;
                         }
@@ -14087,7 +14044,15 @@ export class Runtime {
                                 return false;
                         }
                         else if (sName === "awk") {
-                            if (this.evalSyncAwk([], sPlainArgs) === undefined)
+                            if (sIdx !== 1)
+                                return false;
+                            const input = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
+                            if (input === undefined)
+                                return false;
+                            const lines = input.length === 0 ? [] : input.split("\n");
+                            if (input.endsWith("\n"))
+                                lines.pop();
+                            if (this.evalSyncAwk(lines, sPlainArgs) === undefined)
                                 return false;
                         }
                         else if (sName === "grep") {
@@ -14101,7 +14066,7 @@ export class Runtime {
                         else if (sName === "jq") {
                             if (sIdx !== 1)
                                 return false;
-                            const jqIn = this.extractLoopInvariantJqInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
+                            const jqIn = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
                             if (jqIn === undefined || this.evalSyncJq(jqIn, sPlainArgs) === undefined)
                                 return false;
                         }
@@ -14124,7 +14089,7 @@ export class Runtime {
                         else if (sName === "numfmt") {
                             if (sIdx !== 1)
                                 return false;
-                            const nmCheck = this.extractLoopInvariantJqInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
+                            const nmCheck = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
                             if (nmCheck === undefined || this.evalSyncNumfmt(nmCheck.split("\n"), sPlainArgs) === undefined)
                                 return false;
                         }
@@ -14201,50 +14166,15 @@ export class Runtime {
         }
         return undefined;
     }
-    execSyncUnsetStep(step, rawState, io, monitor, touched) {
+    execSyncUnsetStep(step, rawState, monitor, touched) {
         const uVars = step.unsetVars;
-        const store = monitor.store;
         let lastExpanded = "";
-        for (let ui = 0; ui < uVars.length; ui++) {
-            const uvn = uVars[ui];
-            if (uvn.charCodeAt(0) === 64) {
-                const wIdx = Number(uvn.slice(1));
-                const wu = step.cmd.words[wIdx];
-                const tExpanded = this.fastValueWord(wu, rawState, io, false, false, false, false, 0, step.line);
-                lastExpanded = tExpanded;
-                const bracket = tExpanded.indexOf("[");
-                if (bracket > 0 && tExpanded.endsWith("]") && store) {
-                    const arrName = tExpanded.slice(0, bracket);
-                    const subStr = tExpanded.slice(bracket + 1, -1);
-                    const binding = store.get(arrName);
-                    if (binding) {
-                        if (binding.associative) {
-                            const id = fastStringHexIdentity(subStr);
-                            const existingKey = binding.keys.get(id);
-                            if (existingKey !== undefined) {
-                                binding.remove(existingKey.index);
-                                store.changed(monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets), arrName);
-                            }
-                        }
-                        else {
-                            const idxNum = /^(?:0|[1-9][0-9]{0,8})$/.test(subStr)
-                                ? Number(subStr)
-                                : resolveSimpleArithOperand(subStr, rawState, monitor, store, this._syncArithRawWriteOnly ? this._syncArithTouched : undefined);
-                            const resolvedIdx = idxNum !== undefined ? (idxNum >= 0 ? idxNum : binding.maximum + 1 + idxNum) : undefined;
-                            if (resolvedIdx !== undefined && resolvedIdx >= 0 && binding.values.has(resolvedIdx)) {
-                                binding.remove(resolvedIdx);
-                                store.changed(monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets), arrName);
-                            }
-                        }
-                    }
-                }
-            }
-            else {
-                delete rawState.variables[uvn];
-                monitor.proxy.exported.delete(uvn);
-                touched.add(uvn);
-                lastExpanded = uvn;
-            }
+        for (const uvn of uVars) {
+            delete rawState.variables[uvn];
+            rawState.exported.delete(uvn);
+            monitor.proxy.exported.delete(uvn);
+            touched.add(uvn);
+            lastExpanded = uvn;
         }
         return lastExpanded;
     }
@@ -14268,26 +14198,7 @@ export class Runtime {
             if (vn && startIdx === 1 && hasShellFunction(rawState, vn))
                 return undefined;
             if (!vn || vn.startsWith("-") || !isShellIdentifier(vn) || controlNames.has(vn) || vn === "OPTIND" || rawState.readonlyVariables?.has(vn) || rawState.variableAttributes?.get(vn) || store?.get(vn) || stateMonitor(rawState)?.hasOverlay(vn) || rawState.locals.some(f => f.has(vn))) {
-                const wu = cmd.words[i];
-                const p0 = wu.parts[0];
-                const pLast = wu.parts[wu.parts.length - 1];
-                const m = p0?.kind === "text" ? /^([a-zA-Z_][a-zA-Z0-9_]*)\[/.exec(p0.value) : undefined;
-                const arrName = m?.[1];
-                const b = arrName ? store?.get(arrName) : undefined;
-                if (arrName &&
-                    b &&
-                    b.references === 1 &&
-                    !store.watches.has(arrName) &&
-                    !rawState.readonlyVariables?.has(arrName) &&
-                    !hasUnpreparedLocal(rawState, arrName) &&
-                    !stateMonitor(rawState)?.hasOverlay(arrName) &&
-                    pLast?.kind === "text" &&
-                    pLast.value.endsWith("]") &&
-                    this.isPureSyncValueWord(wu, rawState) &&
-                    (p0.quoted || rawState.noglob || (!rawState.nullglob && this._isMemoryBackingFs && tryGetMemoryDirectoryEntryNamesSync(this.backingFs, rawState.cwd)?.size === 0))) {
-                    vars.push(`@${i}`);
-                    continue;
-                }
+                // Array unsets need the full builtin: arithmetic, @/* and maximum-index updates.
                 return undefined;
             }
             vars.push(vn);
@@ -15052,6 +14963,10 @@ export class Runtime {
                     return false;
                 }
                 const assignment = this.assignment(w0);
+                // Eligibility is checked against the entry locale. Changing it can make
+                // otherwise pure expansions require the asynchronous byte-aware path.
+                if (assignment && (assignment.name === "LC_ALL" || assignment.name === "LC_CTYPE" || assignment.name === "LC_COLLATE" || assignment.name === "LANG"))
+                    return false;
                 if (!assignment || (assignment.append && this.budget.limits.maxExpansionBytes !== Infinity) || assignment.name === "OPTIND" || assignment.name === "PIPESTATUS" || assignment.name.includes("[") || rawState.readonlyVariables?.has(assignment.name) || rawState.variableAttributes?.get(assignment.name) || store?.get(assignment.name) || !this.isPureSyncValueWord(assignment.value, rawState)) {
                     return false;
                 }
@@ -16855,7 +16770,8 @@ export class Runtime {
                     }
                     else {
                         monitor.values.invalidate(varName);
-                        monitor.proxy.exported.delete(varName);
+                        if (!rawState.exported.has(varName))
+                            monitor.proxy.exported.delete(varName);
                     }
                 }
             }
@@ -17120,7 +17036,7 @@ export class Runtime {
         };
         return visit(script);
     }
-    extractLoopInvariantJqInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState) {
+    extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState) {
         const w0 = cmd.words[0]?.plain;
         const resolveInvariantWord = (w) => {
             if (w.plain !== undefined)
@@ -17137,10 +17053,10 @@ export class Runtime {
             }
             return undefined;
         };
-        if (w0 === "jq" || w0 === "numfmt") {
+        if (w0 === "jq" || w0 === "numfmt" || w0 === "awk") {
             if (hasSingleHereStringRedir) {
                 const resolved = resolveInvariantWord(cmd.redirects[0].target);
-                return resolved !== undefined ? resolved.trim() : undefined;
+                return resolved !== undefined ? resolved + "\n" : undefined;
             }
             if (this._fileWrites?.size || this._outputFiles?.size)
                 return undefined;
@@ -17152,12 +17068,12 @@ export class Runtime {
             const vCheck = this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, fPlain), false);
             if (!vCheck || vCheck.byteLength > 16384 || vCheck.includes(0))
                 return undefined;
-            return sharedSyncPipeDecoder.decode(vCheck).trim();
+            return sharedSyncPipeDecoder.decode(vCheck);
         }
         if (w0 === "cat") {
             if (hasSingleHereStringRedir) {
                 const resolved = resolveInvariantWord(cmd.redirects[0].target);
-                return resolved !== undefined ? resolved.trim() : undefined;
+                return resolved !== undefined ? resolved + "\n" : undefined;
             }
             if (this._fileWrites?.size || this._outputFiles?.size)
                 return undefined;
@@ -17169,12 +17085,12 @@ export class Runtime {
             const vCheck = this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, fPlain), false);
             if (!vCheck || vCheck.byteLength > 16384 || vCheck.includes(0))
                 return undefined;
-            return sharedSyncPipeDecoder.decode(vCheck).trim();
+            return sharedSyncPipeDecoder.decode(vCheck);
         }
         if (w0 === "echo" && cmd.words.length === 2) {
             const resolved = resolveInvariantWord(cmd.words[1]);
             if (resolved !== undefined && !resolved.startsWith("-"))
-                return resolved.trim();
+                return resolved + "\n";
             return undefined;
         }
         if (w0 === "printf" && cmd.words.length >= 2) {
@@ -17186,7 +17102,7 @@ export class Runtime {
                 args.push(r);
             }
             const formatted = tryFastPrintf(args);
-            return formatted !== undefined ? formatted.trim() : undefined;
+            return formatted;
         }
         return undefined;
     }
@@ -17662,7 +17578,7 @@ export class Runtime {
                     break;
                 }
                 if (step.unsetVars !== undefined) {
-                    lastArg = this.execSyncUnsetStep(step, rawState, io, monitor, touched);
+                    lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
                     rawState.status = 0;
                     continue;
                 }
@@ -18240,7 +18156,7 @@ export class Runtime {
                 break;
             }
             if (step.unsetVars !== undefined) {
-                lastArg = this.execSyncUnsetStep(step, rawState, io, monitor, touched);
+                lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
                 rawState.status = 0;
                 onUpdate({ lastCmd, lastArg });
                 continue;
@@ -18425,7 +18341,7 @@ export class Runtime {
                     break;
                 }
                 if (step.unsetVars !== undefined) {
-                    lastArg = this.execSyncUnsetStep(step, rawState, io, monitor, touched);
+                    lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
                     rawState.status = 0;
                     continue;
                 }
@@ -27530,17 +27446,17 @@ export class Runtime {
         if (st === "ceil")
             return typeof item === "number" ? [Math.ceil(item)] : undefined;
         if (st === "round")
-            return typeof item === "number" ? [Math.round(item)] : undefined;
+            return typeof item === "number" ? [Math.sign(item) * Math.round(Math.abs(item))] : undefined;
         if (st === "abs")
             return typeof item === "number" ? [Math.abs(item)] : undefined;
         if (st === "utf8bytelength")
-            return typeof item === "string" ? [Buffer.byteLength(item, "utf8")] : undefined;
+            return typeof item === "string" ? [fastSharedTextEncoder.encode(item).byteLength] : undefined;
         if (st === "explode")
             return typeof item === "string" ? [Array.from(item, c => c.codePointAt(0))] : undefined;
         if (st === "implode") {
             if (!Array.isArray(item) || !item.every(x => typeof x === "number" && Number.isInteger(x) && x >= 0 && x <= 0x10ffff))
                 return undefined;
-            return [String.fromCodePoint(...item)];
+            return [item.map(cp => String.fromCodePoint(cp >= 0xd800 && cp <= 0xdfff ? 0xfffd : cp)).join("")];
         }
         if (st === "transpose") {
             if (!Array.isArray(item) || !item.every(row => Array.isArray(row)))
@@ -27554,14 +27470,20 @@ export class Runtime {
             return [trans];
         }
         const idxFnM = /^(index|rindex|indices)\(\s*"([^"\\]*)"\s*\)$/.exec(st);
-        if (idxFnM && typeof item === "string") {
+        if (idxFnM && (typeof item === "string" || Array.isArray(item))) {
             const fn = idxFnM[1];
             const sub = idxFnM[2];
             const found = [];
-            if (sub.length > 0) {
+            if (Array.isArray(item)) {
+                for (let i = 0; i < item.length; i++) {
+                    if (item[i] === sub)
+                        found.push(i);
+                }
+            }
+            else if (sub.length > 0) {
                 let pos = 0;
                 while ((pos = item.indexOf(sub, pos)) !== -1) {
-                    found.push(Array.from(item.slice(0, pos)).length);
+                    found.push(fastSharedTextEncoder.encode(item.slice(0, pos)).byteLength);
                     pos += 1;
                 }
             }
@@ -28967,6 +28889,8 @@ export class Runtime {
                     const tm = /^(\$(?:[0-9]+|NF)|NR|NF)\s*(==|!=|>=|<=|>|<)\s*(-?[0-9]+(?:\.[0-9]+)?|"[^"$\\]*")\s*\?\s*(\$(?:[0-9]+|NF)|"[^"$\\]*"|-?[0-9]+(?:\.[0-9]+)?)\s*:\s*(\$(?:[0-9]+|NF)|"[^"$\\]*"|-?[0-9]+(?:\.[0-9]+)?)$/.exec(m[1].trim());
                     if (!tm)
                         return undefined;
+                    if (tm[2] === ">")
+                        return undefined; // Unparenthesized print > is output redirection.
                     parts.push({ kind: "ternary", lhs: tm[1], op: tm[2], rhs: tm[3], yes: tm[4], no: tm[5] });
                 }
                 else if (m[2] !== undefined)
@@ -29080,8 +29004,10 @@ export class Runtime {
                 else if (p.kind === "int") {
                     const idx = p.token === "NF" ? fields.length : Number(p.token);
                     const s = idx === 0 ? l : (idx >= 1 && idx <= fields.length ? fields[idx - 1] : "");
-                    const n = Number(/^[ \t]*([+-]?(?:\d+(?:\.\d*)?|\.\d+))/.exec(s)?.[1] ?? 0);
-                    out += String(Math.trunc(n));
+                    const n = awkNumber(awkInputValue(s));
+                    if (!Number.isFinite(n))
+                        return undefined;
+                    out += awkValueText(awkNumeric(Math.trunc(n)));
                 }
                 else if (p.kind === "ternary") {
                     const resolveAtom = (tok) => {
@@ -29099,16 +29025,10 @@ export class Runtime {
                     };
                     const lv = resolveAtom(p.lhs);
                     const rv = resolveAtom(p.rhs);
-                    const isStrCmp = p.rhs.startsWith("\"");
-                    let cond = false;
-                    if (isStrCmp) {
-                        cond = p.op === "==" ? lv === rv : p.op === "!=" ? lv !== rv : p.op === ">" ? lv > rv : p.op === "<" ? lv < rv : p.op === ">=" ? lv >= rv : lv <= rv;
-                    }
-                    else {
-                        const ln = Number(lv) || 0;
-                        const rn = Number(rv) || 0;
-                        cond = p.op === "==" ? ln === rn : p.op === "!=" ? ln !== rn : p.op === ">" ? ln > rn : p.op === "<" ? ln < rn : p.op === ">=" ? ln >= rn : ln <= rn;
-                    }
+                    const left = p.lhs === "NR" || p.lhs === "NF" ? awkNumeric(Number(lv)) : awkInputValue(lv);
+                    const right = p.rhs.startsWith('"') ? awkString(rv) : awkNumeric(Number(rv));
+                    const comparison = awkCompare(left, right, "%.6g");
+                    const cond = p.op === "==" ? comparison === 0 : p.op === "!=" ? comparison !== 0 : p.op === ">" ? comparison > 0 : p.op === "<" ? comparison < 0 : p.op === ">=" ? comparison >= 0 : comparison <= 0;
                     out += resolveAtom(cond ? p.yes : p.no);
                 }
                 else if (p.kind === "arith") {
@@ -29373,13 +29293,14 @@ export class Runtime {
             if (s.length === 0)
                 return [""];
             const res = [];
+            const chars = Array.from(s);
             const escapes = { b: "\b", f: "\f", n: "\n", r: "\r", t: "\t", v: "\v", "0": "" };
-            for (let i = 0; i < s.length; i++) {
-                const ch = s[i];
+            for (let i = 0; i < chars.length; i++) {
+                const ch = chars[i];
                 if (ch === "\\") {
-                    if (i + 1 >= s.length)
+                    if (i + 1 >= chars.length)
                         return undefined;
-                    const esc = s[++i];
+                    const esc = chars[++i];
                     res.push(escapes[esc] ?? esc);
                 }
                 else {

package/dist/safe-bash-command-ssconvert/index.js

@@ -97606,7 +97606,8 @@ var lookupSpecialForms = {
     if (!args.length || args.length > 4) return error("#VALUE!");
     let source = args[0];
     while (source.kind === "parentheses") source = source.child;
-    let value3 = host.evaluate(source, false);
+    const areaSet = source.kind === "binary" && source.op === "union";
+    let value3 = host.evaluate(source, areaSet);
     if (value3.kind === "error") return value3;
     const offsets = [0, 0, 0];
     for (let index2 = 1; index2 < args.length; index2++) {
@@ -97616,11 +97617,17 @@ var lookupSpecialForms = {
       if (n === void 0) return error("#VALUE!");
       offsets[index2 - 1] = Math.trunc(n) - 1;
     }
-    if (source.kind === "binary" && source.op === "union") {
-      if (value3.kind === "matrix") {
-        if (offsets[2] < 0 || offsets[2] >= value3.rows.length) return error("#REF!");
-        value3 = value3.rows[offsets[2]][0];
-      } else return error("#REF!");
+    if (areaSet) {
+      const areas = [], pending = [value3];
+      while (pending.length) {
+        host.tick();
+        const area = pending.pop();
+        if (area.kind === "set") for (let index2 = area.values.length - 1; index2 >= 0; index2--) pending.push(area.values[index2]);
+        else areas.push(area);
+      }
+      if (offsets[2] < 0 || offsets[2] >= areas.length) return error("#REF!");
+      value3 = areas[offsets[2]];
+      if (value3.kind === "error") return value3;
     } else if (offsets[2] !== 0) return error("#REF!");
     const row = offsets[0], column = offsets[1], dims = dimensions(value3);
     if (row < 0 || column < 0 || row >= dims.height || column >= dims.width) return error("#REF!");
@@ -140035,6 +140042,7 @@ function lotusExternalVariable(name) {
 async function lotusFormula(bytes, format2, group, row, column, sheetIndex, sheetName2, context, consumeOperation, functions2 = lotusFunctions, names2, legacyReferenceLayout) {
   const b3 = new Binary(bytes), stack = [], modern = format2 !== "wk1";
   const relativeReferences = /* @__PURE__ */ new Map();
+  const indexRanges = /* @__PURE__ */ new Map();
   let at = 0;
   const pop = async () => {
     if (stack.length) return stack.pop();
@@ -140042,7 +140050,8 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
     return "#REF!";
   };
   const ref = (r, c4, rr, cr) => {
-    if (r < 0 || c4 < 0) return "#REF!";
+    const rows = modern || legacyReferenceLayout === void 0 ? 65536 : legacyReferenceLayout === "wk1" ? 2048 : 16384;
+    if (r < 0 || r >= rows || c4 < 0 || c4 >= 256) return "#REF!";
     const a3 = formatA1(r, c4);
     let i = 0;
     while (a3[i] >= "A" && a3[i] <= "Z") i++;
@@ -140052,13 +140061,13 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
     const c4 = b3.u16(p2), r = b3.u16(p2 + 2), cr = !!(c4 & 32768), rr = !!(r & 32768);
     if (legacyReferenceLayout === "works3" || legacyReferenceLayout === "symphony") {
       const axis = (raw, origin, bits) => {
-        if (!(raw & 32768)) return raw;
+        if (!(raw & 32768)) return raw & (1 << bits) - 1;
         const shift = 32 - bits, boundary = 2 ** (bits - 1);
         let delta = raw << shift >> shift;
         if (delta + origin >= boundary) delta -= boundary;
         return origin + delta;
       };
-      let targetColumn = c4;
+      let targetColumn = c4 & 255;
       if (legacyReferenceLayout === "symphony" && cr) {
         let delta = c4 & 255;
         if (delta & 128 && delta + column >= 256) delta -= 256;
@@ -140086,6 +140095,10 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
     const target = b3.u8(p2 + 2), name = sheetName2(target);
     return (target === sheetIndex && !qualifySheet ? "" : quoteFormulaString(name, "'", gnumericGrammar) + "!") + ref(b3.u16(p2), b3.u8(p2 + 3), !!(flags & 2), !!(flags & 1));
   };
+  const rangeReference = (first, last) => {
+    if (first.endsWith("#REF!") || last?.endsWith("#REF!")) return "#REF!";
+    return first + (last === void 0 ? "" : ":" + last);
+  };
   while (at < bytes.length) {
     context.signal.throwIfAborted();
     const op = b3.u8(at++);
@@ -140119,8 +140132,17 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
           const name = `LOTUS_SHEET_REFERENCE_${relativeReferences.size}`;
           relativeReferences.set(name, { kind: "reference", start: 0, end: 0, first, ...last ? { last } : {} });
           stack.push(name);
-        } else stack.push(newRef(at + 1, flags & 7, crossSheet) + (op === 2 ? `:${newRef(at + 5, flags >> 3 & 7, crossSheet)}` : ""));
-      } else stack.push(oldRef(at) + (op === 2 ? `:${oldRef(at + 4)}` : ""));
+        } else {
+          const source = rangeReference(newRef(at + 1, flags & 7, crossSheet), op === 2 ? newRef(at + 5, flags >> 3 & 7, crossSheet) : void 0);
+          stack.push(source);
+          if (crossSheet) indexRanges.set(source, {
+            firstSheet: b3.u8(at + 3),
+            lastSheet: b3.u8(at + 7),
+            first: ref(b3.u16(at + 1), b3.u8(at + 4), !!(flags & 2), !!(flags & 1)),
+            last: ref(b3.u16(at + 5), b3.u8(at + 8), !!(flags & 16), !!(flags & 8))
+          });
+        }
+      } else stack.push(rangeReference(oldRef(at), op === 2 ? oldRef(at + 4) : void 0));
       at += length;
     } else if (op === 5) {
       const length = format2 === "123" ? 4 : 2;
@@ -140159,7 +140181,14 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
         const crossSheet = range3.first.sheet !== range3.last.sheet;
         const endpoint = (point) => (point.sheet === sheetIndex && !crossSheet ? "" : quoteFormulaString(sheetName2(point.sheet), "'", gnumericGrammar) + "!") + ref(point.row, point.column, op === 7, op === 7);
         const single = range3.first.row === range3.last.row && range3.first.column === range3.last.column && range3.first.sheet === range3.last.sheet;
-        stack.push(endpoint(range3.first) + (single ? "" : ":" + endpoint(range3.last)));
+        const source = endpoint(range3.first) + (single ? "" : ":" + endpoint(range3.last));
+        stack.push(source);
+        if (crossSheet) indexRanges.set(source, {
+          firstSheet: range3.first.sheet,
+          lastSheet: range3.last.sheet,
+          first: ref(range3.first.row, range3.first.column, op === 7, op === 7),
+          last: ref(range3.last.row, range3.last.column, op === 7, op === 7)
+        });
       }
     } else if (modern && op >= 9 && op <= 11) {
       const length = op === 9 ? 4 : op === 10 ? 5 : 11;
@@ -140203,7 +140232,7 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
       }
       const operands = [];
       for (let i = 0; i < args; i++) operands.unshift(await pop());
-      let subtract3 = 0;
+      let subtract3 = info?.[3] === "wk1_year_func" ? 1900 : 0;
       if (functions2 === lotusFunctions) {
         switch (info?.[1]) {
           case "CHOOSE":
@@ -140221,19 +140250,36 @@ async function lotusFormula(bytes, format2, group, row, column, sheetIndex, shee
           case "HLOOKUP":
             if (operands.length === 3) operands[2] = `(${operands[2]}+1)`;
             break;
+          case "DSUM":
+          case "DAVG":
+          case "DCNT":
+          case "DMIN":
+          case "DMAX":
+          case "DVAR":
+          case "DSTD":
+          case "DPURECOUNT":
+            if (operands.length > 1) operands[1] = `(${operands[1]}+1)`;
+            break;
           case "INDEX":
-            if (operands.length === 3) {
+            if (operands.length === 3 || operands.length === 4) {
               const [, column2, row2] = operands;
               operands[1] = `(${row2}+1)`;
               operands[2] = `(${column2}+1)`;
+              if (operands.length === 4) operands[3] = `(${operands[3]}+1)`;
+              const span2 = indexRanges.get(operands[0]);
+              if (span2) {
+                const choices = [];
+                for (let index2 = Math.min(span2.firstSheet, span2.lastSheet); index2 <= Math.max(span2.firstSheet, span2.lastSheet); index2++) {
+                  consumeOperation();
+                  choices.push(quoteFormulaString(sheetName2(index2), "'", gnumericGrammar) + "!" + span2.first + ":" + span2.last);
+                }
+                operands[0] = `(${choices.join(",")})`;
+              }
             }
             break;
           case "STRING":
             operands.push("TRUE()");
             break;
-          case "YEAR":
-            subtract3 = 1900;
-            break;
           case "ROUNDUP":
           case "ROUNDDOWN":
             if (operands.length === 3) operands.pop();

package/dist/safe-bash-query-engine/index.js

@@ -1,9 +1,9 @@
 import {
   YqValueFailure,
   createYqQuerySession
-} from "../safe-bash/command-chunks/chunk-6QU5OLPJ.js";
+} from "../safe-bash/command-chunks/chunk-4AWKMIU3.js";
 import "../safe-bash/command-chunks/chunk-S3BO2NJT.js";
-import "../safe-bash/command-chunks/chunk-6742OVAC.js";
+import "../safe-bash/command-chunks/chunk-WX5IUIQK.js";
 import "../safe-bash/command-chunks/chunk-TPDKSK66.js";
 import "../safe-bash/command-chunks/chunk-A7SJ2FC6.js";
 import "../safe-bash/command-chunks/chunk-XZ7QGZMG.js";

package/dist/safe-bash-query-engine/interpreter.js

@@ -1,6 +1,6 @@
 import {
   Interpreter
-} from "../safe-bash/command-chunks/chunk-6742OVAC.js";
+} from "../safe-bash/command-chunks/chunk-WX5IUIQK.js";
 import "../safe-bash/command-chunks/chunk-TPDKSK66.js";
 import "../safe-bash/command-chunks/chunk-A7SJ2FC6.js";
 import "../safe-bash/command-chunks/chunk-XZ7QGZMG.js";

package/dist/safe-bash-query-engine/query-core.js

@@ -1,9 +1,9 @@
 import {
   YqValueFailure,
   createYqQuerySession
-} from "../safe-bash/command-chunks/chunk-6QU5OLPJ.js";
+} from "../safe-bash/command-chunks/chunk-4AWKMIU3.js";
 import "../safe-bash/command-chunks/chunk-S3BO2NJT.js";
-import "../safe-bash/command-chunks/chunk-6742OVAC.js";
+import "../safe-bash/command-chunks/chunk-WX5IUIQK.js";
 import "../safe-bash/command-chunks/chunk-TPDKSK66.js";
 import "../safe-bash/command-chunks/chunk-A7SJ2FC6.js";
 import "../safe-bash/command-chunks/chunk-XZ7QGZMG.js";