@cj-tech-master/excelts 2.0.0 → 2.0.1

package/dist/cjs/utils/datetime.js

@@ -7,9 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateFormatter = exports.DateParser = void 0;
-exports.mightBeDate = mightBeDate;
-exports.parseDate = parseDate;
-exports.formatDate = formatDate;
 exports.getSupportedFormats = getSupportedFormats;
 // ============================================================================
 // Constants - Pre-computed lookup tables for zero-allocation operations
@@ -18,7 +15,6 @@ exports.getSupportedFormats = getSupportedFormats;
 const PAD2 = Array.from({ length: 60 }, (_, i) => (i < 10 ? `0${i}` : `${i}`));
 // Character codes for fast comparison
 const C_0 = 48;
-const C_9 = 57;
 const C_DASH = 45;
 const C_SLASH = 47;
 const C_COLON = 58;
@@ -194,158 +190,6 @@ const AUTO_DETECT = [
     [29, [parseISOMsOffset]]
 ];
 // ============================================================================
-// Public API
-// ============================================================================
-/**
- * Quick pre-filter to reject non-date strings
- */
-function mightBeDate(s) {
-    const len = s.length;
-    if (len < 10 || len > 30) {
-        return false;
-    }
-    const c0 = s.charCodeAt(0);
-    const c1 = s.charCodeAt(1);
-    // Must start with digits
-    if (c0 < C_0 || c0 > C_9 || c1 < C_0 || c1 > C_9) {
-        return false;
-    }
-    const c2 = s.charCodeAt(2);
-    // Either YYYY format (4 digits) or MM/DD format (separator at pos 2)
-    return (c2 >= C_0 && c2 <= C_9) || c2 === C_DASH || c2 === C_SLASH;
-}
-/**
- * Parse a date string
- *
- * @param value - String to parse
- * @param formats - Specific formats to try (optional, auto-detects ISO if omitted)
- * @returns Date object or null
- *
- * @example
- * parseDate("2024-12-26")                    // auto-detect ISO
- * parseDate("12-26-2024", ["MM-DD-YYYY"])   // explicit US format
- */
-function parseDate(value, formats) {
-    if (!value || typeof value !== "string") {
-        return null;
-    }
-    const s = value.trim();
-    if (!s) {
-        return null;
-    }
-    // Explicit formats
-    if (formats?.length) {
-        for (const fmt of formats) {
-            const result = PARSERS[fmt]?.(s);
-            if (result) {
-                return result;
-            }
-        }
-        return null;
-    }
-    // Auto-detect by length
-    const len = s.length;
-    for (const [l, parsers] of AUTO_DETECT) {
-        if (len === l) {
-            for (const p of parsers) {
-                const result = p(s);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-    }
-    return null;
-}
-/**
- * Format a Date to string
- *
- * @param date - Date to format
- * @param format - Format template (optional, defaults to ISO)
- * @param utc - Use UTC time (default: false)
- * @returns Formatted string or empty string if invalid
- *
- * @example
- * formatDate(date)                        // "2024-12-26T10:30:00.000+08:00"
- * formatDate(date, "YYYY-MM-DD", true)   // "2024-12-26"
- */
-function formatDate(date, format, utc = false) {
-    if (!(date instanceof Date)) {
-        return "";
-    }
-    const t = date.getTime();
-    if (t !== t) {
-        return "";
-    } // NaN check (faster than isNaN)
-    // Default ISO format - direct string building (faster than toISOString)
-    if (!format) {
-        if (utc) {
-            const y = date.getUTCFullYear();
-            const M = date.getUTCMonth() + 1;
-            const D = date.getUTCDate();
-            const H = date.getUTCHours();
-            const m = date.getUTCMinutes();
-            const s = date.getUTCSeconds();
-            const ms = date.getUTCMilliseconds();
-            return `${y}-${PAD2[M]}-${PAD2[D]}T${PAD2[H]}:${PAD2[m]}:${PAD2[s]}.${ms < 10 ? "00" + ms : ms < 100 ? "0" + ms : ms}Z`;
-        }
-        const y = date.getFullYear();
-        const M = date.getMonth() + 1;
-        const D = date.getDate();
-        const H = date.getHours();
-        const m = date.getMinutes();
-        const s = date.getSeconds();
-        const ms = date.getMilliseconds();
-        return `${y}-${PAD2[M]}-${PAD2[D]}T${PAD2[H]}:${PAD2[m]}:${PAD2[s]}.${ms < 10 ? "00" + ms : ms < 100 ? "0" + ms : ms}${tzOffset(date)}`;
-    }
-    // Fast paths for common formats
-    if (format === "YYYY-MM-DD") {
-        return utc
-            ? `${date.getUTCFullYear()}-${PAD2[date.getUTCMonth() + 1]}-${PAD2[date.getUTCDate()]}`
-            : `${date.getFullYear()}-${PAD2[date.getMonth() + 1]}-${PAD2[date.getDate()]}`;
-    }
-    return renderFormat(date, format, utc);
-}
-function tzOffset(d) {
-    const off = -d.getTimezoneOffset();
-    const sign = off >= 0 ? "+" : "-";
-    const h = (Math.abs(off) / 60) | 0; // Bitwise OR faster than Math.floor
-    const m = Math.abs(off) % 60;
-    return `${sign}${PAD2[h]}:${PAD2[m]}`;
-}
-function renderFormat(d, fmt, utc) {
-    // Handle escaped sections [...]
-    const esc = [];
-    let out = fmt.replace(/\[([^\]]*)\]/g, (_, c) => {
-        esc.push(c);
-        return `\x00${esc.length - 1}\x00`;
-    });
-    // Get components once
-    const y = utc ? d.getUTCFullYear() : d.getFullYear();
-    const M = utc ? d.getUTCMonth() + 1 : d.getMonth() + 1;
-    const D = utc ? d.getUTCDate() : d.getDate();
-    const H = utc ? d.getUTCHours() : d.getHours();
-    const m = utc ? d.getUTCMinutes() : d.getMinutes();
-    const s = utc ? d.getUTCSeconds() : d.getSeconds();
-    const ms = utc ? d.getUTCMilliseconds() : d.getMilliseconds();
-    // Replace tokens
-    out = out
-        .replace(/YYYY/g, String(y))
-        .replace(/SSS/g, ms < 10 ? `00${ms}` : ms < 100 ? `0${ms}` : String(ms))
-        .replace(/MM/g, PAD2[M])
-        .replace(/DD/g, PAD2[D])
-        .replace(/HH/g, PAD2[H])
-        .replace(/mm/g, PAD2[m])
-        .replace(/ss/g, PAD2[s])
-        .replace(/Z/g, utc ? "Z" : tzOffset(d));
-    // Restore escaped
-    if (esc.length) {
-        // oxlint-disable-next-line no-control-regex
-        out = out.replace(/\x00(\d+)\x00/g, (_, i) => esc[+i]);
-    }
-    return out;
-}
-// ============================================================================
 // High-performance batch processors (class-based for state encapsulation)
 // ============================================================================
 /**
@@ -419,6 +263,13 @@ class DateParser {
     }
 }
 exports.DateParser = DateParser;
+function tzOffset(d) {
+    const off = -d.getTimezoneOffset();
+    const sign = off >= 0 ? "+" : "-";
+    const h = (Math.abs(off) / 60) | 0; // Bitwise OR faster than Math.floor
+    const m = Math.abs(off) % 60;
+    return `${sign}${PAD2[h]}:${PAD2[m]}`;
+}
 /**
  * Optimized date formatter for batch processing
  *

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

@@ -46,6 +46,8 @@ class PivotCacheDefinitionXform extends base_xform_1.BaseXform {
      */
     renderNew(xmlStream, model) {
         const { source, cacheFields } = model;
+        // Record count = number of data rows (excluding header row)
+        const recordCount = source.getSheetValues().slice(2).length;
         xmlStream.openXml(xml_stream_1.XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
@@ -56,7 +58,7 @@ class PivotCacheDefinitionXform extends base_xform_1.BaseXform {
             createdVersion: "8",
             refreshedVersion: "8",
             minRefreshableVersion: "3",
-            recordCount: cacheFields.length + 1
+            recordCount
         });
         xmlStream.openNode("cacheSource", { type: "worksheet" });
         xmlStream.leafNode("worksheetSource", {

package/dist/cjs/xlsx/xform/pivot-table/pivot-table-xform.js

@@ -60,6 +60,22 @@ class PivotTableXform extends base_xform_1.BaseXform {
         const { rows, columns, values, cacheFields, cacheId, applyWidthHeightFormats } = model;
         // Generate unique UID for each pivot table to prevent Excel treating them as identical
         const uniqueUid = `{${crypto.randomUUID().toUpperCase()}}`;
+        // Build rowItems - need one <i> for each unique value in row fields, plus grand total
+        const rowItems = buildRowItems(rows, cacheFields);
+        // Build colItems - need one <i> for each unique value in col fields, plus grand total
+        const colItems = buildColItems(columns, cacheFields, values.length);
+        // Calculate pivot table dimensions
+        const rowFieldItemCount = rows.length > 0 ? cacheFields[rows[0]]?.sharedItems?.length || 0 : 0;
+        const colFieldItemCount = columns.length > 0 ? cacheFields[columns[0]]?.sharedItems?.length || 0 : 0;
+        // Location: A3 is where pivot table starts
+        // - firstHeaderRow: 1 (column headers are in first row of pivot table)
+        // - firstDataRow: 2 (data starts in second row)
+        // - firstDataCol: 1 (data starts in second column, after row labels)
+        // Calculate ref based on actual data size
+        const endRow = 3 + rowFieldItemCount + 1; // start row + data rows + grand total
+        const endCol = 1 + colFieldItemCount + 1; // start col + data cols + grand total
+        const endColLetter = String.fromCharCode(64 + endCol);
+        const locationRef = `A3:${endColLetter}${endRow}`;
         xmlStream.openXml(xml_stream_1.XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotTableXform.PIVOT_TABLE_ATTRIBUTES,
@@ -84,23 +100,23 @@ class PivotTableXform extends base_xform_1.BaseXform {
             multipleFieldFilters: "0"
         });
         xmlStream.writeXml(`
-      <location ref="A3:E15" firstHeaderRow="1" firstDataRow="2" firstDataCol="1" />
+      <location ref="${locationRef}" firstHeaderRow="1" firstDataRow="2" firstDataCol="1" />
       <pivotFields count="${cacheFields.length}">
         ${renderPivotFields(model)}
       </pivotFields>
       <rowFields count="${rows.length}">
         ${rows.map(rowIndex => `<field x="${rowIndex}" />`).join("\n    ")}
       </rowFields>
-      <rowItems count="1">
-        <i t="grand"><x /></i>
+      <rowItems count="${rowItems.count}">
+        ${rowItems.xml}
       </rowItems>
       <colFields count="${columns.length === 0 ? 1 : columns.length}">
         ${columns.length === 0
             ? '<field x="-2" />'
             : columns.map(columnIndex => `<field x="${columnIndex}" />`).join("\n    ")}
       </colFields>
-      <colItems count="1">
-        <i t="grand"><x /></i>
+      <colItems count="${colItems.count}">
+        ${colItems.xml}
       </colItems>
       <dataFields count="${values.length}">
         ${buildDataFields(cacheFields, values, model.metric)}
@@ -464,6 +480,70 @@ PivotTableXform.PIVOT_TABLE_ATTRIBUTES = {
     "xmlns:xr": "http://schemas.microsoft.com/office/spreadsheetml/2014/revision"
 };
 // Helpers
+/**
+ * Build rowItems XML - one item for each unique value in row fields, plus grand total.
+ * Each <i> represents a row in the pivot table.
+ * - Regular items: <i><x v="index"/></i> where index is the position in sharedItems
+ * - Grand total: <i t="grand"><x/></i>
+ */
+function buildRowItems(rows, cacheFields) {
+    if (rows.length === 0) {
+        // No row fields - just grand total
+        return { count: 1, xml: '<i t="grand"><x /></i>' };
+    }
+    // Get unique values count from the first row field
+    const rowFieldIndex = rows[0];
+    const sharedItems = cacheFields[rowFieldIndex]?.sharedItems || [];
+    const itemCount = sharedItems.length;
+    // Build items: one for each unique value + grand total
+    const items = [];
+    // Regular items - reference each unique value by index
+    for (let i = 0; i < itemCount; i++) {
+        items.push(`<i><x v="${i}" /></i>`);
+    }
+    // Grand total row
+    items.push('<i t="grand"><x /></i>');
+    return {
+        count: items.length,
+        xml: items.join("\n        ")
+    };
+}
+/**
+ * Build colItems XML - one item for each unique value in column fields, plus grand total.
+ * When there are multiple data fields (values), each column value may have sub-columns.
+ */
+function buildColItems(columns, cacheFields, valueCount) {
+    if (columns.length === 0) {
+        // No column fields - columns are based on data fields (values)
+        if (valueCount > 1) {
+            // Multiple values: one column per value + grand total
+            const items = [];
+            for (let i = 0; i < valueCount; i++) {
+                items.push(`<i><x v="${i}" /></i>`);
+            }
+            items.push('<i t="grand"><x /></i>');
+            return { count: items.length, xml: items.join("\n        ") };
+        }
+        // Single value: just grand total
+        return { count: 1, xml: '<i t="grand"><x /></i>' };
+    }
+    // Get unique values count from the first column field
+    const colFieldIndex = columns[0];
+    const sharedItems = cacheFields[colFieldIndex]?.sharedItems || [];
+    const itemCount = sharedItems.length;
+    // Build items: one for each unique value + grand total
+    const items = [];
+    // Regular items - reference each unique value by index
+    for (let i = 0; i < itemCount; i++) {
+        items.push(`<i><x v="${i}" /></i>`);
+    }
+    // Grand total column
+    items.push('<i t="grand"><x /></i>');
+    return {
+        count: items.length,
+        xml: items.join("\n        ")
+    };
+}
 /**
  * Build dataField XML elements for all values in the pivot table.
  * Supports multiple values when columns is empty.
@@ -504,10 +584,15 @@ function renderPivotField(fieldType, sharedItems) {
     const defaultAttributes = 'compact="0" outline="0" showAll="0" defaultSubtotal="0"';
     if (fieldType === "row" || fieldType === "column") {
         const axis = fieldType === "row" ? "axisRow" : "axisCol";
+        // items = one for each shared item + one default item
+        const itemsXml = [
+            ...sharedItems.map((_item, index) => `<item x="${index}" />`),
+            '<item t="default" />' // Required default item for subtotals/grand totals
+        ].join("\n              ");
         return `
       <pivotField axis="${axis}" ${defaultAttributes}>
         <items count="${sharedItems.length + 1}">
-          ${sharedItems.map((_item, index) => `<item x="${index}" />`).join("\n              ")}
+          ${itemsXml}
         </items>
       </pivotField>
     `;

package/dist/esm/utils/datetime.js

@@ -11,7 +11,6 @@
 const PAD2 = Array.from({ length: 60 }, (_, i) => (i < 10 ? `0${i}` : `${i}`));
 // Character codes for fast comparison
 const C_0 = 48;
-const C_9 = 57;
 const C_DASH = 45;
 const C_SLASH = 47;
 const C_COLON = 58;
@@ -187,158 +186,6 @@ const AUTO_DETECT = [
     [29, [parseISOMsOffset]]
 ];
 // ============================================================================
-// Public API
-// ============================================================================
-/**
- * Quick pre-filter to reject non-date strings
- */
-export function mightBeDate(s) {
-    const len = s.length;
-    if (len < 10 || len > 30) {
-        return false;
-    }
-    const c0 = s.charCodeAt(0);
-    const c1 = s.charCodeAt(1);
-    // Must start with digits
-    if (c0 < C_0 || c0 > C_9 || c1 < C_0 || c1 > C_9) {
-        return false;
-    }
-    const c2 = s.charCodeAt(2);
-    // Either YYYY format (4 digits) or MM/DD format (separator at pos 2)
-    return (c2 >= C_0 && c2 <= C_9) || c2 === C_DASH || c2 === C_SLASH;
-}
-/**
- * Parse a date string
- *
- * @param value - String to parse
- * @param formats - Specific formats to try (optional, auto-detects ISO if omitted)
- * @returns Date object or null
- *
- * @example
- * parseDate("2024-12-26")                    // auto-detect ISO
- * parseDate("12-26-2024", ["MM-DD-YYYY"])   // explicit US format
- */
-export function parseDate(value, formats) {
-    if (!value || typeof value !== "string") {
-        return null;
-    }
-    const s = value.trim();
-    if (!s) {
-        return null;
-    }
-    // Explicit formats
-    if (formats?.length) {
-        for (const fmt of formats) {
-            const result = PARSERS[fmt]?.(s);
-            if (result) {
-                return result;
-            }
-        }
-        return null;
-    }
-    // Auto-detect by length
-    const len = s.length;
-    for (const [l, parsers] of AUTO_DETECT) {
-        if (len === l) {
-            for (const p of parsers) {
-                const result = p(s);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-    }
-    return null;
-}
-/**
- * Format a Date to string
- *
- * @param date - Date to format
- * @param format - Format template (optional, defaults to ISO)
- * @param utc - Use UTC time (default: false)
- * @returns Formatted string or empty string if invalid
- *
- * @example
- * formatDate(date)                        // "2024-12-26T10:30:00.000+08:00"
- * formatDate(date, "YYYY-MM-DD", true)   // "2024-12-26"
- */
-export function formatDate(date, format, utc = false) {
-    if (!(date instanceof Date)) {
-        return "";
-    }
-    const t = date.getTime();
-    if (t !== t) {
-        return "";
-    } // NaN check (faster than isNaN)
-    // Default ISO format - direct string building (faster than toISOString)
-    if (!format) {
-        if (utc) {
-            const y = date.getUTCFullYear();
-            const M = date.getUTCMonth() + 1;
-            const D = date.getUTCDate();
-            const H = date.getUTCHours();
-            const m = date.getUTCMinutes();
-            const s = date.getUTCSeconds();
-            const ms = date.getUTCMilliseconds();
-            return `${y}-${PAD2[M]}-${PAD2[D]}T${PAD2[H]}:${PAD2[m]}:${PAD2[s]}.${ms < 10 ? "00" + ms : ms < 100 ? "0" + ms : ms}Z`;
-        }
-        const y = date.getFullYear();
-        const M = date.getMonth() + 1;
-        const D = date.getDate();
-        const H = date.getHours();
-        const m = date.getMinutes();
-        const s = date.getSeconds();
-        const ms = date.getMilliseconds();
-        return `${y}-${PAD2[M]}-${PAD2[D]}T${PAD2[H]}:${PAD2[m]}:${PAD2[s]}.${ms < 10 ? "00" + ms : ms < 100 ? "0" + ms : ms}${tzOffset(date)}`;
-    }
-    // Fast paths for common formats
-    if (format === "YYYY-MM-DD") {
-        return utc
-            ? `${date.getUTCFullYear()}-${PAD2[date.getUTCMonth() + 1]}-${PAD2[date.getUTCDate()]}`
-            : `${date.getFullYear()}-${PAD2[date.getMonth() + 1]}-${PAD2[date.getDate()]}`;
-    }
-    return renderFormat(date, format, utc);
-}
-function tzOffset(d) {
-    const off = -d.getTimezoneOffset();
-    const sign = off >= 0 ? "+" : "-";
-    const h = (Math.abs(off) / 60) | 0; // Bitwise OR faster than Math.floor
-    const m = Math.abs(off) % 60;
-    return `${sign}${PAD2[h]}:${PAD2[m]}`;
-}
-function renderFormat(d, fmt, utc) {
-    // Handle escaped sections [...]
-    const esc = [];
-    let out = fmt.replace(/\[([^\]]*)\]/g, (_, c) => {
-        esc.push(c);
-        return `\x00${esc.length - 1}\x00`;
-    });
-    // Get components once
-    const y = utc ? d.getUTCFullYear() : d.getFullYear();
-    const M = utc ? d.getUTCMonth() + 1 : d.getMonth() + 1;
-    const D = utc ? d.getUTCDate() : d.getDate();
-    const H = utc ? d.getUTCHours() : d.getHours();
-    const m = utc ? d.getUTCMinutes() : d.getMinutes();
-    const s = utc ? d.getUTCSeconds() : d.getSeconds();
-    const ms = utc ? d.getUTCMilliseconds() : d.getMilliseconds();
-    // Replace tokens
-    out = out
-        .replace(/YYYY/g, String(y))
-        .replace(/SSS/g, ms < 10 ? `00${ms}` : ms < 100 ? `0${ms}` : String(ms))
-        .replace(/MM/g, PAD2[M])
-        .replace(/DD/g, PAD2[D])
-        .replace(/HH/g, PAD2[H])
-        .replace(/mm/g, PAD2[m])
-        .replace(/ss/g, PAD2[s])
-        .replace(/Z/g, utc ? "Z" : tzOffset(d));
-    // Restore escaped
-    if (esc.length) {
-        // oxlint-disable-next-line no-control-regex
-        out = out.replace(/\x00(\d+)\x00/g, (_, i) => esc[+i]);
-    }
-    return out;
-}
-// ============================================================================
 // High-performance batch processors (class-based for state encapsulation)
 // ============================================================================
 /**
@@ -411,6 +258,13 @@ export class DateParser {
         return out;
     }
 }
+function tzOffset(d) {
+    const off = -d.getTimezoneOffset();
+    const sign = off >= 0 ? "+" : "-";
+    const h = (Math.abs(off) / 60) | 0; // Bitwise OR faster than Math.floor
+    const m = Math.abs(off) % 60;
+    return `${sign}${PAD2[h]}:${PAD2[m]}`;
+}
 /**
  * Optimized date formatter for batch processing
  *

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

@@ -43,6 +43,8 @@ class PivotCacheDefinitionXform extends BaseXform {
      */
     renderNew(xmlStream, model) {
         const { source, cacheFields } = model;
+        // Record count = number of data rows (excluding header row)
+        const recordCount = source.getSheetValues().slice(2).length;
         xmlStream.openXml(XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
@@ -53,7 +55,7 @@ class PivotCacheDefinitionXform extends BaseXform {
             createdVersion: "8",
             refreshedVersion: "8",
             minRefreshableVersion: "3",
-            recordCount: cacheFields.length + 1
+            recordCount
         });
         xmlStream.openNode("cacheSource", { type: "worksheet" });
         xmlStream.leafNode("worksheetSource", {

package/dist/esm/xlsx/xform/pivot-table/pivot-table-xform.js

@@ -57,6 +57,22 @@ class PivotTableXform extends BaseXform {
         const { rows, columns, values, cacheFields, cacheId, applyWidthHeightFormats } = model;
         // Generate unique UID for each pivot table to prevent Excel treating them as identical
         const uniqueUid = `{${crypto.randomUUID().toUpperCase()}}`;
+        // Build rowItems - need one <i> for each unique value in row fields, plus grand total
+        const rowItems = buildRowItems(rows, cacheFields);
+        // Build colItems - need one <i> for each unique value in col fields, plus grand total
+        const colItems = buildColItems(columns, cacheFields, values.length);
+        // Calculate pivot table dimensions
+        const rowFieldItemCount = rows.length > 0 ? cacheFields[rows[0]]?.sharedItems?.length || 0 : 0;
+        const colFieldItemCount = columns.length > 0 ? cacheFields[columns[0]]?.sharedItems?.length || 0 : 0;
+        // Location: A3 is where pivot table starts
+        // - firstHeaderRow: 1 (column headers are in first row of pivot table)
+        // - firstDataRow: 2 (data starts in second row)
+        // - firstDataCol: 1 (data starts in second column, after row labels)
+        // Calculate ref based on actual data size
+        const endRow = 3 + rowFieldItemCount + 1; // start row + data rows + grand total
+        const endCol = 1 + colFieldItemCount + 1; // start col + data cols + grand total
+        const endColLetter = String.fromCharCode(64 + endCol);
+        const locationRef = `A3:${endColLetter}${endRow}`;
         xmlStream.openXml(XmlStream.StdDocAttributes);
         xmlStream.openNode(this.tag, {
             ...PivotTableXform.PIVOT_TABLE_ATTRIBUTES,
@@ -81,23 +97,23 @@ class PivotTableXform extends BaseXform {
             multipleFieldFilters: "0"
         });
         xmlStream.writeXml(`
-      <location ref="A3:E15" firstHeaderRow="1" firstDataRow="2" firstDataCol="1" />
+      <location ref="${locationRef}" firstHeaderRow="1" firstDataRow="2" firstDataCol="1" />
       <pivotFields count="${cacheFields.length}">
         ${renderPivotFields(model)}
       </pivotFields>
       <rowFields count="${rows.length}">
         ${rows.map(rowIndex => `<field x="${rowIndex}" />`).join("\n    ")}
       </rowFields>
-      <rowItems count="1">
-        <i t="grand"><x /></i>
+      <rowItems count="${rowItems.count}">
+        ${rowItems.xml}
       </rowItems>
       <colFields count="${columns.length === 0 ? 1 : columns.length}">
         ${columns.length === 0
             ? '<field x="-2" />'
             : columns.map(columnIndex => `<field x="${columnIndex}" />`).join("\n    ")}
       </colFields>
-      <colItems count="1">
-        <i t="grand"><x /></i>
+      <colItems count="${colItems.count}">
+        ${colItems.xml}
       </colItems>
       <dataFields count="${values.length}">
         ${buildDataFields(cacheFields, values, model.metric)}
@@ -460,6 +476,70 @@ PivotTableXform.PIVOT_TABLE_ATTRIBUTES = {
     "xmlns:xr": "http://schemas.microsoft.com/office/spreadsheetml/2014/revision"
 };
 // Helpers
+/**
+ * Build rowItems XML - one item for each unique value in row fields, plus grand total.
+ * Each <i> represents a row in the pivot table.
+ * - Regular items: <i><x v="index"/></i> where index is the position in sharedItems
+ * - Grand total: <i t="grand"><x/></i>
+ */
+function buildRowItems(rows, cacheFields) {
+    if (rows.length === 0) {
+        // No row fields - just grand total
+        return { count: 1, xml: '<i t="grand"><x /></i>' };
+    }
+    // Get unique values count from the first row field
+    const rowFieldIndex = rows[0];
+    const sharedItems = cacheFields[rowFieldIndex]?.sharedItems || [];
+    const itemCount = sharedItems.length;
+    // Build items: one for each unique value + grand total
+    const items = [];
+    // Regular items - reference each unique value by index
+    for (let i = 0; i < itemCount; i++) {
+        items.push(`<i><x v="${i}" /></i>`);
+    }
+    // Grand total row
+    items.push('<i t="grand"><x /></i>');
+    return {
+        count: items.length,
+        xml: items.join("\n        ")
+    };
+}
+/**
+ * Build colItems XML - one item for each unique value in column fields, plus grand total.
+ * When there are multiple data fields (values), each column value may have sub-columns.
+ */
+function buildColItems(columns, cacheFields, valueCount) {
+    if (columns.length === 0) {
+        // No column fields - columns are based on data fields (values)
+        if (valueCount > 1) {
+            // Multiple values: one column per value + grand total
+            const items = [];
+            for (let i = 0; i < valueCount; i++) {
+                items.push(`<i><x v="${i}" /></i>`);
+            }
+            items.push('<i t="grand"><x /></i>');
+            return { count: items.length, xml: items.join("\n        ") };
+        }
+        // Single value: just grand total
+        return { count: 1, xml: '<i t="grand"><x /></i>' };
+    }
+    // Get unique values count from the first column field
+    const colFieldIndex = columns[0];
+    const sharedItems = cacheFields[colFieldIndex]?.sharedItems || [];
+    const itemCount = sharedItems.length;
+    // Build items: one for each unique value + grand total
+    const items = [];
+    // Regular items - reference each unique value by index
+    for (let i = 0; i < itemCount; i++) {
+        items.push(`<i><x v="${i}" /></i>`);
+    }
+    // Grand total column
+    items.push('<i t="grand"><x /></i>');
+    return {
+        count: items.length,
+        xml: items.join("\n        ")
+    };
+}
 /**
  * Build dataField XML elements for all values in the pivot table.
  * Supports multiple values when columns is empty.
@@ -500,10 +580,15 @@ function renderPivotField(fieldType, sharedItems) {
     const defaultAttributes = 'compact="0" outline="0" showAll="0" defaultSubtotal="0"';
     if (fieldType === "row" || fieldType === "column") {
         const axis = fieldType === "row" ? "axisRow" : "axisCol";
+        // items = one for each shared item + one default item
+        const itemsXml = [
+            ...sharedItems.map((_item, index) => `<item x="${index}" />`),
+            '<item t="default" />' // Required default item for subtotals/grand totals
+        ].join("\n              ");
         return `
       <pivotField axis="${axis}" ${defaultAttributes}>
         <items count="${sharedItems.length + 1}">
-          ${sharedItems.map((_item, index) => `<item x="${index}" />`).join("\n              ")}
+          ${itemsXml}
         </items>
       </pivotField>
     `;