@rowsncolumns/toolkit 24.5.12 → 24.5.14

package/dist/cjs/exporter/xlsx/chart-builder.js

@@ -1,5 +1,5 @@
 import { __assign, __read, __spreadArray, __values } from "tslib";
-import { cellRangeToAddress, chartPaletteColorAt, sanitizeSheetName, } from "@rowsncolumns/utils";
+import { cellRangeToAddress, cellToAddress, chartPaletteColorAt, sanitizeSheetName, } from "@rowsncolumns/utils";
 import { XMLBuilder } from "fast-xml-parser";
 import { area_series, bubble_series, chart_template, column_json, column_series, donut_json, line_series, scatter_json, scatter_series, static_title, } from "./chart-templates";
 var XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>";
@@ -136,6 +136,24 @@ var formatSourcesRef = function (sources, sheetNameById) {
         .filter(function (ref) { return Boolean(ref); });
     return parts.length ? parts.join(",") : undefined;
 };
+/**
+ * The `<c:tx><c:strRef>` formula of a series whose name is linked to a
+ * header cell — `dataLabelSource` (a `SheetRange`), else the address an
+ * earlier import captured as `dataLabelRef`.
+ */
+var seriesLabelRef = function (entry, sheetNameById) {
+    var _a, _b;
+    return (_b = (_a = ((entry === null || entry === void 0 ? void 0 : entry.dataLabelSource)
+        ? formatCellRef(entry.dataLabelSource, sheetNameById)
+        : undefined)) !== null && _a !== void 0 ? _a : entry === null || entry === void 0 ? void 0 : entry.dataLabelRef) !== null && _b !== void 0 ? _b : undefined;
+};
+/** `'Sheet'!$B$1` — the absolute single-cell form Excel writes for a series name. */
+var formatCellRef = function (cell, sheetNameById) {
+    var sheetName = sheetNameById.get(cell.sheetId);
+    if (!sheetName)
+        return undefined;
+    return "".concat(sanitizeSheetName(sheetName), "!").concat(cellToAddress({ rowIndex: cell.startRowIndex, columnIndex: cell.startColumnIndex }, true, true));
+};
 var seriesCategoryRef = function (entry, sheetNameById) {
     return formatSourcesRef(entry === null || entry === void 0 ? void 0 : entry.categorySources, sheetNameById);
 };
@@ -806,8 +824,9 @@ var isComboChart = function (series, defaultChartType) {
 /**
  * Build a bar/column series node.
  */
-var buildBarSeriesNode = function (index, ref, seriesData, domainRef, sheetName, isFirstInGroup) {
+var buildBarSeriesNode = function (index, ref, seriesData, domainRef, sheetName, isFirstInGroup, sheetNameById) {
     var _a;
+    if (sheetNameById === void 0) { sheetNameById = new Map(); }
     var seriesNode = cloneTemplate(column_series);
     seriesNode["c:idx"] = { a$: { val: index.toString() } };
     seriesNode["c:order"] = { a$: { val: index.toString() } };
@@ -865,7 +884,7 @@ var buildBarSeriesNode = function (index, ref, seriesData, domainRef, sheetName,
         removeProp(seriesNode, "c:val");
         seriesNode["c:val"] = buildInlineNumLit(inlineValues);
     }
-    var labelNode = buildSeriesLabel((_a = seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabel) !== null && _a !== void 0 ? _a : undefined, sheetName, seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabelRef);
+    var labelNode = buildSeriesLabel((_a = seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabel) !== null && _a !== void 0 ? _a : undefined, sheetName, seriesLabelRef(seriesData, sheetNameById));
     if (labelNode) {
         seriesNode["c:tx"] = labelNode["c:tx"];
     }
@@ -880,9 +899,10 @@ var buildBarSeriesNode = function (index, ref, seriesData, domainRef, sheetName,
 /**
  * Build a line series node.
  */
-var buildLineSeriesNode = function (index, ref, seriesData, domainRef, sheetName, smooth, showMarkers) {
+var buildLineSeriesNode = function (index, ref, seriesData, domainRef, sheetName, smooth, showMarkers, sheetNameById) {
     var _a, _b;
     if (showMarkers === void 0) { showMarkers = false; }
+    if (sheetNameById === void 0) { sheetNameById = new Map(); }
     var seriesNode = cloneTemplate(line_series);
     seriesNode["c:idx"] = { a$: { val: index.toString() } };
     seriesNode["c:order"] = { a$: { val: index.toString() } };
@@ -926,7 +946,7 @@ var buildLineSeriesNode = function (index, ref, seriesData, domainRef, sheetName
     if (smooth) {
         seriesNode["c:smooth"].a$.val = "1";
     }
-    var labelNode = buildSeriesLabel((_b = seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabel) !== null && _b !== void 0 ? _b : undefined, sheetName, seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabelRef);
+    var labelNode = buildSeriesLabel((_b = seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabel) !== null && _b !== void 0 ? _b : undefined, sheetName, seriesLabelRef(seriesData, sheetNameById));
     if (labelNode) {
         seriesNode["c:tx"] = labelNode["c:tx"];
     }
@@ -935,8 +955,9 @@ var buildLineSeriesNode = function (index, ref, seriesData, domainRef, sheetName
 /**
  * Build an area series node.
  */
-var buildAreaSeriesNode = function (index, ref, seriesData, domainRef, sheetName) {
+var buildAreaSeriesNode = function (index, ref, seriesData, domainRef, sheetName, sheetNameById) {
     var _a, _b, _c;
+    if (sheetNameById === void 0) { sheetNameById = new Map(); }
     var seriesNode = cloneTemplate(area_series);
     seriesNode["c:idx"] = { a$: { val: index.toString() } };
     seriesNode["c:order"] = { a$: { val: index.toString() } };
@@ -966,7 +987,7 @@ var buildAreaSeriesNode = function (index, ref, seriesData, domainRef, sheetName
         removeProp(seriesNode, "c:cat");
     }
     seriesNode["c:val"]["c:numRef"]["c:f"] = ref;
-    var labelNode = buildSeriesLabel((_c = seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabel) !== null && _c !== void 0 ? _c : undefined, sheetName, seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabelRef);
+    var labelNode = buildSeriesLabel((_c = seriesData === null || seriesData === void 0 ? void 0 : seriesData.dataLabel) !== null && _c !== void 0 ? _c : undefined, sheetName, seriesLabelRef(seriesData, sheetNameById));
     if (labelNode) {
         seriesNode["c:tx"] = labelNode["c:tx"];
     }
@@ -979,9 +1000,10 @@ var buildAreaSeriesNode = function (index, ref, seriesData, domainRef, sheetName
  * remaining series, each with its own idx/order, name, category and value
  * reference.
  */
-var appendExtraCircularSeries = function (chartNode, groupKey, seriesRefs, seriesCatRefs, domainRef, series, sheetName) {
+var appendExtraCircularSeries = function (chartNode, groupKey, seriesRefs, seriesCatRefs, domainRef, series, sheetName, sheetNameById) {
     var e_7, _a;
-    var _b, _c, _d, _e, _f, _g, _h;
+    var _b, _c, _d, _e, _f, _g;
+    if (sheetNameById === void 0) { sheetNameById = new Map(); }
     var group = (_b = chartNode["c:plotArea"]) === null || _b === void 0 ? void 0 : _b[groupKey];
     if (!group)
         return;
@@ -1003,16 +1025,16 @@ var appendExtraCircularSeries = function (chartNode, groupKey, seriesRefs, serie
     }
     try {
         for (var extra_1 = __values(extra), extra_1_1 = extra_1.next(); !extra_1_1.done; extra_1_1 = extra_1.next()) {
-            var _j = extra_1_1.value, ref = _j.ref, index = _j.index;
+            var _h = extra_1_1.value, ref = _h.ref, index = _h.index;
             var node = {
                 "c:idx": { a$: { val: String(index) } },
                 "c:order": { a$: { val: String(index) } },
             };
-            var labelNode = buildSeriesLabel((_f = (_e = series[index]) === null || _e === void 0 ? void 0 : _e.dataLabel) !== null && _f !== void 0 ? _f : undefined, sheetName, (_g = series[index]) === null || _g === void 0 ? void 0 : _g.dataLabelRef);
+            var labelNode = buildSeriesLabel((_f = (_e = series[index]) === null || _e === void 0 ? void 0 : _e.dataLabel) !== null && _f !== void 0 ? _f : undefined, sheetName, seriesLabelRef(series[index], sheetNameById));
             if (labelNode) {
                 node["c:tx"] = labelNode["c:tx"];
             }
-            var catRef = (_h = seriesCatRefs[index]) !== null && _h !== void 0 ? _h : domainRef;
+            var catRef = (_g = seriesCatRefs[index]) !== null && _g !== void 0 ? _g : domainRef;
             if (catRef) {
                 node["c:cat"] = { "c:strRef": { "c:f": catRef } };
             }
@@ -1299,7 +1321,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
                     };
                     for (var i = 0; i < groupSeries.length; i++) {
                         var _14 = groupSeries[i], index = _14.index, ref = _14.ref, data = _14.data;
-                        var seriesNode = buildBarSeriesNode(index, ref, data, (_q = seriesCatRefs[index]) !== null && _q !== void 0 ? _q : domainRef, sheetName, i === 0);
+                        var seriesNode = buildBarSeriesNode(index, ref, data, (_q = seriesCatRefs[index]) !== null && _q !== void 0 ? _q : domainRef, sheetName, i === 0, sheetNameById);
                         barChartNode["c:ser"].push(seriesNode);
                     }
                     comboGroups.push(["c:barChart", barChartNode]);
@@ -1326,7 +1348,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
                     try {
                         for (var groupSeries_1 = (e_10 = void 0, __values(groupSeries)), groupSeries_1_1 = groupSeries_1.next(); !groupSeries_1_1.done; groupSeries_1_1 = groupSeries_1.next()) {
                             var _15 = groupSeries_1_1.value, index = _15.index, ref = _15.ref, data = _15.data;
-                            var seriesNode = buildLineSeriesNode(index, ref, data, (_r = seriesCatRefs[index]) !== null && _r !== void 0 ? _r : domainRef, sheetName, smooth, showMarkers);
+                            var seriesNode = buildLineSeriesNode(index, ref, data, (_r = seriesCatRefs[index]) !== null && _r !== void 0 ? _r : domainRef, sheetName, smooth, showMarkers, sheetNameById);
                             lineChartNode["c:ser"].push(seriesNode);
                         }
                     }
@@ -1350,7 +1372,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
                     try {
                         for (var groupSeries_2 = (e_11 = void 0, __values(groupSeries)), groupSeries_2_1 = groupSeries_2.next(); !groupSeries_2_1.done; groupSeries_2_1 = groupSeries_2.next()) {
                             var _16 = groupSeries_2_1.value, index = _16.index, ref = _16.ref, data = _16.data;
-                            var seriesNode = buildAreaSeriesNode(index, ref, data, (_s = seriesCatRefs[index]) !== null && _s !== void 0 ? _s : domainRef, sheetName);
+                            var seriesNode = buildAreaSeriesNode(index, ref, data, (_s = seriesCatRefs[index]) !== null && _s !== void 0 ? _s : domainRef, sheetName, sheetNameById);
                             areaChartNode["c:ser"].push(seriesNode);
                         }
                     }
@@ -1392,7 +1414,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
         bar["c:barDir"].a$.val = "col";
         var seriesContainer_1 = bar["c:ser"];
         seriesRefs.forEach(function (ref, index) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             if (!ref)
                 return;
             var seriesNode = cloneTemplate(column_series);
@@ -1417,7 +1439,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
                 };
             }
             seriesNode["c:val"]["c:numRef"]["c:f"] = ref;
-            var labelNode = buildSeriesLabel((_d = (_c = series[index]) === null || _c === void 0 ? void 0 : _c.dataLabel) !== null && _d !== void 0 ? _d : undefined, sheetNameById.get(chart.position.sheetId), (_e = series[index]) === null || _e === void 0 ? void 0 : _e.dataLabelRef);
+            var labelNode = buildSeriesLabel((_d = (_c = series[index]) === null || _c === void 0 ? void 0 : _c.dataLabel) !== null && _d !== void 0 ? _d : undefined, sheetNameById.get(chart.position.sheetId), seriesLabelRef(series[index], sheetNameById));
             if (labelNode) {
                 seriesNode["c:tx"] = labelNode["c:tx"];
             }
@@ -1495,7 +1517,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
             var enrichedSeries = index === 0 && !domainRef && (inlineDomainValues_1 === null || inlineDomainValues_1 === void 0 ? void 0 : inlineDomainValues_1.length)
                 ? __assign(__assign({}, series[index]), { inlineDomainValues: inlineDomainValues_1 })
                 : series[index];
-            var seriesNode = buildBarSeriesNode(index, ref !== null && ref !== void 0 ? ref : "", enrichedSeries, (_b = seriesCatRefs[index]) !== null && _b !== void 0 ? _b : domainRef, sheetNameById.get(chart.position.sheetId), index === 0);
+            var seriesNode = buildBarSeriesNode(index, ref !== null && ref !== void 0 ? ref : "", enrichedSeries, (_b = seriesCatRefs[index]) !== null && _b !== void 0 ? _b : domainRef, sheetNameById.get(chart.position.sheetId), index === 0, sheetNameById);
             seriesContainer_2.push(seriesNode);
         });
         chartSpace["c:chartSpace"]["c:chart"] = barChart;
@@ -1512,14 +1534,14 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
             ? buildOfPieChart(domainRef, valueRef, chartTitle, specAny, chartSubtitle)
             : buildPieChart(domainRef, valueRef, chartTitle, chartSubtitle);
         if (!isOfPie) {
-            appendExtraCircularSeries(pieChart, "c:pieChart", seriesRefs, seriesCatRefs, domainRef, series, sheetNameById.get(chart.position.sheetId));
+            appendExtraCircularSeries(pieChart, "c:pieChart", seriesRefs, seriesCatRefs, domainRef, series, sheetNameById.get(chart.position.sheetId), sheetNameById);
         }
         chartSpace["c:chartSpace"]["c:chart"] = pieChart;
     }
     else if (chartType === "doughnut") {
         var valueRef = seriesRefs.find(Boolean);
         var doughnutChart = buildDoughnutChart(domainRef, valueRef, chartTitle, chartSubtitle);
-        appendExtraCircularSeries(doughnutChart, "c:doughnutChart", seriesRefs, seriesCatRefs, domainRef, series, sheetNameById.get(chart.position.sheetId));
+        appendExtraCircularSeries(doughnutChart, "c:doughnutChart", seriesRefs, seriesCatRefs, domainRef, series, sheetNameById.get(chart.position.sheetId), sheetNameById);
         chartSpace["c:chartSpace"]["c:chart"] = doughnutChart;
     }
     else if (chartType === "radar") {
@@ -1562,7 +1584,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
         replacePlotAreaChartGroups(plotArea, [["c:lineChart", lineChartNode]]);
         var seriesContainer_3 = lineChartNode["c:ser"];
         seriesRefs.forEach(function (ref, index) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e;
             if (!ref)
                 return;
             var seriesNode = cloneTemplate(line_series);
@@ -1599,7 +1621,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
             else if (showMarkers_1) {
                 removeProp(seriesNode, "c:marker");
             }
-            var labelNode = buildSeriesLabel((_e = (_d = series[index]) === null || _d === void 0 ? void 0 : _d.dataLabel) !== null && _e !== void 0 ? _e : undefined, sheetNameById.get(chart.position.sheetId), (_f = series[index]) === null || _f === void 0 ? void 0 : _f.dataLabelRef);
+            var labelNode = buildSeriesLabel((_e = (_d = series[index]) === null || _d === void 0 ? void 0 : _d.dataLabel) !== null && _e !== void 0 ? _e : undefined, sheetNameById.get(chart.position.sheetId), seriesLabelRef(series[index], sheetNameById));
             if (labelNode) {
                 seriesNode["c:tx"] = labelNode["c:tx"];
             }
@@ -1630,7 +1652,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
         replacePlotAreaChartGroups(plotArea, [["c:areaChart", areaChartNode]]);
         var seriesContainer_4 = areaChartNode["c:ser"];
         seriesRefs.forEach(function (ref, index) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             if (!ref)
                 return;
             var seriesNode = cloneTemplate(area_series);
@@ -1656,7 +1678,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
                 removeProp(seriesNode, "c:cat");
             }
             seriesNode["c:val"]["c:numRef"]["c:f"] = ref;
-            var labelNode = buildSeriesLabel((_d = (_c = series[index]) === null || _c === void 0 ? void 0 : _c.dataLabel) !== null && _d !== void 0 ? _d : undefined, sheetNameById.get(chart.position.sheetId), (_e = series[index]) === null || _e === void 0 ? void 0 : _e.dataLabelRef);
+            var labelNode = buildSeriesLabel((_d = (_c = series[index]) === null || _c === void 0 ? void 0 : _c.dataLabel) !== null && _d !== void 0 ? _d : undefined, sheetNameById.get(chart.position.sheetId), seriesLabelRef(series[index], sheetNameById));
             if (labelNode) {
                 seriesNode["c:tx"] = labelNode["c:tx"];
             }
@@ -1709,7 +1731,7 @@ export var buildChartXml = function (input, sheetNameById, resolvePivotSourceNam
             else if (smooth) {
                 seriesNode["c:smooth"].a$.val = "1";
             }
-            var labelNode = buildSeriesLabel((_f = (_d = entry === null || entry === void 0 ? void 0 : entry.dataLabel) !== null && _d !== void 0 ? _d : (_e = bubbleLabelEntries_1[index]) === null || _e === void 0 ? void 0 : _e.dataLabel) !== null && _f !== void 0 ? _f : undefined, sheetNameById.get(chart.position.sheetId), entry === null || entry === void 0 ? void 0 : entry.dataLabelRef);
+            var labelNode = buildSeriesLabel((_f = (_d = entry === null || entry === void 0 ? void 0 : entry.dataLabel) !== null && _d !== void 0 ? _d : (_e = bubbleLabelEntries_1[index]) === null || _e === void 0 ? void 0 : _e.dataLabel) !== null && _f !== void 0 ? _f : undefined, sheetNameById.get(chart.position.sheetId), seriesLabelRef(entry, sheetNameById));
             if (labelNode) {
                 seriesNode["c:tx"] = labelNode["c:tx"];
             }

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

@@ -21,6 +21,8 @@ export declare const CHART_EX_GRAPHIC_URI = "http://schemas.microsoft.com/office
  * checked). Returns the `cx:chart` node or undefined for non-chartex anchors.
  */
 export declare function getChartExReferenceFromAnchor(anchor: any): any;
+/** Resolves an `_xlchart.v1.N` defined name (chartex ranges go through them) to its range. */
+export type ResolveChartExName = (name: string) => SheetRange | undefined;
 /**
  * Split a multi-column hierarchy range (Excel lays the treemap hierarchy out
  * as columns, top level first, leaf last) into `parentLabels` (one entry per
@@ -30,8 +32,17 @@ export declare const splitHierarchyRange: (range: SheetRange) => {
     parentLabels: SheetRange[];
     labels: SheetRange;
 };
-/** Parse a `cx:chartSpace` DOM into an `EmbeddedChart` spec (null when unsupported). */
-export declare function parseChartExSpec(chartSpaceDom: any, sheetId: number, resolveSheetId?: ResolveSheetId): EmbeddedChart["spec"] | null;
+/**
+ * Parse a `cx:chartSpace` DOM into an `EmbeddedChart` spec (null when
+ * unsupported). Every `<cx:series>` is a series — its name from `<cx:tx>`
+ * (linked to the header cell when it is a reference, #1100), its ranges from
+ * the `<cx:data>` block its `<cx:dataId>` names — and the per-type options
+ * come from `<cx:layoutPr>`: box & whisker visibility + quartile method,
+ * histogram binning, waterfall subtotals, treemap label layout
+ * (rowsncolumns/spreadsheet#1107). `resolveName` resolves the
+ * `_xlchart.v1.N` defined names Excel writes the ranges through.
+ */
+export declare function parseChartExSpec(chartSpaceDom: any, sheetId: number, resolveSheetId?: ResolveSheetId, resolveName?: ResolveChartExName): EmbeddedChart["spec"] | null;
 /** Resolve + parse one chartex part referenced from a drawing anchor. */
-export declare function processChartEx(chartTarget: string, drawingPath: string, anchor: any, sheetId: number, zipParser: StreamingZipParser, xmlParser: any, sheetDimensions?: SheetDimensions, resolveSheetId?: ResolveSheetId): Promise<EmbeddedChart | null>;
+export declare function processChartEx(chartTarget: string, drawingPath: string, anchor: any, sheetId: number, zipParser: StreamingZipParser, xmlParser: any, sheetDimensions?: SheetDimensions, resolveSheetId?: ResolveSheetId, resolveName?: ResolveChartExName): Promise<EmbeddedChart | null>;
 //# sourceMappingURL=chartex.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chartex.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/chartex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EACb,UAAU,EACX,MAAM,2BAA2B,CAAC;AAInC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,iBAAiB,mEACoC,CAAC;AACnE,eAAO,MAAM,oBAAoB,6DAC2B,CAAC;AAyB7D;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAoB9D;AA8BD;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,KAChB;IAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAalD,CAAC;AAWF,wFAAwF;AACxF,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,cAAc,GAC9B,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI,CA0D9B;AAED,yEAAyE;AACzE,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,kBAAkB,EAC7B,SAAS,EAAE,GAAG,EACd,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAsB/B"}
+{"version":3,"file":"chartex.d.ts","sourceRoot":"","sources":["../../../../../excel-parser/plugins/xlsx/chartex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EACb,UAAU,EACX,MAAM,2BAA2B,CAAC;AAInC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,iBAAiB,mEACoC,CAAC;AACnE,eAAO,MAAM,oBAAoB,6DAC2B,CAAC;AAyB7D;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAoB9D;AA6BD,8FAA8F;AAC9F,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,GAAG,SAAS,CAAC;AA0B1E;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,KAChB;IAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAalD,CAAC;AAgFF;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,cAAc,EAC/B,WAAW,CAAC,EAAE,kBAAkB,GAC/B,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI,CAyJ9B;AAED,yEAAyE;AACzE,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,kBAAkB,EAC7B,SAAS,EAAE,GAAG,EACd,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,CAAC,EAAE,cAAc,EAC/B,WAAW,CAAC,EAAE,kBAAkB,GAC/B,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA2B/B"}

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

@@ -66,19 +66,38 @@ export function getChartExReferenceFromAnchor(anchor) {
     }
     return undefined;
 }
-/** `layoutId` → engine chart type. Unknown layouts are not imported. */
-const CHART_TYPE_BY_LAYOUT = {
-    treemap: "treemap",
-    sunburst: "sunburst",
-    waterfall: "waterfall",
-    funnel: "funnel",
-    boxWhisker: "boxplot",
-    // `clusteredColumn` is a histogram / pareto only when it carries `<cx:binning>`.
+/**
+ * `layoutId` → engine chart type (+ `sourceChartType`). `clusteredColumn` is
+ * a histogram only when it carries `<cx:binning>` (else Excel's plain column
+ * fallback); `paretoLine` is the cumulative line of a Pareto histogram, not a
+ * chart of its own. Unknown layouts are not imported.
+ */
+const chartKindOf = (layoutId, hasBinning) => {
+    switch (layoutId) {
+        case "treemap":
+        case "sunburst":
+        case "waterfall":
+        case "funnel":
+            return { chartType: layoutId };
+        case "boxWhisker":
+            return { chartType: "boxplot" };
+        case "regionMap":
+            return { chartType: "regionMap", sourceChartType: "REGION_MAP" };
+        case "clusteredColumn":
+            return { chartType: hasBinning ? "histogram" : "column" };
+        default:
+            return undefined;
+    }
 };
-const sourcesFromRef = (ref, hostSheetId, resolveSheetId) => {
+const sourcesFromRef = (ref, hostSheetId, resolveSheetId, resolveName) => {
     if (!ref)
         return [];
-    const selections = generateSelectionsFromFormula(`=${ref}`);
+    const trimmed = ref.trim();
+    if (/^_xlchart/i.test(trimmed)) {
+        const range = resolveName?.(trimmed);
+        return range ? [range] : [];
+    }
+    const selections = generateSelectionsFromFormula(`=${trimmed}`);
     return selections.map((sel) => ({
         ...sel.range,
         sheetId: (sel.sheetName ? resolveSheetId?.(sel.sheetName) : undefined) ??
@@ -111,64 +130,259 @@ const dimensionRef = (data, dimTag, type) => {
     const f = child(dim, "f");
     return textOf(Array.isArray(f) ? f[0] : f)?.trim() || undefined;
 };
-/** Parse a `cx:chartSpace` DOM into an `EmbeddedChart` spec (null when unsupported). */
-export function parseChartExSpec(chartSpaceDom, sheetId, resolveSheetId) {
+const flagOf = (node, name) => {
+    const raw = get(node, `a$.${name}`);
+    if (raw === undefined || raw === null)
+        return undefined;
+    return raw === "1" || raw === 1 || raw === "true" || raw === true;
+};
+const numberOf = (raw) => {
+    if (raw === undefined || raw === null || raw === "")
+        return undefined;
+    const n = Number(raw);
+    return Number.isFinite(n) ? n : undefined;
+};
+/** `<cx:spPr><a:solidFill><a:srgbClr val>` → `#RRGGBB` (the series or Pareto line fill). */
+const colorOf = (series) => {
+    const spPr = child(series, "spPr");
+    if (!spPr)
+        return undefined;
+    const walk = (node) => {
+        if (!node || typeof node !== "object")
+            return undefined;
+        for (const key of Object.keys(node)) {
+            const local = key.includes(":") ? key.slice(key.indexOf(":") + 1) : key;
+            const value = node[key];
+            if (local === "srgbClr") {
+                const first = Array.isArray(value) ? value[0] : value;
+                const val = get(first, "a$.val");
+                if (typeof val === "string")
+                    return `#${val.toUpperCase()}`;
+            }
+            if (local !== "a$") {
+                const found = walk(Array.isArray(value) ? value[0] : value);
+                if (found)
+                    return found;
+            }
+        }
+        return undefined;
+    };
+    return walk(spPr);
+};
+const CHART_EX_LABEL_POSITIONS = {
+    ctr: "center",
+    inBase: "insideBase",
+    inEnd: "insideEnd",
+    outEnd: "outsideEnd",
+    t: "above",
+    b: "below",
+    l: "left",
+    r: "right",
+    bestFit: "bestFit",
+};
+/** `<cx:dataLabels>` on a series → its `dataLabels`; every visibility flag off is `{ show: false }`. */
+const dataLabelsOf = (series) => {
+    const dl = child(series, "dataLabels");
+    if (!dl)
+        return undefined;
+    const vis = child(dl, "visibility");
+    const out = {};
+    if (flagOf(vis, "value") ?? true)
+        out.showValue = true;
+    if (flagOf(vis, "categoryName"))
+        out.showCategoryName = true;
+    if (flagOf(vis, "seriesName"))
+        out.showSeriesName = true;
+    const position = CHART_EX_LABEL_POSITIONS[String(get(dl, "a$.pos") ?? "")];
+    if (position)
+        out.position = position;
+    if (!Object.keys(out).length)
+        return { show: false };
+    return { show: true, ...out };
+};
+const singleCell = (range) => ({
+    ...range,
+    endRowIndex: range.startRowIndex,
+    endColumnIndex: range.startColumnIndex,
+});
+/**
+ * Parse a `cx:chartSpace` DOM into an `EmbeddedChart` spec (null when
+ * unsupported). Every `<cx:series>` is a series — its name from `<cx:tx>`
+ * (linked to the header cell when it is a reference, #1100), its ranges from
+ * the `<cx:data>` block its `<cx:dataId>` names — and the per-type options
+ * come from `<cx:layoutPr>`: box & whisker visibility + quartile method,
+ * histogram binning, waterfall subtotals, treemap label layout
+ * (rowsncolumns/spreadsheet#1107). `resolveName` resolves the
+ * `_xlchart.v1.N` defined names Excel writes the ranges through.
+ */
+export function parseChartExSpec(chartSpaceDom, sheetId, resolveSheetId, resolveName) {
     const chartSpace = child(chartSpaceDom, "chartSpace") ?? chartSpaceDom;
     const chart = child(chartSpace, "chart");
     if (!chart)
         return null;
     const region = child(child(chart, "plotArea"), "plotAreaRegion");
-    const series = asArray(child(region, "series"))[0];
-    if (!series)
+    const allSeries = asArray(child(region, "series"));
+    const dataSeries = allSeries.filter((series) => String(get(series, "a$.layoutId") ?? "") !== "paretoLine");
+    const paretoLine = allSeries.find((series) => String(get(series, "a$.layoutId") ?? "") === "paretoLine");
+    const first = dataSeries[0];
+    if (!first)
         return null;
-    const layoutId = String(get(series, "a$.layoutId") ?? "");
+    const layoutId = String(get(first, "a$.layoutId") ?? "");
     // Excel nests `<cx:binning>` in `<cx:layoutPr>`; tolerate it directly on the series too.
-    const binning = child(child(series, "layoutPr"), "binning") ?? child(series, "binning");
-    const chartType = layoutId === "clusteredColumn" && binning
-        ? "histogram"
-        : CHART_TYPE_BY_LAYOUT[layoutId];
-    if (!chartType)
-        return null;
-    const dataId = String(get(child(series, "dataId"), "a$.val") ?? "0");
-    const data = asArray(child(child(chartSpace, "chartData"), "data")).find((d) => String(get(d, "a$.id")) === dataId) ?? asArray(child(child(chartSpace, "chartData"), "data"))[0];
-    if (!data)
+    const layoutPr = child(first, "layoutPr");
+    const binning = child(layoutPr, "binning") ?? child(first, "binning");
+    const kind = chartKindOf(layoutId, Boolean(binning));
+    if (!kind)
         return null;
+    const { chartType } = kind;
+    const hierarchy = chartType === "treemap" || chartType === "sunburst";
+    const dataBlocks = asArray(child(child(chartSpace, "chartData"), "data"));
+    const blockFor = (series) => {
+        const dataId = String(get(child(series, "dataId"), "a$.val") ?? "0");
+        return (dataBlocks.find((d) => String(get(d, "a$.id")) === dataId) ??
+            dataBlocks[0]);
+    };
+    const sources = (ref) => sourcesFromRef(ref, sheetId, resolveSheetId, resolveName);
     const title = textOf(child(child(child(child(chart, "title"), "tx"), "txData"), "v"));
-    const catRef = dimensionRef(data, "strDim", "cat");
-    const catSources = sourcesFromRef(catRef, sheetId, resolveSheetId);
-    if (chartType === "treemap" || chartType === "sunburst") {
-        const sizeRef = dimensionRef(data, "numDim", "size");
-        const sizeSources = sourcesFromRef(sizeRef, sheetId, resolveSheetId);
+    const spec = { chartType };
+    if (kind.sourceChartType)
+        spec.sourceChartType = kind.sourceChartType;
+    if (title)
+        spec.title = title;
+    if (hierarchy) {
+        const data = blockFor(first);
+        if (!data)
+            return null;
+        const catSources = sources(dimensionRef(data, "strDim", "cat"));
+        const sizeSources = sources(dimensionRef(data, "numDim", "size") ?? dimensionRef(data, "numDim", "val"));
         if (!catSources.length || !sizeSources.length)
             return null;
-        const hierarchy = splitHierarchyRange(catSources[0]);
-        return {
-            chartType,
-            ...(title ? { title } : {}),
-            labels: [chartData([hierarchy.labels])],
-            parentLabels: hierarchy.parentLabels.map((range) => chartData([range])),
-            sizeData: [chartData(sizeSources)],
-        };
-    }
-    const valRef = dimensionRef(data, "numDim", "val");
-    const valSources = sourcesFromRef(valRef, sheetId, resolveSheetId);
-    if (!valSources.length)
-        return null;
-    const spec = {
-        chartType,
-        ...(title ? { title } : {}),
-        series: [chartData(valSources)],
-        ...(catSources.length ? { domains: [chartData(catSources)] } : {}),
+        const hierarchyRanges = splitHierarchyRange(catSources[0]);
+        spec.labels = [chartData([hierarchyRanges.labels])];
+        spec.parentLabels = hierarchyRanges.parentLabels.map((range) => chartData([range]));
+        spec.sizeData = [chartData(sizeSources)];
+        spec.useFirstRowAsHeaders = false;
+        if (chartType === "treemap") {
+            const layout = String(get(child(layoutPr, "parentLabelLayout"), "a$.val") ?? "");
+            if (layout === "banner" || layout === "overlapping" || layout === "none") {
+                spec.parentLabelLayout = layout;
+            }
+        }
+    }
+    else {
+        const series = [];
+        let domains;
+        let chartDataLabels;
+        for (const entry of dataSeries) {
+            const data = blockFor(entry);
+            if (!data)
+                continue;
+            const valSources = sources(dimensionRef(data, "numDim", "val") ?? dimensionRef(data, "numDim", "size"));
+            if (!valSources.length)
+                continue;
+            const txData = child(child(entry, "tx"), "txData");
+            const nameRef = textOf(child(txData, "f"))?.trim();
+            const nameSource = nameRef ? sources(nameRef)[0] : undefined;
+            const item = {
+                dataLabel: textOf(child(txData, "v")) ?? `Series ${series.length + 1}`,
+                ...(nameSource ? { dataLabelSource: singleCell(nameSource) } : {}),
+                sources: valSources,
+            };
+            const color = colorOf(entry);
+            if (color)
+                item.color = color;
+            const labels = dataLabelsOf(entry);
+            if (labels) {
+                item.dataLabels = labels;
+                chartDataLabels ??= labels;
+            }
+            if (!domains) {
+                const catSources = sources(dimensionRef(data, "strDim", "cat"));
+                if (catSources.length)
+                    domains = [chartData(catSources)];
+            }
+            series.push(item);
+        }
+        if (!series.length)
+            return null;
+        spec.series = series;
+        if (domains)
+            spec.domains = domains;
+        if (chartDataLabels)
+            spec.dataLabels = chartDataLabels;
+    }
+    if (paretoLine) {
+        spec.sourceChartType = "PARETO";
+        const color = colorOf(paretoLine);
+        if (color)
+            spec.paretoLineColor = color;
+    }
+    if (chartType === "boxplot") {
+        const vis = child(layoutPr, "visibility");
+        if (flagOf(vis, "outliers") === false)
+            spec.showOutliers = false;
+        if (flagOf(vis, "meanMarker"))
+            spec.showMeanMarker = true;
+        if (flagOf(vis, "nonoutliers"))
+            spec.showInnerPoints = true;
+        if (flagOf(vis, "meanLine"))
+            spec.showMeanLine = true;
+        const method = String(get(child(layoutPr, "statistics"), "a$.quartileMethod") ?? "");
+        if (method === "inclusive" || method === "exclusive")
+            spec.quartileMethod = method;
+    }
+    if (binning) {
+        const binSize = numberOf(get(child(binning, "binSize"), "a$.val"));
+        if (binSize !== undefined && binSize > 0)
+            spec.binSize = binSize;
+        const binCount = numberOf(get(child(binning, "binCount"), "a$.val"));
+        if (binCount !== undefined && binCount >= 1)
+            spec.binCount = Math.round(binCount);
+        if (get(binning, "a$.intervalClosed") === "l")
+            spec.intervalClosed = "l";
+        const overflow = numberOf(get(binning, "a$.overflow"));
+        if (overflow !== undefined)
+            spec.overflow = overflow;
+        const underflow = numberOf(get(binning, "a$.underflow"));
+        if (underflow !== undefined)
+            spec.underflow = underflow;
+    }
+    if (chartType === "waterfall") {
+        const totals = asArray(child(child(layoutPr, "subtotals"), "idx"))
+            .map((idx) => numberOf(get(idx, "a$.val")))
+            .filter((n) => n !== undefined);
+        if (totals.length)
+            spec.totalIndices = totals;
+    }
+    // chartex writes `<cx:legend pos>` only when the legend is shown.
+    const legendPos = String(get(child(chart, "legend"), "a$.pos") ?? "");
+    spec.legend = {
+        position: { t: "top", b: "bottom", l: "left", r: "right", tr: "topRight" }[legendPos] ?? "none",
     };
-    if (chartType === "histogram") {
-        const binCount = Number(get(child(binning, "binCount"), "a$.val"));
-        if (Number.isFinite(binCount) && binCount > 0)
-            spec.binCount = binCount;
+    // Axes: the value axis' scale and gridlines, the category axis' gap (a fraction of the bar width).
+    for (const axis of asArray(child(child(chart, "plotArea"), "axis"))) {
+        const valScaling = child(axis, "valScaling");
+        if (valScaling) {
+            const options = {};
+            const min = numberOf(get(valScaling, "a$.min"));
+            const max = numberOf(get(valScaling, "a$.max"));
+            if (min !== undefined)
+                options.min = min;
+            if (max !== undefined)
+                options.max = max;
+            if (!child(axis, "majorGridlines"))
+                options.showMajorGridlines = false;
+            if (Object.keys(options).length)
+                spec.valueAxisOptions = options;
+        }
+        const gap = numberOf(get(child(axis, "catScaling"), "a$.gapWidth"));
+        if (gap !== undefined)
+            spec.gapWidth = Math.round(gap * 100);
     }
     return spec;
 }
 /** Resolve + parse one chartex part referenced from a drawing anchor. */
-export async function processChartEx(chartTarget, drawingPath, anchor, sheetId, zipParser, xmlParser, sheetDimensions, resolveSheetId) {
+export async function processChartEx(chartTarget, drawingPath, anchor, sheetId, zipParser, xmlParser, sheetDimensions, resolveSheetId, resolveName) {
     let chartPath = chartTarget;
     const drawingDir = drawingPath.substring(0, drawingPath.lastIndexOf("/"));
     if (chartPath.startsWith("/")) {
@@ -189,7 +403,7 @@ export async function processChartEx(chartTarget, drawingPath, anchor, sheetId,
     }
     if (!content)
         return null;
-    const spec = parseChartExSpec(xmlParser.parse(content), sheetId, resolveSheetId);
+    const spec = parseChartExSpec(xmlParser.parse(content), sheetId, resolveSheetId, resolveName);
     if (!spec)
         return null;
     const position = extractChartPosition(anchor, sheetId, sheetDimensions);