@office-open/xlsx 0.12.2 → 0.13.0

package/dist/index.mjs

@@ -2042,7 +2042,7 @@ const worksheetDesc = {
 				if (attr(pageSetUpPr, "autoPageBreaks") !== void 0) psup.autoPageBreaks = parseOnOff(attr(pageSetUpPr, "autoPageBreaks")) ?? true;
 				if (Object.keys(psup).length > 0) pageSetUpPrCache = psup;
 			}
-			if (Object.keys(sp).length > 0) result.sheetPr = sp;
+			if (Object.keys(sp).length > 0) result.properties = sp;
 			const tabColorEl = findChild(sheetPrEl, "tabColor");
 			if (tabColorEl) {
 				const tc = {};
@@ -2164,7 +2164,7 @@ const worksheetDesc = {
 			if (olr !== void 0) sfp.outlineLevelRow = olr;
 			const olc = attrNum(sfpEl, "outlineLevelCol");
 			if (olc !== void 0) sfp.outlineLevelCol = olc;
-			result.sheetFormatPr = sfp;
+			result.sheetFormat = sfp;
 		}
 		const dimensionEl = findChild(el, "dimension");
 		if (dimensionEl) {
@@ -2447,13 +2447,13 @@ const worksheetDesc = {
 			if (ppType) pp.type = ppType;
 			const ppAlign = attr(ppEl, "alignment");
 			if (ppAlign) pp.alignment = ppAlign;
-			result.phoneticPr = pp;
+			result.phonetic = pp;
 		}
 		const scEl = findChild(el, "sheetCalcPr");
 		if (scEl) {
 			const sc = {};
 			if (parseOnOff(attr(scEl, "fullCalcOnLoad"))) sc.fullCalcOnLoad = true;
-			result.sheetCalcPr = sc;
+			result.calculation = sc;
 		}
 		const sheetDataEl = findChild(el, "sheetData");
 		if (sheetDataEl) {
@@ -2698,7 +2698,7 @@ const worksheetDesc = {
 						const anchor = readEmbeddedAnchor(anchorEl);
 						if (anchor) opr.anchor = anchor;
 					}
-					if (Object.keys(opr).length > 0) oo.objectPr = opr;
+					if (Object.keys(opr).length > 0) oo.properties = opr;
 				}
 				oleObjects.push(oo);
 			}
@@ -3639,7 +3639,7 @@ function stringifyWorksheet(opts, ctx) {
 	const p = ["<worksheet 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=\"x14ac xr xr2 xr3\" xmlns:x14ac=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac\" xmlns:xr=\"http://schemas.microsoft.com/office/spreadsheetml/2014/revision\" xmlns:xr2=\"http://schemas.microsoft.com/office/spreadsheetml/2015/revision2\" xmlns:xr3=\"http://schemas.microsoft.com/office/spreadsheetml/2016/revision3\">"];
 	const hasTabColor = !!opts.tabColor;
 	const hasOutline = columns.some((c) => c.outlineLevel !== void 0);
-	const sp = opts.sheetPr;
+	const sp = opts.properties;
 	const hasSheetPrAttrs = sp && (sp.codeName || sp.syncHorizontal || sp.syncVertical || sp.syncRef || sp.transitionEvaluation || sp.transitionEntry || sp.published !== void 0 || sp.filterMode || sp.enableFormatConditionsCalculation !== void 0);
 	const hasPageSetUpPr = !!opts.pageSetup?.fitToWidth || !!opts.pageSetup?.fitToHeight || opts.pageSetup?.fitToPage !== void 0 || opts.pageSetup?.autoPageBreaks !== void 0;
 	if (hasTabColor || hasOutline || hasSheetPrAttrs || hasPageSetUpPr) {
@@ -3709,8 +3709,8 @@ function stringifyWorksheet(opts, ctx) {
 		if (innerXml) p.push(`<sheetViews><sheetView${svAttrs}>${innerXml}</sheetView></sheetViews>`);
 		else p.push(`<sheetViews><sheetView${svAttrs}/></sheetViews>`);
 	}
-	if (opts.sheetFormatPr) {
-		const sfp = opts.sheetFormatPr;
+	if (opts.sheetFormat) {
+		const sfp = opts.sheetFormat;
 		const sfpAttrs = {};
 		if (sfp.baseColWidth !== void 0) sfpAttrs.baseColWidth = sfp.baseColWidth;
 		if (sfp.defaultColWidth !== void 0) sfpAttrs.defaultColWidth = sfp.defaultColWidth;
@@ -3746,9 +3746,9 @@ function stringifyWorksheet(opts, ctx) {
 	p.push("<sheetData>");
 	appendSheetDataRows(rows, p, sharedStrings, styles);
 	p.push("</sheetData>");
-	if (opts.sheetCalcPr) {
+	if (opts.calculation) {
 		const scAttrs = [];
-		if (opts.sheetCalcPr.fullCalcOnLoad) scAttrs.push("fullCalcOnLoad=\"1\"");
+		if (opts.calculation.fullCalcOnLoad) scAttrs.push("fullCalcOnLoad=\"1\"");
 		p.push(`<sheetCalcPr${scAttrs.length ? " " + scAttrs.join(" ") : ""}/>`);
 	}
 	if (opts.protection) p.push(stringifySheetProtectionXml(opts.protection));
@@ -3847,8 +3847,8 @@ function stringifyWorksheet(opts, ctx) {
 		for (const mc of mergeCells) p.push(selfCloseElement("mergeCell", attrs({ ref: mc.ref })));
 		p.push("</mergeCells>");
 	}
-	if (opts.phoneticPr) {
-		const pp = opts.phoneticPr;
+	if (opts.phonetic) {
+		const pp = opts.phonetic;
 		const ppAttrs = { fontId: pp.fontId };
 		if (pp.type && pp.type !== "fullwidthKatakana") ppAttrs.type = pp.type;
 		if (pp.alignment && pp.alignment !== "left") ppAttrs.alignment = pp.alignment;
@@ -4078,8 +4078,8 @@ function stringifyWorksheet(opts, ctx) {
 			if (ole.autoLoad) oleAttrs.push("autoLoad=\"1\"");
 			if (ole.rId) oleAttrs.push(`r:id="${escapeXml(ole.rId)}"`);
 			let innerXml;
-			if (ole.objectPr) {
-				const opr = ole.objectPr;
+			if (ole.properties) {
+				const opr = ole.properties;
 				const oprAttrs = [];
 				if (opr.locked === false) oprAttrs.push("locked=\"0\"");
 				if (opr.defaultSize === false) oprAttrs.push("defaultSize=\"0\"");
@@ -4711,7 +4711,7 @@ const commentsDesc = {
 				author: authors[authorId] ?? "",
 				text
 			};
-			if (commentPrEl) comment.commentPr = parseCommentPr(commentPrEl);
+			if (commentPrEl) comment.properties = parseCommentPr(commentPrEl);
 			comments.push(comment);
 		}
 		return { comments };
@@ -5105,7 +5105,7 @@ function parseImageAnchor(anchor, pic, name, ctx) {
 	if (srcRect) result.sourceRectangle = sourceRectangleDesc.parse(srcRect, ctx);
 	const spPrEl = findXdr(pic, "spPr");
 	if (spPrEl) {
-		result.spPr = shapePropertiesDesc.parse(spPrEl, ctx);
+		result.properties = shapePropertiesDesc.parse(spPrEl, ctx);
 		const bwMode = spPrEl.attributes?.["bwMode"];
 		if (bwMode !== void 0) result.blackWhiteMode = bwMode;
 	}
@@ -5189,7 +5189,7 @@ function parseShapeAnchor(anchor, sp, name, ctx) {
 	const result = {
 		col: 1,
 		row: 1,
-		spPr: {}
+		properties: {}
 	};
 	readAnchorFields(anchor, name, result);
 	Object.assign(result, readCNvPr(sp, "nvSpPr", ctx));
@@ -5199,7 +5199,7 @@ function parseShapeAnchor(anchor, sp, name, ctx) {
 	const spLocks = cNvSpPr ? findChild(cNvSpPr, "a:spLocks") : void 0;
 	if (spLocks) result.locking = shapeLockingDesc.parse(spLocks, ctx);
 	const spPr = findXdr(sp, "spPr");
-	if (spPr) result.spPr = shapePropertiesDesc.parse(spPr, ctx);
+	if (spPr) result.properties = shapePropertiesDesc.parse(spPr, ctx);
 	const styleEl = findXdr(sp, "style");
 	if (styleEl) {
 		const style = parseShapeStyle(styleEl, ctx);
@@ -5237,12 +5237,12 @@ function parseConnectorAnchor(anchor, cxnSp, name, ctx) {
 	const result = {
 		col: 1,
 		row: 1,
-		spPr: {}
+		properties: {}
 	};
 	readAnchorFields(anchor, name, result);
 	Object.assign(result, readCNvPr(cxnSp, "nvCxnSpPr", ctx));
 	const spPr = findXdr(cxnSp, "spPr");
-	if (spPr) result.spPr = shapePropertiesDesc.parse(spPr, ctx);
+	if (spPr) result.properties = shapePropertiesDesc.parse(spPr, ctx);
 	if (cxnSp.attributes?.["macro"] !== void 0) result.macro = String(cxnSp.attributes["macro"]);
 	readConnectorNonVisual(result, cxnSp, ctx);
 	const topConnStyle = findXdr(cxnSp, "style");
@@ -5256,19 +5256,19 @@ function parseGroupAnchor(anchor, grpSp, name, ctx) {
 	const result = {
 		col: 1,
 		row: 1,
-		grpSpPr: {}
+		properties: {}
 	};
 	readAnchorFields(anchor, name, result);
 	Object.assign(result, readCNvPr(grpSp, "nvGrpSpPr", ctx));
 	const grpSpPrEl = findXdr(grpSp, "grpSpPr");
-	if (grpSpPrEl) result.grpSpPr = groupShapePropertiesDesc.parse(grpSpPrEl, ctx);
+	if (grpSpPrEl) result.properties = groupShapePropertiesDesc.parse(grpSpPrEl, ctx);
 	const shapes = [];
 	const childConnectors = [];
 	for (const child of grpSp.elements ?? []) {
 		const local = child.name?.startsWith("xdr:") ? child.name.slice(4) : child.name;
 		if (local === "sp") {
 			const spPr = findXdr(child, "spPr");
-			const childShape = { spPr: spPr ? shapePropertiesDesc.parse(spPr, ctx) : {} };
+			const childShape = { properties: spPr ? shapePropertiesDesc.parse(spPr, ctx) : {} };
 			Object.assign(childShape, readCNvPr(child, "nvSpPr", ctx));
 			const childNvSpPr = findXdr(child, "nvSpPr");
 			const childCnVSpPr = childNvSpPr ? findXdr(childNvSpPr, "cNvSpPr") : void 0;
@@ -5287,7 +5287,7 @@ function parseGroupAnchor(anchor, grpSp, name, ctx) {
 			shapes.push(childShape);
 		} else if (local === "cxnSp") {
 			const spPr = findXdr(child, "spPr");
-			const childConn = { spPr: spPr ? shapePropertiesDesc.parse(spPr, ctx) : {} };
+			const childConn = { properties: spPr ? shapePropertiesDesc.parse(spPr, ctx) : {} };
 			Object.assign(childConn, readCNvPr(child, "nvCxnSpPr", ctx));
 			if (child.attributes?.["macro"] !== void 0) childConn.macro = String(child.attributes["macro"]);
 			readConnectorNonVisual(childConn, child, ctx);
@@ -5348,7 +5348,7 @@ function wrapAnchor(opts, inner) {
 	return `<xdr:twoCellAnchor${opts.editAs === void 0 ? "" : ` editAs="${opts.editAs}"`}><xdr:from>${from}</xdr:from><xdr:to>${markerXml(opts.toCol ?? opts.col + 1, opts.toColOffset ?? 0, opts.toRow ?? opts.row + 1, opts.toRowOffset ?? 0)}</xdr:to>${inner}</xdr:twoCellAnchor>`;
 }
 function picXml(img, id, cx, cy, ctx) {
-	const spPr = (img.spPr ? shapePropertiesDesc.stringify(img.spPr, ctx) : shapePropertiesDesc.stringify({
+	const spPr = (img.properties ? shapePropertiesDesc.stringify(img.properties, ctx) : shapePropertiesDesc.stringify({
 		x: 0,
 		y: 0,
 		width: cx,
@@ -5447,25 +5447,25 @@ function buildConnectorContent(cNvPr, id, fallbackName, spPr, ctx, attrs = "", c
 	return `<xdr:cxnSp${attrs}><xdr:nvCxnSpPr>${stringifyNonVisualDrawingProperties("xdr:cNvPr", id, cNvPr, fallbackName, hlinkClickXml(cNvPr?.hyperlink, ctx))}${cNvCxnSpPr}</xdr:nvCxnSpPr><xdr:spPr>${spPrXml}</xdr:spPr>${styleXml}</xdr:cxnSp>`;
 }
 function stringifyShape(shape, id, ctx) {
-	return wrapAnchor(shape, `${buildShapeContent(shape, id, `Shape ${id}`, shape.spPr, shape.textBody, ctx, macroTextlinkAttrs(shape), shape.style)}${clientDataXml(shape)}`);
+	return wrapAnchor(shape, `${buildShapeContent(shape, id, `Shape ${id}`, shape.properties, shape.textBody, ctx, macroTextlinkAttrs(shape), shape.style)}${clientDataXml(shape)}`);
 }
 function stringifyConnector(conn, id, ctx) {
-	return wrapAnchor(conn, `${buildConnectorContent(conn, id, `Connector ${id}`, conn.spPr, ctx, macroTextlinkAttrs(conn), conn)}${clientDataXml(conn)}`);
+	return wrapAnchor(conn, `${buildConnectorContent(conn, id, `Connector ${id}`, conn.properties, ctx, macroTextlinkAttrs(conn), conn)}${clientDataXml(conn)}`);
 }
 function stringifyContentPart(cp) {
 	return wrapAnchor(cp, `<xdr:contentPart r:id="${cp.rId}"/>${clientDataXml(cp)}`);
 }
 /** Build xdr:grpSp content and return the next available cNvPr id. */
 function buildGroup(grp, id, ctx) {
-	const grpSpPrXml = groupShapePropertiesDesc.stringify(grp.grpSpPr, ctx) ?? "";
+	const grpSpPrXml = groupShapePropertiesDesc.stringify(grp.properties, ctx) ?? "";
 	let childId = id + 1;
 	const children = [];
 	for (const childShape of grp.shapes ?? []) {
-		children.push(buildShapeContent(childShape, childId, `Shape ${childId}`, childShape.spPr, childShape.textBody, ctx, macroTextlinkAttrs(childShape), childShape.style));
+		children.push(buildShapeContent(childShape, childId, `Shape ${childId}`, childShape.properties, childShape.textBody, ctx, macroTextlinkAttrs(childShape), childShape.style));
 		childId++;
 	}
 	for (const childConn of grp.connectors ?? []) {
-		children.push(buildConnectorContent(childConn, childId, `Connector ${childId}`, childConn.spPr, ctx, macroTextlinkAttrs(childConn), childConn));
+		children.push(buildConnectorContent(childConn, childId, `Connector ${childId}`, childConn.properties, ctx, macroTextlinkAttrs(childConn), childConn));
 		childId++;
 	}
 	return {
@@ -5881,16 +5881,16 @@ const connectionsDesc = {
 			if (c.credentials !== void 0 && CRED_METHODS.has(c.credentials)) cAttrs.push(`credentials="${c.credentials}"`);
 			if (c.singleSignOnId !== void 0) cAttrs.push(`singleSignOnId="${escapeXml(c.singleSignOnId)}"`);
 			const inner = [];
-			if (c.dbPr) {
-				const dAttrs = [`connection="${escapeXml(c.dbPr.connection)}"`];
-				if (c.dbPr.command !== void 0) dAttrs.push(`command="${escapeXml(c.dbPr.command)}"`);
-				if (c.dbPr.serverCommand !== void 0) dAttrs.push(`serverCommand="${escapeXml(c.dbPr.serverCommand)}"`);
-				if (c.dbPr.commandType !== void 0) dAttrs.push(`commandType="${c.dbPr.commandType}"`);
+			if (c.database) {
+				const dAttrs = [`connection="${escapeXml(c.database.connection)}"`];
+				if (c.database.command !== void 0) dAttrs.push(`command="${escapeXml(c.database.command)}"`);
+				if (c.database.serverCommand !== void 0) dAttrs.push(`serverCommand="${escapeXml(c.database.serverCommand)}"`);
+				if (c.database.commandType !== void 0) dAttrs.push(`commandType="${c.database.commandType}"`);
 				inner.push(`<dbPr ${dAttrs.join(" ")}/>`);
 			}
-			if (c.olapPr) inner.push(stringifyOlapPr(c.olapPr));
-			if (c.webPr) {
-				const w = c.webPr;
+			if (c.olap) inner.push(stringifyOlapPr(c.olap));
+			if (c.web) {
+				const w = c.web;
 				const wAttrs = [];
 				if (w.xml) wAttrs.push("xml=\"1\"");
 				if (w.sourceData) wAttrs.push("sourceData=\"1\"");
@@ -5909,8 +5909,8 @@ const connectionsDesc = {
 				if (tablesXml) inner.push(`<webPr ${wAttrs.join(" ")}>${tablesXml}</webPr>`);
 				else inner.push(`<webPr ${wAttrs.join(" ")}/>`);
 			}
-			if (c.textPr) {
-				const t = c.textPr;
+			if (c.text) {
+				const t = c.text;
 				const tAttrs = [];
 				if (t.prompt === false) tAttrs.push("prompt=\"0\"");
 				if (t.fileType !== void 0) tAttrs.push(`fileType="${t.fileType}"`);
@@ -5992,7 +5992,7 @@ const connectionsDesc = {
 			if (attr(cEl, "credentials") !== void 0) c.credentials = attr(cEl, "credentials");
 			if (attr(cEl, "singleSignOnId") !== void 0) c.singleSignOnId = attr(cEl, "singleSignOnId");
 			const dbEl = findChild(cEl, "dbPr");
-			if (dbEl) c.dbPr = {
+			if (dbEl) c.database = {
 				connection: attr(dbEl, "connection") ?? "",
 				command: attr(dbEl, "command"),
 				serverCommand: attr(dbEl, "serverCommand"),
@@ -6001,7 +6001,7 @@ const connectionsDesc = {
 			const olapEl = findChild(cEl, "olapPr");
 			if (olapEl) {
 				const ol = parseOlapPr(olapEl);
-				if (ol) c.olapPr = ol;
+				if (ol) c.olap = ol;
 			}
 			const webEl = findChild(cEl, "webPr");
 			if (webEl) {
@@ -6027,7 +6027,7 @@ const connectionsDesc = {
 					else if (tEl.name === "x") tables.push(attrNum(tEl, "v") ?? 0);
 					if (tables.length > 0) w.tables = tables;
 				}
-				c.webPr = w;
+				c.web = w;
 			}
 			const textEl = findChild(cEl, "textPr");
 			if (textEl) {
@@ -6065,7 +6065,7 @@ const connectionsDesc = {
 					}
 					if (fields.length > 0) t.textFields = fields;
 				}
-				c.textPr = t;
+				c.text = t;
 			}
 			const paramsEl = findChild(cEl, "parameters");
 			if (paramsEl) {
@@ -7043,8 +7043,8 @@ function stringifyPivotCacheDef(sourceRef, sourceSheet, sourceData, recordsRid,
 				if (fg.parent !== void 0) fgParts.push(` par="${fg.parent}"`);
 				if (fg.base !== void 0) fgParts.push(` base="${fg.base}"`);
 				fgParts.push(">");
-				if (fg.rangePr) {
-					const rp = fg.rangePr;
+				if (fg.range) {
+					const rp = fg.range;
 					const rpAttrs = [];
 					if (rp.autoStart === false) rpAttrs.push("autoStart=\"0\"");
 					if (rp.autoEnd === false) rpAttrs.push("autoEnd=\"0\"");
@@ -7056,9 +7056,9 @@ function stringifyPivotCacheDef(sourceRef, sourceSheet, sourceData, recordsRid,
 					if (rp.groupInterval !== void 0) rpAttrs.push(`groupInterval="${rp.groupInterval}"`);
 					fgParts.push(`<rangePr${rpAttrs.length ? " " + rpAttrs.join(" ") : ""}/>`);
 				}
-				if (fg.discretePr && fg.discretePr.length > 0) {
-					fgParts.push(`<discretePr count="${fg.discretePr.length}">`);
-					for (const idx of fg.discretePr) fgParts.push(`<x v="${idx}"/>`);
+				if (fg.discrete && fg.discrete.length > 0) {
+					fgParts.push(`<discretePr count="${fg.discrete.length}">`);
+					for (const idx of fg.discrete) fgParts.push(`<x v="${idx}"/>`);
 					fgParts.push("</discretePr>");
 				}
 				if (fg.groupItems && fg.groupItems.length > 0) {
@@ -7074,7 +7074,7 @@ function stringifyPivotCacheDef(sourceRef, sourceSheet, sourceData, recordsRid,
 	}
 	p.push("</cacheFields>");
 	if (cacheDefOpts?.mpMaps) for (const mp of cacheDefOpts.mpMaps) p.push(`<mpMap x="${mp.x}"/>`);
-	const olapPrXml = cacheDefOpts?.olapPr ? stringifyOlapPr(cacheDefOpts.olapPr) : "";
+	const olapPrXml = cacheDefOpts?.olap ? stringifyOlapPr(cacheDefOpts.olap) : "";
 	if (olapPrXml) p.push(olapPrXml);
 	if (cacheDefOpts?.cacheHierarchies && cacheDefOpts.cacheHierarchies.length > 0) {
 		const chs = cacheDefOpts.cacheHierarchies;
@@ -7365,8 +7365,8 @@ const tableDesc = {
 			if (col.headerRowCellStyle) colAttrs.headerRowCellStyle = col.headerRowCellStyle;
 			if (col.dataCellStyle) colAttrs.dataCellStyle = col.dataCellStyle;
 			if (col.totalsRowCellStyle) colAttrs.totalsRowCellStyle = col.totalsRowCellStyle;
-			if (col.xmlColumnPr && typeof col.xmlColumnPr.mapId === "number") {
-				const xp = col.xmlColumnPr;
+			if (col.mapping && typeof col.mapping.mapId === "number") {
+				const xp = col.mapping;
 				const xpAttrs = [`mapId="${xp.mapId}"`, `xpath="${escapeXml(xp.xpath)}"`];
 				if (xp.denormalized) xpAttrs.push("denormalized=\"1\"");
 				xpAttrs.push(`xmlDataType="${escapeXml(xp.xmlDataType)}"`);
@@ -7450,12 +7450,12 @@ const tableDesc = {
 				if (attr(colEl, "totalsRowCellStyle")) col.totalsRowCellStyle = attr(colEl, "totalsRowCellStyle");
 				const xcpEl = findChild(colEl, "xmlColumnPr");
 				if (xcpEl) {
-					col.xmlColumnPr = {
+					col.mapping = {
 						mapId: attrNum(xcpEl, "mapId") ?? 0,
 						xpath: attr(xcpEl, "xpath") ?? "",
 						xmlDataType: attr(xcpEl, "xmlDataType") ?? ""
 					};
-					if (parseOnOff(attr(xcpEl, "denormalized"))) col.xmlColumnPr.denormalized = true;
+					if (parseOnOff(attr(xcpEl, "denormalized"))) col.mapping.denormalized = true;
 				}
 				columns.push(col);
 			}
@@ -7543,8 +7543,8 @@ function stringifyWorkbook(opts) {
 		if (fs.spinCount !== void 0) fsAttrs.push(`spinCount="${fs.spinCount}"`);
 		if (fsAttrs.length > 0) parts.push(`<fileSharing ${fsAttrs.join(" ")}/>`);
 	}
-	if (opts.workbookPr) {
-		const wbPr = opts.workbookPr;
+	if (opts.properties) {
+		const wbPr = opts.properties;
 		const wbPrAttrs = [];
 		if (wbPr.date1904) wbPrAttrs.push("date1904=\"1\"");
 		if (wbPr.defaultThemeVersion !== void 0) wbPrAttrs.push(`defaultThemeVersion="${wbPr.defaultThemeVersion}"`);
@@ -7673,8 +7673,8 @@ function stringifyWorkbook(opts) {
 		dnParts.push("</definedNames>");
 		parts.push(dnParts.join(""));
 	}
-	if (opts.calcPr) {
-		const cp = opts.calcPr;
+	if (opts.calculation) {
+		const cp = opts.calculation;
 		const cpAttrs = [];
 		cpAttrs.push(`calcId="${cp.calcId ?? 191029}"`);
 		if (cp.calcMode) cpAttrs.push(`calcMode="${escapeXml(cp.calcMode)}"`);
@@ -7731,8 +7731,8 @@ function stringifyWorkbook(opts) {
 		for (const pc of pivotCaches) parts.push(`<pivotCache cacheId="${pc.cacheId}" r:id="${pc.rId}"/>`);
 		parts.push("</pivotCaches>");
 	}
-	if (opts.smartTagPr) {
-		const stp = opts.smartTagPr;
+	if (opts.smartTag) {
+		const stp = opts.smartTag;
 		const stpAttrs = [];
 		if (stp.embed) stpAttrs.push("embed=\"1\"");
 		if (stp.show && stp.show !== "all") stpAttrs.push(`show="${stp.show}"`);
@@ -7764,8 +7764,8 @@ function stringifyWorkbook(opts) {
 		if (wp.characterSet) wpAttrs.push(`characterSet="${escapeXml(wp.characterSet)}"`);
 		parts.push(`<webPublishing ${wpAttrs.join(" ")}/>`);
 	}
-	if (opts.fileRecoveryPr) {
-		const frp = opts.fileRecoveryPr;
+	if (opts.fileRecovery) {
+		const frp = opts.fileRecovery;
 		const frpAttrs = [];
 		if (frp.autoRecover === false) frpAttrs.push("autoRecover=\"0\"");
 		if (frp.crashSave) frpAttrs.push("crashSave=\"1\"");
@@ -7938,7 +7938,7 @@ const workbookDesc = {
 			if (id !== void 0) calc.iterateDelta = id;
 			if (String(attr(calcPrEl, "fullPrecision")) === "0") calc.fullPrecision = false;
 			if (parseOnOff(attr(calcPrEl, "calcCompleted"))) calc.calcCompleted = true;
-			result.calcPr = calc;
+			result.calculation = calc;
 		}
 		const oleSizeEl = findChild(el, "oleSize");
 		if (oleSizeEl) {
@@ -8022,7 +8022,7 @@ const workbookDesc = {
 			if (parseOnOff(attr(fileRecoveryEl, "crashSave"))) frp.crashSave = true;
 			if (parseOnOff(attr(fileRecoveryEl, "dataExtractLoad"))) frp.dataExtractLoad = true;
 			if (parseOnOff(attr(fileRecoveryEl, "repairLoad"))) frp.repairLoad = true;
-			result.fileRecoveryPr = frp;
+			result.fileRecovery = frp;
 		}
 		const wbPrEl = findChild(el, "workbookPr");
 		if (wbPrEl?.attributes) {
@@ -8046,7 +8046,7 @@ const workbookDesc = {
 			if (parseOnOff(attr(wbPrEl, "checkCompatibility"))) wbPr.checkCompatibility = true;
 			if (String(attr(wbPrEl, "autoCompressPictures")) === "0") wbPr.autoCompressPictures = false;
 			if (parseOnOff(attr(wbPrEl, "refreshAllConnections"))) wbPr.refreshAllConnections = true;
-			result.workbookPr = wbPr;
+			result.properties = wbPr;
 		}
 		const acEl = findChild(el, "mc:AlternateContent");
 		if (acEl) {
@@ -8149,7 +8149,7 @@ const workbookDesc = {
 			if (parseOnOff(attr(smartTagPrEl, "embed"))) stp.embed = true;
 			const show = attr(smartTagPrEl, "show");
 			if (show && show !== "all") stp.show = show;
-			result.smartTagPr = stp;
+			result.smartTag = stp;
 		}
 		const smartTagTypesEl = findChild(el, "smartTagTypes");
 		if (smartTagTypesEl) {
@@ -8373,11 +8373,11 @@ const singleXmlCellsDesc = {
 	stringify(opts, _ctx) {
 		const p = ["<singleXmlCells xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">"];
 		for (const c of opts.cells) {
-			const pr = c.xmlCellPr;
+			const pr = c.properties;
 			const prAttrs = [`id="${pr.id}"`];
 			if (pr.uniqueName !== void 0) prAttrs.push(`uniqueName="${escapeXml(pr.uniqueName)}"`);
-			if (typeof pr.xmlPr.mapId !== "number") continue;
-			p.push(`<singleXmlCell id="${c.id}" r="${escapeXml(c.reference)}" connectionId="${c.connectionId}"><xmlCellPr ${prAttrs.join(" ")}><xmlPr mapId="${pr.xmlPr.mapId}" xpath="${escapeXml(pr.xmlPr.xpath)}" xmlDataType="${escapeXml(pr.xmlPr.xmlDataType)}"/></xmlCellPr></singleXmlCell>`);
+			if (typeof pr.mapping.mapId !== "number") continue;
+			p.push(`<singleXmlCell id="${c.id}" r="${escapeXml(c.reference)}" connectionId="${c.connectionId}"><xmlCellPr ${prAttrs.join(" ")}><xmlPr mapId="${pr.mapping.mapId}" xpath="${escapeXml(pr.mapping.xpath)}" xmlDataType="${escapeXml(pr.mapping.xmlDataType)}"/></xmlCellPr></singleXmlCell>`);
 		}
 		p.push("</singleXmlCells>");
 		return p.join("");
@@ -8392,7 +8392,7 @@ const singleXmlCellsDesc = {
 			if (!xmlPrEl) continue;
 			const pr = { id: attrNum(prEl, "id") ?? 0 };
 			if (attr(prEl, "uniqueName") !== void 0) pr.uniqueName = attr(prEl, "uniqueName");
-			pr.xmlPr = {
+			pr.mapping = {
 				mapId: attrNum(xmlPrEl, "mapId") ?? 0,
 				xpath: attr(xmlPrEl, "xpath") ?? "",
 				xmlDataType: attr(xmlPrEl, "xmlDataType") ?? ""
@@ -8401,7 +8401,7 @@ const singleXmlCellsDesc = {
 				id: attrNum(cEl, "id") ?? 0,
 				reference: attr(cEl, "r") ?? "",
 				connectionId: attrNum(cEl, "connectionId") ?? 0,
-				xmlCellPr: pr
+				properties: pr
 			});
 		}
 		return { cells };
@@ -9478,14 +9478,14 @@ function parseWorkbook(data) {
 		}
 		if (wbData.protection) opts.workbookProtection = wbData.protection;
 		if (wbData.bookView) opts.bookView = wbData.bookView;
-		if (wbData.calcPr) opts.calcPr = wbData.calcPr;
+		if (wbData.calculation) opts.calculation = wbData.calculation;
 		if (wbData.oleSize) opts.oleSize = wbData.oleSize;
 		if (wbData.customViews) opts.customWorkbookViews = wbData.customViews;
-		if (wbData.fileRecoveryPr) opts.fileRecoveryPr = wbData.fileRecoveryPr;
+		if (wbData.fileRecovery) opts.fileRecovery = wbData.fileRecovery;
 		if (wbData.functionGroups) opts.functionGroups = wbData.functionGroups;
 		if (wbData.webPublishing) opts.webPublishing = wbData.webPublishing;
 		if (wbData.fileSharing) opts.fileSharing = wbData.fileSharing;
-		if (wbData.workbookPr) opts.workbookPr = wbData.workbookPr;
+		if (wbData.properties) opts.properties = wbData.properties;
 		if (wbData.webPublishObjects) opts.webPublishObjects = wbData.webPublishObjects;
 		if (wbData.definedNames) opts.definedNames = wbData.definedNames;
 		if (wbData.absPath !== void 0) opts.absPath = wbData.absPath;
@@ -9562,7 +9562,7 @@ function parseWorkbook(data) {
 								description: image.description,
 								title: image.title,
 								hidden: image.hidden,
-								...image.spPr ? { spPr: image.spPr } : {},
+								...image.properties ? { properties: image.properties } : {},
 								...image.blackWhiteMode ? { blackWhiteMode: image.blackWhiteMode } : {},
 								...image.sourceRectangle ? { sourceRectangle: image.sourceRectangle } : {},
 								...image.preferRelativeResize !== void 0 ? { preferRelativeResize: image.preferRelativeResize } : {},
@@ -9587,7 +9587,7 @@ function parseWorkbook(data) {
 						description: image.description,
 						title: image.title,
 						hidden: image.hidden,
-						...image.spPr ? { spPr: image.spPr } : {},
+						...image.properties ? { properties: image.properties } : {},
 						...image.blackWhiteMode ? { blackWhiteMode: image.blackWhiteMode } : {},
 						...image.sourceRectangle ? { sourceRectangle: image.sourceRectangle } : {},
 						...image.preferRelativeResize !== void 0 ? { preferRelativeResize: image.preferRelativeResize } : {},
@@ -10544,14 +10544,14 @@ function compileWorkbook(options, overrides = [], mediaLevel = 0) {
 		pivotCaches: ctx.pivotCacheRefs.length > 0 ? ctx.pivotCacheRefs : rtPivotRefs ?? [],
 		protection: options.workbookProtection,
 		customViews: options.customWorkbookViews,
-		fileRecoveryPr: options.fileRecoveryPr,
+		fileRecovery: options.fileRecovery,
 		functionGroups: options.functionGroups,
 		webPublishing: options.webPublishing,
 		fileSharing: options.fileSharing,
 		webPublishObjects: options.webPublishObjects,
 		definedNames: options.definedNames,
-		workbookPr: options.workbookPr,
-		calcPr: options.calcPr,
+		properties: options.properties,
+		calculation: options.calculation,
 		oleSize: options.oleSize,
 		bookView: options.bookView,
 		...options.absPath !== void 0 ? { absPath: options.absPath } : {},
@@ -10811,7 +10811,7 @@ function compileWorksheetPart(wsOpts, i, worksheetConfigs, ctx, mapping, wsConte
 				rId: embedRid ?? "",
 				...linkRid ? { linkRId: linkRid } : {},
 				...pickNonVisualDrawingProperties(img),
-				...img.spPr ? { spPr: img.spPr } : {},
+				...img.properties ? { properties: img.properties } : {},
 				...img.blackWhiteMode ? { blackWhiteMode: img.blackWhiteMode } : {},
 				...img.sourceRectangle ? { sourceRectangle: img.sourceRectangle } : {},
 				...img.preferRelativeResize !== void 0 ? { preferRelativeResize: img.preferRelativeResize } : {},
@@ -11543,7 +11543,7 @@ const WORKBOOK_KEYS = /* @__PURE__ */ new Set([
 	"customProperties",
 	"workbookProtection",
 	"definedNames",
-	"fileRecoveryPr",
+	"fileRecovery",
 	"functionGroups",
 	"webPublishing",
 	"fileSharing",
@@ -11616,7 +11616,7 @@ function streamWorkbook(options, ondata, compression = {}) {
 		sheets,
 		protection: options.workbookProtection,
 		definedNames: options.definedNames,
-		fileRecoveryPr: options.fileRecoveryPr,
+		fileRecovery: options.fileRecovery,
 		functionGroups: options.functionGroups,
 		webPublishing: options.webPublishing,
 		fileSharing: options.fileSharing