@shbernal/ts-xlsx 3.1.0 → 3.2.0

package/dist/io/xlsx/images.js

@@ -1,12 +1,11 @@
 import { isImageEditAs, isOneCellAnchor, } from '../../core/image.js';
-import { enumToken, numFinite } from '../../xml/xml-attrs.js';
-import { openElements, parseXml, TextCapture } from '../../xml/xml-read.js';
+import { assertWritableNumber, AuthoringError } from '../../errors.js';
+import { enumToken, numFinite, numInteger } from '../../xml/xml-attrs.js';
+import { elementRange, openElements, parseXml, TextCapture } from '../../xml/xml-read.js';
 import { localName } from '../../xml/xml-scan.js';
-import { checkedToken, numAttr, numberText, XML_DECLARATION } from '../../xml/xml.js';
+import { checkedToken, escapeAttr, intAttr, numAttr, numberText, textAttr, XML_DECLARATION, } from '../../xml/xml.js';
 import { relAttr, RELATIONSHIPS_NS } from '../opc/namespaces.js';
-import { relationship, relationshipsPart } from '../opc/rels.js';
 import { DRAWINGML_NS, XDR_NS } from './namespaces.js';
-const IMAGE_REL_TYPE = `${RELATIONSHIPS_NS}/image`;
 const IMAGE_CONTENT_TYPES = new Map([
     ['png', 'image/png'],
     ['jpg', 'image/jpeg'],
@@ -23,81 +22,185 @@ export function imageContentType(extension) {
     const ext = extension.toLowerCase();
     return IMAGE_CONTENT_TYPES.get(ext) ?? `image/${ext}`;
 }
+const ANCHOR_NAMESPACES = ` xmlns:xdr="${XDR_NS}" xmlns:a="${DRAWINGML_NS}" xmlns:r="${RELATIONSHIPS_NS}"`;
 export function drawingXml(images) {
-    const anchors = images.map((image, i) => anchorXml(image, i + 1)).join('');
-    return (XML_DECLARATION +
-        `<xdr:wsDr xmlns:xdr="${XDR_NS}" xmlns:a="${DRAWINGML_NS}" xmlns:r="${RELATIONSHIPS_NS}">` +
-        anchors +
-        '</xdr:wsDr>');
+    const anchors = images.map((image, i) => anchorXml(image, i + 1, '')).join('');
+    return `${XML_DECLARATION}<xdr:wsDr${ANCHOR_NAMESPACES}>${anchors}</xdr:wsDr>`;
 }
-function anchorXml(image, id) {
+export function mergePictures(drawing, images) {
+    const root = elementRange(drawing, ['wsDr']);
+    if (root === undefined) {
+        throw new AuthoringError('cannot add a picture to a kept drawing that has no <wsDr> root');
+    }
+    let lastId = 0;
+    for (const { attrs } of openElements(drawing, 'cNvPr')) {
+        lastId = Math.max(lastId, numInteger(attrs.id, 0) ?? 0);
+    }
+    const anchors = images
+        .map((image, i) => anchorXml(image, lastId + i + 1, ANCHOR_NAMESPACES))
+        .join('');
+    if (root.contentStart === root.end) {
+        const open = drawing.slice(root.start, root.end).replace(/\s*\/>$/, '>');
+        return `${drawing.slice(0, root.start)}${open}${anchors}</${root.name}>${drawing.slice(root.end)}`;
+    }
+    return drawing.slice(0, root.contentEnd) + anchors + drawing.slice(root.contentEnd);
+}
+function anchorXml(image, id, namespaces) {
     const { anchor } = image;
+    const pic = picXml(image, id, anchor.rotation);
     return isOneCellAnchor(anchor)
-        ? oneCellAnchorXml(anchor.from, anchor.ext, anchor.rotation, image.embedId, id)
-        : twoCellAnchorXml(anchor.from, anchor.to, anchor.editAs ?? 'oneCell', anchor.rotation, image.embedId, id);
+        ? oneCellAnchorXml(anchor.from, anchor.ext, pic, namespaces)
+        : twoCellAnchorXml(anchor.from, anchor.to, anchor.editAs ?? 'oneCell', pic, namespaces);
 }
-function twoCellAnchorXml(from, to, editAs, rotation, embedId, id) {
-    return (`<xdr:twoCellAnchor editAs="${checkedToken(editAs, isImageEditAs, 'image anchor edit mode')}">` +
+function twoCellAnchorXml(from, to, editAs, pic, namespaces) {
+    return (`<xdr:twoCellAnchor${namespaces} editAs="${checkedToken(editAs, isImageEditAs, 'image anchor edit mode')}">` +
         `<xdr:from>${anchorPointXml(from)}</xdr:from>` +
         `<xdr:to>${anchorPointXml(to)}</xdr:to>` +
-        picXml(embedId, id, rotation) +
+        pic +
         '<xdr:clientData/>' +
         '</xdr:twoCellAnchor>');
 }
-function oneCellAnchorXml(from, ext, rotation, embedId, id) {
-    return ('<xdr:oneCellAnchor>' +
+function oneCellAnchorXml(from, ext, pic, namespaces) {
+    return (`<xdr:oneCellAnchor${namespaces}>` +
         `<xdr:from>${anchorPointXml(from)}</xdr:from>` +
         `<xdr:ext${numAttr('cx', ext.cx)}${numAttr('cy', ext.cy)}/>` +
-        picXml(embedId, id, rotation) +
+        pic +
         '<xdr:clientData/>' +
         '</xdr:oneCellAnchor>');
 }
-function picXml(embedId, id, rotation) {
+function picXml(image, id, rotation) {
+    const { embedId, properties, hyperlinkId } = image;
     const xfrm = rotation !== undefined ? `<a:xfrm${numAttr('rot', rotation)}/>` : '';
+    const attributes = textAttr('descr', properties.description) + textAttr('title', properties.title);
+    const link = hyperlinkId === undefined
+        ? ''
+        : `<a:hlinkClick r:id="${escapeAttr(hyperlinkId)}"` +
+            `${textAttr('tooltip', properties.hyperlink?.tooltip)}/>`;
+    const cNvPr = link === ''
+        ? `<xdr:cNvPr id="${id}" name="Picture ${id}"${attributes}/>`
+        : `<xdr:cNvPr id="${id}" name="Picture ${id}"${attributes}>${link}</xdr:cNvPr>`;
     return ('<xdr:pic>' +
-        `<xdr:nvPicPr><xdr:cNvPr id="${id}" name="Picture ${id}"/>` +
+        `<xdr:nvPicPr>${cNvPr}` +
         '<xdr:cNvPicPr><a:picLocks noChangeAspect="1"/></xdr:cNvPicPr></xdr:nvPicPr>' +
         `<xdr:blipFill><a:blip r:embed="${embedId}"/>` +
+        srcRectXml(properties.crop) +
         '<a:stretch><a:fillRect/></a:stretch></xdr:blipFill>' +
         `<xdr:spPr>${xfrm}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr>` +
         '</xdr:pic>');
 }
+const CROP_UNITS = 100_000;
+const INT_MAX = 2_147_483_647;
+function srcRectXml(crop) {
+    if (crop === undefined)
+        return '';
+    const edge = (name, fraction) => {
+        if (fraction === undefined)
+            return '';
+        assertWritableNumber(fraction);
+        const units = Math.round(fraction * CROP_UNITS);
+        if (units > INT_MAX) {
+            throw new AuthoringError(`cannot write the picture crop ${name}="${units}": past xsd:int`);
+        }
+        return units === 0 ? '' : intAttr(name, units, -INT_MAX - 1);
+    };
+    const attributes = edge('l', crop.left) + edge('t', crop.top) + edge('r', crop.right) + edge('b', crop.bottom);
+    return attributes === '' ? '' : `<a:srcRect${attributes}/>`;
+}
+function cropEdge(value) {
+    if (value === undefined)
+        return undefined;
+    const percent = value.endsWith('%') ? numFinite(value.slice(0, -1)) : undefined;
+    const units = percent === undefined ? numInteger(value) : Math.round(percent * 1000);
+    if (units === undefined || units === 0 || units > INT_MAX || units < -INT_MAX - 1) {
+        return undefined;
+    }
+    return units / CROP_UNITS;
+}
 function anchorPointXml(point) {
     return (`<xdr:col>${numberText(point.col)}</xdr:col>` +
         `<xdr:colOff>${numberText(point.colOff ?? 0)}</xdr:colOff>` +
         `<xdr:row>${numberText(point.row)}</xdr:row>` +
         `<xdr:rowOff>${numberText(point.rowOff ?? 0)}</xdr:rowOff>`);
 }
-export function drawingRelsXml(mediaTargets) {
-    return relationshipsPart(mediaTargets.map((target, i) => relationship(`rId${i + 1}`, IMAGE_REL_TYPE, target)));
-}
 function blankPoint() {
     return { col: 0, row: 0, colOff: 0, rowOff: 0 };
 }
+const UNMODELED_CONTENT = new Set([
+    'graphicFrame',
+    'sp',
+    'cxnSp',
+    'grpSp',
+    'contentPart',
+    'absoluteAnchor',
+    'AlternateContent',
+]);
 export function parseDrawing(xml) {
     const anchors = [];
+    let fullyModeled = true;
     let from = null;
     let to = null;
     let ext;
     let editAs;
     let rotation;
     let embed;
+    let pictures = 0;
+    let properties = {};
     let target = null;
     let picDepth = 0;
     const coord = new TextCapture(COORDINATES);
     parseXml(xml, {
         onOpen(name, attrs, selfClosing, scope) {
             const local = localName(name);
-            if (local === 'twoCellAnchor' || local === 'oneCellAnchor') {
+            if (UNMODELED_CONTENT.has(local)) {
+                fullyModeled = false;
+            }
+            else if (local === 'twoCellAnchor' || local === 'oneCellAnchor') {
                 from = blankPoint();
                 to = local === 'twoCellAnchor' ? blankPoint() : null;
                 ext = undefined;
                 rotation = undefined;
                 embed = undefined;
-                editAs = enumToken(attrs.editAs, isImageEditAs);
+                pictures = 0;
+                properties = {};
+                editAs =
+                    local === 'twoCellAnchor'
+                        ? (enumToken(attrs.editAs, isImageEditAs) ?? 'twoCell')
+                        : undefined;
             }
             else if (local === 'pic') {
                 picDepth++;
+                pictures++;
+            }
+            else if (local === 'cNvPr' && picDepth > 0) {
+                if (attrs.descr !== undefined && attrs.descr !== '')
+                    properties.description = attrs.descr;
+                if (attrs.title !== undefined && attrs.title !== '')
+                    properties.title = attrs.title;
+            }
+            else if (local === 'hlinkClick' && picDepth > 0) {
+                const id = relAttr(scope, attrs, 'id');
+                if (id !== undefined && id !== '') {
+                    properties.hyperlinkId = id;
+                    if (attrs.tooltip !== undefined)
+                        properties.tooltip = attrs.tooltip;
+                }
+            }
+            else if (local === 'srcRect' && picDepth > 0) {
+                const crop = {};
+                const left = cropEdge(attrs.l);
+                const top = cropEdge(attrs.t);
+                const right = cropEdge(attrs.r);
+                const bottom = cropEdge(attrs.b);
+                if (left !== undefined)
+                    crop.left = left;
+                if (top !== undefined)
+                    crop.top = top;
+                if (right !== undefined)
+                    crop.right = right;
+                if (bottom !== undefined)
+                    crop.bottom = bottom;
+                if (Object.keys(crop).length > 0)
+                    properties.crop = crop;
             }
             else if (local === 'xfrm' && picDepth > 0) {
                 const rot = numFinite(attrs.rot);
@@ -120,6 +223,8 @@ export function parseDrawing(xml) {
                 const value = relAttr(scope, attrs, 'embed');
                 if (value !== undefined)
                     embed = value;
+                if (relAttr(scope, attrs, 'link') !== undefined)
+                    fullyModeled = false;
             }
             else if (target !== null) {
                 coord.open(local, selfClosing);
@@ -143,15 +248,19 @@ export function parseDrawing(xml) {
                 picDepth--;
             }
             else if (local === 'twoCellAnchor' || local === 'oneCellAnchor') {
-                if (from !== null && embed !== undefined) {
-                    const rot = rotation !== undefined ? { rotation } : {};
-                    if (to !== null) {
-                        const mode = editAs !== undefined ? { editAs } : {};
-                        anchors.push({ from: { ...from }, to: { ...to }, ...mode, ...rot, embed });
-                    }
-                    else if (ext !== undefined) {
-                        anchors.push({ from: { ...from }, ext, ...rot, embed });
-                    }
+                const rot = rotation !== undefined ? { rotation } : {};
+                if (from === null || embed === undefined || pictures !== 1) {
+                    fullyModeled = false;
+                }
+                else if (to !== null) {
+                    const mode = editAs !== undefined ? { editAs } : {};
+                    anchors.push({ from: { ...from }, to: { ...to }, ...mode, ...rot, embed, ...properties });
+                }
+                else if (ext !== undefined) {
+                    anchors.push({ from: { ...from }, ext, ...rot, embed, ...properties });
+                }
+                else {
+                    fullyModeled = false;
                 }
                 from = null;
                 to = null;
@@ -159,15 +268,7 @@ export function parseDrawing(xml) {
             }
         },
     });
-    return anchors;
-}
-const UNMODELED_DRAWING_CONTENT = new Set(['graphicFrame', 'sp', 'cxnSp', 'grpSp']);
-export function drawingHasUnmodeledContent(xml) {
-    for (const { local } of openElements(xml)) {
-        if (UNMODELED_DRAWING_CONTENT.has(local))
-            return true;
-    }
-    return false;
+    return { anchors, fullyModeled };
 }
 const COORDINATES = new Set(['col', 'colOff', 'row', 'rowOff']);
 function setCoordinate(point, coord, value) {

package/dist/io/xlsx/namespaces.d.ts

@@ -54,6 +54,14 @@ export declare const DATABAR_LINK_EXT_URI = "{B025F937-C7B1-47D3-B67F-A62EFF666E
 export declare const DATA_VALIDATION_EXT_URI = "{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}";
 export declare const SLICER_LIST_EXT_URI = "{A8765BA9-456A-4dab-B4F3-ACF838C121DE}";
 export declare const SLICER_CACHES_EXT_URI = "{BBE1A952-AA13-448e-AADC-164F8A28A991}";
+/** The extension a dynamic-array formula's cell-metadata block carries its properties in. */
+export declare const DYNAMIC_ARRAY_PROPERTIES_EXT_URI = "{bdbb8cdc-fa1e-496e-a857-3c3f30c029c3}";
+/** The 2017 dynamic-array namespace (`xda:`), which scopes those properties in `xl/metadata.xml`. */
+export declare const DYNAMIC_ARRAY_NS = "http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray";
+/** The extension a rich-value metadata block names its rich value in (`<xlrd:rvb i>`). */
+export declare const RICH_VALUE_BLOCK_EXT_URI = "{3e2802c4-a4d2-4d8b-9148-e3be6c30e623}";
+/** The 2017 rich-data namespace (`xlrd:`): the rich values, their structures, and the blocks naming them. */
+export declare const RICH_DATA_NS = "http://schemas.microsoft.com/office/spreadsheetml/2017/richdata";
 /**
  * Whether an element belongs to the standard SpreadsheetML vocabulary rather than to an extension.
  *

package/dist/io/xlsx/namespaces.js

@@ -11,6 +11,10 @@ export const DATABAR_LINK_EXT_URI = '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}';
 export const DATA_VALIDATION_EXT_URI = '{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}';
 export const SLICER_LIST_EXT_URI = '{A8765BA9-456A-4dab-B4F3-ACF838C121DE}';
 export const SLICER_CACHES_EXT_URI = '{BBE1A952-AA13-448e-AADC-164F8A28A991}';
+export const DYNAMIC_ARRAY_PROPERTIES_EXT_URI = '{bdbb8cdc-fa1e-496e-a857-3c3f30c029c3}';
+export const DYNAMIC_ARRAY_NS = 'http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray';
+export const RICH_VALUE_BLOCK_EXT_URI = '{3e2802c4-a4d2-4d8b-9148-e3be6c30e623}';
+export const RICH_DATA_NS = 'http://schemas.microsoft.com/office/spreadsheetml/2017/richdata';
 export function isMainNamespaceElement(scope, name) {
     const namespace = scope.elementNamespace(name);
     return namespace === SPREADSHEETML_NS || (namespace === undefined && !name.includes(':'));

package/dist/io/xlsx/package-plan.d.ts

@@ -6,29 +6,59 @@ import type { Workbook } from '../../core/workbook.ts';
 import type { Worksheet } from '../../core/worksheet.ts';
 import type { CommentCell } from './comments.ts';
 import type { HyperlinkPlan } from './hyperlinks.ts';
-import type { DrawingImage } from './images.ts';
-export declare class RelIdAllocator {
+import { type DrawingImage } from './images.ts';
+/** One relationship a generated `.rels` part declares, its target already relative to the owner. */
+export interface PlannedRelationship {
+    readonly id: string;
+    readonly type: string;
+    readonly target: string;
+    readonly external?: boolean;
+}
+/**
+ * The relationships one part owns, recorded as their ids are handed out.
+ *
+ * An id and the relationship it names are one fact, so they are written down in one call. When the
+ * ids came from a counter and the `.rels` part was listed somewhere else, a sheet's set was spelled
+ * three times: once where ids were drawn, once in the rels renderer in another order, and once more in
+ * a nine-way condition deciding whether the rels part existed at all. A tenth kind of part needed all
+ * three edits, and missing the last dropped the `.rels` part while the sheet XML still cited the id.
+ * Now the ledger is the rels part, and a part with an empty ledger has none.
+ *
+ * Ids run `rId1`, `rId2`, … in the order parts are added, so no id is derived by summing the ones
+ * before it, and the `.rels` part lists them in that same order. One ledger per owning part; ids are
+ * scoped to it. A ledger adding to a part kept from a file skips the ids that part already holds.
+ */
+export declare class RelationshipLedger {
     #private;
-    /** The next relationship id (`rId1`, `rId2`, …), advancing the counter. */
-    next(): string;
+    /**
+     * @param owner the package path of the part whose `.rels` this is, `''` for the package root.
+     * @param taken the ids the part's `.rels` already holds, none of which a new relationship may take.
+     */
+    constructor(owner: string, taken?: ReadonlySet<string>);
+    /** Record a relationship to a package part, named by its package path, and return its id. */
+    add(type: string, partPath: string): string;
+    /** Record a relationship to a target outside the package (a hyperlink's URL) and return its id. */
+    addExternal(type: string, url: string): string;
+    /** Record a relationship to a place inside this document (a picture link's `#Sheet1!C3`), kept as
+     * written rather than resolved as a part path, and return its id. */
+    addInDocument(type: string, location: string): string;
+    /** Every relationship recorded, in id order. */
+    get relationships(): readonly PlannedRelationship[];
 }
 export interface PivotPlan {
     readonly number: number;
     readonly cacheId: string;
     readonly table: PivotTable;
-    readonly sheetRelId: string;
     workbookRelId: string;
 }
 export interface CommentPlan {
     readonly number: number;
     readonly comments: readonly CommentCell[];
     readonly vmlRelId: string;
-    readonly commentsRelId: string;
 }
 export interface ThreadedCommentPlan {
     readonly number: number;
     readonly threads: readonly CommentThread[];
-    readonly relId: string;
 }
 export interface PrinterSettingsPlan {
     readonly number: number;
@@ -42,8 +72,6 @@ export interface TablePlan {
 }
 export interface BackgroundPlan {
     readonly relId: string;
-    readonly mediaNumber: number;
-    readonly extension: string;
 }
 export interface PreservedPartPlan {
     readonly path: string;
@@ -85,11 +113,8 @@ export interface PreservedPlan {
 export interface DrawingPlan {
     readonly number: number;
     readonly relId: string;
-    readonly images: readonly ImagePlan[];
-}
-export interface ImagePlan extends DrawingImage {
-    readonly mediaNumber: number;
-    readonly extension: string;
+    readonly images: readonly DrawingImage[];
+    readonly relationships: readonly PlannedRelationship[];
 }
 export interface MediaPart {
     readonly number: number;
@@ -109,8 +134,16 @@ export interface MediaPlan {
     resolve(id: number): ResolvedMedia;
 }
 export declare function planMedia(workbook: Workbook, sheets: readonly Worksheet[]): MediaPlan;
-export declare function planPreservedParts(workbook: Workbook, generatedDrawingCount: number, generatedMediaCount: number, generatedPivotCount: number): PreservedPlan;
+/**
+ * The pictures a sheet adds to the drawing it kept from a file, laid out once that drawing's path in the
+ * package is known: each picture's media and link relationships go into `ledger`, the drawing's own,
+ * which already skips the ids the drawing holds.
+ */
+export type PicturesJoiningDrawing = (ledger: RelationshipLedger) => readonly DrawingImage[];
+export declare function planPreservedParts(workbook: Workbook, generatedDrawingCount: number, generatedMediaCount: number, generatedPivotCount: number, pictures: ReadonlyMap<string, PicturesJoiningDrawing>): PreservedPlan;
 export interface SheetPlan {
+    /** Every relationship the sheet's `.rels` part declares, in id order; empty when it needs none. */
+    readonly relationships: readonly PlannedRelationship[];
     readonly tables: TablePlan[];
     readonly drawing: DrawingPlan | null;
     readonly comments: CommentPlan | null;

package/dist/io/xlsx/package-plan.js

@@ -1,12 +1,39 @@
+import { INTERNAL } from '../../core/internal.js';
 import { AuthoringError, InternalError, quoted } from '../../errors.js';
 import { extensionOf, relativePartPath, relsPathFor, THEME_PART_PATH } from '../opc/part-paths.js';
 import { relsPartXml } from '../opc/rels.js';
+import { mergePictures } from './images.js';
 import { drawingPart, mediaPart, pivotCacheDefinitionPart, pivotCacheRecordsPart, pivotTablePart, vmlDrawingPart, } from './part-names.js';
+import { splicePreservedPart } from './preserved-splices.js';
 import { applyThemeOverrides } from './theme-xml.js';
-export class RelIdAllocator {
+export class RelationshipLedger {
+    #owner;
+    #taken;
+    #relationships = [];
     #next = 1;
-    next() {
-        return `rId${this.#next++}`;
+    constructor(owner, taken = new Set()) {
+        this.#owner = owner;
+        this.#taken = taken;
+    }
+    add(type, partPath) {
+        return this.#record({ type, target: relativePartPath(this.#owner, partPath) });
+    }
+    addExternal(type, url) {
+        return this.#record({ type, target: url, external: true });
+    }
+    addInDocument(type, location) {
+        return this.#record({ type, target: location });
+    }
+    get relationships() {
+        return this.#relationships;
+    }
+    #record(relationship) {
+        while (this.#taken.has(`rId${this.#next}`))
+            this.#next += 1;
+        const id = `rId${this.#next}`;
+        this.#next += 1;
+        this.#relationships.push({ id, ...relationship });
+        return id;
     }
 }
 export function planMedia(workbook, sheets) {
@@ -51,7 +78,7 @@ export function planMedia(workbook, sheets) {
         },
     };
 }
-export function planPreservedParts(workbook, generatedDrawingCount, generatedMediaCount, generatedPivotCount) {
+export function planPreservedParts(workbook, generatedDrawingCount, generatedMediaCount, generatedPivotCount, pictures) {
     const sheets = workbook.worksheets;
     const numbering = {
         drawing: generatedDrawingCount,
@@ -78,6 +105,7 @@ export function planPreservedParts(workbook, generatedDrawingCount, generatedMed
         }
     }
     const emitted = new Map();
+    const splices = workbook[INTERNAL].splices();
     for (const reference of allReferences) {
         for (const part of reference.parts) {
             const newPath = resolveRemapped(remap, part.path);
@@ -93,14 +121,23 @@ export function planPreservedParts(workbook, generatedDrawingCount, generatedMed
                     : [{ id: rel.id, type: rel.type, target: relativePartPath(newPath, target) }];
             });
             const overrides = newPath === THEME_PART_PATH ? workbook.themeOverrides : undefined;
+            let bytes = overrides === undefined
+                ? splicePreservedPart(part.bytes, part.contentType, splices)
+                : new TextEncoder().encode(applyThemeOverrides(new TextDecoder().decode(part.bytes), overrides));
+            let relationships = rels;
+            const joining = pictures.get(part.path);
+            if (joining !== undefined) {
+                const ledger = new RelationshipLedger(newPath, new Set(rels.map((rel) => rel.id)));
+                const images = joining(ledger);
+                bytes = new TextEncoder().encode(mergePictures(new TextDecoder().decode(bytes), images));
+                relationships = [...rels, ...ledger.relationships];
+            }
             emitted.set(newPath, {
                 path: newPath,
-                bytes: overrides === undefined
-                    ? part.bytes
-                    : new TextEncoder().encode(applyThemeOverrides(new TextDecoder().decode(part.bytes), overrides)),
+                bytes,
                 contentType: part.contentType,
-                relsPath: rels.length === 0 ? null : relsPathFor(newPath),
-                relsXml: rels.length === 0 ? null : relsPartXml(rels),
+                relsPath: relationships.length === 0 ? null : relsPathFor(newPath),
+                relsXml: relationships.length === 0 ? null : relsPartXml(relationships),
             });
         }
     }

package/dist/io/xlsx/part-names.d.ts

@@ -5,6 +5,12 @@ export declare const SHARED_STRINGS_PART = "xl/sharedStrings.xml";
 /** Singular and unnumbered, unlike the per-sheet thread parts: one identity registry serves the
  * whole workbook's threaded comments. */
 export declare const PERSONS_PART = "xl/persons/person.xml";
+/** The metadata a `<c cm>` and `<c vm>` index: what marks a formula a dynamic array, and what names
+ * the error behind a `#VALUE!`. */
+export declare const METADATA_PART = "xl/metadata.xml";
+/** The rich values a value-metadata block names, and the structures they are read against. */
+export declare const RICH_VALUES_PART = "xl/richData/rdrichvalue.xml";
+export declare const RICH_VALUE_STRUCTURES_PART = "xl/richData/rdrichvaluestructure.xml";
 export declare const CORE_PROPS_PART = "docProps/core.xml";
 export declare const APP_PROPS_PART = "docProps/app.xml";
 /** `xl/worksheets/sheet{n}.xml`, numbered by the sheet's position in the workbook (1-based). */
@@ -31,11 +37,3 @@ export declare function pivotTablePart(number: number): string;
 export declare function pivotCacheDefinitionPart(number: number): string;
 /** `xl/pivotCache/pivotCacheRecords{n}.xml`: the cached rows the definition points at. */
 export declare function pivotCacheRecordsPart(number: number): string;
-/**
- * A part named as a Target of a relationship carried by a *worksheet*. Every worksheet part lives in
- * `xl/worksheets/`, so one sheet's view of a target is every sheet's, and the sheet number the
- * arithmetic runs against does not matter.
- */
-export declare function targetFromWorksheet(partPath: string): string;
-/** A part named as a Target of a relationship carried by the workbook part. */
-export declare function targetFromWorkbook(partPath: string): string;

package/dist/io/xlsx/part-names.js

@@ -1,8 +1,10 @@
-import { relativePartPath } from '../opc/part-paths.js';
 export const WORKBOOK_PART = 'xl/workbook.xml';
 export const STYLES_PART = 'xl/styles.xml';
 export const SHARED_STRINGS_PART = 'xl/sharedStrings.xml';
 export const PERSONS_PART = 'xl/persons/person.xml';
+export const METADATA_PART = 'xl/metadata.xml';
+export const RICH_VALUES_PART = 'xl/richData/rdrichvalue.xml';
+export const RICH_VALUE_STRUCTURES_PART = 'xl/richData/rdrichvaluestructure.xml';
 export const CORE_PROPS_PART = 'docProps/core.xml';
 export const APP_PROPS_PART = 'docProps/app.xml';
 export function worksheetPart(number) {
@@ -38,9 +40,3 @@ export function pivotCacheDefinitionPart(number) {
 export function pivotCacheRecordsPart(number) {
     return `xl/pivotCache/pivotCacheRecords${number}.xml`;
 }
-export function targetFromWorksheet(partPath) {
-    return relativePartPath(worksheetPart(1), partPath);
-}
-export function targetFromWorkbook(partPath) {
-    return relativePartPath(WORKBOOK_PART, partPath);
-}

package/dist/io/xlsx/pivot.d.ts

@@ -1,9 +1,9 @@
 import type { PivotTable } from '../../core/pivot-table.ts';
-/** The `pivotCacheDefinition` part: the source reference and the field catalogue. `r:id="rId1"`
- * names the cache-records part through this cache's own rels part. `refreshOnLoad="1"` tells Excel to
- * rebuild the pivot body from the cache on open, so the layout stays correct without us computing it
- * to the pixel. `recordCount` is the number of source data rows. */
-export declare function pivotCacheDefinitionXml(table: PivotTable): string;
+/** The `pivotCacheDefinition` part: the source reference and the field catalogue. `recordsRelId` is
+ * the id this cache's own rels part gives the cache-records part, which `r:id` cites.
+ * `refreshOnLoad="1"` tells Excel to rebuild the pivot body from the cache on open, so the layout stays
+ * correct without us computing it to the pixel. `recordCount` is the number of source data rows. */
+export declare function pivotCacheDefinitionXml(table: PivotTable, recordsRelId: string): string;
 /** The `pivotCacheRecords` part: one `<r>` per source data row, each cell either an index into an
  * axis field's shared-items catalogue (`<x>`) or an inline value (`<n>`/`<s>`/`<m>`). */
 export declare function pivotCacheRecordsXml(table: PivotTable): string;

package/dist/io/xlsx/pivot.js

@@ -1,5 +1,5 @@
 import { encodeAddress } from '../../core/address.js';
-import { boolAttr, escapeAttr, numberText, XML_DECLARATION } from '../../xml/xml.js';
+import { escapeAttr, numberText, XML_DECLARATION } from '../../xml/xml.js';
 import { RELATIONSHIPS_NS } from '../opc/namespaces.js';
 import { SPREADSHEETML_NS } from './namespaces.js';
 const METRIC_CAPTIONS = {
@@ -15,30 +15,19 @@ const METRIC_CAPTIONS = {
     var: 'Var',
     varp: 'Varp',
 };
-export function pivotCacheDefinitionXml(table) {
+export function pivotCacheDefinitionXml(table, recordsRelId) {
     const fields = table.cacheFields
         .map((field) => {
         const shared = field.sharedItems;
-        if (shared !== null) {
-            const items = shared.map(sharedItemXml).join('');
-            const blank = field.containsBlank ? ' containsBlank="1"' : '';
-            return (`<cacheField name="${escapeAttr(field.name)}" numFmtId="0">` +
-                `<sharedItems${blank} count="${shared.length}">${items}</sharedItems>` +
-                `</cacheField>`);
-        }
-        const blank = field.containsBlank ? ' containsBlank="1"' : '';
-        const numeric = field.numeric;
-        const descriptor = numeric === null
-            ? `<sharedItems${blank}/>`
-            : `<sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1"` +
-                boolAttr('containsInteger', numeric.allInteger) +
-                blank +
-                ` minValue="${numberText(numeric.min)}" maxValue="${numberText(numeric.max)}"/>`;
+        const kinds = sharedItemsKinds(field);
+        const descriptor = shared === null
+            ? `<sharedItems${kinds}/>`
+            : `<sharedItems${kinds} count="${shared.length}">${shared.map(sharedItemXml).join('')}</sharedItems>`;
         return `<cacheField name="${escapeAttr(field.name)}" numFmtId="0">${descriptor}</cacheField>`;
     })
         .join('');
     return (XML_DECLARATION +
-        `<pivotCacheDefinition xmlns="${SPREADSHEETML_NS}" xmlns:r="${RELATIONSHIPS_NS}" r:id="rId1" refreshOnLoad="1" ` +
+        `<pivotCacheDefinition xmlns="${SPREADSHEETML_NS}" xmlns:r="${RELATIONSHIPS_NS}" r:id="${escapeAttr(recordsRelId)}" refreshOnLoad="1" ` +
         `refreshedBy="ts-xlsx" createdVersion="8" refreshedVersion="8" minRefreshableVersion="3" ` +
         `recordCount="${table.records.length}">` +
         `<cacheSource type="worksheet">` +
@@ -64,15 +53,14 @@ export function pivotTableXml(table, name, cacheId) {
     const location = `A1:${encodeAddress(2 + columnGroups, 3 + rowGroups)}`;
     const pivotFields = table.cacheFields
         .map((field, index) => {
+        const dataField = index === table.valueField ? ' dataField="1"' : '';
         if (table.rowFields.includes(index) || table.columnFields.includes(index)) {
             const axis = table.rowFields.includes(index) ? 'axisRow' : 'axisCol';
             const items = field.sharedItems ?? [];
             const entries = `${items.map((_item, i) => `<item x="${i}"/>`).join('')}<item t="default"/>`;
-            return `<pivotField axis="${axis}" showAll="0"><items count="${items.length + 1}">${entries}</items></pivotField>`;
+            return `<pivotField axis="${axis}"${dataField} showAll="0"><items count="${items.length + 1}">${entries}</items></pivotField>`;
         }
-        if (index === table.valueField)
-            return '<pivotField dataField="1" showAll="0"/>';
-        return '<pivotField showAll="0"/>';
+        return `<pivotField${dataField} showAll="0"/>`;
     })
         .join('');
     const rowFields = table.rowFields.map((index) => `<field x="${index}"/>`).join('');
@@ -103,6 +91,19 @@ function dataFieldXml(table) {
     return (`<dataField name="${escapeAttr(caption)}" fld="${table.valueField}"${subtotal} ` +
         `baseField="0" baseItem="0"/>`);
 }
+function sharedItemsKinds(field) {
+    const { containsString, containsBlank, numeric } = field;
+    const hasNumber = numeric !== null;
+    return ((!containsString && !containsBlank && hasNumber ? ' containsSemiMixedTypes="0"' : '') +
+        (containsString ? '' : ' containsString="0"') +
+        (containsBlank ? ' containsBlank="1"' : '') +
+        (containsString && hasNumber ? ' containsMixedTypes="1"' : '') +
+        (numeric === null
+            ? ''
+            : ' containsNumber="1"' +
+                (numeric.allInteger ? ' containsInteger="1"' : '') +
+                ` minValue="${numberText(numeric.min)}" maxValue="${numberText(numeric.max)}"`));
+}
 function sharedItemXml(item) {
     switch (item.kind) {
         case 'string':