ooxml.js 2.5.1 → 2.6.0

package/dist/typed/shared/drawingml.js

@@ -163,18 +163,123 @@ function readGroupXfrm(xfrm) {
 		childOffXPt: emuToPt(Number(cx)),
 		childOffYPt: emuToPt(Number(cy)),
 		childExtWidthPt: emuToPt(Number(ccx)),
-		childExtHeightPt: emuToPt(Number(ccy))
+		childExtHeightPt: emuToPt(Number(ccy)),
+		rotationDeg: base.rotationDeg,
+		flipH: base.flipH,
+		flipV: base.flipV
+	};
+}
+function normalizeDeg(deg) {
+	const mod = deg % 360;
+	return mod < 0 ? mod + 360 : mod;
+}
+function canonicalizeGroupRotation(rotationDeg, flipH, flipV) {
+	if (flipH && flipV) return {
+		angleDeg: rotationDeg + 180,
+		mirrored: false
+	};
+	if (flipV) return {
+		angleDeg: rotationDeg + 180,
+		mirrored: true
+	};
+	if (flipH) return {
+		angleDeg: rotationDeg,
+		mirrored: true
+	};
+	return {
+		angleDeg: rotationDeg,
+		mirrored: false
+	};
+}
+function composeRotation(outer, inner) {
+	if (!outer.mirrored) return {
+		angleDeg: normalizeDeg(outer.angleDeg + inner.angleDeg),
+		mirrored: inner.mirrored
+	};
+	return {
+		angleDeg: normalizeDeg(outer.angleDeg - inner.angleDeg),
+		mirrored: !inner.mirrored
+	};
+}
+function composeGroupTransform(own, parent) {
+	if (own === void 0) return;
+	const ownRotation = canonicalizeGroupRotation(own.rotationDeg, own.flipH, own.flipV);
+	if (parent === void 0) return {
+		offXPt: own.offXPt,
+		offYPt: own.offYPt,
+		extWidthPt: own.extWidthPt,
+		extHeightPt: own.extHeightPt,
+		childOffXPt: own.childOffXPt,
+		childOffYPt: own.childOffYPt,
+		childExtWidthPt: own.childExtWidthPt,
+		childExtHeightPt: own.childExtHeightPt,
+		compositeRotationDeg: normalizeDeg(ownRotation.angleDeg),
+		compositeMirrored: ownRotation.mirrored
+	};
+	const mapped = applyGroupTransform(parent, {
+		xPt: own.offXPt,
+		yPt: own.offYPt,
+		widthPt: own.extWidthPt,
+		heightPt: own.extHeightPt
+	});
+	const composite = composeRotation({
+		angleDeg: parent.compositeRotationDeg,
+		mirrored: parent.compositeMirrored
+	}, ownRotation);
+	return {
+		offXPt: mapped.xPt,
+		offYPt: mapped.yPt,
+		extWidthPt: mapped.widthPt,
+		extHeightPt: mapped.heightPt,
+		childOffXPt: own.childOffXPt,
+		childOffYPt: own.childOffYPt,
+		childExtWidthPt: own.childExtWidthPt,
+		childExtHeightPt: own.childExtHeightPt,
+		compositeRotationDeg: composite.angleDeg,
+		compositeMirrored: composite.mirrored
 	};
 }
 function applyGroupTransform(group, childFrame) {
 	const scaleX = group.childExtWidthPt === 0 ? 1 : group.extWidthPt / group.childExtWidthPt;
 	const scaleY = group.childExtHeightPt === 0 ? 1 : group.extHeightPt / group.childExtHeightPt;
+	const widthPt = childFrame.widthPt * scaleX;
+	const heightPt = childFrame.heightPt * scaleY;
+	const canonicalX = group.offXPt + (childFrame.xPt - group.childOffXPt) * scaleX;
+	const canonicalY = group.offYPt + (childFrame.yPt - group.childOffYPt) * scaleY;
+	if (group.compositeRotationDeg === 0 && !group.compositeMirrored) return {
+		xPt: canonicalX,
+		yPt: canonicalY,
+		widthPt,
+		heightPt
+	};
+	const groupCenterX = group.offXPt + group.extWidthPt / 2;
+	const groupCenterY = group.offYPt + group.extHeightPt / 2;
+	const boxCenterX = canonicalX + widthPt / 2;
+	const boxCenterY = canonicalY + heightPt / 2;
+	let dx = boxCenterX - groupCenterX;
+	const dy = boxCenterY - groupCenterY;
+	if (group.compositeMirrored) dx = -dx;
+	const rad = group.compositeRotationDeg * Math.PI / 180;
+	const cos = Math.cos(rad);
+	const sin = Math.sin(rad);
+	const rotatedX = dx * cos - dy * sin;
+	const rotatedY = dx * sin + dy * cos;
 	return {
-		xPt: group.offXPt + (childFrame.xPt - group.childOffXPt) * scaleX,
-		yPt: group.offYPt + (childFrame.yPt - group.childOffYPt) * scaleY,
-		widthPt: childFrame.widthPt * scaleX,
-		heightPt: childFrame.heightPt * scaleY
+		xPt: groupCenterX + rotatedX - widthPt / 2,
+		yPt: groupCenterY + rotatedY - heightPt / 2,
+		widthPt,
+		heightPt
 	};
 }
+function composeShapeRotationDeg(parentTransform, ownRotationDeg) {
+	if (parentTransform === void 0) return normalizeDeg(ownRotationDeg);
+	return composeRotation({
+		angleDeg: parentTransform.compositeRotationDeg,
+		mirrored: parentTransform.compositeMirrored
+	}, {
+		angleDeg: ownRotationDeg,
+		mirrored: false
+	}).angleDeg;
+}
 //#endregion
-export { EMPTY_THEME, applyGroupTransform, readColorMap, readGroupXfrm, readSchemeColor, readSolidFillColor, readSrgbColor, readTheme, readXfrm, resolveSchemeColorSlot, resolveThemeFontReference };
+export { EMPTY_THEME, applyGroupTransform, composeGroupTransform, composeShapeRotationDeg, readColorMap, readGroupXfrm, readSchemeColor, readSolidFillColor, readSrgbColor, readTheme, readXfrm, resolveSchemeColorSlot, resolveThemeFontReference };

package/dist/typed/shared/units.cjs

@@ -6,6 +6,7 @@ const TWIPS_PER_INCH = 1440;
 const EMU_PER_POINT = EMU_PER_INCH / 72;
 const TWIPS_PER_POINT = TWIPS_PER_INCH / 72;
 const HALF_POINTS_PER_POINT = 2;
+const EIGHTH_POINTS_PER_POINT = 8;
 const DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT = 100;
 const LINE_UNITS_PER_LINE = 240;
 function emuToPt(emu) {
@@ -26,6 +27,12 @@ function halfPointsToPt(halfPoints) {
 function ptToHalfPoints(pt) {
 	return Math.round(pt * 2);
 }
+function eighthPointsToPt(eighthPoints) {
+	return eighthPoints / 8;
+}
+function ptToEighthPoints(pt) {
+	return Math.round(pt * 8);
+}
 function drawingMlFontSizeToPt(hundredths) {
 	return hundredths / 100;
 }
@@ -37,6 +44,7 @@ function lineUnitsToMultiplier(lineUnits) {
 }
 //#endregion
 exports.DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT = DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT;
+exports.EIGHTH_POINTS_PER_POINT = EIGHTH_POINTS_PER_POINT;
 exports.EMU_PER_INCH = EMU_PER_INCH;
 exports.EMU_PER_POINT = EMU_PER_POINT;
 exports.HALF_POINTS_PER_POINT = HALF_POINTS_PER_POINT;
@@ -45,10 +53,12 @@ exports.POINTS_PER_INCH = POINTS_PER_INCH;
 exports.TWIPS_PER_INCH = TWIPS_PER_INCH;
 exports.TWIPS_PER_POINT = TWIPS_PER_POINT;
 exports.drawingMlFontSizeToPt = drawingMlFontSizeToPt;
+exports.eighthPointsToPt = eighthPointsToPt;
 exports.emuToPt = emuToPt;
 exports.halfPointsToPt = halfPointsToPt;
 exports.lineUnitsToMultiplier = lineUnitsToMultiplier;
 exports.ptToDrawingMlFontSize = ptToDrawingMlFontSize;
+exports.ptToEighthPoints = ptToEighthPoints;
 exports.ptToEmu = ptToEmu;
 exports.ptToHalfPoints = ptToHalfPoints;
 exports.ptToTwips = ptToTwips;

package/dist/typed/shared/units.d.cts

@@ -5,6 +5,7 @@ declare const TWIPS_PER_INCH = 1440;
 declare const EMU_PER_POINT: number;
 declare const TWIPS_PER_POINT: number;
 declare const HALF_POINTS_PER_POINT = 2;
+declare const EIGHTH_POINTS_PER_POINT = 8;
 declare const DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT = 100;
 declare const LINE_UNITS_PER_LINE = 240;
 declare function emuToPt(emu: number): number;
@@ -13,8 +14,10 @@ declare function twipsToPt(twips: number): number;
 declare function ptToTwips(pt: number): number;
 declare function halfPointsToPt(halfPoints: number): number;
 declare function ptToHalfPoints(pt: number): number;
+declare function eighthPointsToPt(eighthPoints: number): number;
+declare function ptToEighthPoints(pt: number): number;
 declare function drawingMlFontSizeToPt(hundredths: number): number;
 declare function ptToDrawingMlFontSize(pt: number): number;
 declare function lineUnitsToMultiplier(lineUnits: number): number;
 //#endregion
-export { DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT, EMU_PER_INCH, EMU_PER_POINT, HALF_POINTS_PER_POINT, LINE_UNITS_PER_LINE, POINTS_PER_INCH, TWIPS_PER_INCH, TWIPS_PER_POINT, drawingMlFontSizeToPt, emuToPt, halfPointsToPt, lineUnitsToMultiplier, ptToDrawingMlFontSize, ptToEmu, ptToHalfPoints, ptToTwips, twipsToPt };
+export { DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT, EIGHTH_POINTS_PER_POINT, EMU_PER_INCH, EMU_PER_POINT, HALF_POINTS_PER_POINT, LINE_UNITS_PER_LINE, POINTS_PER_INCH, TWIPS_PER_INCH, TWIPS_PER_POINT, drawingMlFontSizeToPt, eighthPointsToPt, emuToPt, halfPointsToPt, lineUnitsToMultiplier, ptToDrawingMlFontSize, ptToEighthPoints, ptToEmu, ptToHalfPoints, ptToTwips, twipsToPt };

package/dist/typed/shared/units.d.ts

@@ -5,6 +5,7 @@ declare const TWIPS_PER_INCH = 1440;
 declare const EMU_PER_POINT: number;
 declare const TWIPS_PER_POINT: number;
 declare const HALF_POINTS_PER_POINT = 2;
+declare const EIGHTH_POINTS_PER_POINT = 8;
 declare const DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT = 100;
 declare const LINE_UNITS_PER_LINE = 240;
 declare function emuToPt(emu: number): number;
@@ -13,8 +14,10 @@ declare function twipsToPt(twips: number): number;
 declare function ptToTwips(pt: number): number;
 declare function halfPointsToPt(halfPoints: number): number;
 declare function ptToHalfPoints(pt: number): number;
+declare function eighthPointsToPt(eighthPoints: number): number;
+declare function ptToEighthPoints(pt: number): number;
 declare function drawingMlFontSizeToPt(hundredths: number): number;
 declare function ptToDrawingMlFontSize(pt: number): number;
 declare function lineUnitsToMultiplier(lineUnits: number): number;
 //#endregion
-export { DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT, EMU_PER_INCH, EMU_PER_POINT, HALF_POINTS_PER_POINT, LINE_UNITS_PER_LINE, POINTS_PER_INCH, TWIPS_PER_INCH, TWIPS_PER_POINT, drawingMlFontSizeToPt, emuToPt, halfPointsToPt, lineUnitsToMultiplier, ptToDrawingMlFontSize, ptToEmu, ptToHalfPoints, ptToTwips, twipsToPt };
+export { DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT, EIGHTH_POINTS_PER_POINT, EMU_PER_INCH, EMU_PER_POINT, HALF_POINTS_PER_POINT, LINE_UNITS_PER_LINE, POINTS_PER_INCH, TWIPS_PER_INCH, TWIPS_PER_POINT, drawingMlFontSizeToPt, eighthPointsToPt, emuToPt, halfPointsToPt, lineUnitsToMultiplier, ptToDrawingMlFontSize, ptToEighthPoints, ptToEmu, ptToHalfPoints, ptToTwips, twipsToPt };

package/dist/typed/shared/units.js

@@ -5,6 +5,7 @@ const TWIPS_PER_INCH = 1440;
 const EMU_PER_POINT = EMU_PER_INCH / 72;
 const TWIPS_PER_POINT = TWIPS_PER_INCH / 72;
 const HALF_POINTS_PER_POINT = 2;
+const EIGHTH_POINTS_PER_POINT = 8;
 const DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT = 100;
 const LINE_UNITS_PER_LINE = 240;
 function emuToPt(emu) {
@@ -25,6 +26,12 @@ function halfPointsToPt(halfPoints) {
 function ptToHalfPoints(pt) {
 	return Math.round(pt * 2);
 }
+function eighthPointsToPt(eighthPoints) {
+	return eighthPoints / 8;
+}
+function ptToEighthPoints(pt) {
+	return Math.round(pt * 8);
+}
 function drawingMlFontSizeToPt(hundredths) {
 	return hundredths / 100;
 }
@@ -35,4 +42,4 @@ function lineUnitsToMultiplier(lineUnits) {
 	return lineUnits / 240;
 }
 //#endregion
-export { DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT, EMU_PER_INCH, EMU_PER_POINT, HALF_POINTS_PER_POINT, LINE_UNITS_PER_LINE, POINTS_PER_INCH, TWIPS_PER_INCH, TWIPS_PER_POINT, drawingMlFontSizeToPt, emuToPt, halfPointsToPt, lineUnitsToMultiplier, ptToDrawingMlFontSize, ptToEmu, ptToHalfPoints, ptToTwips, twipsToPt };
+export { DRAWINGML_FONT_SIZE_HUNDREDTHS_PER_POINT, EIGHTH_POINTS_PER_POINT, EMU_PER_INCH, EMU_PER_POINT, HALF_POINTS_PER_POINT, LINE_UNITS_PER_LINE, POINTS_PER_INCH, TWIPS_PER_INCH, TWIPS_PER_POINT, drawingMlFontSizeToPt, eighthPointsToPt, emuToPt, halfPointsToPt, lineUnitsToMultiplier, ptToDrawingMlFontSize, ptToEighthPoints, ptToEmu, ptToHalfPoints, ptToTwips, twipsToPt };

package/dist/typed/xlsx/build.cjs

@@ -5,8 +5,11 @@ require("../shared/units.cjs");
 const require_typed_xlsx_shared_strings = require("./shared-strings.cjs");
 const require_typed_xlsx_a1 = require("./a1.cjs");
 const require_typed_xlsx_defined_names = require("./defined-names.cjs");
+const require_typed_xlsx_number_format = require("./number-format.cjs");
 const require_typed_xlsx_util = require("./util.cjs");
 const require_typed_xlsx_print_settings = require("./print-settings.cjs");
+const require_typed_xlsx_serial = require("./serial.cjs");
+const require_typed_xlsx_styles = require("./styles.cjs");
 const require_typed_xlsx_units = require("./units.cjs");
 //#region src/typed/xlsx/build.ts
 const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
@@ -180,36 +183,46 @@ function buildSharedStringsPart(sharedStrings) {
 		uniqueCount: String(entries.length)
 	}, siElements));
 }
-function buildStylesPart() {
-	return xmlPart(require_xml_fragment.el("styleSheet", { xmlns: SML_NS }, [
-		require_xml_fragment.el("fonts", { count: "1" }, [require_xml_fragment.el("font", {}, [require_xml_fragment.el("sz", { val: "11" }), require_xml_fragment.el("name", { val: "Calibri" })])]),
-		require_xml_fragment.el("fills", { count: "2" }, [require_xml_fragment.el("fill", {}, [require_xml_fragment.el("patternFill", { patternType: "none" })]), require_xml_fragment.el("fill", {}, [require_xml_fragment.el("patternFill", { patternType: "gray125" })])]),
-		require_xml_fragment.el("borders", { count: "1" }, [require_xml_fragment.el("border", {}, [
-			require_xml_fragment.el("left"),
-			require_xml_fragment.el("right"),
-			require_xml_fragment.el("top"),
-			require_xml_fragment.el("bottom"),
-			require_xml_fragment.el("diagonal")
-		])]),
-		require_xml_fragment.el("cellStyleXfs", { count: "1" }, [require_xml_fragment.el("xf", {
-			numFmtId: "0",
-			fontId: "0",
-			fillId: "0",
-			borderId: "0"
-		})]),
-		require_xml_fragment.el("cellXfs", { count: "1" }, [require_xml_fragment.el("xf", {
-			numFmtId: "0",
+function buildStylesPart(cellFormats) {
+	const children = [];
+	const declarations = cellFormats.declarations();
+	if (declarations.length > 0) {
+		const numFmtElements = declarations.map((declaration) => require_xml_fragment.el("numFmt", {
+			numFmtId: String(declaration.id),
+			formatCode: require_xml_entities.encodeXmlText(declaration.code)
+		}));
+		children.push(require_xml_fragment.el("numFmts", { count: String(numFmtElements.length) }, numFmtElements));
+	}
+	children.push(require_xml_fragment.el("fonts", { count: "1" }, [require_xml_fragment.el("font", {}, [require_xml_fragment.el("sz", { val: "11" }), require_xml_fragment.el("name", { val: "Calibri" })])]), require_xml_fragment.el("fills", { count: "2" }, [require_xml_fragment.el("fill", {}, [require_xml_fragment.el("patternFill", { patternType: "none" })]), require_xml_fragment.el("fill", {}, [require_xml_fragment.el("patternFill", { patternType: "gray125" })])]), require_xml_fragment.el("borders", { count: "1" }, [require_xml_fragment.el("border", {}, [
+		require_xml_fragment.el("left"),
+		require_xml_fragment.el("right"),
+		require_xml_fragment.el("top"),
+		require_xml_fragment.el("bottom"),
+		require_xml_fragment.el("diagonal")
+	])]), require_xml_fragment.el("cellStyleXfs", { count: "1" }, [require_xml_fragment.el("xf", {
+		numFmtId: "0",
+		fontId: "0",
+		fillId: "0",
+		borderId: "0"
+	})]));
+	const xfElements = cellFormats.cellFormats().map((numFmtId) => {
+		const attrs = {
+			numFmtId: String(numFmtId),
 			fontId: "0",
 			fillId: "0",
 			borderId: "0",
 			xfId: "0"
-		})]),
-		require_xml_fragment.el("cellStyles", { count: "1" }, [require_xml_fragment.el("cellStyle", {
-			name: "Normal",
-			xfId: "0",
-			builtinId: "0"
-		})])
-	]));
+		};
+		if (numFmtId !== 0) attrs.applyNumberFormat = require_typed_xlsx_util.writeXmlBool(true);
+		return require_xml_fragment.el("xf", attrs);
+	});
+	children.push(require_xml_fragment.el("cellXfs", { count: String(xfElements.length) }, xfElements));
+	children.push(require_xml_fragment.el("cellStyles", { count: "1" }, [require_xml_fragment.el("cellStyle", {
+		name: "Normal",
+		xfId: "0",
+		builtinId: "0"
+	})]));
+	return xmlPart(require_xml_fragment.el("styleSheet", { xmlns: SML_NS }, children));
 }
 function buildCorePropertiesPart(metadata) {
 	const children = [];
@@ -260,37 +273,36 @@ function buildColsElement(columns) {
 	return require_xml_fragment.el("cols", {}, columns.map((column) => {
 		const attrs = {
 			min: String(column.index + 1),
-			max: String(column.index + 1),
-			width: require_typed_xlsx_units.ptToColumnWidthChars(column.widthPt).toFixed(2),
-			customWidth: "true"
+			max: String(column.index + 1)
 		};
+		if (column.widthPt !== void 0) {
+			attrs.width = require_typed_xlsx_units.ptToColumnWidthChars(column.widthPt).toFixed(2);
+			attrs.customWidth = "true";
+		}
 		if (column.hidden === true) attrs.hidden = "true";
 		return require_xml_fragment.el("col", attrs);
 	}));
 }
 function renderCellValue(value, isFormulaResult, sharedStrings) {
 	switch (value.kind) {
-		case "string":
-			if (isFormulaResult) return {
-				type: "str",
-				content: require_xml_entities.encodeXmlText(value.value)
-			};
-			return {
-				type: "s",
-				content: String(sharedStrings.intern(value.value))
-			};
-		case "number":
-		case "percentage":
-		case "currency": return { content: String(value.value) };
+		case "string": return renderString(value.value, isFormulaResult, sharedStrings);
+		case "number": return { content: String(value.value) };
+		case "percentage": return {
+			content: String(value.value),
+			format: require_typed_xlsx_number_format.PERCENTAGE_NUMBER_FORMAT
+		};
+		case "currency": return {
+			content: String(value.value),
+			format: require_typed_xlsx_number_format.currencyNumberFormat(value.currency)
+		};
 		case "boolean": return {
 			type: "b",
-			content: value.value ? "1" : "0"
-		};
-		case "date":
-		case "time": return {
-			type: "d",
-			content: require_xml_entities.encodeXmlText(value.value)
+			content: value.value ? "1" : "0",
+			format: require_typed_xlsx_number_format.BOOLEAN_NUMBER_FORMAT
 		};
+		case "date": return renderTemporal(require_typed_xlsx_serial.isoDateToSerial(value.value), value.value, require_typed_xlsx_number_format.DATE_NUMBER_FORMAT, isFormulaResult, sharedStrings);
+		case "time": return renderTemporal(require_typed_xlsx_serial.isoTimeToSerial(value.value), value.value, require_typed_xlsx_number_format.TIME_NUMBER_FORMAT, isFormulaResult, sharedStrings);
+		case "dateTime": return renderTemporal(require_typed_xlsx_serial.isoDateTimeToSerial(value.value), value.value, require_typed_xlsx_number_format.DATE_TIME_NUMBER_FORMAT, isFormulaResult, sharedStrings);
 		case "error": return {
 			type: "e",
 			content: require_xml_entities.encodeXmlText(value.value)
@@ -298,21 +310,39 @@ function renderCellValue(value, isFormulaResult, sharedStrings) {
 		case "empty": return;
 	}
 }
-function buildCellElement(cell, sharedStrings) {
+function renderString(text, isFormulaResult, sharedStrings) {
+	if (isFormulaResult) return {
+		type: "str",
+		content: require_xml_entities.encodeXmlText(text)
+	};
+	return {
+		type: "s",
+		content: String(sharedStrings.intern(text))
+	};
+}
+function renderTemporal(serial, iso, format, isFormulaResult, sharedStrings) {
+	if (serial === void 0) return renderString(iso, isFormulaResult, sharedStrings);
+	return {
+		content: String(serial),
+		format
+	};
+}
+function buildCellElement(cell, sharedStrings, cellFormats) {
+	const children = [];
+	const rendered = renderCellValue(cell.value, cell.formula !== void 0, sharedStrings);
+	const styleIndex = rendered?.format === void 0 ? 0 : cellFormats.intern(rendered.format);
 	const attrs = {
 		r: require_typed_xlsx_a1.cellReference(cell.row, cell.column),
-		s: "0"
+		s: String(styleIndex)
 	};
-	const children = [];
 	if (cell.formula !== void 0) children.push(require_xml_fragment.el("f", {}, [require_xml_fragment.txt(require_xml_entities.encodeXmlText(cell.formula))]));
-	const rendered = renderCellValue(cell.value, cell.formula !== void 0, sharedStrings);
 	if (rendered !== void 0) {
 		if (rendered.type !== void 0) attrs.t = rendered.type;
 		children.push(require_xml_fragment.el("v", {}, [require_xml_fragment.txt(rendered.content)]));
 	}
 	return require_xml_fragment.el("c", attrs, children);
 }
-function buildSheetDataElement(sheet, sharedStrings) {
+function buildSheetDataElement(sheet, sharedStrings, cellFormats) {
 	const cellsByRow = /* @__PURE__ */ new Map();
 	for (const cell of sheet.cells) {
 		const existing = cellsByRow.get(cell.row);
@@ -326,11 +356,13 @@ function buildSheetDataElement(sheet, sharedStrings) {
 		const rowInfo = rowInfoByIndex.get(rowIndex);
 		const attrs = { r: String(rowIndex + 1) };
 		if (rowInfo !== void 0) {
-			attrs.ht = String(rowInfo.heightPt);
-			attrs.customHeight = "true";
+			if (rowInfo.heightPt !== void 0) {
+				attrs.ht = String(rowInfo.heightPt);
+				attrs.customHeight = "true";
+			}
 			if (rowInfo.hidden === true) attrs.hidden = "true";
 		}
-		return require_xml_fragment.el("row", attrs, cells.map((cell) => buildCellElement(cell, sharedStrings)));
+		return require_xml_fragment.el("row", attrs, cells.map((cell) => buildCellElement(cell, sharedStrings, cellFormats)));
 	}));
 }
 function buildMergeCellsElement(cells) {
@@ -379,7 +411,7 @@ function buildPageSetupElement(settings) {
 		attrs.paperWidth = require_typed_xlsx_util.ptToUniversalMeasure(settings.pageSize.widthPt);
 		attrs.paperHeight = require_typed_xlsx_util.ptToUniversalMeasure(settings.pageSize.heightPt);
 	}
-	attrs.scale = String(settings.scale ?? 100);
+	attrs.scale = String(settings.scalePercent ?? 100);
 	attrs.fitToWidth = String(settings.fitToPages?.width ?? 1);
 	attrs.fitToHeight = String(settings.fitToPages?.height ?? 1);
 	attrs.pageOrder = settings.pageOrder;
@@ -416,11 +448,11 @@ function buildBreaksElements(settings) {
 	}
 	return result;
 }
-function buildWorksheetPart(sheet, sharedStrings) {
+function buildWorksheetPart(sheet, sharedStrings, cellFormats) {
 	const children = [buildSheetPrElement(sheet.printSettings), require_xml_fragment.el("dimension", { ref: computeDimension(sheet) })];
 	const colsElement = buildColsElement(sheet.columns);
 	if (colsElement !== void 0) children.push(colsElement);
-	children.push(buildSheetDataElement(sheet, sharedStrings));
+	children.push(buildSheetDataElement(sheet, sharedStrings, cellFormats));
 	const mergeCellsElement = buildMergeCellsElement(sheet.cells);
 	if (mergeCellsElement !== void 0) children.push(mergeCellsElement);
 	children.push(buildPrintOptionsElement(sheet.printSettings), buildPageMarginsElement(sheet.printSettings), buildPageSetupElement(sheet.printSettings));
@@ -436,13 +468,14 @@ function buildXlsxPackage(document) {
 	if (document.kind !== "spreadsheet") throw new Error(`buildXlsxPackage: expected a ContentDocument of kind "spreadsheet", got "${document.kind}"`);
 	const sheets = document.sheets;
 	const sharedStrings = new require_typed_xlsx_shared_strings.SharedStringTable();
-	const worksheetParts = sheets.map((sheet) => buildWorksheetPart(sheet, sharedStrings));
+	const cellFormats = new require_typed_xlsx_styles.CellFormatTable();
+	const worksheetParts = sheets.map((sheet) => buildWorksheetPart(sheet, sharedStrings, cellFormats));
 	const parts = {
 		"[Content_Types].xml": buildContentTypesPart(sheets.length),
 		"_rels/.rels": buildPackageRelsPart(),
 		"xl/workbook.xml": buildWorkbookPart(sheets),
 		"xl/_rels/workbook.xml.rels": buildWorkbookRelsPart(sheets.length),
-		"xl/styles.xml": buildStylesPart(),
+		"xl/styles.xml": buildStylesPart(cellFormats),
 		"xl/sharedStrings.xml": buildSharedStringsPart(sharedStrings),
 		"docProps/core.xml": buildCorePropertiesPart(document.metadata),
 		"docProps/app.xml": buildAppPropertiesPart(document.metadata)