@poe-platform/safe-bash 0.1.747 → 0.1.749

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,20 @@ 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 (value3.kind === "range" && value3.sheets.length > 1) {
+      if (offsets[2] < 0 || offsets[2] >= value3.sheets.length) return error("#REF!");
+      value3 = { ...value3, sheets: [value3.sheets[offsets[2]]] };
     } 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!");
@@ -105512,6 +105522,68 @@ function createZipCodec(runtime = defaults, profile = {}) {
   }
   return { readZipArchive, decodeZipEntry, makeZipEntry, writeZipArchive };
 }
+function expandIndexSheetAreas(document6, onWork) {
+  const order = document6.sheetOrder;
+  if (!order) return document6;
+  let ids, names2;
+  const sheetIndex = (endpoint) => {
+    if (!ids || !names2) {
+      ids = /* @__PURE__ */ new Map();
+      names2 = /* @__PURE__ */ new Map();
+      for (let index2 = 0; index2 < order.length; index2++) {
+        onWork();
+        const id = order[index2];
+        ids.set(id, index2);
+        names2.set(foldSheetName(document6.sheetNames?.[id] ?? id), index2);
+      }
+    }
+    const name = endpoint.sheet ?? document6.position.sheet;
+    return ids.get(name) ?? names2.get(foldSheetName(name)) ?? -1;
+  };
+  const visit = (node3) => {
+    onWork();
+    if (node3.kind === "parentheses" || node3.kind === "unary") return { ...node3, child: visit(node3.child) };
+    if (node3.kind === "binary") return { ...node3, left: visit(node3.left), right: visit(node3.right) };
+    if (node3.kind === "array") return { ...node3, rows: node3.rows.map((row) => row.map(visit)) };
+    if (node3.kind !== "call") return node3;
+    const args = node3.args.map(visit);
+    let source = args[0];
+    while (source?.kind === "parentheses") source = source.child;
+    if (node3.name === "INDEX" && args.length >= 1 && args.length <= 4 && source?.kind === "reference" && source.last && source.first.workbook === void 0 && source.last.workbook === void 0 && !source.label) {
+      const first = sheetIndex(source.first), last = sheetIndex(source.last);
+      if (first >= 0 && last >= 0 && first !== last) {
+        let areas = [];
+        for (let index2 = Math.min(first, last); index2 <= Math.max(first, last); index2++) {
+          onWork();
+          const sheet = document6.sheetNames?.[order[index2]] ?? order[index2];
+          const first2 = { ...source.first, sheet };
+          const last2 = { ...source.last, sheet };
+          delete first2.sheetOffset;
+          delete last2.sheetOffset;
+          areas.push({ ...source, first: first2, last: last2 });
+        }
+        while (areas.length > 1) {
+          const next = [];
+          for (let index2 = 0; index2 < areas.length; index2 += 2) {
+            onWork();
+            next.push(areas[index2 + 1] ? {
+              kind: "binary",
+              op: "union",
+              start: source.start,
+              end: source.end,
+              left: areas[index2],
+              right: areas[index2 + 1]
+            } : areas[index2]);
+          }
+          areas = next;
+        }
+        args[0] = { kind: "parentheses", start: source.start, end: source.end, child: areas[0] };
+      }
+    }
+    return { ...node3, args };
+  };
+  return { ...document6, root: visit(document6.root) };
+}
 var xlsxNamespaceScanElements = /* @__PURE__ */ new Set([
   "worksheet",
   "extLst",
@@ -109386,7 +109458,7 @@ function createXlsxWriter(edition) {
                 ...array ? { t: "array", ref: rangeText(array.range) } : {},
                 ...formulaSemanticsAttributes(array?.arrayStringLiterals ?? cell.arrayStringLiterals, true, cell.formula)
               },
-              escapeXlsx(exportXlsxFormula(cell.formula, sheet, cell.row, cell.column, context, array?.arrayStringLiterals ?? cell.arrayStringLiterals))
+              escapeXlsx(exportXlsxFormula(book, cell.formula, sheet, cell.row, cell.column, context, array?.arrayStringLiterals ?? cell.arrayStringLiterals))
             );
           if (value3.kind === "string") {
             if ((stringCounts.get(stringKey) ?? 0) > 1) {
@@ -109430,7 +109502,7 @@ function createXlsxWriter(edition) {
       };
       for (const [gnm, xlsx, invert] of [["DisplayFormulas", "showFormulas", false], ["HideZero", "showZeros", true], ["HideGrid", "showGridLines", true], ["HideColHeader", "showRowColHeaders", true], ["DisplayOutlines", "showOutlineSymbols", false], ["RTL_Layout", "rightToLeft", false]])
         if (view2[gnm] !== void 0) viewAttrs[xlsx] = (invert ? !Number(view2[gnm]) : !!Number(view2[gnm])) ? 1 : 0;
-      const metadata3 = await writeXlsxSheetMetadata(sheet, index2 + 1, xml2, context, namespace5, exportXlsxFormula, styles, charge);
+      const metadata3 = await writeXlsxSheetMetadata(sheet, index2 + 1, xml2, context, namespace5, exportXlsxFormula.bind(null, book), styles, charge);
       let cols = "", nextColumn = 0;
       for (const c4 of [...sheet.columns ?? []].sort((a3, b3) => a3.index - b3.index)) {
         const importedColumn = metadataNode(c4.style?.gnumeric, charge);
@@ -109511,7 +109583,7 @@ function createXlsxWriter(edition) {
           localSheetId: index2 < 0 ? void 0 : index2,
           ...formulaSemanticsAttributes(name.arrayStringLiterals, true, name.expression, name.position ? { ...name.position, sheet: book.sheets.find((s) => s.id === name.position.sheet)?.name ?? name.position.sheet } : void 0)
         },
-        escapeXlsx(exportXlsxFormula(name.expression, sheet, name.position?.row ?? 0, name.position?.column ?? 0, context, name.arrayStringLiterals))
+        escapeXlsx(exportXlsxFormula(book, name.expression, sheet, name.position?.row ?? 0, name.position?.column ?? 0, context, name.arrayStringLiterals))
       );
     }
     for (const [index2, sheet] of book.sheets.entries()) {
@@ -109588,17 +109660,24 @@ function createXlsxWriter(edition) {
     }
   };
 }
-function exportXlsxFormula(source, sheet, row, column, context, arrayStringLiterals = false) {
+function exportXlsxFormula(book, source, sheet, row, column, context, arrayStringLiterals = false) {
   const position = { sheet: sheet.id, row, column };
+  let work = 0;
+  const onWork = () => {
+    context.signal.throwIfAborted();
+    if (++work > (context.limits.workbookNodes ?? Infinity))
+      throw new SsconvertError("resource-limit", "ssconvert XLSX formula node limit exceeded");
+  };
   const parsed = parseExpression(source.startsWith("=") || source.startsWith("of:=") ? source : "=" + source, {
     position,
     arrayStringLiterals,
+    workbook: book,
     signal: context.signal,
     maximumLength: context.limits.workbookTextBytes ?? context.limits.outputBytes,
     maximumNodes: context.limits.workbookNodes ?? Infinity
   });
   if (!parsed.ok) throw new SsconvertError("unsupported-feature", "Unsupported ssconvert feature: unparsed XLSX formula");
-  const result2 = serializeExpression(parsed.document, excelGrammar, false, true, { relativeSheets: "fixed" });
+  const result2 = serializeExpression(expandIndexSheetAreas(parsed.document, onWork), excelGrammar, false, true, { relativeSheets: "fixed" });
   return result2.startsWith("=") ? result2.slice(1) : result2;
 }
 function invalidBiff(message) {
@@ -128223,8 +128302,8 @@ var operators = {
   ">=": 12,
   ">": 13,
   "<>": 14,
-  " ": 15,
-  ",": 16,
+  intersection: 15,
+  union: 16,
   ":": 17
 };
 var functions = new Map(Object.entries(biffFunctions).map(([id, spec]) => [spec[0], { id: Number(id), min: spec[1], max: spec[2] }]));
@@ -128368,7 +128447,12 @@ var BiffFormulaWriter = class {
         maximumLength: this.context.limits.workbookTextBytes ?? this.context.limits.outputBytes
       });
       if (!parsed.ok) throw new SsconvertError("unsupported-feature", `Cannot export Excel formula: ${expression2}`);
-      return parsed.document.root;
+      let work = 0;
+      return expandIndexSheetAreas(parsed.document, () => {
+        this.context.signal.throwIfAborted();
+        if (++work > (this.context.limits.workbookNodes ?? this.context.limits.cells))
+          throw new SsconvertError("resource-limit", "ssconvert BIFF formula node limit exceeded");
+      }).root;
     };
     const relative = definition !== void 0;
     const root = definition ? parseNamedExpression(definition, this.book, parse2, () => this.context.signal.throwIfAborted()) : parse2(source, { sheet, row, column });
@@ -140035,6 +140119,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 +140127,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 +140138,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 +140172,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 +140209,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 +140258,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 +140309,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 +140327,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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.747",
+  "version": "0.1.749",
   "description": "Extensible virtual shell with pluggable filesystems and streaming commands",
   "type": "module",
   "license": "MIT",
@@ -645,7 +645,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@poe-platform/safe-fs": "0.1.747",
+    "@poe-platform/safe-fs": "0.1.749",
     "pdf-lib": "1.17.1",
     "@types/node": "^25.2.2",
     "pako": "3.0.1",