@rowsncolumns/toolkit 24.4.5 → 24.5.1

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

@@ -3,19 +3,19 @@ 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, parseTableColumnTotals, } from "../../helpers";
+import { createFilterSpecsFromAutoFilter, 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";
 import { StreamingZipParser } from "../../zip-parser-streaming";
 import { SheetDataValidationStamper } from "../../dv-cell-stamp";
 import { BaseWorkbookPlugin } from "../base/index";
-import { processChart } from "./charts";
-import { customFiltersToCondition, dynamicFilterToCondition, } from "../../../autofilter-condition";
+import { bindPivotChartsToPivotTables, PIVOT_SOURCE_NAME_KEY, processChart, } from "./charts";
+import { customFiltersToCriteria, dynamicFilterToCondition, top10FilterToCondition, } from "../../../autofilter-condition";
 import { getConditionalFormattingFromSheet } from "./conditional-formatting";
 import { getDataValidationsForSheet as parseDataValidationsFromSheetData } from "./data-validations";
-import { anchorsInDocumentOrder, processAnchors, } from "./drawing";
-import { getRelationsById } from "./relationships";
+import { anchorPlacementFromEditAs, anchorsInDocumentOrder, processAnchors, } from "./drawing";
+import { getRelationsById, getSheetRelsPath } from "./relationships";
 import { hasPowerQueryParts, } from "../../../power-query";
 import { extractSheetViewProperties } from "./sheet-views";
 import { EMPTY_SHEET_THREADED_COMMENTS, parsePersons, parseThreadedComments, } from "./threaded-comments";
@@ -412,7 +412,7 @@ var WorkbookStyles = /** @class */ (function () {
      */
     WorkbookStyles.prototype.getCustomTableStyleBanding = function (styleName) {
         var e_4, _a;
-        var _b, _c;
+        var _b, _c, _d, _e, _f;
         var style = this.tableStyles.get(styleName);
         if (!style)
             return undefined;
@@ -421,8 +421,8 @@ var WorkbookStyles = /** @class */ (function () {
             columnProperties: {},
         };
         try {
-            for (var _d = __values(style.elements), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var element = _e.value;
+            for (var _g = __values(style.elements), _h = _g.next(); !_h.done; _h = _g.next()) {
+                var element = _h.value;
                 var type = (_b = element.a$) === null || _b === void 0 ? void 0 : _b.type;
                 var dxfId = (_c = element.a$) === null || _c === void 0 ? void 0 : _c.dxfId;
                 if (type === undefined || dxfId === undefined)
@@ -439,10 +439,17 @@ var WorkbookStyles = /** @class */ (function () {
                         if (color)
                             bandedDef.rowProperties.headerColor = color;
                         break;
-                    case "totalRow":
+                    case "totalRow": {
                         if (color)
                             bandedDef.rowProperties.totalRowColor = color;
+                        // Excel's totals element bolds the row (`<font><b/></font>`), fill or not.
+                        var font = (dxf === null || dxf === void 0 ? void 0 : dxf.font) || (dxf === null || dxf === void 0 ? void 0 : dxf["x:font"]);
+                        var b = (_d = font === null || font === void 0 ? void 0 : font.b) !== null && _d !== void 0 ? _d : font === null || font === void 0 ? void 0 : font["x:b"];
+                        if (b !== undefined && ((_f = (_e = b === null || b === void 0 ? void 0 : b.a$) === null || _e === void 0 ? void 0 : _e.val) !== null && _f !== void 0 ? _f : b === null || b === void 0 ? void 0 : b.val) !== "0") {
+                            bandedDef.rowProperties.totalRowBold = true;
+                        }
                         break;
+                    }
                     case "firstRowStripe":
                         if (color)
                             bandedDef.rowProperties.firstBandColor = color;
@@ -459,13 +466,21 @@ var WorkbookStyles = /** @class */ (function () {
                         if (color)
                             bandedDef.columnProperties.secondBandColor = color;
                         break;
+                    case "firstColumn":
+                        if (color)
+                            bandedDef.rowProperties.firstColumnColor = color;
+                        break;
+                    case "lastColumn":
+                        if (color)
+                            bandedDef.rowProperties.lastColumnColor = color;
+                        break;
                 }
             }
         }
         catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+                if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
             }
             finally { if (e_4) throw e_4.error; }
         }
@@ -774,6 +789,11 @@ var XlsxPlugin = /** @class */ (function (_super) {
          * multi-sheet workbook never retains more than one worksheet DOM.
          */
         _this.lastSheetDataCache = null;
+        /**
+         * Per-rid memo of a chartsheet's parsed chart, so `Sheet.chartId` (set by
+         * `getSheets()`) and `getCharts()` see the same generated chart id.
+         */
+        _this.chartsheetChartsCache = new Map();
         /** workbook.xml sheet elements indexed by sheetId (sheet-scoped API). */
         _this.worksheetBySheetId = new Map();
         /**
@@ -1165,6 +1185,15 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                         entry.dynamicFilterType = attrs.type;
                                     }
                                 }
+                                // <top10 top="1" percent="0" val="10"/> (Excel's "Top 10…")
+                                if (name === "top10" && currentFilterColumn !== null) {
+                                    var entry = getOrCreateFilterColumn(currentFilterColumn);
+                                    entry.top10 = {
+                                        top: typeof attrs.top === "string" ? attrs.top : undefined,
+                                        percent: typeof attrs.percent === "string" ? attrs.percent : undefined,
+                                        val: typeof attrs.val === "string" ? attrs.val : undefined,
+                                    };
+                                }
                                 if (name === "tablePart") {
                                     var rid_1 = attrs["r:id"];
                                     if (typeof rid_1 === "string") {
@@ -1232,15 +1261,20 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 };
                             }
                             if ((_c = raw.customFilters) === null || _c === void 0 ? void 0 : _c.length) {
-                                var condition = customFiltersToCondition(raw.customFilters, raw.customFiltersAnd === true);
-                                if (condition)
-                                    criteria.condition = condition;
+                                var conditions = customFiltersToCriteria(raw.customFilters, raw.customFiltersAnd === true);
+                                if (conditions)
+                                    Object.assign(criteria, conditions);
                             }
                             else if (raw.dynamicFilterType) {
                                 var condition = dynamicFilterToCondition(raw.dynamicFilterType);
                                 if (condition)
                                     criteria.condition = condition;
                             }
+                            else if (raw.top10) {
+                                var condition = top10FilterToCondition(raw.top10);
+                                if (condition)
+                                    criteria.condition = condition;
+                            }
                             return { columnIndex: columnIndex, filterCriteria: criteria };
                         });
                         sheetViewData = sheetViewAttrs || paneAttrs
@@ -1348,7 +1382,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             return [2 /*return*/, { maxColumnIndex: maxColumnIndex, maxRowIndex: maxRowIndex }];
                         }
                         sheetPath = this.resolveSheetPath(relation.target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(sheetPath);
                         return [4 /*yield*/, this.zipParser.getText(sheetRelPath)];
                     case 2:
                         sheetRelContent = _e.sent();
@@ -1518,7 +1552,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             controls: false,
                         };
                         sheetPath = this.resolveSheetPath(relation.target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(sheetPath);
                         sheetRelationships = {};
                         _b.label = 1;
                     case 1:
@@ -2106,6 +2140,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         this.personsPromise = null;
                         this.sheetFeatures.clear();
                         this.lastSheetDataCache = null;
+                        this.chartsheetChartsCache.clear();
                         this.sheetMetadataCache.clear();
                         this.dataValidationsBySheetCache.clear();
                         this.conditionalFormattingBySheetCache.clear();
@@ -2144,6 +2179,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
         this.personsPromise = null;
         this.sheetFeatures.clear();
         this.lastSheetDataCache = null;
+        this.chartsheetChartsCache.clear();
         this.sheetMetadataCache.clear();
         this.dataValidationsBySheetCache.clear();
         this.conditionalFormattingBySheetCache.clear();
@@ -2176,9 +2212,9 @@ var XlsxPlugin = /** @class */ (function (_super) {
             var tables, target, sheetPath, sheetRelPath, sheetRelContent, sheetRels, tableRelations, tableRelationsArray, _loop_3, this_1, tablePartIds_1, tablePartIds_1_1, tableRId, e_16_1, err_3;
             var e_16, _a;
             var _this = this;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         tables = [];
                         if (!tablePartIds.length) {
@@ -2188,22 +2224,23 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         sheetPath = target.startsWith("/xl")
                             ? target.replace(/^\//gi, "")
                             : "xl/".concat(this.relations[rId].target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
-                        _c.label = 1;
+                        sheetRelPath = getSheetRelsPath(sheetPath);
+                        _d.label = 1;
                     case 1:
-                        _c.trys.push([1, 11, , 12]);
+                        _d.trys.push([1, 11, , 12]);
                         return [4 /*yield*/, this.zipParser.getText(sheetRelPath)];
                     case 2:
-                        sheetRelContent = _c.sent();
+                        sheetRelContent = _d.sent();
                         sheetRels = this.xmlParser.parse(sheetRelContent);
                         tableRelations = get(sheetRels, "Relationships.Relationship");
                         tableRelationsArray = Array.isArray(tableRelations)
                             ? tableRelations
                             : [tableRelations];
                         _loop_3 = function (tableRId) {
-                            var tableRel, tablePath, tableContent, tableData, tableDefinition, attrs, displayName, headerRow, totalRow, showFirstColumn, showLastColumn, showRowStripes, showColumnStripes, columnDefinitions, columnDefsArray, columns, tableStyle, tableStyleAttrs, filterButton, range, autoFilter, filterSpecs, tableView, fullStyleName, styleName, bandedRange, _d, headerColor, headerBorder, totalRowColor, totalRowBorder;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
+                            var tableRel, tablePath, tableContent, tableData, tableDefinition, attrs, displayName, headerRow, totalRow, tableStyle, tableStyleAttrs, showFirstColumn, showLastColumn, showRowStripes, showColumnStripes, columnDefinitions, columnDefsArray, columns, autoFilter, filterButton, _e, _f, colId, range, filterSpecs, sortSpecs, tableView, fullStyleName, styleName, bandedRange, _g, headerColor, headerBorder, totalRowColor, totalRowBorder, firstColumnColor, lastColumnColor, totalRowBold;
+                            var e_17, _h;
+                            return __generator(this, function (_j) {
+                                switch (_j.label) {
                                     case 0:
                                         tableRel = tableRelationsArray.find(function (rel) { return rel.a$.Id === tableRId; });
                                         if (!tableRel)
@@ -2222,7 +2259,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                         }
                                         return [4 /*yield*/, this_1.zipParser.getText(tablePath)];
                                     case 1:
-                                        tableContent = _e.sent();
+                                        tableContent = _j.sent();
                                         tableData = this_1.xmlParser.parse(tableContent || "");
                                         tableDefinition = get(tableData, "table") || get(tableData, "x:table");
                                         if (tableDefinition) {
@@ -2230,10 +2267,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                             displayName = attrs.displayName || attrs.name || "Table".concat(tables.length + 1);
                                             headerRow = attrs.headerRowCount !== "0";
                                             totalRow = attrs.totalsRowCount === "1";
-                                            showFirstColumn = attrs.showFirstColumn === "1";
-                                            showLastColumn = attrs.showLastColumn === "1";
-                                            showRowStripes = attrs.showRowStripes !== "0";
-                                            showColumnStripes = attrs.showColumnStripes === "1";
+                                            tableStyle = get(tableDefinition, "tableStyleInfo") ||
+                                                get(tableDefinition, "x:tableStyleInfo") ||
+                                                {};
+                                            tableStyleAttrs = tableStyle.a$ || {};
+                                            showFirstColumn = tableStyleAttrs.showFirstColumn === "1";
+                                            showLastColumn = tableStyleAttrs.showLastColumn === "1";
+                                            showRowStripes = tableStyleAttrs.showRowStripes !== "0";
+                                            showColumnStripes = tableStyleAttrs.showColumnStripes === "1";
                                             columnDefinitions = get(tableDefinition, "tableColumns.tableColumn") ||
                                                 get(tableDefinition, "x:tableColumns.x:tableColumn");
                                             columnDefsArray = Array.isArray(columnDefinitions)
@@ -2253,30 +2294,27 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                 }
                                                 return columnObj;
                                             });
-                                            tableStyle = get(tableDefinition, "tableStyleInfo") ||
-                                                get(tableDefinition, "x:tableStyleInfo") ||
-                                                {};
-                                            tableStyleAttrs = tableStyle.a$ || {};
-                                            filterButton = attrs.filterButton !== "0";
+                                            autoFilter = (_b = tableDefinition.autoFilter) !== null && _b !== void 0 ? _b : tableDefinition["x:autoFilter"];
+                                            filterButton = attrs.filterButton !== "0" && (!headerRow || autoFilter !== undefined);
+                                            try {
+                                                for (_e = (e_17 = void 0, __values(hiddenFilterButtonColumns(autoFilter))), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                                    colId = _f.value;
+                                                    if (columns[colId])
+                                                        columns[colId].filterButton = false;
+                                                }
+                                            }
+                                            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                                            finally {
+                                                try {
+                                                    if (_f && !_f.done && (_h = _e.return)) _h.call(_e);
+                                                }
+                                                finally { if (e_17) throw e_17.error; }
+                                            }
                                             range = getRangeFromAddressRef(attrs.ref);
                                             if (range) {
-                                                autoFilter = (_b = tableDefinition.autoFilter) !== null && _b !== void 0 ? _b : tableDefinition["x:autoFilter"];
                                                 filterSpecs = createFilterSpecsFromAutoFilter(autoFilter, function (dxfId, cellColor) { return _this.resolveDxfColor(dxfId, cellColor); });
-                                                tableView = {
-                                                    id: attrs.id,
-                                                    title: attrs.name,
-                                                    sheetId: sheetId,
-                                                    headerRow: headerRow,
-                                                    totalRow: totalRow,
-                                                    showRowStripes: showRowStripes,
-                                                    showColumnStripes: showColumnStripes,
-                                                    showFirstColumn: showFirstColumn,
-                                                    showLastColumn: showLastColumn,
-                                                    filterButton: filterButton,
-                                                    columns: columns,
-                                                    range: range,
-                                                    filterSpecs: filterSpecs,
-                                                };
+                                                sortSpecs = createSortSpecsFromSortState((_c = tableDefinition.sortState) !== null && _c !== void 0 ? _c : tableDefinition["x:sortState"], range, function (dxfId, cellColor) { return _this.resolveDxfColor(dxfId, cellColor); });
+                                                tableView = __assign({ id: attrs.id, title: attrs.name, sheetId: sheetId, headerRow: headerRow, totalRow: totalRow, showRowStripes: showRowStripes, showColumnStripes: showColumnStripes, showFirstColumn: showFirstColumn, showLastColumn: showLastColumn, filterButton: filterButton, columns: columns, range: range, filterSpecs: filterSpecs }, (sortSpecs.length ? { sortSpecs: sortSpecs } : {}));
                                                 // Add table theme if available
                                                 if (tableStyleAttrs.name) {
                                                     fullStyleName = tableStyleAttrs.name;
@@ -2290,16 +2328,22 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     if (bandedRange) {
                                                         // Only include row/column properties based on stripe settings
                                                         if (!showRowStripes && bandedRange.rowProperties) {
-                                                            _d = bandedRange.rowProperties, headerColor = _d.headerColor, headerBorder = _d.headerBorder, totalRowColor = _d.totalRowColor, totalRowBorder = _d.totalRowBorder;
+                                                            _g = bandedRange.rowProperties, headerColor = _g.headerColor, headerBorder = _g.headerBorder, totalRowColor = _g.totalRowColor, totalRowBorder = _g.totalRowBorder, firstColumnColor = _g.firstColumnColor, lastColumnColor = _g.lastColumnColor, totalRowBold = _g.totalRowBold;
                                                             if (headerColor ||
                                                                 headerBorder ||
                                                                 totalRowColor ||
-                                                                totalRowBorder) {
+                                                                totalRowBorder ||
+                                                                firstColumnColor ||
+                                                                lastColumnColor ||
+                                                                totalRowBold) {
                                                                 bandedRange.rowProperties = {
                                                                     headerColor: headerColor,
                                                                     headerBorder: headerBorder,
                                                                     totalRowColor: totalRowColor,
                                                                     totalRowBorder: totalRowBorder,
+                                                                    firstColumnColor: firstColumnColor,
+                                                                    lastColumnColor: lastColumnColor,
+                                                                    totalRowBold: totalRowBold,
                                                                 };
                                                             }
                                                             else {
@@ -2320,24 +2364,24 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             });
                         };
                         this_1 = this;
-                        _c.label = 3;
+                        _d.label = 3;
                     case 3:
-                        _c.trys.push([3, 8, 9, 10]);
+                        _d.trys.push([3, 8, 9, 10]);
                         tablePartIds_1 = __values(tablePartIds), tablePartIds_1_1 = tablePartIds_1.next();
-                        _c.label = 4;
+                        _d.label = 4;
                     case 4:
                         if (!!tablePartIds_1_1.done) return [3 /*break*/, 7];
                         tableRId = tablePartIds_1_1.value;
                         return [5 /*yield**/, _loop_3(tableRId)];
                     case 5:
-                        _c.sent();
-                        _c.label = 6;
+                        _d.sent();
+                        _d.label = 6;
                     case 6:
                         tablePartIds_1_1 = tablePartIds_1.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_16_1 = _c.sent();
+                        e_16_1 = _d.sent();
                         e_16 = { error: e_16_1 };
                         return [3 /*break*/, 10];
                     case 9:
@@ -2348,7 +2392,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [7 /*endfinally*/];
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        err_3 = _c.sent();
+                        err_3 = _d.sent();
                         // Skip if relation file doesn't exist or has issues
                         console.log("Error parsing table", err_3);
                         return [3 /*break*/, 12];
@@ -2386,6 +2430,29 @@ var XlsxPlugin = /** @class */ (function (_super) {
         }
         return this.resolveSheetPath(relation.target);
     };
+    /**
+     * A chartsheet (`xl/chartsheets/sheetN.xml`) is listed in `<sheets>` like a
+     * worksheet; only its workbook relationship type tells it apart.
+     */
+    XlsxPlugin.prototype.isChartsheet = function (rid) {
+        var _a;
+        var relation = this.relations[rid];
+        if (!relation)
+            return false;
+        return (((_a = relation.type) !== null && _a !== void 0 ? _a : "").endsWith("/chartsheet") ||
+            this.resolveSheetPath(relation.target).includes("chartsheets/"));
+    };
+    XlsxPlugin.prototype.getChartsheetCharts = function (rid, sheetId) {
+        var _this = this;
+        var cached = this.chartsheetChartsCache.get(rid);
+        if (!cached) {
+            cached = this.getSheetData(rid).then(function (sheetData) {
+                return _this._getCharts(rid, sheetId, sheetData);
+            });
+            this.chartsheetChartsCache.set(rid, cached);
+        }
+        return cached;
+    };
     XlsxPlugin.prototype.streamSheetRows = function (rid) {
         return __asyncGenerator(this, arguments, function streamSheetRows_1() {
             var path, inSheetData, currentRow, currentCell, currentValueText, currentFormulaText, currentInlineText, currentFormulaAttrs, currentTag, inInlineStr, inInlineRun, inInlineRunProps, inlineRunStart, inlineRunText, inlineRunFormat, inlineRuns, normalizeTag, normalizeAttrs, truthyAttr, commitInlineRun, applyInlineRunProperty, HIGH_WATER_ROWS, queue, queueHead, done, pendingResolve, drainResolve, queuedRows, releaseDrain, notifyDrained, pushRow, closeQueue, self, parser, aborted, producerError, producerDone, row_1, row;
@@ -2798,7 +2865,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
     XlsxPlugin.prototype.getCommentsForSheet = function (rId) {
         return __awaiter(this, void 0, void 0, function () {
             var comments, relation, sheetPath, sheetRelPath, sheetRelContent, _a, sheetRels, relationships, relationshipsArray, commentRel, commentsPath, commentsContent, parsedComments, commentList, commentArray, commentArray_1, commentArray_1_1, comment, ref, text, _b;
-            var e_17, _c;
+            var e_18, _c;
             var _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -2813,7 +2880,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             return [2 /*return*/, comments];
                         }
                         sheetPath = this.resolveSheetPath(relation.target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(sheetPath);
                         _e.label = 1;
                     case 1:
                         _e.trys.push([1, 3, , 4]);
@@ -2865,12 +2932,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                        catch (e_18_1) { e_18 = { error: e_18_1 }; }
                         finally {
                             try {
                                 if (commentArray_1_1 && !commentArray_1_1.done && (_c = commentArray_1.return)) _c.call(commentArray_1);
                             }
-                            finally { if (e_17) throw e_17.error; }
+                            finally { if (e_18) throw e_18.error; }
                         }
                         return [3 /*break*/, 8];
                     case 7:
@@ -2942,7 +3009,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             return [2 /*return*/, result];
                         }
                         sheetPath = this.resolveSheetPath(relation.target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(sheetPath);
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, , 7]);
@@ -2986,8 +3053,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
      */
     XlsxPlugin.prototype.getCommentThreads = function (sheetId) {
         return __awaiter(this, void 0, void 0, function () {
-            var elements, threads, elements_1, elements_1_1, element, rid, sheetThreads, e_18_1;
-            var e_18, _a;
+            var elements, threads, elements_1, elements_1_1, element, rid, sheetThreads, e_19_1;
+            var e_19, _a;
             var _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -3017,14 +3084,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_18_1 = _c.sent();
-                        e_18 = { error: e_18_1 };
+                        e_19_1 = _c.sent();
+                        e_19 = { error: e_19_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (elements_1_1 && !elements_1_1.done && (_a = elements_1.return)) _a.call(elements_1);
                         }
-                        finally { if (e_18) throw e_18.error; }
+                        finally { if (e_19) throw e_19.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, threads];
                 }
@@ -3032,7 +3099,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
         });
     };
     XlsxPlugin.prototype.getFonts = function () {
-        var e_19, _a, e_20, _b, e_21, _c;
+        var e_20, _a, e_21, _b, e_22, _c;
         var _d, _e, _f;
         var fontSet = new Set();
         // The Fonts array contains all font definitions used in the workbook.
@@ -3069,12 +3136,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_19_1) { e_19 = { error: e_19_1 }; }
+            catch (e_20_1) { e_20 = { error: e_20_1 }; }
             finally {
                 try {
                     if (fontArray_1_1 && !fontArray_1_1.done && (_a = fontArray_1.return)) _a.call(fontArray_1);
                 }
-                finally { if (e_19) throw e_19.error; }
+                finally { if (e_20) throw e_20.error; }
             }
         }
         // Rich-text shared-string runs carry per-run `<rPr><rFont val>` fonts
@@ -3084,7 +3151,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 for (var _g = __values(this.richSharedStringRuns.values()), _h = _g.next(); !_h.done; _h = _g.next()) {
                     var runs = _h.value;
                     try {
-                        for (var runs_2 = (e_21 = void 0, __values(runs)), runs_2_1 = runs_2.next(); !runs_2_1.done; runs_2_1 = runs_2.next()) {
+                        for (var runs_2 = (e_22 = void 0, __values(runs)), runs_2_1 = runs_2.next(); !runs_2_1.done; runs_2_1 = runs_2.next()) {
                             var run = runs_2_1.value;
                             var family = run.nodeType === "text" ? (_f = run.format) === null || _f === void 0 ? void 0 : _f.fontFamily : undefined;
                             if (family) {
@@ -3092,21 +3159,21 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             }
                         }
                     }
-                    catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                    catch (e_22_1) { e_22 = { error: e_22_1 }; }
                     finally {
                         try {
                             if (runs_2_1 && !runs_2_1.done && (_c = runs_2.return)) _c.call(runs_2);
                         }
-                        finally { if (e_21) throw e_21.error; }
+                        finally { if (e_22) throw e_22.error; }
                     }
                 }
             }
-            catch (e_20_1) { e_20 = { error: e_20_1 }; }
+            catch (e_21_1) { e_21 = { error: e_21_1 }; }
             finally {
                 try {
                     if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
                 }
-                finally { if (e_20) throw e_20.error; }
+                finally { if (e_21) throw e_21.error; }
             }
         }
         return __spreadArray([], __read(fontSet), false);
@@ -3118,7 +3185,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
      * Extract column widths and row heights from sheet XML for chart positioning
      */
     XlsxPlugin.prototype._extractSheetDimensions = function (sheetData) {
-        var e_22, _a, e_23, _b, e_24, _c;
+        var e_23, _a, e_24, _b, e_25, _c;
         var _d, _e, _f, _g, _h, _j, _k;
         var columnWidths = new Map();
         var rowHeights = new Map();
@@ -3146,12 +3213,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
                 if (colsArray_1_1 && !colsArray_1_1.done && (_a = colsArray_1.return)) _a.call(colsArray_1);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_23) throw e_23.error; }
         }
         // Extract row heights from sheetData/row elements
         var rows = get(sheetData, "worksheet.sheetData.row") ||
@@ -3185,12 +3252,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
                 if (rowsArray_1_1 && !rowsArray_1_1.done && (_b = rowsArray_1.return)) _b.call(rowsArray_1);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_24) throw e_24.error; }
         }
         try {
             // Also check for hidden columns
@@ -3211,12 +3278,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (colsArray_2_1 && !colsArray_2_1.done && (_c = colsArray_2.return)) _c.call(colsArray_2);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_25) throw e_25.error; }
         }
         return {
             columnWidths: columnWidths.size > 0 ? columnWidths : undefined,
@@ -3227,8 +3294,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype._getCharts = function (rid, sheetId, sheetData) {
         return __awaiter(this, void 0, void 0, function () {
-            var charts, sheetDimensions, target, path, sheetIdByName, _a, _b, sheet, name_5, sId, resolveSheetId, drawing, drawings, sheetRelPath, sheetRelContent, sheetRels, drawingRelations, drawingRelationsArray, _loop_4, this_2, drawings_1, drawings_1_1, drawingElement, e_25_1, err_5;
-            var e_26, _c, e_25, _d;
+            var charts, sheetDimensions, target, path, sheetIdByName, _a, _b, sheet, name_5, sId, resolveSheetId, drawing, drawings, sheetRelPath, sheetRelContent, sheetRels, drawingRelations, drawingRelationsArray, _loop_4, this_2, drawings_1, drawings_1_1, drawingElement, e_26_1, err_5;
+            var e_27, _c, e_26, _d;
             var _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -3250,19 +3317,21 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+                        catch (e_27_1) { e_27 = { error: e_27_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_26) throw e_26.error; }
+                            finally { if (e_27) throw e_27.error; }
                         }
                         resolveSheetId = function (sheetName) {
                             return sheetName ? sheetIdByName[String(sheetName)] : undefined;
                         };
                         drawing = get(sheetData, "worksheet.drawing") ||
                             get(sheetData, "drawing") ||
-                            get(sheetData, "x:worksheet.x:drawing");
+                            get(sheetData, "x:worksheet.x:drawing") ||
+                            get(sheetData, "chartsheet.drawing") ||
+                            get(sheetData, "x:chartsheet.x:drawing");
                         if (!drawing) {
                             return [2 /*return*/, []];
                         }
@@ -3270,7 +3339,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _g.label = 1;
                     case 1:
                         _g.trys.push([1, 11, , 12]);
-                        sheetRelPath = path.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(path);
                         return [4 /*yield*/, this.zipParser.getText(sheetRelPath)];
                     case 2:
                         sheetRelContent = _g.sent();
@@ -3280,10 +3349,10 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             ? drawingRelations
                             : [drawingRelations];
                         _loop_4 = function (drawingElement) {
-                            var drawingId, drawingRel, drawingPath, drawingContent, drawingXml, drawingDir, drawingRelsPath, drawingRelsContent, drawingRelsXml, drawingRelsList, drawingRelsArray, oneCellAnchors, twoCellAnchors, anchors, _loop_5, anchors_1, anchors_1_1, anchor, e_27_1;
-                            var e_27, _h;
-                            return __generator(this, function (_j) {
-                                switch (_j.label) {
+                            var drawingId, drawingRel, drawingPath, drawingContent, drawingXml, drawingDir, drawingRelsPath, drawingRelsContent, drawingRelsXml, drawingRelsList, drawingRelsArray, orderedAnchors, _loop_5, _h, _j, _k, zOrder, anchor, e_28_1;
+                            var e_28, _l;
+                            return __generator(this, function (_m) {
+                                switch (_m.label) {
                                     case 0:
                                         drawingId = get(drawingElement, "a$.r:id") || get(drawingElement, "a$.id");
                                         drawingRel = drawingRelationsArray.find(function (rel) {
@@ -3307,7 +3376,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                         }
                                         return [4 /*yield*/, this_2.zipParser.getText(drawingPath)];
                                     case 1:
-                                        drawingContent = _j.sent();
+                                        drawingContent = _m.sent();
                                         if (!drawingContent)
                                             return [2 /*return*/, "continue"];
                                         drawingXml = this_2.xmlParser.parse(drawingContent);
@@ -3317,7 +3386,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                             .pop(), ".rels");
                                         return [4 /*yield*/, this_2.zipParser.getText(drawingRelsPath)];
                                     case 2:
-                                        drawingRelsContent = _j.sent();
+                                        drawingRelsContent = _m.sent();
                                         if (!drawingRelsContent) {
                                             console.log("Drawing relationships file not found:", drawingRelsPath);
                                             return [2 /*return*/, "continue"];
@@ -3327,21 +3396,11 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                         drawingRelsArray = Array.isArray(drawingRelsList)
                                             ? drawingRelsList
                                             : [drawingRelsList];
-                                        oneCellAnchors = get(drawingXml, "xdr:wsDr.xdr:oneCellAnchor") ||
-                                            get(drawingXml, "wsDr.oneCellAnchor") ||
-                                            [];
-                                        twoCellAnchors = get(drawingXml, "xdr:wsDr.xdr:twoCellAnchor") ||
-                                            get(drawingXml, "wsDr.twoCellAnchor") ||
-                                            [];
-                                        anchors = __spreadArray(__spreadArray([], __read((Array.isArray(oneCellAnchors)
-                                            ? oneCellAnchors
-                                            : [oneCellAnchors])), false), __read((Array.isArray(twoCellAnchors)
-                                            ? twoCellAnchors
-                                            : [twoCellAnchors])), false).filter(Boolean);
-                                        _loop_5 = function (anchor) {
+                                        orderedAnchors = anchorsInDocumentOrder(drawingXml, drawingContent);
+                                        _loop_5 = function (zOrder, anchor) {
                                             var chartRef, chartExRef, chartExRId_1, chartExRel, chartEx, chartRId, chartRel, chart;
-                                            return __generator(this, function (_k) {
-                                                switch (_k.label) {
+                                            return __generator(this, function (_o) {
+                                                switch (_o.label) {
                                                     case 0:
                                                         chartRef = getChartReferenceFromAnchor(anchor);
                                                         if (!!chartRef) return [3 /*break*/, 3];
@@ -3356,10 +3415,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                         if (!chartExRel) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, processChartEx(chartExRel.a$.Target, drawingPath, anchor, sheetId, this_2.zipParser, this_2.xmlParser, sheetDimensions, resolveSheetId)];
                                                     case 1:
-                                                        chartEx = _k.sent();
-                                                        if (chartEx)
+                                                        chartEx = _o.sent();
+                                                        if (chartEx) {
+                                                            chartEx.position = __assign(__assign({}, chartEx.position), { zOrder: zOrder });
                                                             charts.push(chartEx);
-                                                        _k.label = 2;
+                                                        }
+                                                        _o.label = 2;
                                                     case 2: return [2 /*return*/, "continue"];
                                                     case 3:
                                                         chartRId = get(chartRef, "a$.r:id") ||
@@ -3375,40 +3436,41 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                         if (!chartRel) return [3 /*break*/, 5];
                                                         return [4 /*yield*/, processChart(chartRel.a$.Target, drawingPath, anchor, sheetId, this_2.zipParser, this_2.xmlParser, sheetDimensions, resolveSheetId)];
                                                     case 4:
-                                                        chart = _k.sent();
+                                                        chart = _o.sent();
                                                         if (chart) {
+                                                            chart.position = __assign(__assign({}, chart.position), { zOrder: zOrder });
                                                             charts.push(chart);
                                                         }
-                                                        _k.label = 5;
+                                                        _o.label = 5;
                                                     case 5: return [2 /*return*/];
                                                 }
                                             });
                                         };
-                                        _j.label = 3;
+                                        _m.label = 3;
                                     case 3:
-                                        _j.trys.push([3, 8, 9, 10]);
-                                        anchors_1 = (e_27 = void 0, __values(anchors)), anchors_1_1 = anchors_1.next();
-                                        _j.label = 4;
+                                        _m.trys.push([3, 8, 9, 10]);
+                                        _h = (e_28 = void 0, __values(orderedAnchors.entries())), _j = _h.next();
+                                        _m.label = 4;
                                     case 4:
-                                        if (!!anchors_1_1.done) return [3 /*break*/, 7];
-                                        anchor = anchors_1_1.value;
-                                        return [5 /*yield**/, _loop_5(anchor)];
+                                        if (!!_j.done) return [3 /*break*/, 7];
+                                        _k = __read(_j.value, 2), zOrder = _k[0], anchor = _k[1].node;
+                                        return [5 /*yield**/, _loop_5(zOrder, anchor)];
                                     case 5:
-                                        _j.sent();
-                                        _j.label = 6;
+                                        _m.sent();
+                                        _m.label = 6;
                                     case 6:
-                                        anchors_1_1 = anchors_1.next();
+                                        _j = _h.next();
                                         return [3 /*break*/, 4];
                                     case 7: return [3 /*break*/, 10];
                                     case 8:
-                                        e_27_1 = _j.sent();
-                                        e_27 = { error: e_27_1 };
+                                        e_28_1 = _m.sent();
+                                        e_28 = { error: e_28_1 };
                                         return [3 /*break*/, 10];
                                     case 9:
                                         try {
-                                            if (anchors_1_1 && !anchors_1_1.done && (_h = anchors_1.return)) _h.call(anchors_1);
+                                            if (_j && !_j.done && (_l = _h.return)) _l.call(_h);
                                         }
-                                        finally { if (e_27) throw e_27.error; }
+                                        finally { if (e_28) throw e_28.error; }
                                         return [7 /*endfinally*/];
                                     case 10: return [2 /*return*/];
                                 }
@@ -3432,14 +3494,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_25_1 = _g.sent();
-                        e_25 = { error: e_25_1 };
+                        e_26_1 = _g.sent();
+                        e_26 = { error: e_26_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (drawings_1_1 && !drawings_1_1.done && (_d = drawings_1.return)) _d.call(drawings_1);
                         }
-                        finally { if (e_25) throw e_25.error; }
+                        finally { if (e_26) throw e_26.error; }
                         return [7 /*endfinally*/];
                     case 10: return [2 /*return*/, charts];
                     case 11:
@@ -3458,8 +3520,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
      */
     XlsxPlugin.prototype._getDrawings = function (rid, sheetId, sheetData) {
         return __awaiter(this, void 0, void 0, function () {
-            var images, target, path, drawing, drawings, sheetRelPath, sheetRelContent, sheetRels, drawingRelations, drawingRelationsArray, _loop_6, this_3, drawings_2, drawings_2_1, drawingElement, e_28_1;
-            var e_28, _a;
+            var images, target, path, drawing, drawings, sheetRelPath, sheetRelContent, sheetRels, drawingRelations, drawingRelationsArray, _loop_6, this_3, drawings_2, drawings_2_1, drawingElement, e_29_1;
+            var e_29, _a;
             var _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -3471,12 +3533,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             : "xl/".concat(this.relations[rid].target);
                         drawing = get(sheetData, "worksheet.drawing") ||
                             get(sheetData, "drawing") ||
-                            get(sheetData, "x:worksheet.x:drawing");
+                            get(sheetData, "x:worksheet.x:drawing") ||
+                            get(sheetData, "chartsheet.drawing") ||
+                            get(sheetData, "x:chartsheet.x:drawing");
                         if (!drawing) {
                             return [2 /*return*/, []];
                         }
                         drawings = Array.isArray(drawing) ? drawing : [drawing];
-                        sheetRelPath = path.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(path);
                         return [4 /*yield*/, this.zipParser.getText(sheetRelPath)];
                     case 1:
                         sheetRelContent = _c.sent();
@@ -3486,10 +3550,10 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             ? drawingRelations
                             : [drawingRelations];
                         _loop_6 = function (drawingElement) {
-                            var drawingId, drawingRels, drawingRels_2, drawingRels_2_1, drawingRel, drawingPath, drawingContent, drawing_1, _d, _e, anchor, _f, _g, image, e_29_1, e_30_1, e_31_1;
-                            var e_31, _h, e_30, _j, e_29, _k;
-                            return __generator(this, function (_l) {
-                                switch (_l.label) {
+                            var drawingId, drawingRels, drawingRels_2, drawingRels_2_1, drawingRel, drawingPath, drawingContent, drawing_1, orderedAnchors, _d, _e, _f, zOrder, anchor, _g, _h, image, e_30_1, e_31_1, e_32_1;
+                            var e_32, _j, e_31, _k, e_30, _l;
+                            return __generator(this, function (_m) {
+                                switch (_m.label) {
                                     case 0:
                                         drawingId = get(drawingElement, "a$.r:id") || get(drawingElement, "a$.id");
                                         drawingRels = drawingRelationsArray.filter(function (rel) {
@@ -3498,11 +3562,11 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                 rel.a$.ID === drawingId ||
                                                 (rel.a$.Target && rel.a$.Target.includes("drawing"));
                                         });
-                                        _l.label = 1;
+                                        _m.label = 1;
                                     case 1:
-                                        _l.trys.push([1, 19, 20, 21]);
-                                        drawingRels_2 = (e_31 = void 0, __values(drawingRels)), drawingRels_2_1 = drawingRels_2.next();
-                                        _l.label = 2;
+                                        _m.trys.push([1, 19, 20, 21]);
+                                        drawingRels_2 = (e_32 = void 0, __values(drawingRels)), drawingRels_2_1 = drawingRels_2.next();
+                                        _m.label = 2;
                                     case 2:
                                         if (!!drawingRels_2_1.done) return [3 /*break*/, 18];
                                         drawingRel = drawingRels_2_1.value;
@@ -3523,70 +3587,72 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                         }
                                         return [4 /*yield*/, this_3.zipParser.getText(drawingPath)];
                                     case 3:
-                                        drawingContent = (_b = (_l.sent())) !== null && _b !== void 0 ? _b : "";
+                                        drawingContent = (_b = (_m.sent())) !== null && _b !== void 0 ? _b : "";
                                         drawing_1 = this_3.xmlParser.parse(drawingContent);
-                                        _l.label = 4;
+                                        orderedAnchors = anchorsInDocumentOrder(drawing_1, drawingContent);
+                                        _m.label = 4;
                                     case 4:
-                                        _l.trys.push([4, 15, 16, 17]);
-                                        _d = (e_30 = void 0, __values(anchorsInDocumentOrder(drawing_1, drawingContent))), _e = _d.next();
-                                        _l.label = 5;
+                                        _m.trys.push([4, 15, 16, 17]);
+                                        _d = (e_31 = void 0, __values(orderedAnchors.entries())), _e = _d.next();
+                                        _m.label = 5;
                                     case 5:
                                         if (!!_e.done) return [3 /*break*/, 14];
-                                        anchor = _e.value;
-                                        _l.label = 6;
+                                        _f = __read(_e.value, 2), zOrder = _f[0], anchor = _f[1];
+                                        _m.label = 6;
                                     case 6:
-                                        _l.trys.push([6, 11, 12, 13]);
-                                        e_29 = void 0;
+                                        _m.trys.push([6, 11, 12, 13]);
+                                        e_30 = void 0;
                                         return [4 /*yield*/, processAnchors(anchor.node, anchor.kind, drawingPath, sheetId, this_3.zipParser, this_3.xmlParser)];
                                     case 7:
-                                        _f = (__values.apply(void 0, [_l.sent()])), _g = _f.next();
-                                        _l.label = 8;
+                                        _g = (__values.apply(void 0, [_m.sent()])), _h = _g.next();
+                                        _m.label = 8;
                                     case 8:
-                                        if (!!_g.done) return [3 /*break*/, 10];
-                                        image = _g.value;
+                                        if (!!_h.done) return [3 /*break*/, 10];
+                                        image = _h.value;
+                                        image.position = __assign(__assign({}, image.position), { zOrder: zOrder });
                                         images.push(image);
-                                        _l.label = 9;
+                                        _m.label = 9;
                                     case 9:
-                                        _g = _f.next();
+                                        _h = _g.next();
                                         return [3 /*break*/, 8];
                                     case 10: return [3 /*break*/, 13];
                                     case 11:
-                                        e_29_1 = _l.sent();
-                                        e_29 = { error: e_29_1 };
+                                        e_30_1 = _m.sent();
+                                        e_30 = { error: e_30_1 };
                                         return [3 /*break*/, 13];
                                     case 12:
                                         try {
-                                            if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
+                                            if (_h && !_h.done && (_l = _g.return)) _l.call(_g);
                                         }
-                                        finally { if (e_29) throw e_29.error; }
+                                        finally { if (e_30) throw e_30.error; }
                                         return [7 /*endfinally*/];
                                     case 13:
                                         _e = _d.next();
                                         return [3 /*break*/, 5];
                                     case 14: return [3 /*break*/, 17];
                                     case 15:
-                                        e_30_1 = _l.sent();
-                                        e_30 = { error: e_30_1 };
+                                        e_31_1 = _m.sent();
+                                        e_31 = { error: e_31_1 };
                                         return [3 /*break*/, 17];
                                     case 16:
                                         try {
-                                            if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
+                                            if (_e && !_e.done && (_k = _d.return)) _k.call(_d);
                                         }
-                                        finally { if (e_30) throw e_30.error; }
+                                        finally { if (e_31) throw e_31.error; }
                                         return [7 /*endfinally*/];
                                     case 17:
                                         drawingRels_2_1 = drawingRels_2.next();
                                         return [3 /*break*/, 2];
                                     case 18: return [3 /*break*/, 21];
                                     case 19:
-                                        e_31_1 = _l.sent();
-                                        e_31 = { error: e_31_1 };
+                                        e_32_1 = _m.sent();
+                                        e_32 = { error: e_32_1 };
                                         return [3 /*break*/, 21];
                                     case 20:
                                         try {
-                                            if (drawingRels_2_1 && !drawingRels_2_1.done && (_h = drawingRels_2.return)) _h.call(drawingRels_2);
+                                            if (drawingRels_2_1 && !drawingRels_2_1.done && (_j = drawingRels_2.return)) _j.call(drawingRels_2);
                                         }
-                                        finally { if (e_31) throw e_31.error; }
+                                        finally { if (e_32) throw e_32.error; }
                                         return [7 /*endfinally*/];
                                     case 21: return [2 /*return*/];
                                 }
@@ -3610,14 +3676,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_28_1 = _c.sent();
-                        e_28 = { error: e_28_1 };
+                        e_29_1 = _c.sent();
+                        e_29 = { error: e_29_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (drawings_2_1 && !drawings_2_1.done && (_a = drawings_2.return)) _a.call(drawings_2);
                         }
-                        finally { if (e_28) throw e_28.error; }
+                        finally { if (e_29) throw e_29.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/, images];
                 }
@@ -3660,6 +3726,34 @@ var XlsxPlugin = /** @class */ (function (_super) {
     XlsxPlugin.prototype.getNamedCellStyles = function () {
         return resolveNamedCellStyles(this.workbookStyles);
     };
+    /**
+     * The workbook's custom `<tableStyle>`s with their per-element dxf fills resolved into banding —
+     * the `customTableStyles` document facet (table style gallery + re-export), #668 T-103.
+     */
+    XlsxPlugin.prototype.getCustomTableStyles = function () {
+        var e_33, _a;
+        var _b, _c;
+        var styles = (_b = this.workbookStyles) === null || _b === void 0 ? void 0 : _b.tableStyles;
+        if (!styles)
+            return [];
+        var out = [];
+        try {
+            for (var _d = __values(styles.keys()), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var name_6 = _e.value;
+                var bandedRange = (_c = this.workbookStyles) === null || _c === void 0 ? void 0 : _c.getCustomTableStyleBanding(name_6);
+                if (bandedRange)
+                    out.push({ name: name_6, bandedRange: bandedRange });
+            }
+        }
+        catch (e_33_1) { e_33 = { error: e_33_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            }
+            finally { if (e_33) throw e_33.error; }
+        }
+        return out;
+    };
     /**
      * The workbook default font — styles.xml fonts[0], the font every cell
      * without an explicit font inherits. Exporters pass this through so the
@@ -3733,16 +3827,16 @@ var XlsxPlugin = /** @class */ (function (_super) {
         this.printNamesBySheetId.set(sheetId, entry);
     };
     XlsxPlugin.prototype._getNamedRanges = function () {
-        var e_32, _a, e_33, _b;
+        var e_34, _a, e_35, _b;
         var _c, _d;
         this.printNamesBySheetId.clear();
         var xml = this.workbookXml;
         var sheetIdBySheetName = this._getSheets().reduce(function (acc, element) {
             var _a;
             if (element) {
-                var name_6 = (_a = element.a$) === null || _a === void 0 ? void 0 : _a.name;
+                var name_7 = (_a = element.a$) === null || _a === void 0 ? void 0 : _a.name;
                 var sheetId = Number(element.a$.sheetId);
-                acc[name_6] = sheetId;
+                acc[name_7] = sheetId;
             }
             return acc;
         }, {});
@@ -3757,15 +3851,15 @@ var XlsxPlugin = /** @class */ (function (_super) {
             try {
                 for (var defined_names_1 = __values(defined_names), defined_names_1_1 = defined_names_1.next(); !defined_names_1_1.done; defined_names_1_1 = defined_names_1.next()) {
                     var defined_name = defined_names_1_1.value;
-                    var name_7 = (_c = defined_name.a$) === null || _c === void 0 ? void 0 : _c.name;
+                    var name_8 = (_c = defined_name.a$) === null || _c === void 0 ? void 0 : _c.name;
                     var expression = defined_name.t$ || "";
                     var 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_7)) {
-                        this.stashBuiltinPrintName(name_7, typeof expression === "string" ? expression : "", (_d = defined_name.a$) === null || _d === void 0 ? void 0 : _d.localSheetId, sheetIdBySheetName);
+                    if (isBuiltinPrintName(name_8)) {
+                        this.stashBuiltinPrintName(name_8, typeof expression === "string" ? expression : "", (_d = defined_name.a$) === null || _d === void 0 ? void 0 : _d.localSheetId, sheetIdBySheetName);
                         continue;
                     }
                     // Empty defined names are noise; nothing useful to round-trip.
@@ -3783,23 +3877,23 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         var pushedRange = false;
                         if (selections.length) {
                             try {
-                                for (var selections_1 = (e_33 = void 0, __values(selections)), selections_1_1 = selections_1.next(); !selections_1_1.done; selections_1_1 = selections_1.next()) {
+                                for (var selections_1 = (e_35 = void 0, __values(selections)), selections_1_1 = selections_1.next(); !selections_1_1.done; selections_1_1 = selections_1.next()) {
                                     var selection = selections_1_1.value;
                                     var sheetId = selection.sheetName
                                         ? sheetIdBySheetName[selection.sheetName]
                                         : undefined;
                                     if (!isNil(sheetId)) {
-                                        namedRanges.push(__assign({ namedRangeId: uuid(), name: name_7, range: __assign(__assign({}, selection.range), { sheetId: sheetId }) }, (hidden ? { hidden: true } : {})));
+                                        namedRanges.push(__assign({ namedRangeId: uuid(), name: name_8, range: __assign(__assign({}, selection.range), { sheetId: sheetId }) }, (hidden ? { hidden: true } : {})));
                                         pushedRange = true;
                                     }
                                 }
                             }
-                            catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                            catch (e_35_1) { e_35 = { error: e_35_1 }; }
                             finally {
                                 try {
                                     if (selections_1_1 && !selections_1_1.done && (_b = selections_1.return)) _b.call(selections_1);
                                 }
-                                finally { if (e_33) throw e_33.error; }
+                                finally { if (e_35) throw e_35.error; }
                             }
                         }
                         // Reference parsed but no selection bound to a known sheet — most
@@ -3808,7 +3902,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         // Preserve the original expression as value-only so the name
                         // survives the round-trip.
                         if (!pushedRange) {
-                            namedRanges.push(__assign({ name: name_7, namedRangeId: uuid(), value: isAFormula(expression) ? "=".concat(expression) : expression }, (hidden ? { hidden: true } : {})));
+                            namedRanges.push(__assign({ name: name_8, namedRangeId: uuid(), value: isAFormula(expression) ? "=".concat(expression) : expression }, (hidden ? { hidden: true } : {})));
                         }
                     }
                     else {
@@ -3817,18 +3911,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         // formula-shaped expressions (e.g. `OFFSET(...)`) get the
                         // "=" prefix the calculator expects; static literals and
                         // broken refs are preserved verbatim.
-                        namedRanges.push(__assign({ name: name_7, namedRangeId: uuid(), value: isAFormula(expression) || isBareFormulaExpression(expression)
+                        namedRanges.push(__assign({ name: name_8, namedRangeId: uuid(), value: isAFormula(expression) || isBareFormulaExpression(expression)
                                 ? "=".concat(expression)
                                 : expression }, (hidden ? { hidden: true } : {})));
                     }
                 }
             }
-            catch (e_32_1) { e_32 = { error: e_32_1 }; }
+            catch (e_34_1) { e_34 = { error: e_34_1 }; }
             finally {
                 try {
                     if (defined_names_1_1 && !defined_names_1_1.done && (_a = defined_names_1.return)) _a.call(defined_names_1);
                 }
-                finally { if (e_32) throw e_32.error; }
+                finally { if (e_34) throw e_34.error; }
             }
         }
         return namedRanges;
@@ -3887,8 +3981,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
     // INTERFACE IMPLEMENTATION METHODS
     XlsxPlugin.prototype.getSheets = function () {
         return __awaiter(this, arguments, void 0, function (minRowCount, minColumnCount) {
-            var workSheets, sheets, tables, workSheets_1, workSheets_1_1, element, built, e_34_1;
-            var e_34, _a;
+            var workSheets, sheets, tables, workSheets_1, workSheets_1_1, element, built, e_36_1;
+            var e_36, _a;
             var _b;
             if (minRowCount === void 0) { minRowCount = 0; }
             if (minColumnCount === void 0) { minColumnCount = 0; }
@@ -3923,14 +4017,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_34_1 = _c.sent();
-                        e_34 = { error: e_34_1 };
+                        e_36_1 = _c.sent();
+                        e_36 = { error: e_36_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (workSheets_1_1 && !workSheets_1_1.done && (_a = workSheets_1.return)) _a.call(workSheets_1);
                         }
-                        finally { if (e_34) throw e_34.error; }
+                        finally { if (e_36) throw e_36.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, [sheets, tables]];
                 }
@@ -3938,6 +4032,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
         });
     };
     XlsxPlugin.prototype.getSheetCatalog = function () {
+        var _this = this;
         var catalog = [];
         this._getSheets().forEach(function (element, index) {
             var _a;
@@ -3951,12 +4046,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 : state === "hidden"
                     ? "hidden"
                     : "visible";
+            var rid = element.a$["r:id"];
             catalog.push({
                 sheetId: Number(element.a$.sheetId),
                 title: name,
                 visibility: visibility,
                 hidden: visibility !== "visible",
                 index: index,
+                type: rid && _this.isChartsheet(rid) ? "chartsheet" : "worksheet",
             });
         });
         return catalog;
@@ -3988,16 +4085,16 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.buildSheetFromElement = function (element_1) {
         return __awaiter(this, arguments, void 0, function (element, minRowCount, minColumnCount) {
-            var name, state, sheetId, rid, visibility, hidden, sheet_1, metadata, merges, rowEntries, columnMetadata, maxRowIndex, maxColumnIndex, autoFilterRange_1, filterSpecs, sheetViewData, tabColor, sheetHasFilterMode_1, zeroHeight_1, defaultRowHeightPx, defaultColumnWidthPx, tablePartIds, outlineSummaryBelow, outlineSummaryRight, sheetProtection, protectedRangeEntries, printSettings, printNames, merged, rowCount, sheetTables, rowInTableMap_1, columnCount, _a, frozenRowCount, frozenColumnCount, paneTopLeftCell, showGridLines, showRowColHeaders, showZeros, zoomScale, rightToLeft, merges_2, merges_2_1, range, drawingBounds, finalRowCount, finalColumnCount;
-            var e_35, _b;
-            var _c;
+            var name, state, sheetId, rid, visibility, hidden, sheet_1, _a, chart, metadata, merges, rowEntries, columnMetadata, maxRowIndex, maxColumnIndex, autoFilterRange_1, filterSpecs, sheetViewData, tabColor, sheetHasFilterMode_1, zeroHeight_1, defaultRowHeightPx, defaultColumnWidthPx, tablePartIds, outlineSummaryBelow, outlineSummaryRight, sheetProtection, protectedRangeEntries, printSettings, printNames, merged, rowCount, sheetTables, rowInTableMap_1, columnCount, _b, frozenRowCount, frozenColumnCount, paneTopLeftCell, showGridLines, showRowColHeaders, showZeros, zoomScale, rightToLeft, merges_2, merges_2_1, range, drawingBounds, finalRowCount, finalColumnCount;
+            var e_37, _c;
+            var _d;
             if (minRowCount === void 0) { minRowCount = 0; }
             if (minColumnCount === void 0) { minColumnCount = 0; }
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        name = (_c = element.a$) === null || _c === void 0 ? void 0 : _c.name;
-                        if (!name) return [3 /*break*/, 4];
+                        name = (_d = element.a$) === null || _d === void 0 ? void 0 : _d.name;
+                        if (!name) return [3 /*break*/, 6];
                         state = element.a$.state;
                         sheetId = Number(element.a$.sheetId);
                         rid = element.a$["r:id"];
@@ -4018,9 +4115,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         if (visibility !== "visible") {
                             sheet_1.visibility = visibility;
                         }
-                        return [4 /*yield*/, this.getSheetMetadata(rid)];
+                        if (!this.isChartsheet(rid)) return [3 /*break*/, 2];
+                        sheet_1.type = "chartsheet";
+                        return [4 /*yield*/, this.getChartsheetCharts(rid, sheetId)];
                     case 1:
-                        metadata = _d.sent();
+                        _a = __read.apply(void 0, [_e.sent(), 1]), chart = _a[0];
+                        if (chart) {
+                            sheet_1.chartId = chart.chartId;
+                        }
+                        _e.label = 2;
+                    case 2: return [4 /*yield*/, this.getSheetMetadata(rid)];
+                    case 3:
+                        metadata = _e.sent();
                         merges = metadata.merges, rowEntries = metadata.rowEntries, columnMetadata = metadata.columnMetadata, maxRowIndex = metadata.maxRowIndex, maxColumnIndex = metadata.maxColumnIndex, autoFilterRange_1 = metadata.autoFilterRange, filterSpecs = metadata.filterSpecs, sheetViewData = metadata.sheetViewData, tabColor = metadata.tabColor, sheetHasFilterMode_1 = metadata.sheetHasFilterMode, zeroHeight_1 = metadata.zeroHeight, defaultRowHeightPx = metadata.defaultRowHeightPx, defaultColumnWidthPx = metadata.defaultColumnWidthPx, tablePartIds = metadata.tablePartIds, outlineSummaryBelow = metadata.outlineSummaryBelow, outlineSummaryRight = metadata.outlineSummaryRight, sheetProtection = metadata.sheetProtection, protectedRangeEntries = metadata.protectedRangeEntries, printSettings = metadata.printSettings;
                         if (sheetProtection) {
                             sheet_1.sheetProtection = sheetProtection;
@@ -4050,8 +4156,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         }
                         rowCount = findMax([minRowCount, maxRowIndex || 0]);
                         return [4 /*yield*/, this.getTablesFromSheet(sheetId, rid, tablePartIds)];
-                    case 2:
-                        sheetTables = _d.sent();
+                    case 4:
+                        sheetTables = _e.sent();
                         rowInTableMap_1 = {};
                         // Populate the lookup map
                         sheetTables.forEach(function (table) {
@@ -4063,7 +4169,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             }
                         });
                         columnCount = 0;
-                        _a = extractSheetViewProperties(sheetViewData), frozenRowCount = _a.frozenRowCount, frozenColumnCount = _a.frozenColumnCount, paneTopLeftCell = _a.paneTopLeftCell, showGridLines = _a.showGridLines, showRowColHeaders = _a.showRowColHeaders, showZeros = _a.showZeros, zoomScale = _a.zoomScale, rightToLeft = _a.rightToLeft;
+                        _b = extractSheetViewProperties(sheetViewData), frozenRowCount = _b.frozenRowCount, frozenColumnCount = _b.frozenColumnCount, paneTopLeftCell = _b.paneTopLeftCell, showGridLines = _b.showGridLines, showRowColHeaders = _b.showRowColHeaders, showZeros = _b.showZeros, zoomScale = _b.zoomScale, rightToLeft = _b.rightToLeft;
                         sheet_1.frozenRowCount = frozenRowCount;
                         sheet_1.frozenColumnCount = frozenColumnCount;
                         if (paneTopLeftCell) {
@@ -4100,12 +4206,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 sheet_1.merges.push(range);
                             }
                         }
-                        catch (e_35_1) { e_35 = { error: e_35_1 }; }
+                        catch (e_37_1) { e_37 = { error: e_37_1 }; }
                         finally {
                             try {
-                                if (merges_2_1 && !merges_2_1.done && (_b = merges_2.return)) _b.call(merges_2);
+                                if (merges_2_1 && !merges_2_1.done && (_c = merges_2.return)) _c.call(merges_2);
                             }
-                            finally { if (e_35) throw e_35.error; }
+                            finally { if (e_37) throw e_37.error; }
                         }
                         columnCount = findMax([maxColumnIndex, minColumnCount]);
                         rowEntries.forEach(function (entry, rowIndex) {
@@ -4174,8 +4280,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             sheet_1.columnMetadata[Number(key)] = value;
                         });
                         return [4 /*yield*/, this.getDrawingBounds(rid)];
-                    case 3:
-                        drawingBounds = _d.sent();
+                    case 5:
+                        drawingBounds = _e.sent();
                         finalRowCount = findMax([rowCount, drawingBounds.maxRowIndex]);
                         finalColumnCount = findMax([
                             columnCount,
@@ -4186,15 +4292,15 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         if (finalColumnCount)
                             sheet_1.columnCount = finalColumnCount;
                         return [2 /*return*/, { sheet: sheet_1, tables: sheetTables }];
-                    case 4: return [2 /*return*/, undefined];
+                    case 6: return [2 /*return*/, undefined];
                 }
             });
         });
     };
     XlsxPlugin.prototype.processSheetData = function () {
         return __asyncGenerator(this, arguments, function processSheetData_1(chunkSize, enableCellXfsRegistry, _enableSharedStrings, onPhase) {
-            var workSheets, totalSheets, currentSheetIndex, workSheets_2, workSheets_2_1, element, e_36_1;
-            var e_36, _a;
+            var workSheets, totalSheets, currentSheetIndex, workSheets_2, workSheets_2_1, element, e_38_1;
+            var e_38, _a;
             var _b;
             if (chunkSize === void 0) { chunkSize = 100; }
             if (enableCellXfsRegistry === void 0) { enableCellXfsRegistry = false; }
@@ -4233,14 +4339,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_36_1 = _c.sent();
-                        e_36 = { error: e_36_1 };
+                        e_38_1 = _c.sent();
+                        e_38 = { error: e_38_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (workSheets_2_1 && !workSheets_2_1.done && (_a = workSheets_2.return)) _a.call(workSheets_2);
                         }
-                        finally { if (e_36) throw e_36.error; }
+                        finally { if (e_38) throw e_38.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
                 }
@@ -4290,10 +4396,10 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.processOneSheet = function (element_1, _a) {
         return __asyncGenerator(this, arguments, function processOneSheet_1(element, _b) {
-            var name_8, sheetId_1, rid, metadata, materializeMaxColumn, colStyleByColumn_1, _c, _d, _e, min, max, styleIndex, clampedMax, col, styleCellTemplates_1, getTemplateForStyleIndex, styleMaterializeBudget, mergeRangesByRow_1, getMergeRangeForCell, sheetComments, sheetThreadedComments_1, commentsByRow_1, threadsByRow_1, hyperlinksByRow, sparklinesByRow, dvFeatures, dvStamper, _f, _g, CHUNK_SIZE, chunkIndex_1, totalRowsProcessed_1, totalRowsKnown_1, lastRowIndex, currentChunk_1, currentChunkRowIndices_1, startRowIndex_1, endRowIndex_1, flushChunk, _loop_7, this_4, _h, _j, _k, e_37_1, _l, _m, trailing, payload, e_38_1, finalPayload;
-            var e_39, _o, e_38, _p;
+            var name_9, sheetId_1, rid, metadata, materializeMaxColumn, colStyleByColumn_1, _c, _d, _e, min, max, styleIndex, clampedMax, col, styleCellTemplates_1, getTemplateForStyleIndex, styleMaterializeBudget, mergeRangesByRow_1, getMergeRangeForCell, sheetComments, sheetThreadedComments_1, commentsByRow_1, threadsByRow_1, hyperlinksByRow, sparklinesByRow, dvFeatures, dvStamper, _f, _g, CHUNK_SIZE, chunkIndex_1, totalRowsProcessed_1, totalRowsKnown_1, lastRowIndex, currentChunk_1, currentChunkRowIndices_1, startRowIndex_1, endRowIndex_1, flushChunk, _loop_7, this_4, _h, _j, _k, e_39_1, _l, _m, trailing, payload, e_40_1, finalPayload;
+            var e_41, _o, e_40, _p;
             var _this = this;
-            var _q, e_37, _r, _s;
+            var _q, e_39, _r, _s;
             var _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
             var chunkSize = _b.chunkSize, enableCellXfsRegistry = _b.enableCellXfsRegistry, _enableSharedStrings = _b.enableSharedStrings, onPhase = _b.onPhase, currentSheetIndex = _b.currentSheetIndex, totalSheets = _b.totalSheets;
             return __generator(this, function (_5) {
@@ -4302,13 +4408,13 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         // Shared formulas (`si` ids) are sheet-local in OOXML; reset per sheet
                         // so one sheet's leaders never leak into another sheet's followers.
                         this.clearSharedFormula();
-                        name_8 = (_t = element.a$) === null || _t === void 0 ? void 0 : _t.name;
+                        name_9 = (_t = element.a$) === null || _t === void 0 ? void 0 : _t.name;
                         sheetId_1 = Number(element.a$.sheetId);
                         rid = element.a$["r:id"];
                         this.currentSheetTotalRows = undefined;
                         // The per-sheet scans below can be long and silent on large sheets;
                         // report phases so the host's inactivity watchdog sees liveness.
-                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-metadata", name_8);
+                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-metadata", name_9);
                         return [4 /*yield*/, __await(this.getSheetMetadata(rid))];
                     case 1:
                         metadata = _5.sent();
@@ -4323,12 +4429,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_39_1) { e_39 = { error: e_39_1 }; }
+                        catch (e_41_1) { e_41 = { error: e_41_1 }; }
                         finally {
                             try {
                                 if (_d && !_d.done && (_o = _c.return)) _o.call(_c);
                             }
-                            finally { if (e_39) throw e_39.error; }
+                            finally { if (e_41) throw e_41.error; }
                         }
                         styleCellTemplates_1 = new Map();
                         getTemplateForStyleIndex = function (styleIndex) {
@@ -4342,7 +4448,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         styleMaterializeBudget = STYLE_MATERIALIZE_CELL_BUDGET;
                         mergeRangesByRow_1 = this.buildMergeRangesByRow(metadata.merges);
                         getMergeRangeForCell = function (rowIndex, columnIndex) {
-                            var e_40, _a;
+                            var e_42, _a;
                             var ranges = mergeRangesByRow_1.get(rowIndex);
                             if (!ranges)
                                 return undefined;
@@ -4355,12 +4461,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                     }
                                 }
                             }
-                            catch (e_40_1) { e_40 = { error: e_40_1 }; }
+                            catch (e_42_1) { e_42 = { error: e_42_1 }; }
                             finally {
                                 try {
                                     if (ranges_1_1 && !ranges_1_1.done && (_a = ranges_1.return)) _a.call(ranges_1);
                                 }
-                                finally { if (e_40) throw e_40.error; }
+                                finally { if (e_42) throw e_42.error; }
                             }
                             return undefined;
                         };
@@ -4372,12 +4478,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         sheetThreadedComments_1 = _5.sent();
                         commentsByRow_1 = new Map();
                         threadsByRow_1 = new Map();
-                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-hyperlinks", name_8);
+                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-hyperlinks", name_9);
                         return [4 /*yield*/, __await(this.getHyperlinksForSheet(rid))];
                     case 4:
                         hyperlinksByRow = _5.sent();
-                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-sparklines", name_8);
-                        return [4 /*yield*/, __await(this.getSparklinesForSheet(rid, name_8))];
+                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-sparklines", name_9);
+                        return [4 /*yield*/, __await(this.getSparklinesForSheet(rid, name_9))];
                     case 5:
                         sparklinesByRow = _5.sent();
                         dvFeatures = this.sheetFeatures.get(rid);
@@ -4392,7 +4498,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _5.label = 8;
                     case 8:
                         dvStamper = _f;
-                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-rows", name_8);
+                        onPhase === null || onPhase === void 0 ? void 0 : onPhase("sheet-rows", name_9);
                         // Create comments by row. A cell whose comment is the legacy `tc=`
                         // shadow of an imported thread must NOT also get a plain note —
                         // the thread (stamped below via `commentThreadId`) supersedes it.
@@ -4436,7 +4542,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                             }
                             var result = {
                                 sheetId: sheetId_1,
-                                title: name_8,
+                                title: name_9,
                                 currentSheetIndex: currentSheetIndex,
                                 totalSheets: totalSheets,
                                 chunkIndex: chunkIndex_1,
@@ -4460,7 +4566,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _5.trys.push([9, 15, 16, 21]);
                         _loop_7 = function () {
                             var row, parsedRowIndex, rowIndex, rowData, rowAttrs, hasRowCustomFormat, parsedRowStyle, rowStyleIndex, getInheritedStyleIndex, cells, rowComments, rowThreads, rowHyperlinks, rowCellsByColumnIndex, cellArray, seqColIndex, cellArray_1, cellArray_1_1, cell, cellRef, columnIndex, colStr, inherited, k, cell, cellRef, columnIndex, colStr, mergeRange, cellValue, hyperlink, comment, threadId, columnIndex, inherited, template, _6, _7, _8, columnIndex, hyperlink, _9, _10, _11, columnIndex, text, _12, _13, _14, columnIndex, threadId, rowSparklines, _15, _16, _17, columnIndex, sparkline, existingCell, preserveGaps, sparklineData, selection, _18, startRowIndex_2, endRowIndex_2, startColumnIndex, endColumnIndex, col, cell, value, sparklineOptions, cellData, payload;
-                            var e_41, _19, e_42, _20, e_43, _21, e_44, _22, e_45, _23;
+                            var e_43, _19, e_44, _20, e_45, _21, e_46, _22, e_47, _23;
                             return __generator(this, function (_24) {
                                 switch (_24.label) {
                                     case 0:
@@ -4502,7 +4608,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                             cellArray = Array.isArray(cells) ? cells : [cells];
                                             seqColIndex = 1;
                                             try {
-                                                for (cellArray_1 = (e_41 = void 0, __values(cellArray)), cellArray_1_1 = cellArray_1.next(); !cellArray_1_1.done; cellArray_1_1 = cellArray_1.next()) {
+                                                for (cellArray_1 = (e_43 = void 0, __values(cellArray)), cellArray_1_1 = cellArray_1.next(); !cellArray_1_1.done; cellArray_1_1 = cellArray_1.next()) {
                                                     cell = cellArray_1_1.value;
                                                     if (!cell || !cell.a$) {
                                                         seqColIndex++;
@@ -4529,12 +4635,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     rowCellsByColumnIndex.set(columnIndex, cell);
                                                 }
                                             }
-                                            catch (e_41_1) { e_41 = { error: e_41_1 }; }
+                                            catch (e_43_1) { e_43 = { error: e_43_1 }; }
                                             finally {
                                                 try {
                                                     if (cellArray_1_1 && !cellArray_1_1.done && (_19 = cellArray_1.return)) _19.call(cellArray_1);
                                                 }
-                                                finally { if (e_41) throw e_41.error; }
+                                                finally { if (e_43) throw e_43.error; }
                                             }
                                             // Second pass: process each cell
                                             seqColIndex = 1;
@@ -4556,7 +4662,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     seqColIndex++;
                                                 }
                                                 mergeRange = getMergeRangeForCell(rowIndex, columnIndex);
-                                                cellValue = getCellValueAndFormat(cell, this_4, enableCellXfsRegistry, _enableSharedStrings, name_8, mergeRange
+                                                cellValue = getCellValueAndFormat(cell, this_4, enableCellXfsRegistry, _enableSharedStrings, name_9, mergeRange
                                                     ? { range: mergeRange, rowCellsByColumnIndex: rowCellsByColumnIndex }
                                                     : undefined);
                                                 hyperlink = rowHyperlinks === null || rowHyperlinks === void 0 ? void 0 : rowHyperlinks.get(columnIndex);
@@ -4608,7 +4714,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                         }
                                         if (rowHyperlinks) {
                                             try {
-                                                for (_6 = (e_42 = void 0, __values(rowHyperlinks.entries())), _7 = _6.next(); !_7.done; _7 = _6.next()) {
+                                                for (_6 = (e_44 = void 0, __values(rowHyperlinks.entries())), _7 = _6.next(); !_7.done; _7 = _6.next()) {
                                                     _8 = __read(_7.value, 2), columnIndex = _8[0], hyperlink = _8[1];
                                                     if (rowData.values[columnIndex]) {
                                                         if (!((_y = rowData.values[columnIndex]) === null || _y === void 0 ? void 0 : _y.hyperlink)) {
@@ -4620,18 +4726,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     }
                                                 }
                                             }
-                                            catch (e_42_1) { e_42 = { error: e_42_1 }; }
+                                            catch (e_44_1) { e_44 = { error: e_44_1 }; }
                                             finally {
                                                 try {
                                                     if (_7 && !_7.done && (_20 = _6.return)) _20.call(_6);
                                                 }
-                                                finally { if (e_42) throw e_42.error; }
+                                                finally { if (e_44) throw e_44.error; }
                                             }
                                             hyperlinksByRow.delete(rowIndex);
                                         }
                                         if (rowComments) {
                                             try {
-                                                for (_9 = (e_43 = void 0, __values(rowComments.entries())), _10 = _9.next(); !_10.done; _10 = _9.next()) {
+                                                for (_9 = (e_45 = void 0, __values(rowComments.entries())), _10 = _9.next(); !_10.done; _10 = _9.next()) {
                                                     _11 = __read(_10.value, 2), columnIndex = _11[0], text = _11[1];
                                                     if (rowData.values[columnIndex]) {
                                                         if (!((_z = rowData.values[columnIndex]) === null || _z === void 0 ? void 0 : _z.note)) {
@@ -4643,18 +4749,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     }
                                                 }
                                             }
-                                            catch (e_43_1) { e_43 = { error: e_43_1 }; }
+                                            catch (e_45_1) { e_45 = { error: e_45_1 }; }
                                             finally {
                                                 try {
                                                     if (_10 && !_10.done && (_21 = _9.return)) _21.call(_9);
                                                 }
-                                                finally { if (e_43) throw e_43.error; }
+                                                finally { if (e_45) throw e_45.error; }
                                             }
                                             commentsByRow_1.delete(rowIndex);
                                         }
                                         if (rowThreads) {
                                             try {
-                                                for (_12 = (e_44 = void 0, __values(rowThreads.entries())), _13 = _12.next(); !_13.done; _13 = _12.next()) {
+                                                for (_12 = (e_46 = void 0, __values(rowThreads.entries())), _13 = _12.next(); !_13.done; _13 = _12.next()) {
                                                     _14 = __read(_13.value, 2), columnIndex = _14[0], threadId = _14[1];
                                                     if (rowData.values[columnIndex]) {
                                                         if (!((_0 = rowData.values[columnIndex]) === null || _0 === void 0 ? void 0 : _0.commentThreadId)) {
@@ -4668,19 +4774,19 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     }
                                                 }
                                             }
-                                            catch (e_44_1) { e_44 = { error: e_44_1 }; }
+                                            catch (e_46_1) { e_46 = { error: e_46_1 }; }
                                             finally {
                                                 try {
                                                     if (_13 && !_13.done && (_22 = _12.return)) _22.call(_12);
                                                 }
-                                                finally { if (e_44) throw e_44.error; }
+                                                finally { if (e_46) throw e_46.error; }
                                             }
                                             threadsByRow_1.delete(rowIndex);
                                         }
                                         rowSparklines = sparklinesByRow.get(rowIndex);
                                         if (rowSparklines) {
                                             try {
-                                                for (_15 = (e_45 = void 0, __values(rowSparklines.entries())), _16 = _15.next(); !_16.done; _16 = _15.next()) {
+                                                for (_15 = (e_47 = void 0, __values(rowSparklines.entries())), _16 = _15.next(); !_16.done; _16 = _15.next()) {
                                                     _17 = __read(_16.value, 2), columnIndex = _17[0], sparkline = _17[1];
                                                     existingCell = rowData.values[columnIndex];
                                                     // Only set formula if cell doesn't already have one
@@ -4775,12 +4881,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                     rowData.values[columnIndex] = cellData;
                                                 }
                                             }
-                                            catch (e_45_1) { e_45 = { error: e_45_1 }; }
+                                            catch (e_47_1) { e_47 = { error: e_47_1 }; }
                                             finally {
                                                 try {
                                                     if (_16 && !_16.done && (_23 = _15.return)) _23.call(_15);
                                                 }
-                                                finally { if (e_45) throw e_45.error; }
+                                                finally { if (e_47) throw e_47.error; }
                                             }
                                             sparklinesByRow.delete(rowIndex);
                                         }
@@ -4815,8 +4921,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 10];
                     case 14: return [3 /*break*/, 21];
                     case 15:
-                        e_37_1 = _5.sent();
-                        e_37 = { error: e_37_1 };
+                        e_39_1 = _5.sent();
+                        e_39 = { error: e_39_1 };
                         return [3 /*break*/, 21];
                     case 16:
                         _5.trys.push([16, , 19, 20]);
@@ -4827,7 +4933,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _5.label = 18;
                     case 18: return [3 /*break*/, 20];
                     case 19:
-                        if (e_37) throw e_37.error;
+                        if (e_39) throw e_39.error;
                         return [7 /*endfinally*/];
                     case 20: return [7 /*endfinally*/];
                     case 21:
@@ -4860,14 +4966,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 23];
                     case 27: return [3 /*break*/, 30];
                     case 28:
-                        e_38_1 = _5.sent();
-                        e_38 = { error: e_38_1 };
+                        e_40_1 = _5.sent();
+                        e_40 = { error: e_40_1 };
                         return [3 /*break*/, 30];
                     case 29:
                         try {
                             if (_m && !_m.done && (_p = _l.return)) _p.call(_l);
                         }
-                        finally { if (e_38) throw e_38.error; }
+                        finally { if (e_40) throw e_40.error; }
                         return [7 /*endfinally*/];
                     case 30:
                         finalPayload = flushChunk(true);
@@ -4884,8 +4990,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.getDrawings = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var workSheets, allDrawings, workSheets_3, workSheets_3_1, element, sheetId, rid, features, sheet_data, drawings, _a, _b, _c, _d, e_46_1;
-            var e_46, _e;
+            var workSheets, allDrawings, workSheets_3, workSheets_3_1, element, sheetId, rid, features, sheet_data, drawings, _a, _b, _c, _d, e_48_1;
+            var e_48, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -4928,14 +5034,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_46_1 = _f.sent();
-                        e_46 = { error: e_46_1 };
+                        e_48_1 = _f.sent();
+                        e_48 = { error: e_48_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
                             if (workSheets_3_1 && !workSheets_3_1.done && (_e = workSheets_3.return)) _e.call(workSheets_3);
                         }
-                        finally { if (e_46) throw e_46.error; }
+                        finally { if (e_48) throw e_48.error; }
                         return [7 /*endfinally*/];
                     case 11: return [2 /*return*/, allDrawings];
                 }
@@ -4949,8 +5055,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
      */
     XlsxPlugin.prototype._getFormControls = function (rid, sheetId, sheetData) {
         return __awaiter(this, void 0, void 0, function () {
-            var controls, target, sheetPath, sheetRelPath, relTargets, sheetRels, _a, _b, list, _c, _d, rel, id, relTarget, _e, ctrlProps, controls_1, controls_1_1, control, relTarget, xml, _f, e_47_1, captions, legacyRelId, vmlTarget, _g, _h;
-            var e_48, _j, e_47, _k;
+            var controls, target, sheetPath, sheetRelPath, relTargets, sheetRels, _a, _b, list, _c, _d, rel, id, relTarget, _e, ctrlProps, controls_1, controls_1_1, control, relTarget, xml, _f, e_49_1, captions, legacyRelId, vmlTarget, _g, _h;
+            var e_50, _j, e_49, _k;
             var _l, _m;
             return __generator(this, function (_o) {
                 switch (_o.label) {
@@ -4962,7 +5068,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         sheetPath = target.startsWith("/xl")
                             ? target.replace(/^\//gi, "")
                             : "xl/".concat(target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(sheetPath);
                         relTargets = new Map();
                         _o.label = 1;
                     case 1:
@@ -4982,12 +5088,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_48_1) { e_48 = { error: e_48_1 }; }
+                        catch (e_50_1) { e_50 = { error: e_50_1 }; }
                         finally {
                             try {
                                 if (_d && !_d.done && (_j = _c.return)) _j.call(_c);
                             }
-                            finally { if (e_48) throw e_48.error; }
+                            finally { if (e_50) throw e_50.error; }
                         }
                         return [3 /*break*/, 4];
                     case 3:
@@ -5024,14 +5130,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 6];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_47_1 = _o.sent();
-                        e_47 = { error: e_47_1 };
+                        e_49_1 = _o.sent();
+                        e_49 = { error: e_49_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         try {
                             if (controls_1_1 && !controls_1_1.done && (_k = controls_1.return)) _k.call(controls_1);
                         }
-                        finally { if (e_47) throw e_47.error; }
+                        finally { if (e_49) throw e_49.error; }
                         return [7 /*endfinally*/];
                     case 14:
                         captions = new Map();
@@ -5056,50 +5162,95 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.getCharts = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var allCharts, workSheets, workSheets_4, workSheets_4_1, element, sheetId, rid, features, sheet_data, charts, e_49_1;
-            var e_49, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var allCharts, workSheets, workSheets_4, workSheets_4_1, element, sheetId, rid, _a, _b, _c, _d, features, sheet_data, charts, e_51_1, sheetTitleById, workSheets_5, workSheets_5_1, ws, id, pivotTables, _e;
+            var e_51, _f, e_52, _g;
+            var _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         allCharts = [];
                         workSheets = this._getSheets();
-                        _b.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _b.trys.push([1, 7, 8, 9]);
+                        _k.trys.push([1, 9, 10, 11]);
                         workSheets_4 = __values(workSheets), workSheets_4_1 = workSheets_4.next();
-                        _b.label = 2;
+                        _k.label = 2;
                     case 2:
-                        if (!!workSheets_4_1.done) return [3 /*break*/, 6];
+                        if (!!workSheets_4_1.done) return [3 /*break*/, 8];
                         element = workSheets_4_1.value;
                         sheetId = Number(element.a$.sheetId);
                         rid = element.a$["r:id"];
+                        if (!this.isChartsheet(rid)) return [3 /*break*/, 4];
+                        _b = (_a = allCharts.push).apply;
+                        _c = [allCharts];
+                        _d = [[]];
+                        return [4 /*yield*/, this.getChartsheetCharts(rid, sheetId)];
+                    case 3:
+                        _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_k.sent())]), false]))]));
+                        return [3 /*break*/, 7];
+                    case 4:
                         features = this.sheetFeatures.get(rid);
                         if (features && !features.drawing) {
-                            return [3 /*break*/, 5];
+                            return [3 /*break*/, 7];
                         }
                         return [4 /*yield*/, this.getSheetData(rid)];
-                    case 3:
-                        sheet_data = _b.sent();
+                    case 5:
+                        sheet_data = _k.sent();
                         return [4 /*yield*/, this._getCharts(rid, sheetId, sheet_data)];
-                    case 4:
-                        charts = _b.sent();
+                    case 6:
+                        charts = _k.sent();
                         allCharts.push.apply(allCharts, __spreadArray([], __read(charts), false));
-                        _b.label = 5;
-                    case 5:
+                        _k.label = 7;
+                    case 7:
                         workSheets_4_1 = workSheets_4.next();
                         return [3 /*break*/, 2];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_49_1 = _b.sent();
-                        e_49 = { error: e_49_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
+                    case 8: return [3 /*break*/, 11];
+                    case 9:
+                        e_51_1 = _k.sent();
+                        e_51 = { error: e_51_1 };
+                        return [3 /*break*/, 11];
+                    case 10:
                         try {
-                            if (workSheets_4_1 && !workSheets_4_1.done && (_a = workSheets_4.return)) _a.call(workSheets_4);
+                            if (workSheets_4_1 && !workSheets_4_1.done && (_f = workSheets_4.return)) _f.call(workSheets_4);
                         }
-                        finally { if (e_49) throw e_49.error; }
+                        finally { if (e_51) throw e_51.error; }
                         return [7 /*endfinally*/];
-                    case 9: return [2 /*return*/, allCharts];
+                    case 11:
+                        if (!allCharts.some(function (chart) {
+                            return chart.spec[PIVOT_SOURCE_NAME_KEY] !==
+                                undefined;
+                        })) return [3 /*break*/, 16];
+                        sheetTitleById = new Map();
+                        try {
+                            for (workSheets_5 = __values(workSheets), workSheets_5_1 = workSheets_5.next(); !workSheets_5_1.done; workSheets_5_1 = workSheets_5.next()) {
+                                ws = workSheets_5_1.value;
+                                id = Number((_h = ws.a$) === null || _h === void 0 ? void 0 : _h.sheetId);
+                                if (((_j = ws.a$) === null || _j === void 0 ? void 0 : _j.name) && Number.isFinite(id))
+                                    sheetTitleById.set(id, ws.a$.name);
+                            }
+                        }
+                        catch (e_52_1) { e_52 = { error: e_52_1 }; }
+                        finally {
+                            try {
+                                if (workSheets_5_1 && !workSheets_5_1.done && (_g = workSheets_5.return)) _g.call(workSheets_5);
+                            }
+                            finally { if (e_52) throw e_52.error; }
+                        }
+                        pivotTables = [];
+                        _k.label = 12;
+                    case 12:
+                        _k.trys.push([12, 14, , 15]);
+                        return [4 /*yield*/, this.getPivotTables()];
+                    case 13:
+                        pivotTables = _k.sent();
+                        return [3 /*break*/, 15];
+                    case 14:
+                        _e = _k.sent();
+                        return [3 /*break*/, 15];
+                    case 15:
+                        bindPivotChartsToPivotTables(allCharts, pivotTables, sheetTitleById);
+                        _k.label = 16;
+                    case 16: return [2 /*return*/, allCharts];
                 }
             });
         });
@@ -5112,8 +5263,17 @@ var XlsxPlugin = /** @class */ (function (_super) {
      */
     XlsxPlugin.prototype.getPivotTables = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var parsePivotTablesForSheet, all, workSheets, sheetNameToId, workSheets_5, workSheets_5_1, ws, name_9, id, pivotIdCounter, nextPivotId, workSheets_6, workSheets_6_1, element, sheetId, rid, target, path, sheetRelPath, sheetRelContent, _a, sheetRels, relList, relArray, pivotRels, pivots, e_50_1;
-            var e_51, _b, e_50, _c;
+            var _a;
+            return __generator(this, function (_b) {
+                (_a = this.pivotTablesPromise) !== null && _a !== void 0 ? _a : (this.pivotTablesPromise = this.parsePivotTables());
+                return [2 /*return*/, this.pivotTablesPromise];
+            });
+        });
+    };
+    XlsxPlugin.prototype.parsePivotTables = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var parsePivotTablesForSheet, all, workSheets, sheetNameToId, workSheets_6, workSheets_6_1, ws, name_10, id, pivotIdCounter, nextPivotId, workSheets_7, workSheets_7_1, element, sheetId, rid, target, path, sheetRelPath, sheetRelContent, _a, sheetRels, relList, relArray, pivotRels, pivots, e_53_1;
+            var e_54, _b, e_53, _c;
             var _d, _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -5124,31 +5284,31 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         workSheets = this._getSheets();
                         sheetNameToId = new Map();
                         try {
-                            for (workSheets_5 = __values(workSheets), workSheets_5_1 = workSheets_5.next(); !workSheets_5_1.done; workSheets_5_1 = workSheets_5.next()) {
-                                ws = workSheets_5_1.value;
-                                name_9 = (_d = ws.a$) === null || _d === void 0 ? void 0 : _d.name;
+                            for (workSheets_6 = __values(workSheets), workSheets_6_1 = workSheets_6.next(); !workSheets_6_1.done; workSheets_6_1 = workSheets_6.next()) {
+                                ws = workSheets_6_1.value;
+                                name_10 = (_d = ws.a$) === null || _d === void 0 ? void 0 : _d.name;
                                 id = Number((_e = ws.a$) === null || _e === void 0 ? void 0 : _e.sheetId);
-                                if (name_9 && Number.isFinite(id))
-                                    sheetNameToId.set(name_9, id);
+                                if (name_10 && Number.isFinite(id))
+                                    sheetNameToId.set(name_10, id);
                             }
                         }
-                        catch (e_51_1) { e_51 = { error: e_51_1 }; }
+                        catch (e_54_1) { e_54 = { error: e_54_1 }; }
                         finally {
                             try {
-                                if (workSheets_5_1 && !workSheets_5_1.done && (_b = workSheets_5.return)) _b.call(workSheets_5);
+                                if (workSheets_6_1 && !workSheets_6_1.done && (_b = workSheets_6.return)) _b.call(workSheets_6);
                             }
-                            finally { if (e_51) throw e_51.error; }
+                            finally { if (e_54) throw e_54.error; }
                         }
                         pivotIdCounter = 1;
                         nextPivotId = function () { return "imported-pivot-".concat(pivotIdCounter++); };
                         _g.label = 2;
                     case 2:
                         _g.trys.push([2, 11, 12, 13]);
-                        workSheets_6 = __values(workSheets), workSheets_6_1 = workSheets_6.next();
+                        workSheets_7 = __values(workSheets), workSheets_7_1 = workSheets_7.next();
                         _g.label = 3;
                     case 3:
-                        if (!!workSheets_6_1.done) return [3 /*break*/, 10];
-                        element = workSheets_6_1.value;
+                        if (!!workSheets_7_1.done) return [3 /*break*/, 10];
+                        element = workSheets_7_1.value;
                         sheetId = Number(element.a$.sheetId);
                         rid = element.a$["r:id"];
                         target = (_f = this.relations[rid]) === null || _f === void 0 ? void 0 : _f.target;
@@ -5157,7 +5317,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         path = target.startsWith("/xl")
                             ? target.replace(/^\//gi, "")
                             : "xl/".concat(target);
-                        sheetRelPath = path.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(path);
                         sheetRelContent = void 0;
                         _g.label = 4;
                     case 4:
@@ -5202,18 +5362,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         all.push.apply(all, __spreadArray([], __read(pivots), false));
                         _g.label = 9;
                     case 9:
-                        workSheets_6_1 = workSheets_6.next();
+                        workSheets_7_1 = workSheets_7.next();
                         return [3 /*break*/, 3];
                     case 10: return [3 /*break*/, 13];
                     case 11:
-                        e_50_1 = _g.sent();
-                        e_50 = { error: e_50_1 };
+                        e_53_1 = _g.sent();
+                        e_53 = { error: e_53_1 };
                         return [3 /*break*/, 13];
                     case 12:
                         try {
-                            if (workSheets_6_1 && !workSheets_6_1.done && (_c = workSheets_6.return)) _c.call(workSheets_6);
+                            if (workSheets_7_1 && !workSheets_7_1.done && (_c = workSheets_7.return)) _c.call(workSheets_7);
                         }
-                        finally { if (e_50) throw e_50.error; }
+                        finally { if (e_53) throw e_53.error; }
                         return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, all];
                 }
@@ -5230,8 +5390,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
      */
     XlsxPlugin.prototype.getPowerQuery = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var customXmlParts, connectionsXml, _a, _b, rel, type, itemPath, itemXml, propsXml, itemRelsPath, itemRels, _c, _d, relList, relArray, propsRel, propsPath, path, e_52_1, queryTables, _e, _f, element, rid, target, sheetPath, sheetRelsPath, sheetRels, _g, _h, relList, relArray, relArray_1, relArray_1_1, r, relType, tablePath, tableRelsPath, tableRels, _j, _k, tableRelList, tableRelArray, qtRel, qtPath, partXml, tableData, _l, _m, tableDefinition, attrs, tableTitle, colDefs, colArray, columns, e_53_1, e_54_1, parts;
-            var e_52, _o, e_54, _p, e_53, _q;
+            var customXmlParts, connectionsXml, _a, _b, rel, type, itemPath, itemXml, propsXml, itemRelsPath, itemRels, _c, _d, relList, relArray, propsRel, propsPath, path, e_55_1, queryTables, _e, _f, element, rid, target, sheetPath, sheetRelsPath, sheetRels, _g, _h, relList, relArray, relArray_1, relArray_1_1, r, relType, tablePath, tableRelsPath, tableRels, _j, _k, tableRelList, tableRelArray, qtRel, qtPath, partXml, tableData, _l, _m, tableDefinition, attrs, tableTitle, colDefs, colArray, columns, e_56_1, e_57_1, parts;
+            var e_55, _o, e_57, _p, e_56, _q;
             var _r, _s, _t, _u, _v, _w;
             return __generator(this, function (_x) {
                 switch (_x.label) {
@@ -5293,14 +5453,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 10: return [3 /*break*/, 13];
                     case 11:
-                        e_52_1 = _x.sent();
-                        e_52 = { error: e_52_1 };
+                        e_55_1 = _x.sent();
+                        e_55 = { error: e_55_1 };
                         return [3 /*break*/, 13];
                     case 12:
                         try {
                             if (_b && !_b.done && (_o = _a.return)) _o.call(_a);
                         }
-                        finally { if (e_52) throw e_52.error; }
+                        finally { if (e_55) throw e_55.error; }
                         return [7 /*endfinally*/];
                     case 13:
                         queryTables = [];
@@ -5329,7 +5489,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _x.label = 17;
                     case 17:
                         _x.trys.push([17, 24, 25, 26]);
-                        relArray_1 = (e_53 = void 0, __values(relArray)), relArray_1_1 = relArray_1.next();
+                        relArray_1 = (e_56 = void 0, __values(relArray)), relArray_1_1 = relArray_1.next();
                         _x.label = 18;
                     case 18:
                         if (!!relArray_1_1.done) return [3 /*break*/, 23];
@@ -5391,28 +5551,28 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 18];
                     case 23: return [3 /*break*/, 26];
                     case 24:
-                        e_53_1 = _x.sent();
-                        e_53 = { error: e_53_1 };
+                        e_56_1 = _x.sent();
+                        e_56 = { error: e_56_1 };
                         return [3 /*break*/, 26];
                     case 25:
                         try {
                             if (relArray_1_1 && !relArray_1_1.done && (_q = relArray_1.return)) _q.call(relArray_1);
                         }
-                        finally { if (e_53) throw e_53.error; }
+                        finally { if (e_56) throw e_56.error; }
                         return [7 /*endfinally*/];
                     case 26:
                         _f = _e.next();
                         return [3 /*break*/, 15];
                     case 27: return [3 /*break*/, 30];
                     case 28:
-                        e_54_1 = _x.sent();
-                        e_54 = { error: e_54_1 };
+                        e_57_1 = _x.sent();
+                        e_57 = { error: e_57_1 };
                         return [3 /*break*/, 30];
                     case 29:
                         try {
                             if (_f && !_f.done && (_p = _e.return)) _p.call(_e);
                         }
-                        finally { if (e_54) throw e_54.error; }
+                        finally { if (e_57) throw e_57.error; }
                         return [7 /*endfinally*/];
                     case 30:
                         parts = {};
@@ -5429,8 +5589,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.getConditionalFormatting = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var conditionalFormatting, _a, _b, element, _c, _d, _e, _f, e_55_1;
-            var e_55, _g;
+            var conditionalFormatting, _a, _b, element, _c, _d, _e, _f, e_58_1;
+            var e_58, _g;
             return __generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
@@ -5455,14 +5615,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_55_1 = _h.sent();
-                        e_55 = { error: e_55_1 };
+                        e_58_1 = _h.sent();
+                        e_58 = { error: e_58_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                         }
-                        finally { if (e_55) throw e_55.error; }
+                        finally { if (e_58) throw e_58.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, conditionalFormatting];
                 }
@@ -5502,8 +5662,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.getDataValidations = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var dataValidations, _a, _b, element, _c, _d, _e, _f, e_56_1;
-            var e_56, _g;
+            var dataValidations, _a, _b, element, _c, _d, _e, _f, e_59_1;
+            var e_59, _g;
             return __generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
@@ -5528,14 +5688,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_56_1 = _h.sent();
-                        e_56 = { error: e_56_1 };
+                        e_59_1 = _h.sent();
+                        e_59 = { error: e_59_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                         }
-                        finally { if (e_56) throw e_56.error; }
+                        finally { if (e_59) throw e_59.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, dataValidations];
                 }
@@ -5600,7 +5760,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
     XlsxPlugin.prototype.getProperties = function () {
         return __awaiter(this, void 0, void 0, function () {
             var props, tryRead, coreXml, parsed, root, textOf_1, appXml, parsed, root, textOf, _a, _b, key;
-            var e_57, _c;
+            var e_60, _c;
             var _this = this;
             var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             return __generator(this, function (_r) {
@@ -5684,12 +5844,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_57_1) { e_57 = { error: e_57_1 }; }
+                        catch (e_60_1) { e_60 = { error: e_60_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_57) throw e_57.error; }
+                            finally { if (e_60) throw e_60.error; }
                         }
                         return [2 /*return*/, Object.keys(props).length ? props : undefined];
                 }
@@ -5705,8 +5865,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
     };
     XlsxPlugin.prototype.getSlicersForWorkbook = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var slicers, workbookRelsPath, workbookRelsContent, workbookRels, relationships, relationshipsArray, slicerRels, slicerCacheRels, toArray_1, slicerPathToSheetIds_2, addSlicerPath, slicerRels_1, slicerRels_1_1, slicerRel, target, workSheets, sheetRelContext, workSheets_7, workSheets_7_1, sheet, rid, currentSheetId, relation, sheetPath, sheetRelPath, sheetRelContent, sheetRels, sheetRelations, sheetRelationsArray, drawingRel, drawingPath, sheetSlicerRels, sheetSlicerRels_1, sheetSlicerRels_1_1, rel, target, _a, e_58_1, slicerCacheMap, slicerCacheRels_1, slicerCacheRels_1_1, cacheRel, cachePath, cacheContent, cacheXml, cacheDefinition, cacheName, title, extList, extArray, extArray_2, extArray_2_1, ext, tableSlicerCache, tableIdRaw, tableId, columnIndex, err_6, e_59_1, slicerPathToSheetIds_1, slicerPathToSheetIds_1_1, _b, slicerPath, linkedSheetIds, slicerContent, slicerXml, slicerDefinitionNode, slicerDefinition, slicerAttrs, cacheName, caption, cacheInfo, position, sheetId, workSheets_8, workSheets_8_1, sheet, currentSheetId, context, drawingContent, drawingXml, wsDr, anchors, firstSlicerAnchor, anchors_2, anchors_2_1, anchor, alternateContent, choices, graphicFrames, graphicFrames_1, graphicFrames_1_1, graphicFrame, graphicData, uri, isSlicerGraphic, nvGraphicFramePr, cNvPr, shapeName, e_60_1, slicer, err_7, e_61_1, err_8;
-            var e_62, _c, e_58, _d, e_63, _e, e_59, _f, e_64, _g, e_61, _h, e_60, _j, e_65, _k, e_66, _l;
+            var slicers, workbookRelsPath, workbookRelsContent, workbookRels, relationships, relationshipsArray, slicerRels, slicerCacheRels, toArray_1, slicerPathToSheetIds_2, addSlicerPath, slicerRels_1, slicerRels_1_1, slicerRel, target, workSheets, sheetRelContext, workSheets_8, workSheets_8_1, sheet, rid, currentSheetId, relation, sheetPath, sheetRelPath, sheetRelContent, sheetRels, sheetRelations, sheetRelationsArray, drawingRel, drawingPath, sheetSlicerRels, sheetSlicerRels_1, sheetSlicerRels_1_1, rel, target, _a, e_61_1, slicerCacheMap, slicerCacheRels_1, slicerCacheRels_1_1, cacheRel, cachePath, cacheContent, cacheXml, cacheDefinition, cacheName, title, extList, extArray, extArray_2, extArray_2_1, ext, tableSlicerCache, tableIdRaw, tableId, columnIndex, err_6, e_62_1, slicerPathToSheetIds_1, slicerPathToSheetIds_1_1, _b, slicerPath, linkedSheetIds, slicerContent, slicerXml, slicerDefinitionNode, slicerDefinition, slicerAttrs, cacheName, caption, cacheInfo, position, sheetId, workSheets_9, workSheets_9_1, sheet, currentSheetId, context, drawingContent, drawingXml, wsDr, anchors, firstSlicerAnchor, anchors_1, anchors_1_1, anchor, alternateContent, choices, graphicFrames, graphicFrames_1, graphicFrames_1_1, graphicFrame, graphicData, uri, isSlicerGraphic, nvGraphicFramePr, cNvPr, shapeName, e_63_1, slicer, err_7, e_64_1, err_8;
+            var e_65, _c, e_61, _d, e_66, _e, e_62, _f, e_67, _g, e_64, _h, e_63, _j, e_68, _k, e_69, _l;
             var _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
             return __generator(this, function (_0) {
                 switch (_0.label) {
@@ -5755,23 +5915,23 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 addSlicerPath(this.resolveSheetPath(target));
                             }
                         }
-                        catch (e_62_1) { e_62 = { error: e_62_1 }; }
+                        catch (e_65_1) { e_65 = { error: e_65_1 }; }
                         finally {
                             try {
                                 if (slicerRels_1_1 && !slicerRels_1_1.done && (_c = slicerRels_1.return)) _c.call(slicerRels_1);
                             }
-                            finally { if (e_62) throw e_62.error; }
+                            finally { if (e_65) throw e_65.error; }
                         }
                         workSheets = this._getSheets();
                         sheetRelContext = new Map();
                         _0.label = 3;
                     case 3:
                         _0.trys.push([3, 10, 11, 12]);
-                        workSheets_7 = __values(workSheets), workSheets_7_1 = workSheets_7.next();
+                        workSheets_8 = __values(workSheets), workSheets_8_1 = workSheets_8.next();
                         _0.label = 4;
                     case 4:
-                        if (!!workSheets_7_1.done) return [3 /*break*/, 9];
-                        sheet = workSheets_7_1.value;
+                        if (!!workSheets_8_1.done) return [3 /*break*/, 9];
+                        sheet = workSheets_8_1.value;
                         rid = (_o = sheet === null || sheet === void 0 ? void 0 : sheet.a$) === null || _o === void 0 ? void 0 : _o["r:id"];
                         currentSheetId = Number((_p = sheet === null || sheet === void 0 ? void 0 : sheet.a$) === null || _p === void 0 ? void 0 : _p.sheetId);
                         if (!rid || Number.isNaN(currentSheetId))
@@ -5780,7 +5940,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         if (!(relation === null || relation === void 0 ? void 0 : relation.target))
                             return [3 /*break*/, 8];
                         sheetPath = this.resolveSheetPath(relation.target);
-                        sheetRelPath = sheetPath.replace("worksheets", "worksheets/_rels") + ".rels";
+                        sheetRelPath = getSheetRelsPath(sheetPath);
                         _0.label = 5;
                     case 5:
                         _0.trys.push([5, 7, , 8]);
@@ -5807,7 +5967,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 "http://schemas.microsoft.com/office/2007/relationships/slicer";
                         });
                         try {
-                            for (sheetSlicerRels_1 = (e_63 = void 0, __values(sheetSlicerRels)), sheetSlicerRels_1_1 = sheetSlicerRels_1.next(); !sheetSlicerRels_1_1.done; sheetSlicerRels_1_1 = sheetSlicerRels_1.next()) {
+                            for (sheetSlicerRels_1 = (e_66 = void 0, __values(sheetSlicerRels)), sheetSlicerRels_1_1 = sheetSlicerRels_1.next(); !sheetSlicerRels_1_1.done; sheetSlicerRels_1_1 = sheetSlicerRels_1.next()) {
                                 rel = sheetSlicerRels_1_1.value;
                                 target = (_r = rel === null || rel === void 0 ? void 0 : rel.a$) === null || _r === void 0 ? void 0 : _r.Target;
                                 if (!target)
@@ -5815,12 +5975,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 addSlicerPath(this.resolveRelationshipTarget(sheetRelPath, target), currentSheetId);
                             }
                         }
-                        catch (e_63_1) { e_63 = { error: e_63_1 }; }
+                        catch (e_66_1) { e_66 = { error: e_66_1 }; }
                         finally {
                             try {
                                 if (sheetSlicerRels_1_1 && !sheetSlicerRels_1_1.done && (_e = sheetSlicerRels_1.return)) _e.call(sheetSlicerRels_1);
                             }
-                            finally { if (e_63) throw e_63.error; }
+                            finally { if (e_66) throw e_66.error; }
                         }
                         return [3 /*break*/, 8];
                     case 7:
@@ -5828,18 +5988,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         // Sheet may not have a relationship part.
                         return [3 /*break*/, 8];
                     case 8:
-                        workSheets_7_1 = workSheets_7.next();
+                        workSheets_8_1 = workSheets_8.next();
                         return [3 /*break*/, 4];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_58_1 = _0.sent();
-                        e_58 = { error: e_58_1 };
+                        e_61_1 = _0.sent();
+                        e_61 = { error: e_61_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
-                            if (workSheets_7_1 && !workSheets_7_1.done && (_d = workSheets_7.return)) _d.call(workSheets_7);
+                            if (workSheets_8_1 && !workSheets_8_1.done && (_d = workSheets_8.return)) _d.call(workSheets_8);
                         }
-                        finally { if (e_58) throw e_58.error; }
+                        finally { if (e_61) throw e_61.error; }
                         return [7 /*endfinally*/];
                     case 12:
                         if (slicerPathToSheetIds_2.size === 0) {
@@ -5885,7 +6045,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         ]);
                         extArray = toArray_1(extList);
                         try {
-                            for (extArray_2 = (e_64 = void 0, __values(extArray)), extArray_2_1 = extArray_2.next(); !extArray_2_1.done; extArray_2_1 = extArray_2.next()) {
+                            for (extArray_2 = (e_67 = void 0, __values(extArray)), extArray_2_1 = extArray_2.next(); !extArray_2_1.done; extArray_2_1 = extArray_2.next()) {
                                 ext = extArray_2_1.value;
                                 tableSlicerCache = getWithFallback(ext, [
                                     "x15:tableSlicerCache",
@@ -5903,12 +6063,12 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_64_1) { e_64 = { error: e_64_1 }; }
+                        catch (e_67_1) { e_67 = { error: e_67_1 }; }
                         finally {
                             try {
                                 if (extArray_2_1 && !extArray_2_1.done && (_g = extArray_2.return)) _g.call(extArray_2);
                             }
-                            finally { if (e_64) throw e_64.error; }
+                            finally { if (e_67) throw e_67.error; }
                         }
                         return [3 /*break*/, 18];
                     case 17:
@@ -5920,14 +6080,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 14];
                     case 19: return [3 /*break*/, 22];
                     case 20:
-                        e_59_1 = _0.sent();
-                        e_59 = { error: e_59_1 };
+                        e_62_1 = _0.sent();
+                        e_62 = { error: e_62_1 };
                         return [3 /*break*/, 22];
                     case 21:
                         try {
                             if (slicerCacheRels_1_1 && !slicerCacheRels_1_1.done && (_f = slicerCacheRels_1.return)) _f.call(slicerCacheRels_1);
                         }
-                        finally { if (e_59) throw e_59.error; }
+                        finally { if (e_62) throw e_62.error; }
                         return [7 /*endfinally*/];
                     case 22:
                         _0.trys.push([22, 38, 39, 40]);
@@ -5970,11 +6130,11 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _0.label = 26;
                     case 26:
                         _0.trys.push([26, 32, 33, 34]);
-                        workSheets_8 = (e_60 = void 0, __values(workSheets)), workSheets_8_1 = workSheets_8.next();
+                        workSheets_9 = (e_63 = void 0, __values(workSheets)), workSheets_9_1 = workSheets_9.next();
                         _0.label = 27;
                     case 27:
-                        if (!!workSheets_8_1.done) return [3 /*break*/, 31];
-                        sheet = workSheets_8_1.value;
+                        if (!!workSheets_9_1.done) return [3 /*break*/, 31];
+                        sheet = workSheets_9_1.value;
                         currentSheetId = Number((_w = sheet === null || sheet === void 0 ? void 0 : sheet.a$) === null || _w === void 0 ? void 0 : _w.sheetId);
                         if (Number.isNaN(currentSheetId))
                             return [3 /*break*/, 30];
@@ -5996,8 +6156,8 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                 anchors = __spreadArray(__spreadArray([], __read(toArray_1(wsDr["xdr:oneCellAnchor"] || wsDr["oneCellAnchor"])), false), __read(toArray_1(wsDr["xdr:twoCellAnchor"] || wsDr["twoCellAnchor"])), false);
                                 firstSlicerAnchor = null;
                                 try {
-                                    for (anchors_2 = (e_65 = void 0, __values(anchors)), anchors_2_1 = anchors_2.next(); !anchors_2_1.done; anchors_2_1 = anchors_2.next()) {
-                                        anchor = anchors_2_1.value;
+                                    for (anchors_1 = (e_68 = void 0, __values(anchors)), anchors_1_1 = anchors_1.next(); !anchors_1_1.done; anchors_1_1 = anchors_1.next()) {
+                                        anchor = anchors_1_1.value;
                                         alternateContent = getWithFallback(anchor, [
                                             "mc:AlternateContent",
                                             "AlternateContent",
@@ -6013,7 +6173,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                             ]));
                                         })), false);
                                         try {
-                                            for (graphicFrames_1 = (e_66 = void 0, __values(graphicFrames)), graphicFrames_1_1 = graphicFrames_1.next(); !graphicFrames_1_1.done; graphicFrames_1_1 = graphicFrames_1.next()) {
+                                            for (graphicFrames_1 = (e_69 = void 0, __values(graphicFrames)), graphicFrames_1_1 = graphicFrames_1.next(); !graphicFrames_1_1.done; graphicFrames_1_1 = graphicFrames_1.next()) {
                                                 graphicFrame = graphicFrames_1_1.value;
                                                 graphicData = getWithFallback(graphicFrame, [
                                                     "a:graphic.a:graphicData",
@@ -6046,23 +6206,23 @@ var XlsxPlugin = /** @class */ (function (_super) {
                                                 }
                                             }
                                         }
-                                        catch (e_66_1) { e_66 = { error: e_66_1 }; }
+                                        catch (e_69_1) { e_69 = { error: e_69_1 }; }
                                         finally {
                                             try {
                                                 if (graphicFrames_1_1 && !graphicFrames_1_1.done && (_l = graphicFrames_1.return)) _l.call(graphicFrames_1);
                                             }
-                                            finally { if (e_66) throw e_66.error; }
+                                            finally { if (e_69) throw e_69.error; }
                                         }
                                         if (position)
                                             break;
                                     }
                                 }
-                                catch (e_65_1) { e_65 = { error: e_65_1 }; }
+                                catch (e_68_1) { e_68 = { error: e_68_1 }; }
                                 finally {
                                     try {
-                                        if (anchors_2_1 && !anchors_2_1.done && (_k = anchors_2.return)) _k.call(anchors_2);
+                                        if (anchors_1_1 && !anchors_1_1.done && (_k = anchors_1.return)) _k.call(anchors_1);
                                     }
-                                    finally { if (e_65) throw e_65.error; }
+                                    finally { if (e_68) throw e_68.error; }
                                 }
                                 if (!position && firstSlicerAnchor) {
                                     position = this.extractSlicerPosition(firstSlicerAnchor, currentSheetId);
@@ -6072,18 +6232,18 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         _0.label = 29;
                     case 29: return [3 /*break*/, 31];
                     case 30:
-                        workSheets_8_1 = workSheets_8.next();
+                        workSheets_9_1 = workSheets_9.next();
                         return [3 /*break*/, 27];
                     case 31: return [3 /*break*/, 34];
                     case 32:
-                        e_60_1 = _0.sent();
-                        e_60 = { error: e_60_1 };
+                        e_63_1 = _0.sent();
+                        e_63 = { error: e_63_1 };
                         return [3 /*break*/, 34];
                     case 33:
                         try {
-                            if (workSheets_8_1 && !workSheets_8_1.done && (_j = workSheets_8.return)) _j.call(workSheets_8);
+                            if (workSheets_9_1 && !workSheets_9_1.done && (_j = workSheets_9.return)) _j.call(workSheets_9);
                         }
-                        finally { if (e_60) throw e_60.error; }
+                        finally { if (e_63) throw e_63.error; }
                         return [7 /*endfinally*/];
                     case 34:
                         // Create default position if we couldn't find one
@@ -6125,14 +6285,14 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         return [3 /*break*/, 23];
                     case 37: return [3 /*break*/, 40];
                     case 38:
-                        e_61_1 = _0.sent();
-                        e_61 = { error: e_61_1 };
+                        e_64_1 = _0.sent();
+                        e_64 = { error: e_64_1 };
                         return [3 /*break*/, 40];
                     case 39:
                         try {
                             if (slicerPathToSheetIds_1_1 && !slicerPathToSheetIds_1_1.done && (_h = slicerPathToSheetIds_1.return)) _h.call(slicerPathToSheetIds_1);
                         }
-                        finally { if (e_61) throw e_61.error; }
+                        finally { if (e_64) throw e_64.error; }
                         return [7 /*endfinally*/];
                     case 40: return [3 /*break*/, 42];
                     case 41:
@@ -6164,6 +6324,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 var height = extAttributes.cy
                     ? Math.round(parseInt(String(extAttributes.cy), 10) / 9525)
                     : 300;
+                // A `oneCellAnchor` is "Move but don't size with cells" (#668 C-46)
                 return {
                     sheetId: sheetId,
                     overlayPosition: {
@@ -6175,6 +6336,7 @@ var XlsxPlugin = /** @class */ (function (_super) {
                         offsetYPixels: Math.round(rowOff / 9525),
                         widthPixels: width,
                         heightPixels: height,
+                        placement: "moveOnly",
                     },
                 };
             }
@@ -6188,21 +6350,26 @@ var XlsxPlugin = /** @class */ (function (_super) {
                 var rowOff = this.parseIntSafe(get(fromCell, "xdr:rowOff") || get(fromCell, "rowOff"));
                 var toCol = this.parseIntSafe(get(toCell, "xdr:col") || get(toCell, "col"));
                 var toRow = this.parseIntSafe(get(toCell, "xdr:row") || get(toCell, "row"));
+                var toColOff = this.parseIntSafe(get(toCell, "xdr:colOff") || get(toCell, "colOff"));
+                var toRowOff = this.parseIntSafe(get(toCell, "xdr:rowOff") || get(toCell, "rowOff"));
                 // Estimate size based on cell span
                 var width = Math.max((toCol - col) * 64, 100);
                 var height = Math.max((toRow - row) * 20, 100);
+                // `editAs` is the slicer's placement mode; a plain twoCellAnchor
+                // keeps `to` as the second anchor like a chart (#668 C-46)
+                var placement = anchorPlacementFromEditAs(get(anchor, "a$.editAs"));
                 return {
                     sheetId: sheetId,
-                    overlayPosition: {
-                        anchorCell: {
+                    overlayPosition: __assign({ anchorCell: {
                             rowIndex: row + 1,
                             columnIndex: col + 1,
-                        },
-                        offsetXPixels: Math.round(colOff / 9525),
-                        offsetYPixels: Math.round(rowOff / 9525),
-                        widthPixels: width,
-                        heightPixels: height,
-                    },
+                        }, offsetXPixels: Math.round(colOff / 9525), offsetYPixels: Math.round(rowOff / 9525), widthPixels: width, heightPixels: height }, (placement === "moveAndSize"
+                        ? {
+                            toCell: { rowIndex: toRow + 1, columnIndex: toCol + 1 },
+                            toOffsetXPixels: Math.round(toColOff / 9525),
+                            toOffsetYPixels: Math.round(toRowOff / 9525),
+                        }
+                        : { placement: placement })),
                 };
             }
             return null;
@@ -6364,7 +6531,7 @@ var SHEET_PROTECTION_FLAGS = [
  * Mirrors `rnc-import`'s `read_sheet_protection`.
  */
 var readSheetProtectionAttrs = function (attrs) {
-    var e_67, _a;
+    var e_70, _a;
     var protection = {};
     try {
         for (var SHEET_PROTECTION_FLAGS_1 = __values(SHEET_PROTECTION_FLAGS), SHEET_PROTECTION_FLAGS_1_1 = SHEET_PROTECTION_FLAGS_1.next(); !SHEET_PROTECTION_FLAGS_1_1.done; SHEET_PROTECTION_FLAGS_1_1 = SHEET_PROTECTION_FLAGS_1.next()) {
@@ -6375,12 +6542,12 @@ var readSheetProtectionAttrs = function (attrs) {
             }
         }
     }
-    catch (e_67_1) { e_67 = { error: e_67_1 }; }
+    catch (e_70_1) { e_70 = { error: e_70_1 }; }
     finally {
         try {
             if (SHEET_PROTECTION_FLAGS_1_1 && !SHEET_PROTECTION_FLAGS_1_1.done && (_a = SHEET_PROTECTION_FLAGS_1.return)) _a.call(SHEET_PROTECTION_FLAGS_1);
         }
-        finally { if (e_67) throw e_67.error; }
+        finally { if (e_70) throw e_70.error; }
     }
     if (attrs.password)
         protection.password = attrs.password;
@@ -6404,7 +6571,7 @@ var readSheetProtectionAttrs = function (attrs) {
  * (Excel writes one per element in practice).
  */
 var protectedRangesFromEntries = function (sheetId, entries) {
-    var e_68, _a;
+    var e_71, _a;
     var ranges = [];
     try {
         for (var entries_1 = __values(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
@@ -6424,12 +6591,12 @@ var protectedRangesFromEntries = function (sheetId, entries) {
             ranges.push(protectedRange);
         }
     }
-    catch (e_68_1) { e_68 = { error: e_68_1 }; }
+    catch (e_71_1) { e_71 = { error: e_71_1 }; }
     finally {
         try {
             if (entries_1_1 && !entries_1_1.done && (_a = entries_1.return)) _a.call(entries_1);
         }
-        finally { if (e_68) throw e_68.error; }
+        finally { if (e_71) throw e_71.error; }
     }
     return ranges;
 };
@@ -6453,7 +6620,7 @@ var xmlFloatOpt = function (value) {
     return Number.isFinite(n) ? n : undefined;
 };
 var stripUndefined = function (value) {
-    var e_69, _a;
+    var e_72, _a;
     try {
         for (var _b = __values(Object.keys(value)), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
@@ -6461,12 +6628,12 @@ var stripUndefined = function (value) {
                 delete value[key];
         }
     }
-    catch (e_69_1) { e_69 = { error: e_69_1 }; }
+    catch (e_72_1) { e_72 = { error: e_72_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_69) throw e_69.error; }
+        finally { if (e_72) throw e_72.error; }
     }
     return value;
 };