@rowsncolumns/toolkit 24.4.2 → 24.4.3

package/dist/cjs/exporter/xlsx/chart-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/chart-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EAEd,MAAM,2BAA2B,CAAC;AAovCnC,eAAO,MAAM,aAAa,GACxB,OAAO,aAAa,EACpB,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KACjC,MAAM,GAAG,SAsnBX,CAAC"}
+{"version":3,"file":"chart-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/chart-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EAEd,MAAM,2BAA2B,CAAC;AAovCnC,eAAO,MAAM,aAAa,GACxB,OAAO,aAAa,EACpB,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KACjC,MAAM,GAAG,SAgoBX,CAAC"}

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

@@ -1565,6 +1565,12 @@ export var buildChartXml = function (chart, sheetNameById) {
     // chartType-agnostic and intentionally run last so per-type branches
     // don't have to know about them.
     applyChartFormatting(chartSpace, chart.spec, sheetNameById);
+    // 3-D / surface variants (sourceChartType BAR_3D, LINE_3D, PIE_3D,
+    // AREA_3D, SURFACE, SURFACE_3D) — swap the 2-D chart group for its
+    // OOXML 3-D element and add `<c:view3D>`. Runs after the formatting
+    // pass so data labels / overlays land in the container first and are
+    // carried across by the rename.
+    applyThreeDChartType(chartSpace["c:chartSpace"]["c:chart"], chart.spec.sourceChartType);
     // `<c:roundedCorners val="1"/>` lives at the chartSpace root (sibling
     // of `<c:chart>`). Default per OOXML §21.2.2.183 is `false`; only
     // emit when the spec opted in so files imported without the element
@@ -1575,6 +1581,204 @@ export var buildChartXml = function (chart, sheetNameById) {
     var xml = chartBuilder.build(chartSpace);
     return "".concat(XML_DECLARATION).concat(xml);
 };
+// -------------------------- 3-D / surface --------------------------
+/** Series-axis id for the 3-D chart groups that take a third axis. */
+var SER_AX_ID = "1789284465";
+/**
+ * How each 3-D class maps onto its 2-D chart group: which container it
+ * replaces, the element it becomes, and how many `<c:axId>` refs the
+ * schema wants (0 = no axes, 3 = adds a series axis).
+ */
+var THREE_D_CHART_GROUPS = {
+    BAR_3D: { from: "c:barChart", to: "c:bar3DChart", axes: 2 },
+    LINE_3D: { from: "c:lineChart", to: "c:line3DChart", axes: 3 },
+    PIE_3D: { from: "c:pieChart", to: "c:pie3DChart", axes: 0 },
+    AREA_3D: { from: "c:areaChart", to: "c:area3DChart", axes: 2 },
+    SURFACE: { from: "c:areaChart", to: "c:surfaceChart", axes: 2 },
+    SURFACE_3D: { from: "c:areaChart", to: "c:surface3DChart", axes: 3 },
+};
+var normalizeThreeDToken = function (value) {
+    if (typeof value !== "string")
+        return undefined;
+    var token = value.trim().toUpperCase();
+    return token in THREE_D_CHART_GROUPS ? token : undefined;
+};
+/** Copy `keys` (in order) from `source` into `target`, skipping absent ones. */
+var pickKeys = function (target, source, keys) {
+    var e_6, _a;
+    try {
+        for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+            var key = keys_1_1.value;
+            if (source[key] !== undefined)
+                target[key] = source[key];
+        }
+    }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    finally {
+        try {
+            if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+        }
+        finally { if (e_6) throw e_6.error; }
+    }
+};
+/**
+ * Rebuild the 2-D chart group as its 3-D element with the CT_*3DChart
+ * child sequence. Element order matters to Excel, so each shape is
+ * written out explicitly rather than renaming the key in place:
+ *   bar3DChart:     barDir, grouping, varyColors, ser, dLbls, gapWidth, shape, axId
+ *   line3DChart:    grouping, varyColors, ser, dLbls, axId×3
+ *   pie3DChart:     varyColors, ser, dLbls
+ *   area3DChart:    grouping, varyColors, ser, dLbls, axId
+ *   surfaceChart:   wireframe, ser, axId          (surface3DChart: axId×3)
+ */
+var buildThreeDChartGroup = function (token, group, axIds) {
+    var node = {};
+    switch (token) {
+        case "BAR_3D":
+            pickKeys(node, group, ["c:barDir", "c:grouping", "c:varyColors"]);
+            pickKeys(node, group, ["c:ser", "c:dLbls", "c:gapWidth"]);
+            node["c:shape"] = { a$: { val: "box" } };
+            node["c:axId"] = axIds;
+            return node;
+        case "LINE_3D":
+        case "AREA_3D":
+            pickKeys(node, group, ["c:grouping", "c:varyColors", "c:ser", "c:dLbls"]);
+            node["c:axId"] = axIds;
+            return node;
+        case "PIE_3D":
+            pickKeys(node, group, ["c:varyColors", "c:ser", "c:dLbls"]);
+            return node;
+        case "SURFACE":
+        case "SURFACE_3D":
+            node["c:wireframe"] = { a$: { val: "0" } };
+            pickKeys(node, group, ["c:ser"]);
+            node["c:axId"] = axIds;
+            return node;
+    }
+};
+/** `<c:serAx>` for the 3-D groups whose schema takes a third (depth) axis. */
+var buildSerAxNode = function (valAxId) { return ({
+    "c:axId": { a$: { val: SER_AX_ID } },
+    "c:scaling": { "c:orientation": { a$: { val: "minMax" } } },
+    "c:delete": { a$: { val: "0" } },
+    "c:axPos": { a$: { val: "b" } },
+    "c:majorTickMark": { a$: { val: "out" } },
+    "c:minorTickMark": { a$: { val: "none" } },
+    "c:tickLblPos": { a$: { val: "nextTo" } },
+    "c:crossAx": { a$: { val: valAxId } },
+    "c:crosses": { a$: { val: "autoZero" } },
+}); };
+/** `<c:view3D>` — Excel's default camera for each class (CT_View3D order). */
+var buildView3DNode = function (token) {
+    if (token === "PIE_3D") {
+        return {
+            "c:rotX": { a$: { val: "30" } },
+            "c:rotY": { a$: { val: "0" } },
+            "c:rAngAx": { a$: { val: "0" } },
+        };
+    }
+    if (token === "SURFACE" || token === "SURFACE_3D") {
+        // Right-angle axes are not allowed on surfaces; use a perspective view.
+        return {
+            "c:rotX": { a$: { val: "15" } },
+            "c:rotY": { a$: { val: "20" } },
+            "c:rAngAx": { a$: { val: "0" } },
+            "c:perspective": { a$: { val: "30" } },
+        };
+    }
+    return {
+        "c:rotX": { a$: { val: "15" } },
+        "c:rotY": { a$: { val: "20" } },
+        "c:rAngAx": { a$: { val: "1" } },
+    };
+};
+/**
+ * Turn an assembled 2-D `<c:chart>` into its 3-D variant when the spec
+ * carries a 3-D `sourceChartType`: the chart group is swapped for the
+ * matching `c:*3DChart` / `c:surfaceChart` element, a `<c:serAx>` is
+ * added where the schema takes three axes, and `<c:view3D>` is inserted
+ * before `<c:plotArea>`. No-op for 2-D specs or when the token doesn't
+ * match the emitted chart group (the 2-D chart is left untouched).
+ */
+var applyThreeDChartType = function (chartNode, sourceChartType) {
+    var e_7, _a, e_8, _b, e_9, _c;
+    var _d, _e, _f, _g, _h, _j;
+    var token = normalizeThreeDToken(sourceChartType);
+    if (!token || !chartNode)
+        return;
+    var plotArea = chartNode["c:plotArea"];
+    if (!plotArea)
+        return;
+    var _k = THREE_D_CHART_GROUPS[token], from = _k.from, to = _k.to, axes = _k.axes;
+    var group = plotArea[from];
+    if (!group || Array.isArray(group))
+        return;
+    var existingAxIds = Array.isArray(group["c:axId"])
+        ? group["c:axId"]
+        : group["c:axId"]
+            ? [group["c:axId"]]
+            : [];
+    var valAxId = (_j = (_f = (_e = (_d = existingAxIds[1]) === null || _d === void 0 ? void 0 : _d.a$) === null || _e === void 0 ? void 0 : _e.val) !== null && _f !== void 0 ? _f : (_h = (_g = existingAxIds[0]) === null || _g === void 0 ? void 0 : _g.a$) === null || _h === void 0 ? void 0 : _h.val) !== null && _j !== void 0 ? _j : "0";
+    var axIds = axes === 3
+        ? __spreadArray(__spreadArray([], __read(existingAxIds.slice(0, 2)), false), [{ a$: { val: SER_AX_ID } }], false) : existingAxIds.slice(0, 2);
+    // Rebuild plotArea preserving element order, swapping the chart group
+    // and appending the series axis after the value axis when needed.
+    var rebuiltPlotArea = {};
+    try {
+        for (var _l = __values(Object.entries(plotArea)), _m = _l.next(); !_m.done; _m = _l.next()) {
+            var _o = __read(_m.value, 2), key = _o[0], value = _o[1];
+            if (key === from) {
+                rebuiltPlotArea[to] = buildThreeDChartGroup(token, group, axIds);
+                continue;
+            }
+            rebuiltPlotArea[key] = value;
+            if (key === "c:valAx" && axes === 3) {
+                rebuiltPlotArea["c:serAx"] = buildSerAxNode(valAxId);
+            }
+        }
+    }
+    catch (e_7_1) { e_7 = { error: e_7_1 }; }
+    finally {
+        try {
+            if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
+        }
+        finally { if (e_7) throw e_7.error; }
+    }
+    // Rebuild the chart node so `<c:view3D>` lands before `<c:plotArea>`.
+    var rebuiltChart = {};
+    try {
+        for (var _p = __values(Object.entries(chartNode)), _q = _p.next(); !_q.done; _q = _p.next()) {
+            var _r = __read(_q.value, 2), key = _r[0], value = _r[1];
+            if (key === "c:plotArea") {
+                rebuiltChart["c:view3D"] = buildView3DNode(token);
+                rebuiltChart[key] = rebuiltPlotArea;
+                continue;
+            }
+            rebuiltChart[key] = value;
+        }
+    }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+    finally {
+        try {
+            if (_q && !_q.done && (_b = _p.return)) _b.call(_p);
+        }
+        finally { if (e_8) throw e_8.error; }
+    }
+    try {
+        for (var _s = __values(Object.keys(chartNode)), _t = _s.next(); !_t.done; _t = _s.next()) {
+            var key = _t.value;
+            delete chartNode[key];
+        }
+    }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    finally {
+        try {
+            if (_t && !_t.done && (_c = _s.return)) _c.call(_s);
+        }
+        finally { if (e_9) throw e_9.error; }
+    }
+    Object.assign(chartNode, rebuiltChart);
+};
 // -------------------------- Phase 5 helpers --------------------------
 var LEGEND_POS = {
     top: "t",
@@ -1622,7 +1826,7 @@ var SERIES_CONTAINER_KEYS = [
  * matches the order emitted by the builder, so we index by position.
  */
 var applySeriesOverlays = function (plotArea, series, sheetNameById) {
-    var e_6, _a, e_7, _b;
+    var e_10, _a, e_11, _b;
     if (!Array.isArray(series) || !series.length)
         return;
     var seriesIndex = 0;
@@ -1637,7 +1841,7 @@ var applySeriesOverlays = function (plotArea, series, sheetNameById) {
                 continue;
             var list = Array.isArray(ser) ? ser : [ser];
             try {
-                for (var list_1 = (e_7 = void 0, __values(list)), list_1_1 = list_1.next(); !list_1_1.done; list_1_1 = list_1.next()) {
+                for (var list_1 = (e_11 = void 0, __values(list)), list_1_1 = list_1.next(); !list_1_1.done; list_1_1 = list_1.next()) {
                     var node = list_1_1.value;
                     var data = series[seriesIndex++];
                     if (!data)
@@ -1657,21 +1861,21 @@ var applySeriesOverlays = function (plotArea, series, sheetNameById) {
                     }
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_11_1) { e_11 = { error: e_11_1 }; }
             finally {
                 try {
                     if (list_1_1 && !list_1_1.done && (_b = list_1.return)) _b.call(list_1);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_11) throw e_11.error; }
             }
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    catch (e_10_1) { e_10 = { error: e_10_1 }; }
     finally {
         try {
             if (SERIES_CONTAINER_KEYS_1_1 && !SERIES_CONTAINER_KEYS_1_1.done && (_a = SERIES_CONTAINER_KEYS_1.return)) _a.call(SERIES_CONTAINER_KEYS_1);
         }
-        finally { if (e_6) throw e_6.error; }
+        finally { if (e_10) throw e_10.error; }
     }
 };
 var buildTrendlineNode = function (t) {

package/dist/cjs/exporter/xlsx/pivot-builder.d.ts

@@ -26,6 +26,14 @@
  * + ~100 lines in xlsx-export.ts) is the closest reference template.
  */
 import type { PivotTable } from "@rowsncolumns/spreadsheet";
+/**
+ * Distinct source fields a calculated-field formula references —
+ * single-quoted names (`'Unit Price'`, `''` escapes a quote) or bare
+ * identifiers; numeric literals (incl. `1e5`) and operators are skipped.
+ * Mirrors `@rowsncolumns/pivot`'s tokenizer without pulling in the
+ * DuckDB-backed pivot package.
+ */
+export declare const calculatedFieldReferences: (formula: string) => string[];
 /**
  * Build pivotCacheDefinition XML for a pivot. The cacheSource
  * points at the live worksheet range; `refreshOnLoad="1"` makes

package/dist/cjs/exporter/xlsx/pivot-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivot-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/pivot-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AA4D5D;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,GACvC,OAAO,UAAU,EACjB,WAAW,MAAM,EACjB,YAAY,MAAM,EAAE,KACnB,MAAM,GAAG,IAgCX,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,UAAU,EACjB,SAAS,MAAM,EACf,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAChC,MAAM,GAAG,IAkHX,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GACjC,UAAU,MAAM,EAChB,aAAa,MAAM,KAClB,MAcF,CAAC"}
+{"version":3,"file":"pivot-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/pivot-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,2BAA2B,CAAC;AAqBxE;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,KAAG,MAAM,EAYjE,CAAC;AA2DF;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,GACvC,OAAO,UAAU,EACjB,WAAW,MAAM,EACjB,YAAY,MAAM,EAAE,KACnB,MAAM,GAAG,IAuCX,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,UAAU,EACjB,SAAS,MAAM,EACf,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAChC,MAAM,GAAG,IA2JX,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GACjC,UAAU,MAAM,EAChB,aAAa,MAAM,KAClB,MAcF,CAAC"}

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

@@ -1,5 +1,55 @@
 import { __read, __spreadArray, __values } from "tslib";
 import { XMLBuilder } from "fast-xml-parser";
+/**
+ * `PivotValue.showAs` → `dataField@showDataAs` (ECMA-376) or, for the
+ * rank modes Excel only knows through its 2010 extension,
+ * `x14:dataField@pivotShowAs`.
+ */
+var SHOW_DATA_AS = {
+    pct_of_total: "percentOfTotal",
+    pct_of_row: "percentOfRow",
+    pct_of_column: "percentOfCol",
+    running_total: "runTotal",
+};
+var X14_PIVOT_SHOW_AS = {
+    rank_asc: "rankAscending",
+    rank_desc: "rankDescending",
+};
+var X14_DATA_FIELD_EXT_URI = "{E15A36E0-9728-4e99-A89B-3F7291B0FE68}";
+var X14_NS = "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";
+/**
+ * Distinct source fields a calculated-field formula references —
+ * single-quoted names (`'Unit Price'`, `''` escapes a quote) or bare
+ * identifiers; numeric literals (incl. `1e5`) and operators are skipped.
+ * Mirrors `@rowsncolumns/pivot`'s tokenizer without pulling in the
+ * DuckDB-backed pivot package.
+ */
+export var calculatedFieldReferences = function (formula) {
+    var e_1, _a;
+    var out = [];
+    var push = function (name) {
+        if (name && !out.includes(name))
+            out.push(name);
+    };
+    var re = /'((?:[^']|'')*)'|(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?|([A-Za-z_\u00C0-\uFFFF][A-Za-z0-9_.\u00C0-\uFFFF]*)/g;
+    try {
+        for (var _b = __values(formula.replace(/^\s*=/, "").matchAll(re)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var m = _c.value;
+            if (m[1] !== undefined)
+                push(m[1].replace(/''/g, "'"));
+            else if (m[2] !== undefined)
+                push(m[2]);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return out;
+};
 var xmlBuilder = new XMLBuilder({
     ignoreAttributes: false,
     attributeNamePrefix: "@_",
@@ -55,13 +105,19 @@ var aggToSubtotal = function (agg) {
  * @param fieldNames  All source column headers (becomes <cacheFields>)
  */
 export var buildPivotCacheDefinitionXml = function (pivot, sheetName, fieldNames) {
+    var _a;
     if (!pivot.source)
         return null;
     var sourceRef = rangeRef(pivot.source);
-    var cacheFields = fieldNames.map(function (name) { return ({
-        "@_name": name,
-        sharedItems: { "@_count": "0" },
-    }); });
+    // Calculated fields are cache fields too (`databaseField="0"` +
+    // `formula`), listed after the source columns like Excel does.
+    var calculatedByName = new Map(((_a = pivot.calculatedFields) !== null && _a !== void 0 ? _a : []).map(function (c) { return [c.name, c.formula]; }));
+    var cacheFields = fieldNames.map(function (name) {
+        var formula = calculatedByName.get(name);
+        return formula !== undefined
+            ? { "@_name": name, "@_formula": formula, "@_databaseField": "0" }
+            : { "@_name": name, sharedItems: { "@_count": "0" } };
+    });
     var doc = {
         "?xml": { "@_version": "1.0", "@_encoding": "UTF-8", "@_standalone": "yes" },
         pivotCacheDefinition: {
@@ -96,112 +152,155 @@ export var buildPivotCacheDefinitionXml = function (pivot, sheetName, fieldNames
  * @param fieldIndices  Maps row/col/value field names → cacheField indices
  */
 export var buildPivotTableXml = function (pivot, cacheId, fieldIndices) {
-    var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
-    var _e, _f, _g, _h, _j, _k, _l;
+    var e_2, _a, e_3, _b, e_4, _c, e_5, _d;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     if (!pivot.pivotRange)
         return null;
     var ref = rangeRef(pivot.pivotRange);
-    // pivotFields: one entry per cacheField, with axis attribute
-    // (axisRow / axisCol / dataField). Order = cacheField order.
+    // pivotFields: one entry per cacheField, with the axis attribute
+    // (axisRow / axisCol) and/or `dataField="1"` for value fields
+    // (`ST_Axis` has no "dataField" value — a field can sit on an axis
+    // AND be a data field). Order = cacheField order.
     var pivotFields = [];
     // We don't know the full field universe here without the source
     // schema. Best-effort: declare entries for the union of row/col/
     // value fields and tag with the appropriate axis.
     var fieldAxis = new Map();
     try {
-        for (var _m = __values((_e = pivot.rows) !== null && _e !== void 0 ? _e : []), _o = _m.next(); !_o.done; _o = _m.next()) {
-            var r = _o.value;
+        for (var _t = __values((_e = pivot.rows) !== null && _e !== void 0 ? _e : []), _u = _t.next(); !_u.done; _u = _t.next()) {
+            var r = _u.value;
             var idx = fieldIndices.get(r.field);
             if (idx != null)
                 fieldAxis.set(idx, "axisRow");
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
-            if (_o && !_o.done && (_a = _m.return)) _a.call(_m);
+            if (_u && !_u.done && (_a = _t.return)) _a.call(_t);
         }
-        finally { if (e_1) throw e_1.error; }
+        finally { if (e_2) throw e_2.error; }
     }
     try {
-        for (var _p = __values((_f = pivot.columns) !== null && _f !== void 0 ? _f : []), _q = _p.next(); !_q.done; _q = _p.next()) {
-            var c = _q.value;
+        for (var _v = __values((_f = pivot.columns) !== null && _f !== void 0 ? _f : []), _w = _v.next(); !_w.done; _w = _v.next()) {
+            var c = _w.value;
             var idx = fieldIndices.get(c.field);
             if (idx != null)
                 fieldAxis.set(idx, "axisCol");
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
     finally {
         try {
-            if (_q && !_q.done && (_b = _p.return)) _b.call(_p);
+            if (_w && !_w.done && (_b = _v.return)) _b.call(_v);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_3) throw e_3.error; }
     }
+    var dataFieldIndices = new Set();
     try {
-        for (var _r = __values((_g = pivot.values) !== null && _g !== void 0 ? _g : []), _s = _r.next(); !_s.done; _s = _r.next()) {
-            var v = _s.value;
+        for (var _x = __values((_g = pivot.values) !== null && _g !== void 0 ? _g : []), _y = _x.next(); !_y.done; _y = _x.next()) {
+            var v = _y.value;
             var idx = fieldIndices.get(v.field);
             if (idx != null)
-                fieldAxis.set(idx, "dataField");
+                dataFieldIndices.add(idx);
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
-            if (_s && !_s.done && (_c = _r.return)) _c.call(_r);
+            if (_y && !_y.done && (_c = _x.return)) _c.call(_x);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_4) throw e_4.error; }
     }
+    var calculatedNames = new Set(((_h = pivot.calculatedFields) !== null && _h !== void 0 ? _h : []).map(function (c) { return c.name; }));
     // Need to emit one <pivotField> per cacheField in order, even
     // for unused fields (Excel requires the array shapes match).
     // Caller passes us the full field set via fieldIndices.
     var sortedFieldIndices = __spreadArray([], __read(fieldIndices.entries()), false).sort(function (a, b) { return a[1] - b[1]; });
     try {
         for (var sortedFieldIndices_1 = __values(sortedFieldIndices), sortedFieldIndices_1_1 = sortedFieldIndices_1.next(); !sortedFieldIndices_1_1.done; sortedFieldIndices_1_1 = sortedFieldIndices_1.next()) {
-            var _t = __read(sortedFieldIndices_1_1.value, 2), idx = _t[1];
+            var _z = __read(sortedFieldIndices_1_1.value, 2), name_1 = _z[0], idx = _z[1];
             var axis = fieldAxis.get(idx);
-            if (axis) {
-                pivotFields.push({ "@_axis": axis, "@_compact": "0", items: {} });
+            var entry = {};
+            if (axis)
+                entry["@_axis"] = axis;
+            if (dataFieldIndices.has(idx))
+                entry["@_dataField"] = "1";
+            if (calculatedNames.has(name_1)) {
+                // Excel pins calculated fields to the values area.
+                entry["@_dragToRow"] = "0";
+                entry["@_dragToCol"] = "0";
+                entry["@_dragToPage"] = "0";
+                entry["@_showAll"] = "0";
+                entry["@_defaultSubtotal"] = "0";
             }
             else {
-                pivotFields.push({ "@_compact": "0" });
+                entry["@_compact"] = "0";
+                if (axis)
+                    entry.items = {};
             }
+            pivotFields.push(entry);
         }
     }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
     finally {
         try {
             if (sortedFieldIndices_1_1 && !sortedFieldIndices_1_1.done && (_d = sortedFieldIndices_1.return)) _d.call(sortedFieldIndices_1);
         }
-        finally { if (e_4) throw e_4.error; }
+        finally { if (e_5) throw e_5.error; }
     }
-    var rowFields = ((_h = pivot.rows) !== null && _h !== void 0 ? _h : [])
+    var rowFields = ((_j = pivot.rows) !== null && _j !== void 0 ? _j : [])
         .map(function (r) { return fieldIndices.get(r.field); })
         .filter(function (i) { return i != null; })
         .map(function (i) { return ({ "@_x": String(i) }); });
-    var colFields = ((_j = pivot.columns) !== null && _j !== void 0 ? _j : [])
+    var colFields = ((_k = pivot.columns) !== null && _k !== void 0 ? _k : [])
         .map(function (c) { return fieldIndices.get(c.field); })
         .filter(function (i) { return i != null; })
         .map(function (i) { return ({ "@_x": String(i) }); });
-    var dataFields = ((_k = pivot.values) !== null && _k !== void 0 ? _k : [])
+    // Running totals need a base field: Excel defaults to the first row
+    // field (falls back to the first column field / field 0).
+    var runTotalBase = (_p = (_m = (_l = rowFields[0]) === null || _l === void 0 ? void 0 : _l["@_x"]) !== null && _m !== void 0 ? _m : (_o = colFields[0]) === null || _o === void 0 ? void 0 : _o["@_x"]) !== null && _p !== void 0 ? _p : "0";
+    var dataFields = ((_q = pivot.values) !== null && _q !== void 0 ? _q : [])
         .map(function (v) {
         var _a;
         var idx = fieldIndices.get(v.field);
         if (idx == null)
             return null;
-        return {
+        var entry = {
             "@_name": (_a = v.displayName) !== null && _a !== void 0 ? _a : "".concat(v.aggFunc, " of ").concat(v.field),
             "@_fld": String(idx),
-            "@_subtotal": aggToSubtotal(v.aggFunc),
+            "@_subtotal": calculatedNames.has(v.field)
+                ? "sum"
+                : aggToSubtotal(v.aggFunc),
         };
+        var showDataAs = v.showAs ? SHOW_DATA_AS[v.showAs] : undefined;
+        if (showDataAs) {
+            entry["@_showDataAs"] = showDataAs;
+            if (showDataAs === "runTotal")
+                entry["@_baseField"] = runTotalBase;
+        }
+        var pivotShowAs = v.showAs ? X14_PIVOT_SHOW_AS[v.showAs] : undefined;
+        if (pivotShowAs) {
+            entry.extLst = {
+                ext: {
+                    "@_uri": X14_DATA_FIELD_EXT_URI,
+                    "@_xmlns:x14": X14_NS,
+                    "x14:dataField": { "@_pivotShowAs": pivotShowAs },
+                },
+            };
+        }
+        return entry;
     })
         .filter(function (d) { return d !== null; });
+    var styleInfo = (_r = pivot.styleInfo) !== null && _r !== void 0 ? _r : {};
+    var styleFlag = function (value, fallback) {
+        return value === undefined ? fallback : value ? "1" : "0";
+    };
     var doc = {
         "?xml": { "@_version": "1.0", "@_encoding": "UTF-8", "@_standalone": "yes" },
         pivotTableDefinition: {
             "@_xmlns": "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-            "@_name": (_l = pivot.name) !== null && _l !== void 0 ? _l : "PivotTable".concat(pivot.pivotId),
+            "@_name": (_s = pivot.name) !== null && _s !== void 0 ? _s : "PivotTable".concat(pivot.pivotId),
             "@_cacheId": String(cacheId),
             "@_dataOnRows": "0",
             "@_applyNumberFormats": "0",
@@ -242,12 +341,12 @@ export var buildPivotTableXml = function (pivot, cacheId, fieldIndices) {
                 ? { "@_count": String(dataFields.length), dataField: dataFields }
                 : undefined,
             pivotTableStyleInfo: {
-                "@_name": "PivotStyleLight16",
-                "@_showRowHeaders": "1",
-                "@_showColHeaders": "1",
-                "@_showRowStripes": "0",
-                "@_showColStripes": "0",
-                "@_showLastColumn": "1",
+                "@_name": styleInfo.name || "PivotStyleLight16",
+                "@_showRowHeaders": styleFlag(styleInfo.showRowHeaders, "1"),
+                "@_showColHeaders": styleFlag(styleInfo.showColHeaders, "1"),
+                "@_showRowStripes": styleFlag(styleInfo.showRowStripes, "0"),
+                "@_showColStripes": styleFlag(styleInfo.showColStripes, "0"),
+                "@_showLastColumn": styleFlag(styleInfo.showLastColumn, "1"),
             },
         },
     };

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

@@ -716,10 +716,16 @@ var serializeAlignment = function (record) {
         attrs.push("relativeIndent=\"".concat(record.relativeIndent, "\""));
     }
     if (record.textRotation !== undefined && record.textRotation !== null) {
-        // Excel encodes "vertical (stacked)" text as the magic value 255.
-        var rotation = record.textRotation === "vertical" ? 255 : record.textRotation;
+        // Excel encodes "vertical (stacked)" text as the magic value 255 and
+        // clockwise rotation as 90 + degrees (91–180); the engine keeps signed
+        // counter-clockwise degrees.
+        var rotation = record.textRotation === "vertical"
+            ? 255
+            : record.textRotation < 0
+                ? 90 - record.textRotation
+                : record.textRotation;
         if (Number.isFinite(rotation) && rotation !== 0) {
-            attrs.push("textRotation=\"".concat(rotation, "\""));
+            attrs.push("textRotation=\"".concat(Math.round(rotation), "\""));
         }
     }
     if (record.shrinkToFit) {

package/dist/cjs/exporter/xlsx/threaded-comments-builder.d.ts

@@ -10,6 +10,7 @@ export declare const PERSON_CONTENT_TYPE = "application/vnd.ms-excel.person+xml"
  * scoping author/comment ids within a single workbook.
  */
 export declare const deterministicGuid: (seed: string) => string;
+export declare const isBracedGuid: (id: string) => boolean;
 /**
  * Workbook-scoped author registry. Shared across every sheet's collector so
  * an author who comments on multiple sheets maps to a single `person` entry
@@ -35,7 +36,12 @@ export declare class ThreadedCommentsCollector {
     /** Anchor a thread to a cell. No-op if the id is unknown or empty. */
     addCell(address: string, threadId: string | number | null | undefined): void;
     isEmpty(): boolean;
-    /** Braced root GUID for a thread — used as both the root `id` and `tc=`. */
+    /**
+     * Braced root GUID for a thread — used as both the root `id` and `tc=`.
+     * An id that already is a braced GUID (what Excel and both importers
+     * produce) passes through, so a re-exported thread keeps the identity
+     * Excel assigned it; anything else is hashed deterministically.
+     */
     private rootGuid;
     /**
      * Legacy `xl/comments{N}.xml` mirror entries. Feed these into the existing

package/dist/cjs/exporter/xlsx/threaded-comments-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"threaded-comments-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/threaded-comments-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAyBhE,eAAO,MAAM,yBAAyB,8EACuC,CAAC;AAC9E,eAAO,MAAM,eAAe,qEACwC,CAAC;AACrE,eAAO,MAAM,8BAA8B,kDACM,CAAC;AAClD,eAAO,MAAM,mBAAmB,wCAAwC,CAAC;AAsBzE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAiBhD,CAAC;AAEF;;;;GAIG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAGlB;IAEJ,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS;IAWtE,OAAO;IAIP,KAAK;CAYN;AAQD;;;;GAIG;AACH,qBAAa,yBAAyB;IAMlC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;gBAG3C,OAAO,EAAE,aAAa,EAAE,GAAG,SAAS,EACnB,OAAO,EAAE,cAAc;IAO1C,sEAAsE;IACtE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IAQrE,OAAO;IAIP,4EAA4E;IAC5E,OAAO,CAAC,QAAQ;IAIhB;;;;;OAKG;IACH,aAAa,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE;IAcpE;;;;OAIG;IACH,KAAK,IAAI,MAAM,GAAG,SAAS;CA+B5B"}
+{"version":3,"file":"threaded-comments-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/threaded-comments-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAyBhE,eAAO,MAAM,yBAAyB,8EACuC,CAAC;AAC9E,eAAO,MAAM,eAAe,qEACwC,CAAC;AACrE,eAAO,MAAM,8BAA8B,kDACM,CAAC;AAClD,eAAO,MAAM,mBAAmB,wCAAwC,CAAC;AAsBzE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAiBhD,CAAC;AAKF,eAAO,MAAM,YAAY,GAAI,IAAI,MAAM,YAAyB,CAAC;AAEjE;;;;GAIG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAGlB;IAEJ,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS;IAWtE,OAAO;IAIP,KAAK;CAYN;AAQD;;;;GAIG;AACH,qBAAa,yBAAyB;IAMlC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;gBAG3C,OAAO,EAAE,aAAa,EAAE,GAAG,SAAS,EACnB,OAAO,EAAE,cAAc;IAO1C,sEAAsE;IACtE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IAQrE,OAAO;IAIP;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAMhB;;;;;OAKG;IACH,aAAa,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE;IAcpE;;;;OAIG;IACH,KAAK,IAAI,MAAM,GAAG,SAAS;CAiC5B"}