@rowsncolumns/toolkit 24.4.2 → 24.4.3

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

@@ -2,9 +2,10 @@ import { addressToCell, addressToSelection, alpha2number, checkIfStringIsReferen
 import { XMLParser } from "fast-xml-parser";
 import { get } from "lodash-es";
 import { Parser as HtmlParser } from "htmlparser2";
-import { createFilterSpecsFromAutoFilter, excelColumnWidthToPixels, findMax, getRangeFromAddressRef, } from "../../helpers";
+import { createFilterSpecsFromAutoFilter, excelColumnWidthToPixels, findMax, getRangeFromAddressRef, parseTableColumnTotals, } from "../../helpers";
 import { defaultSpreadsheetTheme } from "../../theme-default";
 import { Unescape } from "../../utils";
+import { compactPrintSettings, isBuiltinPrintName, isDefaultPageMargins, parsePrintAreaFormula, parsePrintTitlesFormula, PRINT_AREA_NAME, } from "../../../print-settings";
 import { StreamingZipParser } from "../../zip-parser-streaming";
 import { SheetDataValidationStamper } from "../../dv-cell-stamp";
 import { BaseWorkbookPlugin } from "../base/index";
@@ -12,7 +13,7 @@ import { processChart } from "./charts";
 import { customFiltersToCondition, dynamicFilterToCondition, } from "../../../autofilter-condition";
 import { getConditionalFormattingFromSheet } from "./conditional-formatting";
 import { getDataValidationsForSheet as parseDataValidationsFromSheetData } from "./data-validations";
-import { processAnchors } from "./drawing";
+import { anchorsInDocumentOrder, processAnchors, } from "./drawing";
 import { getRelationsById } from "./relationships";
 import { hasPowerQueryParts, } from "../../../power-query";
 import { extractSheetViewProperties } from "./sheet-views";
@@ -739,6 +740,18 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
      * `getDataValidations()` aggregates these per-sheet caches, keeping ids
      * stable across per-sheet and workbook-wide callers.
      */
+    /**
+     * `<protectedRanges>` per sheet, populated while `getSheets` builds each
+     * `Sheet` (the element sits after `<sheetData>` in the worksheet part, so it
+     * rides the same geometry pass). Read back via `getProtectedRanges`.
+     */
+    protectedRangesBySheet = new Map();
+    /**
+     * The builtin `_xlnm.Print_Area` / `_xlnm.Print_Titles` defined names,
+     * hoisted out of `namedRanges` (they are sheet-scoped facets, not user
+     * names) and merged into each sheet's `printSettings` by `getSheets()`.
+     */
+    printNamesBySheetId = new Map();
     dataValidationsBySheetCache = new Map();
     /** Per-sheet memo for conditional formatting, mirroring the DV cache. */
     conditionalFormattingBySheetCache = new Map();
@@ -784,6 +797,26 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         let paneAttrs;
         let tabColor;
         let autoFilterRef;
+        // `<sheetProtection>` + `<protectedRanges>/<protectedRange>` — the sheet's
+        // protection facets, read here because both sit after `<sheetData>`.
+        let sheetProtection;
+        const protectedRangeEntries = [];
+        // Print facets (`CT_Worksheet` tail: printOptions / pageMargins /
+        // pageSetup / headerFooter / rowBreaks / colBreaks) plus the
+        // `<sheetPr><pageSetUpPr fitToPage>` flag. `_xlnm.Print_Area` /
+        // `_xlnm.Print_Titles` come from the workbook's defined names and are
+        // merged in by `getSheets()`.
+        let pageSetup;
+        let pageMargins;
+        let printOptions;
+        let fitToPage = false;
+        let headerFooter;
+        // The `<oddHeader>`-style element whose text is streaming in.
+        let headerFooterTextTarget;
+        const rowBreaks = [];
+        const columnBreaks = [];
+        // Inside `<rowBreaks>` ("row") / `<colBreaks>` ("column"); routes `<brk>`.
+        let breakAxis;
         const filterColumns = new Map();
         const getOrCreateFilterColumn = (colId) => {
             let entry = filterColumns.get(colId);
@@ -800,10 +833,21 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         // r-less sheets still report real extents instead of 0.
         let lastScannedRowIndex = 0;
         let scanSeqColIndex = 1;
+        // `<customSheetViews>` (Excel's View → Custom Views) carry their own
+        // pane / selection / autoFilter / print setup / breaks. They describe a
+        // saved view, not the sheet, so the whole subtree is skipped — a custom
+        // view's `<oddHeader>` or `<brk>` must not become the sheet's.
+        let inCustomSheetViews = false;
         const normalizeTag = (name) => name.includes(":") ? name.split(":")[1] : name;
         const parser = new HtmlParser({
             onopentag(tagName, attrs) {
                 const name = normalizeTag(tagName);
+                if (name === "customSheetViews") {
+                    inCustomSheetViews = true;
+                    return;
+                }
+                if (inCustomSheetViews)
+                    return;
                 if (name === "dimension") {
                     const ref = attrs?.ref;
                     if (typeof ref === "string") {
@@ -849,6 +893,50 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                 if (name === "tabColor") {
                     tabColor = { a$: { ...attrs } };
                 }
+                if (name === "sheetProtection") {
+                    sheetProtection = readSheetProtectionAttrs(attrs);
+                }
+                if (name === "protectedRange") {
+                    const sqref = attrs.sqref;
+                    if (typeof sqref === "string" && sqref) {
+                        protectedRangeEntries.push({
+                            sqref,
+                            name: attrs.name,
+                            securityDescriptor: attrs.securityDescriptor,
+                        });
+                    }
+                }
+                if (name === "pageSetUpPr") {
+                    fitToPage = isXmlTrue(attrs?.fitToPage);
+                }
+                if (name === "pageSetup") {
+                    pageSetup = readPageSetupAttrs(attrs);
+                }
+                if (name === "pageMargins") {
+                    pageMargins = readPageMarginsAttrs(attrs);
+                }
+                if (name === "printOptions") {
+                    printOptions = readPrintOptionsAttrs(attrs);
+                }
+                if (name === "headerFooter") {
+                    headerFooter = readHeaderFooterAttrs(attrs);
+                }
+                if (isHeaderFooterTextKey(name)) {
+                    headerFooterTextTarget = name;
+                    headerFooter ??= {};
+                }
+                if (name === "rowBreaks")
+                    breakAxis = "row";
+                if (name === "colBreaks")
+                    breakAxis = "column";
+                if (name === "brk" && breakAxis) {
+                    // Only manual breaks are user state; Excel drops automatic ones
+                    // (`man` absent) on save as well.
+                    const id = parseInt(attrs?.id ?? "", 10);
+                    if (Number.isFinite(id) && id > 0 && isXmlTrue(attrs?.man)) {
+                        (breakAxis === "row" ? rowBreaks : columnBreaks).push(id);
+                    }
+                }
                 if (name === "sheetView" && !sheetViewAttrs) {
                     sheetViewAttrs = { ...attrs };
                 }
@@ -1037,11 +1125,29 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                     }
                 }
             },
+            ontext(text) {
+                if (headerFooterTextTarget && headerFooter) {
+                    headerFooter[headerFooterTextTarget] =
+                        `${headerFooter[headerFooterTextTarget] ?? ""}${text}`;
+                }
+            },
             onclosetag(tagName) {
                 const name = normalizeTag(tagName);
+                if (name === "customSheetViews") {
+                    inCustomSheetViews = false;
+                    return;
+                }
+                if (inCustomSheetViews)
+                    return;
                 if (name === "filterColumn") {
                     currentFilterColumn = null;
                 }
+                if (isHeaderFooterTextKey(name)) {
+                    headerFooterTextTarget = undefined;
+                }
+                if (name === "rowBreaks" || name === "colBreaks") {
+                    breakAxis = undefined;
+                }
             },
             onerror(err) {
                 console.error("Streaming sheet metadata parse error", err);
@@ -1114,6 +1220,18 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
             tablePartIds,
             outlineSummaryBelow,
             outlineSummaryRight,
+            sheetProtection,
+            protectedRangeEntries,
+            printSettings: compactPrintSettings({
+                pageSetup: fitToPage ? { ...pageSetup, fitToPage: true } : pageSetup,
+                // Every Excel worksheet carries `<pageMargins>`; only non-default
+                // margins are user state worth modelling.
+                pageMargins: isDefaultPageMargins(pageMargins) ? undefined : pageMargins,
+                printOptions,
+                headerFooter,
+                rowBreaks,
+                columnBreaks,
+            }),
         };
     }
     /**
@@ -1816,6 +1934,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         this.sheetMetadataCache.clear();
         this.dataValidationsBySheetCache.clear();
         this.conditionalFormattingBySheetCache.clear();
+        this.protectedRangesBySheet.clear();
         await this.loadWorkbookXml();
         this.relations = await this.getRelations();
         this.workbookStyles = await WorkbookStyles.load(this.zipParser, this.xmlParser);
@@ -1835,6 +1954,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         this.sheetMetadataCache.clear();
         this.dataValidationsBySheetCache.clear();
         this.conditionalFormattingBySheetCache.clear();
+        this.protectedRangesBySheet.clear();
         this.worksheetBySheetId.clear();
     }
     clearSharedFormula() {
@@ -1924,7 +2044,10 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                             : [];
                     const columns = columnDefsArray.map((colDef) => {
                         const name = colDef.a$.name || "";
-                        const columnObj = { name };
+                        const columnObj = {
+                            name,
+                            ...parseTableColumnTotals(colDef),
+                        };
                         // Check for calculated column
                         // Handle both with and without namespace prefix
                         const calculatedColumnFormula = get(colDef, "calculatedColumnFormula") ||
@@ -2878,28 +3001,17 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                         ? drawingPath.substring(1)
                         : `xl/${drawingPath}`;
                 }
-                const drawingContent = await this.zipParser.getText(drawingPath);
+                const drawingContent = (await this.zipParser.getText(drawingPath)) ?? "";
                 // Parse drawing XML
-                const drawing = this.xmlParser.parse(drawingContent ?? "");
-                // Extract image anchors - both absolute and cell anchors
-                // Handle different XML namespaces that might be used
-                const twoCellAnchors = get(drawing, "xdr:wsDr.xdr:twoCellAnchor") ||
-                    get(drawing, "wsDr.twoCellAnchor");
-                const oneCellAnchors = get(drawing, "xdr:wsDr.xdr:oneCellAnchor") ||
-                    get(drawing, "wsDr.oneCellAnchor");
-                const absoluteAnchors = get(drawing, "xdr:wsDr.xdr:absoluteAnchor") ||
-                    get(drawing, "wsDr.absoluteAnchor");
-                // One cell
-                for (const image of await processAnchors(oneCellAnchors, "oneCellAnchor", drawingPath, sheetId, this.zipParser, this.xmlParser)) {
-                    images.push(image);
-                }
-                // Two cell
-                for (const image of await processAnchors(twoCellAnchors, "twoCellAnchors", drawingPath, sheetId, this.zipParser, this.xmlParser)) {
-                    images.push(image);
-                }
-                // absoluteAnchors
-                for (const image of await processAnchors(absoluteAnchors, "absoluteAnchors", drawingPath, sheetId, this.zipParser, this.xmlParser)) {
-                    images.push(image);
+                const drawing = this.xmlParser.parse(drawingContent);
+                // Anchor order in the drawing part is Excel's z-order (first = back).
+                // The parse groups anchors by element name, so the document order
+                // across `oneCellAnchor` / `twoCellAnchor` / `absoluteAnchor` is
+                // recovered from the raw part and each anchor processed in that order.
+                for (const anchor of anchorsInDocumentOrder(drawing, drawingContent)) {
+                    for (const image of await processAnchors(anchor.node, anchor.kind, drawingPath, sheetId, this.zipParser, this.xmlParser)) {
+                        images.push(image);
+                    }
                 }
             }
         }
@@ -2949,7 +3061,43 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
     _getSheets() {
         return this.workSheets;
     }
+    /**
+     * Resolve a builtin print name to its sheet (`localSheetId` indexes the
+     * `<sheets>` order; a name without scope falls back to the sheet named in
+     * the formula) and record the parsed print area / titles for `getSheets()`.
+     */
+    stashBuiltinPrintName(name, expression, localSheetId, sheetIdBySheetName) {
+        if (!expression || expression.includes("#REF!"))
+            return;
+        const parsed = name === PRINT_AREA_NAME
+            ? parsePrintAreaFormula(expression)
+            : parsePrintTitlesFormula(expression);
+        if (!parsed)
+            return;
+        let sheetId;
+        if (localSheetId !== undefined) {
+            const index = parseInt(localSheetId, 10);
+            const sheetEl = this._getSheets()[index];
+            const id = Number(sheetEl?.a$?.sheetId);
+            if (Number.isFinite(id))
+                sheetId = id;
+        }
+        if (sheetId === undefined && parsed.sheetName) {
+            sheetId = sheetIdBySheetName[parsed.sheetName];
+        }
+        if (sheetId === undefined)
+            return;
+        const entry = this.printNamesBySheetId.get(sheetId) ?? {};
+        if ("ranges" in parsed) {
+            entry.printArea = parsed.ranges;
+        }
+        else {
+            entry.printTitles = parsed.titles;
+        }
+        this.printNamesBySheetId.set(sheetId, entry);
+    }
     _getNamedRanges() {
+        this.printNamesBySheetId.clear();
         const xml = this.workbookXml;
         const sheetIdBySheetName = this._getSheets().reduce((acc, element) => {
             if (element) {
@@ -2971,6 +3119,14 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                 const name = defined_name.a$?.name;
                 const expression = defined_name.t$ || "";
                 const hidden = defined_name.a$.hidden === "1";
+                // `_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
+                // Excel repair the file on the next export.
+                if (isBuiltinPrintName(name)) {
+                    this.stashBuiltinPrintName(name, typeof expression === "string" ? expression : "", defined_name.a$?.localSheetId, sheetIdBySheetName);
+                    continue;
+                }
                 // Empty defined names are noise; nothing useful to round-trip.
                 // Hidden defined names ARE preserved — Excel uses them as scratch
                 // names for features like print areas and add-ins, and dropping
@@ -3162,7 +3318,21 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
                 sheet.visibility = visibility;
             }
             const metadata = await this.getSheetMetadata(rid);
-            const { merges, rowEntries, columnMetadata, maxRowIndex, maxColumnIndex, autoFilterRange, filterSpecs, sheetViewData, tabColor, sheetHasFilterMode, zeroHeight, defaultRowHeightPx, defaultColumnWidthPx, tablePartIds, outlineSummaryBelow, outlineSummaryRight, } = metadata;
+            const { merges, rowEntries, columnMetadata, maxRowIndex, maxColumnIndex, autoFilterRange, filterSpecs, sheetViewData, tabColor, sheetHasFilterMode, zeroHeight, defaultRowHeightPx, defaultColumnWidthPx, tablePartIds, outlineSummaryBelow, outlineSummaryRight, sheetProtection, protectedRangeEntries, printSettings, } = metadata;
+            if (sheetProtection) {
+                sheet.sheetProtection = sheetProtection;
+            }
+            {
+                const printNames = this.printNamesBySheetId.get(sheetId);
+                const merged = compactPrintSettings({
+                    ...printSettings,
+                    printArea: printNames?.printArea,
+                    printTitles: printNames?.printTitles,
+                });
+                if (merged)
+                    sheet.printSettings = merged;
+            }
+            this.protectedRangesBySheet.set(sheetId, protectedRangesFromEntries(sheetId, protectedRangeEntries));
             if (defaultRowHeightPx !== undefined) {
                 sheet.defaultRowHeight = defaultRowHeightPx;
             }
@@ -3203,7 +3373,7 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
             // counts
             let columnCount = 0;
             // gridlines / headers / zeros / zoom
-            const { frozenRowCount, frozenColumnCount, paneTopLeftCell, showGridLines, showRowColHeaders, showZeros, zoomScale, } = extractSheetViewProperties(sheetViewData);
+            const { frozenRowCount, frozenColumnCount, paneTopLeftCell, showGridLines, showRowColHeaders, showZeros, zoomScale, rightToLeft, } = extractSheetViewProperties(sheetViewData);
             sheet.frozenRowCount = frozenRowCount;
             sheet.frozenColumnCount = frozenColumnCount;
             if (paneTopLeftCell) {
@@ -3219,6 +3389,8 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
             if (zoomScale !== undefined && zoomScale !== 100) {
                 sheet.zoomScale = zoomScale;
             }
+            if (rightToLeft)
+                sheet.rightToLeft = true;
             // tab color
             if (tabColor) {
                 sheet.tabColor = extractColor(tabColor, this.workbookStyles.indexedColors);
@@ -4117,6 +4289,18 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         const sheet_data = await this.getSheetData(rid);
         return parseDataValidationsFromSheetData(this, sheetId, sheet_data, sheetName);
     }
+    /**
+     * Allow-edit ranges (`<protectedRanges>/<protectedRange>`) in the model the
+     * `protect-range` command writes: `protectedRangeId` = the source `name`,
+     * `range` = the first `sqref` area plus `sheetId`. Available after
+     * `getSheets()`; sheet-level `<sheetProtection>` rides `Sheet.sheetProtection`.
+     */
+    getProtectedRanges(sheetId) {
+        if (sheetId !== undefined) {
+            return this.protectedRangesBySheet.get(sheetId) ?? [];
+        }
+        return Array.from(this.protectedRangesBySheet.values()).flat();
+    }
     getNamedRanges() {
         return this.namedRanges;
     }
@@ -4652,3 +4836,155 @@ export class XlsxPlugin extends BaseWorkbookPlugin {
         return externalLinks;
     }
 }
+/** `CT_SheetProtection` boolean attributes, in OOXML order (camelCase = model key). */
+const SHEET_PROTECTION_FLAGS = [
+    "sheet",
+    "objects",
+    "scenarios",
+    "formatCells",
+    "formatColumns",
+    "formatRows",
+    "insertColumns",
+    "insertRows",
+    "insertHyperlinks",
+    "deleteColumns",
+    "deleteRows",
+    "selectLockedCells",
+    "sort",
+    "autoFilter",
+    "pivotTables",
+    "selectUnlockedCells",
+];
+/**
+ * `<sheetProtection …>` attributes → `Sheet.sheetProtection`. Only attributes
+ * present in the source are set (`"1"|"true"` → true, anything else → false),
+ * so an explicit flag round-trips without inventing schema defaults; the
+ * password hash (legacy `password` or the agile quartet) rides along verbatim.
+ * Mirrors `rnc-import`'s `read_sheet_protection`.
+ */
+const readSheetProtectionAttrs = (attrs) => {
+    const protection = {};
+    for (const flag of SHEET_PROTECTION_FLAGS) {
+        const value = attrs[flag];
+        if (value !== undefined) {
+            protection[flag] = value === "1" || value === "true";
+        }
+    }
+    if (attrs.password)
+        protection.password = attrs.password;
+    if (attrs.algorithmName)
+        protection.algorithmName = attrs.algorithmName;
+    if (attrs.hashValue)
+        protection.hashValue = attrs.hashValue;
+    if (attrs.saltValue)
+        protection.saltValue = attrs.saltValue;
+    if (attrs.spinCount !== undefined) {
+        const spinCount = parseInt(attrs.spinCount, 10);
+        if (Number.isFinite(spinCount))
+            protection.spinCount = spinCount;
+    }
+    return protection;
+};
+/**
+ * `<protectedRange sqref name>` entries → `ProtectedRange[]` for one sheet. The
+ * `name` becomes the `protectedRangeId` so it keys the stored facet and
+ * re-exports under the same name; only the first `sqref` area is modeled
+ * (Excel writes one per element in practice).
+ */
+const protectedRangesFromEntries = (sheetId, entries) => {
+    const ranges = [];
+    for (const entry of entries) {
+        const first = entry.sqref.trim().split(/\s+/)[0];
+        const range = first ? getRangeFromAddressRef(first) : undefined;
+        if (!range)
+            continue;
+        const protectedRange = {
+            range: { sheetId, ...range },
+        };
+        if (entry.name)
+            protectedRange.protectedRangeId = entry.name;
+        if (entry.securityDescriptor) {
+            protectedRange.securityDescriptor = entry.securityDescriptor;
+        }
+        ranges.push(protectedRange);
+    }
+    return ranges;
+};
+const isXmlTrue = (value) => value === "1" || value === "true";
+/** `"1"|"true"|"0"|"false"` → boolean; absent stays undefined. */
+const xmlBoolOpt = (value) => value === undefined ? undefined : isXmlTrue(value);
+const xmlIntOpt = (value) => {
+    if (value === undefined)
+        return undefined;
+    const n = parseInt(value, 10);
+    return Number.isFinite(n) ? n : undefined;
+};
+const xmlFloatOpt = (value) => {
+    if (value === undefined)
+        return undefined;
+    const n = parseFloat(value);
+    return Number.isFinite(n) ? n : undefined;
+};
+const stripUndefined = (value) => {
+    for (const key of Object.keys(value)) {
+        if (value[key] === undefined)
+            delete value[key];
+    }
+    return value;
+};
+/** `<headerFooter>` children whose text is a header/footer code string. */
+const HEADER_FOOTER_TEXT_ELEMENTS = [
+    "oddHeader",
+    "oddFooter",
+    "evenHeader",
+    "evenFooter",
+    "firstHeader",
+    "firstFooter",
+];
+const isHeaderFooterTextKey = (name) => HEADER_FOOTER_TEXT_ELEMENTS.includes(name);
+/**
+ * `<pageSetup …>` → `PageSetup` (present attributes only; `fitToPage` is
+ * filled from `<sheetPr><pageSetUpPr>` by the caller). Mirrors
+ * `rnc-import`'s `read_page_setup`.
+ */
+const readPageSetupAttrs = (attrs) => {
+    const orientation = attrs.orientation;
+    const pageOrder = attrs.pageOrder;
+    return stripUndefined({
+        orientation: orientation === "landscape" || orientation === "portrait"
+            ? orientation
+            : undefined,
+        paperSize: xmlIntOpt(attrs.paperSize),
+        scale: xmlIntOpt(attrs.scale),
+        fitToWidth: xmlIntOpt(attrs.fitToWidth),
+        fitToHeight: xmlIntOpt(attrs.fitToHeight),
+        firstPageNumber: xmlIntOpt(attrs.firstPageNumber),
+        useFirstPageNumber: xmlBoolOpt(attrs.useFirstPageNumber),
+        pageOrder: pageOrder === "overThenDown" || pageOrder === "downThenOver"
+            ? pageOrder
+            : undefined,
+        blackAndWhite: xmlBoolOpt(attrs.blackAndWhite),
+        draft: xmlBoolOpt(attrs.draft),
+    });
+};
+const readPageMarginsAttrs = (attrs) => stripUndefined({
+    left: xmlFloatOpt(attrs.left),
+    right: xmlFloatOpt(attrs.right),
+    top: xmlFloatOpt(attrs.top),
+    bottom: xmlFloatOpt(attrs.bottom),
+    header: xmlFloatOpt(attrs.header),
+    footer: xmlFloatOpt(attrs.footer),
+});
+const readPrintOptionsAttrs = (attrs) => stripUndefined({
+    gridLines: xmlBoolOpt(attrs.gridLines),
+    headings: xmlBoolOpt(attrs.headings),
+    horizontalCentered: xmlBoolOpt(attrs.horizontalCentered),
+    verticalCentered: xmlBoolOpt(attrs.verticalCentered),
+});
+/** `<headerFooter …>` attributes; the child texts stream in via `ontext`. */
+const readHeaderFooterAttrs = (attrs) => stripUndefined({
+    differentOddEven: xmlBoolOpt(attrs.differentOddEven),
+    differentFirst: xmlBoolOpt(attrs.differentFirst),
+    scaleWithDoc: xmlBoolOpt(attrs.scaleWithDoc),
+    alignWithMargins: xmlBoolOpt(attrs.alignWithMargins),
+});

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

@@ -1 +1 @@
-{"version":3,"file":"pivots.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/pivots.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AASrE,KAAK,aAAa,GAAG;IACnB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6OF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS;IACP,SAAS,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,mEAAmE;IACnE,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,kDAAkD;IAClD,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACtD,cAAc,EAAE,MAAM,CAAC;CACxB,KACA,OAAO,CAAC,UAAU,EAAE,CAoEtB,CAAC"}
+{"version":3,"file":"pivots.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/pivots.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAEV,UAAU,EAGX,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAoErE,KAAK,aAAa,GAAG;IACnB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAkQF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS;IACP,SAAS,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,mEAAmE;IACnE,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,kDAAkD;IAClD,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACtD,cAAc,EAAE,MAAM,CAAC;CACxB,KACA,OAAO,CAAC,UAAU,EAAE,CAsEtB,CAAC"}

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

@@ -1,3 +1,62 @@
+const attr = (node, name) => {
+    const v = node?.a$?.[name] ?? node?.[`@_${name}`];
+    return v === undefined || v === null ? undefined : String(v);
+};
+/**
+ * `dataField@showDataAs` (ECMA-376) + the `x14:dataField@pivotShowAs`
+ * extension Excel uses for the newer modes → `PivotValue.showAs`.
+ * Modes without an engine equivalent (difference, % of parent, index…)
+ * degrade to the plain aggregate.
+ */
+const readShowAs = (dataField) => {
+    const extLst = dataField?.extLst ?? dataField?.["x:extLst"];
+    const exts = asArray(extLst?.ext ?? extLst?.["x:ext"]);
+    for (const ext of exts) {
+        const x14 = ext?.["x14:dataField"];
+        const pivotShowAs = attr(x14, "pivotShowAs");
+        if (pivotShowAs === "rankAscending")
+            return "rank_asc";
+        if (pivotShowAs === "rankDescending")
+            return "rank_desc";
+    }
+    switch (attr(dataField, "showDataAs")) {
+        case "percentOfTotal":
+            return "pct_of_total";
+        case "percentOfRow":
+            return "pct_of_row";
+        case "percentOfCol":
+            return "pct_of_column";
+        case "runTotal":
+            return "running_total";
+        default:
+            return undefined;
+    }
+};
+const readStyleInfo = (pt) => {
+    const node = pt?.pivotTableStyleInfo ?? pt?.["x:pivotTableStyleInfo"];
+    if (!node)
+        return undefined;
+    const flag = (name) => {
+        const v = attr(node, name);
+        return v === undefined ? undefined : v !== "0" && v !== "false";
+    };
+    const info = {};
+    const name = attr(node, "name");
+    if (name)
+        info.name = name;
+    for (const key of [
+        "showRowHeaders",
+        "showColHeaders",
+        "showRowStripes",
+        "showColStripes",
+        "showLastColumn",
+    ]) {
+        const v = flag(key);
+        if (v !== undefined)
+            info[key] = v;
+    }
+    return Object.keys(info).length ? info : undefined;
+};
 const asArray = (value) => {
     if (value === undefined || value === null)
         return [];
@@ -69,6 +128,9 @@ const parsePivotCacheDefinition = (cacheXml) => {
     const cacheSource = cacheDef.cacheSource ?? cacheDef["x:cacheSource"];
     const wsSource = cacheSource?.worksheetSource ?? cacheSource?.["x:worksheetSource"];
     const sourceRef = wsSource?.a$?.ref || wsSource?.["@_ref"];
+    // Excel writes the source sheet as `worksheetSource@sheet` (the ref is
+    // then sheet-less); a `Sheet!A1:D9` prefix on the ref also occurs.
+    const sourceSheet = attr(wsSource, "sheet");
     const cacheFields = cacheDef.cacheFields ?? cacheDef["x:cacheFields"];
     const rawFieldList = asArray(cacheFields?.cacheField ?? cacheFields?.["x:cacheField"]);
     const fields = rawFieldList.map((cf) => {
@@ -86,9 +148,14 @@ const parsePivotCacheDefinition = (cacheXml) => {
                 items.push(null);
             }
         }
-        return { name, sharedItems: items.length > 0 ? items : undefined };
+        const formula = attr(cf, "formula");
+        return {
+            name,
+            sharedItems: items.length > 0 ? items : undefined,
+            ...(formula !== undefined ? { formula } : {}),
+        };
     });
-    return { sourceRef, fields };
+    return { sourceRef, sourceSheet, fields };
 };
 /**
  * Parse a single pivotTable.xml into a PivotTable record. Needs the
@@ -124,7 +191,8 @@ const parsePivotTableXml = (pivotXml, cacheDef, getSheetId, defaultSheetId, pivo
     // Source range from cacheDef
     let source;
     if (cacheDef.sourceRef) {
-        const { sheet, a1 } = stripSheetPrefix(cacheDef.sourceRef);
+        const { sheet: prefixSheet, a1 } = stripSheetPrefix(cacheDef.sourceRef);
+        const sheet = prefixSheet ?? cacheDef.sourceSheet;
         const sourceRange = parseA1Range(a1);
         if (sourceRange) {
             const resolved = sheet ? getSheetId(sheet) : undefined;
@@ -169,11 +237,19 @@ const parsePivotTableXml = (pivotXml, cacheDef, getSheetId, defaultSheetId, pivo
         const field = fieldNameAt(idx);
         if (!field)
             return null;
-        const aggFunc = normalizeAggFunc(d.a$?.subtotal || d["@_subtotal"]);
+        // Excel always summarizes a calculated field with Sum.
+        const aggFunc = cacheDef.fields[idx]?.formula !== undefined
+            ? "sum"
+            : normalizeAggFunc(d.a$?.subtotal || d["@_subtotal"]);
         const displayName = d.a$?.name || d["@_name"] || `${aggFunc} of ${field}`;
-        return { field, displayName, aggFunc };
+        const showAs = readShowAs(d);
+        return { field, displayName, aggFunc, ...(showAs ? { showAs } : {}) };
     })
         .filter((v) => v !== null);
+    const calculatedFields = cacheDef.fields
+        .filter((f) => f.formula !== undefined && f.name !== "")
+        .map((f) => ({ name: f.name, formula: f.formula }));
+    const styleInfo = readStyleInfo(pt);
     // Display toggles (Phase A1 — round-trip these so the editor
     // checkboxes pick up the imported values).
     // XLSX: rowGrandTotals / colGrandTotals default to "1" (true).
@@ -192,6 +268,8 @@ const parsePivotTableXml = (pivotXml, cacheDef, getSheetId, defaultSheetId, pivo
         showColumnGrandTotals: showColGT,
         // Subtotal default on individual fields → leave true.
         showSubtotals: true,
+        ...(calculatedFields.length ? { calculatedFields } : {}),
+        ...(styleInfo ? { styleInfo } : {}),
     };
 };
 /**
@@ -219,7 +297,9 @@ export const parsePivotTablesForSheet = async (options) => {
         const fileName = pivotTablePath.split("/").pop();
         const pivotRelsPath = `${pivotDir}/_rels/${fileName}.rels`;
         const pivotRelsText = await zipParser.getText(pivotRelsPath);
-        let cacheDef = { fields: [] };
+        let cacheDef = {
+            fields: [],
+        };
         if (pivotRelsText) {
             const pivotRels = xmlParser.parse(pivotRelsText);
             const relList = asArray(pivotRels?.Relationships?.Relationship);