@rowsncolumns/toolkit 24.5.4 → 24.5.5

package/dist/esm/excel-parser/helpers.js

@@ -1,5 +1,7 @@
 import { customFiltersToCriteria, dynamicFilterToCondition, top10FilterToCondition, } from "../autofilter-condition";
 import { addressToSelection } from "@rowsncolumns/utils";
+/** The engine's "(Blanks)" checklist entry — Excel's `<filters blank="1">`. */
+export const BLANK_LABEL = "(Blanks)";
 export const getRangeFromAddressRef = (ref) => {
     const selection = addressToSelection(ref);
     if (!selection)
@@ -85,6 +87,44 @@ const getNodeText = (node) => {
     }
     return String(node);
 };
+/**
+ * A `<dateGroupItem>`'s attributes → the criteria's date-group entry, or
+ * `undefined` without a year. `dateTimeGrouping` defaults to `day` like the
+ * schema.
+ */
+export function dateGroupFilterFromAttributes(attrs) {
+    if (!attrs)
+        return undefined;
+    const int = (name) => {
+        const raw = attrs[name];
+        if (raw === undefined || raw === null || raw === "")
+            return undefined;
+        const n = parseInt(String(raw), 10);
+        return Number.isFinite(n) ? n : undefined;
+    };
+    const year = int("year");
+    if (year === undefined)
+        return undefined;
+    const grouping = attrs.dateTimeGrouping;
+    const dateTimeGrouping = typeof grouping === "string" &&
+        ["year", "month", "day", "hour", "minute", "second"].includes(grouping)
+        ? grouping
+        : "day";
+    const month = int("month");
+    const day = int("day");
+    const hour = int("hour");
+    const minute = int("minute");
+    const second = int("second");
+    return {
+        year,
+        ...(month !== undefined ? { month } : {}),
+        ...(day !== undefined ? { day } : {}),
+        ...(hour !== undefined ? { hour } : {}),
+        ...(minute !== undefined ? { minute } : {}),
+        ...(second !== undefined ? { second } : {}),
+        dateTimeGrouping,
+    };
+}
 export function createFilterSpecsFromAutoFilter(autoFilter, 
 /**
  * Optional dxf resolver — called with (dxfId, cellColor) to return a
@@ -107,9 +147,31 @@ resolveDxfColor) {
         // <filters><filter val=…/></filters>
         const filtersObj = col.filters ?? col["x:filters"];
         const filter = filtersObj?.filter ?? filtersObj?.["x:filter"];
-        if (filter) {
-            const filterArray = Array.isArray(filter) ? filter : [filter];
-            criteria.visibleValues = filterArray.map((f) => f.a$.val);
+        const filtersAttrs = filtersObj?.a$ ?? filtersObj;
+        // `<filters blank="1">` — the checked "(Blanks)" entry is an attribute in
+        // Excel, never a `<filter val>`.
+        const showBlanks = filtersAttrs?.blank === "1" || filtersAttrs?.blank === "true";
+        if (filter || showBlanks) {
+            const filterArray = filter
+                ? Array.isArray(filter)
+                    ? filter
+                    : [filter]
+                : [];
+            const values = filterArray.map((f) => String(f.a$.val));
+            if (showBlanks)
+                values.push(BLANK_LABEL);
+            criteria.visibleValues = values;
+        }
+        // <filters><dateGroupItem year month day … dateTimeGrouping/></filters> —
+        // Excel's date-grouped checklist entries.
+        const dateGroupItem = filtersObj?.dateGroupItem ?? filtersObj?.["x:dateGroupItem"];
+        if (dateGroupItem) {
+            const items = Array.isArray(dateGroupItem) ? dateGroupItem : [dateGroupItem];
+            const dateGroups = items
+                .map((item) => dateGroupFilterFromAttributes(item?.a$ ?? item))
+                .filter((group) => group !== undefined);
+            if (dateGroups.length)
+                criteria.dateGroups = dateGroups;
         }
         // <colorFilter dxfId="…" cellColor="1|0"/>
         const colorFilterNode = col.colorFilter ?? col["x:colorFilter"];

package/dist/esm/excel-parser/interface.d.ts

@@ -1,4 +1,4 @@
-import type { ConditionalFormatRule, DataValidationRuleRecord, EmbeddedChart, NamedRange, ProtectedRange, Sheet, Slicer, SpreadsheetTheme, TableView, CustomTableStyle } from "@rowsncolumns/spreadsheet";
+import type { ConditionalFormatRule, DataValidationRuleRecord, EmbeddedChart, NamedRange, ProtectedRange, Sheet, Slicer, SpreadsheetTheme, TableView, CustomTableStyle, WorkbookProtection } from "@rowsncolumns/spreadsheet";
 import type { CommentThread, IterativeCalculationOptions, NamedCellStyle, TextFormat, TextFormatRun } from "@rowsncolumns/common-types";
 import type { EmbeddedObjectWithPosition, ExternalLink, ProcessSheetDataForSheetOptions, ProcessSheetDataResult, SheetCatalogEntry, WorkbookProperties } from "./types";
 export interface IWorkbookPlugin {
@@ -97,6 +97,14 @@ export interface IWorkbookPlugin {
      * Get iterative calculation settings if present in the workbook.
      */
     getIterativeCalculationOptions(): IterativeCalculationOptions | undefined;
+    /**
+     * Workbook-level protection (`<workbookProtection>` in `xl/workbook.xml` —
+     * Excel's "Protect Workbook" structure / windows / revision locks with the
+     * source's password hash), or `undefined` when the workbook is unprotected.
+     * Optional so plugins without workbook protection still satisfy the
+     * interface; the workbook wrapper resolves to `undefined`.
+     */
+    getWorkbookProtection?(): WorkbookProtection | undefined;
     /**
      * Whether the workbook uses the 1904 date epoch (`<workbookPr date1904="1"/>`).
      * Date serials in a 1904-anchored workbook are shifted by 1462 days.

package/dist/esm/excel-parser/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../excel-parser/interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../excel-parser/interface.ts"],"names":[],"mappings":"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"}

package/dist/esm/excel-parser/plugins/xlsx/conditional-formatting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conditional-formatting.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/conditional-formatting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EAGV,qBAAqB,EAGrB,YAAY,EAKZ,aAAa,EACd,MAAM,2BAA2B,CAAC;AAgLnC,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,UAAU,GACjB,aAAa,GAAG,SAAS,CAuC3B;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,GACjB,YAAY,CAKd;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,GAAG,GACV,gBAAgB,GAAG,SAAS,CAgI9B;AA8KD;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,GAAG,EACd,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,GAAG,EACnB,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACxC,qBAAqB,EAAE,CAsLzB"}
+{"version":3,"file":"conditional-formatting.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/conditional-formatting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAGhB,UAAU,EAGV,qBAAqB,EAGrB,YAAY,EAKZ,aAAa,EACd,MAAM,2BAA2B,CAAC;AA6NnC,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,UAAU,GACjB,aAAa,GAAG,SAAS,CAuC3B;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,GACjB,YAAY,CAKd;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,GAAG,GACV,gBAAgB,GAAG,SAAS,CAgI9B;AA8KD;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,GAAG,EACd,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,GAAG,EACnB,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACxC,qBAAqB,EAAE,CAsLzB"}

package/dist/esm/excel-parser/plugins/xlsx/conditional-formatting.js

@@ -1,6 +1,6 @@
 import { get, set } from "lodash-es";
 import { getRangeFromAddressRef } from "../../helpers";
-import { extractColor } from "./styles";
+import { extractColor, mapBorderStyle, mapBorderWidth, mapNumberFormatType, } from "./styles";
 /**
  * Parse cell format from dxf format definition. Theme color
  * references (`<color theme="N" tint="T"/>`) are intentionally
@@ -57,6 +57,47 @@ function parseDxfFormat(dxf, indexedColors) {
     if (dxf.fill && dxf.fill.patternFill && dxf.fill.patternFill.bgColor) {
         format.backgroundColor = extractColor(dxf.fill.patternFill.bgColor, indexedColors);
     }
+    // Border — a dxf carries its `<border>` inline (no borderId). Excel writes only
+    // the edges the rule sets; `style="none"` (or no style) is "no border here".
+    if (dxf.border) {
+        const borders = {};
+        const edgeToBorder = (edge) => {
+            const style = edge?.a$?.style;
+            if (!style || style === "none")
+                return undefined;
+            return {
+                style: mapBorderStyle(style),
+                width: mapBorderWidth(style),
+                color: edge.color ? extractColor(edge.color, indexedColors) : null,
+            };
+        };
+        for (const side of ["top", "bottom", "left", "right"]) {
+            const border = edgeToBorder(dxf.border[side]);
+            if (border)
+                borders[side] = border;
+        }
+        const diagonal = edgeToBorder(dxf.border.diagonal);
+        if (diagonal) {
+            const isOn = (v) => v !== undefined && v !== "0" && v !== "false" && v !== false;
+            if (isOn(dxf.border.a$?.diagonalUp))
+                borders.diagonalUp = diagonal;
+            if (isOn(dxf.border.a$?.diagonalDown))
+                borders.diagonalDown = diagonal;
+        }
+        if (Object.keys(borders).length > 0) {
+            format.borders = borders;
+        }
+    }
+    // Number format — inline `<numFmt numFmtId formatCode/>`; the code is authoritative
+    // (a dxf-only format need not appear in the workbook's `<numFmts>` table).
+    const formatCode = dxf.numFmt?.a$?.formatCode;
+    if (typeof formatCode === "string" && formatCode.length > 0) {
+        const numFmtId = parseInt(dxf.numFmt.a$?.numFmtId ?? "0", 10);
+        format.numberFormat = {
+            type: mapNumberFormatType(Number.isNaN(numFmtId) ? 0 : numFmtId, formatCode) ?? "GENERAL",
+            pattern: formatCode,
+        };
+    }
     return format;
 }
 /**

package/dist/esm/excel-parser/plugins/xlsx/data-validations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-validations.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/data-validations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,wBAAwB,EAEzB,MAAM,2BAA2B,CAAC;AASnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAwSvD,eAAO,MAAM,0BAA0B,GACrC,UAAU,eAAe,EACzB,SAAS,MAAM,EACf,YAAY,GAAG,EACf,YAAY,MAAM,+BAyRnB,CAAC"}
+{"version":3,"file":"data-validations.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/data-validations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,wBAAwB,EAEzB,MAAM,2BAA2B,CAAC;AASnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAoTvD,eAAO,MAAM,0BAA0B,GACrC,UAAU,eAAe,EACzB,SAAS,MAAM,EACf,YAAY,GAAG,EACf,YAAY,MAAM,+BAyRnB,CAAC"}

package/dist/esm/excel-parser/plugins/xlsx/data-validations.js

@@ -114,6 +114,15 @@ const mapErrorStyle = (style) => {
     return "stop";
 };
 const NUMBER_VALIDATION_TYPES = new Set(["whole", "decimal", "time"]);
+const NUMERIC_LITERAL_PATTERN = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i;
+/**
+ * A `whole` / `decimal` / `date` / `time` bound is an OOXML formula — Excel
+ * writes `<formula1>$B$1</formula1>`, `TODAY()`, `DATE(2024,1,1)`, `LEN(A1)`,
+ * `MaxValue` with no leading `=`. Store it the way the rule editors and the
+ * expression builders read a formula operand (`=…`), keeping only a bare
+ * numeric literal (`10`, `0.5`, `45292`) as is.
+ */
+const toBoundOperand = (formula) => NUMERIC_LITERAL_PATTERN.test(formula) ? formula : `=${formula}`;
 const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const parseListValues = (raw) => {
     const trimmed = raw.trim();
@@ -473,8 +482,8 @@ export const getDataValidationsForSheet = (workbook, sheetId, sheet_data, sheetN
             continue;
         }
         const values = [
-            { userEnteredValue: formula1 },
-            ...(formula2 ? [{ userEnteredValue: formula2 }] : []),
+            { userEnteredValue: toBoundOperand(formula1) },
+            ...(formula2 ? [{ userEnteredValue: toBoundOperand(formula2) }] : []),
         ];
         dataValidations.push({
             id: uuid(),

package/dist/esm/excel-parser/plugins/xlsx/index.d.ts

@@ -1,4 +1,4 @@
-import type { CellFormat, ConditionalFormatRule, DataValidationRuleRecord, EmbeddedChart, EmbeddedObject, NamedRange, ProtectedRange, Sheet, Slicer, SpreadsheetTheme, TableView, CustomTableStyle } from "@rowsncolumns/spreadsheet";
+import type { CellFormat, ConditionalFormatRule, DataValidationRuleRecord, EmbeddedChart, EmbeddedObject, NamedRange, ProtectedRange, Sheet, WorkbookProtection, Slicer, SpreadsheetTheme, TableView, CustomTableStyle } from "@rowsncolumns/spreadsheet";
 import type { NamedCellStyle, CommentThread, TextFormat, TextFormatRun } from "@rowsncolumns/common-types";
 import { XMLParser } from "fast-xml-parser";
 import type { IWorkbookPlugin } from "../../interface";
@@ -125,6 +125,7 @@ export declare class XlsxPlugin extends BaseWorkbookPlugin implements IWorkbookP
     private workSheets;
     private calcPr;
     private workbookPr;
+    private workbookProtectionXml;
     private currentSheetTotalRows?;
     /**
      * Per-sheet feature presence recorded during the hyperlink SAX pass.
@@ -307,6 +308,12 @@ export declare class XlsxPlugin extends BaseWorkbookPlugin implements IWorkbookP
      * 1904-anchored we treat it as 1900.
      */
     getUse1904Epoch(): boolean;
+    /**
+     * `<workbookProtection …/>` → `WorkbookProtection`. The element's presence is
+     * what matters (Excel writes it only for a protected workbook); attributes
+     * are kept exactly as present so the exporter replays them verbatim.
+     */
+    getWorkbookProtection(): WorkbookProtection | undefined;
     getIterativeCalculationOptions(): IterativeCalculationOptions | undefined;
     getSheetCount(): number;
     getSheets(minRowCount?: number, minColumnCount?: number): Promise<[Sheet[], TableView[]]>;

package/dist/esm/excel-parser/plugins/xlsx/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/index.ts"],"names":[],"mappings":"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"}

package/dist/esm/excel-parser/plugins/xlsx/index.js

@@ -1,8 +1,9 @@
 import { addressToCell, addressToSelection, alpha2number, checkIfStringIsReference, findMatchingBandProperty, generateSelectionsFromFormula, getCellXfsKey, isAFormula, isBareFormulaExpression, isNil, uuid, } from "@rowsncolumns/utils";
+import { normalizeImportedFormula } from "../../../helpers/excel-formula-prefixes";
 import { XMLParser } from "fast-xml-parser";
 import { get } from "lodash-es";
 import { Parser as HtmlParser } from "htmlparser2";
-import { createFilterSpecsFromAutoFilter, excelColumnWidthToPixels, findMax, createSortSpecsFromSortState, getRangeFromAddressRef, hiddenFilterButtonColumns, parseTableColumnTotals, } from "../../helpers";
+import { BLANK_LABEL, createFilterSpecsFromAutoFilter, dateGroupFilterFromAttributes, excelColumnWidthToPixels, findMax, createSortSpecsFromSortState, getRangeFromAddressRef, hiddenFilterButtonColumns, parseTableColumnTotals, } from "../../helpers";
 import { defaultSpreadsheetTheme } from "../../theme-default";
 import { Unescape } from "../../utils";
 import { compactPrintSettings, isBuiltinPrintName, isDefaultPageMargins, parsePrintAreaFormula, parsePrintTitlesFormula, PRINT_AREA_NAME, } from "../../../print-settings";
@@ -724,6 +725,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
     workSheets = [];
     calcPr;
     workbookPr;
+    workbookProtectionXml;
     currentSheetTotalRows;
     /**
      * Per-sheet feature presence recorded during the hyperlink SAX pass.
@@ -1090,12 +1092,27 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                     const colId = parseInt(attrs.colId ?? "0", 10);
                     currentFilterColumn = Number.isNaN(colId) ? null : colId;
                 }
+                // <filters blank="1"> — Excel writes the checked "(Blanks)" entry
+                // as an attribute, never as a <filter val>.
+                if (name === "filters" && currentFilterColumn !== null) {
+                    if (attrs.blank === "1" || attrs.blank === "true") {
+                        getOrCreateFilterColumn(currentFilterColumn).showBlanks = true;
+                    }
+                }
                 if (name === "filter" && currentFilterColumn !== null) {
                     const val = attrs.val;
                     if (typeof val === "string") {
                         getOrCreateFilterColumn(currentFilterColumn).visibleValues.push(val);
                     }
                 }
+                // <dateGroupItem year month day … dateTimeGrouping/> inside <filters>.
+                if (name === "dateGroupItem" && currentFilterColumn !== null) {
+                    const group = dateGroupFilterFromAttributes(attrs);
+                    if (group) {
+                        const entry = getOrCreateFilterColumn(currentFilterColumn);
+                        (entry.dateGroups ??= []).push(group);
+                    }
+                }
                 if (name === "colorFilter" && currentFilterColumn !== null) {
                     const entry = getOrCreateFilterColumn(currentFilterColumn);
                     const dxfIdRaw = attrs.dxfId;
@@ -1198,8 +1215,13 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         }
         const filterSpecs = Array.from(filterColumns.entries()).map(([columnIndex, raw]) => {
             const criteria = {};
-            if (raw.visibleValues.length) {
-                criteria.visibleValues = raw.visibleValues;
+            if (raw.visibleValues.length || raw.showBlanks) {
+                criteria.visibleValues = raw.showBlanks
+                    ? [...raw.visibleValues, BLANK_LABEL]
+                    : raw.visibleValues;
+            }
+            if (raw.dateGroups?.length) {
+                criteria.dateGroups = raw.dateGroups;
             }
             if (raw.colorFilterDxfId !== undefined) {
                 const color = this.resolveDxfColor(raw.colorFilterDxfId, raw.colorFilterCellColor !== false);
@@ -1863,6 +1885,9 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         this.workbookPr =
             get(this.workbookXml, "workbook.workbookPr") ||
                 get(this.workbookXml, "x:workbook.x:workbookPr");
+        this.workbookProtectionXml =
+            get(this.workbookXml, "workbook.workbookProtection") ||
+                get(this.workbookXml, "x:workbook.x:workbookProtection");
     }
     extractSheetsFromWorkbook(workbookXml) {
         let workSheets = get(workbookXml, "workbook.sheets.sheet") ||
@@ -3228,10 +3253,32 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
             const defined_names = Array.isArray(definedName)
                 ? definedName
                 : [definedName];
+            const sheetElements = this._getSheets();
+            // `localSheetId` indexes the `<sheets>` order; the model scopes a name by
+            // the sheet's id (`scopeSheetId`) so renames and reorders don't move it.
+            const scopeOf = (localSheetId) => {
+                if (localSheetId === undefined || localSheetId === null)
+                    return {};
+                const index = parseInt(String(localSheetId), 10);
+                const sheetId = Number(sheetElements[index]?.a$?.sheetId);
+                return Number.isFinite(sheetId) ? { scopeSheetId: sheetId } : {};
+            };
             for (const defined_name of defined_names) {
                 const name = defined_name.a$?.name;
-                const expression = defined_name.t$ || "";
+                // Defined names are stored with the same markers as cell formulas
+                // (`_xlfn.LAMBDA(_xlpm.x,_xlpm.x*2)`); keep the displayed spelling.
+                // The XML layer hands a numeric constant (`<definedName>0.2</definedName>`)
+                // over as a number — keep every expression as text so a constant name
+                // exports the way it was read.
+                const rawExpression = defined_name.t$;
+                const expressionText = rawExpression === undefined || rawExpression === null
+                    ? ""
+                    : String(rawExpression);
+                const expression = expressionText
+                    ? normalizeImportedFormula(expressionText)
+                    : "";
                 const hidden = defined_name.a$.hidden === "1";
+                const scope = scopeOf(defined_name.a$?.localSheetId);
                 // `_xlnm.Print_Area` / `_xlnm.Print_Titles` are sheet-scoped print
                 // facets, not user names: they land on `sheet.printSettings` (see
                 // `getSheets()`), never in `namedRanges` — a global copy would make
@@ -3267,6 +3314,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                                         sheetId,
                                     },
                                     ...(hidden ? { hidden: true } : {}),
+                                    ...scope,
                                 });
                                 pushedRange = true;
                             }
@@ -3283,6 +3331,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                             namedRangeId: uuid(),
                             value: isAFormula(expression) ? `=${expression}` : expression,
                             ...(hidden ? { hidden: true } : {}),
+                            ...scope,
                         });
                     }
                 }
@@ -3299,6 +3348,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                             ? `=${expression}`
                             : expression,
                         ...(hidden ? { hidden: true } : {}),
+                        ...scope,
                     });
                 }
             }
@@ -3322,6 +3372,16 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         const v = this.workbookPr?.a$?.date1904;
         return v === "1" || v === "true" || v === true;
     }
+    /**
+     * `<workbookProtection …/>` → `WorkbookProtection`. The element's presence is
+     * what matters (Excel writes it only for a protected workbook); attributes
+     * are kept exactly as present so the exporter replays them verbatim.
+     */
+    getWorkbookProtection() {
+        if (!this.workbookProtectionXml)
+            return undefined;
+        return readWorkbookProtectionAttrs(this.workbookProtectionXml?.a$ ?? {});
+    }
     getIterativeCalculationOptions() {
         const attrs = this.calcPr?.a$;
         if (!attrs)
@@ -5079,6 +5139,51 @@ const SHEET_PROTECTION_FLAGS = [
     "pivotTables",
     "selectUnlockedCells",
 ];
+/** `CT_WorkbookProtection` boolean attributes (camelCase = model key). */
+const WORKBOOK_PROTECTION_FLAGS = [
+    "lockStructure",
+    "lockWindows",
+    "lockRevision",
+];
+/** `CT_WorkbookProtection` string (hash / password) attributes. */
+const WORKBOOK_PROTECTION_TEXT_ATTRS = [
+    "workbookPassword",
+    "revisionsPassword",
+    "workbookAlgorithmName",
+    "workbookHashValue",
+    "workbookSaltValue",
+    "revisionsAlgorithmName",
+    "revisionsHashValue",
+    "revisionsSaltValue",
+];
+/**
+ * `<workbookProtection …>` attributes → `WorkbookProtection`. Only attributes
+ * present in the source are set (`"1"|"true"` → true, anything else → false),
+ * so the element round-trips without inventing schema defaults; the password
+ * hashes (legacy `workbookPassword` / `revisionsPassword` or the agile
+ * quartets) ride along verbatim. Mirrors `rnc-import`'s `read_workbook_protection`.
+ */
+const readWorkbookProtectionAttrs = (attrs) => {
+    const protection = {};
+    for (const flag of WORKBOOK_PROTECTION_FLAGS) {
+        const value = attrs[flag];
+        if (value !== undefined) {
+            protection[flag] = value === "1" || value === "true";
+        }
+    }
+    for (const key of WORKBOOK_PROTECTION_TEXT_ATTRS) {
+        if (attrs[key])
+            protection[key] = attrs[key];
+    }
+    for (const key of ["workbookSpinCount", "revisionsSpinCount"]) {
+        if (attrs[key] !== undefined) {
+            const count = parseInt(attrs[key], 10);
+            if (Number.isFinite(count))
+                protection[key] = count;
+        }
+    }
+    return protection;
+};
 /**
  * `<sheetProtection …>` attributes → `Sheet.sheetProtection`. Only attributes
  * present in the source are set (`"1"|"true"` → true, anything else → false),

package/dist/esm/excel-parser/plugins/xlsx/styles.d.ts

@@ -1,5 +1,5 @@
-import type { GridRange, NamedCellStyle } from "@rowsncolumns/common-types";
-import type { CellData, Color, ExtendedValue, TextFormat } from "@rowsncolumns/spreadsheet";
+import type { GridRange, Maybe, NamedCellStyle } from "@rowsncolumns/common-types";
+import type { BorderStyle, CellData, Color, ExtendedValue, TextFormat } from "@rowsncolumns/spreadsheet";
 import type { WorkBook } from "../../workbook";
 import type { WorkbookStyles } from "./index";
 type MergeCellContext = {
@@ -54,5 +54,20 @@ export declare function fontNodeToTextFormat(font: any, workbookStyles: Workbook
  * Extract color information
  */
 export declare function extractColor(colorObj: any, indexedColors?: Array<string | undefined>): Color | undefined | null;
+/**
+ * Map Excel number format ID to our NumberFormatType
+ */
+export declare function mapNumberFormatType(numFmtId: number, formatCode: Maybe<string>): "GENERAL" | "NUMBER" | "CURRENCY" | "ACCOUNTING" | "DATE" | "TIME" | "DATE_TIME" | "PERCENT" | "FRACTION" | "SCIENTIFIC" | "TEXT";
+/**
+ * Map Excel border style to our BorderStyle. Covers all 13 OOXML
+ * styles; the previous reduced set silently collapsed `hair` →
+ * `thin` and lost `mediumDashed` / `dashDot` / `dashDotDot` /
+ * `slantDashDot` entirely.
+ */
+export declare function mapBorderStyle(excelStyle: any): BorderStyle;
+/**
+ * Map border width based on style
+ */
+export declare function mapBorderWidth(excelStyle: any): 1 | 2 | 3;
 export {};
 //# sourceMappingURL=styles.d.ts.map

package/dist/esm/excel-parser/plugins/xlsx/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAET,cAAc,EACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAGV,QAAQ,EAER,KAAK,EAEL,aAAa,EAIb,UAAU,EACX,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAuD9C,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACzC,CAAC;AAEF;;;;;GAKG;AAEH,6DAA6D;AAC7D,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,GAAG,SAAS,KAAG,OACvB,CAAC;AAE1C,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,EAC7B,mBAAmB,UAAQ,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,QAAQ,GAAG,IAAI,CAqKjB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,GAC5B,QAAQ,GAAG,IAAI,CAoBjB;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,GAAG,KAAG,aAAa,GAAG,SAShE,CAAC;AA2TF;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,cAAc,GAC7B;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAUpD;AAgCD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,GAChD,cAAc,EAAE,CAuBlB;AA4ND;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,cAAc,GAC7B,UAAU,GAAG,IAAI,CAwFnB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,GAAG,EACb,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACxC,KAAK,GAAG,SAAS,GAAG,IAAI,CA8C1B"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,KAAK,EACL,cAAc,EACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAEV,WAAW,EACX,QAAQ,EAER,KAAK,EAEL,aAAa,EAIb,UAAU,EACX,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAuD9C,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACzC,CAAC;AAEF;;;;;GAKG;AAEH,6DAA6D;AAC7D,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,GAAG,SAAS,KAAG,OACvB,CAAC;AAE1C,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,EAC7B,mBAAmB,UAAQ,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,QAAQ,GAAG,IAAI,CAuKjB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,GAC5B,QAAQ,GAAG,IAAI,CAoBjB;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,GAAG,KAAG,aAAa,GAAG,SAShE,CAAC;AAsUF;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,cAAc,GAC7B;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAUpD;AAgCD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,GAChD,cAAc,EAAE,CAuBlB;AA4ND;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,cAAc,GAC7B,UAAU,GAAG,IAAI,CAwFnB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,GAAG,EACb,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACxC,KAAK,GAAG,SAAS,GAAG,IAAI,CA8C1B;AAiCD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,qIA6K9E;AAmRD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,GAAG,GAAG,WAAW,CA6B3D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,GAAG,aAwB7C"}

package/dist/esm/excel-parser/plugins/xlsx/styles.js

@@ -1,7 +1,7 @@
 import { formulaToRelativeReference } from "@rowsncolumns/calculator";
 import { IndexedColors } from "@rowsncolumns/utils";
 import { addressToCell, ssfFormat } from "@rowsncolumns/utils";
-import { decodeImplicitIntersection } from "../../../helpers/implicit-intersection";
+import { normalizeImportedFormula } from "../../../helpers/excel-formula-prefixes";
 import { standardExcelFormatCodeById } from "./numfmt";
 import { detectValueTypeAndPattern } from "./value-type-detection";
 const getNode = (node, ...keys) => {
@@ -72,7 +72,7 @@ export function getCellValueAndFormat(cell, workbook, enableCellXfsRegistry = fa
         return null;
     }
     // Extract raw value
-    const { rawValue: extractedRawValue, formulaValue, sharedStringIndex, isError, arrayFormulaRef, sharedFormulaSpec, } = extractCellValue(cell, workbook, activeSheetName);
+    const { rawValue: extractedRawValue, formulaValue, sharedStringIndex, isError, arrayFormulaRef, legacyArrayFormula, sharedFormulaSpec, } = extractCellValue(cell, workbook, activeSheetName);
     let rawValue = extractedRawValue;
     // Extract cell format
     const cellFormat = extractCellFormat(cell, workbook.workbookStyles, mergeContext);
@@ -190,6 +190,7 @@ export function getCellValueAndFormat(cell, workbook, enableCellXfsRegistry = fa
         ...(ue ? { ue } : {}),
         ...(ev ? { ev } : {}),
         ...(arrayFormulaRef ? { af: arrayFormulaRef } : {}),
+        ...(arrayFormulaRef && legacyArrayFormula ? { cse: true } : {}),
         ...(sharedFormulaSpec ? { sf: sharedFormulaSpec } : {}),
         ...(protection ? { protection } : {}),
     };
@@ -254,6 +255,7 @@ function extractCellValue(cell, workbook, activeSheetName) {
     let sharedStringIndex;
     let isError = false;
     let arrayFormulaRef;
+    let legacyArrayFormula = false;
     let sharedFormulaSpec;
     if (cellFormula) {
         // Shared formula. Capture provenance so the exporter can re-emit
@@ -285,10 +287,16 @@ function extractCellValue(cell, workbook, activeSheetName) {
         // carries the `<f>` element; spilled cells in the range have no formula
         // and therefore never reach this branch. Default to the cell's own
         // coordinate when `ref` is absent (some writers omit it for single-cell).
+        // Excel 365 marks a dynamic-array anchor with `cm="1"` on the `<c>`
+        // (an index into `xl/metadata.xml`'s XLDAPR record); the same
+        // `<f t="array">` without `cm` is a legacy Ctrl+Shift+Enter array, which
+        // Excel keeps showing as `{=…}`. Remember which one it was so the
+        // exporter writes the same kind back.
         if (cellFormula.a$ && cellFormula.a$.t === "array") {
             const cellRef = cell.a$?.r;
             arrayFormulaRef =
                 cellFormula.a$.ref ?? (cellRef ? `${cellRef}:${cellRef}` : undefined);
+            legacyArrayFormula = cell.a$?.cm === undefined || cell.a$?.cm === null;
         }
         // Shared-formula followers parse as `{ a$: { t: "shared", si }, t$: "" }` —
         // the self-closing `<f t="shared" si=".."/>` has no text content but the
@@ -327,9 +335,12 @@ function extractCellValue(cell, workbook, activeSheetName) {
         }
     }
     if (formulaValue) {
-        // Excel 365 persists the implicit-intersection operator `@` as
-        // `_xlfn.SINGLE(...)`; show it the way Excel does.
-        formulaValue = decodeImplicitIntersection(normalizeFormulaSheetNames(formulaValue));
+        // Sheet XML spells modern formulas with storage markers Excel never
+        // shows — `_xlfn.XLOOKUP(`, `_xlfn._xlws.FILTER(`, `_xlpm.` on LET /
+        // LAMBDA parameters, `_xlfn.ANCHORARRAY(A1)` for `A1#` and
+        // `_xlfn.SINGLE(x)` for `@x`. Store the formula the way Excel displays
+        // it; the exporter re-adds the markers.
+        formulaValue = normalizeImportedFormula(normalizeFormulaSheetNames(formulaValue));
     }
     switch (cellType) {
         case "s": {
@@ -409,6 +420,7 @@ function extractCellValue(cell, workbook, activeSheetName) {
         sharedStringIndex,
         isError,
         arrayFormulaRef,
+        legacyArrayFormula,
         sharedFormulaSpec,
     };
 }
@@ -914,7 +926,7 @@ function extractNumberFormat(xf, workbookStyles) {
 /**
  * Map Excel number format ID to our NumberFormatType
  */
-function mapNumberFormatType(numFmtId, formatCode) {
+export function mapNumberFormatType(numFmtId, formatCode) {
     // Built-in format ids
     switch (numFmtId) {
         case 0:
@@ -1324,7 +1336,7 @@ function extractBorders(xf, workbookStyles) {
  * `thin` and lost `mediumDashed` / `dashDot` / `dashDotDot` /
  * `slantDashDot` entirely.
  */
-function mapBorderStyle(excelStyle) {
+export function mapBorderStyle(excelStyle) {
     switch (excelStyle) {
         case "hair":
             return "hair";
@@ -1357,7 +1369,7 @@ function mapBorderStyle(excelStyle) {
 /**
  * Map border width based on style
  */
-function mapBorderWidth(excelStyle) {
+export function mapBorderWidth(excelStyle) {
     switch (excelStyle) {
         case "hair":
             // Hair is the lightest border in OOXML — slightly thinner than