@cj-tech-master/excelts 5.0.6 → 5.1.0

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
- * @cj-tech-master/excelts v5.0.6
+ * @cj-tech-master/excelts v5.1.0
  * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
  * (c) 2026 cjnoname
  * Released under the MIT License
@@ -643,7 +643,7 @@ var ExcelTS = (function(exports) {
 				let row = parseInt(rowStr, 10);
 				if (!colDollar) col += to.col - offset.col;
 				if (!rowDollar) row += to.row - offset.row;
-				return (sheet || "") + (colDollar || "") + colCache.n2l(col) + (rowDollar || "") + row;
+				return (sheet ?? "") + (colDollar ?? "") + colCache.n2l(col) + (rowDollar ?? "") + row;
 			}
 			return refMatch;
 		});
@@ -1079,8 +1079,8 @@ var ExcelTS = (function(exports) {
 		}
 		get value() {
 			return {
-				text: this.model.text || "",
-				hyperlink: this.model.hyperlink || "",
+				text: this.model.text ?? "",
+				hyperlink: this.model.hyperlink ?? "",
 				tooltip: this.model.tooltip
 			};
 		}
@@ -1114,11 +1114,11 @@ var ExcelTS = (function(exports) {
 			this.model.address = value;
 		}
 		toCsvString() {
-			return this.model.hyperlink || "";
+			return this.model.hyperlink ?? "";
 		}
 		release() {}
 		toString() {
-			return this.model.text || "";
+			return this.model.text ?? "";
 		}
 	};
 	var MergeValue = class {
@@ -1262,7 +1262,7 @@ var ExcelTS = (function(exports) {
 			return this._translatedFormula;
 		}
 		toCsvString() {
-			return `${this.model.result || ""}`;
+			return `${this.model.result ?? ""}`;
 		}
 		release() {}
 		toString() {
@@ -1647,8 +1647,8 @@ var ExcelTS = (function(exports) {
 		}
 		addPageBreak(lft, rght) {
 			const ws = this._worksheet;
-			const left = Math.max(0, (lft || 0) - 1) || 0;
-			const right = Math.max(0, (rght || 0) - 1) || 16838;
+			const left = Math.max(0, (lft ?? 0) - 1) || 0;
+			const right = Math.max(0, (rght ?? 0) - 1) || 16838;
 			const pb = {
 				id: this._number,
 				max: right,
@@ -1799,7 +1799,7 @@ var ExcelTS = (function(exports) {
 			this._hidden = value;
 		}
 		get outlineLevel() {
-			return this._outlineLevel || 0;
+			return this._outlineLevel ?? 0;
 		}
 		set outlineLevel(value) {
 			this._outlineLevel = value;
@@ -1864,7 +1864,7 @@ var ExcelTS = (function(exports) {
 			if (value.height) this.height = value.height;
 			else delete this.height;
 			this.hidden = value.hidden;
-			this.outlineLevel = value.outlineLevel || 0;
+			this.outlineLevel = value.outlineLevel ?? 0;
 			this.dyDescent = value.dyDescent;
 			this.style = value.style && JSON.parse(JSON.stringify(value.style)) || {};
 		}
@@ -1976,7 +1976,7 @@ var ExcelTS = (function(exports) {
 		* Set an outline level for columns
 		*/
 		get outlineLevel() {
-			return this._outlineLevel || 0;
+			return this._outlineLevel ?? 0;
 		}
 		set outlineLevel(value) {
 			this._outlineLevel = value;
@@ -2053,8 +2053,8 @@ var ExcelTS = (function(exports) {
 		*/
 		addPageBreak(top, bottom) {
 			const ws = this._worksheet;
-			const topRow = Math.max(0, (top || 0) - 1) || 0;
-			const bottomRow = Math.max(0, (bottom || 0) - 1) || 1048575;
+			const topRow = Math.max(0, (top ?? 0) - 1) || 0;
+			const bottomRow = Math.max(0, (bottom ?? 0) - 1) || 1048575;
 			const pb = {
 				id: this._number,
 				max: bottomRow,
@@ -2143,7 +2143,7 @@ var ExcelTS = (function(exports) {
 		static fromModel(worksheetOrCols, colsMaybe) {
 			const worksheet = Array.isArray(worksheetOrCols) ? worksheetOrCols : worksheetOrCols;
 			let cols = Array.isArray(worksheetOrCols) ? worksheetOrCols : colsMaybe ?? [];
-			cols = cols || [];
+			cols = cols ?? [];
 			const columns = [];
 			let count = 1;
 			let index = 0;
@@ -2186,10 +2186,10 @@ var ExcelTS = (function(exports) {
 				this.nativeRow = decoded.row + offset;
 				this.nativeRowOff = 0;
 			} else if (isAnchorModel(address)) {
-				this.nativeCol = address.nativeCol || 0;
-				this.nativeColOff = address.nativeColOff || 0;
-				this.nativeRow = address.nativeRow || 0;
-				this.nativeRowOff = address.nativeRowOff || 0;
+				this.nativeCol = address.nativeCol ?? 0;
+				this.nativeColOff = address.nativeColOff ?? 0;
+				this.nativeRow = address.nativeRow ?? 0;
+				this.nativeRowOff = address.nativeRowOff ?? 0;
 			} else if (isSimpleAddress(address)) {
 				this.col = address.col + offset;
 				this.row = address.row + offset;
@@ -2384,7 +2384,7 @@ var ExcelTS = (function(exports) {
 				case "stdDev": return `SUBTOTAL(106,${this.table.name}[${column.name}])`;
 				case "var": return `SUBTOTAL(107,${this.table.name}[${column.name}])`;
 				case "sum": return `SUBTOTAL(109,${this.table.name}[${column.name}])`;
-				case "custom": return column.totalsRowFormula || null;
+				case "custom": return column.totalsRowFormula ?? null;
 				default: throw new Error(`Invalid Totals Row Function: ${column.totalsRowFunction}`);
 			}
 		}
@@ -2431,7 +2431,7 @@ var ExcelTS = (function(exports) {
 				if (i === 0) assign(column, "totalsRowLabel", "Total");
 				else {
 					assign(column, "totalsRowFunction", "none");
-					column.totalsRowFormula = this.getFormula(column) || void 0;
+					column.totalsRowFormula = this.getFormula(column) ?? void 0;
 				}
 			});
 		}
@@ -2709,7 +2709,7 @@ var ExcelTS = (function(exports) {
 		constructor(worksheet, range, options) {
 			this.worksheet = worksheet;
 			const { tl, br } = this._parseRange(range);
-			const shapeId = 1025 + (worksheet.formControls?.length || 0);
+			const shapeId = 1025 + (worksheet.formControls?.length ?? 0);
 			let link;
 			if (options?.link) link = this._toAbsoluteRef(options.link);
 			this.model = {
@@ -2976,6 +2976,14 @@ var ExcelTS = (function(exports) {
 		const millisecondSinceEpoch = Math.round((v - 25569 + (date1904 ? 1462 : 0)) * 24 * 3600 * 1e3);
 		return new Date(millisecondSinceEpoch);
 	}
+	/**
+	* Parse an OOXML date string into a Date object.
+	* OOXML dates like "2024-01-15T00:00:00" lack a timezone suffix,
+	* which some JS engines parse as local time. Appending "Z" forces UTC.
+	*/
+	function parseOoxmlDate(raw) {
+		return new Date(raw.endsWith("Z") ? raw : raw + "Z");
+	}
 	const xmlDecodingMap = {
 		lt: "<",
 		gt: ">",
@@ -3060,8 +3068,23 @@ var ExcelTS = (function(exports) {
 	}
 	function toSortedArray(values) {
 		const result = Array.from(values);
+		if (result.length <= 1) return result;
 		if (result.every((item) => Number.isFinite(item))) return result.sort((a, b) => a - b);
-		return result.sort();
+		if (result.every((item) => item instanceof Date)) return result.sort((a, b) => a.getTime() - b.getTime());
+		return result.sort((a, b) => {
+			const ta = sortTypeRank(a);
+			const tb = sortTypeRank(b);
+			if (ta !== tb) return ta - tb;
+			if (ta === 0) return a - b;
+			if (ta === 1) return a.getTime() - b.getTime();
+			return String(a).localeCompare(String(b));
+		});
+	}
+	/** Rank for mixed-type sort: numbers=0, dates=1, everything else=2 */
+	function sortTypeRank(v) {
+		if (Number.isFinite(v)) return 0;
+		if (v instanceof Date) return 1;
+		return 2;
 	}
 	const textDecoder$2 = new TextDecoder("utf-8");
 	let latin1Decoder;
@@ -5376,6 +5399,40 @@ var ExcelTS = (function(exports) {
 //#endregion
 //#region src/modules/excel/pivot-table.ts
 /**
+	* Wrapper for OOXML error values in sharedItems (e.g. `<e v="REF!"/>`).
+	* Distinguishes error strings from regular strings so they roundtrip as `<e>` not `<s>`.
+	*/
+	var PivotErrorValue = class {
+		constructor(code) {
+			this.code = code;
+		}
+		/** Returns the display form with '#' prefix, e.g. "#REF!" */
+		toString() {
+			return `#${this.code}`;
+		}
+	};
+	/** Map from PivotTableSubtotal to its Excel display name prefix */
+	const METRIC_DISPLAY_NAMES = {
+		sum: "Sum",
+		count: "Count",
+		average: "Average",
+		max: "Max",
+		min: "Min",
+		product: "Product",
+		countNums: "Count Numbers",
+		stdDev: "StdDev",
+		stdDevP: "StdDevP",
+		var: "Var",
+		varP: "VarP"
+	};
+	/** Set of all valid PivotTableSubtotal values (for runtime validation) */
+	const VALID_SUBTOTALS = new Set(Object.keys(METRIC_DISPLAY_NAMES));
+	/**
+	* Data rows start at index 2 in ExcelJS sparse arrays:
+	* index 0 = empty (ExcelJS convention), index 1 = header row.
+	*/
+	const DATA_START_INDEX = 2;
+	/**
 	* Creates a PivotTableSource adapter from a Table object.
 	* This allows Tables to be used as pivot table data sources with the same interface as Worksheets.
 	*/
@@ -5392,6 +5449,7 @@ var ExcelTS = (function(exports) {
 		const headerRow = [void 0, ...columnNames];
 		const dataRows = tableModel.rows.map((row) => [void 0, ...row]);
 		const tl = tableModel.tl;
+		if (!tl) throw new Error(`Table "${tableModel.name}" is missing top-left cell address (tl)`);
 		const startRow = tl.row;
 		const startCol = tl.col;
 		const endRow = startRow + tableModel.rows.length;
@@ -5399,9 +5457,10 @@ var ExcelTS = (function(exports) {
 		const shortRange = colCache.encode(startRow, startCol, endRow, endCol);
 		return {
 			name: table.worksheet.name,
+			tableName: tableModel.name,
 			getRow(rowNumber) {
 				if (rowNumber === 1) return { values: headerRow };
-				const dataIndex = rowNumber - 2;
+				const dataIndex = rowNumber - DATA_START_INDEX;
 				if (dataIndex >= 0 && dataIndex < dataRows.length) return { values: dataRows[dataIndex] };
 				return { values: [] };
 			},
@@ -5421,54 +5480,154 @@ var ExcelTS = (function(exports) {
 			dimensions: { shortRange }
 		};
 	}
+	/** Base cache ID starts at 10 (Excel convention), each subsequent table increments */
+	const BASE_CACHE_ID = 10;
 	/**
 	* Resolves the data source from the model, supporting both sourceSheet and sourceTable.
+	* Validates that exactly one source is provided.
 	*/
 	function resolveSource(model) {
+		if (model.sourceSheet && model.sourceTable) throw new Error("Cannot specify both sourceSheet and sourceTable. Choose one.");
 		if (model.sourceTable) return createTableSourceAdapter(model.sourceTable);
+		if (!model.sourceSheet) throw new Error("Either sourceSheet or sourceTable must be provided.");
 		return model.sourceSheet;
 	}
+	/** Resolve a value entry to its column name string */
+	function resolveValueName(v) {
+		return typeof v === "string" ? v : v.name;
+	}
+	/** Resolve a value entry's metric (or undefined if inheriting table-wide default) */
+	function resolveValueMetric(v) {
+		return typeof v === "string" ? void 0 : v.metric;
+	}
 	function makePivotTable(worksheet, model) {
-		if (!model.sourceSheet && !model.sourceTable) throw new Error("Either sourceSheet or sourceTable must be provided.");
-		if (model.sourceSheet && model.sourceTable) throw new Error("Cannot specify both sourceSheet and sourceTable. Choose one.");
 		const source = resolveSource(model);
-		validate(worksheet, model, source);
-		const { rows, values } = model;
+		validate(model, source);
+		const { rows } = model;
 		const columns = model.columns ?? [];
-		const cacheFields = makeCacheFields(source, [...rows, ...columns], values);
-		const nameToIndex = cacheFields.reduce((result, cacheField, index) => {
-			result[cacheField.name] = index;
-			return result;
-		}, {});
-		const rowIndices = rows.map((row) => nameToIndex[row]);
-		const columnIndices = columns.map((column) => nameToIndex[column]);
-		const valueIndices = values.map((value) => nameToIndex[value]);
-		const tableNumber = worksheet.workbook.pivotTables.length + 1;
+		const pages = model.pages ?? [];
+		const valueNames = model.values.map(resolveValueName);
+		const defaultMetric = model.metric ?? "sum";
+		const valueMetrics = model.values.map((v) => resolveValueMetric(v) ?? defaultMetric);
+		const cacheFields = makeCacheFields(source, [
+			...rows,
+			...columns,
+			...pages
+		], valueNames);
+		const nameToIndex = {};
+		for (let i = 0; i < cacheFields.length; i++) nameToIndex[cacheFields[i].name] = i;
+		const resolveIndex = (fieldName, role) => {
+			const idx = nameToIndex[fieldName];
+			if (idx === void 0) throw new Error(`${role} field "${fieldName}" not found in cache fields`);
+			return idx;
+		};
+		const rowIndices = rows.map((row) => resolveIndex(row, "Row"));
+		const columnIndices = columns.map((column) => resolveIndex(column, "Column"));
+		const valueIndices = valueNames.map((value) => resolveIndex(value, "Value"));
+		const pageIndices = pages.map((page) => resolveIndex(page, "Page"));
+		const existingTableNumbers = worksheet.workbook.pivotTables.map((pt) => pt.tableNumber).filter((n) => Number.isFinite(n));
+		const tableNumber = existingTableNumbers.length > 0 ? existingTableNumbers.reduce((a, b) => a > b ? a : b, -Infinity) + 1 : 1;
+		const existingCacheIds = worksheet.workbook.pivotTables.map((pt) => parseInt(pt.cacheId, 10)).filter((id) => Number.isFinite(id));
+		const nextCacheId = existingCacheIds.length > 0 ? existingCacheIds.reduce((a, b) => a > b ? a : b, -Infinity) + 1 : BASE_CACHE_ID + tableNumber - 1;
 		return {
 			source,
 			rows: rowIndices,
 			columns: columnIndices,
 			values: valueIndices,
-			metric: model.metric ?? "sum",
+			pages: pageIndices,
+			metric: defaultMetric,
+			valueMetrics,
 			cacheFields,
-			cacheId: String(10 + tableNumber - 1),
+			cacheId: String(nextCacheId),
 			applyWidthHeightFormats: model.applyWidthHeightFormats ?? "1",
 			tableNumber
 		};
 	}
-	function validate(_worksheet, model, source) {
-		if (model.metric && model.metric !== "sum" && model.metric !== "count") throw new Error("Only the \"sum\" and \"count\" metrics are supported at this time.");
+	function validate(model, source) {
 		const columns = model.columns ?? [];
+		const pages = model.pages ?? [];
+		const valueNames = model.values.map(resolveValueName);
 		const headerNames = source.getRow(1).values.slice(1);
-		const headerNameSet = new Set(headerNames);
-		for (const name of [
-			...model.rows,
-			...columns,
-			...model.values
-		]) if (!headerNameSet.has(name)) throw new Error(`The header name "${name}" was not found in ${source.name}.`);
+		for (let i = 0; i < headerNames.length; i++) {
+			const h = headerNames[i];
+			if (h === null || h === void 0 || h === "" || typeof h === "string" && h.trim() === "") throw new Error(`Empty or missing header name at column ${i + 1} in ${source.name}. Pivot tables require all columns to have non-empty headers.`);
+		}
+		const headerDupCheck = /* @__PURE__ */ new Set();
+		for (const h of headerNames) {
+			const name = String(h);
+			if (headerDupCheck.has(name)) throw new Error(`Duplicate header name "${name}" found in ${source.name}. Pivot tables require unique column names.`);
+			headerDupCheck.add(name);
+		}
+		const headerNameSet = new Set(headerNames.map(String));
+		const validateFieldExists = (name) => {
+			if (!headerNameSet.has(name)) throw new Error(`The header name "${name}" was not found in ${source.name}.`);
+		};
+		for (const name of model.rows) validateFieldExists(name);
+		for (const name of columns) validateFieldExists(name);
+		for (const name of valueNames) validateFieldExists(name);
+		for (const name of pages) validateFieldExists(name);
+		const fieldToAxis = /* @__PURE__ */ new Map();
+		const axisAreas = [
+			{
+				name: "rows",
+				fields: model.rows
+			},
+			{
+				name: "columns",
+				fields: columns
+			},
+			{
+				name: "pages",
+				fields: pages
+			}
+		];
+		for (const area of axisAreas) for (const field of area.fields) {
+			const existing = fieldToAxis.get(field);
+			if (existing === area.name) throw new Error(`Duplicate field "${field}" in ${area.name}. Each field can only appear once per axis area.`);
+			else if (existing) throw new Error(`Field "${field}" cannot appear in both ${existing} and ${area.name}. Each field can only be assigned to one axis area.`);
+			fieldToAxis.set(field, area.name);
+		}
 		if (!model.rows.length) throw new Error("No pivot table rows specified.");
 		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.");
+		if (model.metric !== void 0 && !VALID_SUBTOTALS.has(model.metric)) throw new Error(`Invalid metric "${model.metric}". Must be one of: ${[...VALID_SUBTOTALS].join(", ")}.`);
+		for (const v of model.values) {
+			const perMetric = resolveValueMetric(v);
+			if (perMetric !== void 0 && !VALID_SUBTOTALS.has(perMetric)) throw new Error(`Invalid metric "${perMetric}" on value field "${resolveValueName(v)}". Must be one of: ${[...VALID_SUBTOTALS].join(", ")}.`);
+		}
+		const valueDupCheck = /* @__PURE__ */ new Set();
+		for (const name of valueNames) {
+			if (valueDupCheck.has(name)) throw new Error(`Duplicate value field "${name}". Each value field name must be unique.`);
+			valueDupCheck.add(name);
+		}
+	}
+	/**
+	* R8-B2: Unwrap complex cell value types to a primitive suitable for pivot table shared items.
+	* - CellErrorValue ({error:"#REF!"}) → PivotErrorValue
+	* - CellRichTextValue ({richText:[...]}) → concatenated plain text
+	* - CellFormulaValue / CellArrayFormulaValue / CellSharedFormulaValue → result value (recursive)
+	* - CellHyperlinkValue ({text,hyperlink}) → text string
+	* - CellCheckboxValue ({checkbox:bool}) → boolean
+	* - Other objects → String(v)
+	*/
+	function unwrapCellValue(v) {
+		if (v === null || v === void 0) return null;
+		if (typeof v !== "object") return v;
+		if (v instanceof Date) return v;
+		if (v instanceof PivotErrorValue) return v;
+		const obj = v;
+		if (typeof obj.error === "string") {
+			const errorStr = obj.error;
+			return new PivotErrorValue(errorStr.startsWith("#") ? errorStr.slice(1) : errorStr);
+		}
+		if ("formula" in obj || "sharedFormula" in obj) {
+			const result = obj.result;
+			if (result === void 0 || result === null) return null;
+			return unwrapCellValue(result);
+		}
+		if (Array.isArray(obj.richText)) return obj.richText.map((rt) => rt.text ?? "").join("");
+		if (typeof obj.text === "string" && typeof obj.hyperlink === "string") return obj.text;
+		if (typeof obj.checkbox === "boolean") return obj.checkbox;
+		return String(v);
 	}
 	function makeCacheFields(source, fieldNamesWithSharedItems, valueFieldNames) {
 		const names = source.getRow(1).values;
@@ -5477,33 +5636,47 @@ var ExcelTS = (function(exports) {
 		const aggregate = (columnIndex) => {
 			const columnValues = source.getColumn(columnIndex).values;
 			const uniqueValues = /* @__PURE__ */ new Set();
-			for (let i = 2; i < columnValues.length; i++) {
-				const v = columnValues[i];
-				if (v !== null && v !== void 0) uniqueValues.add(v);
+			const seenErrors = /* @__PURE__ */ new Map();
+			let hasNull = false;
+			for (let i = DATA_START_INDEX; i < columnValues.length; i++) {
+				const v = unwrapCellValue(columnValues[i]);
+				if (v === null || typeof v === "number" && isNaN(v)) hasNull = true;
+				else if (v instanceof PivotErrorValue) {
+					if (!seenErrors.has(v.code)) {
+						seenErrors.set(v.code, v);
+						uniqueValues.add(v);
+					}
+				} else uniqueValues.add(v);
 			}
-			return toSortedArray(uniqueValues);
+			const sorted = toSortedArray(uniqueValues);
+			if (hasNull) sorted.push(null);
+			return sorted;
 		};
 		const getMinMax = (columnIndex) => {
 			const columnValues = source.getColumn(columnIndex).values;
 			let min = Infinity;
 			let max = -Infinity;
 			let hasNumeric = false;
-			for (let i = 2; i < columnValues.length; i++) {
-				const v = columnValues[i];
-				if (typeof v === "number" && !isNaN(v)) {
+			let allInteger = true;
+			for (let i = DATA_START_INDEX; i < columnValues.length; i++) {
+				const unwrapped = unwrapCellValue(columnValues[i]);
+				if (typeof unwrapped === "number" && !isNaN(unwrapped)) {
 					hasNumeric = true;
-					if (v < min) min = v;
-					if (v > max) max = v;
+					if (unwrapped < min) min = unwrapped;
+					if (unwrapped > max) max = unwrapped;
+					if (!Number.isInteger(unwrapped)) allInteger = false;
 				}
 			}
 			return hasNumeric ? {
 				minValue: min,
-				maxValue: max
+				maxValue: max,
+				allInteger
 			} : null;
 		};
 		const result = [];
 		for (const columnIndex of range(1, names.length)) {
-			const name = names[columnIndex];
+			const rawName = names[columnIndex];
+			const name = String(rawName);
 			if (sharedItemsFields.has(name)) result.push({
 				name,
 				sharedItems: aggregate(columnIndex)
@@ -5513,8 +5686,10 @@ var ExcelTS = (function(exports) {
 				result.push({
 					name,
 					sharedItems: null,
+					containsNumber: minMax ? "1" : void 0,
 					minValue: minMax?.minValue,
-					maxValue: minMax?.maxValue
+					maxValue: minMax?.maxValue,
+					containsInteger: minMax?.allInteger ? "1" : void 0
 				});
 			} else result.push({
 				name,
@@ -5569,10 +5744,10 @@ var ExcelTS = (function(exports) {
 		constructor(options) {
 			options = options || {};
 			this._workbook = options.workbook;
-			this.id = options.id || 0;
-			this.orderNo = options.orderNo || 0;
+			this.id = options.id ?? 0;
+			this.orderNo = options.orderNo ?? 0;
 			this.name = options.name || `sheet${this.id}`;
-			this.state = options.state || "visible";
+			this.state = options.state ?? "visible";
 			this._rows = [];
 			this._columns = null;
 			this._keys = {};
@@ -5625,8 +5800,8 @@ var ExcelTS = (function(exports) {
 				firstFooter: null
 			}, options.headerFooter);
 			this.dataValidations = new DataValidations();
-			this.views = options.views || [];
-			this.autoFilter = options.autoFilter || null;
+			this.views = options.views ?? [];
+			this.autoFilter = options.autoFilter ?? null;
 			this._media = [];
 			this.sheetProtection = null;
 			this.tables = {};
@@ -5745,7 +5920,7 @@ var ExcelTS = (function(exports) {
 		spliceColumns(start, count, ...inserts) {
 			const nRows = this._rows.length;
 			if (inserts.length > 0) for (let i = 0; i < nRows; i++) {
-				const insertValues = inserts.map((insert) => insert[i] || null);
+				const insertValues = inserts.map((insert) => insert[i] ?? null);
 				this.getRow(i + 1).splice(start, count, ...insertValues);
 			}
 			else this._rows.forEach((r) => {
@@ -6240,7 +6415,7 @@ var ExcelTS = (function(exports) {
 				formControls: this.formControls.map((fc) => fc.model),
 				drawing: this._drawing
 			};
-			model.cols = Column.toModel(this.columns || []);
+			model.cols = Column.toModel(this.columns ?? []);
 			const rows = model.rows = [];
 			const dimensions = model.dimensions = new Range();
 			this._rows.forEach((row) => {
@@ -6278,8 +6453,8 @@ var ExcelTS = (function(exports) {
 			this.properties = value.properties;
 			this.pageSetup = value.pageSetup;
 			this.headerFooter = value.headerFooter;
-			this.rowBreaks = value.rowBreaks || [];
-			this.colBreaks = value.colBreaks || [];
+			this.rowBreaks = value.rowBreaks ?? [];
+			this.colBreaks = value.colBreaks ?? [];
 			this.views = value.views;
 			this.autoFilter = value.autoFilter;
 			this._media = value.media.map((medium) => new Image(this, medium));
@@ -6567,7 +6742,7 @@ var ExcelTS = (function(exports) {
 			value.forEach((definedName) => {
 				const matrix = matrixMap[definedName.name] = new CellMatrix();
 				definedName.ranges.forEach((rangeStr) => {
-					if (rangeRegexp.test(rangeStr.split("!").pop() || "")) matrix.addCell(rangeStr);
+					if (rangeRegexp.test(rangeStr.split("!").pop() ?? "")) matrix.addCell(rangeStr);
 				});
 			});
 		}
@@ -7634,7 +7809,7 @@ var ExcelTS = (function(exports) {
 		}
 		reconcile(_model, _options) {}
 		reset() {
-			this.model = null;
+			this.model = void 0;
 			if (this.map) Object.values(this.map).forEach((xform) => {
 				if (xform instanceof BaseXform) xform.reset();
 				else if (xform.xform) xform.xform.reset();
@@ -7774,7 +7949,7 @@ var ExcelTS = (function(exports) {
 			this.always = !!options.always;
 			this.count = options.count;
 			this.empty = options.empty;
-			this.$count = options.$count || "count";
+			this.$count = options.$count ?? "count";
 			this.$ = options.$;
 			this.childXform = options.childXform;
 			this.maxItems = options.maxItems;
@@ -7789,9 +7964,9 @@ var ExcelTS = (function(exports) {
 		render(xmlStream, model) {
 			if (this.always || model && model.length) {
 				xmlStream.openNode(this.tag, this.$);
-				if (this.count) xmlStream.addAttribute(this.$count, model && model.length || 0);
+				if (this.count) xmlStream.addAttribute(this.$count, model?.length ?? 0);
 				const { childXform } = this;
-				(model || []).forEach((childModel, index) => {
+				(model ?? []).forEach((childModel, index) => {
 					childXform.render(xmlStream, childModel, index);
 				});
 				xmlStream.closeNode();
@@ -7845,7 +8020,7 @@ var ExcelTS = (function(exports) {
 	var ColorXform = class extends BaseXform {
 		constructor(name) {
 			super();
-			this.name = name || "color";
+			this.name = name ?? "color";
 		}
 		get tag() {
 			return this.name;
@@ -9021,12 +9196,12 @@ var ExcelTS = (function(exports) {
 		}
 		render(xmlStream, model) {
 			xmlStream.openNode("xf", {
-				numFmtId: model.numFmtId || 0,
-				fontId: model.fontId || 0,
-				fillId: model.fillId || 0,
-				borderId: model.borderId || 0
+				numFmtId: model.numFmtId ?? 0,
+				fontId: model.fontId ?? 0,
+				fillId: model.fillId ?? 0,
+				borderId: model.borderId ?? 0
 			});
-			if (this.xfId) xmlStream.addAttribute("xfId", model.xfId || 0);
+			if (this.xfId) xmlStream.addAttribute("xfId", model.xfId ?? 0);
 			if (model.applyNumberFormat || model.numFmtId) xmlStream.addAttribute("applyNumberFormat", "1");
 			if (model.applyFont || model.fontId) xmlStream.addAttribute("applyFont", "1");
 			if (model.applyFill || model.fillId) xmlStream.addAttribute("applyFill", "1");
@@ -9916,8 +10091,8 @@ var ExcelTS = (function(exports) {
 		}
 		render(xmlStream, model) {
 			xmlStream.openNode(this.tag, {
-				sb: model.sb || 0,
-				eb: model.eb || 0
+				sb: model.sb ?? 0,
+				eb: model.eb ?? 0
 			});
 			if (model && Object.prototype.hasOwnProperty.call(model, "richText") && model.richText) {
 				const { r } = this.map;
@@ -10424,7 +10599,7 @@ var ExcelTS = (function(exports) {
 			xmlStream.openXml(XmlStream.StdDocAttributes);
 			xmlStream.openNode("Types", ContentTypesXform.PROPERTY_ATTRIBUTES);
 			const mediaHash = {};
-			(model.media || []).forEach((medium) => {
+			(model.media ?? []).forEach((medium) => {
 				if (medium.type === "image") {
 					const imageType = medium.extension;
 					if (!mediaHash[imageType]) {
@@ -10455,21 +10630,28 @@ var ExcelTS = (function(exports) {
 					ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
 				});
 			});
-			if ((model.pivotTables || []).length) (model.pivotTables || []).forEach((pivotTable) => {
-				const n = pivotTable.tableNumber;
-				xmlStream.leafNode("Override", {
-					PartName: toContentTypesPartName(pivotCacheDefinitionPath(n)),
-					ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"
-				});
-				xmlStream.leafNode("Override", {
-					PartName: toContentTypesPartName(pivotCacheRecordsPath(n)),
-					ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml"
-				});
-				xmlStream.leafNode("Override", {
-					PartName: toContentTypesPartName(pivotTablePath(n)),
-					ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
+			if ((model.pivotTables ?? []).length) {
+				const writtenCacheIds = /* @__PURE__ */ new Set();
+				(model.pivotTables ?? []).forEach((pivotTable) => {
+					const n = pivotTable.tableNumber;
+					const cacheId = pivotTable.cacheId;
+					if (!writtenCacheIds.has(cacheId)) {
+						writtenCacheIds.add(cacheId);
+						xmlStream.leafNode("Override", {
+							PartName: toContentTypesPartName(pivotCacheDefinitionPath(n)),
+							ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"
+						});
+						if (pivotTable.isLoaded ? !!pivotTable.cacheRecords : true) xmlStream.leafNode("Override", {
+							PartName: toContentTypesPartName(pivotCacheRecordsPath(n)),
+							ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml"
+						});
+					}
+					xmlStream.leafNode("Override", {
+						PartName: toContentTypesPartName(pivotTablePath(n)),
+						ContentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
+					});
 				});
-			});
+			}
 			xmlStream.leafNode("Override", {
 				PartName: toContentTypesPartName(OOXML_PATHS.xlTheme1),
 				ContentType: "application/vnd.openxmlformats-officedocument.theme+xml"
@@ -10611,7 +10793,7 @@ var ExcelTS = (function(exports) {
 			xmlStream.leafNode("ScaleCrop", void 0, "false");
 			this.map.HeadingPairs.render(xmlStream, model.worksheets);
 			this.map.TitlesOfParts.render(xmlStream, model.worksheets);
-			this.map.Company.render(xmlStream, model.company || "");
+			this.map.Company.render(xmlStream, model.company ?? "");
 			this.map.Manager.render(xmlStream, model.manager);
 			xmlStream.leafNode("LinksUpToDate", void 0, "false");
 			xmlStream.leafNode("SharedDoc", void 0, "false");
@@ -10712,7 +10894,7 @@ var ExcelTS = (function(exports) {
 	const colRangeRegexp = /^[$]?[A-Za-z]{1,3}:[$]?[A-Za-z]{1,3}$/;
 	function isValidRange(range) {
 		if (range.startsWith("{") || range.endsWith("}")) return false;
-		const cellRef = range.split("!").pop() || "";
+		const cellRef = range.split("!").pop() ?? "";
 		if (!cellRangeRegexp.test(cellRef) && !rowRangeRegexp.test(cellRef) && !colRangeRegexp.test(cellRef)) return false;
 		try {
 			const decoded = colCache.decodeEx(range);
@@ -10730,7 +10912,7 @@ var ExcelTS = (function(exports) {
 		let last = "";
 		parsedText.split(",").forEach((item) => {
 			if (!item) return;
-			const quotes = (item.match(/'/g) || []).length;
+			const quotes = (item.match(/'/g) ?? []).length;
 			if (!quotes) {
 				if (quotesOpened) last += `${item},`;
 				else if (isValidRange(item)) ranges.push(item);
@@ -10784,10 +10966,10 @@ var ExcelTS = (function(exports) {
 	var WorkbookViewXform = class extends BaseXform {
 		render(xmlStream, model) {
 			const attributes = {
-				xWindow: model.x || 0,
-				yWindow: model.y || 0,
-				windowWidth: model.width || 12e3,
-				windowHeight: model.height || 24e3,
+				xWindow: model.x ?? 0,
+				yWindow: model.y ?? 0,
+				windowWidth: model.width ?? 12e3,
+				windowHeight: model.height ?? 24e3,
 				firstSheet: model.firstSheet,
 				activeTab: model.activeTab
 			};
@@ -10955,7 +11137,7 @@ var ExcelTS = (function(exports) {
 				index++;
 			});
 			if (printAreas.length) model.definedNames = model.definedNames.concat(printAreas);
-			(model.media || []).forEach((medium, i) => {
+			(model.media ?? []).forEach((medium, i) => {
 				medium.name = medium.type + (i + 1);
 			});
 		}
@@ -10968,7 +11150,14 @@ var ExcelTS = (function(exports) {
 			this.map.sheets.render(xmlStream, model.sheets);
 			this.map.definedNames.render(xmlStream, model.definedNames);
 			this.map.calcPr.render(xmlStream, model.calcProperties);
-			this.map.pivotCaches.render(xmlStream, model.pivotTables);
+			const pivotTables = model.pivotTables ?? [];
+			const seenCacheIds = /* @__PURE__ */ new Set();
+			const uniquePivotCaches = pivotTables.filter((pt) => {
+				if (seenCacheIds.has(pt.cacheId)) return false;
+				seenCacheIds.add(pt.cacheId);
+				return true;
+			});
+			this.map.pivotCaches.render(xmlStream, uniquePivotCaches);
 			xmlStream.closeNode();
 		}
 		parseOpen(node) {
@@ -11007,14 +11196,14 @@ var ExcelTS = (function(exports) {
 			}
 		}
 		reconcile(model) {
-			const rels = (model.workbookRels || []).reduce((map, rel) => {
+			const rels = (model.workbookRels ?? []).reduce((map, rel) => {
 				map[rel.Id] = rel;
 				return map;
 			}, {});
 			const worksheets = [];
 			let worksheet;
 			let index = 0;
-			(model.sheets || []).forEach((sheet) => {
+			(model.sheets ?? []).forEach((sheet) => {
 				const rel = rels[sheet.rId];
 				if (!rel) return;
 				worksheet = model.worksheetHash[`xl/${rel.Target.replace(/^(\s|\/xl\/)+/, "")}`];
@@ -11431,7 +11620,7 @@ var ExcelTS = (function(exports) {
 					return true;
 				case "r":
 					this.model.value = this.model.value || {};
-					this.model.value.richText = this.model.value.richText || [];
+					this.model.value.richText = this.model.value.richText ?? [];
 					this.model.value.richText.push(this.parser.model);
 					this.parser = void 0;
 					this.currentNode = void 0;
@@ -11625,9 +11814,9 @@ var ExcelTS = (function(exports) {
 		parseOpen(node) {
 			if (node.name === "col") {
 				const model = this.model = {
-					min: parseInt(node.attributes.min || "0", 10),
-					max: parseInt(node.attributes.max || "0", 10),
-					width: node.attributes.width === void 0 ? void 0 : parseFloat(node.attributes.width || "0")
+					min: parseInt(node.attributes.min ?? "0", 10),
+					max: parseInt(node.attributes.max ?? "0", 10),
+					width: node.attributes.width === void 0 ? void 0 : parseFloat(node.attributes.width ?? "0")
 				};
 				if (node.attributes.style) model.styleId = parseInt(node.attributes.style, 10);
 				if (parseBoolean(node.attributes.hidden)) model.hidden = true;
@@ -11834,7 +12023,7 @@ var ExcelTS = (function(exports) {
 					if (value.errorTitle) xmlStream.addAttribute("errorTitle", value.errorTitle);
 					if (value.error) xmlStream.addAttribute("error", value.error);
 					xmlStream.addAttribute("sqref", value.sqref);
-					(value.formulae || []).forEach((formula, index) => {
+					(value.formulae ?? []).forEach((formula, index) => {
 						xmlStream.openNode(`formula${index + 1}`);
 						if (value.type === "date") xmlStream.writeText(dateToExcel(new Date(formula)));
 						else xmlStream.writeText(formula);
@@ -11853,7 +12042,7 @@ var ExcelTS = (function(exports) {
 				case "dataValidation": {
 					this._address = node.attributes.sqref;
 					const dataValidation = {
-						type: node.attributes.type || "any",
+						type: node.attributes.type ?? "any",
 						formulae: []
 					};
 					if (node.attributes.type) assignBool(dataValidation, node.attributes, "allowBlank");
@@ -11893,7 +12082,7 @@ var ExcelTS = (function(exports) {
 						delete this._dataValidation.formulae;
 						delete this._dataValidation.operator;
 					}
-					(this._address.split(/\s+/g) || []).forEach((addr) => {
+					this._address.split(/\s+/g).forEach((addr) => {
 						if (addr.includes(":")) this.model[`range:${addr}`] = this._dataValidation;
 						else this.model[addr] = this._dataValidation;
 					});
@@ -12070,10 +12259,10 @@ var ExcelTS = (function(exports) {
 		parseOpen(node) {
 			if (node.name === "sheetFormatPr") {
 				this.model = {
-					defaultRowHeight: parseFloat(node.attributes.defaultRowHeight || "0"),
+					defaultRowHeight: parseFloat(node.attributes.defaultRowHeight ?? "0"),
 					dyDescent: node.attributes["x14ac:dyDescent"] !== void 0 ? parseFloat(node.attributes["x14ac:dyDescent"]) : void 0,
-					outlineLevelRow: parseInt(node.attributes.outlineLevelRow || "0", 10),
-					outlineLevelCol: parseInt(node.attributes.outlineLevelCol || "0", 10)
+					outlineLevelRow: parseInt(node.attributes.outlineLevelRow ?? "0", 10),
+					outlineLevelCol: parseInt(node.attributes.outlineLevelCol ?? "0", 10)
 				};
 				if (node.attributes.defaultColWidth) this.model.defaultColWidth = parseFloat(node.attributes.defaultColWidth);
 				if (node.attributes.customHeight === "1") this.model.customHeight = true;
@@ -12110,7 +12299,7 @@ var ExcelTS = (function(exports) {
 		render(xmlStream, model) {
 			const initialAttrs = {};
 			if (model.tabSelected) initialAttrs.tabSelected = "1";
-			initialAttrs.workbookViewId = model.workbookViewId || 0;
+			initialAttrs.workbookViewId = model.workbookViewId ?? 0;
 			xmlStream.openNode("sheetView", initialAttrs);
 			const add = function(name, value, included) {
 				if (included) xmlStream.addAttribute(name, value);
@@ -12128,8 +12317,8 @@ var ExcelTS = (function(exports) {
 			let activePane;
 			switch (model.state) {
 				case "frozen":
-					xSplit = model.xSplit || 0;
-					ySplit = model.ySplit || 0;
+					xSplit = model.xSplit ?? 0;
+					ySplit = model.ySplit ?? 0;
 					topLeftCell = model.topLeftCell || colCache.getAddress(ySplit + 1, xSplit + 1).address;
 					activePane = model.xSplit && model.ySplit && "bottomRight" || model.xSplit && "topRight" || "bottomLeft";
 					xmlStream.leafNode("pane", {
@@ -12179,8 +12368,8 @@ var ExcelTS = (function(exports) {
 						showRuler: !(node.attributes.showRuler === "0"),
 						showRowColHeaders: !(node.attributes.showRowColHeaders === "0"),
 						showGridLines: !(node.attributes.showGridLines === "0"),
-						zoomScale: parseInt(node.attributes.zoomScale || "100", 10),
-						zoomScaleNormal: parseInt(node.attributes.zoomScaleNormal || "100", 10),
+						zoomScale: parseInt(node.attributes.zoomScale ?? "100", 10),
+						zoomScaleNormal: parseInt(node.attributes.zoomScaleNormal ?? "100", 10),
 						style: node.attributes.view
 					};
 					this.pane = void 0;
@@ -12188,15 +12377,15 @@ var ExcelTS = (function(exports) {
 					return true;
 				case "pane":
 					this.pane = {
-						xSplit: parseInt(node.attributes.xSplit || "0", 10),
-						ySplit: parseInt(node.attributes.ySplit || "0", 10),
+						xSplit: parseInt(node.attributes.xSplit ?? "0", 10),
+						ySplit: parseInt(node.attributes.ySplit ?? "0", 10),
 						topLeftCell: node.attributes.topLeftCell,
-						activePane: node.attributes.activePane || "topLeft",
+						activePane: node.attributes.activePane ?? "topLeft",
 						state: node.attributes.state
 					};
 					return true;
 				case "selection": {
-					const name = node.attributes.pane || "topLeft";
+					const name = node.attributes.pane ?? "topLeft";
 					this.selections[name] = {
 						pane: name,
 						activeCell: node.attributes.activeCell
@@ -12217,7 +12406,7 @@ var ExcelTS = (function(exports) {
 							workbookViewId: this.sheetView.workbookViewId,
 							rightToLeft: this.sheetView.rightToLeft,
 							tabSelected: this.sheetView.tabSelected,
-							state: VIEW_STATES[this.pane.state] || "split",
+							state: VIEW_STATES[this.pane.state] ?? "split",
 							xSplit: this.pane.xSplit,
 							ySplit: this.pane.ySplit,
 							topLeftCell: this.pane.topLeftCell,
@@ -12439,21 +12628,21 @@ var ExcelTS = (function(exports) {
 				case this.tag:
 					this.model = {
 						paperSize: pageSizeToModel(node.attributes.paperSize),
-						orientation: node.attributes.orientation || "portrait",
-						horizontalDpi: parseInt(node.attributes.horizontalDpi || "4294967295", 10),
-						verticalDpi: parseInt(node.attributes.verticalDpi || "4294967295", 10),
-						pageOrder: node.attributes.pageOrder || "downThenOver",
+						orientation: node.attributes.orientation ?? "portrait",
+						horizontalDpi: parseInt(node.attributes.horizontalDpi ?? "4294967295", 10),
+						verticalDpi: parseInt(node.attributes.verticalDpi ?? "4294967295", 10),
+						pageOrder: node.attributes.pageOrder ?? "downThenOver",
 						blackAndWhite: node.attributes.blackAndWhite === "1",
 						draft: node.attributes.draft === "1",
-						cellComments: node.attributes.cellComments || "None",
-						errors: node.attributes.errors || "displayed",
-						scale: parseInt(node.attributes.scale || "100", 10),
-						fitToWidth: parseInt(node.attributes.fitToWidth || "1", 10),
-						fitToHeight: parseInt(node.attributes.fitToHeight || "1", 10),
-						firstPageNumber: parseInt(node.attributes.firstPageNumber || "1", 10),
+						cellComments: node.attributes.cellComments ?? "None",
+						errors: node.attributes.errors ?? "displayed",
+						scale: parseInt(node.attributes.scale ?? "100", 10),
+						fitToWidth: parseInt(node.attributes.fitToWidth ?? "1", 10),
+						fitToHeight: parseInt(node.attributes.fitToHeight ?? "1", 10),
+						firstPageNumber: parseInt(node.attributes.firstPageNumber ?? "1", 10),
 						useFirstPageNumber: node.attributes.useFirstPageNumber === "1",
 						usePrinterDefaults: node.attributes.usePrinterDefaults === "1",
-						copies: parseInt(node.attributes.copies || "1", 10)
+						copies: parseInt(node.attributes.copies ?? "1", 10)
 					};
 					return true;
 				default: return false;
@@ -12766,22 +12955,22 @@ var ExcelTS = (function(exports) {
 		parseText(text) {
 			switch (this.currentNode) {
 				case "oddHeader":
-					this.model.oddHeader = (this.model.oddHeader || "") + text;
+					this.model.oddHeader = (this.model.oddHeader ?? "") + text;
 					break;
 				case "oddFooter":
-					this.model.oddFooter = (this.model.oddFooter || "") + text;
+					this.model.oddFooter = (this.model.oddFooter ?? "") + text;
 					break;
 				case "evenHeader":
-					this.model.evenHeader = (this.model.evenHeader || "") + text;
+					this.model.evenHeader = (this.model.evenHeader ?? "") + text;
 					break;
 				case "evenFooter":
-					this.model.evenFooter = (this.model.evenFooter || "") + text;
+					this.model.evenFooter = (this.model.evenFooter ?? "") + text;
 					break;
 				case "firstHeader":
-					this.model.firstHeader = (this.model.firstHeader || "") + text;
+					this.model.firstHeader = (this.model.firstHeader ?? "") + text;
 					break;
 				case "firstFooter":
-					this.model.firstFooter = (this.model.firstFooter || "") + text;
+					this.model.firstFooter = (this.model.firstFooter ?? "") + text;
 					break;
 				default: break;
 			}
@@ -13262,7 +13451,7 @@ var ExcelTS = (function(exports) {
 					Object.assign(this.model, parser.model);
 					break;
 				case "formula":
-					this.model.formulae = this.model.formulae || [];
+					this.model.formulae = this.model.formulae ?? [];
 					this.model.formulae.push(parser.model);
 					break;
 			}
@@ -13315,7 +13504,7 @@ var ExcelTS = (function(exports) {
 			this.model = [];
 		}
 		prepare(model, options) {
-			let nextPriority = model.reduce((p, cf) => Math.max(p, ...cf.rules.map((rule) => rule.priority || 0)), 1);
+			let nextPriority = model.reduce((p, cf) => Math.max(p, ...cf.rules.map((rule) => rule.priority ?? 0)), 1);
 			model.forEach((cf) => {
 				cf.rules.forEach((rule) => {
 					if (!rule.priority) rule.priority = nextPriority++;
@@ -13644,7 +13833,7 @@ var ExcelTS = (function(exports) {
 			xmlStream.openNode(this.tag, {
 				type: "iconSet",
 				priority: model.priority,
-				id: model.x14Id || `{${uuidV4()}}`
+				id: model.x14Id ?? `{${uuidV4()}}`
 			});
 			this.iconSetXform.render(xmlStream, model);
 			xmlStream.closeNode();
@@ -13861,7 +14050,7 @@ var ExcelTS = (function(exports) {
 		constructor(options) {
 			super();
 			const { maxRows, maxCols, ignoreNodes } = options || {};
-			this.ignoreNodes = ignoreNodes || [];
+			this.ignoreNodes = ignoreNodes ?? [];
 			this.map = {
 				sheetPr: new SheetPropertiesXform(),
 				dimension: new DimensionXform(),
@@ -14047,7 +14236,7 @@ var ExcelTS = (function(exports) {
 					if (style) column.dxfId = options.styles.addDxfStyle(style);
 				});
 			});
-			(model.pivotTables || []).forEach((pivotTable) => {
+			(model.pivotTables ?? []).forEach((pivotTable) => {
 				rels.push({
 					Id: nextRid(rels),
 					Type: RelType.PivotTable,
@@ -14267,8 +14456,8 @@ var ExcelTS = (function(exports) {
 						drawing: this.map.drawing.model,
 						tables: this.map.tableParts.model,
 						conditionalFormattings,
-						rowBreaks: this.map.rowBreaks.model || [],
-						colBreaks: this.map.colBreaks.model || []
+						rowBreaks: this.map.rowBreaks.model ?? [],
+						colBreaks: this.map.colBreaks.model ?? []
 					};
 					if (this.map.autoFilter.model) this.model.autoFilter = this.map.autoFilter.model;
 					if (this.map.sheetProtection.model) this.model.sheetProtection = this.map.sheetProtection.model;
@@ -14278,7 +14467,7 @@ var ExcelTS = (function(exports) {
 			}
 		}
 		reconcile(model, options) {
-			const rels = (model.relationships || []).reduce((h, rel) => {
+			const rels = (model.relationships ?? []).reduce((h, rel) => {
 				h[rel.Id] = rel;
 				if (rel.Type === RelType.Comments) model.comments = options.comments[rel.Target].comments;
 				if (rel.Type === RelType.VmlDrawing && model.comments && model.comments.length) {
@@ -14289,18 +14478,18 @@ var ExcelTS = (function(exports) {
 				}
 				return h;
 			}, {});
-			options.commentsMap = (model.comments || []).reduce((h, comment) => {
+			options.commentsMap = (model.comments ?? []).reduce((h, comment) => {
 				if (comment.ref) h[comment.ref] = comment;
 				return h;
 			}, {});
-			options.hyperlinkMap = (model.hyperlinks || []).reduce((h, hyperlink) => {
+			options.hyperlinkMap = (model.hyperlinks ?? []).reduce((h, hyperlink) => {
 				if (hyperlink.rId) h[hyperlink.address] = rels[hyperlink.rId].Target;
 				return h;
 			}, {});
 			options.formulae = {};
-			model.rows = model.rows && model.rows.filter(Boolean) || [];
+			model.rows = model.rows?.filter(Boolean) ?? [];
 			model.rows.forEach((row) => {
-				row.cells = row.cells && row.cells.filter(Boolean) || [];
+				row.cells = row.cells?.filter(Boolean) ?? [];
 			});
 			this.map.cols.reconcile(model.cols, options);
 			this.map.sheetData.reconcile(model.rows, options);
@@ -14315,7 +14504,7 @@ var ExcelTS = (function(exports) {
 						model.drawing = {
 							...drawing,
 							name: drawingName,
-							rels: options.drawingRels?.[drawingName] || drawing.rels || []
+							rels: options.drawingRels?.[drawingName] ?? drawing.rels ?? []
 						};
 						drawing.anchors.forEach((anchor) => {
 							if (anchor.medium) {
@@ -14340,12 +14529,12 @@ var ExcelTS = (function(exports) {
 					imageId
 				});
 			}
-			model.tables = (model.tables || []).map((tablePart) => {
+			model.tables = (model.tables ?? []).map((tablePart) => {
 				const rel = rels[tablePart.rId];
 				return options.tables[rel.Target];
 			});
 			model.pivotTables = [];
-			(model.relationships || []).forEach((rel) => {
+			(model.relationships ?? []).forEach((rel) => {
 				if (rel.Type === RelType.PivotTable && options.pivotTables) {
 					const pivotTable = options.pivotTables[rel.Target];
 					if (pivotTable) model.pivotTables.push(pivotTable);
@@ -14404,7 +14593,7 @@ var ExcelTS = (function(exports) {
 			switch (node.name) {
 				case this.tag:
 					this.reset();
-					this.model = { range: { editAs: node.attributes.editAs || "oneCell" } };
+					this.model = { range: { editAs: node.attributes.editAs ?? "oneCell" } };
 					break;
 				default:
 					this.parser = this.map[node.name];
@@ -15021,7 +15210,7 @@ var ExcelTS = (function(exports) {
 					...model.alternateContent?.requires === "a14" ? { "xmlns:a14": "http://schemas.microsoft.com/office/drawing/2010/main" } : {}
 				});
 			}
-			xmlStream.openNode(this.tag, { editAs: model.range.editAs || "oneCell" });
+			xmlStream.openNode(this.tag, { editAs: model.range.editAs ?? "oneCell" });
 			this.map["xdr:from"].render(xmlStream, model.range.tl);
 			this.map["xdr:to"].render(xmlStream, model.range.br);
 			if (model.picture) this.map["xdr:pic"].render(xmlStream, model.picture);
@@ -15078,8 +15267,8 @@ var ExcelTS = (function(exports) {
 		parseOpen(node) {
 			if (node.name === this.tag) {
 				this.model = {
-					width: parseInt(node.attributes.cx || "0", 10) / EMU_PER_PIXEL_AT_96_DPI,
-					height: parseInt(node.attributes.cy || "0", 10) / EMU_PER_PIXEL_AT_96_DPI
+					width: parseInt(node.attributes.cx ?? "0", 10) / EMU_PER_PIXEL_AT_96_DPI,
+					height: parseInt(node.attributes.cy ?? "0", 10) / EMU_PER_PIXEL_AT_96_DPI
 				};
 				return true;
 			}
@@ -15110,7 +15299,7 @@ var ExcelTS = (function(exports) {
 			this.map["xdr:pic"].prepare(model.picture, options);
 		}
 		render(xmlStream, model) {
-			xmlStream.openNode(this.tag, { editAs: model.range.editAs || "oneCell" });
+			xmlStream.openNode(this.tag, { editAs: model.range.editAs ?? "oneCell" });
 			this.map["xdr:from"].render(xmlStream, model.range.tl);
 			this.map["xdr:ext"].render(xmlStream, model.range.ext);
 			this.map["xdr:pic"].render(xmlStream, model.picture);
@@ -15604,16 +15793,145 @@ var ExcelTS = (function(exports) {
 		}
 	};
 
+//#endregion
+//#region src/modules/excel/xlsx/xform/pivot-table/cache-field.ts
+/**
+	* Format a Date for OOXML pivot cache output.
+	* Excel expects `"2024-01-15T00:00:00"` — no milliseconds, no trailing "Z".
+	*/
+	function formatDateForExcel(date) {
+		if (isNaN(date.getTime())) return "";
+		return date.toISOString().replace(/\.\d{3}Z$/, "");
+	}
+	/**
+	* Render a single `<cacheField>` element as an XML string.
+	*
+	* This is a pure data-in → string-out transformation with no state or lifecycle,
+	* so it is a plain function rather than a class.
+	*/
+	function renderCacheField(cf) {
+		const escapedName = xmlEncode(cf.name);
+		const fmtId = cf.numFmtId ?? "0";
+		const extraStr = buildExtraAttrsStr(cf.extraAttrs);
+		const fgXml = cf.fieldGroupXml ? `\n      ${cf.fieldGroupXml}` : "";
+		if (cf.sharedItems === null) {
+			if (cf.isLoaded) {
+				if (fgXml) return `<cacheField name="${escapedName}" numFmtId="${fmtId}"${extraStr}>${fgXml}\n    </cacheField>`;
+				return `<cacheField name="${escapedName}" numFmtId="${fmtId}"${extraStr} />`;
+			}
+			let attrStr;
+			if (cf.minValue !== void 0 && cf.maxValue !== void 0) attrStr = ` containsSemiMixedTypes="0" containsString="0" containsNumber="1"${cf.containsInteger ? " containsInteger=\"1\"" : ""} minValue="${cf.minValue}" maxValue="${cf.maxValue}"`;
+			else attrStr = "";
+			return `<cacheField name="${escapedName}" numFmtId="${fmtId}"${extraStr}>
+      <sharedItems${attrStr} />${fgXml}
+    </cacheField>`;
+		}
+		if (cf.isLoaded && cf.sharedItems.length === 0) return `<cacheField name="${escapedName}" numFmtId="${fmtId}"${extraStr}>
+      <sharedItems${buildLoadedSharedItemsAttrs(cf)} />${fgXml}
+    </cacheField>`;
+		if (cf.isLoaded) {
+			const itemXmls = renderSharedItemElements(cf.sharedItems);
+			return `<cacheField name="${escapedName}" numFmtId="${fmtId}"${extraStr}>
+      <sharedItems${buildLoadedSharedItemsAttrs(cf)} count="${cf.sharedItems.length}">
+        ${itemXmls}
+      </sharedItems>${fgXml}
+    </cacheField>`;
+		}
+		let hasString = false;
+		let hasNumber = false;
+		let hasBoolean = false;
+		let hasDate = false;
+		let hasNull = false;
+		let hasError = false;
+		let allInteger = true;
+		let minValue = Infinity;
+		let maxValue = -Infinity;
+		for (const item of cf.sharedItems) if (item === null) hasNull = true;
+		else if (item instanceof PivotErrorValue) hasError = true;
+		else if (typeof item === "string") hasString = true;
+		else if (typeof item === "number") if (Number.isFinite(item)) {
+			hasNumber = true;
+			if (item < minValue) minValue = item;
+			if (item > maxValue) maxValue = item;
+			if (!Number.isInteger(item)) allInteger = false;
+		} else hasNull = true;
+		else if (typeof item === "boolean") hasBoolean = true;
+		else if (item instanceof Date) hasDate = true;
+		const attrs = [];
+		if (!hasString) {
+			attrs.push("containsSemiMixedTypes=\"0\"");
+			attrs.push("containsString=\"0\"");
+		}
+		if ((hasString ? 1 : 0) + (hasNumber ? 1 : 0) + (hasBoolean ? 1 : 0) + (hasDate ? 1 : 0) + (hasError ? 1 : 0) > 1) attrs.push("containsMixedTypes=\"1\"");
+		if (hasNumber) {
+			attrs.push("containsNumber=\"1\"");
+			if (allInteger) attrs.push("containsInteger=\"1\"");
+			attrs.push(`minValue="${minValue}"`);
+			attrs.push(`maxValue="${maxValue}"`);
+		}
+		if (hasDate) attrs.push("containsDate=\"1\"");
+		if (hasNull) attrs.push("containsBlank=\"1\"");
+		const itemXmls = renderSharedItemElements(cf.sharedItems);
+		return `<cacheField name="${escapedName}" numFmtId="${fmtId}"${extraStr}>
+      <sharedItems${attrs.length > 0 ? ` ${attrs.join(" ")}` : ""} count="${cf.sharedItems.length}">
+        ${itemXmls}
+      </sharedItems>${fgXml}
+    </cacheField>`;
+	}
+	/**
+	* Render shared item elements as an XML string.
+	*/
+	function renderSharedItemElements(sharedItems) {
+		const itemXmls = [];
+		for (const item of sharedItems) if (item === null) itemXmls.push("<m />");
+		else if (item instanceof PivotErrorValue) itemXmls.push(`<e v="${xmlEncode(item.code)}" />`);
+		else if (typeof item === "number") if (Number.isFinite(item)) itemXmls.push(`<n v="${item}" />`);
+		else itemXmls.push("<m />");
+		else if (typeof item === "boolean") itemXmls.push(`<b v="${item ? "1" : "0"}" />`);
+		else if (item instanceof Date) itemXmls.push(`<d v="${formatDateForExcel(item)}" />`);
+		else itemXmls.push(`<s v="${xmlEncode(item)}" />`);
+		return itemXmls.join("");
+	}
+	/**
+	* Build extra attributes string for cacheField element (roundtrip preservation).
+	*/
+	function buildExtraAttrsStr(extraAttrs) {
+		if (!extraAttrs) return "";
+		return Object.entries(extraAttrs).map(([k, v]) => ` ${k}="${xmlEncode(v)}"`).join("");
+	}
+	/**
+	* Build sharedItems attribute string from preserved loaded attributes.
+	* Reconstructs the original attribute order for roundtrip fidelity.
+	*/
+	function buildLoadedSharedItemsAttrs(cf) {
+		const parts = [];
+		if (cf.containsSemiMixedTypes !== void 0) parts.push(`containsSemiMixedTypes="${cf.containsSemiMixedTypes}"`);
+		if (cf.containsNonDate !== void 0) parts.push(`containsNonDate="${cf.containsNonDate}"`);
+		if (cf.containsString !== void 0) parts.push(`containsString="${cf.containsString}"`);
+		if (cf.containsBlank !== void 0) parts.push(`containsBlank="${cf.containsBlank}"`);
+		if (cf.containsMixedTypes !== void 0) parts.push(`containsMixedTypes="${cf.containsMixedTypes}"`);
+		if (cf.containsNumber !== void 0) parts.push(`containsNumber="${cf.containsNumber}"`);
+		if (cf.containsInteger !== void 0) parts.push(`containsInteger="${cf.containsInteger}"`);
+		if (cf.minValue !== void 0) parts.push(`minValue="${cf.minValue}"`);
+		if (cf.maxValue !== void 0) parts.push(`maxValue="${cf.maxValue}"`);
+		if (cf.containsDate !== void 0) parts.push(`containsDate="${cf.containsDate}"`);
+		return parts.length > 0 ? ` ${parts.join(" ")}` : "";
+	}
+
 //#endregion
 //#region src/modules/excel/xlsx/xform/pivot-table/pivot-cache-records-xform.ts
+/** Attribute keys on <pivotCacheRecords> that are individually parsed (not collected into extraRootAttrs). */
+	const KNOWN_CACHE_RECORDS_ROOT_KEYS = new Set([
+		"xmlns",
+		"xmlns:r",
+		"count"
+	]);
 	var PivotCacheRecordsXform = class PivotCacheRecordsXform extends BaseXform {
 		constructor() {
 			super();
-			this.map = {};
 			this.model = null;
 			this.currentRecord = null;
 		}
-		prepare(_model) {}
 		get tag() {
 			return "pivotCacheRecords";
 		}
@@ -15626,7 +15944,7 @@ var ExcelTS = (function(exports) {
 		* Supports both newly created models (with PivotTableSource) and loaded models.
 		*/
 		render(xmlStream, model) {
-			if (model.isLoaded || !("source" in model)) this.renderLoaded(xmlStream, model);
+			if ("isLoaded" in model && model.isLoaded || !("source" in model)) this.renderLoaded(xmlStream, model);
 			else this.renderNew(xmlStream, model);
 		}
 		/**
@@ -15634,7 +15952,7 @@ var ExcelTS = (function(exports) {
 		*/
 		renderNew(xmlStream, model) {
 			const { source, cacheFields } = model;
-			const sourceBodyRows = source.getSheetValues().slice(2);
+			const sourceBodyRows = source.getSheetValues().slice(2).filter(Array.isArray);
 			xmlStream.openXml(XmlStream.StdDocAttributes);
 			xmlStream.openNode(this.tag, {
 				...PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES,
@@ -15648,10 +15966,18 @@ var ExcelTS = (function(exports) {
 		*/
 		renderLoaded(xmlStream, model) {
 			xmlStream.openXml(XmlStream.StdDocAttributes);
-			xmlStream.openNode(this.tag, {
-				...PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES,
-				count: model.count
-			});
+			const rootAttrs = {
+				xmlns: PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES.xmlns,
+				"xmlns:r": PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES["xmlns:r"]
+			};
+			if (model.extraRootAttrs) for (const [k, v] of Object.entries(model.extraRootAttrs)) rootAttrs[k] = v;
+			else {
+				rootAttrs["xmlns:mc"] = PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES["xmlns:mc"];
+				rootAttrs["mc:Ignorable"] = PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES["mc:Ignorable"];
+				rootAttrs["xmlns:xr"] = PivotCacheRecordsXform.PIVOT_CACHE_RECORDS_ATTRIBUTES["xmlns:xr"];
+			}
+			rootAttrs.count = model.records.length;
+			xmlStream.openNode(this.tag, rootAttrs);
 			for (const record of model.records) {
 				xmlStream.writeXml("\n  <r>");
 				for (const value of record) {
@@ -15668,13 +15994,18 @@ var ExcelTS = (function(exports) {
 		renderRecordValue(value) {
 			switch (value.type) {
 				case "x": return `<x v="${value.value}" />`;
-				case "n": return `<n v="${value.value}" />`;
-				case "s": return `<s v="${xmlEncode(String(value.value))}" />`;
+				case "n":
+					if (!Number.isFinite(value.value)) return "<m />";
+					return `<n v="${value.value}" />`;
+				case "s": return `<s v="${xmlEncode(value.value)}" />`;
 				case "b": return `<b v="${value.value ? "1" : "0"}" />`;
 				case "m": return "<m />";
-				case "d": return `<d v="${value.value.toISOString()}" />`;
-				case "e": return `<e v="${value.value}" />`;
-				default: return "<m />";
+				case "d": return `<d v="${formatDateForExcel(value.value)}" />`;
+				case "e": return `<e v="${xmlEncode(value.value)}" />`;
+				default: {
+					const _exhaustive = value;
+					throw new Error(`Unhandled record value type: ${_exhaustive.type}`);
+				}
 			}
 		}
 		renderTableNew(sourceBodyRows, cacheFields) {
@@ -15682,54 +16013,69 @@ var ExcelTS = (function(exports) {
 			for (const row of sourceBodyRows) {
 				const realRow = row.slice(1);
 				parts.push("\n  <r>");
-				for (let i = 0; i < realRow.length; i++) {
+				const fieldCount = Math.min(realRow.length, cacheFields.length);
+				for (let i = 0; i < fieldCount; i++) {
 					parts.push("\n    ");
 					parts.push(this.renderCellNew(realRow[i], cacheFields[i].sharedItems));
 				}
+				for (let i = fieldCount; i < cacheFields.length; i++) parts.push("\n    <m />");
 				parts.push("\n  </r>");
 			}
 			return parts.join("");
 		}
 		renderCellNew(value, sharedItems) {
-			if (value === null || value === void 0) return "<m />";
+			if (value === null || value === void 0 || typeof value === "number" && !Number.isFinite(value)) {
+				if (sharedItems === null) return "<m />";
+				const idx = sharedItems.indexOf(null);
+				if (idx >= 0) return `<x v="${idx}" />`;
+				return "<m />";
+			}
 			if (sharedItems === null) {
+				if (value instanceof PivotErrorValue) return `<e v="${xmlEncode(value.code)}" />`;
+				if (typeof value === "boolean") return `<b v="${value ? "1" : "0"}" />`;
+				if (value instanceof Date) return `<d v="${formatDateForExcel(value)}" />`;
 				if (Number.isFinite(value)) return `<n v="${value}" />`;
 				return `<s v="${xmlEncode(String(value))}" />`;
 			}
-			const sharedItemsIndex = sharedItems.indexOf(value);
+			const sharedItemsIndex = findSharedItemIndex(sharedItems, value);
 			if (sharedItemsIndex < 0) throw new Error(`${JSON.stringify(value)} not in sharedItems ${JSON.stringify(sharedItems)}`);
 			return `<x v="${sharedItemsIndex}" />`;
 		}
 		parseOpen(node) {
 			const { name, attributes } = node;
 			switch (name) {
-				case this.tag:
+				case this.tag: {
 					this.reset();
+					const extraRootAttrs = {};
+					for (const [k, v] of Object.entries(attributes)) if (!KNOWN_CACHE_RECORDS_ROOT_KEYS.has(k)) extraRootAttrs[k] = String(v);
 					this.model = {
 						records: [],
-						count: parseInt(attributes.count || "0", 10),
-						isLoaded: true
+						count: parseInt(attributes.count ?? "0", 10),
+						isLoaded: true,
+						extraRootAttrs: Object.keys(extraRootAttrs).length > 0 ? extraRootAttrs : void 0
 					};
 					break;
+				}
 				case "r":
 					this.currentRecord = [];
 					break;
 				case "x":
 					if (this.currentRecord) this.currentRecord.push({
 						type: "x",
-						value: parseInt(attributes.v || "0", 10)
+						value: parseInt(attributes.v ?? "0", 10)
 					});
 					break;
 				case "n":
-					if (this.currentRecord) this.currentRecord.push({
+					if (this.currentRecord) if (attributes.v === void 0 || attributes.v === "") this.currentRecord.push({ type: "m" });
+					else this.currentRecord.push({
 						type: "n",
-						value: parseFloat(attributes.v || "0")
+						value: parseFloat(attributes.v)
 					});
 					break;
 				case "s":
 					if (this.currentRecord) this.currentRecord.push({
 						type: "s",
-						value: xmlDecode(attributes.v || "")
+						value: attributes.v ?? ""
 					});
 					break;
 				case "b":
@@ -15742,15 +16088,20 @@ var ExcelTS = (function(exports) {
 					if (this.currentRecord) this.currentRecord.push({ type: "m" });
 					break;
 				case "d":
-					if (this.currentRecord) this.currentRecord.push({
-						type: "d",
-						value: new Date(attributes.v || "")
-					});
+					if (this.currentRecord) if (!attributes.v) this.currentRecord.push({ type: "m" });
+					else {
+						const date = parseOoxmlDate(attributes.v);
+						if (isNaN(date.getTime())) this.currentRecord.push({ type: "m" });
+						else this.currentRecord.push({
+							type: "d",
+							value: date
+						});
+					}
 					break;
 				case "e":
 					if (this.currentRecord) this.currentRecord.push({
 						type: "e",
-						value: attributes.v || ""
+						value: attributes.v ?? ""
 					});
 					break;
 			}
@@ -15769,7 +16120,6 @@ var ExcelTS = (function(exports) {
 			}
 			return true;
 		}
-		reconcile(_model, _options) {}
 		static {
 			this.PIVOT_CACHE_RECORDS_ATTRIBUTES = {
 				xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -15780,48 +16130,157 @@ var ExcelTS = (function(exports) {
 			};
 		}
 	};
+	/**
+	* Find the index of `value` in `sharedItems`, using type-aware comparison.
+	* - Date objects are compared by timestamp (getTime()) since === uses reference equality.
+	* - PivotErrorValue objects are compared by their code string.
+	* - All other types use strict equality (===) via indexOf.
+	*/
+	function findSharedItemIndex(sharedItems, value) {
+		if (value instanceof Date) {
+			const ts = value.getTime();
+			for (let i = 0; i < sharedItems.length; i++) {
+				const item = sharedItems[i];
+				if (item instanceof Date && item.getTime() === ts) return i;
+			}
+			return -1;
+		}
+		if (value instanceof PivotErrorValue) {
+			for (let i = 0; i < sharedItems.length; i++) {
+				const item = sharedItems[i];
+				if (item instanceof PivotErrorValue && item.code === value.code) return i;
+			}
+			return -1;
+		}
+		return sharedItems.indexOf(value);
+	}
 
 //#endregion
-//#region src/modules/excel/xlsx/xform/pivot-table/cache-field.ts
-	var CacheField = class {
-		constructor({ name, sharedItems, minValue, maxValue }) {
-			this.name = name;
-			this.sharedItems = sharedItems;
-			this.minValue = minValue;
-			this.maxValue = maxValue;
-		}
-		render() {
-			const escapedName = xmlEncode(this.name);
-			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>`;
+//#region src/modules/excel/xlsx/xform/pivot-table/raw-xml-collector.ts
+/**
+	* Reusable utility for collecting raw XML fragments during SAX parsing.
+	*
+	* Many pivot-table xforms need to capture entire sub-trees (extLst, formats,
+	* conditionalFormats, filters, fieldGroup, unknown elements, …) as raw strings
+	* for roundtrip preservation.  The pattern — `active` flag, `depth` counter,
+	* `buffer` of string fragments, plus identical `feedOpen` / `feedClose` /
+	* `feedText` logic — was previously copy-pasted across multiple files.
+	*
+	* Usage:
+	* ```ts
+	* const collector = new RawXmlCollector("extLst");
+	* // In parseOpen, when you see <extLst>:
+	* collector.start();                      // opens with <extLst>
+	* // For every child open tag while active:
+	* collector.feedOpen(name, attributes);
+	* // For every text node while active:
+	* collector.feedText(text);
+	* // For every close tag while active:
+	* if (collector.feedClose(name)) { ... }  // returns true when root tag closed
+	* // Retrieve result:
+	* collector.result;                       // joined XML string
+	* ```
+	*/
+	var RawXmlCollector = class {
+		constructor(rootTag) {
+			this.active = false;
+			this.depth = 0;
+			this.buffer = [];
+			this.lastOpenIndex = -1;
+			this.rootTag = rootTag;
+		}
+		/**
+		* Begin collecting.  Pushes the opening root tag (with optional attributes)
+		* and resets depth.
+		*
+		* @param attributes - Attributes on the root element (may be undefined/null).
+		*/
+		start(attributes) {
+			this.active = true;
+			this.depth = 0;
+			const attrsStr = serializeAttributes(attributes);
+			this.buffer = [`<${this.rootTag}${attrsStr ? " " + attrsStr : ""}>`];
+		}
+		/**
+		* Begin collecting with a dynamically determined root tag.
+		* Used for catch-all unknown element collectors where the tag name
+		* is not known at construction time.
+		*/
+		startAs(rootTag, attributes) {
+			this.rootTag = rootTag;
+			this.start(attributes);
+		}
+		/**
+		* Reset the collector to its initial idle state.
+		*/
+		reset() {
+			this.active = false;
+			this.depth = 0;
+			this.buffer.length = 0;
+			this.lastOpenIndex = -1;
+		}
+		/**
+		* Feed an open-tag event.  Must only be called while `active` is true.
+		*/
+		feedOpen(name, attributes) {
+			const attrsStr = serializeAttributes(attributes);
+			this.buffer.push(`<${name}${attrsStr ? " " + attrsStr : ""}>`);
+			this.depth++;
+			this.lastOpenIndex = this.buffer.length - 1;
+		}
+		/**
+		* Feed a text-node event.  Must only be called while `active` is true.
+		*/
+		feedText(text) {
+			this.buffer.push(xmlEncode(text));
+			this.lastOpenIndex = -1;
+		}
+		/**
+		* Feed a close-tag event.
+		*
+		* @returns `true` when the **root** close tag has been received (collector
+		*          deactivates itself and the result is ready).  `false` for any
+		*          nested close tag.
+		*/
+		feedClose(name) {
+			if (name === this.rootTag && this.depth === 0) {
+				this.buffer.push(`</${name}>`);
+				this.active = false;
+				this.lastOpenIndex = -1;
+				return true;
 			}
-			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>`;
+			if (this.depth > 0) this.depth--;
+			if (this.lastOpenIndex >= 0 && this.lastOpenIndex === this.buffer.length - 1) {
+				const openTag = this.buffer[this.lastOpenIndex];
+				this.buffer[this.lastOpenIndex] = openTag.slice(0, -1) + " />";
+				this.lastOpenIndex = -1;
+				return false;
 			}
-			return `<cacheField name="${escapedName}" numFmtId="0">
-      <sharedItems count="${this.sharedItems.length}">
-        ${this.sharedItems.map((item) => `<s v="${xmlEncode(String(item))}" />`).join("")}
-      </sharedItems>
-    </cacheField>`;
+			this.lastOpenIndex = -1;
+			this.buffer.push(`</${name}>`);
+			return false;
+		}
+		/** The collected XML string.  Only meaningful after `feedClose` returns true. */
+		get result() {
+			return this.buffer.join("");
 		}
 	};
+	/**
+	* Serialize an attributes object to an XML attribute string.
+	* `null`, `undefined`, and empty objects produce an empty string.
+	*/
+	function serializeAttributes(attributes) {
+		if (!attributes) return "";
+		const entries = Object.entries(attributes);
+		if (entries.length === 0) return "";
+		return entries.filter(([, v]) => v != null).map(([k, v]) => `${k}="${xmlEncode(String(v))}"`).join(" ");
+	}
 
 //#endregion
 //#region src/modules/excel/xlsx/xform/pivot-table/cache-field-xform.ts
-/**
+/** Attribute keys on <cacheField> that are individually parsed (not collected into extraAttrs). */
+	const KNOWN_CACHE_FIELD_KEYS = new Set(["name", "numFmtId"]);
+	/**
 	* Xform for parsing individual <cacheField> elements within a pivot cache definition.
 	*
 	* Example XML:
@@ -15843,8 +16302,9 @@ var ExcelTS = (function(exports) {
 	var CacheFieldXform = class extends BaseXform {
 		constructor() {
 			super();
-			this.model = null;
 			this.inSharedItems = false;
+			this.fieldGroupCollector = new RawXmlCollector("fieldGroup");
+			this.model = null;
 		}
 		get tag() {
 			return "cacheField";
@@ -15852,65 +16312,74 @@ var ExcelTS = (function(exports) {
 		reset() {
 			this.model = null;
 			this.inSharedItems = false;
+			this.fieldGroupCollector.reset();
 		}
 		parseOpen(node) {
 			const { name, attributes } = node;
+			if (this.fieldGroupCollector.active) {
+				this.fieldGroupCollector.feedOpen(name, attributes);
+				return true;
+			}
 			switch (name) {
-				case "cacheField":
+				case "cacheField": {
+					const extraAttrs = {};
+					for (const [k, v] of Object.entries(attributes)) if (!KNOWN_CACHE_FIELD_KEYS.has(k)) extraAttrs[k] = String(v);
 					this.model = {
-						name: xmlDecode(attributes.name || ""),
-						sharedItems: null
+						name: attributes.name ?? "",
+						sharedItems: null,
+						numFmtId: attributes.numFmtId,
+						isLoaded: true,
+						extraAttrs: Object.keys(extraAttrs).length > 0 ? extraAttrs : void 0
 					};
 					break;
+				}
+				case "fieldGroup":
+					if (this.model) this.fieldGroupCollector.start(attributes);
+					break;
 				case "sharedItems":
 					this.inSharedItems = true;
 					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;
+						if (attributes.containsNumber !== void 0) this.model.containsNumber = attributes.containsNumber;
+						if (attributes.containsInteger !== void 0) this.model.containsInteger = attributes.containsInteger;
+						if (attributes.minValue !== void 0) {
+							const parsed = parseFloat(attributes.minValue);
+							if (Number.isFinite(parsed)) this.model.minValue = parsed;
+						}
+						if (attributes.maxValue !== void 0) {
+							const parsed = parseFloat(attributes.maxValue);
+							if (Number.isFinite(parsed)) this.model.maxValue = parsed;
+						}
+						if (attributes.containsSemiMixedTypes !== void 0) this.model.containsSemiMixedTypes = attributes.containsSemiMixedTypes;
+						if (attributes.containsNonDate !== void 0) this.model.containsNonDate = attributes.containsNonDate;
+						if (attributes.containsString !== void 0) this.model.containsString = attributes.containsString;
+						if (attributes.containsBlank !== void 0) this.model.containsBlank = attributes.containsBlank;
+						if (attributes.containsDate !== void 0) this.model.containsDate = attributes.containsDate;
+						if (attributes.containsMixedTypes !== void 0) this.model.containsMixedTypes = attributes.containsMixedTypes;
+						this.model.sharedItems = [];
 					}
 					break;
 				case "s":
-					if (this.inSharedItems && this.model?.sharedItems !== null) {
-						const value = xmlDecode(attributes.v || "");
-						this.model.sharedItems.push(value);
-					}
-					break;
 				case "n":
-					if (this.inSharedItems && this.model?.sharedItems !== null) {
-						const value = parseFloat(attributes.v || "0");
-						this.model.sharedItems.push(value);
-					}
-					break;
 				case "b":
-					if (this.inSharedItems && this.model?.sharedItems !== null) {
-						const value = attributes.v === "1";
-						this.model.sharedItems.push(value);
-					}
-					break;
 				case "e":
-					if (this.inSharedItems && this.model?.sharedItems !== null) {
-						const value = `#${attributes.v || "ERROR!"}`;
-						this.model.sharedItems.push(value);
-					}
-					break;
 				case "m":
-					if (this.inSharedItems && this.model?.sharedItems !== null) this.model.sharedItems.push(null);
-					break;
 				case "d":
-					if (this.inSharedItems && this.model?.sharedItems !== null) {
-						const value = new Date(attributes.v || "");
-						this.model.sharedItems.push(value);
-					}
+					if (this.inSharedItems && this.model && this.model.sharedItems !== null) this.model.sharedItems.push(parseSharedItemValue(name, attributes));
 					break;
 			}
 			return true;
 		}
-		parseText(_text) {}
+		parseText(text) {
+			if (this.fieldGroupCollector.active) this.fieldGroupCollector.feedText(text);
+		}
 		parseClose(name) {
+			if (this.fieldGroupCollector.active) {
+				if (this.fieldGroupCollector.feedClose(name)) {
+					if (this.model) this.model.fieldGroupXml = this.fieldGroupCollector.result;
+					this.fieldGroupCollector.reset();
+				}
+				return true;
+			}
 			switch (name) {
 				case "cacheField": return false;
 				case "sharedItems":
@@ -15920,19 +16389,64 @@ var ExcelTS = (function(exports) {
 			return true;
 		}
 	};
+	/**
+	* Convert a SAX-parsed shared item element into its typed value.
+	*
+	* Tag mapping:
+	* - `s` → string
+	* - `n` → number
+	* - `b` → boolean
+	* - `e` → PivotErrorValue
+	* - `m` → null (missing)
+	* - `d` → Date (UTC)
+	*/
+	function parseSharedItemValue(tag, attributes) {
+		switch (tag) {
+			case "s": return attributes.v ?? "";
+			case "n":
+				if (attributes.v === void 0 || attributes.v === "") return null;
+				return parseFloat(attributes.v);
+			case "b": return attributes.v === "1";
+			case "e": return new PivotErrorValue(attributes.v ?? "");
+			case "m": return null;
+			case "d": {
+				if (!attributes.v) return null;
+				const date = parseOoxmlDate(attributes.v);
+				return isNaN(date.getTime()) ? null : date;
+			}
+			default: return null;
+		}
+	}
 
 //#endregion
 //#region src/modules/excel/xlsx/xform/pivot-table/pivot-cache-definition-xform.ts
+/** Attribute keys on <pivotCacheDefinition> that are individually parsed (not collected into extraRootAttrs). */
+	const KNOWN_CACHE_DEF_ROOT_KEYS = new Set([
+		"xmlns",
+		"xmlns:r",
+		"r:id",
+		"refreshOnLoad",
+		"createdVersion",
+		"refreshedVersion",
+		"minRefreshableVersion",
+		"recordCount",
+		"backgroundQuery",
+		"supportSubquery",
+		"supportAdvancedDrill"
+	]);
 	var PivotCacheDefinitionXform = class PivotCacheDefinitionXform extends BaseXform {
 		constructor() {
 			super();
-			this.map = {};
-			this.model = null;
 			this.currentCacheField = null;
 			this.inCacheFields = false;
 			this.inCacheSource = false;
+			this.extLstCollector = new RawXmlCollector("extLst");
+			this.unknownCollector = new RawXmlCollector("");
+			this.unknownElementsXmlParts = [];
+			this.cacheSourceChildCollector = new RawXmlCollector("");
+			this.cacheSourceXmlParts = [];
+			this.model = null;
 		}
-		prepare(_model) {}
 		get tag() {
 			return "pivotCacheDefinition";
 		}
@@ -15941,13 +16455,18 @@ var ExcelTS = (function(exports) {
 			this.currentCacheField = null;
 			this.inCacheFields = false;
 			this.inCacheSource = false;
+			this.extLstCollector.reset();
+			this.unknownCollector.reset();
+			this.unknownElementsXmlParts = [];
+			this.cacheSourceChildCollector.reset();
+			this.cacheSourceXmlParts = [];
 		}
 		/**
 		* Render pivot cache definition XML.
 		* Supports both newly created models (with PivotTableSource) and loaded models.
 		*/
 		render(xmlStream, model) {
-			if (model.isLoaded || !("source" in model)) this.renderLoaded(xmlStream, model);
+			if ("isLoaded" in model && model.isLoaded || !("source" in model)) this.renderLoaded(xmlStream, model);
 			else this.renderNew(xmlStream, model);
 		}
 		/**
@@ -15955,7 +16474,7 @@ var ExcelTS = (function(exports) {
 		*/
 		renderNew(xmlStream, model) {
 			const { source, cacheFields } = model;
-			const recordCount = source.getSheetValues().slice(2).length;
+			const recordCount = source.getSheetValues().slice(2).filter(Array.isArray).length;
 			xmlStream.openXml(XmlStream.StdDocAttributes);
 			xmlStream.openNode(this.tag, {
 				...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
@@ -15967,13 +16486,14 @@ var ExcelTS = (function(exports) {
 				recordCount
 			});
 			xmlStream.openNode("cacheSource", { type: "worksheet" });
-			xmlStream.leafNode("worksheetSource", {
+			const worksheetSourceAttrs = source.tableName ? { name: source.tableName } : {
 				ref: source.dimensions.shortRange,
 				sheet: source.name
-			});
+			};
+			xmlStream.leafNode("worksheetSource", worksheetSourceAttrs);
 			xmlStream.closeNode();
 			xmlStream.openNode("cacheFields", { count: cacheFields.length });
-			xmlStream.writeXml(cacheFields.map((cacheField) => new CacheField(cacheField).render()).join("\n    "));
+			xmlStream.writeXml(PivotCacheDefinitionXform.renderCacheFieldsXml(cacheFields));
 			xmlStream.closeNode();
 			xmlStream.closeNode();
 		}
@@ -15983,36 +16503,61 @@ var ExcelTS = (function(exports) {
 		renderLoaded(xmlStream, model) {
 			const { cacheFields, sourceRef, sourceSheet, sourceTableName, recordCount } = model;
 			xmlStream.openXml(XmlStream.StdDocAttributes);
-			xmlStream.openNode(this.tag, {
+			const rootAttrs = {
 				...PivotCacheDefinitionXform.PIVOT_CACHE_DEFINITION_ATTRIBUTES,
-				"r:id": model.rId || "rId1",
-				refreshOnLoad: model.refreshOnLoad || "1",
-				createdVersion: model.createdVersion || "8",
-				refreshedVersion: model.refreshedVersion || "8",
-				minRefreshableVersion: model.minRefreshableVersion || "3",
-				recordCount: recordCount || cacheFields.length + 1
-			});
-			xmlStream.openNode("cacheSource", { type: "worksheet" });
-			const worksheetSourceAttrs = sourceTableName ? { name: sourceTableName } : {
-				ref: sourceRef,
-				sheet: sourceSheet
+				"r:id": model.rId ?? "rId1"
 			};
-			xmlStream.leafNode("worksheetSource", worksheetSourceAttrs);
+			if (model.refreshOnLoad) rootAttrs.refreshOnLoad = model.refreshOnLoad;
+			rootAttrs.createdVersion = model.createdVersion ?? "8";
+			rootAttrs.refreshedVersion = model.refreshedVersion ?? "8";
+			rootAttrs.minRefreshableVersion = model.minRefreshableVersion ?? "3";
+			if (recordCount !== void 0) rootAttrs.recordCount = recordCount;
+			if (model.backgroundQuery) rootAttrs.backgroundQuery = model.backgroundQuery;
+			if (model.supportSubquery) rootAttrs.supportSubquery = model.supportSubquery;
+			if (model.supportAdvancedDrill) rootAttrs.supportAdvancedDrill = model.supportAdvancedDrill;
+			if (model.extraRootAttrs) for (const [k, v] of Object.entries(model.extraRootAttrs)) rootAttrs[k] = v;
+			xmlStream.openNode(this.tag, rootAttrs);
+			xmlStream.openNode("cacheSource", { type: model.cacheSourceType ?? "worksheet" });
+			if (!model.cacheSourceType || model.cacheSourceType === "worksheet") {
+				const worksheetSourceAttrs = sourceTableName ? { name: sourceTableName } : {
+					ref: sourceRef,
+					sheet: sourceSheet
+				};
+				if (model.worksheetSourceRId) worksheetSourceAttrs["r:id"] = model.worksheetSourceRId;
+				if (Object.values(worksheetSourceAttrs).some((v) => v !== void 0)) xmlStream.leafNode("worksheetSource", worksheetSourceAttrs);
+			}
+			if (model.cacheSourceXml) xmlStream.writeXml(model.cacheSourceXml);
 			xmlStream.closeNode();
 			xmlStream.openNode("cacheFields", { count: cacheFields.length });
-			xmlStream.writeXml(cacheFields.map((cacheField) => new CacheField(cacheField).render()).join("\n    "));
+			xmlStream.writeXml(PivotCacheDefinitionXform.renderCacheFieldsXml(cacheFields));
 			xmlStream.closeNode();
+			if (model.unknownElementsXml) xmlStream.writeXml(model.unknownElementsXml);
+			if (model.extLstXml) xmlStream.writeXml(model.extLstXml);
 			xmlStream.closeNode();
 		}
 		parseOpen(node) {
 			const { name, attributes } = node;
+			if (this.extLstCollector.active) {
+				this.extLstCollector.feedOpen(name, attributes);
+				return true;
+			}
+			if (this.unknownCollector.active) {
+				this.unknownCollector.feedOpen(name, attributes);
+				return true;
+			}
+			if (this.cacheSourceChildCollector.active) {
+				this.cacheSourceChildCollector.feedOpen(name, attributes);
+				return true;
+			}
 			if (this.currentCacheField) {
 				this.currentCacheField.parseOpen(node);
 				return true;
 			}
 			switch (name) {
-				case this.tag:
+				case this.tag: {
 					this.reset();
+					const extraRootAttrs = {};
+					for (const [k, v] of Object.entries(attributes)) if (!KNOWN_CACHE_DEF_ROOT_KEYS.has(k)) extraRootAttrs[k] = String(v);
 					this.model = {
 						cacheFields: [],
 						rId: attributes["r:id"],
@@ -16021,17 +16566,24 @@ var ExcelTS = (function(exports) {
 						refreshedVersion: attributes.refreshedVersion,
 						minRefreshableVersion: attributes.minRefreshableVersion,
 						recordCount: attributes.recordCount ? parseInt(attributes.recordCount, 10) : void 0,
+						backgroundQuery: attributes.backgroundQuery,
+						supportSubquery: attributes.supportSubquery,
+						supportAdvancedDrill: attributes.supportAdvancedDrill,
+						extraRootAttrs: Object.keys(extraRootAttrs).length > 0 ? extraRootAttrs : void 0,
 						isLoaded: true
 					};
 					break;
+				}
 				case "cacheSource":
 					this.inCacheSource = true;
+					if (this.model) this.model.cacheSourceType = attributes.type;
 					break;
 				case "worksheetSource":
 					if (this.inCacheSource && this.model) {
 						this.model.sourceRef = attributes.ref;
 						this.model.sourceSheet = attributes.sheet;
 						this.model.sourceTableName = attributes.name;
+						if (attributes["r:id"]) this.model.worksheetSourceRId = attributes["r:id"];
 					}
 					break;
 				case "cacheFields":
@@ -16043,13 +16595,56 @@ var ExcelTS = (function(exports) {
 						this.currentCacheField.parseOpen(node);
 					}
 					break;
+				case "extLst":
+					if (this.model) this.extLstCollector.start(attributes);
+					break;
+				default:
+					if (this.inCacheSource && this.model) {
+						this.cacheSourceChildCollector.startAs(name, attributes);
+						break;
+					}
+					if (this.model) this.unknownCollector.startAs(name, attributes);
+					break;
 			}
 			return true;
 		}
 		parseText(text) {
+			if (this.extLstCollector.active) {
+				this.extLstCollector.feedText(text);
+				return;
+			}
+			if (this.unknownCollector.active) {
+				this.unknownCollector.feedText(text);
+				return;
+			}
+			if (this.cacheSourceChildCollector.active) {
+				this.cacheSourceChildCollector.feedText(text);
+				return;
+			}
 			if (this.currentCacheField) this.currentCacheField.parseText(text);
 		}
 		parseClose(name) {
+			if (this.extLstCollector.active) {
+				if (this.extLstCollector.feedClose(name)) {
+					if (this.model) this.model.extLstXml = this.extLstCollector.result;
+					this.extLstCollector.reset();
+				}
+				return true;
+			}
+			if (this.unknownCollector.active) {
+				if (this.unknownCollector.feedClose(name)) {
+					this.unknownElementsXmlParts.push(this.unknownCollector.result);
+					this.unknownCollector.reset();
+				}
+				return true;
+			}
+			if (this.cacheSourceChildCollector.active) {
+				if (this.cacheSourceChildCollector.feedClose(name)) {
+					this.cacheSourceXmlParts.push(this.cacheSourceChildCollector.result);
+					this.cacheSourceChildCollector.reset();
+				}
+				return true;
+			}
 			if (this.currentCacheField) {
 				if (!this.currentCacheField.parseClose(name)) {
 					if (this.model && this.currentCacheField.model) this.model.cacheFields.push(this.currentCacheField.model);
@@ -16058,9 +16653,12 @@ var ExcelTS = (function(exports) {
 				return true;
 			}
 			switch (name) {
-				case this.tag: return false;
+				case this.tag:
+					if (this.model && this.unknownElementsXmlParts.length > 0) this.model.unknownElementsXml = this.unknownElementsXmlParts.join("");
+					return false;
 				case "cacheSource":
 					this.inCacheSource = false;
+					if (this.model && this.cacheSourceXmlParts.length > 0) this.model.cacheSourceXml = this.cacheSourceXmlParts.join("");
 					break;
 				case "cacheFields":
 					this.inCacheFields = false;
@@ -16068,7 +16666,9 @@ var ExcelTS = (function(exports) {
 			}
 			return true;
 		}
-		reconcile(_model, _options) {}
+		static renderCacheFieldsXml(cacheFields) {
+			return "\n    " + cacheFields.map((cf) => renderCacheField(cf)).join("\n    ");
+		}
 		static {
 			this.PIVOT_CACHE_DEFINITION_ATTRIBUTES = {
 				xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -16079,71 +16679,117 @@ var ExcelTS = (function(exports) {
 
 //#endregion
 //#region src/modules/excel/xlsx/xform/pivot-table/pivot-table-xform.ts
+/** OOXML sentinel field index meaning "data values" pseudo-field (used in pivotArea references) */
+	const FIELD_INDEX_DATA_VALUES = 4294967294;
+	/**
+	* Signed sentinel for the "Values" pseudo-field in colFields/rowFields.
+	* OOXML represents this as x="-2" (signed int32 of 0xFFFFFFFE).
+	*/
+	const VALUES_FIELD_INDEX = -2;
+	/** Default pivot table style name */
+	const DEFAULT_PIVOT_STYLE = "PivotStyleLight16";
+	/** Valid OOXML axis values for pivot fields */
+	const VALID_PIVOT_AXES = new Set([
+		"axisRow",
+		"axisCol",
+		"axisPage",
+		"axisValues"
+	]);
+	/** PivotFieldItem attribute keys — used to build the attrs object for rendering */
+	const PIVOT_FIELD_ITEM_KEYS = [
+		"x",
+		"t",
+		"h",
+		"sd",
+		"f",
+		"m",
+		"c",
+		"d"
+	];
+	/** Factory for default ParserState values */
+	function createDefaultParserState() {
+		return {
+			currentSection: null,
+			inPivotArea: false,
+			inAutoSortScope: false
+		};
+	}
+	/** Known pivotField attributes that we parse individually (hoisted to module scope) */
+	const KNOWN_PIVOT_FIELD_KEYS = new Set([
+		"axis",
+		"dataField",
+		"compact",
+		"outline",
+		"showAll",
+		"defaultSubtotal",
+		"numFmtId",
+		"sortType",
+		"subtotalTop",
+		"insertBlankRow",
+		"multipleItemSelectionAllowed"
+	]);
 	var PivotTableXform = class PivotTableXform extends BaseXform {
 		constructor() {
 			super();
-			this.state = {
-				inPivotFields: false,
-				inRowFields: false,
-				inColFields: false,
-				inDataFields: false,
-				inRowItems: false,
-				inColItems: false,
-				inLocation: false,
-				inItems: false,
-				inPivotTableStyleInfo: false,
-				inChartFormats: false,
-				inPivotArea: false
-			};
+			this.state = createDefaultParserState();
 			this.currentPivotField = null;
 			this.currentRowItem = null;
 			this.currentColItem = null;
 			this.currentChartFormat = null;
 			this.pivotAreaXmlBuffer = [];
-			this.pivotAreaDepth = 0;
-			this.map = {};
+			this.autoSortScopeXmlBuffer = [];
+			this.extLstCollector = new RawXmlCollector("extLst");
+			this.formatsCollector = new RawXmlCollector("formats");
+			this.conditionalFormatsCollector = new RawXmlCollector("conditionalFormats");
+			this.filtersCollector = new RawXmlCollector("filters");
+			this.unknownCollector = new RawXmlCollector("");
+			this.unknownElementsXmlParts = [];
 			this.model = null;
 		}
-		prepare(_model) {}
 		get tag() {
 			return "pivotTableDefinition";
 		}
 		reset() {
 			this.model = null;
-			Object.keys(this.state).forEach((key) => {
-				this.state[key] = false;
-			});
+			this.state = createDefaultParserState();
 			this.currentPivotField = null;
 			this.currentRowItem = null;
 			this.currentColItem = null;
 			this.currentChartFormat = null;
 			this.pivotAreaXmlBuffer = [];
-			this.pivotAreaDepth = 0;
+			this.autoSortScopeXmlBuffer = [];
+			this.extLstCollector.reset();
+			this.formatsCollector.reset();
+			this.conditionalFormatsCollector.reset();
+			this.filtersCollector.reset();
+			this.unknownCollector.reset();
+			this.unknownElementsXmlParts = [];
 		}
 		/**
 		* Render pivot table XML.
 		* Supports both newly created models and loaded models.
 		*/
 		render(xmlStream, model) {
-			if (model.isLoaded) this.renderLoaded(xmlStream, model);
+			if ("isLoaded" in model && model.isLoaded) this.renderLoaded(xmlStream, model);
 			else this.renderNew(xmlStream, model);
 		}
 		/**
 		* Render newly created pivot table
 		*/
 		renderNew(xmlStream, model) {
-			const { rows, columns, values, cacheFields, cacheId, applyWidthHeightFormats } = model;
-			const rowItems = buildRowItems(rows, cacheFields);
-			const colItems = buildColItems(columns, cacheFields, values.length);
-			const rowFieldItemCount = rows.length > 0 ? cacheFields[rows[0]]?.sharedItems?.length || 0 : 0;
-			const colFieldItemCount = columns.length > 0 ? cacheFields[columns[0]]?.sharedItems?.length || 0 : 0;
-			const endRow = 4 + rowFieldItemCount + 1;
-			const endCol = 1 + colFieldItemCount + 1;
-			const locationRef = `A3:${String.fromCharCode(64 + endCol)}${endRow}`;
+			const { rows, columns, values, pages = [], cacheFields, cacheId, tableNumber, applyWidthHeightFormats } = model;
+			const isMultiValueNoCol = columns.length === 0 && values.length > 1;
+			const pageCount = pages.length;
+			const pageOffset = pageCount > 0 ? pageCount + 1 : 0;
+			const firstDataCol = rows.length;
+			const startRow = 3 + pageOffset;
+			const endRow = startRow + 1;
+			const endCol = firstDataCol + (isMultiValueNoCol ? values.length : 1);
+			const locationRef = `A${startRow}:${colCache.n2l(endCol)}${endRow}`;
 			xmlStream.openXml(XmlStream.StdDocAttributes);
 			xmlStream.openNode(this.tag, {
 				...PivotTableXform.PIVOT_TABLE_ATTRIBUTES,
-				name: "PivotTable2",
+				name: `PivotTable${tableNumber}`,
 				cacheId,
 				applyNumberFormats: "0",
 				applyBorderFormats: "0",
@@ -16162,93 +16808,91 @@ var ExcelTS = (function(exports) {
 				compactData: "0",
 				multipleFieldFilters: "0"
 			});
-			xmlStream.writeXml(`
-      <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="${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="${colItems.count}">
-        ${colItems.xml}
-      </colItems>
-      <dataFields count="${values.length}">
-        ${buildDataFields(cacheFields, values, model.metric)}
-      </dataFields>
-      <pivotTableStyleInfo
-        name="PivotStyleLight16"
-        showRowHeaders="1"
-        showColHeaders="1"
-        showRowStripes="0"
-        showColStripes="0"
-        showLastColumn="1"
-      />
-      <extLst>
-        <ext
-          uri="{962EF5D1-5CA2-4c93-8EF4-DBF5C05439D2}"
-          xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"
-        >
-          <x14:pivotTableDefinition
-            hideValuesRow="1"
-            xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main"
-          />
-        </ext>
-        <ext
-          uri="{747A6164-185A-40DC-8AA5-F01512510D54}"
-          xmlns:xpdl="http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout"
-        >
-          <xpdl:pivotTableDefinition16
-            EnabledSubtotalsDefault="0"
-            SubtotalsOnTopDefault="0"
-          />
-        </ext>
-      </extLst>
-    `);
+			const locAttrs = {
+				ref: locationRef,
+				firstHeaderRow: 1,
+				firstDataRow: 1,
+				firstDataCol
+			};
+			if (pageCount > 0) {
+				locAttrs.rowPageCount = pageCount;
+				locAttrs.colPageCount = 1;
+			}
+			xmlStream.leafNode("location", locAttrs);
+			renderPivotFields(xmlStream, model);
+			xmlStream.openNode("rowFields", { count: rows.length });
+			for (const rowIndex of rows) xmlStream.leafNode("field", { x: rowIndex });
+			xmlStream.closeNode();
+			xmlStream.openNode("rowItems", { count: 1 });
+			xmlStream.openNode("i", { t: "grand" });
+			xmlStream.leafNode("x");
+			xmlStream.closeNode();
+			xmlStream.closeNode();
+			if (columns.length > 0) {
+				const fieldCount = values.length > 1 ? columns.length + 1 : columns.length;
+				xmlStream.openNode("colFields", { count: fieldCount });
+				for (const colIndex of columns) xmlStream.leafNode("field", { x: colIndex });
+				if (values.length > 1) xmlStream.leafNode("field", { x: VALUES_FIELD_INDEX });
+				xmlStream.closeNode();
+			} else if (isMultiValueNoCol) {
+				xmlStream.openNode("colFields", { count: 1 });
+				xmlStream.leafNode("field", { x: VALUES_FIELD_INDEX });
+				xmlStream.closeNode();
+			}
+			if (isMultiValueNoCol) {
+				xmlStream.openNode("colItems", { count: values.length + 1 });
+				for (let idx = 0; idx < values.length; idx++) {
+					xmlStream.openNode("i");
+					xmlStream.leafNode("x", idx === 0 ? void 0 : { v: idx });
+					xmlStream.closeNode();
+				}
+				xmlStream.openNode("i", { t: "grand" });
+				xmlStream.leafNode("x");
+				xmlStream.closeNode();
+				xmlStream.closeNode();
+			} else {
+				xmlStream.openNode("colItems", { count: 1 });
+				xmlStream.leafNode("i");
+				xmlStream.closeNode();
+			}
+			if (pageCount > 0) {
+				xmlStream.openNode("pageFields", { count: pageCount });
+				for (const fld of pages) xmlStream.leafNode("pageField", {
+					fld,
+					hier: -1
+				});
+				xmlStream.closeNode();
+			}
+			renderDataFields(xmlStream, cacheFields, values, model.valueMetrics);
+			xmlStream.leafNode("pivotTableStyleInfo", {
+				name: DEFAULT_PIVOT_STYLE,
+				showRowHeaders: "1",
+				showColHeaders: "1",
+				showRowStripes: "0",
+				showColStripes: "0",
+				showLastColumn: "1"
+			});
+			xmlStream.writeXml(PivotTableXform.EXTLST_XML);
 			xmlStream.closeNode();
 		}
 		/**
 		* Render loaded pivot table (preserving original structure)
 		*/
 		renderLoaded(xmlStream, model) {
-			const attrs = {
-				...PivotTableXform.PIVOT_TABLE_ATTRIBUTES,
-				name: model.name || "PivotTable1",
-				cacheId: model.cacheId,
-				applyNumberFormats: model.applyNumberFormats || "0",
-				applyBorderFormats: model.applyBorderFormats || "0",
-				applyFontFormats: model.applyFontFormats || "0",
-				applyPatternFormats: model.applyPatternFormats || "0",
-				applyAlignmentFormats: model.applyAlignmentFormats || "0",
-				applyWidthHeightFormats: model.applyWidthHeightFormats ?? "0",
-				dataCaption: model.dataCaption || "Values",
-				updatedVersion: model.updatedVersion || "8",
-				minRefreshableVersion: model.minRefreshableVersion || "3",
-				useAutoFormatting: model.useAutoFormatting ? "1" : "0",
-				itemPrintTitles: model.itemPrintTitles ? "1" : "0",
-				createdVersion: model.createdVersion || "8",
-				indent: model.indent !== void 0 ? String(model.indent) : "0",
-				multipleFieldFilters: model.multipleFieldFilters ? "1" : "0"
-			};
-			if (model.outline) attrs.outline = "1";
-			if (model.outlineData) attrs.outlineData = "1";
-			if (model.chartFormat !== void 0) attrs.chartFormat = String(model.chartFormat);
-			if (model.compact) attrs.compact = "1";
-			if (model.compactData) attrs.compactData = "1";
+			const attrs = this.buildLoadedRootAttributes(model);
 			xmlStream.openXml(XmlStream.StdDocAttributes);
 			xmlStream.openNode(this.tag, attrs);
-			if (model.location) xmlStream.leafNode("location", {
-				ref: model.location.ref,
-				firstHeaderRow: model.location.firstHeaderRow,
-				firstDataRow: model.location.firstDataRow,
-				firstDataCol: model.location.firstDataCol
-			});
+			if (model.location) {
+				const locAttrs = {
+					ref: model.location.ref,
+					firstHeaderRow: model.location.firstHeaderRow,
+					firstDataRow: model.location.firstDataRow,
+					firstDataCol: model.location.firstDataCol
+				};
+				if (model.location.rowPageCount !== void 0) locAttrs.rowPageCount = model.location.rowPageCount;
+				if (model.location.colPageCount !== void 0) locAttrs.colPageCount = model.location.colPageCount;
+				xmlStream.leafNode("location", locAttrs);
+			}
 			if (model.pivotFields.length > 0) {
 				xmlStream.openNode("pivotFields", { count: model.pivotFields.length });
 				for (const pivotField of model.pivotFields) this.renderPivotFieldLoaded(xmlStream, pivotField);
@@ -16263,11 +16907,12 @@ var ExcelTS = (function(exports) {
 				xmlStream.openNode("rowItems", { count: model.rowItems.length });
 				for (const item of model.rowItems) this.renderRowColItem(xmlStream, item);
 				xmlStream.closeNode();
-			} else xmlStream.writeXml("<rowItems count=\"1\"><i t=\"grand\"><x/></i></rowItems>");
-			if (model.hasColFields || model.colFields.length > 0) {
+			} else if (model.hasRowItems) xmlStream.writeXml("<rowItems count=\"1\"><i t=\"grand\"><x/></i></rowItems>");
+			if (model.hasColFields || model.colFields.length > 0) if (model.colFields.length === 0 && model.dataFields.length <= 1) xmlStream.leafNode("colFields", { count: 0 });
+			else {
 				const colFieldCount = model.colFields.length === 0 ? 1 : model.colFields.length;
 				xmlStream.openNode("colFields", { count: colFieldCount });
-				if (model.colFields.length === 0) xmlStream.leafNode("field", { x: -2 });
+				if (model.colFields.length === 0) xmlStream.leafNode("field", { x: VALUES_FIELD_INDEX });
 				else for (const fieldIndex of model.colFields) xmlStream.leafNode("field", { x: fieldIndex });
 				xmlStream.closeNode();
 			}
@@ -16275,44 +16920,108 @@ var ExcelTS = (function(exports) {
 				xmlStream.openNode("colItems", { count: model.colItems.length });
 				for (const item of model.colItems) this.renderRowColItem(xmlStream, item);
 				xmlStream.closeNode();
-			} else xmlStream.writeXml("<colItems count=\"1\"><i t=\"grand\"><x/></i></colItems>");
+			} else if (model.hasColItems) xmlStream.writeXml("<colItems count=\"1\"><i t=\"grand\"><x/></i></colItems>");
+			if (model.pageFields && model.pageFields.length > 0) {
+				xmlStream.openNode("pageFields", { count: model.pageFields.length });
+				for (const pf of model.pageFields) {
+					const pfAttrs = { fld: pf.fld };
+					if (pf.item !== void 0) pfAttrs.item = pf.item;
+					if (pf.hier !== void 0) pfAttrs.hier = pf.hier;
+					if (pf.name !== void 0) pfAttrs.name = pf.name;
+					xmlStream.leafNode("pageField", pfAttrs);
+				}
+				xmlStream.closeNode();
+			}
 			if (model.dataFields.length > 0) {
 				xmlStream.openNode("dataFields", { count: model.dataFields.length });
 				for (const dataField of model.dataFields) {
 					const dfAttrs = {
 						name: dataField.name,
-						fld: dataField.fld,
-						baseField: dataField.baseField ?? 0,
-						baseItem: dataField.baseItem ?? 0
+						fld: dataField.fld
 					};
-					if (dataField.subtotal && dataField.subtotal !== "sum") dfAttrs.subtotal = dataField.subtotal;
+					if (dataField.baseField !== void 0) dfAttrs.baseField = dataField.baseField;
+					if (dataField.baseItem !== void 0) dfAttrs.baseItem = dataField.baseItem;
+					if (dataField.subtotal !== void 0 && dataField.subtotal !== "sum") dfAttrs.subtotal = dataField.subtotal;
+					if (dataField.numFmtId !== void 0) dfAttrs.numFmtId = dataField.numFmtId;
 					xmlStream.leafNode("dataField", dfAttrs);
 				}
 				xmlStream.closeNode();
 			}
-			if (model.chartFormats && model.chartFormats.length > 0) {
-				xmlStream.openNode("chartFormats", { count: model.chartFormats.length });
-				for (const cf of model.chartFormats) {
-					xmlStream.openNode("chartFormat", {
-						chart: cf.chart,
-						format: cf.format,
-						series: cf.series ? "1" : void 0
-					});
-					if (cf.pivotAreaXml) xmlStream.writeXml(cf.pivotAreaXml);
-					else xmlStream.writeXml(`<pivotArea type="data" outline="0" fieldPosition="0"><references count="1"><reference field="4294967294" count="1" selected="0"><x v="0"/></reference></references></pivotArea>`);
-					xmlStream.closeNode();
-				}
+			if (model.formatsXml) xmlStream.writeXml(model.formatsXml);
+			if (model.conditionalFormatsXml) xmlStream.writeXml(model.conditionalFormatsXml);
+			if (model.chartFormats && model.chartFormats.length > 0) this.renderChartFormats(xmlStream, model.chartFormats);
+			const si = model.styleInfo;
+			xmlStream.leafNode("pivotTableStyleInfo", {
+				name: si?.name ?? model.styleName ?? DEFAULT_PIVOT_STYLE,
+				showRowHeaders: si?.showRowHeaders ?? "1",
+				showColHeaders: si?.showColHeaders ?? "1",
+				showRowStripes: si?.showRowStripes ?? "0",
+				showColStripes: si?.showColStripes ?? "0",
+				showLastColumn: si?.showLastColumn ?? "1"
+			});
+			if (model.filtersXml) xmlStream.writeXml(model.filtersXml);
+			if (model.unknownElementsXml) xmlStream.writeXml(model.unknownElementsXml);
+			const extLstXml = model.extLstXml ?? (model.isLoaded ? "" : PivotTableXform.EXTLST_XML);
+			if (extLstXml) xmlStream.writeXml(extLstXml);
+			xmlStream.closeNode();
+		}
+		/**
+		* Build the root `<pivotTableDefinition>` attributes for a loaded (roundtrip) model.
+		* Extracted from renderLoaded to keep the render method focused on element structure.
+		*/
+		buildLoadedRootAttributes(model) {
+			const attrs = {
+				...PivotTableXform.PIVOT_TABLE_ATTRIBUTES,
+				name: model.name ?? "PivotTable1",
+				cacheId: String(model.cacheId),
+				applyNumberFormats: model.applyNumberFormats ?? "0",
+				applyBorderFormats: model.applyBorderFormats ?? "0",
+				applyFontFormats: model.applyFontFormats ?? "0",
+				applyPatternFormats: model.applyPatternFormats ?? "0",
+				applyAlignmentFormats: model.applyAlignmentFormats ?? "0",
+				applyWidthHeightFormats: model.applyWidthHeightFormats ?? "0",
+				dataCaption: model.dataCaption ?? "Values",
+				updatedVersion: model.updatedVersion ?? "8",
+				minRefreshableVersion: model.minRefreshableVersion ?? "3"
+			};
+			if (model.useAutoFormatting !== void 0) attrs.useAutoFormatting = model.useAutoFormatting;
+			if (model.itemPrintTitles !== void 0) attrs.itemPrintTitles = model.itemPrintTitles;
+			if (model.multipleFieldFilters !== void 0) attrs.multipleFieldFilters = model.multipleFieldFilters;
+			attrs.createdVersion = model.createdVersion ?? "8";
+			if (model.indent !== void 0) attrs.indent = String(model.indent);
+			if (model.uid) {
+				attrs["xmlns:xr"] = "http://schemas.microsoft.com/office/spreadsheetml/2014/revision";
+				attrs["xr:uid"] = model.uid;
+			}
+			if (model.outline) attrs.outline = "1";
+			if (model.outlineData) attrs.outlineData = "1";
+			if (model.chartFormat !== void 0) attrs.chartFormat = String(model.chartFormat);
+			if (model.colGrandTotals !== void 0) attrs.colGrandTotals = model.colGrandTotals;
+			if (model.rowGrandTotals !== void 0) attrs.rowGrandTotals = model.rowGrandTotals;
+			if (model.showError !== void 0) attrs.showError = model.showError;
+			if (model.errorCaption !== void 0) attrs.errorCaption = model.errorCaption;
+			if (model.showMissing !== void 0) attrs.showMissing = model.showMissing;
+			if (model.missingCaption !== void 0) attrs.missingCaption = model.missingCaption;
+			if (model.grandTotalCaption !== void 0) attrs.grandTotalCaption = model.grandTotalCaption;
+			if (model.compact === false) attrs.compact = "0";
+			if (model.compactData === false) attrs.compactData = "0";
+			return attrs;
+		}
+		/**
+		* Render `<chartFormats>` with preserved pivotArea XML for pivot chart roundtrip.
+		*/
+		renderChartFormats(xmlStream, chartFormats) {
+			xmlStream.openNode("chartFormats", { count: chartFormats.length });
+			for (const cf of chartFormats) {
+				xmlStream.openNode("chartFormat", {
+					chart: cf.chart,
+					format: cf.format,
+					series: cf.series === true ? "1" : cf.series === false ? "0" : void 0
+				});
+				if (cf.pivotAreaXml) xmlStream.writeXml(cf.pivotAreaXml);
+				else xmlStream.writeXml(`<pivotArea type="data" outline="0" fieldPosition="0"><references count="1"><reference field="${FIELD_INDEX_DATA_VALUES}" count="1" selected="0"><x v="0"/></reference></references></pivotArea>`);
 				xmlStream.closeNode();
 			}
-			xmlStream.leafNode("pivotTableStyleInfo", {
-				name: model.styleName || "PivotStyleLight16",
-				showRowHeaders: "1",
-				showColHeaders: "1",
-				showRowStripes: "0",
-				showColStripes: "0",
-				showLastColumn: "1"
-			});
-			xmlStream.writeXml(`<extLst><ext uri="{962EF5D1-5CA2-4c93-8EF4-DBF5C05439D2}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"><x14:pivotTableDefinition hideValuesRow="1" xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main"/></ext><ext uri="{747A6164-185A-40DC-8AA5-F01512510D54}" xmlns:xpdl="http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout"><xpdl:pivotTableDefinition16/></ext></extLst>`);
 			xmlStream.closeNode();
 		}
 		/**
@@ -16320,10 +17029,12 @@ var ExcelTS = (function(exports) {
 		*/
 		renderRowColItem(xmlStream, item) {
 			const attrs = {};
-			if (item.t) attrs.t = item.t;
-			if (item.x && item.x.length > 0) {
+			if (item.t !== void 0) attrs.t = item.t;
+			if (item.r !== void 0) attrs.r = item.r;
+			if (item.i !== void 0) attrs.i = item.i;
+			if (item.x.length > 0) {
 				xmlStream.openNode("i", attrs);
-				for (const x of item.x) if (x.v && x.v !== 0) xmlStream.leafNode("x", { v: x.v });
+				for (const x of item.x) if (x.v !== 0) xmlStream.leafNode("x", { v: x.v });
 				else xmlStream.leafNode("x");
 				xmlStream.closeNode();
 			} else xmlStream.leafNode("i", attrs);
@@ -16335,28 +17046,64 @@ var ExcelTS = (function(exports) {
 			const attrs = {};
 			if (field.axis) attrs.axis = field.axis;
 			if (field.dataField) attrs.dataField = "1";
+			if (field.numFmtId !== void 0) attrs.numFmtId = String(field.numFmtId);
+			if (field.sortType) attrs.sortType = field.sortType;
+			if (field.compact === false) attrs.compact = "0";
+			if (field.outline === false) attrs.outline = "0";
 			attrs.showAll = field.showAll ? "1" : "0";
-			if (field.items && field.items.length > 0) {
+			if (field.defaultSubtotal === false) attrs.defaultSubtotal = "0";
+			if (field.subtotalTop === false) attrs.subtotalTop = "0";
+			if (field.insertBlankRow === true) attrs.insertBlankRow = "1";
+			if (field.multipleItemSelectionAllowed === true) attrs.multipleItemSelectionAllowed = "1";
+			if (field.extraAttrs) for (const [k, v] of Object.entries(field.extraAttrs)) attrs[k] = v;
+			if (field.items !== void 0 && field.items.length > 0 || field.autoSortScopeXml !== void 0) {
 				xmlStream.openNode("pivotField", attrs);
-				xmlStream.openNode("items", { count: field.items.length + 1 });
-				for (const itemIndex of field.items) xmlStream.leafNode("item", { x: itemIndex });
-				xmlStream.writeXml("<item t=\"default\"/>");
-				xmlStream.closeNode();
+				if (field.items !== void 0 && field.items.length > 0) {
+					xmlStream.openNode("items", { count: field.items.length });
+					for (const item of field.items) {
+						const itemAttrs = {};
+						for (const key of PIVOT_FIELD_ITEM_KEYS) if (item[key] !== void 0) itemAttrs[key] = item[key];
+						xmlStream.leafNode("item", itemAttrs);
+					}
+					xmlStream.closeNode();
+				}
+				if (field.autoSortScopeXml) xmlStream.writeXml(field.autoSortScopeXml);
 				xmlStream.closeNode();
 			} else xmlStream.leafNode("pivotField", attrs);
 		}
 		parseOpen(node) {
 			const { name, attributes } = node;
+			if (this.extLstCollector.active) {
+				this.extLstCollector.feedOpen(name, attributes);
+				return true;
+			}
+			if (this.formatsCollector.active) {
+				this.formatsCollector.feedOpen(name, attributes);
+				return true;
+			}
+			if (this.conditionalFormatsCollector.active) {
+				this.conditionalFormatsCollector.feedOpen(name, attributes);
+				return true;
+			}
+			if (this.filtersCollector.active) {
+				this.filtersCollector.feedOpen(name, attributes);
+				return true;
+			}
+			if (this.unknownCollector.active) {
+				this.unknownCollector.feedOpen(name, attributes);
+				return true;
+			}
 			switch (name) {
 				case this.tag:
 					this.reset();
 					this.model = {
 						name: attributes.name,
-						cacheId: parseInt(attributes.cacheId || "0", 10),
+						cacheId: parseInt(attributes.cacheId ?? "0", 10),
 						uid: attributes["xr:uid"],
 						pivotFields: [],
 						rowFields: [],
 						colFields: [],
+						pageFields: [],
 						dataFields: [],
 						applyNumberFormats: attributes.applyNumberFormats,
 						applyBorderFormats: attributes.applyBorderFormats,
@@ -16368,15 +17115,22 @@ var ExcelTS = (function(exports) {
 						updatedVersion: attributes.updatedVersion,
 						minRefreshableVersion: attributes.minRefreshableVersion,
 						createdVersion: attributes.createdVersion,
-						useAutoFormatting: attributes.useAutoFormatting === "1",
-						itemPrintTitles: attributes.itemPrintTitles === "1",
-						indent: attributes.indent ? parseInt(attributes.indent, 10) : 0,
-						compact: attributes.compact === "1",
-						compactData: attributes.compactData === "1",
-						multipleFieldFilters: attributes.multipleFieldFilters === "1",
+						useAutoFormatting: attributes.useAutoFormatting,
+						itemPrintTitles: attributes.itemPrintTitles,
+						indent: attributes.indent !== void 0 ? parseInt(attributes.indent, 10) : void 0,
+						compact: attributes.compact !== "0",
+						compactData: attributes.compactData !== "0",
+						multipleFieldFilters: attributes.multipleFieldFilters,
 						outline: attributes.outline === "1",
 						outlineData: attributes.outlineData === "1",
-						chartFormat: attributes.chartFormat ? parseInt(attributes.chartFormat, 10) : void 0,
+						chartFormat: attributes.chartFormat !== void 0 ? parseInt(attributes.chartFormat, 10) : void 0,
+						colGrandTotals: attributes.colGrandTotals,
+						rowGrandTotals: attributes.rowGrandTotals,
+						showError: attributes.showError,
+						errorCaption: attributes.errorCaption,
+						showMissing: attributes.showMissing,
+						missingCaption: attributes.missingCaption,
+						grandTotalCaption: attributes.grandTotalCaption,
 						rowItems: [],
 						colItems: [],
 						chartFormats: [],
@@ -16386,132 +17140,241 @@ var ExcelTS = (function(exports) {
 				case "location":
 					if (this.model) this.model.location = {
 						ref: attributes.ref,
-						firstHeaderRow: attributes.firstHeaderRow ? parseInt(attributes.firstHeaderRow, 10) : void 0,
-						firstDataRow: attributes.firstDataRow ? parseInt(attributes.firstDataRow, 10) : void 0,
-						firstDataCol: attributes.firstDataCol ? parseInt(attributes.firstDataCol, 10) : void 0
+						firstHeaderRow: attributes.firstHeaderRow !== void 0 ? parseInt(attributes.firstHeaderRow, 10) : void 0,
+						firstDataRow: attributes.firstDataRow !== void 0 ? parseInt(attributes.firstDataRow, 10) : void 0,
+						firstDataCol: attributes.firstDataCol !== void 0 ? parseInt(attributes.firstDataCol, 10) : void 0,
+						rowPageCount: attributes.rowPageCount !== void 0 ? parseInt(attributes.rowPageCount, 10) : void 0,
+						colPageCount: attributes.colPageCount !== void 0 ? parseInt(attributes.colPageCount, 10) : void 0
 					};
 					break;
 				case "pivotFields":
-					this.state.inPivotFields = true;
+					this.state.currentSection = "pivotFields";
 					break;
 				case "pivotField":
-					if (this.state.inPivotFields) this.currentPivotField = {
-						axis: attributes.axis,
-						dataField: attributes.dataField === "1",
-						items: [],
-						compact: attributes.compact === "1",
-						outline: attributes.outline === "1",
-						showAll: attributes.showAll === "1",
-						defaultSubtotal: attributes.defaultSubtotal === "1"
-					};
-					break;
-				case "items":
-					if (this.currentPivotField) this.state.inItems = true;
+					if (this.state.currentSection === "pivotFields") {
+						const extraAttrs = {};
+						for (const [k, v] of Object.entries(attributes)) if (!KNOWN_PIVOT_FIELD_KEYS.has(k)) extraAttrs[k] = String(v);
+						this.currentPivotField = {
+							axis: VALID_PIVOT_AXES.has(attributes.axis) ? attributes.axis : void 0,
+							dataField: attributes.dataField === "1",
+							items: [],
+							compact: attributes.compact !== "0",
+							outline: attributes.outline !== "0",
+							showAll: attributes.showAll !== "0",
+							defaultSubtotal: attributes.defaultSubtotal !== "0",
+							numFmtId: attributes.numFmtId !== void 0 ? parseInt(attributes.numFmtId, 10) : void 0,
+							sortType: attributes.sortType,
+							subtotalTop: attributes.subtotalTop !== void 0 ? attributes.subtotalTop === "1" : void 0,
+							insertBlankRow: attributes.insertBlankRow === "1" ? true : void 0,
+							multipleItemSelectionAllowed: attributes.multipleItemSelectionAllowed === "1" ? true : void 0,
+							extraAttrs: Object.keys(extraAttrs).length > 0 ? extraAttrs : void 0
+						};
+					}
 					break;
+				case "items": break;
 				case "item":
-					if (this.state.inItems && this.currentPivotField && attributes.x !== void 0) this.currentPivotField.items.push(parseInt(attributes.x, 10));
+					if (this.currentPivotField) {
+						const item = {};
+						if (attributes.x !== void 0) item.x = parseInt(attributes.x, 10);
+						for (const key of PIVOT_FIELD_ITEM_KEYS) if (key !== "x" && attributes[key] !== void 0) item[key] = attributes[key];
+						this.currentPivotField.items.push(item);
+					}
+					break;
+				case "autoSortScope":
+					if (this.currentPivotField) {
+						this.state.inAutoSortScope = true;
+						this.autoSortScopeXmlBuffer = ["<autoSortScope>"];
+					}
 					break;
 				case "rowFields":
-					this.state.inRowFields = true;
+					this.state.currentSection = "rowFields";
 					break;
 				case "colFields":
-					this.state.inColFields = true;
+					this.state.currentSection = "colFields";
 					if (this.model) this.model.hasColFields = true;
 					break;
 				case "dataFields":
-					this.state.inDataFields = true;
+					this.state.currentSection = "dataFields";
+					break;
+				case "pageFields":
+					this.state.currentSection = "pageFields";
+					break;
+				case "pageField":
+					if (this.state.currentSection === "pageFields" && this.model) this.model.pageFields.push({
+						fld: parseInt(attributes.fld ?? "0", 10),
+						item: attributes.item !== void 0 ? parseInt(attributes.item, 10) : void 0,
+						hier: attributes.hier !== void 0 ? parseInt(attributes.hier, 10) : void 0,
+						name: attributes.name
+					});
 					break;
 				case "rowItems":
-					this.state.inRowItems = true;
+					this.state.currentSection = "rowItems";
+					if (this.model) this.model.hasRowItems = true;
 					break;
 				case "colItems":
-					this.state.inColItems = true;
+					this.state.currentSection = "colItems";
+					if (this.model) this.model.hasColItems = true;
 					break;
 				case "i":
-					if (this.state.inRowItems && this.model) this.currentRowItem = {
-						t: attributes.t,
-						x: []
-					};
-					else if (this.state.inColItems && this.model) this.currentColItem = {
-						t: attributes.t,
-						x: []
-					};
+					if (this.model) {
+						const rowColItem = this.state.currentSection === "rowItems" || this.state.currentSection === "colItems" ? parseRowColItem(attributes) : null;
+						if (this.state.currentSection === "rowItems") this.currentRowItem = rowColItem;
+						else if (this.state.currentSection === "colItems") this.currentColItem = rowColItem;
+					}
 					break;
 				case "x":
 					if (this.state.inPivotArea) {
-						const xAttrs = Object.entries(attributes).map(([k, v]) => `${k}="${v}"`).join(" ");
-						this.pivotAreaXmlBuffer.push(xAttrs ? `<x ${xAttrs}/>` : "<x/>");
-					} else if (this.currentRowItem) this.currentRowItem.x.push({ v: attributes.v ? parseInt(attributes.v, 10) : 0 });
-					else if (this.currentColItem) this.currentColItem.x.push({ v: attributes.v ? parseInt(attributes.v, 10) : 0 });
+						const xAttrs = serializeAttributes(attributes);
+						if (this.state.inAutoSortScope) this.autoSortScopeXmlBuffer.push(xAttrs ? `<x ${xAttrs}/>` : "<x/>");
+						else this.pivotAreaXmlBuffer.push(xAttrs ? `<x ${xAttrs}/>` : "<x/>");
+					} else if (this.currentRowItem) this.currentRowItem.x.push({ v: parseInt(attributes.v ?? "0", 10) });
+					else if (this.currentColItem) this.currentColItem.x.push({ v: parseInt(attributes.v ?? "0", 10) });
 					break;
 				case "chartFormats":
-					this.state.inChartFormats = true;
+					this.state.currentSection = "chartFormats";
 					break;
 				case "chartFormat":
-					if (this.state.inChartFormats && this.model) this.currentChartFormat = {
-						chart: attributes.chart ? parseInt(attributes.chart, 10) : 0,
-						format: attributes.format ? parseInt(attributes.format, 10) : 0,
-						series: attributes.series === "1"
+					if (this.state.currentSection === "chartFormats" && this.model) this.currentChartFormat = {
+						chart: parseInt(attributes.chart ?? "0", 10),
+						format: parseInt(attributes.format ?? "0", 10),
+						series: attributes.series !== void 0 ? attributes.series === "1" : void 0
 					};
 					break;
 				case "pivotArea":
 					if (this.currentChartFormat) {
 						this.state.inPivotArea = true;
-						const attrsStr = Object.entries(attributes).map(([k, v]) => `${k}="${v}"`).join(" ");
+						const attrsStr = serializeAttributes(attributes);
 						this.pivotAreaXmlBuffer = [attrsStr ? `<pivotArea ${attrsStr}>` : "<pivotArea>"];
+					} else if (this.state.inAutoSortScope) {
+						this.state.inPivotArea = true;
+						const attrsStr = serializeAttributes(attributes);
+						this.autoSortScopeXmlBuffer.push(attrsStr ? `<pivotArea ${attrsStr}>` : "<pivotArea>");
 					}
 					break;
 				case "references":
 				case "reference":
 					if (this.state.inPivotArea) {
-						this.pivotAreaDepth++;
-						const attrsStr = Object.entries(attributes).map(([k, v]) => `${k}="${v}"`).join(" ");
-						this.pivotAreaXmlBuffer.push(`<${name}${attrsStr ? " " + attrsStr : ""}>`);
+						const attrsStr = serializeAttributes(attributes);
+						if (this.state.inAutoSortScope) this.autoSortScopeXmlBuffer.push(`<${name}${attrsStr ? " " + attrsStr : ""}>`);
+						else this.pivotAreaXmlBuffer.push(`<${name}${attrsStr ? " " + attrsStr : ""}>`);
 					}
 					break;
 				case "field":
 					if (this.model) {
-						const fieldIndex = parseInt(attributes.x || "0", 10);
-						if (this.state.inRowFields) this.model.rowFields.push(fieldIndex);
-						else if (this.state.inColFields) this.model.colFields.push(fieldIndex);
+						const fieldIndex = parseInt(attributes.x ?? "0", 10);
+						if (this.state.currentSection === "rowFields") this.model.rowFields.push(fieldIndex);
+						else if (this.state.currentSection === "colFields") this.model.colFields.push(fieldIndex);
 					}
 					break;
 				case "dataField":
-					if (this.state.inDataFields && this.model) this.model.dataFields.push({
-						name: xmlDecode(attributes.name || ""),
-						fld: parseInt(attributes.fld || "0", 10),
-						baseField: attributes.baseField ? parseInt(attributes.baseField, 10) : 0,
-						baseItem: attributes.baseItem ? parseInt(attributes.baseItem, 10) : 0,
-						subtotal: attributes.subtotal
+					if (this.state.currentSection === "dataFields" && this.model) this.model.dataFields.push({
+						name: attributes.name ?? "",
+						fld: parseInt(attributes.fld ?? "0", 10),
+						baseField: attributes.baseField !== void 0 ? parseInt(attributes.baseField, 10) : void 0,
+						baseItem: attributes.baseItem !== void 0 ? parseInt(attributes.baseItem, 10) : void 0,
+						subtotal: VALID_SUBTOTALS.has(attributes.subtotal) ? attributes.subtotal : void 0,
+						numFmtId: attributes.numFmtId !== void 0 ? parseInt(attributes.numFmtId, 10) : void 0
 					});
 					break;
 				case "pivotTableStyleInfo":
-					if (this.model) this.model.styleName = attributes.name;
+					if (this.model) {
+						this.model.styleName = attributes.name;
+						this.model.styleInfo = {
+							name: attributes.name,
+							showRowHeaders: attributes.showRowHeaders,
+							showColHeaders: attributes.showColHeaders,
+							showRowStripes: attributes.showRowStripes,
+							showColStripes: attributes.showColStripes,
+							showLastColumn: attributes.showLastColumn
+						};
+					}
+					break;
+				case "extLst":
+					if (this.model) this.extLstCollector.start(attributes);
+					break;
+				case "formats":
+					if (this.model) this.formatsCollector.start(attributes);
+					break;
+				case "conditionalFormats":
+					if (this.model) this.conditionalFormatsCollector.start(attributes);
+					break;
+				case "filters":
+					if (this.model) this.filtersCollector.start(attributes);
+					break;
+				default:
+					if (this.model && this.state.currentSection === null && !this.state.inPivotArea && !this.state.inAutoSortScope) this.unknownCollector.startAs(name, attributes);
 					break;
 			}
 			return true;
 		}
-		parseText(_text) {}
+		parseText(text) {
+			if (this.extLstCollector.active) this.extLstCollector.feedText(text);
+			else if (this.formatsCollector.active) this.formatsCollector.feedText(text);
+			else if (this.conditionalFormatsCollector.active) this.conditionalFormatsCollector.feedText(text);
+			else if (this.filtersCollector.active) this.filtersCollector.feedText(text);
+			else if (this.unknownCollector.active) this.unknownCollector.feedText(text);
+		}
+		/** Feed a close-tag to a collector; if it completes, store the result on the model. */
+		tryCloseCollector(collector, name, modelKey) {
+			if (collector.feedClose(name)) {
+				if (this.model) this.model[modelKey] = collector.result;
+				collector.reset();
+			}
+		}
 		parseClose(name) {
+			if (this.extLstCollector.active) {
+				this.tryCloseCollector(this.extLstCollector, name, "extLstXml");
+				return true;
+			}
+			if (this.formatsCollector.active) {
+				this.tryCloseCollector(this.formatsCollector, name, "formatsXml");
+				return true;
+			}
+			if (this.conditionalFormatsCollector.active) {
+				this.tryCloseCollector(this.conditionalFormatsCollector, name, "conditionalFormatsXml");
+				return true;
+			}
+			if (this.filtersCollector.active) {
+				this.tryCloseCollector(this.filtersCollector, name, "filtersXml");
+				return true;
+			}
+			if (this.unknownCollector.active) {
+				if (this.unknownCollector.feedClose(name)) {
+					this.unknownElementsXmlParts.push(this.unknownCollector.result);
+					this.unknownCollector.reset();
+				}
+				return true;
+			}
 			if (this.state.inPivotArea) {
 				if (name === "pivotArea") {
-					this.pivotAreaXmlBuffer.push("</pivotArea>");
-					if (this.currentChartFormat) this.currentChartFormat.pivotAreaXml = this.pivotAreaXmlBuffer.join("");
+					if (this.state.inAutoSortScope) this.autoSortScopeXmlBuffer.push("</pivotArea>");
+					else {
+						this.pivotAreaXmlBuffer.push("</pivotArea>");
+						if (this.currentChartFormat) this.currentChartFormat.pivotAreaXml = this.pivotAreaXmlBuffer.join("");
+						this.pivotAreaXmlBuffer = [];
+					}
 					this.state.inPivotArea = false;
-					this.pivotAreaXmlBuffer = [];
-					this.pivotAreaDepth = 0;
 					return true;
 				} else if (name === "references" || name === "reference") {
-					this.pivotAreaXmlBuffer.push(`</${name}>`);
-					this.pivotAreaDepth--;
+					if (this.state.inAutoSortScope) this.autoSortScopeXmlBuffer.push(`</${name}>`);
+					else this.pivotAreaXmlBuffer.push(`</${name}>`);
 					return true;
 				}
 				return true;
 			}
 			switch (name) {
-				case this.tag: return false;
+				case this.tag:
+					if (this.model && this.unknownElementsXmlParts.length > 0) this.model.unknownElementsXml = this.unknownElementsXmlParts.join("");
+					return false;
 				case "pivotFields":
-					this.state.inPivotFields = false;
+				case "rowFields":
+				case "colFields":
+				case "dataFields":
+				case "pageFields":
+				case "rowItems":
+				case "colItems":
+				case "chartFormats":
+					this.state.currentSection = null;
 					break;
 				case "pivotField":
 					if (this.currentPivotField && this.model) {
@@ -16519,146 +17382,107 @@ var ExcelTS = (function(exports) {
 						this.currentPivotField = null;
 					}
 					break;
-				case "items":
-					this.state.inItems = false;
-					break;
-				case "rowFields":
-					this.state.inRowFields = false;
-					break;
-				case "colFields":
-					this.state.inColFields = false;
-					break;
-				case "dataFields":
-					this.state.inDataFields = false;
-					break;
-				case "rowItems":
-					this.state.inRowItems = false;
-					break;
-				case "colItems":
-					this.state.inColItems = false;
+				case "items": break;
+				case "autoSortScope":
+					if (this.state.inAutoSortScope && this.currentPivotField) {
+						this.autoSortScopeXmlBuffer.push("</autoSortScope>");
+						this.currentPivotField.autoSortScopeXml = this.autoSortScopeXmlBuffer.join("");
+						this.autoSortScopeXmlBuffer = [];
+						this.state.inAutoSortScope = false;
+					}
 					break;
 				case "i":
 					if (this.currentRowItem && this.model) {
-						this.model.rowItems.push(this.currentRowItem);
+						this.model.rowItems?.push(this.currentRowItem);
 						this.currentRowItem = null;
 					} else if (this.currentColItem && this.model) {
-						this.model.colItems.push(this.currentColItem);
+						this.model.colItems?.push(this.currentColItem);
 						this.currentColItem = null;
 					}
 					break;
-				case "chartFormats":
-					this.state.inChartFormats = false;
-					break;
 				case "chartFormat":
 					if (this.currentChartFormat && this.model) {
-						this.model.chartFormats.push(this.currentChartFormat);
+						this.model.chartFormats?.push(this.currentChartFormat);
 						this.currentChartFormat = null;
 					}
 					break;
 			}
 			return true;
 		}
-		reconcile(_model, _options) {}
 		static {
 			this.PIVOT_TABLE_ATTRIBUTES = { xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main" };
 		}
+		static {
+			this.EXTLST_XML = "<extLst><ext uri=\"{962EF5D1-5CA2-4c93-8EF4-DBF5C05439D2}\" xmlns:x14=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main\"><x14:pivotTableDefinition hideValuesRow=\"1\" xmlns:xm=\"http://schemas.microsoft.com/office/excel/2006/main\"/></ext><ext uri=\"{747A6164-185A-40DC-8AA5-F01512510D54}\" xmlns:xpdl=\"http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout\"><xpdl:pivotTableDefinition16 EnabledSubtotalsDefault=\"0\" SubtotalsOnTopDefault=\"0\"/></ext></extLst>";
+		}
 	};
-	/**
-	* 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/></i> for index 0, <i><x v="index"/></i> for index > 0
-	* - Grand total: <i t="grand"><x/></i>
-	* Note: When v=0, the v attribute should be omitted (Excel convention)
-	*/
-	function buildRowItems(rows, cacheFields) {
-		if (rows.length === 0) return {
-			count: 1,
-			xml: "<i t=\"grand\"><x /></i>"
-		};
-		const itemCount = (cacheFields[rows[0]]?.sharedItems || []).length;
-		const items = [];
-		for (let i = 0; i < itemCount; i++) if (i === 0) items.push("<i><x /></i>");
-		else items.push(`<i><x v="${i}" /></i>`);
-		items.push("<i t=\"grand\"><x /></i>");
+	/** Parse attributes of a row/col `<i>` element into a RowColItem. */
+	function parseRowColItem(attributes) {
 		return {
-			count: items.length,
-			xml: items.join("\n        ")
+			t: attributes.t,
+			r: attributes.r !== void 0 ? parseInt(attributes.r, 10) : void 0,
+			i: attributes.i !== void 0 ? parseInt(attributes.i, 10) : void 0,
+			x: []
 		};
 	}
 	/**
-	* 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.
-	* Note: When v=0, the v attribute should be omitted (Excel convention)
+	* Render dataField XML elements for all values in the pivot table.
+	* Each value field gets its own metric from the `valueMetrics` array.
 	*/
-	function buildColItems(columns, cacheFields, valueCount) {
-		if (columns.length === 0) {
-			if (valueCount > 1) {
-				const items = [];
-				for (let i = 0; i < valueCount; i++) if (i === 0) items.push("<i><x /></i>");
-				else items.push(`<i><x v="${i}" /></i>`);
-				items.push("<i t=\"grand\"><x /></i>");
-				return {
-					count: items.length,
-					xml: items.join("\n        ")
-				};
-			}
-			return {
-				count: 1,
-				xml: "<i t=\"grand\"><x /></i>"
+	function renderDataFields(xmlStream, cacheFields, values, valueMetrics) {
+		xmlStream.openNode("dataFields", { count: values.length });
+		for (let i = 0; i < values.length; i++) {
+			const valueIndex = values[i];
+			const metric = valueMetrics[i] ?? "sum";
+			const metricName = METRIC_DISPLAY_NAMES[metric];
+			const field = cacheFields[valueIndex];
+			if (!field) throw new Error(`Value field index ${valueIndex} is out of bounds (cacheFields has ${cacheFields.length} entries)`);
+			const attrs = {
+				name: `${metricName} of ${field.name}`,
+				fld: valueIndex,
+				baseField: 0,
+				baseItem: 0
 			};
+			if (metric !== "sum") attrs.subtotal = metric;
+			xmlStream.leafNode("dataField", attrs);
 		}
-		const itemCount = (cacheFields[columns[0]]?.sharedItems || []).length;
-		const items = [];
-		for (let i = 0; i < itemCount; i++) if (i === 0) items.push("<i><x /></i>");
-		else items.push(`<i><x v="${i}" /></i>`);
-		items.push("<i t=\"grand\"><x /></i>");
-		return {
-			count: items.length,
-			xml: items.join("\n        ")
-		};
+		xmlStream.closeNode();
 	}
-	/**
-	* Build dataField XML elements for all values in the pivot table.
-	* Supports multiple values when columns is empty.
-	*/
-	function buildDataFields(cacheFields, values, metric) {
-		const metricName = metric === "count" ? "Count" : "Sum";
-		const subtotalAttr = metric === "count" ? " subtotal=\"count\"" : "";
-		return values.map((valueIndex) => `<dataField
-          name="${metricName} of ${xmlEncode(cacheFields[valueIndex].name)}"
-          fld="${valueIndex}"
-          baseField="0"
-          baseItem="0"${subtotalAttr}
-        />`).join("");
-	}
-	function renderPivotFields(pivotTable) {
+	function renderPivotFields(xmlStream, pivotTable) {
 		const rowSet = new Set(pivotTable.rows);
 		const colSet = new Set(pivotTable.columns);
 		const valueSet = new Set(pivotTable.values);
-		return pivotTable.cacheFields.map((cacheField, fieldIndex) => {
-			return renderPivotField(rowSet.has(fieldIndex), colSet.has(fieldIndex), valueSet.has(fieldIndex), cacheField.sharedItems);
-		}).join("");
-	}
-	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}>
-        <items count="${sharedItems.length + 1}">
-          ${itemsXml}
-        </items>
-      </pivotField>
-    `;
-		}
-		return `
-    <pivotField
-      ${isValue ? "dataField=\"1\"" : ""}
-      compact="0" outline="0" showAll="0" defaultSubtotal="0"
-    />
-  `;
+		const pageSet = new Set(pivotTable.pages ?? []);
+		xmlStream.openNode("pivotFields", { count: pivotTable.cacheFields.length });
+		for (let fieldIndex = 0; fieldIndex < pivotTable.cacheFields.length; fieldIndex++) {
+			const cacheField = pivotTable.cacheFields[fieldIndex];
+			renderPivotField(xmlStream, rowSet.has(fieldIndex), colSet.has(fieldIndex), valueSet.has(fieldIndex), pageSet.has(fieldIndex), cacheField.sharedItems);
+		}
+		xmlStream.closeNode();
+	}
+	function renderPivotField(xmlStream, isRow, isCol, isValue, isPage, sharedItems) {
+		if (isRow || isCol || isPage) {
+			if (!sharedItems) throw new Error("sharedItems is required for axis field (row/column/page)");
+			const attrs = { axis: isRow ? "axisRow" : isCol ? "axisCol" : "axisPage" };
+			if (isValue) attrs.dataField = "1";
+			attrs.compact = "0";
+			attrs.outline = "0";
+			attrs.showAll = "0";
+			xmlStream.openNode("pivotField", attrs);
+			xmlStream.openNode("items", { count: sharedItems.length + 1 });
+			for (let i = 0; i < sharedItems.length; i++) xmlStream.leafNode("item", { x: i });
+			xmlStream.leafNode("item", { t: "default" });
+			xmlStream.closeNode();
+			xmlStream.closeNode();
+			return;
+		}
+		const attrs = {};
+		if (isValue) attrs.dataField = "1";
+		attrs.compact = "0";
+		attrs.outline = "0";
+		attrs.showAll = "0";
+		attrs.defaultSubtotal = "0";
+		xmlStream.leafNode("pivotField", attrs);
 	}
 
 //#endregion
@@ -16801,7 +17625,7 @@ var ExcelTS = (function(exports) {
 			return `${(parseFloat(value.toString()) * multiple).toFixed(2)}${unit}`;
 		}
 		reverseConversionUnit(inset) {
-			return (inset || "").split(",").map((margin) => {
+			return (inset ?? "").split(",").map((margin) => {
 				return Number(parseFloat(this.conversionUnit(parseFloat(margin), .1, "")).toFixed(2));
 			});
 		}
@@ -16908,7 +17732,7 @@ var ExcelTS = (function(exports) {
 			this.text = "";
 		}
 		get tag() {
-			return this._model && this._model.tag || "";
+			return this._model?.tag ?? "";
 		}
 		render(xmlStream, model) {
 			xmlStream.leafNode(this.tag, null, model);
@@ -16938,7 +17762,7 @@ var ExcelTS = (function(exports) {
 			this.model = {};
 		}
 		get tag() {
-			return this._model && this._model.tag || "";
+			return this._model?.tag ?? "";
 		}
 		render(xmlStream, model, type) {
 			if (type && model === type[2]) xmlStream.leafNode(this.tag);
@@ -17054,7 +17878,7 @@ var ExcelTS = (function(exports) {
 			return "v:shape";
 		}
 		render(xmlStream, model, index) {
-			xmlStream.openNode("v:shape", VmlShapeXform.V_SHAPE_ATTRIBUTES(model, index || 0));
+			xmlStream.openNode("v:shape", VmlShapeXform.V_SHAPE_ATTRIBUTES(model, index ?? 0));
 			xmlStream.leafNode("v:fill", { color2: "infoBackground [80]" });
 			xmlStream.leafNode("v:shadow", {
 				color: "none [81]",
@@ -17376,7 +18200,7 @@ var ExcelTS = (function(exports) {
 			return this._buffer;
 		}
 		reset(position) {
-			position = position || 0;
+			position = position ?? 0;
 			this._buffer = void 0;
 			this._inPos = position;
 		}
@@ -17526,7 +18350,7 @@ var ExcelTS = (function(exports) {
 			this._asyncWriteQueue = Promise.resolve();
 			this.bufSize = options?.bufSize || 1024 * 1024;
 			this.buffers = [];
-			this.batch = options?.batch || false;
+			this.batch = options?.batch ?? false;
 			this.corked = false;
 			this.paused = false;
 			this.encoding = null;
@@ -17694,7 +18518,7 @@ var ExcelTS = (function(exports) {
 		* Cross-platform compatible - works identically in Node.js and Browser.
 		*/
 		readString(encoding) {
-			const enc = encoding || this.encoding || "utf-8";
+			const enc = encoding ?? this.encoding ?? "utf-8";
 			const buf = this.read();
 			if (typeof Buffer !== "undefined" && buf instanceof Buffer) return buf.toString(enc);
 			return new TextDecoder(enc).decode(buf);
@@ -20779,7 +21603,6 @@ var ExcelTS = (function(exports) {
 				pivotTables: {},
 				pivotTableRels: {},
 				pivotCacheDefinitions: {},
-				pivotCacheDefinitionRels: {},
 				pivotCacheRecords: {},
 				passthrough: {}
 			};
@@ -20961,7 +21784,7 @@ var ExcelTS = (function(exports) {
 						o[rel.Id] = rel;
 						return o;
 					}, {});
-					(drawing.anchors || []).forEach((anchor) => {
+					(drawing.anchors ?? []).forEach((anchor) => {
 						const hyperlinks = anchor.picture && anchor.picture.hyperlinks;
 						if (hyperlinks && drawingOptions.rels[hyperlinks.rId]) {
 							hyperlinks.hyperlink = drawingOptions.rels[hyperlinks.rId].Target;
@@ -21010,7 +21833,6 @@ var ExcelTS = (function(exports) {
 			delete model.drawingRels;
 			delete model.vmlDrawings;
 			delete model.pivotTableRels;
-			delete model.pivotCacheDefinitionRels;
 		}
 		/**
 		* Reconcile pivot tables by linking them to worksheets and their cache data.
@@ -21037,21 +21859,24 @@ var ExcelTS = (function(exports) {
 			});
 			const loadedPivotTables = [];
 			const pivotTablesIndexed = {};
-			Object.entries(rawPivotTables).forEach(([pivotName, pivotTable]) => {
-				const pt = pivotTable;
+			Object.entries(rawPivotTables).forEach(([pivotName, pt]) => {
 				const tableNumber = this._extractTableNumber(pivotName);
 				const cacheData = cacheMap.get(pt.cacheId);
+				const defaultMetric = this._determineMetric(pt.dataFields);
 				const completePivotTable = {
 					...pt,
 					tableNumber,
+					cacheId: String(pt.cacheId),
 					cacheDefinition: cacheData?.definition,
 					cacheRecords: cacheData?.records,
-					cacheFields: cacheData?.definition?.cacheFields || [],
+					cacheFields: cacheData?.definition?.cacheFields ?? [],
 					rows: pt.rowFields.filter((f) => f >= 0),
 					columns: pt.colFields.filter((f) => f >= 0 && f !== -2),
 					values: pt.dataFields.map((df) => df.fld),
-					metric: this._determineMetric(pt.dataFields),
-					applyWidthHeightFormats: pt.applyWidthHeightFormats || "0"
+					pages: pt.pageFields.map((pf) => pf.fld),
+					metric: defaultMetric,
+					valueMetrics: this._determineValueMetrics(pt.dataFields, defaultMetric),
+					applyWidthHeightFormats: pt.applyWidthHeightFormats === "1" ? "1" : "0"
 				};
 				loadedPivotTables.push(completePivotTable);
 				pivotTablesIndexed[pivotTableRelTargetFromWorksheetName(pivotName)] = completePivotTable;
@@ -21059,7 +21884,6 @@ var ExcelTS = (function(exports) {
 			loadedPivotTables.sort((a, b) => a.tableNumber - b.tableNumber);
 			model.pivotTables = loadedPivotTables;
 			model.pivotTablesIndexed = pivotTablesIndexed;
-			model.loadedPivotTables = loadedPivotTables;
 		}
 		_extractTableNumber(name) {
 			const match = name.match(/pivotTable(\d+)/);
@@ -21067,14 +21891,14 @@ var ExcelTS = (function(exports) {
 		}
 		_buildCacheIdMap(model) {
 			const rIdToCacheId = /* @__PURE__ */ new Map();
-			const pivotCaches = model.pivotCaches || [];
+			const pivotCaches = model.pivotCaches ?? [];
 			for (const cache of pivotCaches) if (cache.cacheId && cache.rId) rIdToCacheId.set(cache.rId, parseInt(cache.cacheId, 10));
 			return rIdToCacheId;
 		}
 		_buildDefinitionToCacheIdMap(model) {
 			const definitionToCacheId = /* @__PURE__ */ new Map();
 			const rIdToCacheId = this._buildCacheIdMap(model);
-			const workbookRels = model.workbookRels || [];
+			const workbookRels = model.workbookRels ?? [];
 			for (const rel of workbookRels) if (rel.Type === XLSX.RelType.PivotCacheDefinition && rel.Target) {
 				const match = rel.Target.match(/pivotCacheDefinition(\d+)\.xml/);
 				if (match) {
@@ -21086,9 +21910,12 @@ var ExcelTS = (function(exports) {
 			return definitionToCacheId;
 		}
 		_determineMetric(dataFields) {
-			if (dataFields.length > 0 && dataFields[0].subtotal === "count") return "count";
+			if (dataFields.length > 0 && dataFields[0].subtotal) return dataFields[0].subtotal;
 			return "sum";
 		}
+		_determineValueMetrics(dataFields, defaultMetric) {
+			return dataFields.map((df) => df.subtotal || defaultMetric);
+		}
 		async _processWorksheetEntry(stream, model, sheetNo, options, path) {
 			const worksheet = await new WorkSheetXform(options).parseStream(stream);
 			if (!worksheet) throw new Error(`Failed to parse worksheet ${path}`);
@@ -21204,10 +22031,6 @@ var ExcelTS = (function(exports) {
 			const cacheDefinition = await new PivotCacheDefinitionXform().parseStream(stream);
 			if (cacheDefinition) model.pivotCacheDefinitions[name] = cacheDefinition;
 		}
-		async _processPivotCacheDefinitionRelsEntry(stream, model, name) {
-			const relationships = await new RelationshipsXform().parseStream(stream);
-			model.pivotCacheDefinitionRels[name] = relationships;
-		}
 		async _processPivotCacheRecordsEntry(stream, model, name) {
 			const cacheRecords = await new PivotCacheRecordsXform().parseStream(stream);
 			if (cacheRecords) model.pivotCacheRecords[name] = cacheRecords;
@@ -21288,11 +22111,7 @@ var ExcelTS = (function(exports) {
 				await this._processPivotCacheDefinitionEntry(stream, model, pivotCacheDefinitionName);
 				return true;
 			}
-			const pivotCacheDefinitionRelsName = getPivotCacheDefinitionNameFromRelsPath(entryName);
-			if (pivotCacheDefinitionRelsName) {
-				await this._processPivotCacheDefinitionRelsEntry(stream, model, pivotCacheDefinitionRelsName);
-				return true;
-			}
+			if (getPivotCacheDefinitionNameFromRelsPath(entryName)) return true;
 			const pivotCacheRecordsName = getPivotCacheRecordsNameFromPath(entryName);
 			if (pivotCacheRecordsName) {
 				await this._processPivotCacheRecordsEntry(stream, model, pivotCacheRecordsName);
@@ -21373,13 +22192,19 @@ var ExcelTS = (function(exports) {
 				Type: XLSX.RelType.FeaturePropertyBag,
 				Target: OOXML_REL_TARGETS.workbookFeaturePropertyBag
 			});
-			(model.pivotTables || []).forEach((pivotTable) => {
-				pivotTable.rId = `rId${count++}`;
-				relationships.push({
-					Id: pivotTable.rId,
-					Type: XLSX.RelType.PivotCacheDefinition,
-					Target: pivotCacheDefinitionRelTargetFromWorkbook(pivotTable.tableNumber)
-				});
+			const seenCacheIds = /* @__PURE__ */ new Map();
+			(model.pivotTables ?? []).forEach((pivotTable) => {
+				const existing = seenCacheIds.get(pivotTable.cacheId);
+				if (existing) pivotTable.rId = existing;
+				else {
+					pivotTable.rId = `rId${count++}`;
+					seenCacheIds.set(pivotTable.cacheId, pivotTable.rId);
+					relationships.push({
+						Id: pivotTable.rId,
+						Type: XLSX.RelType.PivotCacheDefinition,
+						Target: pivotCacheDefinitionRelTargetFromWorkbook(pivotTable.tableNumber)
+					});
+				}
 			});
 			model.worksheets.forEach((worksheet, index) => {
 				worksheet.rId = `rId${count++}`;
@@ -21455,7 +22280,7 @@ var ExcelTS = (function(exports) {
 				if (drawing) {
 					if (this.drawingHasChartReference(drawing) && rawDrawings[drawing.name]) zip.append(rawDrawings[drawing.name], { name: drawingPath(drawing.name) });
 					else {
-						const filteredAnchors = (drawing.anchors || []).filter((a) => {
+						const filteredAnchors = (drawing.anchors ?? []).filter((a) => {
 							if (a == null) return false;
 							if (a.range?.br && a.shape) return true;
 							if (!a.br && !a.picture) return false;
@@ -21501,35 +22326,45 @@ var ExcelTS = (function(exports) {
 			const pivotCacheDefinitionXform = new PivotCacheDefinitionXform();
 			const pivotTableXform = new PivotTableXform();
 			const relsXform = new RelationshipsXform();
+			const writtenCaches = /* @__PURE__ */ new Map();
 			model.pivotTables.forEach((pivotTable) => {
 				const n = pivotTable.tableNumber;
-				if (pivotTable.isLoaded) {
-					if (pivotTable.cacheDefinition) {
-						const xml = pivotCacheDefinitionXform.toXml(pivotTable.cacheDefinition);
+				const isLoaded = pivotTable.isLoaded;
+				const cacheId = pivotTable.cacheId;
+				if (!writtenCaches.has(cacheId)) {
+					writtenCaches.set(cacheId, n);
+					if (isLoaded) {
+						if (pivotTable.cacheDefinition) {
+							const xml = pivotCacheDefinitionXform.toXml(pivotTable.cacheDefinition);
+							zip.append(xml, { name: pivotCacheDefinitionPath(n) });
+						}
+						if (pivotTable.cacheRecords) {
+							const xml = pivotCacheRecordsXform.toXml(pivotTable.cacheRecords);
+							zip.append(xml, { name: pivotCacheRecordsPath(n) });
+						}
+					} else {
+						let xml = pivotCacheRecordsXform.toXml(pivotTable);
+						zip.append(xml, { name: pivotCacheRecordsPath(n) });
+						xml = pivotCacheDefinitionXform.toXml(pivotTable);
 						zip.append(xml, { name: pivotCacheDefinitionPath(n) });
 					}
-					if (pivotTable.cacheRecords) {
-						const xml = pivotCacheRecordsXform.toXml(pivotTable.cacheRecords);
-						zip.append(xml, { name: pivotCacheRecordsPath(n) });
+					if (isLoaded ? !!pivotTable.cacheRecords : true) {
+						const cacheRecordsRId = (isLoaded ? pivotTable.cacheDefinition?.rId : void 0) ?? "rId1";
+						const xml = relsXform.toXml([{
+							Id: cacheRecordsRId,
+							Type: XLSX.RelType.PivotCacheRecords,
+							Target: pivotCacheRecordsRelTarget(n)
+						}]);
+						zip.append(xml, { name: pivotCacheDefinitionRelsPath(n) });
 					}
-				} else {
-					let xml = pivotCacheRecordsXform.toXml(pivotTable);
-					zip.append(xml, { name: pivotCacheRecordsPath(n) });
-					xml = pivotCacheDefinitionXform.toXml(pivotTable);
-					zip.append(xml, { name: pivotCacheDefinitionPath(n) });
 				}
-				let xml = relsXform.toXml([{
-					Id: "rId1",
-					Type: XLSX.RelType.PivotCacheRecords,
-					Target: pivotCacheRecordsRelTarget(n)
-				}]);
-				zip.append(xml, { name: pivotCacheDefinitionRelsPath(n) });
-				xml = pivotTableXform.toXml(pivotTable);
+				let xml = pivotTableXform.toXml(pivotTable);
 				zip.append(xml, { name: pivotTablePath(n) });
+				const cacheTableNumber = writtenCaches.get(cacheId);
 				xml = relsXform.toXml([{
 					Id: "rId1",
 					Type: XLSX.RelType.PivotCacheDefinition,
-					Target: pivotCacheDefinitionRelTargetFromPivotTable(n)
+					Target: pivotCacheDefinitionRelTargetFromPivotTable(cacheTableNumber)
 				}]);
 				zip.append(xml, { name: pivotTableRelsPath(n) });
 			});
@@ -21544,10 +22379,10 @@ var ExcelTS = (function(exports) {
 			});
 		}
 		prepareModel(model, options) {
-			model.creator = model.creator || "ExcelTS";
-			model.lastModifiedBy = model.lastModifiedBy || "ExcelTS";
-			model.created = model.created || /* @__PURE__ */ new Date();
-			model.modified = model.modified || /* @__PURE__ */ new Date();
+			model.creator = model.creator ?? "ExcelTS";
+			model.lastModifiedBy = model.lastModifiedBy ?? "ExcelTS";
+			model.created = model.created ?? /* @__PURE__ */ new Date();
+			model.modified = model.modified ?? /* @__PURE__ */ new Date();
 			model.useSharedStrings = options.useSharedStrings !== void 0 ? options.useSharedStrings : true;
 			model.useStyles = options.useStyles !== void 0 ? options.useStyles : true;
 			model.sharedStrings = new SharedStringsXform();
@@ -22124,7 +22959,7 @@ var ExcelTS = (function(exports) {
 					else if (result.isValid) validatedRows.push(row);
 					else invalidRows.push({
 						row: Object.values(row),
-						reason: result.reason || "Validation failed"
+						reason: result.reason ?? "Validation failed"
 					});
 				}
 				dataRows = validatedRows;
@@ -22154,7 +22989,7 @@ var ExcelTS = (function(exports) {
 				else if (result.isValid) validatedRows.push(row);
 				else arrayInvalidRows.push({
 					row,
-					reason: result.reason || "Validation failed"
+					reason: result.reason ?? "Validation failed"
 				});
 			}
 			resultRows = validatedRows;
@@ -22764,8 +23599,8 @@ var ExcelTS = (function(exports) {
 		const formatter = dateFormat ? DateFormatter.create(dateFormat, { utc: dateUTC }) : DateFormatter.iso(dateUTC);
 		return function mapValue(value) {
 			if (value) {
-				if (value.text || value.hyperlink) return value.hyperlink || value.text || "";
-				if (value.formula || value.result) return value.result || "";
+				if (value.text || value.hyperlink) return value.hyperlink ?? value.text ?? "";
+				if (value.formula || value.result) return value.result ?? "";
 				if (value instanceof Date) return formatter.format(value);
 				if (value.error) return value.error;
 				if (typeof value === "object") return JSON.stringify(value);
@@ -23096,7 +23931,7 @@ var ExcelTS = (function(exports) {
 		constructor(options) {
 			this.id = options.id;
 			this.name = options.name || `Sheet${this.id}`;
-			this.state = options.state || "visible";
+			this.state = options.state ?? "visible";
 			this._rows = [];
 			this._columns = null;
 			this._keys = {};
@@ -23158,11 +23993,11 @@ var ExcelTS = (function(exports) {
 				rowBreaks: null,
 				colBreaks: null
 			}, options.pageSetup);
-			this.useSharedStrings = options.useSharedStrings || false;
+			this.useSharedStrings = options.useSharedStrings ?? false;
 			this._workbook = options.workbook;
 			this.hasComments = false;
-			this._views = options.views || [];
-			this.autoFilter = options.autoFilter || null;
+			this._views = options.views ?? [];
+			this.autoFilter = options.autoFilter ?? null;
 			this._media = [];
 			this.sheetProtection = null;
 			this._writeOpenWorksheet();
@@ -23525,10 +24360,10 @@ var ExcelTS = (function(exports) {
 			this.WorksheetWriterClass = WorksheetWriterClass;
 			this.created = options.created || /* @__PURE__ */ new Date();
 			this.modified = options.modified || this.created;
-			this.creator = options.creator || "ExcelTS";
-			this.lastModifiedBy = options.lastModifiedBy || "ExcelTS";
+			this.creator = options.creator ?? "ExcelTS";
+			this.lastModifiedBy = options.lastModifiedBy ?? "ExcelTS";
 			this.lastPrinted = options.lastPrinted;
-			this.useSharedStrings = options.useSharedStrings || false;
+			this.useSharedStrings = options.useSharedStrings ?? false;
 			this.sharedStrings = new SharedStrings();
 			this.styles = options.useStyles ? new StylesXform(true) : new StylesXform.Mock(true);
 			this._definedNames = new DefinedNames();
@@ -23640,7 +24475,7 @@ var ExcelTS = (function(exports) {
 				};
 			}
 			const id = this.nextId;
-			name = name || `sheet${id}`;
+			name = name ?? `sheet${id}`;
 			const worksheet = new this.WorksheetWriterClass({
 				id,
 				name,
@@ -23971,7 +24806,7 @@ var ExcelTS = (function(exports) {
 		return textDecoder.decode(pathBuffer);
 	}
 	function isZipUnicodeFlag(flags) {
-		return ((flags || 0) & 2048) !== 0;
+		return ((flags ?? 0) & 2048) !== 0;
 	}
 	function isZipDirectoryPath(path) {
 		if (path.length === 0) return false;
@@ -23989,8 +24824,8 @@ var ExcelTS = (function(exports) {
 		};
 	}
 	function resolveZipEntryLastModifiedDateTime(vars, extraFields) {
-		const dosDate = vars.lastModifiedDate || 0;
-		const dosTime = vars.lastModifiedTime || 0;
+		const dosDate = vars.lastModifiedDate ?? 0;
+		const dosTime = vars.lastModifiedTime ?? 0;
 		const dosDateTime = parseDosDateTimeUTC(dosDate, dosTime);
 		const unixSecondsMtime = extraFields.mtimeUnixSeconds;
 		if (unixSecondsMtime === void 0) return dosDateTime;
@@ -23998,10 +24833,10 @@ var ExcelTS = (function(exports) {
 	}
 	const parseExtraField = parseZipExtraFields;
 	function hasDataDescriptorFlag(flags) {
-		return ((flags || 0) & 8) !== 0;
+		return ((flags ?? 0) & 8) !== 0;
 	}
 	function isFileSizeKnown(flags, compressedSize) {
-		return !hasDataDescriptorFlag(flags) || (compressedSize || 0) > 0;
+		return !hasDataDescriptorFlag(flags) || (compressedSize ?? 0) > 0;
 	}
 	function autodrain(stream) {
 		const draining = stream.pipe(new Transform({ transform(_chunk, _encoding, callback) {
@@ -24033,8 +24868,8 @@ var ExcelTS = (function(exports) {
 	async function readCrxHeader(pull) {
 		const data = await pull(12);
 		const header = data.length >= 12 ? parseCrxHeaderFast(data) : parseTyped(data, CRX_HEADER_FORMAT);
-		const pubKeyLength = header.pubKeyLength || 0;
-		const keyAndSig = await pull(pubKeyLength + (header.signatureLength || 0));
+		const pubKeyLength = header.pubKeyLength ?? 0;
+		const keyAndSig = await pull(pubKeyLength + (header.signatureLength ?? 0));
 		header.publicKey = keyAndSig.subarray(0, pubKeyLength);
 		header.signature = keyAndSig.subarray(pubKeyLength);
 		return header;
@@ -24044,8 +24879,8 @@ var ExcelTS = (function(exports) {
 		const vars = data.length >= 26 ? parseLocalFileHeaderVarsFast(data) : parseTyped(data, LOCAL_FILE_HEADER_FORMAT);
 		return {
 			vars,
-			fileNameBuffer: await pull(vars.fileNameLength || 0),
-			extraFieldData: await pull(vars.extraFieldLength || 0)
+			fileNameBuffer: await pull(vars.fileNameLength ?? 0),
+			extraFieldData: await pull(vars.extraFieldLength ?? 0)
 		};
 	}
 	async function readDataDescriptor(pull) {
@@ -24054,12 +24889,12 @@ var ExcelTS = (function(exports) {
 	}
 	async function consumeCentralDirectoryFileHeader(pull) {
 		const vars = parseTyped(await pull(42), CENTRAL_DIRECTORY_FILE_HEADER_FORMAT);
-		await pull(vars.fileNameLength || 0);
-		await pull(vars.extraFieldLength || 0);
-		await pull(vars.fileCommentLength || 0);
+		await pull(vars.fileNameLength ?? 0);
+		await pull(vars.extraFieldLength ?? 0);
+		await pull(vars.fileCommentLength ?? 0);
 	}
 	async function consumeEndOfCentralDirectoryRecord(pull) {
-		await pull(parseTyped(await pull(18), END_OF_CENTRAL_DIRECTORY_FORMAT).commentLength || 0);
+		await pull(parseTyped(await pull(18), END_OF_CENTRAL_DIRECTORY_FORMAT).commentLength ?? 0);
 	}
 	function isValidZipRecordSignature(sig) {
 		switch (sig) {
@@ -24384,7 +25219,7 @@ var ExcelTS = (function(exports) {
 		};
 		entry.path = fileName;
 		entry.props = buildZipEntryProps(fileName, fileNameBuffer, vars.flags);
-		entry.type = getZipEntryType(fileName, vars.uncompressedSize || 0);
+		entry.type = getZipEntryType(fileName, vars.uncompressedSize ?? 0);
 		if (opts.verbose) {
 			if (entry.type === "Directory") console.log("   creating:", fileName);
 			else if (entry.type === "File") if (vars.compressionMethod === 0) console.log(" extracting:", fileName);
@@ -24396,7 +25231,7 @@ var ExcelTS = (function(exports) {
 		entry.extraFields = extra;
 		entry.__autodraining = autodraining;
 		const fileSizeKnown = isFileSizeKnown(vars.flags, vars.compressedSize);
-		if (fileSizeKnown) entry.size = vars.uncompressedSize || 0;
+		if (fileSizeKnown) entry.size = vars.uncompressedSize ?? 0;
 		if (opts.forceStream) emitter.pushEntry(entry);
 		else {
 			emitter.emitEntry(entry);
@@ -24408,8 +25243,8 @@ var ExcelTS = (function(exports) {
 			extraFields: entry.extraFields
 		});
 		const sizesTrusted = !hasDataDescriptorFlag(vars.flags);
-		const compressedSize = vars.compressedSize || 0;
-		const uncompressedSize = vars.uncompressedSize || 0;
+		const compressedSize = vars.compressedSize ?? 0;
+		const uncompressedSize = vars.uncompressedSize ?? 0;
 		if (sizesTrusted && fileSizeKnown && inflateRawSync && vars.compressionMethod !== 0 && !autodraining && compressedSize <= thresholdBytes && uncompressedSize <= thresholdBytes) {
 			const decompressedData = inflateRawSync(await io.pull(compressedSize));
 			entry.end(decompressedData);
@@ -24418,11 +25253,11 @@ var ExcelTS = (function(exports) {
 		}
 		const inflater = vars.compressionMethod && !autodraining ? inflateFactory() : new PassThrough({ highWaterMark: DEFAULT_UNZIP_STREAM_HIGH_WATER_MARK$1 });
 		if (fileSizeKnown) {
-			await pumpKnownCompressedSizeToEntry(io, inflater, entry, vars.compressedSize || 0);
+			await pumpKnownCompressedSizeToEntry(io, inflater, entry, vars.compressedSize ?? 0);
 			return;
 		}
 		await pipeline(io.streamUntilDataDescriptor(), inflater, entry);
-		entry.size = (await readDataDescriptor(async (l) => io.pull(l))).uncompressedSize || 0;
+		entry.size = (await readDataDescriptor(async (l) => io.pull(l))).uncompressedSize ?? 0;
 	}
 
 //#endregion
@@ -24536,8 +25371,8 @@ var ExcelTS = (function(exports) {
 			});
 		}
 		destroy(error) {
-			if (!this.writeClosed) this.writer.abort(error || void 0).catch(() => {});
-			this.reader.cancel(error || void 0).catch(() => {});
+			if (!this.writeClosed) this.writer.abort(error ?? void 0).catch(() => {});
+			this.reader.cancel(error ?? void 0).catch(() => {});
 			return super.destroy(error);
 		}
 	};
@@ -24683,7 +25518,7 @@ onmessage = async (ev) => {
 				}
 			};
 			this.worker.onerror = (e) => {
-				const err = new Error(e.message || "Worker error");
+				const err = new Error(e.message ?? "Worker error");
 				for (const cb of this._pendingAcks.values()) cb(err);
 				this._pendingAcks.clear();
 				this.emit("error", err);
@@ -25264,7 +26099,7 @@ onmessage = async (ev) => {
 									min: parseInt(node.attributes.min, 10),
 									max: parseInt(node.attributes.max, 10),
 									width: parseFloat(node.attributes.width),
-									styleId: parseInt(node.attributes.style || "0", 10)
+									styleId: parseInt(node.attributes.style ?? "0", 10)
 								});
 								break;
 							case "row":
@@ -25592,7 +26427,7 @@ onmessage = async (ev) => {
 		async _parseRels(entry) {
 			this.workbookRels = await new RelationshipsXform().parseStream(iterateStream(entry));
 			this._workbookRelIdByTarget = Object.create(null);
-			for (const rel of this.workbookRels || []) if (rel?.Target && rel?.Id) this._workbookRelIdByTarget[rel.Target] = rel.Id;
+			for (const rel of this.workbookRels ?? []) if (rel?.Target && rel?.Id) this._workbookRelIdByTarget[rel.Target] = rel.Id;
 		}
 		async _parseWorkbook(entry) {
 			this._emitEntry({ type: "workbook" });
@@ -25600,7 +26435,7 @@ onmessage = async (ev) => {
 			this.model = await workbook.parseStream(iterateStream(entry));
 			this.properties = workbook.map?.workbookPr;
 			this._sheetByRelId = Object.create(null);
-			for (const sheet of this.model?.sheets || []) this._sheetByRelId[sheet.rId] = sheet;
+			for (const sheet of this.model?.sheets ?? []) this._sheetByRelId[sheet.rId] = sheet;
 		}
 		async *_parseSharedStrings(entry) {
 			this._emitEntry({ type: "shared-strings" });
@@ -25692,10 +26527,10 @@ onmessage = async (ev) => {
 					}
 					break;
 				case "si":
-					if (this.options.sharedStrings === "cache") this.sharedStrings.push(richText.length ? { richText } : text || "");
+					if (this.options.sharedStrings === "cache") this.sharedStrings.push(richText.length ? { richText } : text ?? "");
 					else if (this.options.sharedStrings === "emit") yield {
 						index: index++,
-						text: richText.length ? { richText } : text || ""
+						text: richText.length ? { richText } : text ?? ""
 					};
 					richText = [];
 					font = null;
@@ -26016,8 +26851,8 @@ onmessage = async (ev) => {
 		}
 		get model() {
 			return {
-				creator: this.creator || "Unknown",
-				lastModifiedBy: this.lastModifiedBy || "Unknown",
+				creator: this.creator ?? "Unknown",
+				lastModifiedBy: this.lastModifiedBy ?? "Unknown",
 				lastPrinted: this.lastPrinted,
 				created: this.created,
 				modified: this.modified,
@@ -26079,8 +26914,8 @@ onmessage = async (ev) => {
 			this._definedNames.model = value.definedNames;
 			this.views = value.views;
 			this._themes = value.themes;
-			this.media = value.media || [];
-			this.pivotTables = value.pivotTables || value.loadedPivotTables || [];
+			this.media = value.media ?? [];
+			this.pivotTables = value.pivotTables ?? [];
 			this._passthrough = value.passthrough || {};
 			this._rawDrawings = value.rawDrawings || {};
 			this._defaultFont = value.defaultFont;
@@ -26287,7 +27122,7 @@ onmessage = async (ev) => {
 	* @param fmt The format string containing %
 	*/
 	function formatPercentage(val, fmt) {
-		const percentCount = (fmt.match(/%/g) || []).length;
+		const percentCount = (fmt.match(/%/g) ?? []).length;
 		return formatNumberPattern(val * Math.pow(100, percentCount), fmt.replace(/%/g, "") || "0") + "%".repeat(percentCount);
 	}
 	/**
@@ -26442,7 +27277,7 @@ onmessage = async (ev) => {
 		} else {
 			formattedInt = intPart;
 			if (intFmt.includes(",")) formattedInt = commaify(intPart);
-			const minIntDigits = (intFmt.match(/0/g) || []).length;
+			const minIntDigits = (intFmt.match(/0/g) ?? []).length;
 			if (formattedInt.length < minIntDigits) formattedInt = "0".repeat(minIntDigits - formattedInt.length) + formattedInt;
 		}
 		let formattedDec = "";