@office-open/xlsx 0.6.6 → 0.6.8

package/dist/{index.js → index.mjs}

@@ -1,4 +1,4 @@
-import { AppProperties, BaseXmlComponent, ChartCollection, ChartSpace, Formatter, IgnoreIfEmptyXmlComponent, OoxmlMimeType, Relationships, buildCorePropertiesXml, compileMapping, createPacker, parseArchive, parseCorePropsElement, strFromU8, toJson, unzipSync, zipAndConvert } from "@office-open/core";
+import { AppProperties, BaseXmlComponent, ChartCollection, ChartSpace, Formatter, IgnoreIfEmptyXmlComponent, OoxmlMimeType, Relationships, buildCorePropertiesXmlString, compileMapping, createPacker, parseArchive, parseCorePropsElement, strFromU8, toJson, unzipSync, zipAndConvert } from "@office-open/core";
 import { attr, attrNum, attrs, escapeXml, findChild, js2xml, selfCloseElement, textOf } from "@office-open/xml";
 import { toUint8Array } from "undio";
 //#region src/file/content-types.ts
@@ -13,7 +13,7 @@ const XLSX_STYLES = "application/vnd.openxmlformats-officedocument.spreadsheetml
 const XLSX_SHARED_STRINGS = "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml";
 const XLSX_THEME = "application/vnd.openxmlformats-officedocument.theme+xml";
 const XLSX_CHART = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
-const STATIC_CHILDREN = [{ _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/content-types" } }, ...[
+const STATIC_XML = [
 	{
 		type: "Default",
 		contentType: "application/vnd.openxmlformats-package.relationships+xml",
@@ -24,16 +24,6 @@ const STATIC_CHILDREN = [{ _attr: { xmlns: "http://schemas.openxmlformats.org/pa
 		contentType: "application/xml",
 		key: "xml"
 	},
-	{
-		type: "Default",
-		contentType: "image/png",
-		key: "png"
-	},
-	{
-		type: "Default",
-		contentType: "image/jpeg",
-		key: "jpeg"
-	},
 	{
 		type: "Override",
 		contentType: XLSX_MAIN,
@@ -49,16 +39,7 @@ const STATIC_CHILDREN = [{ _attr: { xmlns: "http://schemas.openxmlformats.org/pa
 		contentType: "application/vnd.openxmlformats-officedocument.extended-properties+xml",
 		key: "/docProps/app.xml"
 	}
-].map((e) => {
-	if (e.type === "Default") return { Default: { _attr: {
-		ContentType: e.contentType,
-		Extension: e.key
-	} } };
-	return { Override: { _attr: {
-		ContentType: e.contentType,
-		PartName: e.key
-	} } };
-})];
+].map((e) => e.type === "Default" ? `<Default ContentType="${e.contentType}" Extension="${e.key}"/>` : `<Override ContentType="${e.contentType}" PartName="${e.key}"/>`).join("");
 var ContentTypes = class extends BaseXmlComponent {
 	dynamicEntries = [];
 	constructor() {
@@ -106,17 +87,21 @@ var ContentTypes = class extends BaseXmlComponent {
 			key: `/xl/drawings/drawing${index}.xml`
 		});
 	}
-	prepForXml(_context) {
-		const children = [...STATIC_CHILDREN];
-		for (const e of this.dynamicEntries) if (e.type === "Default") children.push({ Default: { _attr: {
-			ContentType: e.contentType,
-			Extension: e.key
-		} } });
-		else children.push({ Override: { _attr: {
-			ContentType: e.contentType,
-			PartName: e.key
-		} } });
-		return { Types: children };
+	addImageType(extension) {
+		const contentType = extension === "png" ? "image/png" : "image/jpeg";
+		if (this.dynamicEntries.some((e) => e.type === "Default" && e.key === extension)) return;
+		this.dynamicEntries.push({
+			type: "Default",
+			contentType,
+			key: extension
+		});
+	}
+	toXml(_context) {
+		const p = ["<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">", STATIC_XML];
+		for (const e of this.dynamicEntries) if (e.type === "Default") p.push(`<Default ContentType="${e.contentType}" Extension="${e.key}"/>`);
+		else p.push(`<Override ContentType="${e.contentType}" PartName="${e.key}"/>`);
+		p.push("</Types>");
+		return p.join("");
 	}
 };
 //#endregion
@@ -132,8 +117,8 @@ var CoreProperties = class extends BaseXmlComponent {
 		super("cp:coreProperties");
 		this.options = options;
 	}
-	prepForXml(_context) {
-		return buildCorePropertiesXml(this.options);
+	toXml(_context) {
+		return buildCorePropertiesXmlString(this.options);
 	}
 };
 //#endregion
@@ -188,15 +173,6 @@ var SharedStrings = class extends BaseXmlComponent {
 		p.push("</sst>");
 		return p.join("");
 	}
-	prepForXml(_context) {
-		const children = [{ _attr: {
-			xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-			count: this.strings.length,
-			uniqueCount: this.indexMap.size
-		} }];
-		for (const s of this.strings) children.push({ si: [{ t: [s] }] });
-		return { sst: children };
-	}
 };
 //#endregion
 //#region src/file/styles.ts
@@ -356,7 +332,7 @@ var Styles = class extends BaseXmlComponent {
 		for (const f of this.fills) {
 			const patternAttrs = attrs({ patternType: f.patternType ?? "solid" });
 			const fgColor = f.color ? `<fgColor rgb="FF${f.color}"/>` : "";
-			p.push(`<fill><patternFill${patternAttrs}>${fgColor}</patternFill></fill>`);
+			p.push(fgColor ? `<fill><patternFill${patternAttrs}>${fgColor}</patternFill></fill>` : `<fill><patternFill${patternAttrs}/></fill>`);
 		}
 		p.push("</fills>");
 		p.push(`<borders count="${this.borders.length}">`);
@@ -369,17 +345,21 @@ var Styles = class extends BaseXmlComponent {
 				numFmtId: xf.numFmtId,
 				fontId: xf.fontId,
 				fillId: xf.fillId,
-				borderId: xf.borderId
+				borderId: xf.borderId,
+				xfId: 0
 			};
 			if (xf.alignment) xAttrs.applyAlignment = 1;
 			if (xf.fontId > 0) xAttrs.applyFont = 1;
 			if (xf.fillId > 0) xAttrs.applyFill = 1;
 			if (xf.borderId > 0) xAttrs.applyBorder = 1;
 			const alignStr = xf.alignment ? this.alignmentXmlStr(xf.alignment) : "";
-			p.push(`<xf${attrs(xAttrs)}>${alignStr}</xf>`);
+			p.push(alignStr ? `<xf${attrs(xAttrs)}>${alignStr}</xf>` : `<xf${attrs(xAttrs)}/>`);
 		}
 		p.push("</cellXfs>");
 		p.push("<cellStyles count=\"1\"><cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/></cellStyles>");
+		p.push("<dxfs count=\"0\"/>");
+		p.push("<tableStyles count=\"0\" defaultTableStyle=\"TableStyleMedium2\" defaultPivotStyle=\"PivotStyleLight16\"/>");
+		p.push("<extLst/>");
 		p.push("</styleSheet>");
 		return p.join("");
 	}
@@ -420,105 +400,6 @@ var Styles = class extends BaseXmlComponent {
 		if (a.indent !== void 0) aAttrs.indent = a.indent;
 		return `<alignment${attrs(aAttrs)}/>`;
 	}
-	prepForXml(_context) {
-		const children = [{ _attr: { xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main" } }];
-		if (this.customNumFmts.size > 0) {
-			const fmtElements = [{ _attr: { count: this.customNumFmts.size } }];
-			for (const [fmt, id] of this.customNumFmts) fmtElements.push({ numFmt: { _attr: {
-				numFmtId: id,
-				formatCode: fmt
-			} } });
-			children.push({ numFmts: fmtElements });
-		}
-		children.push(this.buildFonts());
-		children.push(this.buildFills());
-		children.push(this.buildBorders());
-		children.push({ cellStyleXfs: [{ _attr: { count: 1 } }, { xf: [{ _attr: {
-			numFmtId: 0,
-			fontId: 0,
-			fillId: 0,
-			borderId: 0
-		} }] }] });
-		children.push(this.buildCellXfs());
-		children.push({ cellStyles: [{ _attr: { count: 1 } }, { cellStyle: [{ _attr: {
-			name: "Normal",
-			xfId: 0,
-			builtinId: 0
-		} }] }] });
-		return { styleSheet: children };
-	}
-	buildFonts() {
-		const elements = [{ _attr: { count: this.fonts.length } }];
-		for (const f of this.fonts) elements.push({ font: this.fontXml(f) });
-		return { fonts: elements };
-	}
-	fontXml(f) {
-		const parts = [];
-		if (f.bold) parts.push({ b: [] });
-		if (f.italic) parts.push({ i: [] });
-		if (f.underline) parts.push({ u: [] });
-		if (f.strike) parts.push({ strike: [] });
-		if (f.size) parts.push({ sz: [{ _attr: { val: f.size } }] });
-		if (f.color) parts.push({ color: [{ _attr: { rgb: `FF${f.color}` } }] });
-		if (f.fontName) parts.push({ name: [{ _attr: { val: f.fontName } }] });
-		return parts;
-	}
-	buildFills() {
-		const elements = [{ _attr: { count: this.fills.length } }];
-		for (const f of this.fills) elements.push({ fill: [{ patternFill: [{ _attr: { patternType: f.patternType ?? "solid" } }, ...f.color ? [{ fgColor: [{ _attr: { rgb: `FF${f.color}` } }] }] : []] }] });
-		return { fills: elements };
-	}
-	buildBorders() {
-		const elements = [{ _attr: { count: this.borders.length } }];
-		for (const b of this.borders) elements.push({ border: this.borderXml(b) });
-		return { borders: elements };
-	}
-	borderXml(b) {
-		const parts = [];
-		for (const side of [
-			"left",
-			"right",
-			"top",
-			"bottom",
-			"diagonal"
-		]) {
-			const opts = b[side];
-			if (opts && opts.style && opts.style !== "none") {
-				const children = [{ _attr: { style: opts.style } }];
-				if (opts.color) children.push({ color: [{ _attr: { rgb: `FF${opts.color}` } }] });
-				parts.push({ [side]: children });
-			} else parts.push({ [side]: [] });
-		}
-		return parts;
-	}
-	buildCellXfs() {
-		const elements = [{ _attr: { count: this.cellXfs.length } }];
-		for (const xf of this.cellXfs) {
-			const attrs = {
-				numFmtId: xf.numFmtId,
-				fontId: xf.fontId,
-				fillId: xf.fillId,
-				borderId: xf.borderId
-			};
-			if (xf.alignment) attrs.applyAlignment = 1;
-			if (xf.fontId > 0) attrs.applyFont = 1;
-			if (xf.fillId > 0) attrs.applyFill = 1;
-			if (xf.borderId > 0) attrs.applyBorder = 1;
-			const children = [{ _attr: attrs }];
-			if (xf.alignment) children.push(this.alignmentXml(xf.alignment));
-			elements.push({ xf: children });
-		}
-		return { cellXfs: elements };
-	}
-	alignmentXml(a) {
-		const attrs = {};
-		if (a.horizontal) attrs.horizontal = a.horizontal;
-		if (a.vertical) attrs.vertical = a.vertical;
-		if (a.wrapText) attrs.wrapText = 1;
-		if (a.textRotation !== void 0) attrs.textRotation = a.textRotation;
-		if (a.indent !== void 0) attrs.indent = a.indent;
-		return { alignment: [{ _attr: attrs }] };
-	}
 };
 //#endregion
 //#region src/file/theme.ts
@@ -541,12 +422,6 @@ var DefaultTheme = class extends BaseXmlComponent {
 	toXml(_context) {
 		return THEME_XML;
 	}
-	prepForXml(_context) {
-		return { "a:theme": [{ _attr: {
-			"xmlns:a": "http://schemas.openxmlformats.org/drawingml/2006/main",
-			name: "Office Theme"
-		} }] };
-	}
 };
 //#endregion
 //#region src/file/workbook.ts
@@ -561,21 +436,18 @@ var WorkbookXml = class extends BaseXmlComponent {
 		super("workbook");
 		this.sheets = sheets;
 	}
-	prepForXml(_context) {
-		const sheetElements = [];
+	toXml(_context) {
+		const p = [
+			"<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">",
+			"<bookViews><workbookView xWindow=\"0\" yWindow=\"0\" windowWidth=\"28800\" windowHeight=\"12300\"/></bookViews>",
+			"<sheets>"
+		];
 		for (const s of this.sheets) {
-			const attrs = {
-				name: s.name,
-				sheetId: String(s.sheetId),
-				"r:id": s.rId
-			};
-			if (s.state && s.state !== "visible") attrs.state = s.state;
-			sheetElements.push({ sheet: { _attr: attrs } });
+			const stateAttr = s.state && s.state !== "visible" ? ` state="${s.state}"` : "";
+			p.push(`<sheet name="${escapeXml(s.name)}" sheetId="${s.sheetId}" r:id="${s.rId}"${stateAttr}/>`);
 		}
-		return { workbook: [{ _attr: {
-			xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-			"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-		} }, { sheets: sheetElements }] };
+		p.push("</sheets><calcPr calcId=\"191029\"/></workbook>");
+		return p.join("");
 	}
 };
 //#endregion
@@ -585,6 +457,12 @@ var WorkbookXml = class extends BaseXmlComponent {
 *
 * @module
 */
+/** Cell formula type (maps to ST_CellFormulaType). */
+const FormulaType = {
+	NORMAL: "normal",
+	ARRAY: "array",
+	SHARED: "shared"
+};
 var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 	rows;
 	columns;
@@ -613,116 +491,6 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 	get charts() {
 		return this.chartOptions;
 	}
-	prepForXml(context) {
-		const fileData = context.fileData;
-		const sharedStrings = fileData?.sharedStrings;
-		const styles = fileData?.styles;
-		const children = [{ _attr: {
-			xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-			"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-		} }];
-		if (this.freezePanes) {
-			const fp = this.freezePanes;
-			const ySplit = fp.row ? fp.row : 0;
-			const xSplit = fp.col ? fp.col : 0;
-			const topRow = fp.row ? fp.row + 1 : 1;
-			const leftCol = fp.col ? fp.col + 1 : 1;
-			const attr = {
-				ySplit,
-				xSplit,
-				topLeftCell: this.defaultCellRef(topRow, leftCol),
-				activePane: ySplit > 0 && xSplit > 0 ? "bottomRight" : ySplit > 0 ? "bottomLeft" : "topRight",
-				state: "frozen"
-			};
-			children.push({ sheetViews: [{ sheetView: [{ _attr: {
-				tabSelected: 1,
-				workbookViewId: 0
-			} }, { pane: { _attr: attr } }] }] });
-		}
-		if (this.columns.length > 0) {
-			const colElements = [];
-			for (const col of this.columns) {
-				const colAttrs = {
-					min: col.min,
-					max: col.max
-				};
-				if (col.width !== void 0) {
-					colAttrs.width = col.width;
-					colAttrs.customWidth = 1;
-				}
-				if (col.hidden) colAttrs.hidden = 1;
-				colElements.push({ col: { _attr: colAttrs } });
-			}
-			children.push({ cols: colElements });
-		}
-		const sheetDataChildren = [];
-		for (let i = 0; i < this.rows.length; i++) {
-			const rowOpts = this.rows[i];
-			const rowNumber = rowOpts.rowNumber ?? i + 1;
-			const rowAttrs = { r: rowNumber };
-			if (rowOpts.height !== void 0) {
-				rowAttrs.ht = rowOpts.height;
-				rowAttrs.customHeight = 1;
-			}
-			if (rowOpts.hidden) rowAttrs.hidden = 1;
-			const cellElements = [];
-			if (rowOpts.cells) for (let j = 0; j < rowOpts.cells.length; j++) {
-				const cell = rowOpts.cells[j];
-				const ref = cell.reference ?? this.defaultCellRef(rowNumber, j + 1);
-				const cellObj = this.buildCell(ref, cell, sharedStrings, styles);
-				if (cellObj) cellElements.push(cellObj);
-			}
-			sheetDataChildren.push({ row: [{ _attr: rowAttrs }, ...cellElements] });
-		}
-		children.push({ sheetData: sheetDataChildren });
-		if (this.autoFilter) children.push({ autoFilter: { _attr: { ref: this.autoFilter } } });
-		if (this.mergeCells.length > 0) {
-			const mergeElements = [{ _attr: { count: this.mergeCells.length } }];
-			for (const mc of this.mergeCells) {
-				const fromRef = this.defaultCellRef(mc.from.row, mc.from.col);
-				const toRef = this.defaultCellRef(mc.to.row, mc.to.col);
-				mergeElements.push({ mergeCell: { _attr: { ref: `${fromRef}:${toRef}` } } });
-			}
-			children.push({ mergeCells: mergeElements });
-		}
-		if (this.conditionalFormats.length > 0) for (const cf of this.conditionalFormats) {
-			const rules = [];
-			for (let ri = 0; ri < cf.rules.length; ri++) {
-				const rule = cf.rules[ri];
-				const ruleAttrs = {
-					type: rule.type,
-					priority: rule.priority ?? ri + 1
-				};
-				if (rule.operator) ruleAttrs.operator = rule.operator;
-				if (rule.dxfId !== void 0) ruleAttrs.dxfId = rule.dxfId;
-				const ruleChildren = [{ _attr: ruleAttrs }];
-				if (rule.formulas) for (const f of rule.formulas) ruleChildren.push({ formula: [f] });
-				rules.push({ cfRule: ruleChildren });
-			}
-			children.push({ conditionalFormatting: [{ _attr: { sqref: cf.sqref } }, ...rules] });
-		}
-		if (this.dataValidations.length > 0) {
-			const dvElements = [{ _attr: { count: this.dataValidations.length } }];
-			for (const dv of this.dataValidations) {
-				const dvAttrs = { sqref: dv.sqref };
-				if (dv.type && dv.type !== "none") dvAttrs.type = dv.type;
-				if (dv.operator) dvAttrs.operator = dv.operator;
-				if (dv.allowBlank) dvAttrs.allowBlank = 1;
-				if (dv.showErrorMessage) dvAttrs.showErrorMessage = 1;
-				if (dv.showInputMessage) dvAttrs.showInputMessage = 1;
-				if (dv.errorTitle) dvAttrs.errorTitle = dv.errorTitle;
-				if (dv.error) dvAttrs.error = dv.error;
-				if (dv.promptTitle) dvAttrs.promptTitle = dv.promptTitle;
-				if (dv.prompt) dvAttrs.prompt = dv.prompt;
-				const dvChildren = [{ _attr: dvAttrs }];
-				if (dv.formula1 !== void 0) dvChildren.push({ formula1: [dv.formula1] });
-				if (dv.formula2 !== void 0) dvChildren.push({ formula2: [dv.formula2] });
-				dvElements.push({ dataValidation: dvChildren });
-			}
-			children.push({ dataValidations: dvElements });
-		}
-		return { worksheet: children };
-	}
 	/**
 	* Zero-allocation fast path: directly concatenate XML string.
 	* Bypasses the IXmlableObject intermediate tree entirely.
@@ -732,6 +500,13 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 		const sharedStrings = fileData?.sharedStrings;
 		const styles = fileData?.styles;
 		const p = ["<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"];
+		const maxRow = this.rows.length;
+		let maxCol = 0;
+		for (const row of this.rows) if (row.cells && row.cells.length > maxCol) maxCol = row.cells.length;
+		if (maxRow > 0 && maxCol > 0) {
+			const dimRef = `A1:${this.defaultCellRef(maxRow, maxCol)}`;
+			p.push(`<dimension ref="${dimRef}"/>`);
+		}
 		if (this.freezePanes) {
 			const fp = this.freezePanes;
 			const ySplit = fp.row ? fp.row : 0;
@@ -741,7 +516,8 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 			const topLeftCell = this.defaultCellRef(topRow, leftCol);
 			const activePane = ySplit > 0 && xSplit > 0 ? "bottomRight" : ySplit > 0 ? "bottomLeft" : "topRight";
 			p.push("<sheetViews><sheetView tabSelected=\"1\" workbookViewId=\"0\">", `<pane ySplit="${ySplit}" xSplit="${xSplit}" topLeftCell="${topLeftCell}" activePane="${activePane}" state="frozen"/>`, "</sheetView></sheetViews>");
-		}
+		} else p.push("<sheetViews><sheetView tabSelected=\"1\" workbookViewId=\"0\"/></sheetViews>");
+		p.push("<sheetFormatPr defaultRowHeight=\"15\"/>");
 		if (this.columns.length > 0) {
 			p.push("<cols>");
 			for (const col of this.columns) {
@@ -777,7 +553,7 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 					if (cellStr) rowParts.push(cellStr);
 				}
 				p.push(`<row${attrs(rowAttrs)}>`, ...rowParts, "</row>");
-			} else p.push(`<row${attrs(rowAttrs)}></row>`);
+			} else p.push(`<row${attrs(rowAttrs)}/>`);
 		}
 		p.push("</sheetData>");
 		if (this.autoFilter) p.push(selfCloseElement("autoFilter", attrs({ ref: this.autoFilter })));
@@ -828,10 +604,23 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 			}
 			p.push("</dataValidations>");
 		}
+		p.push("<pageMargins left=\"0.75\" right=\"0.75\" top=\"1\" bottom=\"1\" header=\"0.5\" footer=\"0.5\"/>");
 		p.push("</worksheet>");
 		return p.join("");
 	}
 	/**
+	* Build the <f> element string for a cell formula.
+	*/
+	buildFormulaString(fOpts) {
+		const fAttrs = {};
+		if (fOpts.type && fOpts.type !== FormulaType.NORMAL) fAttrs.t = fOpts.type;
+		if (fOpts.reference) fAttrs.ref = fOpts.reference;
+		if (fOpts.sharedIndex !== void 0) fAttrs.si = fOpts.sharedIndex;
+		if (fOpts.formula !== void 0 && fOpts.formula !== "") return `<f${attrs(fAttrs)}>${escapeXml(fOpts.formula)}</f>`;
+		if (Object.keys(fAttrs).length > 0) return selfCloseElement("f", attrs(fAttrs));
+		return "";
+	}
+	/**
 	* Direct string serialization of a single cell — zero intermediate objects.
 	*/
 	buildCellString(ref, cell, sharedStrings, styles) {
@@ -839,6 +628,21 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 		if (cell.style !== void 0 && styles) cellAttrs.s = styles.register(cell.style);
 		else if (cell.styleIndex !== void 0) cellAttrs.s = cell.styleIndex;
 		const value = cell.value;
+		if (cell.formula) {
+			const fStr = this.buildFormulaString(cell.formula);
+			let vStr = "";
+			if (value === null || value === void 0) return `<c${attrs(cellAttrs)}>${fStr}</c>`;
+			if (typeof value === "number") vStr = `<v>${value}</v>`;
+			else if (typeof value === "boolean") {
+				cellAttrs.t = "b";
+				vStr = `<v>${value ? 1 : 0}</v>`;
+			} else if (typeof value === "string") {
+				cellAttrs.t = "str";
+				vStr = `<v>${escapeXml(value)}</v>`;
+			} else if (value instanceof Date) vStr = `<v>${this.dateToSerialNumber(value)}</v>`;
+			if (vStr) return `<c${attrs(cellAttrs)}>${fStr}${vStr}</c>`;
+			return `<c${attrs(cellAttrs)}>${fStr}</c>`;
+		}
 		if (value === null || value === void 0) {
 			if (cell.styleIndex !== void 0) return selfCloseElement("c", attrs(cellAttrs));
 			return "";
@@ -876,34 +680,6 @@ var Worksheet = class extends IgnoreIfEmptyXmlComponent {
 		}
 		return result;
 	}
-	buildCell(ref, cell, sharedStrings, styles) {
-		const attrs = { r: ref };
-		if (cell.style !== void 0 && styles) attrs.s = styles.register(cell.style);
-		else if (cell.styleIndex !== void 0) attrs.s = cell.styleIndex;
-		const value = cell.value;
-		if (value === null || value === void 0) {
-			if (cell.styleIndex !== void 0) return { c: [{ _attr: attrs }] };
-			return;
-		}
-		if (typeof value === "string") {
-			if (sharedStrings) {
-				attrs.t = "s";
-				const idx = sharedStrings.register(value);
-				return { c: [{ _attr: attrs }, { v: [idx] }] };
-			}
-			attrs.t = "inlineStr";
-			return { c: [{ _attr: attrs }, { is: [{ t: [value] }] }] };
-		}
-		if (typeof value === "number") return { c: [{ _attr: attrs }, { v: [value] }] };
-		if (typeof value === "boolean") {
-			attrs.t = "b";
-			return { c: [{ _attr: attrs }, { v: [value ? 1 : 0] }] };
-		}
-		if (value instanceof Date) {
-			const serial = this.dateToSerialNumber(value);
-			return { c: [{ _attr: attrs }, { v: [serial] }] };
-		}
-	}
 	dateToSerialNumber(date) {
 		const epoch = new Date(1899, 11, 30);
 		return (date.getTime() - epoch.getTime()) / 864e5;
@@ -1024,80 +800,19 @@ var Drawing = class extends BaseXmlComponent {
 		this.images = images;
 		this.charts = charts;
 	}
-	prepForXml(_context) {
-		const children = [{ _attr: {
-			xmlns: XDR_NS,
-			"xmlns:a": A_NS,
-			"xmlns:r": R_NS
-		} }];
-		let nextId = 1;
-		for (const img of this.images) children.push(this.buildImageAnchor(img, nextId++));
-		for (const chart of this.charts) children.push(this.buildChartAnchor(chart, nextId++));
-		return { wsDr: children };
-	}
-	buildFromAnchor(col, row, colOffset, rowOffset) {
-		return { from: [
-			{ col: [col - 1] },
-			{ colOff: [colOffset ?? 0] },
-			{ row: [row - 1] },
-			{ rowOff: [rowOffset ?? 0] }
-		] };
-	}
-	buildToAnchor(col, row) {
-		return { to: [
-			{ col: [col] },
-			{ colOff: [0] },
-			{ row: [row] },
-			{ rowOff: [0] }
-		] };
-	}
-	buildImageAnchor(img, id) {
-		return { twoCellAnchor: [
-			{ _attr: { editAs: "oneCell" } },
-			this.buildFromAnchor(img.col, img.row, img.colOffset, img.rowOffset),
-			this.buildToAnchor(img.col, img.row),
-			{ pic: [
-				{ nvPicPr: [{ cNvPr: { _attr: {
-					id,
-					name: `Picture ${id}`
-				} } }, { cNvPicPr: [{ _attr: { preferRelativeResize: 1 } }] }] },
-				{ blipFill: [{ "a:blip": { _attr: { "r:embed": img.rId } } }, { "a:stretch": [{ "a:fillRect": [] }] }] },
-				{ spPr: [{ "a:xfrm": [{ "a:off": { _attr: {
-					x: 0,
-					y: 0
-				} } }, { "a:ext": { _attr: {
-					cx: 4e5,
-					cy: 3e5
-				} } }] }, { "a:prstGeom": [{ _attr: { prst: "rect" } }, { "a:avLst": [] }] }] }
-			] },
-			{ clientData: [] }
-		] };
-	}
-	buildChartAnchor(chart, id) {
-		return { twoCellAnchor: [
-			{ _attr: { editAs: "oneCell" } },
-			this.buildFromAnchor(chart.col, chart.row, chart.colOffset, chart.rowOffset),
-			this.buildToAnchor(chart.col + 8, chart.row + 15),
-			{ graphicFrame: [
-				{ nvGraphicFramePr: [{ cNvPr: { _attr: {
-					id,
-					name: `Chart ${id}`
-				} } }, { cNvGraphicFramePr: [{ "a:graphicFrameLocks": { _attr: { noGrp: 1 } } }] }] },
-				{ xfrm: [{ "a:off": { _attr: {
-					x: 0,
-					y: 0
-				} } }, { "a:ext": { _attr: {
-					cx: 0,
-					cy: 0
-				} } }] },
-				{ "a:graphic": [{ "a:graphicData": [{ _attr: { uri: C_URI } }, { "c:chart": { _attr: {
-					"xmlns:c": "http://schemas.openxmlformats.org/drawingml/2006/chart",
-					"xmlns:r": R_NS,
-					"r:id": chart.rId
-				} } }] }] }
-			] },
-			{ clientData: [] }
-		] };
+	toXml(_context) {
+		const p = [`<wsDr xmlns="${XDR_NS}" xmlns:a="${A_NS}" xmlns:r="${R_NS}">`];
+		let id = 1;
+		for (const img of this.images) {
+			p.push(`<twoCellAnchor editAs="oneCell"><from><col>${img.col - 1}</col><colOff>${img.colOffset ?? 0}</colOff><row>${img.row - 1}</row><rowOff>${img.rowOffset ?? 0}</rowOff></from>`, `<to><col>${img.col}</col><colOff>0</colOff><row>${img.row}</row><rowOff>0</rowOff></to>`, `<pic><nvPicPr><cNvPr id="${id}" name="Picture ${id}"/><cNvPicPr preferRelativeResize="1"/></nvPicPr>`, `<blipFill><a:blip r:embed="${img.rId}"/><a:stretch><a:fillRect/></a:stretch></blipFill>`, `<spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="400000" cy="300000"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></spPr></pic>`, `<clientData/></twoCellAnchor>`);
+			id++;
+		}
+		for (const chart of this.charts) {
+			p.push(`<twoCellAnchor editAs="oneCell"><from><col>${chart.col - 1}</col><colOff>${chart.colOffset ?? 0}</colOff><row>${chart.row - 1}</row><rowOff>${chart.rowOffset ?? 0}</rowOff></from>`, `<to><col>${chart.col + 8}</col><colOff>0</colOff><row>${chart.row + 15}</row><rowOff>0</rowOff></to>`, `<graphicFrame><nvGraphicFramePr><cNvPr id="${id}" name="Chart ${id}"/><cNvGraphicFramePr><a:graphicFrameLocks noGrp="1"/></cNvGraphicFramePr></nvGraphicFramePr>`, `<xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xfrm>`, `<a:graphic><a:graphicData uri="${C_URI}"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="${R_NS}" r:id="${chart.rId}"/></a:graphicData></a:graphic></graphicFrame>`, `<clientData/></twoCellAnchor>`);
+			id++;
+		}
+		p.push("</wsDr>");
+		return p.join("");
 	}
 };
 //#endregion
@@ -1116,13 +831,13 @@ var Compiler = class {
 		};
 		const f = this.formatter;
 		const mapping = {};
-		const fmt = (component, declaration) => f.formatToXml(component, context, declaration);
+		const fmt = (component) => f.formatToXml(component, context);
 		mapping["Properties"] = {
-			data: fmt(file.coreProperties, true),
+			data: fmt(file.coreProperties),
 			path: "docProps/core.xml"
 		};
 		mapping["AppProperties"] = {
-			data: fmt(file.appProperties, true),
+			data: fmt(file.appProperties),
 			path: "docProps/app.xml"
 		};
 		mapping["FileRelationships"] = {
@@ -1130,7 +845,7 @@ var Compiler = class {
 			path: "_rels/.rels"
 		};
 		mapping["Workbook"] = {
-			data: fmt(file.workbookXml, true),
+			data: fmt(file.workbookXml),
 			path: "xl/workbook.xml"
 		};
 		mapping["WorkbookRelationships"] = {
@@ -1144,7 +859,7 @@ var Compiler = class {
 			const ws = worksheets[i];
 			const imgOpts = ws.imageOptions;
 			const chartOpts = ws.charts;
-			let sheetXml = fmt(ws, true);
+			let sheetXml = fmt(ws);
 			if (imgOpts.length > 0 || chartOpts.length > 0) {
 				const drawingImages = [];
 				const drawingCharts = [];
@@ -1187,7 +902,7 @@ var Compiler = class {
 				const drawing = new Drawing(drawingImages, drawingCharts);
 				const drawingIdx = i + 1;
 				mapping[`Drawing${i}`] = {
-					data: fmt(drawing, true),
+					data: fmt(drawing),
 					path: `xl/drawings/drawing${drawingIdx}.xml`
 				};
 				mapping[`DrawingRels${i}`] = {
@@ -1210,33 +925,43 @@ var Compiler = class {
 		}
 		const sharedStrings = file.sharedStrings;
 		if (sharedStrings.count > 0) mapping["SharedStrings"] = {
-			data: fmt(sharedStrings, true),
+			data: fmt(sharedStrings),
 			path: "xl/sharedStrings.xml"
 		};
 		mapping["Styles"] = {
-			data: fmt(file.styles, true),
+			data: fmt(file.styles),
 			path: "xl/styles.xml"
 		};
 		mapping["Theme"] = {
-			data: fmt(file.theme, true),
+			data: fmt(file.theme),
 			path: "xl/theme/theme1.xml"
 		};
 		for (let i = 0; i < file.charts.array.length; i++) {
 			const chartData = file.charts.array[i];
 			mapping[`Chart${i}`] = {
-				data: fmt(chartData.chartSpace, true),
+				data: fmt(chartData.chartSpace),
 				path: `xl/charts/chart${i + 1}.xml`
 			};
 			file.contentTypes.addChart(i + 1);
 		}
+		const imageExts = /* @__PURE__ */ new Set();
+		for (const img of file.media.array) {
+			const ext = img.fileName.endsWith(".png") ? "png" : "jpeg";
+			if (!imageExts.has(ext)) {
+				imageExts.add(ext);
+				file.contentTypes.addImageType(ext);
+			}
+		}
 		mapping["ContentTypes"] = {
 			data: fmt(file.contentTypes),
 			path: "[Content_Types].xml"
 		};
-		return compileMapping(mapping, overrides, file.media.array.map((img) => ({
+		const mediaFiles = [];
+		for (const img of file.media.array) mediaFiles.push({
 			data: img.data,
 			path: `xl/media/${img.fileName}`
-		})));
+		});
+		return compileMapping(mapping, overrides, mediaFiles);
 	}
 };
 //#endregion
@@ -1625,4 +1350,4 @@ function findLocalChild(parent, name) {
 //#endregion
 export { File, File as Workbook, Packer, PatchType, SharedStrings, Styles, columnToLetter, dateToSerialNumber, letterToColumn, parseWorkbook, parseXlsx, patchWorkbook };
 
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.mjs.map