@cj-tech-master/excelts 2.0.0-canary.20251228013952.4f2c3c6 → 2.0.0-canary.20251228024848.8822305

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/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>
     `;

package/dist/types/csv/csv-core.d.ts

@@ -24,12 +24,6 @@ export type RowTransformFunction<I = Row, O = Row> = ((row: I) => O | null) | ((
 export type RowValidateCallback = (error?: Error | null, isValid?: boolean, reason?: string) => void;
 /** Row validate function - sync or async */
 export type RowValidateFunction<T = Row> = ((row: T) => boolean) | ((row: T, callback: RowValidateCallback) => void);
-/** Validation result */
-export interface RowValidationResult<T = Row> {
-    row: T | null;
-    isValid: boolean;
-    reason?: string;
-}
 /**
  * CSV parsing options
  */

package/dist/types/stream/xlsx/workbook-reader.d.ts

@@ -51,7 +51,7 @@ interface EntryPayload {
     id?: string;
 }
 /** Parse event types */
-export type ParseEventType = "shared-strings" | "worksheet" | "hyperlinks";
+export type ParseEventType = EntryPayload["type"];
 export interface SharedStringEvent {
     eventType: "shared-strings";
     value: {

package/dist/types/stream/xlsx/worksheet-reader.d.ts

@@ -10,7 +10,7 @@ export interface WorksheetHyperlink {
     rId: string;
 }
 /** Events emitted during worksheet parsing */
-export type WorksheetEventType = "row" | "hyperlink";
+export type WorksheetEventType = RowEvent["eventType"] | HyperlinkEvent["eventType"];
 /** Row event emitted during parsing */
 export interface RowEvent {
     eventType: "row";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cj-tech-master/excelts",
-  "version": "2.0.0-canary.20251228013952.4f2c3c6",
+  "version": "2.0.0-canary.20251228024848.8822305",
   "description": "TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.",
   "type": "module",
   "publishConfig": {