@cj-tech-master/excelts 3.0.0-canary.20251228183403.d3eb98d → 3.0.0

package/dist/cjs/doc/pivot-table.js

@@ -114,7 +114,7 @@ function makePivotTable(worksheet, model) {
     validate(worksheet, model, source);
     const { rows, values } = model;
     const columns = model.columns ?? [];
-    const cacheFields = makeCacheFields(source, [...rows, ...columns], values);
+    const cacheFields = makeCacheFields(source, [...rows, ...columns]);
     const nameToIndex = cacheFields.reduce((result, cacheField, index) => {
         result[cacheField.name] = index;
         return result;
@@ -171,15 +171,13 @@ function validate(_worksheet, model, source) {
         throw new Error("It is currently not possible to have multiple values when columns are specified. Please either supply an empty array for columns or a single value.");
     }
 }
-function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
+function makeCacheFields(source, fieldNamesWithSharedItems) {
     // Cache fields are used in pivot tables to reference source data.
     // Fields in fieldNamesWithSharedItems get their unique values extracted as sharedItems.
-    // Fields in valueFieldNames (but not in fieldNamesWithSharedItems) get min/max calculated.
-    // Other fields are unused and get empty sharedItems.
+    // Other fields (typically numeric) have sharedItems = null.
     const names = source.getRow(1).values;
     // Use Set for O(1) lookup instead of object
     const sharedItemsFields = new Set(fieldNamesWithSharedItems);
-    const valueFields = new Set(valueFieldNames);
     const aggregate = (columnIndex) => {
         const columnValues = source.getColumn(columnIndex).values;
         // Build unique values set directly, skipping header (index 0,1) and null/undefined
@@ -217,11 +215,10 @@ function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
     for (const columnIndex of (0, utils_1.range)(1, names.length)) {
         const name = names[columnIndex];
         if (sharedItemsFields.has(name)) {
-            // Field used for rows/columns - extract unique values as sharedItems
             result.push({ name, sharedItems: aggregate(columnIndex) });
         }
-        else if (valueFields.has(name)) {
-            // Field used only for values (aggregation) - calculate min/max
+        else {
+            // Numeric field - calculate min/max
             const minMax = getMinMax(columnIndex);
             result.push({
                 name,
@@ -230,10 +227,6 @@ function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
                 maxValue: minMax?.maxValue
             });
         }
-        else {
-            // Unused field - just empty sharedItems (like Excel does)
-            result.push({ name, sharedItems: null });
-        }
     }
     return result;
 }

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

@@ -47,26 +47,30 @@ class CacheFieldXform extends base_xform_1.BaseXform {
                 break;
             case "sharedItems":
                 this.inSharedItems = true;
-                // Store numeric field metadata
-                if (this.model) {
-                    this.model.containsNumber = attributes.containsNumber === "1";
-                    this.model.containsInteger = attributes.containsInteger === "1";
-                    if (attributes.minValue !== undefined) {
-                        this.model.minValue = parseFloat(attributes.minValue);
-                    }
-                    if (attributes.maxValue !== undefined) {
-                        this.model.maxValue = parseFloat(attributes.maxValue);
-                    }
-                    // Initialize sharedItems array if count > 0 (for both string and numeric fields)
-                    const count = parseInt(attributes.count || "0", 10);
-                    if (count > 0) {
-                        this.model.sharedItems = [];
-                    }
-                    else {
-                        // No count means no individual items (pure numeric field)
+                // Check if this is a numeric field (no string items)
+                if (attributes.containsNumber === "1" || attributes.containsInteger === "1") {
+                    if (this.model) {
+                        this.model.containsNumber = attributes.containsNumber === "1";
+                        this.model.containsInteger = attributes.containsInteger === "1";
+                        if (attributes.minValue !== undefined) {
+                            this.model.minValue = parseFloat(attributes.minValue);
+                        }
+                        if (attributes.maxValue !== undefined) {
+                            this.model.maxValue = parseFloat(attributes.maxValue);
+                        }
+                        // Numeric fields have sharedItems = null
                         this.model.sharedItems = null;
                     }
                 }
+                else {
+                    // String field - initialize sharedItems array if count > 0
+                    if (this.model) {
+                        const count = parseInt(attributes.count || "0", 10);
+                        if (count > 0) {
+                            this.model.sharedItems = [];
+                        }
+                    }
+                }
                 break;
             case "s":
                 // String value in sharedItems

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

@@ -13,7 +13,7 @@ class CacheField {
         //
         // or
         //
-        // integer type (no sharedItems)
+        // integer type
         //
         // {
         //   'name': 'D',
@@ -21,15 +21,6 @@ class CacheField {
         //   'minValue': 5,
         //   'maxValue': 45
         // }
-        //
-        // or
-        //
-        // numeric type with shared items (used as both row/column and value field)
-        //
-        // {
-        //   'name': 'C',
-        //   'sharedItems': [5, 24, 35, 45]
-        // }
         this.name = name;
         this.sharedItems = sharedItems;
         this.minValue = minValue;
@@ -40,37 +31,17 @@ class CacheField {
         // Shared Items: http://www.datypic.com/sc/ooxml/e-ssml_sharedItems-1.html
         // Escape XML special characters in name attribute
         const escapedName = (0, utils_1.xmlEncode)(this.name);
-        // No shared items - field not used for rows/columns
+        // integer types
         if (this.sharedItems === null) {
-            // If no minValue/maxValue, this is an unused field - use empty sharedItems like Excel does
-            if (this.minValue === undefined || this.maxValue === undefined) {
-                return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems />
-    </cacheField>`;
-            }
-            // Numeric field used only for values (not rows/columns) - include min/max
+            // Build minValue/maxValue attributes if available
+            const minMaxAttrs = this.minValue !== undefined && this.maxValue !== undefined
+                ? ` minValue="${this.minValue}" maxValue="${this.maxValue}"`
+                : "";
             return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="1" minValue="${this.minValue}" maxValue="${this.maxValue}" />
-    </cacheField>`;
-        }
-        // Shared items exist - check if all values are numeric
-        // Note: empty array returns true for every(), so check length first
-        const allNumeric = this.sharedItems.length > 0 &&
-            this.sharedItems.every(item => typeof item === "number" && Number.isFinite(item));
-        const allInteger = allNumeric && this.sharedItems.every(item => Number.isInteger(item));
-        if (allNumeric) {
-            // Numeric shared items - used when field is both a row/column field AND a value field
-            // This allows Excel to both group by unique values AND perform aggregation
-            const minValue = Math.min(...this.sharedItems);
-            const maxValue = Math.max(...this.sharedItems);
-            const integerAttr = allInteger ? ' containsInteger="1"' : "";
-            return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1"${integerAttr} minValue="${minValue}" maxValue="${maxValue}" count="${this.sharedItems.length}">
-        ${this.sharedItems.map(item => `<n v="${item}" />`).join("")}
-      </sharedItems>
+      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="1"${minMaxAttrs} />
     </cacheField>`;
         }
-        // String shared items - escape XML special characters in each value
+        // string types - escape XML special characters in each shared item value
         return `<cacheField name="${escapedName}" numFmtId="0">
       <sharedItems count="${this.sharedItems.length}">
         ${this.sharedItems.map(item => `<s v="${(0, utils_1.xmlEncode)(String(item))}" />`).join("")}

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

@@ -119,7 +119,7 @@ class PivotCacheRecordsXform extends base_xform_1.BaseXform {
             }
             return `<s v="${(0, utils_1.xmlEncode)(String(value))}" />`;
         }
-        // shared items - use indexOf for value lookup (works for both string and numeric)
+        // shared items
         const sharedItemsIndex = sharedItems.indexOf(value);
         if (sharedItemsIndex < 0) {
             throw new Error(`${JSON.stringify(value)} not in sharedItems ${JSON.stringify(sharedItems)}`);

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

@@ -585,24 +585,25 @@ function renderPivotFields(pivotTable) {
     const valueSet = new Set(pivotTable.values);
     return pivotTable.cacheFields
         .map((cacheField, fieldIndex) => {
-        const isRow = rowSet.has(fieldIndex);
-        const isCol = colSet.has(fieldIndex);
-        const isValue = valueSet.has(fieldIndex);
-        return renderPivotField(isRow, isCol, isValue, cacheField.sharedItems);
+        const fieldType = rowSet.has(fieldIndex)
+            ? "row"
+            : colSet.has(fieldIndex)
+                ? "column"
+                : valueSet.has(fieldIndex)
+                    ? "value"
+                    : null;
+        return renderPivotField(fieldType, cacheField.sharedItems);
     })
         .join("");
 }
-function renderPivotField(isRow, isCol, isValue, sharedItems) {
-    // A field can be both a row/column field AND a value field (issue #15)
-    // In this case, it needs both axis attribute AND dataField="1"
-    if (isRow || isCol) {
-        const axis = isRow ? "axisRow" : "axisCol";
+function renderPivotField(fieldType, sharedItems) {
+    // fieldType: 'row', 'column', 'value', null
+    // Note: defaultSubtotal="0" should only be on value fields and non-axis fields,
+    // NOT on row/column axis fields (Excel will auto-calculate subtotals for them)
+    if (fieldType === "row" || fieldType === "column") {
+        const axis = fieldType === "row" ? "axisRow" : "axisCol";
         // Row and column fields should NOT have defaultSubtotal="0"
-        let axisAttributes = 'compact="0" outline="0" showAll="0"';
-        // If also a value field, add dataField="1"
-        if (isValue) {
-            axisAttributes = `dataField="1" ${axisAttributes}`;
-        }
+        const axisAttributes = 'compact="0" outline="0" showAll="0"';
         // items = one for each shared item + one default item
         const itemsXml = [
             ...sharedItems.map((_item, index) => `<item x="${index}" />`),
@@ -620,7 +621,7 @@ function renderPivotField(isRow, isCol, isValue, sharedItems) {
     const defaultAttributes = 'compact="0" outline="0" showAll="0" defaultSubtotal="0"';
     return `
     <pivotField
-      ${isValue ? 'dataField="1"' : ""}
+      ${fieldType === "value" ? 'dataField="1"' : ""}
       ${defaultAttributes}
     />
   `;

package/dist/esm/doc/pivot-table.js

@@ -111,7 +111,7 @@ function makePivotTable(worksheet, model) {
     validate(worksheet, model, source);
     const { rows, values } = model;
     const columns = model.columns ?? [];
-    const cacheFields = makeCacheFields(source, [...rows, ...columns], values);
+    const cacheFields = makeCacheFields(source, [...rows, ...columns]);
     const nameToIndex = cacheFields.reduce((result, cacheField, index) => {
         result[cacheField.name] = index;
         return result;
@@ -168,15 +168,13 @@ function validate(_worksheet, model, source) {
         throw new Error("It is currently not possible to have multiple values when columns are specified. Please either supply an empty array for columns or a single value.");
     }
 }
-function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
+function makeCacheFields(source, fieldNamesWithSharedItems) {
     // Cache fields are used in pivot tables to reference source data.
     // Fields in fieldNamesWithSharedItems get their unique values extracted as sharedItems.
-    // Fields in valueFieldNames (but not in fieldNamesWithSharedItems) get min/max calculated.
-    // Other fields are unused and get empty sharedItems.
+    // Other fields (typically numeric) have sharedItems = null.
     const names = source.getRow(1).values;
     // Use Set for O(1) lookup instead of object
     const sharedItemsFields = new Set(fieldNamesWithSharedItems);
-    const valueFields = new Set(valueFieldNames);
     const aggregate = (columnIndex) => {
         const columnValues = source.getColumn(columnIndex).values;
         // Build unique values set directly, skipping header (index 0,1) and null/undefined
@@ -214,11 +212,10 @@ function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
     for (const columnIndex of range(1, names.length)) {
         const name = names[columnIndex];
         if (sharedItemsFields.has(name)) {
-            // Field used for rows/columns - extract unique values as sharedItems
             result.push({ name, sharedItems: aggregate(columnIndex) });
         }
-        else if (valueFields.has(name)) {
-            // Field used only for values (aggregation) - calculate min/max
+        else {
+            // Numeric field - calculate min/max
             const minMax = getMinMax(columnIndex);
             result.push({
                 name,
@@ -227,10 +224,6 @@ function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
                 maxValue: minMax?.maxValue
             });
         }
-        else {
-            // Unused field - just empty sharedItems (like Excel does)
-            result.push({ name, sharedItems: null });
-        }
     }
     return result;
 }

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

@@ -44,26 +44,30 @@ class CacheFieldXform extends BaseXform {
                 break;
             case "sharedItems":
                 this.inSharedItems = true;
-                // Store numeric field metadata
-                if (this.model) {
-                    this.model.containsNumber = attributes.containsNumber === "1";
-                    this.model.containsInteger = attributes.containsInteger === "1";
-                    if (attributes.minValue !== undefined) {
-                        this.model.minValue = parseFloat(attributes.minValue);
-                    }
-                    if (attributes.maxValue !== undefined) {
-                        this.model.maxValue = parseFloat(attributes.maxValue);
-                    }
-                    // Initialize sharedItems array if count > 0 (for both string and numeric fields)
-                    const count = parseInt(attributes.count || "0", 10);
-                    if (count > 0) {
-                        this.model.sharedItems = [];
-                    }
-                    else {
-                        // No count means no individual items (pure numeric field)
+                // Check if this is a numeric field (no string items)
+                if (attributes.containsNumber === "1" || attributes.containsInteger === "1") {
+                    if (this.model) {
+                        this.model.containsNumber = attributes.containsNumber === "1";
+                        this.model.containsInteger = attributes.containsInteger === "1";
+                        if (attributes.minValue !== undefined) {
+                            this.model.minValue = parseFloat(attributes.minValue);
+                        }
+                        if (attributes.maxValue !== undefined) {
+                            this.model.maxValue = parseFloat(attributes.maxValue);
+                        }
+                        // Numeric fields have sharedItems = null
                         this.model.sharedItems = null;
                     }
                 }
+                else {
+                    // String field - initialize sharedItems array if count > 0
+                    if (this.model) {
+                        const count = parseInt(attributes.count || "0", 10);
+                        if (count > 0) {
+                            this.model.sharedItems = [];
+                        }
+                    }
+                }
                 break;
             case "s":
                 // String value in sharedItems

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

@@ -10,7 +10,7 @@ class CacheField {
         //
         // or
         //
-        // integer type (no sharedItems)
+        // integer type
         //
         // {
         //   'name': 'D',
@@ -18,15 +18,6 @@ class CacheField {
         //   'minValue': 5,
         //   'maxValue': 45
         // }
-        //
-        // or
-        //
-        // numeric type with shared items (used as both row/column and value field)
-        //
-        // {
-        //   'name': 'C',
-        //   'sharedItems': [5, 24, 35, 45]
-        // }
         this.name = name;
         this.sharedItems = sharedItems;
         this.minValue = minValue;
@@ -37,37 +28,17 @@ class CacheField {
         // Shared Items: http://www.datypic.com/sc/ooxml/e-ssml_sharedItems-1.html
         // Escape XML special characters in name attribute
         const escapedName = xmlEncode(this.name);
-        // No shared items - field not used for rows/columns
+        // integer types
         if (this.sharedItems === null) {
-            // If no minValue/maxValue, this is an unused field - use empty sharedItems like Excel does
-            if (this.minValue === undefined || this.maxValue === undefined) {
-                return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems />
-    </cacheField>`;
-            }
-            // Numeric field used only for values (not rows/columns) - include min/max
+            // Build minValue/maxValue attributes if available
+            const minMaxAttrs = this.minValue !== undefined && this.maxValue !== undefined
+                ? ` minValue="${this.minValue}" maxValue="${this.maxValue}"`
+                : "";
             return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="1" minValue="${this.minValue}" maxValue="${this.maxValue}" />
-    </cacheField>`;
-        }
-        // Shared items exist - check if all values are numeric
-        // Note: empty array returns true for every(), so check length first
-        const allNumeric = this.sharedItems.length > 0 &&
-            this.sharedItems.every(item => typeof item === "number" && Number.isFinite(item));
-        const allInteger = allNumeric && this.sharedItems.every(item => Number.isInteger(item));
-        if (allNumeric) {
-            // Numeric shared items - used when field is both a row/column field AND a value field
-            // This allows Excel to both group by unique values AND perform aggregation
-            const minValue = Math.min(...this.sharedItems);
-            const maxValue = Math.max(...this.sharedItems);
-            const integerAttr = allInteger ? ' containsInteger="1"' : "";
-            return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1"${integerAttr} minValue="${minValue}" maxValue="${maxValue}" count="${this.sharedItems.length}">
-        ${this.sharedItems.map(item => `<n v="${item}" />`).join("")}
-      </sharedItems>
+      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="1"${minMaxAttrs} />
     </cacheField>`;
         }
-        // String shared items - escape XML special characters in each value
+        // string types - escape XML special characters in each shared item value
         return `<cacheField name="${escapedName}" numFmtId="0">
       <sharedItems count="${this.sharedItems.length}">
         ${this.sharedItems.map(item => `<s v="${xmlEncode(String(item))}" />`).join("")}

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

@@ -116,7 +116,7 @@ class PivotCacheRecordsXform extends BaseXform {
             }
             return `<s v="${xmlEncode(String(value))}" />`;
         }
-        // shared items - use indexOf for value lookup (works for both string and numeric)
+        // shared items
         const sharedItemsIndex = sharedItems.indexOf(value);
         if (sharedItemsIndex < 0) {
             throw new Error(`${JSON.stringify(value)} not in sharedItems ${JSON.stringify(sharedItems)}`);

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

@@ -581,24 +581,25 @@ function renderPivotFields(pivotTable) {
     const valueSet = new Set(pivotTable.values);
     return pivotTable.cacheFields
         .map((cacheField, fieldIndex) => {
-        const isRow = rowSet.has(fieldIndex);
-        const isCol = colSet.has(fieldIndex);
-        const isValue = valueSet.has(fieldIndex);
-        return renderPivotField(isRow, isCol, isValue, cacheField.sharedItems);
+        const fieldType = rowSet.has(fieldIndex)
+            ? "row"
+            : colSet.has(fieldIndex)
+                ? "column"
+                : valueSet.has(fieldIndex)
+                    ? "value"
+                    : null;
+        return renderPivotField(fieldType, cacheField.sharedItems);
     })
         .join("");
 }
-function renderPivotField(isRow, isCol, isValue, sharedItems) {
-    // A field can be both a row/column field AND a value field (issue #15)
-    // In this case, it needs both axis attribute AND dataField="1"
-    if (isRow || isCol) {
-        const axis = isRow ? "axisRow" : "axisCol";
+function renderPivotField(fieldType, sharedItems) {
+    // fieldType: 'row', 'column', 'value', null
+    // Note: defaultSubtotal="0" should only be on value fields and non-axis fields,
+    // NOT on row/column axis fields (Excel will auto-calculate subtotals for them)
+    if (fieldType === "row" || fieldType === "column") {
+        const axis = fieldType === "row" ? "axisRow" : "axisCol";
         // Row and column fields should NOT have defaultSubtotal="0"
-        let axisAttributes = 'compact="0" outline="0" showAll="0"';
-        // If also a value field, add dataField="1"
-        if (isValue) {
-            axisAttributes = `dataField="1" ${axisAttributes}`;
-        }
+        const axisAttributes = 'compact="0" outline="0" showAll="0"';
         // items = one for each shared item + one default item
         const itemsXml = [
             ...sharedItems.map((_item, index) => `<item x="${index}" />`),
@@ -616,7 +617,7 @@ function renderPivotField(isRow, isCol, isValue, sharedItems) {
     const defaultAttributes = 'compact="0" outline="0" showAll="0" defaultSubtotal="0"';
     return `
     <pivotField
-      ${isValue ? 'dataField="1"' : ""}
+      ${fieldType === "value" ? 'dataField="1"' : ""}
       ${defaultAttributes}
     />
   `;

package/dist/types/xlsx/xform/pivot-table/cache-field-xform.d.ts

@@ -4,7 +4,7 @@ import { BaseXform } from "../base-xform";
  */
 interface CacheFieldModel {
     name: string;
-    sharedItems: any[] | null;
+    sharedItems: string[] | null;
     containsNumber?: boolean;
     containsInteger?: boolean;
     minValue?: number;

package/dist/types/xlsx/xform/pivot-table/cache-field.d.ts

@@ -1,6 +1,6 @@
 interface CacheFieldConfig {
     name: string;
-    sharedItems: any[] | null;
+    sharedItems: string[] | null;
     minValue?: number;
     maxValue?: number;
 }

package/package.json

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