ooxml.js 2.5.2 → 2.6.0

package/dist/typed/xlsx/build.js

@@ -4,8 +4,11 @@ import "../shared/units.js";
 import { SharedStringTable } from "./shared-strings.js";
 import { cellReference, rangeReference } from "./a1.js";
 import { XLNM_PRINT_AREA, XLNM_PRINT_TITLES, buildPrintAreaValue, buildPrintTitlesValue } from "./defined-names.js";
+import { BOOLEAN_NUMBER_FORMAT, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PERCENTAGE_NUMBER_FORMAT, TIME_NUMBER_FORMAT, currencyNumberFormat } from "./number-format.js";
 import { pageSizeToPaperSizeCode, ptToUniversalMeasure, writeXmlBool } from "./util.js";
 import { DEFAULT_HEADER_FOOTER_MARGIN_PT } from "./print-settings.js";
+import { isoDateTimeToSerial, isoDateToSerial, isoTimeToSerial } from "./serial.js";
+import { CellFormatTable } from "./styles.js";
 import { ptToColumnWidthChars } from "./units.js";
 //#region src/typed/xlsx/build.ts
 const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
@@ -179,36 +182,46 @@ function buildSharedStringsPart(sharedStrings) {
 		uniqueCount: String(entries.length)
 	}, siElements));
 }
-function buildStylesPart() {
-	return xmlPart(el("styleSheet", { xmlns: SML_NS }, [
-		el("fonts", { count: "1" }, [el("font", {}, [el("sz", { val: "11" }), el("name", { val: "Calibri" })])]),
-		el("fills", { count: "2" }, [el("fill", {}, [el("patternFill", { patternType: "none" })]), el("fill", {}, [el("patternFill", { patternType: "gray125" })])]),
-		el("borders", { count: "1" }, [el("border", {}, [
-			el("left"),
-			el("right"),
-			el("top"),
-			el("bottom"),
-			el("diagonal")
-		])]),
-		el("cellStyleXfs", { count: "1" }, [el("xf", {
-			numFmtId: "0",
-			fontId: "0",
-			fillId: "0",
-			borderId: "0"
-		})]),
-		el("cellXfs", { count: "1" }, [el("xf", {
-			numFmtId: "0",
+function buildStylesPart(cellFormats) {
+	const children = [];
+	const declarations = cellFormats.declarations();
+	if (declarations.length > 0) {
+		const numFmtElements = declarations.map((declaration) => el("numFmt", {
+			numFmtId: String(declaration.id),
+			formatCode: encodeXmlText(declaration.code)
+		}));
+		children.push(el("numFmts", { count: String(numFmtElements.length) }, numFmtElements));
+	}
+	children.push(el("fonts", { count: "1" }, [el("font", {}, [el("sz", { val: "11" }), el("name", { val: "Calibri" })])]), el("fills", { count: "2" }, [el("fill", {}, [el("patternFill", { patternType: "none" })]), el("fill", {}, [el("patternFill", { patternType: "gray125" })])]), el("borders", { count: "1" }, [el("border", {}, [
+		el("left"),
+		el("right"),
+		el("top"),
+		el("bottom"),
+		el("diagonal")
+	])]), el("cellStyleXfs", { count: "1" }, [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"
-		})]),
-		el("cellStyles", { count: "1" }, [el("cellStyle", {
-			name: "Normal",
-			xfId: "0",
-			builtinId: "0"
-		})])
-	]));
+		};
+		if (numFmtId !== 0) attrs.applyNumberFormat = writeXmlBool(true);
+		return el("xf", attrs);
+	});
+	children.push(el("cellXfs", { count: String(xfElements.length) }, xfElements));
+	children.push(el("cellStyles", { count: "1" }, [el("cellStyle", {
+		name: "Normal",
+		xfId: "0",
+		builtinId: "0"
+	})]));
+	return xmlPart(el("styleSheet", { xmlns: SML_NS }, children));
 }
 function buildCorePropertiesPart(metadata) {
 	const children = [];
@@ -271,28 +284,24 @@ function buildColsElement(columns) {
 }
 function renderCellValue(value, isFormulaResult, sharedStrings) {
 	switch (value.kind) {
-		case "string":
-			if (isFormulaResult) return {
-				type: "str",
-				content: 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: PERCENTAGE_NUMBER_FORMAT
+		};
+		case "currency": return {
+			content: String(value.value),
+			format: currencyNumberFormat(value.currency)
+		};
 		case "boolean": return {
 			type: "b",
-			content: value.value ? "1" : "0"
-		};
-		case "date":
-		case "time":
-		case "dateTime": return {
-			type: "d",
-			content: encodeXmlText(value.value)
+			content: value.value ? "1" : "0",
+			format: BOOLEAN_NUMBER_FORMAT
 		};
+		case "date": return renderTemporal(isoDateToSerial(value.value), value.value, DATE_NUMBER_FORMAT, isFormulaResult, sharedStrings);
+		case "time": return renderTemporal(isoTimeToSerial(value.value), value.value, TIME_NUMBER_FORMAT, isFormulaResult, sharedStrings);
+		case "dateTime": return renderTemporal(isoDateTimeToSerial(value.value), value.value, DATE_TIME_NUMBER_FORMAT, isFormulaResult, sharedStrings);
 		case "error": return {
 			type: "e",
 			content: encodeXmlText(value.value)
@@ -300,21 +309,39 @@ function renderCellValue(value, isFormulaResult, sharedStrings) {
 		case "empty": return;
 	}
 }
-function buildCellElement(cell, sharedStrings) {
+function renderString(text, isFormulaResult, sharedStrings) {
+	if (isFormulaResult) return {
+		type: "str",
+		content: 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: cellReference(cell.row, cell.column),
-		s: "0"
+		s: String(styleIndex)
 	};
-	const children = [];
 	if (cell.formula !== void 0) children.push(el("f", {}, [txt(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(el("v", {}, [txt(rendered.content)]));
 	}
 	return 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);
@@ -334,7 +361,7 @@ function buildSheetDataElement(sheet, sharedStrings) {
 			}
 			if (rowInfo.hidden === true) attrs.hidden = "true";
 		}
-		return el("row", attrs, cells.map((cell) => buildCellElement(cell, sharedStrings)));
+		return el("row", attrs, cells.map((cell) => buildCellElement(cell, sharedStrings, cellFormats)));
 	}));
 }
 function buildMergeCellsElement(cells) {
@@ -420,11 +447,11 @@ function buildBreaksElements(settings) {
 	}
 	return result;
 }
-function buildWorksheetPart(sheet, sharedStrings) {
+function buildWorksheetPart(sheet, sharedStrings, cellFormats) {
 	const children = [buildSheetPrElement(sheet.printSettings), 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));
@@ -440,13 +467,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 SharedStringTable();
-	const worksheetParts = sheets.map((sheet) => buildWorksheetPart(sheet, sharedStrings));
+	const cellFormats = new 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)

package/dist/typed/xlsx/content.cjs

@@ -4,8 +4,11 @@ const require_typed_shared_metadata = require("../shared/metadata.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");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/xlsx/content.ts
@@ -81,19 +84,88 @@ function readInlineOrSharedStringText(container) {
 }
 function deriveDisplayText(value) {
 	switch (value.kind) {
-		case "number": return String(value.value);
+		case "number":
+		case "percentage":
+		case "currency": return String(value.value);
 		case "boolean": return value.value ? "TRUE" : "FALSE";
 		case "string":
 		case "error":
 		case "date":
 		case "time":
 		case "dateTime": return value.value;
-		case "percentage":
-		case "currency": return String(value.value);
 		case "empty": return "";
 	}
 }
-function readCellValue(cell, sharedStrings) {
+const DEFAULT_CELL_STYLE_INDEX = 0;
+const PLAIN_NUMBER = { kind: "number" };
+function readNumericFormatContext(pkg) {
+	return {
+		classes: require_typed_xlsx_styles.readCellFormatCodes(pkg).map((code) => code === void 0 ? PLAIN_NUMBER : require_typed_xlsx_number_format.classifyNumberFormat(code)),
+		date1904: require_typed_xlsx_serial.readDate1904(pkg)
+	};
+}
+function numberFormatOf(cell, context) {
+	const raw = require_typed_util.attr(cell, "s");
+	const index = raw === void 0 ? DEFAULT_CELL_STYLE_INDEX : Number.parseInt(raw, 10);
+	return (Number.isInteger(index) ? context.classes[index] : void 0) ?? PLAIN_NUMBER;
+}
+function resolveNumericValue(num, cell, context) {
+	const format = numberFormatOf(cell, context);
+	switch (format.kind) {
+		case "percentage": return {
+			kind: "percentage",
+			value: num
+		};
+		case "currency": return format.code === void 0 ? {
+			kind: "currency",
+			value: num
+		} : {
+			kind: "currency",
+			value: num,
+			currency: format.code
+		};
+		case "date": {
+			const iso = require_typed_xlsx_serial.serialToIsoDate(num, context.date1904);
+			return iso === void 0 ? {
+				kind: "number",
+				value: num
+			} : {
+				kind: "date",
+				value: iso
+			};
+		}
+		case "time": {
+			const iso = require_typed_xlsx_serial.serialToIsoTime(num);
+			return iso === void 0 ? {
+				kind: "number",
+				value: num
+			} : {
+				kind: "time",
+				value: iso
+			};
+		}
+		case "dateTime": {
+			const iso = require_typed_xlsx_serial.serialToIsoDateTime(num, context.date1904);
+			return iso === void 0 ? {
+				kind: "number",
+				value: num
+			} : {
+				kind: "dateTime",
+				value: iso
+			};
+		}
+		case "elapsedTime": return {
+			kind: "number",
+			value: num
+		};
+		case "text":
+		case "number": return {
+			kind: "number",
+			value: num
+		};
+	}
+}
+function readCellValue(cell, sharedStrings, numericFormats) {
 	const type = require_typed_util.attr(cell, "t");
 	if (type === "inlineStr") {
 		const is = require_typed_util.childrenWithTag(cell, "is")[0];
@@ -153,22 +225,19 @@ function readCellValue(cell, sharedStrings) {
 	};
 	const num = Number(raw);
 	if (Number.isNaN(num)) return;
-	const value = {
-		kind: "number",
-		value: num
-	};
+	const value = resolveNumericValue(num, cell, numericFormats);
 	return {
 		value,
 		displayText: deriveDisplayText(value)
 	};
 }
-function readCell(cell, sharedStrings) {
+function readCell(cell, sharedStrings, numericFormats) {
 	const reference = require_typed_util.attr(cell, "r");
 	const position = reference === void 0 ? void 0 : require_typed_xlsx_a1.parseCellReference(reference);
 	if (position === void 0) return;
 	const formulaEl = require_typed_util.childrenWithTag(cell, "f")[0];
 	const formula = formulaEl === void 0 ? void 0 : require_typed_util.textContent(formulaEl);
-	const resolved = readCellValue(cell, sharedStrings);
+	const resolved = readCellValue(cell, sharedStrings, numericFormats);
 	if (resolved === void 0) {
 		if (formula === void 0) return;
 		return {
@@ -205,18 +274,18 @@ function applyMergedRanges(worksheet, cells) {
 		if (rowSpan > 1) anchor.rowSpan = rowSpan;
 	}
 }
-function readCells(worksheet, sharedStrings) {
+function readCells(worksheet, sharedStrings, numericFormats) {
 	const sheetData = require_typed_util.childrenWithTag(worksheet, "sheetData")[0];
 	if (sheetData === void 0) return [];
 	const cells = [];
 	for (const row of require_typed_util.childrenWithTag(sheetData, "row")) for (const cell of require_typed_util.childrenWithTag(row, "c")) {
-		const read = readCell(cell, sharedStrings);
+		const read = readCell(cell, sharedStrings, numericFormats);
 		if (read !== void 0) cells.push(read);
 	}
 	applyMergedRanges(worksheet, cells);
 	return cells;
 }
-function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet) {
+function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats) {
 	const worksheet = require_typed_util.rootElement(pkg.parts[entry.path]);
 	if (worksheet === void 0) return {
 		name: entry.name,
@@ -228,7 +297,7 @@ function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet) {
 	};
 	return {
 		name: entry.name,
-		cells: readCells(worksheet, sharedStrings),
+		cells: readCells(worksheet, sharedStrings, numericFormats),
 		columns: readColumns(worksheet),
 		rows: readRows(worksheet),
 		images: [],
@@ -246,7 +315,8 @@ function fallbackEmptyWorksheet() {
 function readXlsxContent(pkg) {
 	const sharedStrings = require_typed_xlsx_shared_strings.loadSharedStrings(pkg);
 	const definedNamesBySheet = require_typed_xlsx_defined_names.readDefinedNamesBySheet(pkg);
-	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet));
+	const numericFormats = readNumericFormatContext(pkg);
+	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats));
 	return {
 		kind: "spreadsheet",
 		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,

package/dist/typed/xlsx/content.js

@@ -3,8 +3,11 @@ import { readCoreProperties } from "../shared/metadata.js";
 import { loadSharedStrings } from "./shared-strings.js";
 import { parseCellReference, parseRangeReference } from "./a1.js";
 import { readDefinedNamesBySheet } from "./defined-names.js";
+import { classifyNumberFormat } from "./number-format.js";
 import { readXmlBool } from "./util.js";
 import { readPrintSettings } from "./print-settings.js";
+import { readDate1904, serialToIsoDate, serialToIsoDateTime, serialToIsoTime } from "./serial.js";
+import { readCellFormatCodes } from "./styles.js";
 import { columnWidthCharsToPt } from "./units.js";
 import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/typed/xlsx/content.ts
@@ -80,19 +83,88 @@ function readInlineOrSharedStringText(container) {
 }
 function deriveDisplayText(value) {
 	switch (value.kind) {
-		case "number": return String(value.value);
+		case "number":
+		case "percentage":
+		case "currency": return String(value.value);
 		case "boolean": return value.value ? "TRUE" : "FALSE";
 		case "string":
 		case "error":
 		case "date":
 		case "time":
 		case "dateTime": return value.value;
-		case "percentage":
-		case "currency": return String(value.value);
 		case "empty": return "";
 	}
 }
-function readCellValue(cell, sharedStrings) {
+const DEFAULT_CELL_STYLE_INDEX = 0;
+const PLAIN_NUMBER = { kind: "number" };
+function readNumericFormatContext(pkg) {
+	return {
+		classes: readCellFormatCodes(pkg).map((code) => code === void 0 ? PLAIN_NUMBER : classifyNumberFormat(code)),
+		date1904: readDate1904(pkg)
+	};
+}
+function numberFormatOf(cell, context) {
+	const raw = attr(cell, "s");
+	const index = raw === void 0 ? DEFAULT_CELL_STYLE_INDEX : Number.parseInt(raw, 10);
+	return (Number.isInteger(index) ? context.classes[index] : void 0) ?? PLAIN_NUMBER;
+}
+function resolveNumericValue(num, cell, context) {
+	const format = numberFormatOf(cell, context);
+	switch (format.kind) {
+		case "percentage": return {
+			kind: "percentage",
+			value: num
+		};
+		case "currency": return format.code === void 0 ? {
+			kind: "currency",
+			value: num
+		} : {
+			kind: "currency",
+			value: num,
+			currency: format.code
+		};
+		case "date": {
+			const iso = serialToIsoDate(num, context.date1904);
+			return iso === void 0 ? {
+				kind: "number",
+				value: num
+			} : {
+				kind: "date",
+				value: iso
+			};
+		}
+		case "time": {
+			const iso = serialToIsoTime(num);
+			return iso === void 0 ? {
+				kind: "number",
+				value: num
+			} : {
+				kind: "time",
+				value: iso
+			};
+		}
+		case "dateTime": {
+			const iso = serialToIsoDateTime(num, context.date1904);
+			return iso === void 0 ? {
+				kind: "number",
+				value: num
+			} : {
+				kind: "dateTime",
+				value: iso
+			};
+		}
+		case "elapsedTime": return {
+			kind: "number",
+			value: num
+		};
+		case "text":
+		case "number": return {
+			kind: "number",
+			value: num
+		};
+	}
+}
+function readCellValue(cell, sharedStrings, numericFormats) {
 	const type = attr(cell, "t");
 	if (type === "inlineStr") {
 		const is = childrenWithTag(cell, "is")[0];
@@ -152,22 +224,19 @@ function readCellValue(cell, sharedStrings) {
 	};
 	const num = Number(raw);
 	if (Number.isNaN(num)) return;
-	const value = {
-		kind: "number",
-		value: num
-	};
+	const value = resolveNumericValue(num, cell, numericFormats);
 	return {
 		value,
 		displayText: deriveDisplayText(value)
 	};
 }
-function readCell(cell, sharedStrings) {
+function readCell(cell, sharedStrings, numericFormats) {
 	const reference = attr(cell, "r");
 	const position = reference === void 0 ? void 0 : parseCellReference(reference);
 	if (position === void 0) return;
 	const formulaEl = childrenWithTag(cell, "f")[0];
 	const formula = formulaEl === void 0 ? void 0 : textContent(formulaEl);
-	const resolved = readCellValue(cell, sharedStrings);
+	const resolved = readCellValue(cell, sharedStrings, numericFormats);
 	if (resolved === void 0) {
 		if (formula === void 0) return;
 		return {
@@ -204,18 +273,18 @@ function applyMergedRanges(worksheet, cells) {
 		if (rowSpan > 1) anchor.rowSpan = rowSpan;
 	}
 }
-function readCells(worksheet, sharedStrings) {
+function readCells(worksheet, sharedStrings, numericFormats) {
 	const sheetData = childrenWithTag(worksheet, "sheetData")[0];
 	if (sheetData === void 0) return [];
 	const cells = [];
 	for (const row of childrenWithTag(sheetData, "row")) for (const cell of childrenWithTag(row, "c")) {
-		const read = readCell(cell, sharedStrings);
+		const read = readCell(cell, sharedStrings, numericFormats);
 		if (read !== void 0) cells.push(read);
 	}
 	applyMergedRanges(worksheet, cells);
 	return cells;
 }
-function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet) {
+function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats) {
 	const worksheet = rootElement(pkg.parts[entry.path]);
 	if (worksheet === void 0) return {
 		name: entry.name,
@@ -227,7 +296,7 @@ function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet) {
 	};
 	return {
 		name: entry.name,
-		cells: readCells(worksheet, sharedStrings),
+		cells: readCells(worksheet, sharedStrings, numericFormats),
 		columns: readColumns(worksheet),
 		rows: readRows(worksheet),
 		images: [],
@@ -245,7 +314,8 @@ function fallbackEmptyWorksheet() {
 function readXlsxContent(pkg) {
 	const sharedStrings = loadSharedStrings(pkg);
 	const definedNamesBySheet = readDefinedNamesBySheet(pkg);
-	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet));
+	const numericFormats = readNumericFormatContext(pkg);
+	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats));
 	return {
 		kind: "spreadsheet",
 		formatVersion: CONTENT_FORMAT_VERSION,