@rowsncolumns/toolkit 24.4.5 → 24.5.1

package/dist/esm/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/esm/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/esm/exporter/xlsx/form-controls-builder.js

@@ -33,12 +33,33 @@ export const buildCtrlPropXml = (spec) => {
     const open = `<formControlPr xmlns="${FORM_CONTROL_NS}" objectType="${escapeAttr(spec.objectType)}"${attrsXml(rest)}`;
     return `${XML_DECLARATION}${body ? `${open}>${body}</formControlPr>` : `${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 const controlAnchorFlags = (spec, overlay) => {
+    const placement = overlay?.placement ?? (overlay?.toCell ? "moveAndSize" : undefined);
+    if (placement) {
+        return {
+            moveWithCells: placement !== "absolute",
+            sizeWithCells: placement === "moveAndSize",
+        };
+    }
+    return {
+        moveWithCells: spec.moveWithCells === true,
+        sizeWithCells: spec.sizeWithCells === true,
+    };
+};
 const cellAnchorXml = (tag, anchor) => `<${tag}><xdr:col>${anchor.col}</xdr:col><xdr:colOff>${Math.round(anchor.colOff)}</xdr:colOff><xdr:row>${anchor.row}</xdr:row><xdr:rowOff>${Math.round(anchor.rowOff)}</xdr:rowOff></${tag}>`;
 /** One `<control>` element (inside the `<controls>` wrapper). */
-export const buildControlElementXml = ({ spec, relId, shapeId, from, to, }) => {
+export const buildControlElementXml = ({ spec, relId, shapeId, from, to, overlay, }) => {
     const name = spec.name ?? `${spec.objectType} ${shapeId}`;
-    const anchorAttrs = (spec.moveWithCells ? ' moveWithCells="1"' : "") +
-        (spec.sizeWithCells ? ' sizeWithCells="1"' : "");
+    const flags = controlAnchorFlags(spec, overlay);
+    const anchorAttrs = (flags.moveWithCells ? ' moveWithCells="1"' : "") +
+        (flags.sizeWithCells ? ' sizeWithCells="1"' : "");
     return `<control shapeId="${shapeId}" r:id="${relId}" name="${escapeAttr(name)}"><controlPr${attrsXml(spec.controlProperties)}><anchor${anchorAttrs}>${cellAnchorXml("from", from)}${cellAnchorXml("to", to)}</anchor></controlPr></control>`;
 };
 /**
@@ -64,7 +85,7 @@ const truthy = (value) => value === "1" || value === "true";
  * range, selection, scroll values) from the VML, the ctrlProp part is the
  * x14 mirror.
  */
-const clientDataChildrenXml = (spec) => {
+const clientDataChildrenXml = (spec, flags) => {
     const p = spec.properties ?? {};
     const c = spec.controlProperties ?? {};
     const out = [];
@@ -74,9 +95,9 @@ const clientDataChildrenXml = (spec) => {
         else
             out.push(`<x:${tag}>${escapeText(value)}</x:${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__");
@@ -156,12 +177,12 @@ const clientDataChildrenXml = (spec) => {
 export const FORM_CONTROL_VML_SHAPETYPE = `<v:shapetype id="_x0000_t201" coordsize="21600,21600" o:spt="201" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter"/><v:path shadowok="f" o:extrusionok="f" strokeok="f" fillok="f" o:connecttype="rect"/><o:lock v:ext="edit" shapetype="t"/></v:shapetype>`;
 const toPt = (px) => `${(px * 0.75).toFixed(2).replace(/\.?0+$/, "")}pt`;
 /** One `<v:shape>` drawing a form control. */
-export const buildFormControlVmlShape = ({ spec, shapeId, zIndex, geometry, }) => {
+export const buildFormControlVmlShape = ({ spec, shapeId, zIndex, geometry, overlay, }) => {
     const objectType = VML_OBJECT_TYPE[spec.objectType] ?? spec.objectType;
     const caption = spec.text
         ? `<div style="text-align:left"><font face="Tahoma" size="160" color="auto">${escapeText(spec.text)}</font></div>`
         : "";
-    const clientData = clientDataChildrenXml(spec).replace("__ANCHOR__", `<x:Anchor>${geometry.anchor.join(", ")}</x:Anchor>`);
+    const clientData = clientDataChildrenXml(spec, controlAnchorFlags(spec, overlay)).replace("__ANCHOR__", `<x:Anchor>${geometry.anchor.join(", ")}</x:Anchor>`);
     const style = `position:absolute;margin-left:${toPt(geometry.leftPx)};margin-top:${toPt(geometry.topPx)};width:${toPt(geometry.widthPx)};height:${toPt(geometry.heightPx)};z-index:${zIndex};mso-wrap-style:tight`;
     return `<v:shape id="_x0000_s${shapeId}" type="#_x0000_t201" style="${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">${caption}</v:textbox><x:ClientData ObjectType="${escapeAttr(objectType)}">${clientData}</x:ClientData></v:shape>`;
 };

package/dist/esm/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/esm/exporter/xlsx/pivot-builder.js

@@ -40,10 +40,26 @@ export const calculatedFieldReferences = (formula) => {
 };
 const xmlBuilder = new XMLBuilder({
     ignoreAttributes: false,
-    attributeNamePrefix: "@_",
+    preserveOrder: true,
+    attributeNamePrefix: "",
+    suppressEmptyNode: true,
     format: true,
     indentBy: "  ",
 });
+/** An element with `attributes` (undefined values dropped) and ordered `children`. */
+const el = (tag, attributes = {}, children = []) => {
+    const attrs = {};
+    for (const [key, value] of Object.entries(attributes)) {
+        if (value !== undefined)
+            attrs[key] = value;
+    }
+    return Object.keys(attrs).length ? { [tag]: children, ":@": attrs } : { [tag]: children };
+};
+const XML_DECLARATION = {
+    "?xml": [{ "#text": "" }],
+    ":@": { version: "1.0", encoding: "UTF-8", standalone: "yes" },
+};
+const buildDocument = (root) => xmlBuilder.build([XML_DECLARATION, root]);
 /**
  * Convert numeric col/row to A1 notation. 1-indexed.
  * e.g. (1, 1) → "A1", (28, 5) → "AB5".
@@ -80,6 +96,23 @@ const aggToSubtotal = (agg) => {
     };
     return map[agg] ?? "sum";
 };
+/** Preserved XLSX cache items by cache-field name (`PivotTable.cacheFields`). */
+const preservedCacheFields = (pivot) => new Map((pivot.cacheFields ?? []).map((field) => [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).
+ */
+const buildSharedItems = (shared) => el("sharedItems", {
+    ...(shared.attributes ?? {}),
+    ...(shared.items.length ? { count: String(shared.items.length) } : {}),
+}, shared.items.map((item) => el(item.type, { v: item.value, ...(item.attributes ?? {}) })));
+/** Preserved `<pivotField><items>`: `x`, `t`, the rest verbatim, in Excel's order. */
+const buildFieldItems = (items) => el("items", { count: String(items.length) }, items.map((item) => el("item", {
+    ...(item.x !== undefined ? { x: String(item.x) } : {}),
+    ...(item.t !== undefined ? { t: item.t } : {}),
+    ...(item.attributes ?? {}),
+})));
 /**
  * Build pivotCacheDefinition XML for a pivot. The cacheSource
  * points at the live worksheet range; `refreshOnLoad="1"` makes
@@ -96,35 +129,64 @@ export const buildPivotCacheDefinitionXml = (pivot, sheetName, fieldNames) => {
     // Calculated fields are cache fields too (`databaseField="0"` +
     // `formula`), listed after the source columns like Excel does.
     const calculatedByName = new Map((pivot.calculatedFields ?? []).map((c) => [c.name, c.formula]));
+    const preserved = preservedCacheFields(pivot);
+    let preservedAny = false;
     const cacheFields = fieldNames.map((name) => {
         const 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, formula, databaseField: "0" });
+        }
+        const shared = preserved.get(name)?.sharedItems;
+        if (!shared)
+            return el("cacheField", { name }, [el("sharedItems", { count: "0" })]);
+        preservedAny = true;
+        return el("cacheField", { name }, [buildSharedItems(shared)]);
     });
-    const 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", {
+        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",
+        // Preserved item lists with no records part: Excel's own "don't save
+        // source data" shape (`saveData="0"`), rebuilt on open by refreshOnLoad.
+        ...(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). */
+const buildPivotArea = (area) => {
+    const references = area.references ?? [];
+    return el("pivotArea", area.attributes ?? {}, references.length
+        ? [
+            el("references", { count: String(references.length) }, references.map((ref) => {
+                const items = ref.items ?? [];
+                return el("reference", { ...(ref.attributes ?? {}), count: String(items.length) }, items.map((v) => 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>`.
+ */
+const buildChartFormats = (pivot) => {
+    const formats = pivot.chartFormats ?? [];
+    if (!formats.length)
+        return undefined;
+    return el("chartFormats", { count: String(formats.length) }, formats.map((format) => el("chartFormat", {
+        chart: String(format.chart),
+        format: String(format.format),
+        ...(format.series ? { series: "1" } : {}),
+    }, [buildPivotArea(format.pivotArea ?? {})])));
 };
 /**
  * Build the pivotTable layout XML. Excel determines whether a cell
@@ -165,131 +227,122 @@ export const buildPivotTableXml = (pivot, cacheId, fieldIndices) => {
             dataFieldIndices.add(idx);
     }
     const calculatedNames = new Set((pivot.calculatedFields ?? []).map((c) => c.name));
+    const 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.
     const sortedFieldIndices = [...fieldIndices.entries()].sort((a, b) => a[1] - b[1]);
     for (const [name, idx] of sortedFieldIndices) {
         const axis = fieldAxis.get(idx);
-        const entry = {};
-        if (axis)
-            entry["@_axis"] = axis;
-        if (dataFieldIndices.has(idx))
-            entry["@_dataField"] = "1";
+        const attributes = {
+            axis,
+            dataField: dataFieldIndices.has(idx) ? "1" : undefined,
+        };
         if (calculatedNames.has(name)) {
             // Excel pins calculated fields to the values area.
-            entry["@_dragToRow"] = "0";
-            entry["@_dragToCol"] = "0";
-            entry["@_dragToPage"] = "0";
-            entry["@_showAll"] = "0";
-            entry["@_defaultSubtotal"] = "0";
+            pivotFields.push(el("pivotField", {
+                ...attributes,
+                dragToRow: "0",
+                dragToCol: "0",
+                dragToPage: "0",
+                showAll: "0",
+                defaultSubtotal: "0",
+            }));
+            continue;
         }
-        else {
-            entry["@_compact"] = "0";
-            if (axis)
-                entry.items = {};
-        }
-        pivotFields.push(entry);
+        // Preserved `<items>` (C-84) keep Excel's item order — the indices the
+        // pivot's `<chartFormats>` pivot areas reference.
+        const items = preserved.get(name)?.items;
+        const children = items?.length ? [buildFieldItems(items)] : axis ? [el("items")] : [];
+        pivotFields.push(el("pivotField", { ...attributes, compact: "0" }, children));
     }
-    const rowFields = (pivot.rows ?? [])
+    const rowFieldIndices = (pivot.rows ?? [])
         .map((r) => fieldIndices.get(r.field))
-        .filter((i) => i != null)
-        .map((i) => ({ "@_x": String(i) }));
-    const colFields = (pivot.columns ?? [])
+        .filter((i) => i != null);
+    const colFieldIndices = (pivot.columns ?? [])
         .map((c) => fieldIndices.get(c.field))
-        .filter((i) => i != null)
-        .map((i) => ({ "@_x": String(i) }));
+        .filter((i) => i != null);
+    const axisFields = (indices) => indices.map((i) => 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).
-    const runTotalBase = rowFields[0]?.["@_x"] ?? colFields[0]?.["@_x"] ?? "0";
+    const runTotalBase = String(rowFieldIndices[0] ?? colFieldIndices[0] ?? 0);
     const dataFields = (pivot.values ?? [])
         .map((v) => {
         const idx = fieldIndices.get(v.field);
         if (idx == null)
             return null;
-        const entry = {
-            "@_name": v.displayName ?? `${v.aggFunc} of ${v.field}`,
-            "@_fld": String(idx),
-            "@_subtotal": calculatedNames.has(v.field)
-                ? "sum"
-                : aggToSubtotal(v.aggFunc),
-        };
         const showDataAs = v.showAs ? SHOW_DATA_AS[v.showAs] : undefined;
-        if (showDataAs) {
-            entry["@_showDataAs"] = showDataAs;
-            if (showDataAs === "runTotal")
-                entry["@_baseField"] = runTotalBase;
-        }
         const 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: v.displayName ?? `${v.aggFunc} of ${v.field}`,
+            fld: String(idx),
+            subtotal: calculatedNames.has(v.field) ? "sum" : aggToSubtotal(v.aggFunc),
+            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 }),
+                    ]),
+                ]),
+            ]
+            : []);
     })
         .filter((d) => d !== null);
     const styleInfo = pivot.styleInfo ?? {};
     const styleFlag = (value, fallback) => value === undefined ? fallback : value ? "1" : "0";
-    const doc = {
-        "?xml": { "@_version": "1.0", "@_encoding": "UTF-8", "@_standalone": "yes" },
-        pivotTableDefinition: {
-            "@_xmlns": "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-            "@_name": pivot.name ?? `PivotTable${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);
+    const chartFormats = buildChartFormats(pivot);
+    return buildDocument(el("pivotTableDefinition", {
+        xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
+        name: pivot.name ?? `PivotTable${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",
+    }, [
+        el("location", { ref, firstHeaderRow: "1", firstDataRow: "1", firstDataCol: "1" }),
+        ...(pivotFields.length
+            ? [el("pivotFields", { count: String(pivotFields.length) }, pivotFields)]
+            : []),
+        ...(rowFieldIndices.length
+            ? [el("rowFields", { count: String(rowFieldIndices.length) }, axisFields(rowFieldIndices))]
+            : []),
+        ...(colFieldIndices.length
+            ? [el("colFields", { count: String(colFieldIndices.length) }, axisFields(colFieldIndices))]
+            : []),
+        ...(dataFields.length
+            ? [el("dataFields", { count: String(dataFields.length) }, dataFields)]
+            : []),
+        // CT_pivotTableDefinition order: chartFormats follows dataFields (and
+        // formats / conditionalFormats) and precedes pivotTableStyleInfo.
+        ...(chartFormats ? [chartFormats] : []),
+        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"),
+        }),
+    ]));
 };
 /**
  * Build the pivotTable.xml.rels file (links the pivot to its
@@ -300,16 +353,11 @@ export const buildPivotTableXml = (pivot, cacheId, fieldIndices) => {
  *                     "../pivotCache/pivotCacheDefinition1.xml"
  */
 export const buildPivotTableRelsXml = (cacheRid, cacheTarget) => {
-    const 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,
+        }),
+    ]));
 };

package/dist/esm/exporter/xlsx/style-builder.d.ts

@@ -1,4 +1,4 @@
-import type { CellData, CellFormat, Color, TextFormat } from "@rowsncolumns/spreadsheet";
+import type { CellData, CellFormat, Color, TextFormat, BandedDefinition } from "@rowsncolumns/spreadsheet";
 import { type CellXfs } from "@rowsncolumns/spreadsheet-state";
 type NamedCellStyleRecord = {
     name: string;
@@ -8,7 +8,7 @@ type NamedCellStyleRecord = {
     hidden?: boolean;
     customBuiltin?: boolean;
 };
-type CustomTableStyleRecord = {
+export type CustomTableStyleRecord = {
     name: string;
     pivot?: boolean;
     elements: Array<{
@@ -20,6 +20,12 @@ type CustomTableStyleRecord = {
         italic?: boolean;
     }>;
 };
+/**
+ * A `CustomTableStyle`'s banding as `<tableStyleElement>` records — the inverse of the parser's
+ * `getCustomTableStyleBanding` (header → `headerRow`, stripes, totals row with its bold, first /
+ * last column, column stripes). Elements without a colour or font are dropped (#668 T-103).
+ */
+export declare const tableStyleElementsFromBanding: (bandedRange: BandedDefinition) => CustomTableStyleRecord["elements"];
 export declare class StyleBuilder {
     private numberFormats;
     private fonts;

package/dist/esm/exporter/xlsx/style-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"style-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/style-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EACR,UAAU,EACV,KAAK,EAEL,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAwF/D,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAKF,KAAK,sBAAsB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,eAAe,CAAC,EAAE,KAAK,CAAC;QACxB,SAAS,CAAC,EAAE,KAAK,CAAC;QAClB,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC,CAAC;CACJ,CAAC;AAEF,qBAAa,YAAY;IACvB,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,KAAK,CAKX;IACF,OAAO,CAAC,KAAK,CAA+D;IAC5E,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,eAAe,CAErB;IACF,OAAO,CAAC,iBAAiB,CAAgC;IAEzD;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAC,OAAO,EAAE,oBAAoB,EAAE;IAUlD;;;;;;;OAOG;IACH,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,EAAE;IAOtD,OAAO,CAAC,OAAO,CAOb;IAEF,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,IAAI,CAAmB;IAC/B,OAAO,CAAC,MAAM,CAA6B;;IAU3C;;;;;;;OAOG;IACH,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI;IASzC,YAAY,CAAC,CAAC,SAAS,QAAQ,EAC7B,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC1B,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS;IACnC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC,GAC/C,MAAM;IAsET,0BAA0B,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI;IA0BrD,OAAO,CAAC,iBAAiB;IAoCzB,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,SAAS;IA2DjB,OAAO,CAAC,WAAW;IA2BnB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,eAAe;IA8BvB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,YAAY;IAMpB,KAAK;CAuJN"}
+{"version":3,"file":"style-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/style-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EACR,UAAU,EACV,KAAK,EAEL,UAAU,EACV,gBAAgB,EAEjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAwF/D,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAKF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,eAAe,CAAC,EAAE,KAAK,CAAC;QACxB,SAAS,CAAC,EAAE,KAAK,CAAC;QAClB,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC,CAAC;CACJ,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,GACxC,aAAa,gBAAgB,KAC5B,sBAAsB,CAAC,UAAU,CAqBnC,CAAC;AAEF,qBAAa,YAAY;IACvB,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,KAAK,CAKX;IACF,OAAO,CAAC,KAAK,CAA+D;IAC5E,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,eAAe,CAErB;IACF,OAAO,CAAC,iBAAiB,CAAgC;IAEzD;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAC,OAAO,EAAE,oBAAoB,EAAE;IAUlD;;;;;;;OAOG;IACH,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,EAAE;IAOtD,OAAO,CAAC,OAAO,CAOb;IAEF,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,IAAI,CAAmB;IAC/B,OAAO,CAAC,MAAM,CAA6B;;IAU3C;;;;;;;OAOG;IACH,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI;IASzC,YAAY,CAAC,CAAC,SAAS,QAAQ,EAC7B,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC1B,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS;IACnC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC,GAC/C,MAAM;IAsET,0BAA0B,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI;IA0BrD,OAAO,CAAC,iBAAiB;IAoCzB,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,SAAS;IA2DjB,OAAO,CAAC,WAAW;IA2BnB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,eAAe;IA8BvB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,YAAY;IAMpB,KAAK;CAuJN"}

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

@@ -7,6 +7,34 @@ const isStyleReference = (value) => !!value && typeof value === "object" && "sid
 // numFmtId 47 per ECMA-376). Re-aliased for backwards compat with the
 // previous local name in this file.
 const BUILT_IN_NUMFMT_BY_PATTERN = BUILTIN_NUMFMT_BY_PATTERN;
+/**
+ * A `CustomTableStyle`'s banding as `<tableStyleElement>` records — the inverse of the parser's
+ * `getCustomTableStyleBanding` (header → `headerRow`, stripes, totals row with its bold, first /
+ * last column, column stripes). Elements without a colour or font are dropped (#668 T-103).
+ */
+export const tableStyleElementsFromBanding = (bandedRange) => {
+    const rows = bandedRange.rowProperties ?? {};
+    const cols = bandedRange.columnProperties ?? {};
+    const elements = [];
+    const push = (type, backgroundColor, bold) => {
+        if (backgroundColor == null && !bold)
+            return;
+        elements.push({
+            type,
+            ...(backgroundColor != null ? { backgroundColor: backgroundColor } : {}),
+            ...(bold ? { bold: true } : {}),
+        });
+    };
+    push("headerRow", rows.headerColor);
+    push("firstRowStripe", rows.firstBandColor);
+    push("secondRowStripe", rows.secondBandColor);
+    push("totalRow", rows.totalRowColor, rows.totalRowBold === true);
+    push("firstColumn", rows.firstColumnColor);
+    push("lastColumn", rows.lastColumnColor);
+    push("firstColumnStripe", cols.firstBandColor);
+    push("secondColumnStripe", cols.secondBandColor);
+    return elements;
+};
 export class StyleBuilder {
     numberFormats = [];
     fonts = [

package/dist/esm/exporter/xlsx/xlsx-export.d.ts

@@ -1,5 +1,5 @@
 import type { CellData, Citation, CommentThread, DataValidationRuleRecord, IterativeCalculationOptions, SheetData, TextFormat } from "@rowsncolumns/common-types";
-import type { Color, ConditionalFormatRule, EmbeddedChart, EmbeddedObject, NamedRange, PivotTable, ProtectedRange, Sheet, Slicer, SpreadsheetTheme, TableView } from "@rowsncolumns/spreadsheet";
+import type { Color, ConditionalFormatRule, EmbeddedChart, EmbeddedObject, NamedRange, PivotTable, ProtectedRange, Sheet, Slicer, SpreadsheetTheme, TableView, CustomTableStyle } from "@rowsncolumns/spreadsheet";
 import type { CellXfs, SharedStrings as SharedStringsType } from "@rowsncolumns/spreadsheet-state";
 import type { PowerQueryParts } from "../../power-query";
 import type { ExternalLink, WorkbookProperties } from "../../excel-parser/types";
@@ -70,7 +70,7 @@ export type ExportExcelProps<S extends Sheet, T extends CellData, C extends Cita
      * are emitted regardless — Excel needs them as the fallback when a
      * table doesn't pick a custom style.
      */
-    customTableStyles?: Array<{
+    customTableStyles?: Array<CustomTableStyle | {
         name: string;
         pivot?: boolean;
         elements: Array<{