@cj-tech-master/excelts 9.4.2 → 9.5.0

package/dist/browser/modules/excel/stream/worksheet-writer.js

@@ -430,8 +430,9 @@ class WorksheetWriter {
         if (typeof filter === "number") {
             this.conditionalFormatting.splice(filter, 1);
         }
-        else if (filter instanceof Function) {
-            this.conditionalFormatting = this.conditionalFormatting.filter(filter);
+        else if (typeof filter === "function") {
+            // Predicate selects rules to drop, not rules to keep.
+            this.conditionalFormatting = this.conditionalFormatting.filter(cf => !filter(cf));
         }
         else {
             this.conditionalFormatting = [];

package/dist/browser/modules/excel/table.js

@@ -111,7 +111,10 @@ class Column {
         return this.column.style;
     }
     set style(value) {
-        this.column.style = value;
+        // Use _set so commit() will replay store() and propagate the new style
+        // to the on-sheet cells; a bare assignment leaves _cache empty and
+        // commit() returns early.
+        this._set("style", value);
     }
     get totalsRowLabel() {
         return this.column.totalsRowLabel;
@@ -237,10 +240,18 @@ class Table {
         const { row, col } = table.tl;
         assert(row > 0, "Table must be on valid row");
         assert(col > 0, "Table must be on valid col");
-        const { width, tableHeight } = this;
-        // autoFilterRef is a single-row range that targets the header row only.
-        // Excel uses this for filter buttons; including data rows can break filter rendering.
-        table.autoFilterRef = colCache.encode(row, col, row, col + width - 1);
+        const { width, filterHeight, tableHeight } = this;
+        // autoFilterRef spans the header + all data rows (excludes the
+        // optional totals row). Matches what Excel itself emits: a real
+        // `<table ref="A1:C7"><autoFilter ref="A1:C7"/>` uses the same
+        // range for both when there's no totals row, and shrinks the
+        // autoFilter by one row when a totals row is present. Emitting a
+        // single-row range (`A1:C1`) — which the library did previously —
+        // made Excel reject the entire table on open with "Removed
+        // Records: Table from /xl/tables/tableN.xml part (Table)" because
+        // the spec requires the autoFilter range to cover the filterable
+        // data.
+        table.autoFilterRef = colCache.encode(row, col, row + filterHeight - 1, col + width - 1);
         // tableRef is a range that includes optional headers and totals
         table.tableRef = colCache.encode(row, col, row + tableHeight - 1, col + width - 1);
         table.columns.forEach((column, i) => {
@@ -477,7 +488,32 @@ class Table {
     }
     set name(value) {
         this.cacheState();
-        this.table.name = sanitizeTableName(value);
+        const newName = sanitizeTableName(value);
+        const oldName = this.table.name;
+        if (newName === oldName) {
+            return;
+        }
+        // Synchronise the worksheet's table map and the workbook-wide name set
+        // so subsequent getTable(newName)/duplicate-name checks remain correct.
+        // Falls back to a bare assignment if the worksheet hasn't registered
+        // this table (e.g. transient instances built by Worksheet.set model).
+        const ws = this.worksheet;
+        const tables = ws?.tables;
+        const tableNames = ws?.workbook?._tableNames;
+        if (tables && tables[oldName] === this) {
+            const newKey = newName.toLowerCase();
+            const oldKey = oldName.toLowerCase();
+            if (newKey !== oldKey && tableNames?.has(newKey)) {
+                throw new TableError(`Table name "${newName}" already exists in the workbook (case-insensitive).`);
+            }
+            delete tables[oldName];
+            tables[newName] = this;
+            if (tableNames) {
+                tableNames.delete(oldKey);
+                tableNames.add(newKey);
+            }
+        }
+        this.table.name = newName;
     }
     get displayName() {
         return this.table.displayName || this.table.name;

package/dist/browser/modules/excel/types.d.ts

@@ -379,6 +379,78 @@ export interface Comment {
     margins?: Partial<CommentMargins>;
     protection?: Partial<CommentProtection>;
     editAs?: CommentEditAs;
+    /**
+     * Office 365 threaded-comment conversation anchored at the same
+     * cell. When present, Excel surfaces the modern reply UI; the
+     * classic VML note still renders as a fallback for older viewers.
+     *
+     * The first entry in the list is the top-level comment; subsequent
+     * entries with `parentId === first.id` are replies to it. Nested
+     * threads beyond two levels are not supported by Excel itself.
+     */
+    threadedComments?: ThreadedComment[];
+}
+/**
+ * A single entry in a threaded-comment conversation
+ * (`xl/threadedComments/threadedComment{N}.xml` →
+ * `<threadedComment ref="…" personId="…" id="…" parentId="…">`).
+ *
+ * `id` is a GUID-braced string Excel expects to uniquely identify the
+ * comment within the sheet; callers may omit it and let the writer
+ * synthesise one. `personId` must reference an entry in the
+ * workbook-level {@link ThreadedCommentPerson} list — the writer
+ * enforces this by adding any dangling `personId` to the list with a
+ * placeholder displayName.
+ */
+export interface ThreadedComment {
+    /** `{GUID}`-style id; auto-generated if absent. */
+    id?: string;
+    /**
+     * Id of the parent comment when this entry is a reply. Absent for
+     * top-level comments.
+     */
+    parentId?: string;
+    /** Reference to the author in the workbook persons list. */
+    personId: string;
+    /** Creation timestamp as an ISO-8601 string. */
+    date?: string;
+    /** Plain-text body. @mentions are expressed separately via {@link mentions}. */
+    text: string;
+    /**
+     * Structured `@mention` markers inside `text`. `startIndex`/`length`
+     * point at the substring Excel shows as a clickable mention.
+     */
+    mentions?: ThreadedCommentMention[];
+    /**
+     * Whether Excel marks this comment as "resolved". Corresponds to
+     * `done="1"` on the commentExt element. When undefined, Excel treats
+     * the thread as open.
+     */
+    done?: boolean;
+}
+export interface ThreadedCommentMention {
+    mentionId?: string;
+    mentionPersonId: string;
+    startIndex: number;
+    length: number;
+}
+/**
+ * Workbook-level person directory referenced by threaded comments.
+ * Written as `xl/persons/person.xml`; one `<person>` element per
+ * unique commenter.
+ */
+export interface ThreadedCommentPerson {
+    /** `{GUID}`-style id referenced by `threadedComment/@personId`. */
+    id: string;
+    /** Display name shown in the UI (e.g. "Jane Doe"). */
+    displayName: string;
+    /** Provider user id (e.g. "jane@example.com", "S-1-5-…"). */
+    userId?: string;
+    /**
+     * Identity provider — "AD" (Active Directory), "PeoplePicker",
+     * "None". Excel preserves unknown values verbatim.
+     */
+    providerId?: string;
 }
 export type DataValidationOperator = "between" | "notBetween" | "equal" | "notEqual" | "greaterThan" | "lessThan" | "greaterThanOrEqual" | "lessThanOrEqual";
 /** Base properties shared by all data validation types */

package/dist/browser/modules/excel/utils/address.d.ts

@@ -74,3 +74,21 @@ export declare function decodeRange(range: string): SheetRange;
  */
 export declare function encodeRange(range: SheetRange): string;
 export declare function encodeRange(start: CellAddress, end: CellAddress): string;
+/**
+ * Excel allows unquoted sheet names only when they consist entirely of
+ * ASCII letters, digits, and underscores *and* do not start with a digit.
+ * Any sheet name with a space, dot, comma, bracket, `&`, CJK character,
+ * or any other non-trivial symbol must be wrapped in single quotes, with
+ * existing single quotes doubled.
+ *
+ * Shared helper so chart-api, pivot-chart, cache-populator, and the XForm
+ * layer all agree on the rule — before this was unified, three callers
+ * in the chart module used three different regexes, producing divergent
+ * formula strings for sheet names with punctuation.
+ *
+ * @example quoteSheetName("Sheet1") // "Sheet1"
+ * @example quoteSheetName("My Sheet") // "'My Sheet'"
+ * @example quoteSheetName("It's Fine") // "'It''s Fine'"
+ * @example quoteSheetName("2023 Data") // "'2023 Data'" (leading digit → quoted)
+ */
+export declare function quoteSheetName(sheetName: string): string;

package/dist/browser/modules/excel/utils/address.js

@@ -95,3 +95,31 @@ export function encodeRange(startOrRange, end) {
     const endStr = encodeCell(end);
     return startStr === endStr ? startStr : `${startStr}:${endStr}`;
 }
+// =============================================================================
+// Sheet name quoting (Excel formula references)
+// =============================================================================
+/**
+ * Excel allows unquoted sheet names only when they consist entirely of
+ * ASCII letters, digits, and underscores *and* do not start with a digit.
+ * Any sheet name with a space, dot, comma, bracket, `&`, CJK character,
+ * or any other non-trivial symbol must be wrapped in single quotes, with
+ * existing single quotes doubled.
+ *
+ * Shared helper so chart-api, pivot-chart, cache-populator, and the XForm
+ * layer all agree on the rule — before this was unified, three callers
+ * in the chart module used three different regexes, producing divergent
+ * formula strings for sheet names with punctuation.
+ *
+ * @example quoteSheetName("Sheet1") // "Sheet1"
+ * @example quoteSheetName("My Sheet") // "'My Sheet'"
+ * @example quoteSheetName("It's Fine") // "'It''s Fine'"
+ * @example quoteSheetName("2023 Data") // "'2023 Data'" (leading digit → quoted)
+ */
+export function quoteSheetName(sheetName) {
+    // Leading digit forces quoting even with an otherwise clean name —
+    // Excel would otherwise parse `2023Data!A1` as a numeric literal.
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(sheetName)) {
+        return `'${sheetName.replace(/'/g, "''")}'`;
+    }
+    return sheetName;
+}

package/dist/browser/modules/excel/utils/drawing-utils.js

@@ -101,20 +101,25 @@ export function filterDrawingAnchors(anchors) {
         if (a == null) {
             return false;
         }
-        // Absolute anchors need a valid picture
+        // Absolute anchors need either a picture (image with pos+ext) or a
+        // graphicFrame (chart placed via `{ pos, ext }`). The previous
+        // filter returned `!!a.picture` for every absolute anchor,
+        // silently dropping every chart anchored via `{ pos: { x, y },
+        // ext: { cx, cy } }` on write — the drawing XML came out empty
+        // and the chart disappeared from the saved file.
         if (a.range?.pos !== undefined) {
-            return !!a.picture;
+            return !!a.picture || !!a.graphicFrame || !!a.shape;
         }
         // Form controls have range.br and shape properties
         if (a.range?.br && a.shape) {
             return true;
         }
-        // One-cell anchors need a valid picture
-        if (!a.range?.br && !a.picture) {
+        // One-cell anchors need a valid picture or graphicFrame (charts)
+        if (!a.range?.br && !a.picture && !a.graphicFrame) {
             return false;
         }
-        // Two-cell anchors need either picture or shape
-        if (a.range?.br && !a.picture && !a.shape) {
+        // Two-cell anchors need either picture, shape, or graphicFrame (charts)
+        if (a.range?.br && !a.picture && !a.shape && !a.graphicFrame) {
             return false;
         }
         return true;

package/dist/browser/modules/excel/utils/guid.d.ts

@@ -0,0 +1,15 @@
+/**
+ * GUID helpers for OOXML.
+ *
+ * Office parts that need stable cross-reference ids (threaded comments,
+ * chart uniqueIds, slicer caches, …) use the canonical Microsoft
+ * `{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}` format — 32 uppercase hex
+ * characters split into 8-4-4-4-12 groups, surrounded by braces.
+ *
+ * `synthGuid()` returns an RFC-4122 version-4-compatible value suitable
+ * for those callers. We don't use `crypto.randomUUID()` directly because
+ * it isn't available in every supported runtime (older Node without
+ * `node:crypto` globals); `Math.random` is good enough for uniqueness
+ * within a single workbook, which is the only thing Office cares about.
+ */
+export declare function synthGuid(): string;

package/dist/browser/modules/excel/utils/guid.js

@@ -0,0 +1,35 @@
+/**
+ * GUID helpers for OOXML.
+ *
+ * Office parts that need stable cross-reference ids (threaded comments,
+ * chart uniqueIds, slicer caches, …) use the canonical Microsoft
+ * `{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}` format — 32 uppercase hex
+ * characters split into 8-4-4-4-12 groups, surrounded by braces.
+ *
+ * `synthGuid()` returns an RFC-4122 version-4-compatible value suitable
+ * for those callers. We don't use `crypto.randomUUID()` directly because
+ * it isn't available in every supported runtime (older Node without
+ * `node:crypto` globals); `Math.random` is good enough for uniqueness
+ * within a single workbook, which is the only thing Office cares about.
+ */
+export function synthGuid() {
+    const hex = "0123456789ABCDEF";
+    let out = "";
+    for (let i = 0; i < 32; i++) {
+        // Version 4: bit 48 (13th hex digit) is always '4'.
+        // Variant 10xx: bit 64 (17th hex digit) is one of 8, 9, A, B.
+        if (i === 12) {
+            out += "4";
+        }
+        else if (i === 16) {
+            out += hex[8 + Math.floor(Math.random() * 4)];
+        }
+        else {
+            out += hex[Math.floor(Math.random() * 16)];
+        }
+        if (i === 7 || i === 11 || i === 15 || i === 19) {
+            out += "-";
+        }
+    }
+    return out;
+}

package/dist/browser/modules/excel/utils/ooxml-paths.d.ts

@@ -21,6 +21,14 @@ export declare function getThemeNameFromPath(path: string): string | undefined;
 export declare function isBinaryEntryPath(path: string): boolean;
 export declare function getDrawingNameFromPath(path: string): string | undefined;
 export declare function getDrawingNameFromRelsPath(path: string): string | undefined;
+/**
+ * Canonical filename stem for a chart-overlay drawing part — used by
+ * the reader to recognise `xl/drawings/chartUserShapeN.xml` entries
+ * and stash their bytes for post-load reconciliation onto the owning
+ * chart. Returns `undefined` for any other path, including regular
+ * worksheet drawings (those go through {@link getDrawingNameFromPath}).
+ */
+export declare function getChartUserShapesNameFromPath(path: string): string | undefined;
 export declare function getVmlDrawingNameFromPath(path: string): string | undefined;
 export declare function getVmlDrawingHFNameFromPath(path: string): string | undefined;
 /**
@@ -52,6 +60,22 @@ export declare function worksheetRelsPath(sheetId: number | string): string;
 export declare function worksheetRelTarget(sheetId: number | string): string;
 export declare function commentsPath(sheetId: number | string): string;
 export declare function commentsPathFromName(commentName: string): string;
+/**
+ * Modern Office 365 "threaded comments" — separate from classic VML
+ * comments. Each worksheet that uses threaded comments has its own
+ * `xl/threadedComments/threadedComment{N}.xml` part alongside the
+ * legacy `xl/comments{N}.xml` (classic comments carry a fallback text
+ * representation, threaded comments carry the conversation tree).
+ */
+export declare function threadedCommentsPath(sheetId: number | string): string;
+export declare function threadedCommentsPathFromName(name: string): string;
+/**
+ * Modern Office 365 "persons" list — the directory of commenters
+ * referenced by `threadedComment/@personId`. Workbook-level single
+ * part (`xl/persons/person.xml` is the conventional filename for the
+ * primary, rarely-duplicated list).
+ */
+export declare function personsPath(): string;
 export declare function vmlDrawingPath(sheetId: number | string): string;
 export declare function vmlDrawingHFPath(sheetId: number | string): string;
 export declare function vmlDrawingHFRelsPath(sheetId: number | string): string;
@@ -89,6 +113,50 @@ export declare function pivotTableRelTargetFromWorksheet(n: number | string): st
 export declare function tableRelTargetFromWorksheet(target: string): string;
 export declare function mediaRelTargetFromRels(filename: string): string;
 export declare function ctrlPropPath(id: number | string): string;
+export declare function getChartNumberFromPath(path: string): number | undefined;
+export declare function getChartNumberFromRelsPath(path: string): number | undefined;
+export declare function getChartStyleNumberFromPath(path: string): number | undefined;
+export declare function getChartColorsNumberFromPath(path: string): number | undefined;
+export declare function getChartExStyleNumberFromPath(path: string): number | undefined;
+export declare function getChartExColorsNumberFromPath(path: string): number | undefined;
+export declare function chartPath(n: number | string): string;
+export declare function chartRelsPath(n: number | string): string;
+export declare function chartStylePath(n: number | string): string;
+export declare function chartColorsPath(n: number | string): string;
+export declare function chartExStylePath(n: number | string): string;
+export declare function chartExColorsPath(n: number | string): string;
+export declare function chartRelTargetFromDrawing(n: number | string): string;
+/**
+ * Path of the DrawingML overlay part backing a chart's `c:userShapes`
+ * reference. Placed under `xl/drawings/` with a `chartUserShape` prefix
+ * (rather than sharing the regular `drawingN` pool) so the writer can
+ * allocate it by chart number without colliding with worksheet
+ * drawings. Excel itself is indifferent to the part path — only the
+ * rel target matters — so files loaded with a different original
+ * path are renamed on write.
+ */
+export declare function chartUserShapesPath(n: number | string): string;
+/**
+ * Target path emitted inside `xl/charts/_rels/chartN.xml.rels` for the
+ * user-shapes drawing part. Resolved relative to the rels file's
+ * base directory (`xl/charts/`).
+ */
+export declare function chartUserShapesRelTarget(n: number | string): string;
+export declare function chartStyleRelTarget(n: number | string): string;
+export declare function chartColorsRelTarget(n: number | string): string;
+export declare function chartExStyleRelTarget(n: number | string): string;
+export declare function chartExColorsRelTarget(n: number | string): string;
+export declare function isChartPath(path: string): boolean;
+export declare function isChartStylePath(path: string): boolean;
+export declare function isChartColorsPath(path: string): boolean;
+export declare function isChartRelsPath(path: string): boolean;
+export declare function getChartExNumberFromPath(path: string): number | undefined;
+export declare function getChartExNumberFromRelsPath(path: string): number | undefined;
+export declare function chartExPath(n: number | string): string;
+export declare function chartExRelsPath(n: number | string): string;
+export declare function chartExRelTargetFromDrawing(n: number | string): string;
+export declare function isChartExPath(path: string): boolean;
+export declare function isChartExRelsPath(path: string): boolean;
 export declare function ctrlPropRelTargetFromWorksheet(id: number | string): string;
 /**
  * Resolve a relationship Target (relative or absolute) to a normalized zip path.
@@ -101,3 +169,9 @@ export declare function ctrlPropRelTargetFromWorksheet(id: number | string): str
  * @param target   The raw Target value from the .rels file
  */
 export declare function resolveRelTarget(baseDir: string, target: string): string;
+export declare function getChartsheetNoFromPath(path: string): number | undefined;
+export declare function getChartsheetNoFromRelsPath(path: string): number | undefined;
+export declare function chartsheetPath(n: number | string): string;
+export declare function chartsheetRelsPath(n: number | string): string;
+export declare function isChartsheetPath(path: string): boolean;
+export declare function isChartsheetRelsPath(path: string): boolean;

package/dist/browser/modules/excel/utils/ooxml-paths.js

@@ -17,6 +17,16 @@ const themeXmlRegex = /^xl\/theme\/[a-zA-Z0-9]+[.]xml$/;
 const mediaFilenameRegex = /^xl\/media\/([a-zA-Z0-9]+[.][a-zA-Z0-9]{3,4})$/;
 const drawingXmlRegex = /^xl\/drawings\/(drawing\d+)[.]xml$/;
 const drawingRelsXmlRegex = /^xl\/drawings\/_rels\/(drawing\d+)[.]xml[.]rels$/;
+// `chartUserShape` is the canonical stem Excel and this library emit,
+// but OOXML does not mandate any particular filename — the chart part
+// discovers its user-shape drawing via the `.rels` relationship type,
+// not by path. Widen the regex to also accept the plural form and
+// a common third-party variant so foreign packages round-trip without
+// silently dropping the overlay drawing. Packages that name the part
+// entirely differently (e.g. `drawing5.xml` referenced via the
+// `chartUserShapes` rel type) still require the relationship-based
+// discovery path; that's a separate fix tracked against the reader.
+const chartUserShapesXmlRegex = /^xl\/drawings\/((?:chartUserShape|chartUserShapes|userDrawing)\d+)[.]xml$/;
 const vmlDrawingRegex = /^xl\/drawings\/(vmlDrawing\d+)[.]vml$/;
 const vmlDrawingHFRegex = /^xl\/drawings\/(vmlDrawingHF\d+)[.]vml$/;
 // Matches both flat layout (xl/comments1.xml) and subdirectory layout (xl/comments/comment1.xml).
@@ -75,6 +85,17 @@ export function getDrawingNameFromRelsPath(path) {
     const match = drawingRelsXmlRegex.exec(path);
     return match ? match[1] : undefined;
 }
+/**
+ * Canonical filename stem for a chart-overlay drawing part — used by
+ * the reader to recognise `xl/drawings/chartUserShapeN.xml` entries
+ * and stash their bytes for post-load reconciliation onto the owning
+ * chart. Returns `undefined` for any other path, including regular
+ * worksheet drawings (those go through {@link getDrawingNameFromPath}).
+ */
+export function getChartUserShapesNameFromPath(path) {
+    const match = chartUserShapesXmlRegex.exec(path);
+    return match ? match[1] : undefined;
+}
 export function getVmlDrawingNameFromPath(path) {
     const match = vmlDrawingRegex.exec(path);
     return match ? match[1] : undefined;
@@ -156,6 +177,28 @@ export function commentsPathFromName(commentName) {
     // For comments when the caller already has the logical name (e.g. "comments1").
     return `xl/${commentName}.xml`;
 }
+/**
+ * Modern Office 365 "threaded comments" — separate from classic VML
+ * comments. Each worksheet that uses threaded comments has its own
+ * `xl/threadedComments/threadedComment{N}.xml` part alongside the
+ * legacy `xl/comments{N}.xml` (classic comments carry a fallback text
+ * representation, threaded comments carry the conversation tree).
+ */
+export function threadedCommentsPath(sheetId) {
+    return `xl/threadedComments/threadedComment${sheetId}.xml`;
+}
+export function threadedCommentsPathFromName(name) {
+    return `xl/threadedComments/${name}.xml`;
+}
+/**
+ * Modern Office 365 "persons" list — the directory of commenters
+ * referenced by `threadedComment/@personId`. Workbook-level single
+ * part (`xl/persons/person.xml` is the conventional filename for the
+ * primary, rarely-duplicated list).
+ */
+export function personsPath() {
+    return "xl/persons/person.xml";
+}
 export function vmlDrawingPath(sheetId) {
     return `xl/drawings/vmlDrawing${sheetId}.vml`;
 }
@@ -256,6 +299,133 @@ export function mediaRelTargetFromRels(filename) {
 export function ctrlPropPath(id) {
     return `xl/ctrlProps/ctrlProp${id}.xml`;
 }
+// -------- Charts --------
+const chartXmlRegex = /^xl\/charts\/chart(\d+)[.]xml$/;
+const chartRelsXmlRegex = /^xl\/charts\/_rels\/chart(\d+)[.]xml[.]rels$/;
+const chartStyleXmlRegex = /^xl\/charts\/style(\d+)[.]xml$/;
+const chartColorsXmlRegex = /^xl\/charts\/colors(\d+)[.]xml$/;
+const chartExStyleXmlRegex = /^xl\/charts\/styleEx(\d+)[.]xml$/;
+const chartExColorsXmlRegex = /^xl\/charts\/colorsEx(\d+)[.]xml$/;
+export function getChartNumberFromPath(path) {
+    const match = chartXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartNumberFromRelsPath(path) {
+    const match = chartRelsXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartStyleNumberFromPath(path) {
+    const match = chartStyleXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartColorsNumberFromPath(path) {
+    const match = chartColorsXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartExStyleNumberFromPath(path) {
+    const match = chartExStyleXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartExColorsNumberFromPath(path) {
+    const match = chartExColorsXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function chartPath(n) {
+    return `xl/charts/chart${n}.xml`;
+}
+export function chartRelsPath(n) {
+    return `xl/charts/_rels/chart${n}.xml.rels`;
+}
+export function chartStylePath(n) {
+    return `xl/charts/style${n}.xml`;
+}
+export function chartColorsPath(n) {
+    return `xl/charts/colors${n}.xml`;
+}
+export function chartExStylePath(n) {
+    return `xl/charts/styleEx${n}.xml`;
+}
+export function chartExColorsPath(n) {
+    return `xl/charts/colorsEx${n}.xml`;
+}
+export function chartRelTargetFromDrawing(n) {
+    // Target inside xl/drawings/_rels/drawingN.xml.rels (base: xl/drawings/)
+    return `../charts/chart${n}.xml`;
+}
+/**
+ * Path of the DrawingML overlay part backing a chart's `c:userShapes`
+ * reference. Placed under `xl/drawings/` with a `chartUserShape` prefix
+ * (rather than sharing the regular `drawingN` pool) so the writer can
+ * allocate it by chart number without colliding with worksheet
+ * drawings. Excel itself is indifferent to the part path — only the
+ * rel target matters — so files loaded with a different original
+ * path are renamed on write.
+ */
+export function chartUserShapesPath(n) {
+    return `xl/drawings/chartUserShape${n}.xml`;
+}
+/**
+ * Target path emitted inside `xl/charts/_rels/chartN.xml.rels` for the
+ * user-shapes drawing part. Resolved relative to the rels file's
+ * base directory (`xl/charts/`).
+ */
+export function chartUserShapesRelTarget(n) {
+    return `../drawings/chartUserShape${n}.xml`;
+}
+export function chartStyleRelTarget(n) {
+    // Target inside xl/charts/_rels/chartN.xml.rels (base: xl/charts/)
+    return `style${n}.xml`;
+}
+export function chartColorsRelTarget(n) {
+    // Target inside xl/charts/_rels/chartN.xml.rels (base: xl/charts/)
+    return `colors${n}.xml`;
+}
+export function chartExStyleRelTarget(n) {
+    return `styleEx${n}.xml`;
+}
+export function chartExColorsRelTarget(n) {
+    return `colorsEx${n}.xml`;
+}
+export function isChartPath(path) {
+    return chartXmlRegex.test(path);
+}
+export function isChartStylePath(path) {
+    return chartStyleXmlRegex.test(path);
+}
+export function isChartColorsPath(path) {
+    return chartColorsXmlRegex.test(path);
+}
+export function isChartRelsPath(path) {
+    return chartRelsXmlRegex.test(path);
+}
+// ============================================================================
+// Chart Ex (Office 2016+ extended charts: treemap, sunburst, waterfall, etc.)
+// ============================================================================
+const chartExXmlRegex = /^xl\/charts\/chartEx(\d+)[.]xml$/;
+const chartExRelsXmlRegex = /^xl\/charts\/_rels\/chartEx(\d+)[.]xml[.]rels$/;
+export function getChartExNumberFromPath(path) {
+    const match = chartExXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartExNumberFromRelsPath(path) {
+    const match = chartExRelsXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function chartExPath(n) {
+    return `xl/charts/chartEx${n}.xml`;
+}
+export function chartExRelsPath(n) {
+    return `xl/charts/_rels/chartEx${n}.xml.rels`;
+}
+export function chartExRelTargetFromDrawing(n) {
+    return `../charts/chartEx${n}.xml`;
+}
+export function isChartExPath(path) {
+    return chartExXmlRegex.test(path);
+}
+export function isChartExRelsPath(path) {
+    return chartExRelsXmlRegex.test(path);
+}
 export function ctrlPropRelTargetFromWorksheet(id) {
     // Target inside xl/worksheets/_rels/sheetN.xml.rels (base: xl/worksheets/)
     return `../ctrlProps/ctrlProp${id}.xml`;
@@ -271,15 +441,17 @@ export function ctrlPropRelTargetFromWorksheet(id) {
  * @param target   The raw Target value from the .rels file
  */
 export function resolveRelTarget(baseDir, target) {
-    // Absolute target — strip leading slash to get the zip path.
-    if (target.startsWith("/")) {
-        return target.slice(1);
-    }
-    // Ensure baseDir ends with "/" so the join works correctly.
-    const base = baseDir.endsWith("/") ? baseDir : baseDir + "/";
-    // Relative target — resolve against baseDir.
-    // Simple resolution: join base + target, then resolve `.` and `..` segments.
-    const parts = (base + target).split("/");
+    // Normalise every path through the same split / `.` / `..` collapse
+    // so absolute targets with `..` segments (legal per OPC, emitted by
+    // some third-party producers like LibreOffice for cross-folder rels
+    // such as `/xl/worksheets/../charts/chart1.xml`) resolve to a
+    // canonical zip path. Previously the absolute branch returned
+    // `target.slice(1)` verbatim — every downstream `_chartRels[path]`
+    // lookup then missed because the stored keys are canonical.
+    const rawPath = target.startsWith("/")
+        ? target.slice(1)
+        : `${baseDir.endsWith("/") ? baseDir : baseDir + "/"}${target}`;
+    const parts = rawPath.split("/");
     const resolved = [];
     for (const part of parts) {
         if (part === "." || part === "") {
@@ -294,3 +466,28 @@ export function resolveRelTarget(baseDir, target) {
     }
     return resolved.join("/");
 }
+// ============================================================================
+// Chartsheet paths
+// ============================================================================
+const chartsheetXmlRegex = /^xl\/chartsheets\/sheet(\d+)[.]xml$/;
+const chartsheetRelsXmlRegex = /^xl\/chartsheets\/_rels\/sheet(\d+)[.]xml[.]rels$/;
+export function getChartsheetNoFromPath(path) {
+    const match = chartsheetXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function getChartsheetNoFromRelsPath(path) {
+    const match = chartsheetRelsXmlRegex.exec(path);
+    return match ? parseInt(match[1], 10) : undefined;
+}
+export function chartsheetPath(n) {
+    return `xl/chartsheets/sheet${n}.xml`;
+}
+export function chartsheetRelsPath(n) {
+    return `xl/chartsheets/_rels/sheet${n}.xml.rels`;
+}
+export function isChartsheetPath(path) {
+    return chartsheetXmlRegex.test(path);
+}
+export function isChartsheetRelsPath(path) {
+    return chartsheetRelsXmlRegex.test(path);
+}