@rowsncolumns/toolkit 24.4.2 → 24.4.4

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

@@ -11,6 +11,7 @@ import { extractDataValidations } from "./data-validations";
 import { convertOdsFormulaToExcel } from "./formula";
 import { extractSparklines, extractSparklineData, } from "./sparklines";
 import { OdsStyles } from "./styles";
+import { compactPrintSettings } from "../../../print-settings";
 const ODS_XML_OPTIONS = {
     ignoreAttributes: false,
     attributeNamePrefix: "@_",
@@ -48,6 +49,112 @@ function getAttribute(node, attributeName) {
     }
     return undefined;
 }
+const ROW_WRAPPER_TAGS = [
+    "table:table-row-group",
+    "table:table-header-rows",
+    "table:table-rows",
+    "table-row-group",
+    "table-header-rows",
+    "table-rows",
+];
+const COLUMN_WRAPPER_TAGS = [
+    "table:table-column-group",
+    "table:table-header-columns",
+    "table:table-columns",
+    "table-column-group",
+    "table-header-columns",
+    "table-columns",
+];
+/**
+ * Order-preserving `<table:table>` children → the `<table:table-row>` nodes in
+ * document order, descending into `<table:table-row-group>` (outline),
+ * `<table:table-header-rows>` (print titles) and `<table:table-rows>`
+ * wrappers. Rows inside a wrapper are ordinary rows for cell data, merges,
+ * metadata and positions.
+ */
+function flattenOrderedRows(children) {
+    const rows = [];
+    for (const child of children ?? []) {
+        if (!child || typeof child !== "object")
+            continue;
+        if (child["table:table-row"] || child["table-row"]) {
+            rows.push(child);
+            continue;
+        }
+        const wrapper = ROW_WRAPPER_TAGS.find((tag) => child[tag]);
+        if (wrapper)
+            rows.push(...flattenOrderedRows(child[wrapper]));
+    }
+    return rows;
+}
+/** Column counterpart of {@link flattenOrderedRows}. */
+function flattenOrderedColumns(children) {
+    const columns = [];
+    for (const child of children ?? []) {
+        if (!child || typeof child !== "object")
+            continue;
+        if (child["table:table-column"] || child["table-column"]) {
+            columns.push(child);
+            continue;
+        }
+        const wrapper = COLUMN_WRAPPER_TAGS.find((tag) => child[tag]);
+        if (wrapper)
+            columns.push(...flattenOrderedColumns(child[wrapper]));
+    }
+    return columns;
+}
+/**
+ * The 1-based band covered by the `<table:table-header-rows>` /
+ * `<table:table-header-columns>` wrappers (ODS print titles), or undefined.
+ * A band that straddles an outline-group edge is written as several
+ * wrappers (ODF forbids a group inside header rows; LibreOffice closes and
+ * re-opens the wrapper around the group), so the segments are unioned back
+ * into one band — the same rule LibreOffice applies on import.
+ */
+function findOrderedHeaderBand(children, axis) {
+    const itemTags = axis === "row"
+        ? ["table:table-row", "table-row"]
+        : ["table:table-column", "table-column"];
+    const headerTags = axis === "row"
+        ? ["table:table-header-rows", "table-header-rows"]
+        : ["table:table-header-columns", "table-header-columns"];
+    const wrapperTags = axis === "row" ? ROW_WRAPPER_TAGS : COLUMN_WRAPPER_TAGS;
+    const repeatAttr = axis === "row" ? "table:number-rows-repeated" : "table:number-columns-repeated";
+    const flatten = axis === "row" ? flattenOrderedRows : flattenOrderedColumns;
+    const countItems = (nodes) => flatten(nodes).reduce((total, node) => {
+        const repeated = parseInt(getAttribute(node, repeatAttr) ?? "1", 10);
+        return total + (Number.isFinite(repeated) && repeated > 0 ? repeated : 1);
+    }, 0);
+    let position = 1;
+    let band;
+    const visit = (nodes) => {
+        for (const child of nodes ?? []) {
+            if (!child || typeof child !== "object")
+                continue;
+            if (itemTags.some((tag) => child[tag])) {
+                position += countItems([child]);
+                continue;
+            }
+            const header = headerTags.find((tag) => child[tag]);
+            if (header) {
+                const count = countItems(child[header]);
+                if (count) {
+                    const end = position + count - 1;
+                    band = band
+                        ? { start: Math.min(band.start, position), end: Math.max(band.end, end) }
+                        : { start: position, end };
+                    position = end + 1;
+                }
+                continue;
+            }
+            const wrapper = wrapperTags.find((tag) => child[tag]);
+            if (wrapper)
+                visit(child[wrapper]);
+        }
+    };
+    visit(children);
+    return band;
+}
 function fastMergeCellFormats(...formats) {
     let result;
     for (const format of formats) {
@@ -160,10 +267,24 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             if (styles) {
                 const parsedStyles = this.xmlParser.parse(styles);
                 this.odsStyles.parseStylesXml(parsedStyles);
-            }
-            const settings = this.zipParser.Get("settings.xml");
-            if (settings) {
-                this.settingsXml = this.xmlParser.parse(settings);
+                // Master pages carry mixed-content header/footer paragraphs
+                // (`Page <text:page-number/> of …`), so they are read from an
+                // order-preserving parse that also keeps the significant spaces
+                // around the fields and leaves the text verbatim (a `+1` after the
+                // page number is header text, not the number 1).
+                this.odsStyles.parseMasterPagesOrdered(new XMLParser({
+                    ...ODS_ORDERED_XML_OPTIONS,
+                    trimValues: false,
+                    parseTagValue: false,
+                }).parse(styles));
+            }
+            // settings.xml is optional in ODF (our own exporter omits it when no
+            // sheet has view settings); `Get` throws on a missing part.
+            if (this.zipParser.Has("settings.xml")) {
+                const settings = this.zipParser.Get("settings.xml");
+                if (settings) {
+                    this.settingsXml = this.xmlParser.parse(settings);
+                }
             }
         }
         catch (e) {
@@ -229,14 +350,26 @@ export class OdsPlugin extends BaseWorkbookPlugin {
     }
     buildSheetCache() {
         const tables = this.getTables();
+        const orderedTables = this.getOrderedTableWrappers();
         const sheets = [];
         const sheetContexts = [];
+        // `table:print-ranges` per sheet, resolved once the sheet-name map exists.
+        const printRangesBySheetId = new Map();
         tables.forEach((table, index) => {
             const name = table["@_table:name"] ||
                 table["@_name"] ||
                 table["table:name"] ||
                 table["name"] ||
                 `Sheet${index + 1}`;
+            // Order-preserving children of the same table: rows/columns nested in
+            // `<table:table-header-rows>` / `<table:table-row-group>` only appear in
+            // document order there.
+            const orderedTable = orderedTables[index];
+            const orderedTableChildren = orderedTable
+                ? orderedTable[orderedTable["table:table"] ? "table:table" : "table"]
+                : undefined;
+            const rowBreaks = [];
+            const columnBreaks = [];
             const sheet = {
                 sheetId: index + 1,
                 title: name,
@@ -247,13 +380,27 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                 columnMetadata: [],
                 merges: [],
             };
+            // `table:protected="true"` is ODF's sheet-protection switch. The
+            // `table:protection-key` digest is not an OOXML hash, so only the master
+            // flag is modeled — the key itself cannot round-trip into `<sheetProtection>`.
+            const protectedAttr = table["@_table:protected"] ?? table["table:protected"];
+            if (protectedAttr === "true" || protectedAttr === true) {
+                sheet.sheetProtection = { sheet: true };
+            }
+            // Right-to-left sheets live on the table style's `style:writing-mode`
+            // (the ODF counterpart of `<sheetView rightToLeft="1">`).
+            if (this.odsStyles.isTableStyleRightToLeft(table["@_table:style-name"] || table["table:style-name"])) {
+                sheet.rightToLeft = true;
+            }
             // Column metadata from table-column elements
             const columnNodes = get(table, "table:table-column") || get(table, "table-column") || [];
-            const allColumns = Array.isArray(columnNodes)
-                ? columnNodes
-                : columnNodes
-                    ? [columnNodes]
-                    : [];
+            const allColumns = orderedTableChildren
+                ? flattenOrderedColumns(orderedTableChildren)
+                : Array.isArray(columnNodes)
+                    ? columnNodes
+                    : columnNodes
+                        ? [columnNodes]
+                        : [];
             let currentColumnIndex = 1;
             let detectedColumnCount = 0;
             let defaultColumnWidth;
@@ -276,6 +423,10 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                     visibility === "hidden" ||
                     visibility === "none" ||
                     columnStyle?.hidden;
+                // `fo:break-before="page"` on column N = a manual break after N-1.
+                if (columnStyle?.breakBefore && currentColumnIndex > 1) {
+                    columnBreaks.push(currentColumnIndex - 1);
+                }
                 for (let c = 0; c < colsRepeated; c++) {
                     const props = {};
                     let shouldAssign = false;
@@ -309,7 +460,11 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             }
             // Row metadata from table-row elements
             const rowNodes = get(table, "table:table-row") || get(table, "table-row") || [];
-            const allRows = Array.isArray(rowNodes) ? rowNodes : [rowNodes];
+            const allRows = orderedTableChildren
+                ? flattenOrderedRows(orderedTableChildren)
+                : Array.isArray(rowNodes)
+                    ? rowNodes
+                    : [rowNodes];
             // DO NOT DELETE
             // console.log("allRows", allRows);
             let currentRowIndex = 1;
@@ -335,6 +490,10 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                     visibility === "none" ||
                     rowStyle?.hidden;
                 const effectiveRepeats = Math.min(rowsRepeated, 10000);
+                // `fo:break-before="page"` on row N = a manual break after N-1.
+                if (rowStyle?.breakBefore && currentRowIndex > 1) {
+                    rowBreaks.push(currentRowIndex - 1);
+                }
                 const shouldProcessRowMetadata = typeof height === "number" || isHidden;
                 if (!shouldProcessRowMetadata) {
                     currentRowIndex += effectiveRepeats;
@@ -378,6 +537,53 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             if (detectedColumnCount > 0) {
                 sheet.columnCount = Math.max(sheet.columnCount ?? 0, detectedColumnCount);
             }
+            // Print settings: the table style's master page (page layout +
+            // header/footer), manual breaks, and the header-rows/columns bands
+            // (print titles). `table:print-ranges` is resolved below.
+            const tableStyleName = table["@_table:style-name"] || table["table:style-name"];
+            const masterPageName = tableStyleName
+                ? this.odsStyles.getTableMasterPageName(tableStyleName)
+                : undefined;
+            const masterPage = masterPageName
+                ? this.odsStyles.getMasterPage(masterPageName)
+                : undefined;
+            const pageLayout = masterPage?.pageLayoutName
+                ? this.odsStyles.getPageLayout(masterPage.pageLayoutName)
+                : undefined;
+            const headerRows = findOrderedHeaderBand(orderedTableChildren, "row");
+            const headerColumns = findOrderedHeaderBand(orderedTableChildren, "column");
+            const printSettings = compactPrintSettings({
+                pageSetup: pageLayout?.pageSetup,
+                pageMargins: pageLayout?.pageMargins,
+                printOptions: pageLayout?.printOptions,
+                headerFooter: masterPage?.header || masterPage?.footer
+                    ? {
+                        ...(masterPage.header ? { oddHeader: masterPage.header } : {}),
+                        ...(masterPage.footer ? { oddFooter: masterPage.footer } : {}),
+                    }
+                    : undefined,
+                printTitles: headerRows || headerColumns
+                    ? {
+                        ...(headerRows
+                            ? { rowStart: headerRows.start, rowEnd: headerRows.end }
+                            : {}),
+                        ...(headerColumns
+                            ? {
+                                columnStart: headerColumns.start,
+                                columnEnd: headerColumns.end,
+                            }
+                            : {}),
+                    }
+                    : undefined,
+                rowBreaks,
+                columnBreaks,
+            });
+            if (printSettings)
+                sheet.printSettings = printSettings;
+            const printRanges = table["@_table:print-ranges"] || table["table:print-ranges"];
+            if (typeof printRanges === "string" && printRanges.trim()) {
+                printRangesBySheetId.set(sheet.sheetId, printRanges);
+            }
             sheets.push(sheet);
             sheetContexts.push({ node: table, sheetId: sheet.sheetId, name });
         });
@@ -420,6 +626,16 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         const basicFilters = this.extractBasicFilters(sheetContexts, sheetNameMap, spreadsheetNode);
         for (const sheet of sheets) {
             sheet.merges = mergesMap.get(sheet.sheetId) ?? sheet.merges ?? [];
+            const printRanges = printRangesBySheetId.get(sheet.sheetId);
+            if (printRanges) {
+                const context = sheetContexts.find((c) => c.sheetId === sheet.sheetId);
+                const printArea = this.parseRangeList(printRanges, sheetNameMap, context)
+                    .filter((range) => range.sheetId === sheet.sheetId)
+                    .map(({ sheetId: _sheetId, ...range }) => range);
+                if (printArea.length) {
+                    sheet.printSettings = { ...sheet.printSettings, printArea };
+                }
+            }
             const settings = sheetSettings.get(sheet.sheetId);
             if (settings) {
                 if (settings.frozenRowCount !== undefined) {
@@ -934,10 +1150,40 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             const tableChildren = tableWrapper[tableNameKey];
             if (!tableChildren)
                 continue;
-            const rows = tableChildren.filter((child) => child["table:table-row"] || child["table-row"]);
+            const rows = flattenOrderedRows(tableChildren);
             let currentRowIndex = 1;
             const sheetContext = sheetContexts[sheetIndex];
             const sheetId = sheetContext?.sheetId ?? sheetIndex + 1;
+            // Sheet-level `<table:shapes>` frames (what LibreOffice and our own
+            // ODS exporter write for charts/images floating over the grid). They
+            // anchor through `table:anchor-cell-address`; their `svg:x`/`svg:y`
+            // are sheet-absolute, so the cell anchor alone positions them.
+            for (const shapesWrapper of tableChildren.filter((child) => child["table:shapes"] || child["shapes"])) {
+                const shapeChildren = shapesWrapper["table:shapes"] || shapesWrapper["shapes"];
+                // `collectFrameNodes` yields each frame child (the `draw:object` /
+                // `draw:image` wrapper) as `frame` and the `<draw:frame>` attributes
+                // as `cellAttrs`.
+                for (const { frame, cellAttrs: frameAttrs } of this.collectFrameNodes(shapeChildren)) {
+                    const anchorAddress = frameAttrs?.["@_table:anchor-cell-address"] ||
+                        frameAttrs?.["@_anchor-cell-address"];
+                    const anchor = typeof anchorAddress === "string"
+                        ? addressToCell(anchorAddress.split(".").pop() ?? anchorAddress)
+                        : null;
+                    const anchorRow = anchor?.rowIndex ?? 1;
+                    const anchorColumn = anchor?.columnIndex ?? 1;
+                    const placementAttrs = this.withoutAbsoluteOffsets(frameAttrs);
+                    const chart = this.convertFrameToEmbeddedChart(frame, sheetContext, sheetId, anchorRow, anchorColumn, sheetNameMap, placementAttrs);
+                    if (chart) {
+                        chartAnchors.add(this.buildAnchorKey(sheetId, anchorRow, anchorColumn));
+                        charts.push(chart);
+                        continue;
+                    }
+                    const embedded = this.convertFrameToEmbeddedObject(frame, sheetId, anchorRow, anchorColumn, imageCache, placementAttrs);
+                    if (embedded) {
+                        drawings.push(embedded);
+                    }
+                }
+            }
             for (const rowWrapper of rows) {
                 const rowNameKey = rowWrapper["table:table-row"]
                     ? "table:table-row"
@@ -1005,6 +1251,18 @@ export class OdsPlugin extends BaseWorkbookPlugin {
     buildAnchorKey(sheetId, rowIndex, columnIndex) {
         return `${sheetId}:${rowIndex}:${columnIndex}`;
     }
+    /**
+     * Copy of a `<draw:frame>` attribute record without `svg:x` / `svg:y`.
+     * Frames in `<table:shapes>` carry sheet-absolute coordinates there,
+     * which `buildOverlayPlacement` would otherwise read as an offset inside
+     * the anchor cell.
+     */
+    withoutAbsoluteOffsets(frameAttrs) {
+        if (!frameAttrs || typeof frameAttrs !== "object")
+            return frameAttrs;
+        const { "@_svg:x": _x, "@_svg:y": _y, "@_x": _bareX, "@_y": _bareY, ...rest } = frameAttrs;
+        return rest;
+    }
     /**
      * Walk the ordered content XML for each table and assign outline
      * level + collapsed/hiddenByGroup state on `rowMetadata` and
@@ -1051,7 +1309,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                     meta[index] = {};
                 Object.assign(meta[index], patch);
             };
-            const walk = (nodes, itemTag, groupTag, meta, repeatAttrs, summaryAfter) => {
+            const walk = (nodes, itemTag, groupTag, wrapperTags, meta, repeatAttrs, summaryAfter) => {
                 let cursor = 1;
                 const openStack = [];
                 const collapsedDepth = () => openStack.some((g) => g.collapsed);
@@ -1060,6 +1318,14 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                     for (const child of children) {
                         if (!child)
                             continue;
+                        // `<table:table-header-rows>` / `<table:table-rows>` (and the
+                        // column twins) only group rows for printing; their rows keep
+                        // the surrounding outline level and still advance the cursor.
+                        const wrapper = wrapperTags.find((tag) => tag !== groupTag && child[tag]);
+                        if (wrapper) {
+                            visit(child[wrapper] || []);
+                            continue;
+                        }
                         if (child[groupTag]) {
                             const attrs = child[":@"] || {};
                             const display = attrs["@_table:display"] ?? attrs["@_display"];
@@ -1110,8 +1376,8 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                 };
                 visit(nodes);
             };
-            walk(tableChildren, "table:table-column", "table:table-column-group", columnMetadata, ["table:number-columns-repeated", "number-columns-repeated"], summaryRight);
-            walk(tableChildren, "table:table-row", "table:table-row-group", rowMetadata, ["table:number-rows-repeated", "number-rows-repeated"], summaryBelow);
+            walk(tableChildren, "table:table-column", "table:table-column-group", COLUMN_WRAPPER_TAGS, columnMetadata, ["table:number-columns-repeated", "number-columns-repeated"], summaryRight);
+            walk(tableChildren, "table:table-row", "table:table-row-group", ROW_WRAPPER_TAGS, rowMetadata, ["table:number-rows-repeated", "number-rows-repeated"], summaryBelow);
             if (columnMetadata.length > 0)
                 sheet.columnMetadata = columnMetadata;
             if (rowMetadata.length > 0)
@@ -1145,7 +1411,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             const tableChildren = tableWrapper[tableNameKey];
             if (!tableChildren)
                 continue;
-            const rows = tableChildren.filter((child) => child["table:table-row"] || child["table-row"]);
+            const rows = flattenOrderedRows(tableChildren);
             const sheetId = sheetContexts[sheetIndex]?.sheetId ?? sheetIndex + 1;
             let currentRowIndex = 1;
             for (const rowWrapper of rows) {
@@ -1274,7 +1540,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         if (!tableChildren) {
             return buildDefaultColumns();
         }
-        const rows = tableChildren.filter((child) => child["table:table-row"] || child["table-row"]);
+        const rows = flattenOrderedRows(tableChildren);
         if (!rows.length) {
             return buildDefaultColumns();
         }
@@ -1551,14 +1817,24 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         const frameAttrs = this.getAttributes(frameNode);
         const inlineChart = this.findInlineChartNode(frameNode);
         let chartNode = inlineChart;
+        // An inline chart's styles live in the workbook's content.xml, so the
+        // workbook-level table applies. An embedded object is its own ODF
+        // document with its own <office:automatic-styles>, and every object
+        // reuses the same automatic style names (LibreOffice: ch1/ch2…, our
+        // exporter: plot1/series0…), so its styles are scoped to the object —
+        // sharing one table would let the previous chart's
+        // `chart:three-dimensional` flag or series colours leak into this one.
+        let chartStyles = this.odsStyles;
         if (!chartNode) {
             const objectNode = this.findFrameObjectNode(frameNode);
-            const chartFromObject = this.loadChartNodeFromObject(objectNode, frameAttrs);
+            const objectStyles = new OdsStyles();
+            const chartFromObject = this.loadChartNodeFromObject(objectNode, frameAttrs, objectStyles);
             chartNode = chartFromObject;
+            chartStyles = objectStyles;
         }
         if (!chartNode)
             return undefined;
-        const spec = this.convertChartNodeToSpec(chartNode, sheetNameMap, sheetContext);
+        const spec = this.convertChartNodeToSpec(chartNode, sheetNameMap, sheetContext, chartStyles);
         if (!spec)
             return undefined;
         const { overlayPosition } = this.buildOverlayPlacement(frameAttrs, cellAttrs, rowIndex, columnIndex);
@@ -1625,24 +1901,32 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         }
         return undefined;
     }
-    loadChartNodeFromObject(objectNode, frameAttrs) {
-        if (!objectNode)
+    loadChartNodeFromObject(objectNode, frameAttrs, styles) {
+        // A self-closing `<draw:object xlink:href="…"/>` parses to an empty
+        // child list with its attributes on the wrapper (`frameAttrs` here), so
+        // the href must still be honoured when there is no object node.
+        if (!objectNode && !frameAttrs)
             return undefined;
         const objectAttrs = this.getAttributes(objectNode);
         const href = objectAttrs?.["@_xlink:href"] ||
             objectAttrs?.["@_href"] ||
             frameAttrs?.["@_xlink:href"] ||
             frameAttrs?.["@_href"];
-        return this.loadChartNodeFromHref(href);
+        return this.loadChartNodeFromHref(href, styles);
     }
-    loadChartNodeFromHref(href) {
+    /**
+     * Loads an embedded chart object's `content.xml` and registers its
+     * `<office:automatic-styles>` into `styles` — the per-object table the
+     * caller resolves plot-area / series styles against.
+     */
+    loadChartNodeFromHref(href, styles) {
         const path = this.resolveObjectPath(href);
         if (!path)
             return undefined;
         try {
             const content = this.zipParser.Get(path);
             const chartDoc = this.xmlParser.parse(content);
-            this.odsStyles.parseContentXml(chartDoc);
+            styles.parseContentXml(chartDoc);
             return this.findChartNodeInDocument(chartDoc);
         }
         catch {
@@ -1718,11 +2002,12 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         }
         return undefined;
     }
-    convertChartNodeToSpec(chartNode, sheetNameMap, context) {
+    convertChartNodeToSpec(chartNode, sheetNameMap, context, styles) {
         if (!chartNode)
             return undefined;
         const chartAttrs = this.getAttributes(chartNode);
-        const chartType = this.mapOdsChartClassToType(chartAttrs?.["@_chart:class"] || chartAttrs?.["@_class"]);
+        const chartClass = chartAttrs?.["@_chart:class"] || chartAttrs?.["@_class"];
+        const chartType = this.mapOdsChartClassToType(chartClass);
         const titleNode = get(chartNode, "chart:title.chart:title-text") ||
             get(chartNode, "chart:title") ||
             get(chartNode, "title");
@@ -1731,6 +2016,8 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         const plotArea = get(chartNode, "chart:plot-area") || get(chartNode, "plot-area");
         if (!plotArea)
             return undefined;
+        const plotAreaAttrs = this.getAttributes(plotArea);
+        const sourceChartType = this.resolveOdsSourceChartType(chartClass, chartType, plotAreaAttrs?.["@_chart:style-name"] || plotAreaAttrs?.["@_style-name"], styles);
         const seriesNodes = this.toArray(get(plotArea, "chart:series") ||
             get(plotArea, "chart:data-series") ||
             get(plotArea, "series"));
@@ -1758,7 +2045,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                 if (seriesData) {
                     const label = this.extractSeriesLabel(seriesNode);
                     seriesData.dataLabel = label || `Series ${seriesIndex}`;
-                    const color = this.extractChartSeriesColor(seriesNode);
+                    const color = this.extractChartSeriesColor(seriesNode, styles);
                     if (color) {
                         seriesData.color = color;
                     }
@@ -1776,6 +2063,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             title,
             domains: finalizedDomains,
             series,
+            ...(sourceChartType ? { sourceChartType } : {}),
         };
     }
     extractSeriesLabel(seriesNode) {
@@ -1787,7 +2075,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         const label = labelNode ? this.extractTextContent(labelNode) : undefined;
         return label?.trim() || undefined;
     }
-    extractChartSeriesColor(seriesNode) {
+    extractChartSeriesColor(seriesNode, styles) {
         if (!seriesNode)
             return undefined;
         const attrs = this.getAttributes(seriesNode);
@@ -1797,7 +2085,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
             attrs?.["@_style-name"],
         ];
         for (const candidate of styleCandidates) {
-            const color = this.odsStyles.getChartStyleColor(candidate);
+            const color = styles.getChartStyleColor(candidate);
             if (color) {
                 return typeof color === "string" ? color : undefined;
             }
@@ -1819,7 +2107,7 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                 pointAttrs?.["@_style-name"],
             ];
             for (const candidate of pointStyleCandidates) {
-                const color = this.odsStyles.getChartStyleColor(candidate);
+                const color = styles.getChartStyleColor(candidate);
                 if (color)
                     return typeof color === "string" ? color : undefined;
             }
@@ -1855,14 +2143,40 @@ export class OdsPlugin extends BaseWorkbookPlugin {
         if (normalized.includes("line") || normalized.includes("scatter")) {
             return "line";
         }
-        if (normalized.includes("pie")) {
+        if (normalized.includes("pie") || normalized.includes("circle")) {
             return "pie";
         }
-        if (normalized.includes("area")) {
+        // `chart:surface` degrades to area — the same 2-D base the OOXML
+        // surfaceChart / surface3DChart import uses (sourceChartType SURFACE).
+        if (normalized.includes("area") || normalized.includes("surface")) {
             return "area";
         }
         return "bar";
     }
+    /**
+     * The authored 3-D class token for an ODS chart: `chart:surface` is a
+     * surface, and any other class whose plot-area style declares
+     * `chart:three-dimensional="true"` maps to the OOXML 3-D variant of its
+     * 2-D base (`BAR_3D`, `LINE_3D`, `PIE_3D`, `AREA_3D`). Undefined for 2-D.
+     */
+    resolveOdsSourceChartType(chartClass, chartType, plotAreaStyleName, styles) {
+        const threeDimensional = styles.isChartStyleThreeDimensional(plotAreaStyleName);
+        if ((chartClass?.toLowerCase() || "").includes("surface")) {
+            return threeDimensional ? "SURFACE_3D" : "SURFACE";
+        }
+        if (!threeDimensional)
+            return undefined;
+        switch (chartType) {
+            case "bar":
+                return "BAR_3D";
+            case "line":
+                return "LINE_3D";
+            case "pie":
+                return "PIE_3D";
+            case "area":
+                return "AREA_3D";
+        }
+    }
     findRangeString(node, skipKeys) {
         if (!node)
             return undefined;
@@ -2472,8 +2786,8 @@ export class OdsPlugin extends BaseWorkbookPlugin {
                     ? this.odsStyles.getTableCellFormat(tableStyleName)
                     : undefined;
                 // Get rows
-                const rows = tableChildren.filter((child) => child["table:table-row"] || child["table-row"]);
-                const columnWrappers = tableChildren.filter((child) => child["table:table-column"] || child["table-column"]);
+                const rows = flattenOrderedRows(tableChildren);
+                const columnWrappers = flattenOrderedColumns(tableChildren);
                 const columnFormats = new Map();
                 let formattedColumnIndex = 1;
                 for (const columnWrapper of columnWrappers) {