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

package/dist/browser/excelts.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v2.0.1-canary.20251228093548.379d895
+ * @cj-tech-master/excelts v3.0.0-canary.20251228183403.d3eb98d
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2025 cjnoname
  * Released under the MIT License
@@ -2999,7 +2999,7 @@ function makePivotTable(worksheet, model) {
 	validate(worksheet, model, source);
 	const { rows, values } = model;
 	const columns = model.columns ?? [];
-	const cacheFields = makeCacheFields(source, [...rows, ...columns]);
+	const cacheFields = makeCacheFields(source, [...rows, ...columns], values);
 	const nameToIndex = cacheFields.reduce((result, cacheField, index) => {
 		result[cacheField.name] = index;
 		return result;
@@ -3034,9 +3034,10 @@ function validate(_worksheet, model, source) {
 	if (model.values.length < 1) throw new Error("Must have at least one value.");
 	if (model.values.length > 1 && columns.length > 0) 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) {
+function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
 	const names = source.getRow(1).values;
 	const sharedItemsFields = new Set(fieldNamesWithSharedItems);
+	const valueFields = new Set(valueFieldNames);
 	const aggregate = (columnIndex) => {
 		const columnValues = source.getColumn(columnIndex).values;
 		const uniqueValues = /* @__PURE__ */ new Set();
@@ -3071,7 +3072,7 @@ function makeCacheFields(source, fieldNamesWithSharedItems) {
 			name,
 			sharedItems: aggregate(columnIndex)
 		});
-		else {
+		else if (valueFields.has(name)) {
 			const minMax = getMinMax(columnIndex);
 			result.push({
 				name,
@@ -3079,7 +3080,10 @@ function makeCacheFields(source, fieldNamesWithSharedItems) {
 				minValue: minMax?.minValue,
 				maxValue: minMax?.maxValue
 			});
-		}
+		} else result.push({
+			name,
+			sharedItems: null
+		});
 	}
 	return result;
 }
@@ -14680,9 +14684,25 @@ var CacheField = class {
 	}
 	render() {
 		const escapedName = xmlEncode(this.name);
-		if (this.sharedItems === null) return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="1"${this.minValue !== void 0 && this.maxValue !== void 0 ? ` minValue="${this.minValue}" maxValue="${this.maxValue}"` : ""} />
+		if (this.sharedItems === null) {
+			if (this.minValue === void 0 || this.maxValue === void 0) return `<cacheField name="${escapedName}" numFmtId="0">
+      <sharedItems />
+    </cacheField>`;
+			return `<cacheField name="${escapedName}" numFmtId="0">
+      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="1" minValue="${this.minValue}" maxValue="${this.maxValue}" />
     </cacheField>`;
+		}
+		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) {
+			const minValue = Math.min(...this.sharedItems);
+			const maxValue = Math.max(...this.sharedItems);
+			return `<cacheField name="${escapedName}" numFmtId="0">
+      <sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1"${allInteger ? " containsInteger=\"1\"" : ""} minValue="${minValue}" maxValue="${maxValue}" count="${this.sharedItems.length}">
+        ${this.sharedItems.map((item) => `<n v="${item}" />`).join("")}
+      </sharedItems>
+    </cacheField>`;
+		}
 		return `<cacheField name="${escapedName}" numFmtId="0">
       <sharedItems count="${this.sharedItems.length}">
         ${this.sharedItems.map((item) => `<s v="${xmlEncode(String(item))}" />`).join("")}
@@ -14736,16 +14756,13 @@ var CacheFieldXform = class extends BaseXform {
 				break;
 			case "sharedItems":
 				this.inSharedItems = true;
-				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 !== void 0) this.model.minValue = parseFloat(attributes.minValue);
-						if (attributes.maxValue !== void 0) this.model.maxValue = parseFloat(attributes.maxValue);
-						this.model.sharedItems = null;
-					}
-				} else if (this.model) {
+				if (this.model) {
+					this.model.containsNumber = attributes.containsNumber === "1";
+					this.model.containsInteger = attributes.containsInteger === "1";
+					if (attributes.minValue !== void 0) this.model.minValue = parseFloat(attributes.minValue);
+					if (attributes.maxValue !== void 0) this.model.maxValue = parseFloat(attributes.maxValue);
 					if (parseInt(attributes.count || "0", 10) > 0) this.model.sharedItems = [];
+					else this.model.sharedItems = null;
 				}
 				break;
 			case "s":
@@ -15409,13 +15426,14 @@ function renderPivotFields(pivotTable) {
 	const colSet = new Set(pivotTable.columns);
 	const valueSet = new Set(pivotTable.values);
 	return pivotTable.cacheFields.map((cacheField, fieldIndex) => {
-		return renderPivotField(rowSet.has(fieldIndex) ? "row" : colSet.has(fieldIndex) ? "column" : valueSet.has(fieldIndex) ? "value" : null, cacheField.sharedItems);
+		return renderPivotField(rowSet.has(fieldIndex), colSet.has(fieldIndex), valueSet.has(fieldIndex), cacheField.sharedItems);
 	}).join("");
 }
-function renderPivotField(fieldType, sharedItems) {
-	if (fieldType === "row" || fieldType === "column") {
-		const axis = fieldType === "row" ? "axisRow" : "axisCol";
-		const axisAttributes = "compact=\"0\" outline=\"0\" showAll=\"0\"";
+function renderPivotField(isRow, isCol, isValue, sharedItems) {
+	if (isRow || isCol) {
+		const axis = isRow ? "axisRow" : "axisCol";
+		let axisAttributes = "compact=\"0\" outline=\"0\" showAll=\"0\"";
+		if (isValue) axisAttributes = `dataField="1" ${axisAttributes}`;
 		const itemsXml = [...sharedItems.map((_item, index) => `<item x="${index}" />`), "<item t=\"default\" />"].join("\n              ");
 		return `
       <pivotField axis="${axis}" ${axisAttributes}>
@@ -15427,7 +15445,7 @@ function renderPivotField(fieldType, sharedItems) {
 	}
 	return `
     <pivotField
-      ${fieldType === "value" ? "dataField=\"1\"" : ""}
+      ${isValue ? "dataField=\"1\"" : ""}
       compact="0" outline="0" showAll="0" defaultSubtotal="0"
     />
   `;