@cj-tech-master/excelts 5.0.3 → 5.0.4-canary.20260125235458.742dade

package/dist/browser/modules/archive/unzip/zip-parser.d.ts

@@ -32,6 +32,16 @@ export declare class ZipParser {
      * Check if entry exists
      */
     hasEntry(path: string): boolean;
+    /**
+     * Get the number of child entries in a directory.
+     *
+     * Returns the count of entries whose paths start with the directory prefix,
+     * excluding the directory entry itself. For non-directory entries, returns 0.
+     *
+     * @param path - Directory path (with or without trailing slash)
+     * @returns Number of child entries
+     */
+    getChildCount(path: string): number;
     /**
      * List all file paths
      */

package/dist/browser/modules/archive/unzip/zip-parser.js

@@ -275,6 +275,30 @@ export class ZipParser {
     hasEntry(path) {
         return this.entryMap.has(path);
     }
+    /**
+     * Get the number of child entries in a directory.
+     *
+     * Returns the count of entries whose paths start with the directory prefix,
+     * excluding the directory entry itself. For non-directory entries, returns 0.
+     *
+     * @param path - Directory path (with or without trailing slash)
+     * @returns Number of child entries
+     */
+    getChildCount(path) {
+        const entry = this.entryMap.get(path);
+        if (!entry?.isDirectory) {
+            return 0;
+        }
+        // Ensure prefix ends with "/" for correct matching
+        const prefix = entry.path.endsWith("/") ? entry.path : entry.path + "/";
+        let count = 0;
+        for (const e of this.entries) {
+            if (e.path.startsWith(prefix) && e !== entry) {
+                count++;
+            }
+        }
+        return count;
+    }
     /**
      * List all file paths
      */

package/dist/browser/modules/archive/zip/index.d.ts

@@ -22,6 +22,11 @@ export interface ZipOptions {
      * If false, always follow `level` (DEFLATE when level > 0).
      */
     smartStore?: boolean;
+    /**
+     * If true, entries are written in their original input order.
+     * If false (default), entries are sorted alphabetically by name.
+     */
+    noSort?: boolean;
 }
 export interface ZipEntryOptions {
     level?: number;

package/dist/browser/modules/archive/zip/index.js

@@ -15,7 +15,8 @@ export class ZipArchive {
             timestamps: options.timestamps ?? (reproducible ? "dos" : DEFAULT_ZIP_TIMESTAMPS),
             comment: options.comment,
             modTime: options.modTime ?? (reproducible ? REPRODUCIBLE_ZIP_MOD_TIME : new Date()),
-            smartStore: options.smartStore ?? true
+            smartStore: options.smartStore ?? true,
+            noSort: options.noSort ?? false
         };
     }
     add(name, source, options) {
@@ -105,7 +106,8 @@ export class ZipArchive {
                     timestamps: this._options.timestamps,
                     modTime: this._options.modTime,
                     comment: this._options.comment,
-                    smartStore: this._options.smartStore
+                    smartStore: this._options.smartStore,
+                    noSort: this._options.noSort
                 });
             }
             const entries = await Promise.all(this._entries.map(async (e) => ({
@@ -120,7 +122,8 @@ export class ZipArchive {
                 timestamps: this._options.timestamps,
                 modTime: this._options.modTime,
                 comment: this._options.comment,
-                smartStore: this._options.smartStore
+                smartStore: this._options.smartStore,
+                noSort: this._options.noSort
             });
         }
         return collect(this.stream());
@@ -145,7 +148,8 @@ export class ZipArchive {
             timestamps: this._options.timestamps,
             modTime: this._options.modTime,
             comment: this._options.comment,
-            smartStore: this._options.smartStore
+            smartStore: this._options.smartStore,
+            noSort: this._options.noSort
         });
     }
     async pipeTo(sink) {

package/dist/browser/modules/archive/zip/zip-bytes.d.ts

@@ -42,6 +42,11 @@ export interface ZipOptions extends CompressOptions {
      * - default `timestamps` becomes "dos" (no UTC extra field)
      */
     reproducible?: boolean;
+    /**
+     * If true, entries are written in their original input order.
+     * If false (default), entries are sorted alphabetically by name.
+     */
+    noSort?: boolean;
     /**
      * Max number of entries to compress concurrently in `createZip()`.
      * This helps avoid zlib threadpool saturation / memory spikes with many files.

package/dist/browser/modules/archive/zip/zip-bytes.js

@@ -93,13 +93,23 @@ function buildProcessedEntry(entry, offset, settings, compressedData, deflate) {
         offset
     };
 }
-function appendProcessedEntry(processedEntries, entry, compressedData, deflate, currentOffset, settings) {
-    const processedEntry = buildProcessedEntry(entry, currentOffset, settings, compressedData, deflate);
-    processedEntries.push(processedEntry);
-    return {
-        processedEntry,
-        nextOffset: currentOffset + computeLocalRecordSize(processedEntry)
-    };
+/**
+ * Sort entries alphabetically by name (case-insensitive).
+ * Uses Schwartzian transform to avoid repeated decoding during sort.
+ */
+function sortEntriesByName(entries) {
+    if (entries.length <= 1) {
+        return;
+    }
+    const decoder = new TextDecoder();
+    const decorated = entries.map(entry => ({
+        entry,
+        sortKey: decoder.decode(entry.name).toLowerCase()
+    }));
+    decorated.sort((a, b) => a.sortKey.localeCompare(b.sortKey));
+    for (let i = 0; i < decorated.length; i++) {
+        entries[i] = decorated[i].entry;
+    }
 }
 function finalizeZip(processedEntries, zipComment) {
     // Assemble ZIP into a single buffer to reduce allocations and copying.
@@ -161,6 +171,7 @@ function finalizeZip(processedEntries, zipComment) {
  */
 export async function createZip(entries, options = {}) {
     const reproducible = options.reproducible ?? false;
+    const noSort = options.noSort ?? false;
     const level = options.level ?? DEFAULT_ZIP_LEVEL;
     const smartStore = options.smartStore ?? true;
     const concurrency = options.concurrency ?? 4;
@@ -196,7 +207,10 @@ export async function createZip(entries, options = {}) {
         });
         await Promise.all(workers);
     }
-    // Compute offsets in original order.
+    if (!noSort) {
+        sortEntriesByName(processedEntries);
+    }
+    // Compute offsets after sorting.
     let currentOffset = 0;
     for (let i = 0; i < processedEntries.length; i++) {
         const processedEntry = processedEntries[i];
@@ -212,6 +226,7 @@ export async function createZip(entries, options = {}) {
  */
 export function createZipSync(entries, options = {}) {
     const reproducible = options.reproducible ?? false;
+    const noSort = options.noSort ?? false;
     const level = options.level ?? DEFAULT_ZIP_LEVEL;
     const smartStore = options.smartStore ?? true;
     const timestamps = options.timestamps ?? (reproducible ? "dos" : DEFAULT_ZIP_TIMESTAMPS);
@@ -224,7 +239,6 @@ export function createZipSync(entries, options = {}) {
     };
     const thresholdBytes = options.thresholdBytes;
     const processedEntries = [];
-    let currentOffset = 0;
     for (const entry of entries) {
         const entryLevel = entry.level ?? level;
         const compressOptions = {
@@ -232,8 +246,16 @@ export function createZipSync(entries, options = {}) {
             thresholdBytes
         };
         const { compressedData, deflate } = compressEntryMaybeSync(entry, entryLevel, compressOptions, smartStore);
-        const result = appendProcessedEntry(processedEntries, entry, compressedData, deflate, currentOffset, settings);
-        currentOffset = result.nextOffset;
+        processedEntries.push(buildProcessedEntry(entry, 0, settings, compressedData, deflate));
+    }
+    if (!noSort) {
+        sortEntriesByName(processedEntries);
+    }
+    // Compute offsets after sorting.
+    let currentOffset = 0;
+    for (const processedEntry of processedEntries) {
+        processedEntry.offset = currentOffset;
+        currentOffset += computeLocalRecordSize(processedEntry);
     }
     return finalizeZip(processedEntries, zipComment);
 }

package/dist/browser/modules/excel/xlsx/xform/pivot-table/pivot-cache-definition-xform.d.ts

@@ -7,6 +7,7 @@ import type { PivotTableSource } from "@excel/pivot-table";
 interface ParsedCacheDefinitionModel {
     sourceRef?: string;
     sourceSheet?: string;
+    sourceTableName?: string;
     cacheFields: CacheFieldModel[];
     recordCount?: number;
     rId?: string;

package/dist/browser/modules/excel/xlsx/xform/pivot-table/pivot-cache-definition-xform.js

@@ -71,7 +71,7 @@ class PivotCacheDefinitionXform extends BaseXform {
      * Render loaded pivot cache definition (preserving original structure)
      */
     renderLoaded(xmlStream, model) {
-        const { cacheFields, sourceRef, sourceSheet, recordCount } = model;
+        const { cacheFields, sourceRef, sourceSheet, sourceTableName, recordCount } = model;
         xmlStream.openXml(XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
@@ -83,10 +83,13 @@ class PivotCacheDefinitionXform extends BaseXform {
             recordCount: recordCount || cacheFields.length + 1
         });
         xmlStream.openNode("cacheSource", { type: "worksheet" });
-        xmlStream.leafNode("worksheetSource", {
-            ref: sourceRef,
-            sheet: sourceSheet
-        });
+        // worksheetSource supports two reference styles:
+        // 1. name: references a named Table
+        // 2. ref + sheet: references a cell range on a worksheet
+        const worksheetSourceAttrs = sourceTableName
+            ? { name: sourceTableName }
+            : { ref: sourceRef, sheet: sourceSheet };
+        xmlStream.leafNode("worksheetSource", worksheetSourceAttrs);
         xmlStream.closeNode();
         xmlStream.openNode("cacheFields", { count: cacheFields.length });
         xmlStream.writeXml(cacheFields
@@ -124,6 +127,7 @@ class PivotCacheDefinitionXform extends BaseXform {
                 if (this.inCacheSource && this.model) {
                     this.model.sourceRef = attributes.ref;
                     this.model.sourceSheet = attributes.sheet;
+                    this.model.sourceTableName = attributes.name;
                 }
                 break;
             case "cacheFields":

package/dist/cjs/modules/archive/unzip/zip-parser.js

@@ -278,6 +278,30 @@ class ZipParser {
     hasEntry(path) {
         return this.entryMap.has(path);
     }
+    /**
+     * Get the number of child entries in a directory.
+     *
+     * Returns the count of entries whose paths start with the directory prefix,
+     * excluding the directory entry itself. For non-directory entries, returns 0.
+     *
+     * @param path - Directory path (with or without trailing slash)
+     * @returns Number of child entries
+     */
+    getChildCount(path) {
+        const entry = this.entryMap.get(path);
+        if (!entry?.isDirectory) {
+            return 0;
+        }
+        // Ensure prefix ends with "/" for correct matching
+        const prefix = entry.path.endsWith("/") ? entry.path : entry.path + "/";
+        let count = 0;
+        for (const e of this.entries) {
+            if (e.path.startsWith(prefix) && e !== entry) {
+                count++;
+            }
+        }
+        return count;
+    }
     /**
      * List all file paths
      */

package/dist/cjs/modules/archive/zip/index.js

@@ -19,7 +19,8 @@ class ZipArchive {
             timestamps: options.timestamps ?? (reproducible ? "dos" : defaults_1.DEFAULT_ZIP_TIMESTAMPS),
             comment: options.comment,
             modTime: options.modTime ?? (reproducible ? REPRODUCIBLE_ZIP_MOD_TIME : new Date()),
-            smartStore: options.smartStore ?? true
+            smartStore: options.smartStore ?? true,
+            noSort: options.noSort ?? false
         };
     }
     add(name, source, options) {
@@ -109,7 +110,8 @@ class ZipArchive {
                     timestamps: this._options.timestamps,
                     modTime: this._options.modTime,
                     comment: this._options.comment,
-                    smartStore: this._options.smartStore
+                    smartStore: this._options.smartStore,
+                    noSort: this._options.noSort
                 });
             }
             const entries = await Promise.all(this._entries.map(async (e) => ({
@@ -124,7 +126,8 @@ class ZipArchive {
                 timestamps: this._options.timestamps,
                 modTime: this._options.modTime,
                 comment: this._options.comment,
-                smartStore: this._options.smartStore
+                smartStore: this._options.smartStore,
+                noSort: this._options.noSort
             });
         }
         return (0, archive_sink_1.collect)(this.stream());
@@ -149,7 +152,8 @@ class ZipArchive {
             timestamps: this._options.timestamps,
             modTime: this._options.modTime,
             comment: this._options.comment,
-            smartStore: this._options.smartStore
+            smartStore: this._options.smartStore,
+            noSort: this._options.noSort
         });
     }
     async pipeTo(sink) {

package/dist/cjs/modules/archive/zip/zip-bytes.js

@@ -96,13 +96,23 @@ function buildProcessedEntry(entry, offset, settings, compressedData, deflate) {
         offset
     };
 }
-function appendProcessedEntry(processedEntries, entry, compressedData, deflate, currentOffset, settings) {
-    const processedEntry = buildProcessedEntry(entry, currentOffset, settings, compressedData, deflate);
-    processedEntries.push(processedEntry);
-    return {
-        processedEntry,
-        nextOffset: currentOffset + computeLocalRecordSize(processedEntry)
-    };
+/**
+ * Sort entries alphabetically by name (case-insensitive).
+ * Uses Schwartzian transform to avoid repeated decoding during sort.
+ */
+function sortEntriesByName(entries) {
+    if (entries.length <= 1) {
+        return;
+    }
+    const decoder = new TextDecoder();
+    const decorated = entries.map(entry => ({
+        entry,
+        sortKey: decoder.decode(entry.name).toLowerCase()
+    }));
+    decorated.sort((a, b) => a.sortKey.localeCompare(b.sortKey));
+    for (let i = 0; i < decorated.length; i++) {
+        entries[i] = decorated[i].entry;
+    }
 }
 function finalizeZip(processedEntries, zipComment) {
     // Assemble ZIP into a single buffer to reduce allocations and copying.
@@ -164,6 +174,7 @@ function finalizeZip(processedEntries, zipComment) {
  */
 async function createZip(entries, options = {}) {
     const reproducible = options.reproducible ?? false;
+    const noSort = options.noSort ?? false;
     const level = options.level ?? defaults_1.DEFAULT_ZIP_LEVEL;
     const smartStore = options.smartStore ?? true;
     const concurrency = options.concurrency ?? 4;
@@ -199,7 +210,10 @@ async function createZip(entries, options = {}) {
         });
         await Promise.all(workers);
     }
-    // Compute offsets in original order.
+    if (!noSort) {
+        sortEntriesByName(processedEntries);
+    }
+    // Compute offsets after sorting.
     let currentOffset = 0;
     for (let i = 0; i < processedEntries.length; i++) {
         const processedEntry = processedEntries[i];
@@ -215,6 +229,7 @@ async function createZip(entries, options = {}) {
  */
 function createZipSync(entries, options = {}) {
     const reproducible = options.reproducible ?? false;
+    const noSort = options.noSort ?? false;
     const level = options.level ?? defaults_1.DEFAULT_ZIP_LEVEL;
     const smartStore = options.smartStore ?? true;
     const timestamps = options.timestamps ?? (reproducible ? "dos" : defaults_1.DEFAULT_ZIP_TIMESTAMPS);
@@ -227,7 +242,6 @@ function createZipSync(entries, options = {}) {
     };
     const thresholdBytes = options.thresholdBytes;
     const processedEntries = [];
-    let currentOffset = 0;
     for (const entry of entries) {
         const entryLevel = entry.level ?? level;
         const compressOptions = {
@@ -235,8 +249,16 @@ function createZipSync(entries, options = {}) {
             thresholdBytes
         };
         const { compressedData, deflate } = compressEntryMaybeSync(entry, entryLevel, compressOptions, smartStore);
-        const result = appendProcessedEntry(processedEntries, entry, compressedData, deflate, currentOffset, settings);
-        currentOffset = result.nextOffset;
+        processedEntries.push(buildProcessedEntry(entry, 0, settings, compressedData, deflate));
+    }
+    if (!noSort) {
+        sortEntriesByName(processedEntries);
+    }
+    // Compute offsets after sorting.
+    let currentOffset = 0;
+    for (const processedEntry of processedEntries) {
+        processedEntry.offset = currentOffset;
+        currentOffset += computeLocalRecordSize(processedEntry);
     }
     return finalizeZip(processedEntries, zipComment);
 }

package/dist/cjs/modules/excel/xlsx/xform/pivot-table/pivot-cache-definition-xform.js

@@ -74,7 +74,7 @@ class PivotCacheDefinitionXform extends base_xform_1.BaseXform {
      * Render loaded pivot cache definition (preserving original structure)
      */
     renderLoaded(xmlStream, model) {
-        const { cacheFields, sourceRef, sourceSheet, recordCount } = model;
+        const { cacheFields, sourceRef, sourceSheet, sourceTableName, recordCount } = model;
         xmlStream.openXml(xml_stream_1.XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
@@ -86,10 +86,13 @@ class PivotCacheDefinitionXform extends base_xform_1.BaseXform {
             recordCount: recordCount || cacheFields.length + 1
         });
         xmlStream.openNode("cacheSource", { type: "worksheet" });
-        xmlStream.leafNode("worksheetSource", {
-            ref: sourceRef,
-            sheet: sourceSheet
-        });
+        // worksheetSource supports two reference styles:
+        // 1. name: references a named Table
+        // 2. ref + sheet: references a cell range on a worksheet
+        const worksheetSourceAttrs = sourceTableName
+            ? { name: sourceTableName }
+            : { ref: sourceRef, sheet: sourceSheet };
+        xmlStream.leafNode("worksheetSource", worksheetSourceAttrs);
         xmlStream.closeNode();
         xmlStream.openNode("cacheFields", { count: cacheFields.length });
         xmlStream.writeXml(cacheFields
@@ -127,6 +130,7 @@ class PivotCacheDefinitionXform extends base_xform_1.BaseXform {
                 if (this.inCacheSource && this.model) {
                     this.model.sourceRef = attributes.ref;
                     this.model.sourceSheet = attributes.sheet;
+                    this.model.sourceTableName = attributes.name;
                 }
                 break;
             case "cacheFields":

package/dist/esm/modules/archive/unzip/zip-parser.js

@@ -275,6 +275,30 @@ export class ZipParser {
     hasEntry(path) {
         return this.entryMap.has(path);
     }
+    /**
+     * Get the number of child entries in a directory.
+     *
+     * Returns the count of entries whose paths start with the directory prefix,
+     * excluding the directory entry itself. For non-directory entries, returns 0.
+     *
+     * @param path - Directory path (with or without trailing slash)
+     * @returns Number of child entries
+     */
+    getChildCount(path) {
+        const entry = this.entryMap.get(path);
+        if (!entry?.isDirectory) {
+            return 0;
+        }
+        // Ensure prefix ends with "/" for correct matching
+        const prefix = entry.path.endsWith("/") ? entry.path : entry.path + "/";
+        let count = 0;
+        for (const e of this.entries) {
+            if (e.path.startsWith(prefix) && e !== entry) {
+                count++;
+            }
+        }
+        return count;
+    }
     /**
      * List all file paths
      */

package/dist/esm/modules/archive/zip/index.js

@@ -15,7 +15,8 @@ export class ZipArchive {
             timestamps: options.timestamps ?? (reproducible ? "dos" : DEFAULT_ZIP_TIMESTAMPS),
             comment: options.comment,
             modTime: options.modTime ?? (reproducible ? REPRODUCIBLE_ZIP_MOD_TIME : new Date()),
-            smartStore: options.smartStore ?? true
+            smartStore: options.smartStore ?? true,
+            noSort: options.noSort ?? false
         };
     }
     add(name, source, options) {
@@ -105,7 +106,8 @@ export class ZipArchive {
                     timestamps: this._options.timestamps,
                     modTime: this._options.modTime,
                     comment: this._options.comment,
-                    smartStore: this._options.smartStore
+                    smartStore: this._options.smartStore,
+                    noSort: this._options.noSort
                 });
             }
             const entries = await Promise.all(this._entries.map(async (e) => ({
@@ -120,7 +122,8 @@ export class ZipArchive {
                 timestamps: this._options.timestamps,
                 modTime: this._options.modTime,
                 comment: this._options.comment,
-                smartStore: this._options.smartStore
+                smartStore: this._options.smartStore,
+                noSort: this._options.noSort
             });
         }
         return collect(this.stream());
@@ -145,7 +148,8 @@ export class ZipArchive {
             timestamps: this._options.timestamps,
             modTime: this._options.modTime,
             comment: this._options.comment,
-            smartStore: this._options.smartStore
+            smartStore: this._options.smartStore,
+            noSort: this._options.noSort
         });
     }
     async pipeTo(sink) {

package/dist/esm/modules/archive/zip/zip-bytes.js

@@ -93,13 +93,23 @@ function buildProcessedEntry(entry, offset, settings, compressedData, deflate) {
         offset
     };
 }
-function appendProcessedEntry(processedEntries, entry, compressedData, deflate, currentOffset, settings) {
-    const processedEntry = buildProcessedEntry(entry, currentOffset, settings, compressedData, deflate);
-    processedEntries.push(processedEntry);
-    return {
-        processedEntry,
-        nextOffset: currentOffset + computeLocalRecordSize(processedEntry)
-    };
+/**
+ * Sort entries alphabetically by name (case-insensitive).
+ * Uses Schwartzian transform to avoid repeated decoding during sort.
+ */
+function sortEntriesByName(entries) {
+    if (entries.length <= 1) {
+        return;
+    }
+    const decoder = new TextDecoder();
+    const decorated = entries.map(entry => ({
+        entry,
+        sortKey: decoder.decode(entry.name).toLowerCase()
+    }));
+    decorated.sort((a, b) => a.sortKey.localeCompare(b.sortKey));
+    for (let i = 0; i < decorated.length; i++) {
+        entries[i] = decorated[i].entry;
+    }
 }
 function finalizeZip(processedEntries, zipComment) {
     // Assemble ZIP into a single buffer to reduce allocations and copying.
@@ -161,6 +171,7 @@ function finalizeZip(processedEntries, zipComment) {
  */
 export async function createZip(entries, options = {}) {
     const reproducible = options.reproducible ?? false;
+    const noSort = options.noSort ?? false;
     const level = options.level ?? DEFAULT_ZIP_LEVEL;
     const smartStore = options.smartStore ?? true;
     const concurrency = options.concurrency ?? 4;
@@ -196,7 +207,10 @@ export async function createZip(entries, options = {}) {
         });
         await Promise.all(workers);
     }
-    // Compute offsets in original order.
+    if (!noSort) {
+        sortEntriesByName(processedEntries);
+    }
+    // Compute offsets after sorting.
     let currentOffset = 0;
     for (let i = 0; i < processedEntries.length; i++) {
         const processedEntry = processedEntries[i];
@@ -212,6 +226,7 @@ export async function createZip(entries, options = {}) {
  */
 export function createZipSync(entries, options = {}) {
     const reproducible = options.reproducible ?? false;
+    const noSort = options.noSort ?? false;
     const level = options.level ?? DEFAULT_ZIP_LEVEL;
     const smartStore = options.smartStore ?? true;
     const timestamps = options.timestamps ?? (reproducible ? "dos" : DEFAULT_ZIP_TIMESTAMPS);
@@ -224,7 +239,6 @@ export function createZipSync(entries, options = {}) {
     };
     const thresholdBytes = options.thresholdBytes;
     const processedEntries = [];
-    let currentOffset = 0;
     for (const entry of entries) {
         const entryLevel = entry.level ?? level;
         const compressOptions = {
@@ -232,8 +246,16 @@ export function createZipSync(entries, options = {}) {
             thresholdBytes
         };
         const { compressedData, deflate } = compressEntryMaybeSync(entry, entryLevel, compressOptions, smartStore);
-        const result = appendProcessedEntry(processedEntries, entry, compressedData, deflate, currentOffset, settings);
-        currentOffset = result.nextOffset;
+        processedEntries.push(buildProcessedEntry(entry, 0, settings, compressedData, deflate));
+    }
+    if (!noSort) {
+        sortEntriesByName(processedEntries);
+    }
+    // Compute offsets after sorting.
+    let currentOffset = 0;
+    for (const processedEntry of processedEntries) {
+        processedEntry.offset = currentOffset;
+        currentOffset += computeLocalRecordSize(processedEntry);
     }
     return finalizeZip(processedEntries, zipComment);
 }

package/dist/esm/modules/excel/xlsx/xform/pivot-table/pivot-cache-definition-xform.js

@@ -71,7 +71,7 @@ class PivotCacheDefinitionXform extends BaseXform {
      * Render loaded pivot cache definition (preserving original structure)
      */
     renderLoaded(xmlStream, model) {
-        const { cacheFields, sourceRef, sourceSheet, recordCount } = model;
+        const { cacheFields, sourceRef, sourceSheet, sourceTableName, recordCount } = model;
         xmlStream.openXml(XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
@@ -83,10 +83,13 @@ class PivotCacheDefinitionXform extends BaseXform {
             recordCount: recordCount || cacheFields.length + 1
         });
         xmlStream.openNode("cacheSource", { type: "worksheet" });
-        xmlStream.leafNode("worksheetSource", {
-            ref: sourceRef,
-            sheet: sourceSheet
-        });
+        // worksheetSource supports two reference styles:
+        // 1. name: references a named Table
+        // 2. ref + sheet: references a cell range on a worksheet
+        const worksheetSourceAttrs = sourceTableName
+            ? { name: sourceTableName }
+            : { ref: sourceRef, sheet: sourceSheet };
+        xmlStream.leafNode("worksheetSource", worksheetSourceAttrs);
         xmlStream.closeNode();
         xmlStream.openNode("cacheFields", { count: cacheFields.length });
         xmlStream.writeXml(cacheFields
@@ -124,6 +127,7 @@ class PivotCacheDefinitionXform extends BaseXform {
                 if (this.inCacheSource && this.model) {
                     this.model.sourceRef = attributes.ref;
                     this.model.sourceSheet = attributes.sheet;
+                    this.model.sourceTableName = attributes.name;
                 }
                 break;
             case "cacheFields":