@poe-platform/safe-bash 0.1.748 → 0.1.750

package/README.md

@@ -67,7 +67,8 @@ All private command plugins are available from `@poe-platform/safe-bash/core` in
 - `if`/`elif`/`else`, `case`, `for name in …`, `while`, `until`, functions,
   groups `{ …; }`, subshells `( … )` (including adjacent nested subshells),
   `[[ … ]]` (including file age/identity, special-file, mode and nameref
-  predicates; literal/glob and ASCII ERE comparisons also accept UTF-8 locales,
+  predicates; ordering uses byte comparison in C/POSIX and host Intl collation
+  in supported UTF-8 locales. Literal/glob and ASCII ERE comparisons also accept UTF-8 locales,
   with ranges limited to C/POSIX collation, including C.UTF-8), arithmetic commands `(( … ))`, and indexed arrays with arithmetic
   and relative negative element indices, including `declare -a`, `local -a`,
   and `readonly -a` array literals. Arithmetic array operands such as `a[i]`

package/dist/safe-bash/chunks/{chunk-MSEZFB2F.js → chunk-U7DRVFRD.js}

@@ -48712,6 +48712,9 @@ var lookupSpecialForms = {
       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!");
@@ -52500,6 +52503,73 @@ init_platform();
 
 // packages/safe-bash-command-ssconvert/src/codecs/xlsx.ts
 init_platform();
+
+// packages/safe-bash-command-ssconvert/src/formulas/index-sheet-areas.ts
+init_platform();
+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 name5 = endpoint.sheet ?? document6.position.sheet;
+    return ids.get(name5) ?? names2.get(foldSheetName(name5)) ?? -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), last2 = sheetIndex(source.last);
+      if (first >= 0 && last2 >= 0 && first !== last2) {
+        let areas = [];
+        for (let index2 = Math.min(first, last2); index2 <= Math.max(first, last2); index2++) {
+          onWork();
+          const sheet = document6.sheetNames?.[order[index2]] ?? order[index2];
+          const first2 = { ...source.first, sheet };
+          const last3 = { ...source.last, sheet };
+          delete first2.sheetOffset;
+          delete last3.sheetOffset;
+          areas.push({ ...source, first: first2, last: last3 });
+        }
+        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) };
+}
+
+// packages/safe-bash-command-ssconvert/src/codecs/xlsx.ts
 import { parseXmlSteps as parseXmlSteps3, XmlLimitError } from "@poe-platform/safe-fs/core";
 
 // packages/safe-bash-command-ssconvert/src/codecs/xlsx-schema.ts
@@ -56406,7 +56476,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, context2, array?.arrayStringLiterals ?? cell.arrayStringLiterals))
+              escapeXlsx(exportXlsxFormula(book, cell.formula, sheet, cell.row, cell.column, context2, array?.arrayStringLiterals ?? cell.arrayStringLiterals))
             );
           if (value3.kind === "string") {
             if ((stringCounts.get(stringKey) ?? 0) > 1) {
@@ -56450,7 +56520,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, context2, namespace5, exportXlsxFormula, styles, charge);
+      const metadata3 = await writeXlsxSheetMetadata(sheet, index2 + 1, xml2, context2, 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);
@@ -56531,7 +56601,7 @@ function createXlsxWriter(edition) {
           localSheetId: index2 < 0 ? void 0 : index2,
           ...formulaSemanticsAttributes(name5.arrayStringLiterals, true, name5.expression, name5.position ? { ...name5.position, sheet: book.sheets.find((s) => s.id === name5.position.sheet)?.name ?? name5.position.sheet } : void 0)
         },
-        escapeXlsx(exportXlsxFormula(name5.expression, sheet, name5.position?.row ?? 0, name5.position?.column ?? 0, context2, name5.arrayStringLiterals))
+        escapeXlsx(exportXlsxFormula(book, name5.expression, sheet, name5.position?.row ?? 0, name5.position?.column ?? 0, context2, name5.arrayStringLiterals))
       );
     }
     for (const [index2, sheet] of book.sheets.entries()) {
@@ -56608,17 +56678,24 @@ function createXlsxWriter(edition) {
     }
   };
 }
-function exportXlsxFormula(source, sheet, row, column, context2, arrayStringLiterals = false) {
+function exportXlsxFormula(book, source, sheet, row, column, context2, arrayStringLiterals = false) {
   const position = { sheet: sheet.id, row, column };
+  let work = 0;
+  const onWork = () => {
+    context2.signal.throwIfAborted();
+    if (++work > (context2.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: context2.signal,
     maximumLength: context2.limits.workbookTextBytes ?? context2.limits.outputBytes,
     maximumNodes: context2.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;
 }
 
@@ -62830,6 +62907,40 @@ var BiffOutput = class {
     this.length += bytes.length;
     return at;
   }
+  /** Keep tokens/elements intact; oversized UTF-16 array strings carry width flags. */
+  continuedRecord(opcode, payload, boundaries, strings = []) {
+    const at = this.length;
+    let offset = 0, next = 0, stringIndex = 0;
+    do {
+      while (strings[stringIndex] && strings[stringIndex].end <= offset) stringIndex++;
+      const continuedString = strings[stringIndex] && strings[stringIndex].start < offset;
+      const prefix2 = continuedString ? 1 : 0;
+      const maximum = Math.min(payload.length, offset + this.maximumRecord - prefix2);
+      let end2 = maximum;
+      if (boundaries && maximum < payload.length) {
+        end2 = offset;
+        while (next < boundaries.length && boundaries[next] <= maximum) end2 = boundaries[next++];
+        let candidate = stringIndex;
+        while (strings[candidate] && strings[candidate].end <= maximum) candidate++;
+        const string = strings[candidate];
+        if (string && string.end - string.start + 4 > this.maximumRecord && string.start < maximum && maximum < string.end) {
+          const characterEnd = maximum - (maximum - string.start) % 2;
+          if (characterEnd > string.start) end2 = Math.max(end2, characterEnd);
+        }
+        if (end2 <= offset) throw new SsconvertError("unsupported-feature", "Excel BIFF formula token is too large");
+      }
+      let part = payload.subarray(offset, end2);
+      if (prefix2) {
+        const continued = new Uint8Array(part.length + 1);
+        continued[0] = 1;
+        continued.set(part, 1);
+        part = continued;
+      }
+      this.record(offset === 0 ? opcode : 60, part);
+      offset = end2;
+    } while (offset < payload.length);
+    return at;
+  }
   finish() {
     this.context.signal.throwIfAborted();
     const bytes = new Uint8Array(this.length);
@@ -74924,8 +75035,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] }]));
@@ -74958,7 +75069,6 @@ var BiffFormulaWriter = class {
   macroNames = [];
   workbookIndices = /* @__PURE__ */ new Map();
   linkIndices = /* @__PURE__ */ new Map();
-  uniqueNameId = 0;
   relocations = [];
   externalBook(workbook) {
     let index2 = this.workbookIndices.get(workbook);
@@ -75069,11 +75179,21 @@ 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, parse3, () => this.context.signal.throwIfAborted()) : parse3(source, { sheet, row, column });
     const bytes = [], arrays = [], diagnostics = [];
+    const tokenBoundaries = [], arrayBoundaries = [];
+    const arrayStrings = [];
+    const boundary = () => {
+      if (bytes.length && tokenBoundaries.at(-1) !== bytes.length) tokenBoundaries.push(bytes.length);
+    };
     let sheetLossReported = false;
     const relocations = [];
     const push = (part, target = bytes) => {
@@ -75116,12 +75236,14 @@ var BiffFormulaWriter = class {
           push([23]);
           push(biffString(text2, this.revision, this.context, 1));
           if (index2) push([8]);
+          boundary();
         });
         if (chunks.length > 1) push([21]);
       }
     };
     const visit = (node3) => {
       this.context.signal.throwIfAborted();
+      boundary();
       if (node3.kind === "literal") literal2(node3.value);
       else if (node3.kind === "omitted") push([22]);
       else if (node3.kind === "parentheses") {
@@ -75274,24 +75396,15 @@ var BiffFormulaWriter = class {
           push([28, 29]);
           return;
         }
-        if (node3.sheet !== void 0 && scope !== void 0) {
-          const data4 = new Uint8Array(this.revision === 8 ? 7 : 25), view2 = new DataView(data4.buffer);
+        if (node3.sheet !== void 0 && scope !== void 0 && this.revision === 8) {
+          const data4 = new Uint8Array(7), view2 = new DataView(data4.buffer);
           data4[0] = 89;
           const scopeIndex = this.book.sheets.indexOf(scope);
-          if (this.revision === 8) {
-            const externalIndex = this.sheetLink(void 0, scopeIndex, scopeIndex);
-            relocations.push({ offset: bytes.length + 1, index: externalIndex, kind: "sheet" });
-            view2.setUint16(1, externalIndex, true);
-            view2.setUint16(3, index2 + 1, true);
-          } else {
-            const externalIndex = current === scope ? this.book.sheets.length + 1 : scopeIndex;
-            view2.setInt16(1, -(externalIndex + 1), true);
-            view2.setUint16(9, 1, true);
-            view2.setUint16(11, index2 + 1, true);
-            view2.setUint16(19, 15, true);
-            view2.setUint32(21, ++this.uniqueNameId, true);
-          }
-          relocations.push({ offset: bytes.length + (this.revision === 8 ? 3 : 11), index: index2, kind: "name" });
+          const externalIndex = this.sheetLink(void 0, scopeIndex, scopeIndex);
+          relocations.push({ offset: bytes.length + 1, index: externalIndex, kind: "sheet" });
+          view2.setUint16(1, externalIndex, true);
+          view2.setUint16(3, index2 + 1, true);
+          relocations.push({ offset: bytes.length + 3, index: index2, kind: "name" });
           push(data4);
         } else {
           const data4 = new Uint8Array(this.revision === 8 ? 5 : 15);
@@ -75349,12 +75462,15 @@ var BiffFormulaWriter = class {
         if (!columns || columns > 256 || node3.rows.length > 65536) throw new SsconvertError("unsupported-feature", "Excel BIFF array dimensions exceed limits");
         push([64, ...new Uint8Array(7)]);
         push([this.revision === 8 ? columns - 1 : columns & 255, ...words(node3.rows.length - (this.revision === 8 ? 1 : 0))], arrays);
+        arrayBoundaries.push(arrays.length);
         for (const arrayRow of node3.rows) for (const item of arrayRow) {
           if (item.kind !== "literal") throw new SsconvertError("unsupported-feature", "Excel BIFF array requires literals");
           const value3 = item.value;
           if (value3.kind === "string") {
+            const start = arrays.length + 4;
             push([2], arrays);
             push(biffString(value3.value, this.revision, this.context, this.revision === 8 ? 2 : 1), arrays);
+            if (this.revision === 8 && arrays.length > start) arrayStrings.push({ start, end: arrays.length });
           } else {
             const data4 = new Uint8Array(9), view2 = new DataView(data4.buffer);
             data4[0] = value3.kind === "number" ? 1 : value3.kind === "boolean" ? 4 : value3.kind === "error" ? 16 : 0;
@@ -75363,15 +75479,23 @@ var BiffFormulaWriter = class {
             else if (value3.kind === "error") data4[1] = biffError(value3.value);
             push(data4, arrays);
           }
+          arrayBoundaries.push(arrays.length);
         }
       }
+      boundary();
     };
     visit(root);
+    boundary();
+    if (bytes.length > 65535)
+      throw new SsconvertError("unsupported-feature", "Excel BIFF formula token length exceeds version limits");
     const tokens3 = new Uint8Array(bytes);
     for (const relocation of relocations) this.relocations.push({ ...relocation, tokens: tokens3 });
     return {
       tokens: tokens3,
+      tokenBoundaries,
       arrays: new Uint8Array(arrays),
+      arrayBoundaries,
+      arrayStrings,
       diagnostics,
       nameDependencies: relocations.filter((relocation) => relocation.kind === "name").map((relocation) => relocation.index)
     };
@@ -75964,7 +76088,10 @@ async function writeBiffStream(book, revision2, dual, context2, filepass) {
       if (group) {
         formulas.set(cell, {
           tokens: new Uint8Array([dataTables.has(group) ? 2 : 1, ...words(group.range.startRow, group.range.startColumn)]),
+          tokenBoundaries: [5],
           arrays: new Uint8Array(),
+          arrayBoundaries: [],
+          arrayStrings: [],
           diagnostics: [],
           nameDependencies: []
         });
@@ -76054,8 +76181,22 @@ async function writeBiffStream(book, revision2, dual, context2, filepass) {
     header4[3] = text2[0];
     view3.setUint16(4, formula3.tokens.length, true);
     const scope = name5.sheet === void 0 ? 0 : book.sheets.findIndex((sheet) => sheet.id === name5.sheet) + 1;
-    view3.setUint16(revision2 === 8 ? 8 : 6, scope, true);
-    output2.record(24, join(join(header4, text2.subarray(1)), join(formula3.tokens, formula3.arrays)));
+    if (revision2 === 7 && scope) view3.setUint16(6, scope - 1, true);
+    view3.setUint16(8, scope, true);
+    const start = header4.length + text2.length - 1;
+    output2.continuedRecord(
+      24,
+      join(join(header4, text2.subarray(1)), join(formula3.tokens, formula3.arrays)),
+      [
+        start,
+        ...formula3.tokenBoundaries.map((offset) => offset + start),
+        ...formula3.arrayBoundaries.map((offset) => offset + start + formula3.tokens.length)
+      ],
+      formula3.arrayStrings.map((span2) => ({
+        start: start + formula3.tokens.length + span2.start,
+        end: start + formula3.tokens.length + span2.end
+      }))
+    );
   }
   if (revision2 === 8) {
     metadata3.global(output2);
@@ -76109,7 +76250,19 @@ async function writeBiffStream(book, revision2, dual, context2, filepass) {
           view3.setUint16(12, formula3.tokens.length, true);
           data4.set(formula3.tokens, 14);
           data4.set(formula3.arrays, 14 + formula3.tokens.length);
-          output2.record(545, data4);
+          output2.continuedRecord(
+            545,
+            data4,
+            [
+              14,
+              ...formula3.tokenBoundaries.map((offset) => offset + 14),
+              ...formula3.arrayBoundaries.map((offset) => offset + 14 + formula3.tokens.length)
+            ],
+            formula3.arrayStrings.map((span2) => ({
+              start: 14 + formula3.tokens.length + span2.start,
+              end: 14 + formula3.tokens.length + span2.end
+            }))
+          );
         }
       }
       const cached = cell.cachedResult ?? cell.value;
@@ -76191,7 +76344,19 @@ async function writeCell(output2, cell, xf, revision2, strings, context2, formul
     view2.setUint16(20, formula3.tokens.length, true);
     data4.set(formula3.tokens, 22);
     data4.set(formula3.arrays, 22 + formula3.tokens.length);
-    output2.record(6, data4);
+    output2.continuedRecord(
+      6,
+      data4,
+      [
+        22,
+        ...formula3.tokenBoundaries.map((offset) => offset + 22),
+        ...formula3.arrayBoundaries.map((offset) => offset + 22 + formula3.tokens.length)
+      ],
+      formula3.arrayStrings.map((span2) => ({
+        start: 22 + formula3.tokens.length + span2.start,
+        end: 22 + formula3.tokens.length + span2.end
+      }))
+    );
     return;
   }
   if (value3.kind === "number") {
@@ -77122,6 +77287,33 @@ async function readBiff(borrowed, context2, encoding) {
     while (records[index2 + 1]?.opcode === 60) parts.push(records[++index2].data);
     return { parts, next: index2 };
   };
+  const formulaParts = (index2, offset, length) => {
+    const first = records[index2].data;
+    let tokens3;
+    if (offset + length <= first.bytes.length) {
+      tokens3 = first.slice(offset, length);
+      offset += length;
+    } else {
+      accountFormulaWork(length);
+      tokens3 = new Uint8Array(length);
+      let written = 0;
+      while (written < length) {
+        context2.signal.throwIfAborted();
+        const part = records[index2].data;
+        const count = Math.min(length - written, part.bytes.length - offset);
+        tokens3.set(part.slice(offset, count), written);
+        written += count;
+        offset += count;
+        if (written < length) {
+          if (records[index2 + 1]?.opcode !== 60) invalidBiff("truncated formula tokens/CONTINUE");
+          index2++;
+          offset = 0;
+        }
+      }
+    }
+    const extra = stringParts(index2, offset);
+    return { tokens: tokens3, arrays: extra.parts, next: extra.next };
+  };
   for (let index2 = 0; index2 < records.length; index2++) {
     context2.signal.throwIfAborted();
     const record7 = records[index2], data4 = record7.data, opcode = record7.opcode;
@@ -77320,13 +77512,12 @@ async function readBiff(borrowed, context2, encoding) {
       const name5 = accountText(ver >= 8 ? cursor.unicode(length).text : cursor.legacy(length));
       const end2 = 7 + cursor.consumedBytes;
       const tokenLength = end2 + 2 <= data4.bytes.length ? data4.u16(end2) : 0;
-      const tokens3 = tokenLength ? data4.slice(end2 + 2, tokenLength) : new Uint8Array();
+      const formula4 = tokenLength ? formulaParts(index2, end2 + 2, tokenLength) : { tokens: new Uint8Array(), arrays: [], next: index2 };
       const legacyLink = (sheet?.legacyExternalLinks ?? legacyExternalLinks).get((sheet?.legacyExternalSheets ?? legacyExternalSheets).length - 1);
       const table10 = ver >= 8 ? supbooks.at(-1)?.names : legacyLink?.names;
       if (!table10) invalidBiff("EXTERNNAME without workbook link");
-      const arrays = tokenLength ? stringParts(index2, end2 + 2 + tokenLength) : { parts: [], next: index2 };
-      index2 = arrays.next;
-      table10.push({ name: name5, sheetIndex: data4.u16(2), tokens: tokens3, arrays: arrays.parts, revision: ver, codepage, supported: flags2 === 0, record: record7 });
+      index2 = formula4.next;
+      table10.push({ name: name5, sheetIndex: data4.u16(2), tokens: formula4.tokens, arrays: formula4.arrays, revision: ver, codepage, supported: flags2 === 0, record: record7 });
       const addin = ver >= 8 ? supbooks.at(-1)?.kind === "addin" : legacyLink?.addin;
       const externalIdentity = (ver >= 8 ? supbooks.at(-1)?.workbook : legacyLink?.workbook) !== void 0 && flags2 === 0;
       if (!addin || flags2 !== 0) await retain(record7, sheet?.unsupportedRecords ?? unsupported10, !externalIdentity);
@@ -77356,7 +77547,9 @@ async function readBiff(borrowed, context2, encoding) {
     }
     if (opcode === 24 || opcode === 536) {
       const flags2 = data4.u16(0), length = data4.u8(3), tokenLength = ver === 2 ? data4.u8(4) : data4.u16(4);
-      const start = ver >= 7 ? 14 : ver >= 3 ? 6 : 5, sheetIndex = ver >= 8 ? data4.u16(8) : ver >= 7 ? data4.u16(6) : 0;
+      const start = ver >= 7 ? 14 : ver >= 3 ? 6 : 5;
+      const scopeIsWorksheet = ver >= 8 || ver >= 7 && data4.u16(8) !== 0;
+      const sheetIndex = scopeIsWorksheet ? data4.u16(8) : ver >= 7 ? data4.u16(6) : 0;
       const cursor = new BiffStrings([new Binary(data4.slice(start, data4.bytes.length - start))], context2, codepage);
       let name5;
       if (flags2 & 32 && length) {
@@ -77380,10 +77573,20 @@ async function readBiff(borrowed, context2, encoding) {
         ][builtin];
         name5 = (base ?? `_BIFF_BUILTIN_${builtin}`) + text2.slice(1);
       } else name5 = ver >= 8 ? cursor.unicode(length).text : cursor.legacy(length);
-      const tokens3 = data4.slice(start + cursor.consumedBytes, tokenLength);
-      const arrays = stringParts(index2, start + cursor.consumedBytes + tokenLength);
-      index2 = arrays.next;
-      names2.push({ name: accountText(name5), flags: flags2, tokens: tokens3, arrays: arrays.parts, sheetIndex, revision: ver, codepage, record: record7, ...sheet ? { owner: sheet } : {} });
+      const formula4 = formulaParts(index2, start + cursor.consumedBytes, tokenLength);
+      index2 = formula4.next;
+      names2.push({
+        name: accountText(name5),
+        flags: flags2,
+        tokens: formula4.tokens,
+        arrays: formula4.arrays,
+        sheetIndex,
+        scopeIsWorksheet,
+        revision: ver,
+        codepage,
+        record: record7,
+        ...sheet ? { owner: sheet } : {}
+      });
       continue;
     }
     if (ignoredOpcodes.has(opcode)) continue;
@@ -77457,13 +77660,15 @@ async function readBiff(borrowed, context2, encoding) {
         if (kind > 3) invalidBiff("invalid formula cache tag");
       }
       lastFormula = addCell(sheet, data4, value3, { cachedResult: value3, formulaDirty: !!(data4.u16(14) & 3) });
-      lastFormula.tokens = data4.slice(tokenStart, tokenLength);
-      const arrays = stringParts(index2, tokenStart + tokenLength);
-      index2 = arrays.next;
-      lastFormula.arrays = arrays.parts;
+      const formula4 = formulaParts(index2, tokenStart, tokenLength);
+      index2 = formula4.next;
+      lastFormula.tokens = formula4.tokens;
+      lastFormula.arrays = formula4.arrays;
       const nextOpcode = records[index2 + 1]?.opcode;
       const groupFollows = nextOpcode === 1212 || nextOpcode === 33 || nextOpcode === 545 || nextOpcode === 54 || nextOpcode === 55 || nextOpcode === 566;
-      const stringOpcode = records[index2 + (groupFollows ? 2 : 1)]?.opcode;
+      let stringIndex = index2 + (groupFollows ? 2 : 1);
+      if (groupFollows) while (records[stringIndex]?.opcode === 60) stringIndex++;
+      const stringOpcode = records[stringIndex]?.opcode;
       if (stringCache2 && stringOpcode !== 7 && stringOpcode !== 519) {
         const error3 = { kind: "error", value: "MISSING STRING" };
         lastFormula.cell = { ...lastFormula.cell, value: error3, cachedResult: error3 };
@@ -77503,10 +77708,17 @@ async function readBiff(borrowed, context2, encoding) {
       }
       const kind = opcode === 1212 ? "shared" : "array";
       const start = kind === "shared" ? 10 : ver === 2 ? 8 : ver <= 4 ? 10 : 14;
-      const tokens3 = data4.slice(start, ver === 2 && kind === "array" ? data4.u8(start - 1) : data4.u16(start - 2));
-      const arrays = stringParts(index2, start + tokens3.length);
-      index2 = arrays.next;
-      sheet.groups.push({ id: `biff-${sheet.offset}-${record7.offset}`, kind, range: range5, tokens: tokens3, arrays: arrays.parts, keyRow: lastFormula.cell.row, keyColumn: lastFormula.cell.column });
+      const formula4 = formulaParts(index2, start, ver === 2 && kind === "array" ? data4.u8(start - 1) : data4.u16(start - 2));
+      index2 = formula4.next;
+      sheet.groups.push({
+        id: `biff-${sheet.offset}-${record7.offset}`,
+        kind,
+        range: range5,
+        tokens: formula4.tokens,
+        arrays: formula4.arrays,
+        keyRow: lastFormula.cell.row,
+        keyColumn: lastFormula.cell.column
+      });
       continue;
     }
     if (opcode === 7 || opcode === 519) {
@@ -77614,7 +77826,7 @@ async function readBiff(borrowed, context2, encoding) {
   const localSheets = sheets.map((sheet) => sheet.name);
   const nameSheets = names2.map((name5) => {
     if (!name5.sheetIndex) return void 0;
-    return (name5.revision >= 8 ? sheets[name5.sheetIndex - 1]?.name : (name5.owner?.legacyExternalSheets ?? legacyExternalSheets)[name5.sheetIndex - 1]) ?? void 0;
+    return (name5.scopeIsWorksheet ? sheets[name5.sheetIndex - 1]?.name : (name5.owner?.legacyExternalSheets ?? legacyExternalSheets)[name5.sheetIndex - 1]) ?? void 0;
   });
   const externalNameTables = /* @__PURE__ */ new Map();
   const formulaNames = names2.map((name5) => name5.name);
@@ -164396,4 +164608,4 @@ tslib/tslib.js:
 @noble/ciphers/utils.js:
   (*! noble-ciphers - MIT License (c) 2023 Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-MSEZFB2F.js.map
+//# sourceMappingURL=chunk-U7DRVFRD.js.map

package/dist/safe-bash/chunks/{src-2MBSXQOA.js → src-YKSQQDD3.js}

@@ -81,7 +81,7 @@ import {
   updateWorkbook,
   validSheetSize,
   visitFormula
-} from "./chunk-MSEZFB2F.js";
+} from "./chunk-U7DRVFRD.js";
 import "./chunk-CVAVQZSF.js";
 import "./chunk-RCM5PZBN.js";
 import "./chunk-LSRHLNCR.js";
@@ -171,4 +171,4 @@ export {
   validSheetSize,
   visitFormula
 };
-//# sourceMappingURL=src-2MBSXQOA.js.map
+//# sourceMappingURL=src-YKSQQDD3.js.map

package/dist/safe-bash/commands/basic.js

@@ -84,7 +84,7 @@ export function basicCommands() {
             return { exitCode: 0 };
         }),
         define("basename", async (context) => {
-            const parsed = options(context.args, "as:z", { multiple: "a", suffix: "s", zero: "z" });
+            const parsed = options(context.args, "as:z", { multiple: "a", suffix: "s", zero: "z" }, true);
             const multiple = parsed.flags.has("a") || parsed.flags.has("s");
             requireOperands(parsed.operands, 1, multiple ? Infinity : 2);
             const suffix = value(parsed, "s") ?? (multiple ? undefined : parsed.operands[1]);
@@ -97,7 +97,7 @@ export function basicCommands() {
             return { exitCode: 0 };
         }, 1, 1),
         define("dirname", async (context) => {
-            const parsed = options(context.args, "z", { zero: "z" });
+            const parsed = options(context.args, "z", { zero: "z" }, true);
             requireOperands(parsed.operands);
             for (const operand of parsed.operands) {
                 const parent = dirname(operand);