@cj-tech-master/excelts 9.4.2 → 9.5.0

package/dist/esm/modules/excel/image.js

@@ -92,9 +92,19 @@ class Image {
                 };
             }
             else if (range) {
+                // Anchor inputs:
+                //   - string addresses ("A1") are 1-based; the internal Anchor uses
+                //     0-based nativeCol/nativeRow, so the top-left address is shifted
+                //     by -1. The bottom-right address is intentionally NOT shifted —
+                //     this matches the string-range path (e.g. "A1:B2") where br
+                //     anchors the cell *past* the address (i.e. its right/bottom edge).
+                //   - object inputs ({ col, row } / AnchorModel) already use the
+                //     0-based convention and are passed through as-is.
+                const tlInput = range.tl;
+                const brInput = range.br;
                 this.range = {
-                    tl: new Anchor(this.worksheet, range.tl, 0),
-                    br: range.br ? new Anchor(this.worksheet, range.br, 0) : undefined,
+                    tl: new Anchor(this.worksheet, tlInput, typeof tlInput === "string" ? -1 : 0),
+                    br: brInput ? new Anchor(this.worksheet, brInput, 0) : undefined,
                     ext: range.ext,
                     editAs: range.editAs,
                     hyperlinks: hyperlinks || ("hyperlinks" in range ? range.hyperlinks : undefined)

package/dist/esm/modules/excel/pivot-chart.js

@@ -0,0 +1,53 @@
+import { quoteSheetName } from "./utils/address.js";
+const DEFAULT_PIVOT_CHART_PIVOT_AREA_XML = '<pivotArea type="data" outline="0" fieldPosition="0"><references count="1"><reference field="4294967294" count="1" selected="0"><x v="0"/></reference></references></pivotArea>';
+export function withPivotChartSource(pivotTable, options, fmtId, pivotChartOptions) {
+    // Auto-assign the next available fmtId when the caller didn't pass
+    // one. Before this fix, a second `addPivotChart(pivotTable, …)`
+    // against the same pivot would reuse `fmtId=0`, collide with the
+    // first chart's `chartFormat` entry (the `exists` guard in
+    // `ensurePivotChartFormat` would no-op), and produce two charts
+    // pointing at a single pivotArea declaration — Excel renders only
+    // one of them correctly.
+    const existingFormats = pivotTable.chartFormats ?? [];
+    const allocatedFmtId = fmtId ??
+        (existingFormats.length === 0 ? 0 : Math.max(...existingFormats.map(f => f.format ?? 0)) + 1);
+    const resolvedPivotOpts = pivotChartOptions ?? options.pivotChartOptions;
+    ensurePivotChartFormat(pivotTable, allocatedFmtId);
+    applyPivotChartOptions(pivotTable, resolvedPivotOpts);
+    return {
+        ...options,
+        pivotSource: {
+            name: buildPivotChartSourceName(pivotTable),
+            fmtId: allocatedFmtId,
+            options: resolvedPivotOpts
+        }
+    };
+}
+function applyPivotChartOptions(pivotTable, options) {
+    if (!options) {
+        return;
+    }
+    pivotTable.pivotChartOptions = options;
+    if (options.refreshOnOpen && pivotTable.cacheDefinition) {
+        pivotTable.cacheDefinition.refreshOnLoad = "1";
+    }
+}
+function ensurePivotChartFormat(pivotTable, fmtId) {
+    pivotTable.chartFormat ?? (pivotTable.chartFormat = 1);
+    pivotTable.chartFormats ?? (pivotTable.chartFormats = []);
+    const exists = pivotTable.chartFormats.some(format => format.chart === 0 && format.format === fmtId);
+    if (!exists) {
+        pivotTable.chartFormats.push({
+            chart: 0,
+            format: fmtId,
+            series: true,
+            pivotAreaXml: DEFAULT_PIVOT_CHART_PIVOT_AREA_XML
+        });
+    }
+}
+function buildPivotChartSourceName(pivotTable) {
+    const tableName = pivotTable.name ?? `PivotTable${pivotTable.tableNumber}`;
+    return pivotTable.worksheetName
+        ? `${quoteSheetName(pivotTable.worksheetName)}!${tableName}`
+        : tableName;
+}

package/dist/esm/modules/excel/pivot-table.js

@@ -183,8 +183,14 @@ function makePivotTable(worksheet, model) {
     const nextCacheId = existingCacheIds.length > 0
         ? existingCacheIds.reduce((a, b) => (a > b ? a : b), -Infinity) + 1
         : BASE_CACHE_ID + tableNumber - 1;
+    // Normalise the optional user-supplied anchor. A range (e.g. "A3:C5") is
+    // reduced to its top-left cell; the pivot's own field layout determines the
+    // extent of the placeholder location written to XML.
+    const ref = normalisePivotRef(model.ref);
     // form pivot table object
     return {
+        name: `PivotTable${tableNumber}`,
+        worksheetName: worksheet.name,
         source,
         rows: rowIndices,
         columns: columnIndices,
@@ -198,10 +204,39 @@ function makePivotTable(worksheet, model) {
         // '0' = preserve worksheet column widths (useful for custom sizing)
         // '1' = apply pivot table style width/height (default Excel behavior)
         applyWidthHeightFormats: model.applyWidthHeightFormats ?? "1",
+        ref,
         // Table number for file naming (pivotTable1.xml, pivotTable2.xml, etc.)
         tableNumber
     };
 }
+/**
+ * Normalise a user-supplied pivot anchor to a canonical top-left cell address
+ * (e.g. `"A3"`). Accepts either a single cell or a range; ranges are collapsed
+ * to their top-left cell. Returns `undefined` when the input is missing.
+ */
+function normalisePivotRef(ref) {
+    if (ref === undefined) {
+        return undefined;
+    }
+    if (typeof ref !== "string" || ref.trim() === "") {
+        throw new PivotTableError(`Invalid pivot table ref "${String(ref)}". Provide a cell address like "A3".`);
+    }
+    // Strip an optional sheet prefix ("Sheet1!A3") so users can pass through
+    // range strings composed elsewhere without surprises.
+    const trimmed = ref.trim().replace(/^[^!]+!/, "");
+    const topLeft = trimmed.includes(":") ? trimmed.split(":", 1)[0] : trimmed;
+    let decoded;
+    try {
+        decoded = colCache.decodeAddress(topLeft);
+    }
+    catch {
+        throw new PivotTableError(`Invalid pivot table ref "${ref}". Provide a cell address like "A3".`);
+    }
+    if (!decoded.col || !decoded.row) {
+        throw new PivotTableError(`Invalid pivot table ref "${ref}". Both column and row are required (e.g. "A3").`);
+    }
+    return `${colCache.n2l(decoded.col)}${decoded.row}`;
+}
 function validate(model, source) {
     const columns = model.columns ?? [];
     const pages = model.pages ?? [];

package/dist/esm/modules/excel/range.js

@@ -170,10 +170,14 @@ class Range {
     get _serialisedSheetName() {
         const { sheetName } = this.model;
         if (sheetName) {
+            // Plain ASCII identifiers (and the empty string) need no quoting.
             if (/^[a-zA-Z0-9]*$/.test(sheetName)) {
                 return `${sheetName}!`;
             }
-            return `'${sheetName}'!`;
+            // Per OOXML / Excel formula syntax, sheet names containing characters
+            // outside the bareword set are wrapped in single quotes, and any
+            // embedded apostrophes are doubled (e.g. `O'Brien` -> `'O''Brien'`).
+            return `'${sheetName.replace(/'/g, "''")}'!`;
         }
         return "";
     }

package/dist/esm/modules/excel/sparkline/index.js

@@ -0,0 +1,7 @@
+/**
+ * Sparkline module — worksheet mini-charts.
+ *
+ * Sparklines are rendered as `x14:sparklineGroups` inside the worksheet's
+ * extLst. They are distinct from chart objects (which live in chartN.xml).
+ */
+export * from "./sparkline.js";