@office-open/xlsx 0.8.0 → 0.8.1

package/dist/index.mjs

@@ -259,7 +259,10 @@ function buildRPrXml(pr) {
 	if (pr.shadow) parts.push("<shadow/>");
 	if (pr.condense) parts.push("<condense/>");
 	if (pr.extend) parts.push("<extend/>");
-	if (pr.color) parts.push(`<color rgb="${escapeXml(pr.color)}"/>`);
+	if (pr.color) {
+		const rgb = pr.color.length === 6 ? `FF${pr.color}` : pr.color;
+		parts.push(`<color rgb="${escapeXml(rgb)}"/>`);
+	}
 	if (pr.size !== void 0) parts.push(`<sz val="${pr.size}"/>`);
 	if (pr.underline) if (pr.underline === "none") parts.push("<u/>");
 	else parts.push(`<u val="${pr.underline}"/>`);
@@ -339,7 +342,7 @@ function fillKey(f) {
 }
 function borderKey(b) {
 	const sk = (o) => `${o?.style ?? ""}_${o?.color ?? ""}`;
-	return `t${sk(b.top)}b${sk(b.bottom)}l${sk(b.left)}r${sk(b.right)}d${sk(b.diagonal)}st${sk(b.start)}en${sk(b.end)}v${sk(b.vertical)}h${sk(b.horizontal)}`;
+	return `t${sk(b.top)}b${sk(b.bottom)}l${sk(b.left)}r${sk(b.right)}d${sk(b.diagonal)}du${b.diagonalUp ? 1 : 0}dd${b.diagonalDown ? 1 : 0}st${sk(b.start)}en${sk(b.end)}v${sk(b.vertical)}h${sk(b.horizontal)}`;
 }
 const BUILTIN_NUMFMTS = {
 	General: 0,
@@ -391,6 +394,8 @@ var Styles = class extends BaseXmlComponent {
 	dxfs = [];
 	colors;
 	tableStyles;
+	/** Custom cell styles (CT_CellStyles) */
+	customCellStyles;
 	/** Style sheet extensions (CT_ExtensionList) */
 	styleExtensions;
 	constructor() {
@@ -414,6 +419,7 @@ var Styles = class extends BaseXmlComponent {
 			alignment: opts.alignment,
 			quotePrefix: opts.quotePrefix,
 			pivotButton: opts.pivotButton,
+			applyProtection: opts.applyProtection,
 			protection: opts.protection
 		};
 		const key = this.cellXfKey(xf);
@@ -445,6 +451,9 @@ var Styles = class extends BaseXmlComponent {
 	setExtensions(extensions) {
 		this.styleExtensions = extensions;
 	}
+	setCustomCellStyles(styles) {
+		this.customCellStyles = styles;
+	}
 	registerFont(opts) {
 		if (!opts) return 0;
 		const key = fontKey(opts);
@@ -519,12 +528,18 @@ var Styles = class extends BaseXmlComponent {
 			p.push(`<fill><gradientFill${attrs(gfAttrs)}>${stopParts}</gradientFill></fill>`);
 		} else {
 			const patternAttrs = attrs({ patternType: f.patternType ?? "solid" });
-			const colorContent = (f.color ? `<fgColor rgb="FF${f.color}"/>` : "") + (f.bgColor ? `<bgColor rgb="FF${f.bgColor}"/>` : "");
+			const colorContent = (f.color ? `<fgColor rgb="FF${f.color}"/>` : f.colorIndexed !== void 0 ? `<fgColor indexed="${f.colorIndexed}"/>` : "") + (f.bgColor ? `<bgColor rgb="FF${f.bgColor}"/>` : "");
 			p.push(colorContent ? `<fill><patternFill${patternAttrs}>${colorContent}</patternFill></fill>` : `<fill><patternFill${patternAttrs}/></fill>`);
 		}
 		p.push("</fills>");
 		p.push(`<borders count="${this.borders.length}">`);
-		for (const b of this.borders) p.push(`<border>${this.borderXmlStr(b)}</border>`);
+		for (const b of this.borders) {
+			const bAttrs = [];
+			if (b.diagonalUp) bAttrs.push("diagonalUp=\"1\"");
+			if (b.diagonalDown) bAttrs.push("diagonalDown=\"1\"");
+			const bAttr = bAttrs.length ? ` ${bAttrs.join(" ")}` : "";
+			p.push(`<border${bAttr}>${this.borderXmlStr(b)}</border>`);
+		}
 		p.push("</borders>");
 		p.push("<cellStyleXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/></cellStyleXfs>");
 		p.push(`<cellXfs count="${this.cellXfs.length}">`);
@@ -543,11 +558,26 @@ var Styles = class extends BaseXmlComponent {
 			if (xf.numFmtId > 0) xAttrs.applyNumberFormat = 1;
 			if (xf.quotePrefix) xAttrs.quotePrefix = 1;
 			if (xf.pivotButton) xAttrs.pivotButton = 1;
+			if (xf.applyProtection) xAttrs.applyProtection = 1;
+			if (xf.protection) xAttrs.applyProtection = xAttrs.applyProtection ?? 1;
 			const inner = (xf.alignment ? this.alignmentXmlStr(xf.alignment) : "") + (xf.protection ? this.protectionXmlStr(xf.protection) : "");
 			p.push(inner ? `<xf${attrs(xAttrs)}>${inner}</xf>` : `<xf${attrs(xAttrs)}/>`);
 		}
 		p.push("</cellXfs>");
-		p.push("<cellStyles count=\"1\"><cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/></cellStyles>");
+		if (this.customCellStyles && this.customCellStyles.length > 0) {
+			const csParts = [`<cellStyles ${[`count="${this.customCellStyles.length + 1}"`].join(" ")}>`];
+			csParts.push("<cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/>");
+			for (const cs of this.customCellStyles) {
+				const attrs = [`name="${escapeXml(cs.name)}"`, `xfId="${cs.xfId}"`];
+				if (cs.builtinId !== void 0) attrs.push(`builtinId="${cs.builtinId}"`);
+				if (cs.customBuiltin) attrs.push("customBuiltin=\"1\"");
+				if (cs.iLevel !== void 0) attrs.push(`iLevel="${cs.iLevel}"`);
+				if (cs.hidden) attrs.push("hidden=\"1\"");
+				csParts.push(`<cellStyle ${attrs.join(" ")}/>`);
+			}
+			csParts.push("</cellStyles>");
+			p.push(csParts.join(""));
+		} else p.push("<cellStyles count=\"1\"><cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/></cellStyles>");
 		if (this.dxfs.length > 0) {
 			p.push(`<dxfs count="${this.dxfs.length}">`);
 			for (const dxf of this.dxfs) {
@@ -559,6 +589,7 @@ var Styles = class extends BaseXmlComponent {
 					dParts.push(`<fill><patternFill${patAttrs}>${bgColor}</patternFill></fill>`);
 				}
 				if (dxf.numFmt) dParts.push(`<numFmt formatCode="${escapeXml(dxf.numFmt)}"/>`);
+				if (dxf.border) dParts.push(`<border>${this.borderXmlStr(dxf.border)}</border>`);
 				if (dParts.length > 0) p.push(`<dxf>${dParts.join("")}</dxf>`);
 				else p.push("<dxf/>");
 			}
@@ -690,7 +721,8 @@ var WorkbookXml = class extends BaseXmlComponent {
 	bookView;
 	volTypes;
 	webPublishObjects;
-	constructor(sheets, pivotCaches, protection, customViews, fileRecoveryPr, functionGroups, webPublishing, fileSharing, workbookPr, calcPr, bookView, volTypes, webPublishObjects) {
+	conformance;
+	constructor(sheets, pivotCaches, protection, customViews, fileRecoveryPr, functionGroups, webPublishing, fileSharing, workbookPr, calcPr, bookView, volTypes, webPublishObjects, conformance) {
 		super("workbook");
 		this.sheets = sheets;
 		this.pivotCaches = pivotCaches ?? [];
@@ -705,9 +737,10 @@ var WorkbookXml = class extends BaseXmlComponent {
 		this.bookView = bookView;
 		this.volTypes = volTypes;
 		this.webPublishObjects = webPublishObjects;
+		this.conformance = conformance;
 	}
 	toXml(_context) {
-		const parts = ["<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" mc:Ignorable=\"x15 xr xr6 xr10 xr2\" xmlns:x15=\"http://schemas.microsoft.com/office/spreadsheetml/2010/11/main\" xmlns:xr=\"http://schemas.microsoft.com/office/spreadsheetml/2014/revision\" xmlns:xr6=\"http://schemas.microsoft.com/office/spreadsheetml/2016/revision6\" xmlns:xr10=\"http://schemas.microsoft.com/office/spreadsheetml/2016/revision10\" xmlns:xr2=\"http://schemas.microsoft.com/office/spreadsheetml/2015/revision2\">", "<fileVersion appName=\"xl\" lastEdited=\"7\" lowestEdited=\"6\" rupBuild=\"29929\"/>"];
+		const parts = [`<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x15 xr xr6 xr10 xr2" xmlns:x15="http://schemas.microsoft.com/office/spreadsheetml/2010/11/main" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr6="http://schemas.microsoft.com/office/spreadsheetml/2016/revision6" xmlns:xr10="http://schemas.microsoft.com/office/spreadsheetml/2016/revision10" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2"${this.conformance ? ` conformance="${this.conformance}"` : ""}>`, "<fileVersion appName=\"xl\" lastEdited=\"7\" lowestEdited=\"6\" rupBuild=\"29929\"/>"];
 		if (this.fileSharing) {
 			const fileSharing = this.fileSharing;
 			const fsAttrs = [];
@@ -786,6 +819,8 @@ var WorkbookXml = class extends BaseXmlComponent {
 			if (prot.revisionsHashValue) protAttrs.push(`revisionsHashValue="${escapeXml(prot.revisionsHashValue)}"`);
 			if (prot.revisionsSaltValue) protAttrs.push(`revisionsSaltValue="${escapeXml(prot.revisionsSaltValue)}"`);
 			if (prot.revisionsSpinCount !== void 0) protAttrs.push(`revisionsSpinCount="${prot.revisionsSpinCount}"`);
+			if (prot.workbookPasswordCharacterSet) protAttrs.push(`workbookPasswordCharacterSet="${escapeXml(prot.workbookPasswordCharacterSet)}"`);
+			if (prot.revisionsPasswordCharacterSet) protAttrs.push(`revisionsPasswordCharacterSet="${escapeXml(prot.revisionsPasswordCharacterSet)}"`);
 			if (protAttrs.length > 0) parts.push(`<workbookProtection ${protAttrs.join(" ")}/>`);
 		}
 		if (this.bookView) {
@@ -1001,6 +1036,7 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 	images;
 	chartOptions;
 	dataValidations;
+	dataValidationsDisablePrompts;
 	conditionalFormats;
 	hyperlinks;
 	comments;
@@ -1044,6 +1080,7 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 		this.images = options.images ?? [];
 		this.chartOptions = options.charts ?? [];
 		this.dataValidations = options.dataValidations ?? [];
+		this.dataValidationsDisablePrompts = options.dataValidationsDisablePrompts;
 		this.conditionalFormats = options.conditionalFormats ?? [];
 		this.hyperlinks = options.hyperlinks ?? [];
 		this.comments = options.comments ?? [];
@@ -1129,6 +1166,7 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 				if (tc.rgb) tcAttrs.rgb = tc.rgb;
 				if (tc.theme !== void 0) tcAttrs.theme = tc.theme;
 				if (tc.tint !== void 0) tcAttrs.tint = tc.tint;
+				if (tc.indexed !== void 0) tcAttrs.indexed = tc.indexed;
 				prParts.push(`<tabColor${attrs(tcAttrs)}/>`);
 			}
 			if (hasOutline) {
@@ -1140,7 +1178,12 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 				if (sp?.outlineShowSymbols === false) outAttrs.showOutlineSymbols = 0;
 				prParts.push(`<outlinePr${attrs(outAttrs)}/>`);
 			}
-			if (this.pageSetup?.fitToWidth || this.pageSetup?.fitToHeight) prParts.push("<pageSetUpPr fitToPage=\"1\"/>");
+			if (this.pageSetup?.fitToWidth || this.pageSetup?.fitToHeight || this.pageSetup?.autoPageBreaks) {
+				const psupAttrs = {};
+				if (this.pageSetup?.fitToWidth || this.pageSetup?.fitToHeight) psupAttrs.fitToPage = 1;
+				if (this.pageSetup?.autoPageBreaks) psupAttrs.autoPageBreaks = 1;
+				prParts.push(`<pageSetUpPr${attrs(psupAttrs)}/>`);
+			}
 			const prAttrStr = Object.keys(prAttrs).length > 0 ? attrs(prAttrs) : "";
 			p.push(`<sheetPr${prAttrStr}>${prParts.join("")}</sheetPr>`);
 		}
@@ -1373,6 +1416,7 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 						val: String(cell.val)
 					};
 					if (cell.deleted) icAttrs.deleted = true;
+					if (cell.undone) icAttrs.undone = true;
 					sParts.push(`<inputCells${attrs(icAttrs)}/>`);
 				}
 				sParts.push("</scenario>");
@@ -1386,12 +1430,19 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 			const af = this.autoFilter;
 			const inner = [];
 			for (const t10 of af.top10 ?? []) {
+				const fcAttrs = { colId: t10.colId };
+				if (t10.hiddenButton) fcAttrs.hiddenButton = 1;
+				if (t10.showButton === false) fcAttrs.showButton = 0;
 				const t10Attrs = { val: t10.val };
 				if (t10.top === false) t10Attrs.top = 0;
 				if (t10.percent) t10Attrs.percent = 1;
-				inner.push(`<filterColumn colId="${t10.colId}"><top10${attrs(t10Attrs)}/></filterColumn>`);
+				if (t10.filterVal !== void 0) t10Attrs.filterVal = t10.filterVal;
+				inner.push(`<filterColumn${attrs(fcAttrs)}><top10${attrs(t10Attrs)}/></filterColumn>`);
 			}
 			for (const cf of af.customFilters ?? []) {
+				const fcAttrs = { colId: cf.colId };
+				if (cf.hiddenButton) fcAttrs.hiddenButton = 1;
+				if (cf.showButton === false) fcAttrs.showButton = 0;
 				const cfAttrs = {};
 				if (cf.and) cfAttrs.and = 1;
 				const filters = [];
@@ -1401,7 +1452,15 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 					filters.push(selfCloseElement("customFilter", attrs(fAttrs)));
 				}
 				if (cf.val2 !== void 0) filters.push(selfCloseElement("customFilter", attrs({ val: cf.val2 })));
-				if (filters.length > 0) inner.push(`<filterColumn colId="${cf.colId}"><customFilters${attrs(cfAttrs)}>${filters.join("")}</customFilters></filterColumn>`);
+				if (filters.length > 0) inner.push(`<filterColumn${attrs(fcAttrs)}><customFilters${attrs(cfAttrs)}>${filters.join("")}</customFilters></filterColumn>`);
+			}
+			for (const fi of af.filters ?? []) {
+				const fcAttrs = { colId: fi.colId };
+				const filtersAttrs = {};
+				if (fi.blank) filtersAttrs.blank = 1;
+				if (fi.calendarType) filtersAttrs.calendarType = fi.calendarType;
+				const valParts = (fi.values ?? []).map((v) => `<filter val="${escapeXml(v)}"/>`);
+				inner.push(`<filterColumn${attrs(fcAttrs)}><filters${attrs(filtersAttrs)}>${valParts.join("")}</filters></filterColumn>`);
 			}
 			if (af.sort && af.sort.length > 0) {
 				const sortParts = [];
@@ -1434,6 +1493,8 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 				const dfAttrs = { type: df.type };
 				if (df.val !== void 0) dfAttrs.val = df.val;
 				if (df.maxVal !== void 0) dfAttrs.maxVal = df.maxVal;
+				if (df.valIso !== void 0) dfAttrs.valIso = df.valIso;
+				if (df.maxValIso !== void 0) dfAttrs.maxValIso = df.maxValIso;
 				inner.push(`<filterColumn colId="${df.colId}"><dynamicFilter${attrs(dfAttrs)}/></filterColumn>`);
 			}
 			for (const dg of af.dateGroupItems ?? []) {
@@ -1515,7 +1576,9 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 			p.push("</conditionalFormatting>");
 		}
 		if (this.dataValidations.length > 0) {
-			p.push(`<dataValidations count="${this.dataValidations.length}">`);
+			const dvContainerAttrs = { count: this.dataValidations.length };
+			if (this.dataValidationsDisablePrompts) dvContainerAttrs.disablePrompts = 1;
+			p.push(`<dataValidations${attrs(dvContainerAttrs)}>`);
 			for (const dv of this.dataValidations) {
 				const dvAttrs = { sqref: dv.sqref };
 				if (dv.type && dv.type !== "none") dvAttrs.type = dv.type;
@@ -1683,6 +1746,10 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 				const prAttrs = [];
 				if (c.locked === false) prAttrs.push("locked=\"0\"");
 				if (c.uiObject) prAttrs.push("uiObject=\"1\"");
+				if (c.recalcAlways) prAttrs.push("recalcAlways=\"1\"");
+				if (c.linkedCell) prAttrs.push(`linkedCell="${escapeXml(c.linkedCell)}"`);
+				if (c.listFillRange) prAttrs.push(`listFillRange="${escapeXml(c.listFillRange)}"`);
+				if (c.cf) prAttrs.push(`cf="${escapeXml(c.cf)}"`);
 				if (prAttrs.length > 0) ctrlParts.push(`<control ${cAttrs.join(" ")}><controlPr${prAttrs.length ? " " + prAttrs.join(" ") : ""}/></control>`);
 				else ctrlParts.push(`<control ${cAttrs.join(" ")}/>`);
 			}
@@ -2268,7 +2335,24 @@ var PivotCacheDefinitionXml = class extends BaseXmlComponent {
 					max = 0;
 				}
 				const allInteger = this.sourceData.records.every((row) => typeof row[i] === "number" && Number.isInteger(row[i]));
-				p.push(`<cacheField name="${escapeXml(fieldName)}" numFmtId="0"><sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="${allInteger ? "1" : "0"}" minValue="${min}" maxValue="${max}" count="${uniqueVals.length}"/></cacheField>`);
+				const cfOverride = this.cacheDefOpts?.cacheFieldOverrides?.get(i);
+				const cfExtraAttrs = [];
+				const siExtraAttrs = [];
+				if (cfOverride) {
+					if (cfOverride.databaseField) cfExtraAttrs.push("databaseField=\"1\"");
+					if (cfOverride.level !== void 0) cfExtraAttrs.push(`level="${cfOverride.level}"`);
+					if (cfOverride.mappingCount !== void 0) cfExtraAttrs.push(`mappingCount="${cfOverride.mappingCount}"`);
+					if (cfOverride.memberPropertyField !== void 0) cfExtraAttrs.push(`memberPropertyField="${cfOverride.memberPropertyField}"`);
+					if (cfOverride.propertyName) cfExtraAttrs.push(`propertyName="${escapeXml(cfOverride.propertyName)}"`);
+					if (cfOverride.serverField) cfExtraAttrs.push("serverField=\"1\"");
+					if (cfOverride.uniqueList) cfExtraAttrs.push("uniqueList=\"1\"");
+					if (cfOverride.containsMixedTypes) siExtraAttrs.push("containsMixedTypes=\"1\"");
+					if (cfOverride.containsNonDate) siExtraAttrs.push("containsNonDate=\"1\"");
+					if (cfOverride.longText) siExtraAttrs.push("longText=\"1\"");
+					if (cfOverride.maxDate) siExtraAttrs.push(`maxDate="${escapeXml(cfOverride.maxDate)}"`);
+					if (cfOverride.minDate) siExtraAttrs.push(`minDate="${escapeXml(cfOverride.minDate)}"`);
+				}
+				p.push(`<cacheField name="${escapeXml(fieldName)}" ${cfExtraAttrs.length ? cfExtraAttrs.join(" ") + " " : ""}numFmtId="0"><sharedItems containsSemiMixedTypes="0" containsString="0" containsNumber="1" containsInteger="${allInteger ? "1" : "0"}" minValue="${min}" maxValue="${max}" count="${uniqueVals.length}"${siExtraAttrs.length ? " " + siExtraAttrs.join(" ") : ""}/></cacheField>`);
 			} else {
 				let hasDate = false;
 				let hasMissing = false;
@@ -2279,7 +2363,23 @@ var PivotCacheDefinitionXml = class extends BaseXmlComponent {
 				const siAttrs = [`count="${uniqueVals.length}"`];
 				if (hasDate) siAttrs.push("containsDate=\"1\"");
 				if (hasMissing) siAttrs.push("containsBlank=\"1\"");
-				p.push(`<cacheField name="${escapeXml(fieldName)}" numFmtId="0"><sharedItems ${siAttrs.join(" ")}>`);
+				const cfOverride = this.cacheDefOpts?.cacheFieldOverrides?.get(i);
+				const cfExtraAttrs = [];
+				if (cfOverride) {
+					if (cfOverride.databaseField) cfExtraAttrs.push("databaseField=\"1\"");
+					if (cfOverride.level !== void 0) cfExtraAttrs.push(`level="${cfOverride.level}"`);
+					if (cfOverride.mappingCount !== void 0) cfExtraAttrs.push(`mappingCount="${cfOverride.mappingCount}"`);
+					if (cfOverride.memberPropertyField !== void 0) cfExtraAttrs.push(`memberPropertyField="${cfOverride.memberPropertyField}"`);
+					if (cfOverride.propertyName) cfExtraAttrs.push(`propertyName="${escapeXml(cfOverride.propertyName)}"`);
+					if (cfOverride.serverField) cfExtraAttrs.push("serverField=\"1\"");
+					if (cfOverride.uniqueList) cfExtraAttrs.push("uniqueList=\"1\"");
+					if (cfOverride.containsMixedTypes) siAttrs.push("containsMixedTypes=\"1\"");
+					if (cfOverride.containsNonDate) siAttrs.push("containsNonDate=\"1\"");
+					if (cfOverride.longText) siAttrs.push("longText=\"1\"");
+					if (cfOverride.maxDate) siAttrs.push(`maxDate="${escapeXml(cfOverride.maxDate)}"`);
+					if (cfOverride.minDate) siAttrs.push(`minDate="${escapeXml(cfOverride.minDate)}"`);
+				}
+				p.push(`<cacheField name="${escapeXml(fieldName)}" ${cfExtraAttrs.length ? cfExtraAttrs.join(" ") + " " : ""}numFmtId="0"><sharedItems ${siAttrs.join(" ")}>`);
 				for (const v of uniqueVals) if (v === null) p.push("<m/>");
 				else if (v instanceof Date) p.push(`<d v="${v.toISOString().replace(/\.\d{3}Z$/, "Z")}"/>`);
 				else p.push(`<s v="${escapeXml(String(v))}"/>`);
@@ -2357,6 +2457,9 @@ var PivotCacheDefinitionXml = class extends BaseXmlComponent {
 				if (ch.measures) chAttrs.push("measures=\"1\"");
 				if (ch.oneField) chAttrs.push("oneField=\"1\"");
 				if (ch.hidden) chAttrs.push("hidden=\"1\"");
+				if (ch.memberValueDatatype) chAttrs.push(`memberValueDatatype="${ch.memberValueDatatype}"`);
+				if (ch.unbalanced) chAttrs.push("unbalanced=\"1\"");
+				if (ch.unbalancedGroup) chAttrs.push("unbalancedGroup=\"1\"");
 				const hasGroupLevels = ch.groupLevels && ch.groupLevels.length > 0;
 				const hasFieldsUsage = ch.fieldsUsage && ch.fieldsUsage.length > 0;
 				if (hasGroupLevels || hasFieldsUsage) {
@@ -2663,8 +2766,20 @@ var PivotTableXml = class extends BaseXmlComponent {
 		if (o.fieldListSortAscending) defAttrs.push("fieldListSortAscending=\"1\"");
 		if (o.mdxSubqueries) defAttrs.push("mdxSubqueries=\"1\"");
 		if (o.customListSort === false) defAttrs.push("customListSort=\"0\"");
+		if (o.asteriskTotals) defAttrs.push("asteriskTotals=\"1\"");
+		if (o.dataPosition !== void 0) defAttrs.push(`dataPosition="${o.dataPosition}"`);
+		if (o.immersive) defAttrs.push("immersive=\"1\"");
+		if (o.vacatedStyle) defAttrs.push(`vacatedStyle="${escapeXml(o.vacatedStyle)}"`);
 		p.push(`<pivotTableDefinition xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" ${defAttrs.join(" ")}>`);
-		p.push(`<location ref="${escapeXml(locationRef)}" firstHeaderRow="1" firstDataRow="${colFieldIndices.length + 1}" firstDataCol="${rowFieldIndices.length}"/>`);
+		const locAttrs = [
+			`ref="${escapeXml(locationRef)}"`,
+			`firstHeaderRow="1"`,
+			`firstDataRow="${colFieldIndices.length + 1}"`,
+			`firstDataCol="${rowFieldIndices.length}"`
+		];
+		if (o.locationColPageCount !== void 0) locAttrs.push(`colPageCount="${o.locationColPageCount}"`);
+		if (o.locationRowPageCount !== void 0) locAttrs.push(`rowPageCount="${o.locationRowPageCount}"`);
+		p.push(`<location ${locAttrs.join(" ")}/>`);
 		p.push(pivotFieldsXml);
 		if (o.pivotHierarchies && o.pivotHierarchies.length > 0) p.push(this.buildPivotHierarchies(o.pivotHierarchies));
 		if (pageFieldIndices.length > 0) p.push(pageFieldsXml);
@@ -2701,6 +2816,36 @@ var PivotTableXml = class extends BaseXmlComponent {
 		p.push("</pivotTableDefinition>");
 		return p.join("");
 	}
+	buildFieldOverrideAttrs(fo) {
+		const a = [];
+		if (fo.allDrilled) a.push("allDrilled=\"1\"");
+		if (fo.autoShow) a.push("autoShow=\"1\"");
+		if (fo.countSubtotal) a.push("countSubtotal=\"1\"");
+		if (fo.dataSourceSort) a.push("dataSourceSort=\"1\"");
+		if (fo.defaultAttributeDrillState) a.push("defaultAttributeDrillState=\"1\"");
+		if (fo.hiddenLevel) a.push("hiddenLevel=\"1\"");
+		if (fo.hideNewItems) a.push("hideNewItems=\"1\"");
+		if (fo.insertBlankRow) a.push("insertBlankRow=\"1\"");
+		if (fo.insertPageBreak) a.push("insertPageBreak=\"1\"");
+		if (fo.itemPageCount) a.push("itemPageCount=\"1\"");
+		if (fo.measureFilter) a.push("measureFilter=\"1\"");
+		if (fo.nonAutoSortDefault) a.push("nonAutoSortDefault=\"1\"");
+		if (fo.productSubtotal) a.push("productSubtotal=\"1\"");
+		if (fo.rankBy !== void 0) a.push(`rankBy="${fo.rankBy}"`);
+		if (fo.serverField) a.push("serverField=\"1\"");
+		if (fo.showDropDowns) a.push("showDropDowns=\"1\"");
+		if (fo.showPropAsCaption) a.push("showPropAsCaption=\"1\"");
+		if (fo.showPropCell) a.push("showPropCell=\"1\"");
+		if (fo.showPropTip) a.push("showPropTip=\"1\"");
+		if (fo.stdDevPSubtotal) a.push("stdDevPSubtotal=\"1\"");
+		if (fo.stdDevSubtotal) a.push("stdDevSubtotal=\"1\"");
+		if (fo.subtotalCaption) a.push(`subtotalCaption="${escapeXml(fo.subtotalCaption)}"`);
+		if (fo.topAutoShow) a.push("topAutoShow=\"1\"");
+		if (fo.uniqueMemberProperty) a.push("uniqueMemberProperty=\"1\"");
+		if (fo.varPSubtotal) a.push("varPSubtotal=\"1\"");
+		if (fo.varSubtotal) a.push("varSubtotal=\"1\"");
+		return a.join(" ");
+	}
 	buildPivotFields(rowIndices, colIndices, dataIndices, pageIndices) {
 		const fields = this.sourceData.fieldNames;
 		const o = this.options;
@@ -2710,10 +2855,13 @@ var PivotTableXml = class extends BaseXmlComponent {
 			const isCol = colIndices.includes(i);
 			const isData = dataIndices.includes(i);
 			const isPage = pageIndices.includes(i);
+			const override = o.fieldOverrides?.find((fo) => fo.field === fields[i]);
+			const extraAttrs = override ? this.buildFieldOverrideAttrs(override) : "";
 			if (isData) {
 				const dataFieldIdx = dataIndices.indexOf(i);
 				const df = o.data[dataFieldIdx];
 				const dfAttrs = ["dataField=\"1\"", "showAll=\"0\""];
+				if (extraAttrs) dfAttrs.push(extraAttrs);
 				if (df?.showDataAs) dfAttrs.push(`showDataAs="${df.showDataAs}"`);
 				if (df?.baseField !== void 0) dfAttrs.push(`baseField="${df.baseField}"`);
 				if (df?.baseItem !== void 0) dfAttrs.push(`baseItem="${df.baseItem}"`);
@@ -2728,34 +2876,45 @@ var PivotTableXml = class extends BaseXmlComponent {
 				} else parts.push(`<pivotField ${dfAttrs.join(" ")}/>`);
 			} else if (isRow) {
 				const uniqueVals = collectUniqueValues(this.sourceData.records, i);
-				parts.push(`<pivotField axis="axisRow" showAll="0">`);
+				const rAttrs = extraAttrs ? ` axis="axisRow" showAll="0" ${extraAttrs}` : " axis=\"axisRow\" showAll=\"0\"";
+				parts.push(`<pivotField${rAttrs}>`);
 				parts.push(`<items count="${uniqueVals.length + 1}">`);
 				for (let j = 0; j < uniqueVals.length; j++) parts.push(`<item x="${j}"/>`);
-				parts.push(`<item t="default"/>`);
+				parts.push(`<item t="default"${override?.defaultItemSd === false ? " sd=\"0\"" : ""}/>`);
 				parts.push("</items></pivotField>");
 			} else if (isCol) {
 				const uniqueVals = collectUniqueValues(this.sourceData.records, i);
-				parts.push(`<pivotField axis="axisCol" showAll="0">`);
+				const cAttrs = extraAttrs ? ` axis="axisCol" showAll="0" ${extraAttrs}` : " axis=\"axisCol\" showAll=\"0\"";
+				parts.push(`<pivotField${cAttrs}>`);
 				parts.push(`<items count="${uniqueVals.length + 1}">`);
 				for (let j = 0; j < uniqueVals.length; j++) parts.push(`<item x="${j}"/>`);
-				parts.push(`<item t="default"/>`);
+				parts.push(`<item t="default"${override?.defaultItemSd === false ? " sd=\"0\"" : ""}/>`);
 				parts.push("</items></pivotField>");
 			} else if (isPage) {
 				const uniqueVals = collectUniqueValues(this.sourceData.records, i);
-				parts.push(`<pivotField axis="axisPage" showAll="0">`);
+				const pAttrs = extraAttrs ? ` axis="axisPage" showAll="0" ${extraAttrs}` : " axis=\"axisPage\" showAll=\"0\"";
+				parts.push(`<pivotField${pAttrs}>`);
 				parts.push(`<items count="${uniqueVals.length + 1}">`);
 				for (let j = 0; j < uniqueVals.length; j++) parts.push(`<item x="${j}"/>`);
-				parts.push(`<item t="default"/>`);
+				parts.push(`<item t="default"${override?.defaultItemSd === false ? " sd=\"0\"" : ""}/>`);
 				parts.push("</items></pivotField>");
-			} else parts.push(`<pivotField showAll="0"/>`);
+			} else {
+				const nAttrs = extraAttrs ? ` showAll="0" ${extraAttrs}` : " showAll=\"0\"";
+				parts.push(`<pivotField${nAttrs}/>`);
+			}
 		}
 		parts.push("</pivotFields>");
 		return parts.join("");
 	}
 	buildPageFields(pageIndices) {
 		if (pageIndices.length === 0) return "";
+		const o = this.options;
 		const parts = [`<pageFields count="${pageIndices.length}">`];
-		for (let i = 0; i < pageIndices.length; i++) parts.push(`<pageField fld="${pageIndices[i]}" hier="${i}"/>`);
+		for (let i = 0; i < pageIndices.length; i++) {
+			const cap = o.pageCaptions?.[i];
+			const capAttr = cap ? ` cap="${escapeXml(cap)}"` : "";
+			parts.push(`<pageField fld="${pageIndices[i]}" hier="${i}"${capAttr}/>`);
+		}
 		parts.push("</pageFields>");
 		return parts.join("");
 	}
@@ -2893,8 +3052,15 @@ var PivotTableXml = class extends BaseXmlComponent {
 				if (mp.name !== void 0) mpAttrs.push(`name="${escapeXml(mp.name)}"`);
 				if (mp.showCell) mpAttrs.push("showCell=\"1\"");
 				if (mp.showTip) mpAttrs.push("showTip=\"1\"");
+				if (mp.showAsCaption) mpAttrs.push("showAsCaption=\"1\"");
+				if (mp.nameLen !== void 0) mpAttrs.push(`nameLen="${mp.nameLen}"`);
+				if (mp.pPos !== void 0) mpAttrs.push(`pPos="${mp.pPos}"`);
+				if (mp.pLen !== void 0) mpAttrs.push(`pLen="${mp.pLen}"`);
 				return `<mp ${mpAttrs.join(" ")}/>`;
-			}).join("")}</mps>` : "") + (h.members ? `<members count="${h.members.length}">${h.members.map((m) => `<member name="${escapeXml(m.name)}"/>`).join("")}</members>` : "");
+			}).join("")}</mps>` : "") + (h.members ? `<members count="${h.members.length}">${h.members.map((m) => {
+				const levelAttr = m.level !== void 0 ? ` level="${m.level}"` : "";
+				return `<member name="${escapeXml(m.name)}"${levelAttr}/>`;
+			}).join("")}</members>` : "");
 			if (inner) parts.push(`<pivotHierarchy ${hAttrs.join(" ")}>${inner}</pivotHierarchy>`);
 			else parts.push(`<pivotHierarchy ${hAttrs.join(" ")}/>`);
 		}
@@ -2986,6 +3152,12 @@ var PivotTableXml = class extends BaseXmlComponent {
 			if (ref.avgSubtotal) rAttrs.push("avgSubtotal=\"1\"");
 			if (ref.maxSubtotal) rAttrs.push("maxSubtotal=\"1\"");
 			if (ref.minSubtotal) rAttrs.push("minSubtotal=\"1\"");
+			if (ref.countSubtotal) rAttrs.push("countSubtotal=\"1\"");
+			if (ref.productSubtotal) rAttrs.push("productSubtotal=\"1\"");
+			if (ref.stdDevPSubtotal) rAttrs.push("stdDevPSubtotal=\"1\"");
+			if (ref.stdDevSubtotal) rAttrs.push("stdDevSubtotal=\"1\"");
+			if (ref.varPSubtotal) rAttrs.push("varPSubtotal=\"1\"");
+			if (ref.varSubtotal) rAttrs.push("varSubtotal=\"1\"");
 			const xXml = ref.x ? ref.x.map((v) => `<x v="${v}"/>`).join("") : "";
 			if (xXml) parts.push(`<reference ${rAttrs.join(" ")}>${xXml}</reference>`);
 			else parts.push(`<reference ${rAttrs.join(" ")}/>`);
@@ -3100,7 +3272,6 @@ var TableXml = class extends BaseXmlComponent {
 				const fAttrs = col.totalsRowFormulaArray ? " array=\"1\"" : "";
 				inner.push(`<totalsRowFormula${fAttrs}>${escapeXml(col.totalsRowFormula)}</totalsRowFormula>`);
 			}
-			if (col.totalsRowFunction === TotalsRowFunction.CUSTOM && col.totalsRowLabel) {}
 			if (col.totalsRowFunction !== void 0 && col.totalsRowFunction !== TotalsRowFunction.NONE) colAttrs.totalsRowFunction = col.totalsRowFunction;
 			if (col.totalsRowLabel !== void 0) colAttrs.totalsRowLabel = col.totalsRowLabel;
 			if (col.uniqueName) colAttrs.uniqueName = col.uniqueName;
@@ -3202,6 +3373,7 @@ var Dialogsheet = class extends BaseXmlComponent {
 *
 * @module
 */
+/** Preserve sort/filter layout (CT_QueryTableRefresh @preserveSortFilterLayout) */
 var QueryTableXml = class extends BaseXmlComponent {
 	opts;
 	constructor(options) {
@@ -3242,6 +3414,11 @@ function buildQueryTableRefresh(opts) {
 	if (opts.refreshOnLoad) a.refreshOnLoad = 1;
 	if (opts.backgroundRefresh) a.backgroundRefresh = 1;
 	if (opts.rowCount !== void 0) a.rowCount = opts.rowCount;
+	if (opts.fieldIdWrapped) a.fieldIdWrapped = 1;
+	if (opts.headersInLastRefresh) a.headersInLastRefresh = 1;
+	if (opts.preserveSortFilterLayout) a.preserveSortFilterLayout = 1;
+	if (opts.unboundColumnsLeft !== void 0) a.unboundColumnsLeft = opts.unboundColumnsLeft;
+	if (opts.unboundColumnsRight !== void 0) a.unboundColumnsRight = opts.unboundColumnsRight;
 	const children = [];
 	if (opts.deletedFields && opts.deletedFields.length > 0) {
 		const dfParts = opts.deletedFields.map((df) => `<deletedField name="${escapeXml(df.name)}"/>`);
@@ -3260,6 +3437,7 @@ function buildQueryTableRefresh(opts) {
 			if (f.borderFormatting) fAttrs.borderFormatting = 1;
 			if (f.width !== void 0) fAttrs.width = f.width;
 			if (f.clipped) fAttrs.clipped = 1;
+			if (f.dataBound !== void 0) fAttrs.dataBound = f.dataBound ? 1 : 0;
 			fParts.push(`<queryTableField${attrs(fAttrs)}/>`);
 		}
 		fParts.push("</queryTableFields>");
@@ -3411,7 +3589,9 @@ var RevisionHeadersXml = class extends BaseXmlComponent {
 			version: this.opts.version,
 			keepChangeHistory: this.opts.keepChangeHistory,
 			protected: this.opts.protected,
-			preserveHistory: this.opts.preserveHistory
+			preserveHistory: this.opts.preserveHistory,
+			diskRevisions: this.opts.diskRevisions,
+			exclusive: this.opts.exclusive
 		};
 		p.push(`${attrs(rootAttrs)}>`);
 		for (const h of this.opts.headers) {
@@ -3469,7 +3649,10 @@ function buildRowColumn(opts) {
 			deleteCol: "dc"
 		}[opts.action],
 		sId: opts.sheetIndex,
-		edge: opts.edge ? 1 : void 0
+		edge: opts.edge ? 1 : void 0,
+		ra: opts.ra,
+		ua: opts.ua,
+		eol: opts.eol ? 1 : void 0
 	};
 	if (opts.action.includes("Row")) a.row = opts.row;
 	else a.col = opts.col;
@@ -3482,20 +3665,25 @@ function buildCellChange(opts) {
 		quotePrefix: opts.quotePrefix ? 1 : void 0,
 		oldQuotePrefix: opts.oldQuotePrefix ? 1 : void 0,
 		ph: opts.ph ? 1 : void 0,
-		oldPh: opts.oldPh ? 1 : void 0
+		oldPh: opts.oldPh ? 1 : void 0,
+		ra: opts.ra,
+		ua: opts.ua
 	};
 	const children = [];
 	if (opts.oldValue !== void 0) {
 		const oldType = opts.oldType ?? (typeof opts.oldValue === "number" ? "n" : "s");
 		if (opts.formula) children.push(`<f>${escapeXml(opts.formula)}</f>`);
-		children.push(`<oc${attrs({
+		const ocAttrs = {
 			t: oldType,
 			vm: opts.numFmtId
-		})}><v>${escapeXml(String(opts.oldValue))}</v></oc>`);
+		};
+		if (opts.oldCellMeta !== void 0) ocAttrs.cm = opts.oldCellMeta;
+		children.push(`<oc${attrs(ocAttrs)}><v>${escapeXml(String(opts.oldValue))}</v></oc>`);
 	}
 	if (opts.newValue !== void 0) {
-		const newType = opts.newType ?? (typeof opts.newValue === "number" ? "n" : "s");
-		children.push(`<nc${attrs({ t: newType })}><v>${escapeXml(String(opts.newValue))}</v></nc>`);
+		const ncAttrs = { t: opts.newType ?? (typeof opts.newValue === "number" ? "n" : "s") };
+		if (opts.newCellMeta !== void 0) ncAttrs.cm = opts.newCellMeta;
+		children.push(`<nc${attrs(ncAttrs)}><v>${escapeXml(String(opts.newValue))}</v></nc>`);
 	}
 	if (opts.xfDxf !== void 0) {
 		children.push(`<ndxf><font/><numFmt/><fill/><border/><protection/></ndxf>`);
@@ -3512,7 +3700,9 @@ function buildMove(opts) {
 		sId: opts.sheetIndex,
 		source: opts.source,
 		destination: opts.destination,
-		sourceSheetId: opts.sourceSheetId
+		sourceSheetId: opts.sourceSheetId,
+		ra: opts.ra,
+		ua: opts.ua
 	})}/>`;
 }
 function buildFormatting(opts) {
@@ -3529,7 +3719,9 @@ function buildInsertSheet(opts) {
 		rId: opts.rId,
 		sId: opts.sheetIndex,
 		name: opts.name,
-		sheetPosition: opts.sheetPosition
+		sheetPosition: opts.sheetPosition,
+		ra: opts.ra,
+		ua: opts.ua
 	})}/>`;
 }
 function buildComment(opts) {
@@ -3569,7 +3761,9 @@ function buildDefinedName(opts) {
 		help: opts.help,
 		oldHelp: opts.oldHelp,
 		statusBar: opts.statusBar,
-		oldStatusBar: opts.oldStatusBar
+		oldStatusBar: opts.oldStatusBar,
+		ra: opts.ra,
+		ua: opts.ua
 	};
 	const children = [];
 	if (opts.value) children.push(`<formula>${escapeXml(opts.value)}</formula>`);
@@ -3594,20 +3788,26 @@ function buildSheetRename(opts) {
 		rId: opts.rId,
 		sId: opts.sheetIndex,
 		oldName: opts.oldName,
-		newName: opts.newName
+		newName: opts.newName,
+		ra: opts.ra,
+		ua: opts.ua
 	})}/>`;
 }
 function buildQueryTableField(opts) {
 	return `<rqt${attrs({
 		rId: opts.rId,
 		sId: opts.sheetIndex,
-		fieldId: opts.fieldId
+		fieldId: opts.fieldId,
+		ra: opts.ra,
+		ua: opts.ua
 	})}/>`;
 }
 function buildConflict(opts) {
 	return `<rcft${attrs({
 		rId: opts.rId,
-		sId: opts.sheetIndex
+		sId: opts.sheetIndex,
+		ra: opts.ra,
+		ua: opts.ua
 	})}/>`;
 }
 var RevisionLogXml = class extends BaseXmlComponent {
@@ -3645,9 +3845,62 @@ var RevisionLogXml = class extends BaseXmlComponent {
 				localReviewedList.push(`<reviewed rId="${entry.data.rId}"/>`);
 				p.push(`<reviewed rId="${entry.data.rId}"/>`);
 				break;
-			case "undo":
-				p.push(`<undo rId="${entry.data.rId}"/>`);
+			case "undo": {
+				const undoAttrs = {
+					rId: entry.data.rId,
+					cs: entry.data.cs ? 1 : void 0,
+					dn: entry.data.dn ? 1 : void 0,
+					exp: entry.data.exp ? 1 : void 0,
+					nf: entry.data.nf ? 1 : void 0,
+					ref3D: entry.data.ref3D ? 1 : void 0
+				};
+				if (entry.data.revisions && entry.data.revisions.length > 0) {
+					const innerParts = [];
+					for (const inner of entry.data.revisions) switch (inner.type) {
+						case "rowColumn":
+							innerParts.push(buildRowColumn(inner.data));
+							break;
+						case "cellChange":
+							innerParts.push(buildCellChange(inner.data));
+							break;
+						case "move":
+							innerParts.push(buildMove(inner.data));
+							break;
+						case "formatting":
+							innerParts.push(buildFormatting(inner.data));
+							break;
+						case "insertSheet":
+							innerParts.push(buildInsertSheet(inner.data));
+							break;
+						case "comment":
+							innerParts.push(buildComment(inner.data));
+							break;
+						case "definedName":
+							innerParts.push(buildDefinedName(inner.data));
+							break;
+						case "reviewed":
+							innerParts.push(`<reviewed rId="${inner.data.rId}"/>`);
+							break;
+						case "autoFormatting":
+							innerParts.push(buildAutoFormatting(inner.data));
+							break;
+						case "customView":
+							innerParts.push(buildCustomView(inner.data));
+							break;
+						case "sheetRename":
+							innerParts.push(buildSheetRename(inner.data));
+							break;
+						case "queryTableField":
+							innerParts.push(buildQueryTableField(inner.data));
+							break;
+						case "conflict":
+							innerParts.push(buildConflict(inner.data));
+							break;
+					}
+					p.push(`<undo${attrs(undoAttrs)}>${innerParts.join("")}</undo>`);
+				} else p.push(`<undo${attrs(undoAttrs)}/>`);
 				break;
+			}
 			case "autoFormatting":
 				p.push(buildAutoFormatting(entry.data));
 				break;
@@ -3698,6 +3951,13 @@ var ConnectionsXml = class extends BaseXmlComponent {
 			if (c.savePassword) cAttrs.savePassword = 1;
 			if (c.description !== void 0) cAttrs.description = c.description;
 			if (c.credentials !== void 0) cAttrs.credentials = c.credentials;
+			if (c.interval !== void 0) cAttrs.interval = c.interval;
+			if (c.keepAlive) cAttrs.keepAlive = 1;
+			if (c.new) cAttrs.new = 1;
+			if (c.odcFile !== void 0) cAttrs.odcFile = c.odcFile;
+			if (c.onlyUseConnectionFile) cAttrs.onlyUseConnectionFile = 1;
+			if (c.reconnectionMethod !== void 0) cAttrs.reconnectionMethod = c.reconnectionMethod;
+			if (c.singleSignOnId !== void 0) cAttrs.singleSignOnId = c.singleSignOnId;
 			const children = [];
 			if (c.dbPr) {
 				const dbAttrs = { connection: c.dbPr.connection };
@@ -3714,6 +3974,11 @@ var ConnectionsXml = class extends BaseXmlComponent {
 				if (c.webPr.firstRowHeader) wpAttrs.firstRowHeader = 1;
 				if (c.webPr.parsePre) wpAttrs.parsePre = 1;
 				if (c.webPr.xl2000) wpAttrs.xl2000 = 1;
+				if (c.webPr.editPage !== void 0) wpAttrs.editPage = c.webPr.editPage;
+				if (c.webPr.firstRow) wpAttrs.firstRow = 1;
+				if (c.webPr.post) wpAttrs.post = 1;
+				if (c.webPr.textDates) wpAttrs.textDates = 1;
+				if (c.webPr.xl97) wpAttrs.xl97 = 1;
 				const wpChildren = [];
 				if (c.webPr.htmlTables && c.webPr.htmlTables.length > 0) wpChildren.push(`<tables>${c.webPr.htmlTables.map((t) => `<x v="${escapeXml(t)}"/>`).join("")}</tables>`);
 				if (c.webPr.textFields && c.webPr.textFields.length > 0) wpChildren.push(buildTextFields(c.webPr.textFields));
@@ -3734,6 +3999,10 @@ var ConnectionsXml = class extends BaseXmlComponent {
 				if (c.textPr.decimal !== void 0) tpAttrs.decimal = c.textPr.decimal;
 				if (c.textPr.thousands !== void 0) tpAttrs.thousands = c.textPr.thousands;
 				if (c.textPr.trailingMinus !== void 0) tpAttrs.trailingMinus = c.textPr.trailingMinus ? 1 : 0;
+				if (c.textPr.delimiter !== void 0) tpAttrs.delimiter = c.textPr.delimiter;
+				if (c.textPr.fileType !== void 0) tpAttrs.fileType = c.textPr.fileType;
+				if (c.textPr.firstRow) tpAttrs.firstRow = 1;
+				if (c.textPr.qualifier !== void 0) tpAttrs.qualifier = c.textPr.qualifier;
 				const tpChildren = [];
 				if (c.textPr.textFields && c.textPr.textFields.length > 0) tpChildren.push(buildTextFields(c.textPr.textFields));
 				if (tpChildren.length > 0) children.push(`<textPr${attrs(tpAttrs)}>${tpChildren.join("")}</textPr>`);
@@ -3750,6 +4019,7 @@ var ConnectionsXml = class extends BaseXmlComponent {
 					if (param.booleanValue !== void 0) paramAttrs.booleanValue = param.booleanValue ? 1 : 0;
 					if (param.refreshOnChange) paramAttrs.refreshOnChange = 1;
 					if (param.prompt) paramAttrs.prompt = 1;
+					if (param.integer) paramAttrs.integer = 1;
 					if (param.reference !== void 0) paramAttrs.reference = param.reference;
 					if (param.parameterType !== void 0) paramAttrs.parameterType = param.parameterType;
 					paramParts.push(`<parameter${attrs(paramAttrs)}/>`);
@@ -3883,7 +4153,8 @@ var XmlColumnPrXml = class extends BaseXmlComponent {
 		return `<xmlColumnPr${attrs({
 			xpath: this.options.xpath,
 			xmlDataType: this.options.xmlDataType,
-			mapId: this.options.mapId
+			mapId: this.options.mapId,
+			denormalized: this.options.denormalized ? 1 : void 0
 		})}/>`;
 	}
 };
@@ -4014,38 +4285,49 @@ var Comments = class extends BaseXmlComponent {
 	}
 	toXml(_context) {
 		const authors = this.collectAuthors();
-		const p = ["<comments xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">", `<authors>`];
+		const p = [`<comments xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"${this.entries.some((e) => e.commentPr) ? " xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\"" : ""}>`, `<authors>`];
 		for (const author of authors) p.push(`<author>${escapeXml(author)}</author>`);
 		p.push("</authors><commentList>");
 		for (const entry of this.entries) {
 			const authorId = authors.indexOf(entry.author);
 			const textXml = typeof entry.text === "string" ? `<t>${escapeXml(entry.text)}</t>` : buildRstXml(entry.text);
-			let commentPrXml = "";
-			if (entry.commentPr) {
-				const cp = entry.commentPr;
-				const cpAttrs = [];
-				if (cp.locked === false) cpAttrs.push("locked=\"0\"");
-				if (cp.defaultSize === false) cpAttrs.push("defaultSize=\"0\"");
-				if (cp.print === false) cpAttrs.push("print=\"0\"");
-				if (cp.disabled) cpAttrs.push("disabled=\"1\"");
-				if (cp.autoFill === false) cpAttrs.push("autoFill=\"0\"");
-				if (cp.autoLine === false) cpAttrs.push("autoLine=\"0\"");
-				if (cp.altText) cpAttrs.push(`altText="${escapeXml(cp.altText)}"`);
-				if (cp.textHAlign && cp.textHAlign !== "left") cpAttrs.push(`textHAlign="${cp.textHAlign}"`);
-				if (cp.textVAlign && cp.textVAlign !== "top") cpAttrs.push(`textVAlign="${cp.textVAlign}"`);
-				if (cp.lockText === false) cpAttrs.push("lockText=\"0\"");
-				if (cp.justLastX) cpAttrs.push("justLastX=\"1\"");
-				if (cp.autoScale) cpAttrs.push("autoScale=\"1\"");
-				const anchorAttrs = [];
-				if (cp.anchor?.moveWithCells) anchorAttrs.push("moveWithCells=\"1\"");
-				if (cp.anchor?.sizeWithCells) anchorAttrs.push("sizeWithCells=\"1\"");
-				commentPrXml = `<commentPr${cpAttrs.length ? " " + cpAttrs.join(" ") : ""}><anchor${anchorAttrs.length ? " " + anchorAttrs.join(" ") : ""}/></commentPr>`;
-			}
+			const commentPrXml = this.buildCommentPrXml(entry);
 			p.push(`<comment ref="${entry.cell}" authorId="${authorId}"><text>${textXml}</text>${commentPrXml}</comment>`);
 		}
 		p.push("</commentList></comments>");
 		return p.join("");
 	}
+	/** Build CT_CommentPr XML. Returns empty string if commentPr is not set. */
+	buildCommentPrXml(entry) {
+		const cp = entry.commentPr;
+		if (!cp) return "";
+		const attrs = [];
+		if (cp.locked === false) attrs.push("locked=\"0\"");
+		if (cp.defaultSize === false) attrs.push("defaultSize=\"0\"");
+		if (cp.print === false) attrs.push("print=\"0\"");
+		if (cp.disabled) attrs.push("disabled=\"1\"");
+		if (cp.autoFill === false) attrs.push("autoFill=\"0\"");
+		if (cp.autoLine === false) attrs.push("autoLine=\"0\"");
+		if (cp.altText) attrs.push(`altText="${escapeXml(cp.altText)}"`);
+		if (cp.textHAlign && cp.textHAlign !== "left") attrs.push(`textHAlign="${cp.textHAlign}"`);
+		if (cp.textVAlign && cp.textVAlign !== "top") attrs.push(`textVAlign="${cp.textVAlign}"`);
+		if (cp.lockText === false) attrs.push("lockText=\"0\"");
+		if (cp.justLastX) attrs.push("justLastX=\"1\"");
+		if (cp.autoScale) attrs.push("autoScale=\"1\"");
+		const anchorXml = this.buildAnchorXml(entry.cell, cp.anchor);
+		return `<commentPr${attrs.length ? ` ${attrs.join(" ")}` : ""}>${anchorXml}</commentPr>`;
+	}
+	/** Build CT_ObjectAnchor with required xdr:from/xdr:to markers. */
+	buildAnchorXml(cell, anchor) {
+		const col = cell.charCodeAt(0) - 65;
+		const row = parseInt(cell.slice(1), 10) - 1;
+		const toCol = col + 2;
+		const toRow = row + 2;
+		const anchorAttrs = [];
+		if (anchor?.moveWithCells) anchorAttrs.push(" moveWithCells=\"1\"");
+		if (anchor?.sizeWithCells) anchorAttrs.push(" sizeWithCells=\"1\"");
+		return `<anchor${anchorAttrs.join("")}><xdr:from><xdr:col>${col}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${row}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>${toCol}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${toRow}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to></anchor>`;
+	}
 	collectAuthors() {
 		const seen = /* @__PURE__ */ new Set();
 		const result = [];
@@ -4124,6 +4406,10 @@ var ExternalLinkXml = class extends BaseXmlComponent {
 					const dnAttrs = { name: dn.name };
 					if (dn.refersTo !== void 0) dnAttrs.refersTo = dn.refersTo;
 					if (dn.sheetId !== void 0) dnAttrs.sheetId = dn.sheetId;
+					if (dn.publishToServer) dnAttrs.publishToServer = 1;
+					if (dn.vbProcedure) dnAttrs.vbProcedure = 1;
+					if (dn.workbookParameter) dnAttrs.workbookParameter = 1;
+					if (dn.xlm) dnAttrs.xlm = 1;
 					bookParts.push(`<definedName${attrs(dnAttrs)}/>`);
 				}
 				bookParts.push("</definedNames>");