@rowsncolumns/toolkit 24.4.4 → 24.5.0

package/dist/cjs/exporter/xlsx/form-controls-builder.d.ts

@@ -1,4 +1,4 @@
-import type { EmbedFormControlSpec } from "@rowsncolumns/spreadsheet";
+import type { EmbedFormControlSpec, OverlayPosition } from "@rowsncolumns/spreadsheet";
 /**
  * Excel form-control writers — the inverse of
  * `excel-parser/plugins/xlsx/form-controls.ts`. A control is three parts:
@@ -20,13 +20,25 @@ export type ControlCellAnchor = {
     row: number;
     rowOff: number;
 };
+/**
+ * The `<anchor moveWithCells sizeWithCells>` flags to write: the control's
+ * placement mode when its position carries one (Move and size = both, Move
+ * but don't size = `moveWithCells`, Don't move or size = neither) — a
+ * persisted second anchor is a "Move and size" object too — else the flags
+ * the spec arrived with (#668 C-46).
+ */
+export declare const controlAnchorFlags: (spec: Pick<EmbedFormControlSpec, "moveWithCells" | "sizeWithCells">, overlay?: Pick<OverlayPosition, "placement" | "toCell"> | null) => {
+    moveWithCells: boolean;
+    sizeWithCells: boolean;
+};
 /** One `<control>` element (inside the `<controls>` wrapper). */
-export declare const buildControlElementXml: ({ spec, relId, shapeId, from, to, }: {
+export declare const buildControlElementXml: ({ spec, relId, shapeId, from, to, overlay, }: {
     spec: EmbedFormControlSpec;
     relId: string;
     shapeId: number;
     from: ControlCellAnchor;
     to: ControlCellAnchor;
+    overlay?: Pick<OverlayPosition, "placement" | "toCell"> | null;
 }) => string;
 /**
  * The worksheet `<controls>` element. Excel wraps controls in an
@@ -47,11 +59,12 @@ export type FormControlVmlGeometry = {
     anchor: [number, number, number, number, number, number, number, number];
 };
 /** One `<v:shape>` drawing a form control. */
-export declare const buildFormControlVmlShape: ({ spec, shapeId, zIndex, geometry, }: {
+export declare const buildFormControlVmlShape: ({ spec, shapeId, zIndex, geometry, overlay, }: {
     spec: EmbedFormControlSpec;
     shapeId: number;
     zIndex: number;
     geometry: FormControlVmlGeometry;
+    overlay?: Pick<OverlayPosition, "placement" | "toCell"> | null;
 }) => string;
 /** Wrap note + control shapes into one `vmlDrawing` part. */
 export declare const buildVmlDrawingXml: ({ shapeTypes, shapes, }: {

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

@@ -1 +1 @@
-{"version":3,"file":"form-controls-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/form-controls-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE;;;;;;;;GAQG;AAEH,eAAO,MAAM,sBAAsB,mDACe,CAAC;AACnD,eAAO,MAAM,kBAAkB,iFACiD,CAAC;AACjF,eAAO,MAAM,eAAe,kEACqC,CAAC;AAuBlE,yCAAyC;AACzC,eAAO,MAAM,gBAAgB,GAAI,MAAM,oBAAoB,KAAG,MAU7D,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AASF,iEAAiE;AACjE,eAAO,MAAM,sBAAsB,GAAI,qCAMpC;IACD,IAAI,EAAE,oBAAoB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;IACxB,EAAE,EAAE,iBAAiB,CAAC;CACvB,KAAG,MAaH,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,iBAAiB,MAAM,EAAE,KAAG,MAK5D,CAAC;AAmEF,0EAA0E;AAC1E,eAAO,MAAM,0BAA0B,oSAA4Q,CAAC;AAEpT,iFAAiF;AACjF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,qFAAqF;IACrF,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1E,CAAC;AAIF,8CAA8C;AAC9C,eAAO,MAAM,wBAAwB,GAAI,sCAKtC;IACD,IAAI,EAAE,oBAAoB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,sBAAsB,CAAC;CAClC,KAAG,MAmBH,CAAC;AAEF,6DAA6D;AAC7D,eAAO,MAAM,kBAAkB,GAAI,yBAGhC;IACD,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,KAAG,MAAM,GAAG,SAKZ,CAAC"}
+{"version":3,"file":"form-controls-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/form-controls-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EAChB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;;;GAQG;AAEH,eAAO,MAAM,sBAAsB,mDACe,CAAC;AACnD,eAAO,MAAM,kBAAkB,iFACiD,CAAC;AACjF,eAAO,MAAM,eAAe,kEACqC,CAAC;AAuBlE,yCAAyC;AACzC,eAAO,MAAM,gBAAgB,GAAI,MAAM,oBAAoB,KAAG,MAU7D,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,IAAI,CAAC,oBAAoB,EAAE,eAAe,GAAG,eAAe,CAAC,EACnE,UAAU,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,QAAQ,CAAC,GAAG,IAAI,KAC7D;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAalD,CAAC;AASF,iEAAiE;AACjE,eAAO,MAAM,sBAAsB,GAAI,8CAOpC;IACD,IAAI,EAAE,oBAAoB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;IACxB,EAAE,EAAE,iBAAiB,CAAC;IACtB,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;CAChE,KAAG,MAcH,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,iBAAiB,MAAM,EAAE,KAAG,MAK5D,CAAC;AAsEF,0EAA0E;AAC1E,eAAO,MAAM,0BAA0B,oSAA4Q,CAAC;AAEpT,iFAAiF;AACjF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,qFAAqF;IACrF,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1E,CAAC;AAIF,8CAA8C;AAC9C,eAAO,MAAM,wBAAwB,GAAI,+CAMtC;IACD,IAAI,EAAE,oBAAoB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;CAChE,KAAG,MAsBH,CAAC;AAEF,6DAA6D;AAC7D,eAAO,MAAM,kBAAkB,GAAI,yBAGhC;IACD,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,KAAG,MAAM,GAAG,SAKZ,CAAC"}

package/dist/cjs/exporter/xlsx/form-controls-builder.js

@@ -47,16 +47,38 @@ export var buildCtrlPropXml = function (spec) {
     var open = "<formControlPr xmlns=\"".concat(FORM_CONTROL_NS, "\" objectType=\"").concat(escapeAttr(spec.objectType), "\"").concat(attrsXml(rest));
     return "".concat(XML_DECLARATION).concat(body ? "".concat(open, ">").concat(body, "</formControlPr>") : "".concat(open, "/>"));
 };
+/**
+ * The `<anchor moveWithCells sizeWithCells>` flags to write: the control's
+ * placement mode when its position carries one (Move and size = both, Move
+ * but don't size = `moveWithCells`, Don't move or size = neither) — a
+ * persisted second anchor is a "Move and size" object too — else the flags
+ * the spec arrived with (#668 C-46).
+ */
+export var controlAnchorFlags = function (spec, overlay) {
+    var _a;
+    var placement = (_a = overlay === null || overlay === void 0 ? void 0 : overlay.placement) !== null && _a !== void 0 ? _a : ((overlay === null || overlay === void 0 ? void 0 : overlay.toCell) ? "moveAndSize" : undefined);
+    if (placement) {
+        return {
+            moveWithCells: placement !== "absolute",
+            sizeWithCells: placement === "moveAndSize",
+        };
+    }
+    return {
+        moveWithCells: spec.moveWithCells === true,
+        sizeWithCells: spec.sizeWithCells === true,
+    };
+};
 var cellAnchorXml = function (tag, anchor) {
     return "<".concat(tag, "><xdr:col>").concat(anchor.col, "</xdr:col><xdr:colOff>").concat(Math.round(anchor.colOff), "</xdr:colOff><xdr:row>").concat(anchor.row, "</xdr:row><xdr:rowOff>").concat(Math.round(anchor.rowOff), "</xdr:rowOff></").concat(tag, ">");
 };
 /** One `<control>` element (inside the `<controls>` wrapper). */
 export var buildControlElementXml = function (_a) {
     var _b;
-    var spec = _a.spec, relId = _a.relId, shapeId = _a.shapeId, from = _a.from, to = _a.to;
+    var spec = _a.spec, relId = _a.relId, shapeId = _a.shapeId, from = _a.from, to = _a.to, overlay = _a.overlay;
     var name = (_b = spec.name) !== null && _b !== void 0 ? _b : "".concat(spec.objectType, " ").concat(shapeId);
-    var anchorAttrs = (spec.moveWithCells ? ' moveWithCells="1"' : "") +
-        (spec.sizeWithCells ? ' sizeWithCells="1"' : "");
+    var flags = controlAnchorFlags(spec, overlay);
+    var anchorAttrs = (flags.moveWithCells ? ' moveWithCells="1"' : "") +
+        (flags.sizeWithCells ? ' sizeWithCells="1"' : "");
     return "<control shapeId=\"".concat(shapeId, "\" r:id=\"").concat(relId, "\" name=\"").concat(escapeAttr(name), "\"><controlPr").concat(attrsXml(spec.controlProperties), "><anchor").concat(anchorAttrs, ">").concat(cellAnchorXml("from", from)).concat(cellAnchorXml("to", to), "</anchor></controlPr></control>");
 };
 /**
@@ -84,7 +106,7 @@ var truthy = function (value) {
  * range, selection, scroll values) from the VML, the ctrlProp part is the
  * x14 mirror.
  */
-var clientDataChildrenXml = function (spec) {
+var clientDataChildrenXml = function (spec, flags) {
     var _a, _b;
     var p = (_a = spec.properties) !== null && _a !== void 0 ? _a : {};
     var c = (_b = spec.controlProperties) !== null && _b !== void 0 ? _b : {};
@@ -95,9 +117,9 @@ var clientDataChildrenXml = function (spec) {
         else
             out.push("<x:".concat(tag, ">").concat(escapeText(value), "</x:").concat(tag, ">"));
     };
-    if (spec.moveWithCells)
+    if (flags.moveWithCells)
         push("MoveWithCells");
-    if (spec.sizeWithCells)
+    if (flags.sizeWithCells)
         push("SizeWithCells");
     // Anchor is inserted by the caller (needs sheet geometry).
     out.push("__ANCHOR__");
@@ -179,12 +201,12 @@ var toPt = function (px) { return "".concat((px * 0.75).toFixed(2).replace(/\.?0
 /** One `<v:shape>` drawing a form control. */
 export var buildFormControlVmlShape = function (_a) {
     var _b;
-    var spec = _a.spec, shapeId = _a.shapeId, zIndex = _a.zIndex, geometry = _a.geometry;
+    var spec = _a.spec, shapeId = _a.shapeId, zIndex = _a.zIndex, geometry = _a.geometry, overlay = _a.overlay;
     var objectType = (_b = VML_OBJECT_TYPE[spec.objectType]) !== null && _b !== void 0 ? _b : spec.objectType;
     var caption = spec.text
         ? "<div style=\"text-align:left\"><font face=\"Tahoma\" size=\"160\" color=\"auto\">".concat(escapeText(spec.text), "</font></div>")
         : "";
-    var clientData = clientDataChildrenXml(spec).replace("__ANCHOR__", "<x:Anchor>".concat(geometry.anchor.join(", "), "</x:Anchor>"));
+    var clientData = clientDataChildrenXml(spec, controlAnchorFlags(spec, overlay)).replace("__ANCHOR__", "<x:Anchor>".concat(geometry.anchor.join(", "), "</x:Anchor>"));
     var style = "position:absolute;margin-left:".concat(toPt(geometry.leftPx), ";margin-top:").concat(toPt(geometry.topPx), ";width:").concat(toPt(geometry.widthPx), ";height:").concat(toPt(geometry.heightPx), ";z-index:").concat(zIndex, ";mso-wrap-style:tight");
     return "<v:shape id=\"_x0000_s".concat(shapeId, "\" type=\"#_x0000_t201\" style=\"").concat(style, "\" filled=\"f\" fillcolor=\"window [65]\" stroked=\"f\" strokecolor=\"windowText [64]\" o:insetmode=\"auto\"><v:path shadowok=\"f\" o:extrusionok=\"f\" strokeok=\"f\" fillok=\"f\" o:connecttype=\"rect\"/><v:textbox style=\"mso-direction-alt:auto\" o:singleclick=\"f\">").concat(caption, "</v:textbox><x:ClientData ObjectType=\"").concat(escapeAttr(objectType), "\">").concat(clientData, "</x:ClientData></v:shape>");
 };

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,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"}
+{"version":3,"file":"pivot-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/pivot-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,EAKV,UAAU,EAEX,MAAM,2BAA2B,CAAC;AAqBnC;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,KAAG,MAAM,EAYjE,CAAC;AA6HF;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,GACvC,OAAO,UAAU,EACjB,WAAW,MAAM,EACjB,YAAY,MAAM,EAAE,KACnB,MAAM,GAAG,IA2CX,CAAC;AAsDF;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,UAAU,EACjB,SAAS,MAAM,EACf,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAChC,MAAM,GAAG,IAkKX,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GACjC,UAAU,MAAM,EAChB,aAAa,MAAM,KAClB,MAUF,CAAC"}

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

@@ -1,4 +1,4 @@
-import { __read, __spreadArray, __values } from "tslib";
+import { __assign, __read, __spreadArray, __values } from "tslib";
 import { XMLBuilder } from "fast-xml-parser";
 /**
  * `PivotValue.showAs` → `dataField@showDataAs` (ECMA-376) or, for the
@@ -52,10 +52,41 @@ export var calculatedFieldReferences = function (formula) {
 };
 var xmlBuilder = new XMLBuilder({
     ignoreAttributes: false,
-    attributeNamePrefix: "@_",
+    preserveOrder: true,
+    attributeNamePrefix: "",
+    suppressEmptyNode: true,
     format: true,
     indentBy: "  ",
 });
+/** An element with `attributes` (undefined values dropped) and ordered `children`. */
+var el = function (tag, attributes, children) {
+    var e_2, _a, _b, _c;
+    if (attributes === void 0) { attributes = {}; }
+    if (children === void 0) { children = []; }
+    var attrs = {};
+    try {
+        for (var _d = __values(Object.entries(attributes)), _e = _d.next(); !_e.done; _e = _d.next()) {
+            var _f = __read(_e.value, 2), key = _f[0], value = _f[1];
+            if (value !== undefined)
+                attrs[key] = value;
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return Object.keys(attrs).length ? (_b = {}, _b[tag] = children, _b[":@"] = attrs, _b) : (_c = {}, _c[tag] = children, _c);
+};
+var XML_DECLARATION = {
+    "?xml": [{ "#text": "" }],
+    ":@": { version: "1.0", encoding: "UTF-8", standalone: "yes" },
+};
+var buildDocument = function (root) {
+    return xmlBuilder.build([XML_DECLARATION, root]);
+};
 /**
  * Convert numeric col/row to A1 notation. 1-indexed.
  * e.g. (1, 1) → "A1", (28, 5) → "AB5".
@@ -95,6 +126,24 @@ var aggToSubtotal = function (agg) {
     };
     return (_a = map[agg]) !== null && _a !== void 0 ? _a : "sum";
 };
+/** Preserved XLSX cache items by cache-field name (`PivotTable.cacheFields`). */
+var preservedCacheFields = function (pivot) { var _a; return new Map(((_a = pivot.cacheFields) !== null && _a !== void 0 ? _a : []).map(function (field) { return [field.name, field]; })); };
+/**
+ * Preserved `<sharedItems …>`: its attributes, `count` only with an item list
+ * (Excel's form — a numeric field keeps just its type attributes), children
+ * in document order (`<s v/>`, `<n v/>`, `<m/>`… with any further attributes).
+ */
+var buildSharedItems = function (shared) {
+    var _a;
+    return el("sharedItems", __assign(__assign({}, ((_a = shared.attributes) !== null && _a !== void 0 ? _a : {})), (shared.items.length ? { count: String(shared.items.length) } : {})), shared.items.map(function (item) { var _a; return el(item.type, __assign({ v: item.value }, ((_a = item.attributes) !== null && _a !== void 0 ? _a : {}))); }));
+};
+/** Preserved `<pivotField><items>`: `x`, `t`, the rest verbatim, in Excel's order. */
+var buildFieldItems = function (items) {
+    return el("items", { count: String(items.length) }, items.map(function (item) {
+        var _a;
+        return el("item", __assign(__assign(__assign({}, (item.x !== undefined ? { x: String(item.x) } : {})), (item.t !== undefined ? { t: item.t } : {})), ((_a = item.attributes) !== null && _a !== void 0 ? _a : {})));
+    }));
+};
 /**
  * Build pivotCacheDefinition XML for a pivot. The cacheSource
  * points at the live worksheet range; `refreshOnLoad="1"` makes
@@ -112,35 +161,57 @@ export var buildPivotCacheDefinitionXml = function (pivot, sheetName, fieldNames
     // 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 preserved = preservedCacheFields(pivot);
+    var preservedAny = false;
     var cacheFields = fieldNames.map(function (name) {
+        var _a;
         var formula = calculatedByName.get(name);
-        return formula !== undefined
-            ? { "@_name": name, "@_formula": formula, "@_databaseField": "0" }
-            : { "@_name": name, sharedItems: { "@_count": "0" } };
+        if (formula !== undefined) {
+            return el("cacheField", { name: name, formula: formula, databaseField: "0" });
+        }
+        var shared = (_a = preserved.get(name)) === null || _a === void 0 ? void 0 : _a.sharedItems;
+        if (!shared)
+            return el("cacheField", { name: name }, [el("sharedItems", { count: "0" })]);
+        preservedAny = true;
+        return el("cacheField", { name: name }, [buildSharedItems(shared)]);
     });
-    var doc = {
-        "?xml": { "@_version": "1.0", "@_encoding": "UTF-8", "@_standalone": "yes" },
-        pivotCacheDefinition: {
-            "@_xmlns": "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-            "@_xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-            "@_invalid": "1",
-            "@_refreshOnLoad": "1",
-            "@_refreshedBy": "Rows n Columns",
-            "@_recordCount": "0",
-            cacheSource: {
-                "@_type": "worksheet",
-                worksheetSource: {
-                    "@_ref": sourceRef,
-                    "@_sheet": sheetName,
-                },
-            },
-            cacheFields: {
-                "@_count": String(cacheFields.length),
-                cacheField: cacheFields,
-            },
-        },
-    };
-    return xmlBuilder.build(doc);
+    return buildDocument(el("pivotCacheDefinition", __assign({ xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main", "xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships", invalid: "1", refreshOnLoad: "1", refreshedBy: "Rows n Columns", recordCount: "0" }, (preservedAny ? { saveData: "0" } : {})), [
+        el("cacheSource", { type: "worksheet" }, [
+            el("worksheetSource", { ref: sourceRef, sheet: sheetName }),
+        ]),
+        el("cacheFields", { count: String(cacheFields.length) }, cacheFields),
+    ]));
+};
+/** `PivotArea` → `<pivotArea …><references count><reference … count><x v/>…` (Excel's `<x/>` order). */
+var buildPivotArea = function (area) {
+    var _a, _b;
+    var references = (_a = area.references) !== null && _a !== void 0 ? _a : [];
+    return el("pivotArea", (_b = area.attributes) !== null && _b !== void 0 ? _b : {}, references.length
+        ? [
+            el("references", { count: String(references.length) }, references.map(function (ref) {
+                var _a, _b;
+                var items = (_a = ref.items) !== null && _a !== void 0 ? _a : [];
+                return el("reference", __assign(__assign({}, ((_b = ref.attributes) !== null && _b !== void 0 ? _b : {})), { count: String(items.length) }), items.map(function (v) { return el("x", { v: String(v) }); }));
+            })),
+        ]
+        : []);
+};
+/**
+ * `PivotTable.chartFormats` → `<chartFormats count><chartFormat chart
+ * format series><pivotArea>…`: the pivot areas a PivotChart's
+ * `<c:pivotFmt>` entries (`format`) format, keyed by the chart's
+ * `<c:fmtId>` (`chart`). Nothing is written without formats — Excel
+ * itself keeps `<c:pivotFmt>` entries with no `<chartFormat>`.
+ */
+var buildChartFormats = function (pivot) {
+    var _a;
+    var formats = (_a = pivot.chartFormats) !== null && _a !== void 0 ? _a : [];
+    if (!formats.length)
+        return undefined;
+    return el("chartFormats", { count: String(formats.length) }, formats.map(function (format) {
+        var _a;
+        return el("chartFormat", __assign({ chart: String(format.chart), format: String(format.format) }, (format.series ? { series: "1" } : {})), [buildPivotArea((_a = format.pivotArea) !== null && _a !== void 0 ? _a : {})]);
+    }));
 };
 /**
  * Build the pivotTable layout XML. Excel determines whether a cell
@@ -152,8 +223,8 @@ 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_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;
+    var e_3, _a, e_4, _b, e_5, _c, e_6, _d;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     if (!pivot.pivotRange)
         return null;
     var ref = rangeRef(pivot.pivotRange);
@@ -167,190 +238,168 @@ export var buildPivotTableXml = function (pivot, cacheId, fieldIndices) {
     // value fields and tag with the appropriate axis.
     var fieldAxis = new Map();
     try {
-        for (var _t = __values((_e = pivot.rows) !== null && _e !== void 0 ? _e : []), _u = _t.next(); !_u.done; _u = _t.next()) {
-            var r = _u.value;
+        for (var _s = __values((_e = pivot.rows) !== null && _e !== void 0 ? _e : []), _t = _s.next(); !_t.done; _t = _s.next()) {
+            var r = _t.value;
             var idx = fieldIndices.get(r.field);
             if (idx != null)
                 fieldAxis.set(idx, "axisRow");
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
     finally {
         try {
-            if (_u && !_u.done && (_a = _t.return)) _a.call(_t);
+            if (_t && !_t.done && (_a = _s.return)) _a.call(_s);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_3) throw e_3.error; }
     }
     try {
-        for (var _v = __values((_f = pivot.columns) !== null && _f !== void 0 ? _f : []), _w = _v.next(); !_w.done; _w = _v.next()) {
-            var c = _w.value;
+        for (var _u = __values((_f = pivot.columns) !== null && _f !== void 0 ? _f : []), _v = _u.next(); !_v.done; _v = _u.next()) {
+            var c = _v.value;
             var idx = fieldIndices.get(c.field);
             if (idx != null)
                 fieldAxis.set(idx, "axisCol");
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
-            if (_w && !_w.done && (_b = _v.return)) _b.call(_v);
+            if (_v && !_v.done && (_b = _u.return)) _b.call(_u);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     var dataFieldIndices = new Set();
     try {
-        for (var _x = __values((_g = pivot.values) !== null && _g !== void 0 ? _g : []), _y = _x.next(); !_y.done; _y = _x.next()) {
-            var v = _y.value;
+        for (var _w = __values((_g = pivot.values) !== null && _g !== void 0 ? _g : []), _x = _w.next(); !_x.done; _x = _w.next()) {
+            var v = _x.value;
             var idx = fieldIndices.get(v.field);
             if (idx != null)
                 dataFieldIndices.add(idx);
         }
     }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
     finally {
         try {
-            if (_y && !_y.done && (_c = _x.return)) _c.call(_x);
+            if (_x && !_x.done && (_c = _w.return)) _c.call(_w);
         }
-        finally { if (e_4) throw e_4.error; }
+        finally { if (e_5) throw e_5.error; }
     }
     var calculatedNames = new Set(((_h = pivot.calculatedFields) !== null && _h !== void 0 ? _h : []).map(function (c) { return c.name; }));
+    var preserved = preservedCacheFields(pivot);
     // 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 _z = __read(sortedFieldIndices_1_1.value, 2), name_1 = _z[0], idx = _z[1];
+            var _y = __read(sortedFieldIndices_1_1.value, 2), name_1 = _y[0], idx = _y[1];
             var axis = fieldAxis.get(idx);
-            var entry = {};
-            if (axis)
-                entry["@_axis"] = axis;
-            if (dataFieldIndices.has(idx))
-                entry["@_dataField"] = "1";
+            var attributes = {
+                axis: axis,
+                dataField: dataFieldIndices.has(idx) ? "1" : undefined,
+            };
             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 {
-                entry["@_compact"] = "0";
-                if (axis)
-                    entry.items = {};
+                pivotFields.push(el("pivotField", __assign(__assign({}, attributes), { dragToRow: "0", dragToCol: "0", dragToPage: "0", showAll: "0", defaultSubtotal: "0" })));
+                continue;
             }
-            pivotFields.push(entry);
+            // Preserved `<items>` (C-84) keep Excel's item order — the indices the
+            // pivot's `<chartFormats>` pivot areas reference.
+            var items = (_j = preserved.get(name_1)) === null || _j === void 0 ? void 0 : _j.items;
+            var children = (items === null || items === void 0 ? void 0 : items.length) ? [buildFieldItems(items)] : axis ? [el("items")] : [];
+            pivotFields.push(el("pivotField", __assign(__assign({}, attributes), { compact: "0" }), children));
         }
     }
-    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
     finally {
         try {
             if (sortedFieldIndices_1_1 && !sortedFieldIndices_1_1.done && (_d = sortedFieldIndices_1.return)) _d.call(sortedFieldIndices_1);
         }
-        finally { if (e_5) throw e_5.error; }
+        finally { if (e_6) throw e_6.error; }
     }
-    var rowFields = ((_j = pivot.rows) !== null && _j !== void 0 ? _j : [])
+    var rowFieldIndices = ((_k = pivot.rows) !== null && _k !== void 0 ? _k : [])
         .map(function (r) { return fieldIndices.get(r.field); })
-        .filter(function (i) { return i != null; })
-        .map(function (i) { return ({ "@_x": String(i) }); });
-    var colFields = ((_k = pivot.columns) !== null && _k !== void 0 ? _k : [])
+        .filter(function (i) { return i != null; });
+    var colFieldIndices = ((_l = pivot.columns) !== null && _l !== void 0 ? _l : [])
         .map(function (c) { return fieldIndices.get(c.field); })
-        .filter(function (i) { return i != null; })
-        .map(function (i) { return ({ "@_x": String(i) }); });
+        .filter(function (i) { return i != null; });
+    var axisFields = function (indices) { return indices.map(function (i) { return el("field", { x: String(i) }); }); };
     // 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 : [])
+    var runTotalBase = String((_o = (_m = rowFieldIndices[0]) !== null && _m !== void 0 ? _m : colFieldIndices[0]) !== null && _o !== void 0 ? _o : 0);
+    var dataFields = ((_p = pivot.values) !== null && _p !== void 0 ? _p : [])
         .map(function (v) {
         var _a;
         var idx = fieldIndices.get(v.field);
         if (idx == null)
             return null;
-        var entry = {
-            "@_name": (_a = v.displayName) !== null && _a !== void 0 ? _a : "".concat(v.aggFunc, " of ").concat(v.field),
-            "@_fld": String(idx),
-            "@_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;
+        return el("dataField", {
+            name: (_a = v.displayName) !== null && _a !== void 0 ? _a : "".concat(v.aggFunc, " of ").concat(v.field),
+            fld: String(idx),
+            subtotal: calculatedNames.has(v.field) ? "sum" : aggToSubtotal(v.aggFunc),
+            showDataAs: showDataAs,
+            baseField: showDataAs === "runTotal" ? runTotalBase : undefined,
+        }, pivotShowAs
+            ? [
+                el("extLst", {}, [
+                    el("ext", { uri: X14_DATA_FIELD_EXT_URI, "xmlns:x14": X14_NS }, [
+                        el("x14:dataField", { pivotShowAs: pivotShowAs }),
+                    ]),
+                ]),
+            ]
+            : []);
     })
         .filter(function (d) { return d !== null; });
-    var styleInfo = (_r = pivot.styleInfo) !== null && _r !== void 0 ? _r : {};
+    var styleInfo = (_q = pivot.styleInfo) !== null && _q !== void 0 ? _q : {};
     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": (_s = pivot.name) !== null && _s !== void 0 ? _s : "PivotTable".concat(pivot.pivotId),
-            "@_cacheId": String(cacheId),
-            "@_dataOnRows": "0",
-            "@_applyNumberFormats": "0",
-            "@_applyBorderFormats": "0",
-            "@_applyFontFormats": "0",
-            "@_applyPatternFormats": "0",
-            "@_applyAlignmentFormats": "0",
-            "@_applyWidthHeightFormats": "1",
-            "@_dataCaption": "Values",
-            "@_updatedVersion": "8",
-            "@_minRefreshableVersion": "3",
-            "@_showCalcMbrs": "0",
-            "@_useAutoFormatting": "1",
-            "@_itemPrintTitles": "1",
-            "@_createdVersion": "8",
-            "@_indent": "0",
-            "@_outline": "1",
-            "@_outlineData": "1",
-            "@_multipleFieldFilters": "0",
-            "@_rowGrandTotals": pivot.showRowGrandTotals === false ? "0" : "1",
-            "@_colGrandTotals": pivot.showColumnGrandTotals === false ? "0" : "1",
-            location: {
-                "@_ref": ref,
-                "@_firstHeaderRow": "1",
-                "@_firstDataRow": "1",
-                "@_firstDataCol": "1",
-            },
-            pivotFields: pivotFields.length
-                ? { "@_count": String(pivotFields.length), pivotField: pivotFields }
-                : undefined,
-            rowFields: rowFields.length
-                ? { "@_count": String(rowFields.length), field: rowFields }
-                : undefined,
-            colFields: colFields.length
-                ? { "@_count": String(colFields.length), field: colFields }
-                : undefined,
-            dataFields: dataFields.length
-                ? { "@_count": String(dataFields.length), dataField: dataFields }
-                : undefined,
-            pivotTableStyleInfo: {
-                "@_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"),
-            },
-        },
-    };
-    return xmlBuilder.build(doc);
+    var chartFormats = buildChartFormats(pivot);
+    return buildDocument(el("pivotTableDefinition", {
+        xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
+        name: (_r = pivot.name) !== null && _r !== void 0 ? _r : "PivotTable".concat(pivot.pivotId),
+        cacheId: String(cacheId),
+        dataOnRows: "0",
+        applyNumberFormats: "0",
+        applyBorderFormats: "0",
+        applyFontFormats: "0",
+        applyPatternFormats: "0",
+        applyAlignmentFormats: "0",
+        applyWidthHeightFormats: "1",
+        dataCaption: "Values",
+        updatedVersion: "8",
+        minRefreshableVersion: "3",
+        showCalcMbrs: "0",
+        useAutoFormatting: "1",
+        itemPrintTitles: "1",
+        createdVersion: "8",
+        indent: "0",
+        outline: "1",
+        outlineData: "1",
+        multipleFieldFilters: "0",
+        rowGrandTotals: pivot.showRowGrandTotals === false ? "0" : "1",
+        colGrandTotals: pivot.showColumnGrandTotals === false ? "0" : "1",
+    }, __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([
+        el("location", { ref: ref, firstHeaderRow: "1", firstDataRow: "1", firstDataCol: "1" })
+    ], __read((pivotFields.length
+        ? [el("pivotFields", { count: String(pivotFields.length) }, pivotFields)]
+        : [])), false), __read((rowFieldIndices.length
+        ? [el("rowFields", { count: String(rowFieldIndices.length) }, axisFields(rowFieldIndices))]
+        : [])), false), __read((colFieldIndices.length
+        ? [el("colFields", { count: String(colFieldIndices.length) }, axisFields(colFieldIndices))]
+        : [])), false), __read((dataFields.length
+        ? [el("dataFields", { count: String(dataFields.length) }, dataFields)]
+        : [])), false), __read((chartFormats ? [chartFormats] : [])), false), [
+        el("pivotTableStyleInfo", {
+            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"),
+        }),
+    ], false)));
 };
 /**
  * Build the pivotTable.xml.rels file (links the pivot to its
@@ -361,16 +410,11 @@ export var buildPivotTableXml = function (pivot, cacheId, fieldIndices) {
  *                     "../pivotCache/pivotCacheDefinition1.xml"
  */
 export var buildPivotTableRelsXml = function (cacheRid, cacheTarget) {
-    var doc = {
-        "?xml": { "@_version": "1.0", "@_encoding": "UTF-8", "@_standalone": "yes" },
-        Relationships: {
-            "@_xmlns": "http://schemas.openxmlformats.org/package/2006/relationships",
-            Relationship: {
-                "@_Id": cacheRid,
-                "@_Type": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition",
-                "@_Target": cacheTarget,
-            },
-        },
-    };
-    return xmlBuilder.build(doc);
+    return buildDocument(el("Relationships", { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" }, [
+        el("Relationship", {
+            Id: cacheRid,
+            Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition",
+            Target: cacheTarget,
+        }),
+    ]));
 };