ooxml.js 2.6.19 → 2.8.0

package/dist/typed/docx/read.cjs

@@ -266,10 +266,18 @@ function readRawCell(tc, context, rels, pkg) {
 		blocks: readBodyBlocks(tc.children, context, rels, pkg)
 	};
 }
+function readRowHeightPt(tr) {
+	const trPr = require_typed_util.childrenWithTag(tr, "w:trPr")[0];
+	if (trPr === void 0) return;
+	const trHeight = require_typed_util.childrenWithTag(trPr, "w:trHeight")[0];
+	const val = trHeight === void 0 ? void 0 : require_typed_util.attr(trHeight, "w:val");
+	return val === void 0 ? void 0 : require_typed_shared_units.twipsToPt(Number(val));
+}
 function readTable(tbl, context, rels, pkg) {
 	const tblGrid = require_typed_util.childrenWithTag(tbl, "w:tblGrid")[0];
 	const columnWidthsPt = tblGrid === void 0 ? [] : require_typed_util.childrenWithTag(tblGrid, "w:gridCol").map((col) => require_typed_shared_units.twipsToPt(Number(require_typed_util.attr(col, "w:w") ?? "0")));
-	const rawRows = require_typed_util.childrenWithTag(tbl, "w:tr").map((tr) => require_typed_util.childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
+	const trs = require_typed_util.childrenWithTag(tbl, "w:tr");
+	const rawRows = trs.map((tr) => require_typed_util.childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
 	const rowColumnIndices = rawRows.map((row) => {
 		const indices = [];
 		let col = 0;
@@ -282,23 +290,26 @@ function readTable(tbl, context, rels, pkg) {
 	return {
 		kind: "table",
 		columnWidthsPt,
-		rows: rawRows.map((row, rowIndex) => ({ cells: row.map((cell, cellIndex) => {
-			if (cell.isVMergeContinuation) return { blocks: [] };
-			const colIndex = rowColumnIndices[rowIndex][cellIndex];
-			let rowSpan = 1;
-			for (let r = rowIndex + 1; r < rawRows.length; r++) {
-				const matchIndex = rowColumnIndices[r].indexOf(colIndex);
-				if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
-				rowSpan++;
-			}
-			return {
-				blocks: cell.blocks,
-				colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
-				rowSpan: rowSpan > 1 ? rowSpan : void 0,
-				background: cell.background,
-				borders: cell.borders
-			};
-		}) }))
+		rows: rawRows.map((row, rowIndex) => ({
+			heightPt: readRowHeightPt(trs[rowIndex]),
+			cells: row.map((cell, cellIndex) => {
+				if (cell.isVMergeContinuation) return { blocks: [] };
+				const colIndex = rowColumnIndices[rowIndex][cellIndex];
+				let rowSpan = 1;
+				for (let r = rowIndex + 1; r < rawRows.length; r++) {
+					const matchIndex = rowColumnIndices[r].indexOf(colIndex);
+					if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
+					rowSpan++;
+				}
+				return {
+					blocks: cell.blocks,
+					colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
+					rowSpan: rowSpan > 1 ? rowSpan : void 0,
+					background: cell.background,
+					borders: cell.borders
+				};
+			})
+		}))
 	};
 }
 function readBodyBlocks(nodes, context, rels, pkg) {

package/dist/typed/docx/read.js

@@ -265,10 +265,18 @@ function readRawCell(tc, context, rels, pkg) {
 		blocks: readBodyBlocks(tc.children, context, rels, pkg)
 	};
 }
+function readRowHeightPt(tr) {
+	const trPr = childrenWithTag(tr, "w:trPr")[0];
+	if (trPr === void 0) return;
+	const trHeight = childrenWithTag(trPr, "w:trHeight")[0];
+	const val = trHeight === void 0 ? void 0 : attr(trHeight, "w:val");
+	return val === void 0 ? void 0 : twipsToPt(Number(val));
+}
 function readTable(tbl, context, rels, pkg) {
 	const tblGrid = childrenWithTag(tbl, "w:tblGrid")[0];
 	const columnWidthsPt = tblGrid === void 0 ? [] : childrenWithTag(tblGrid, "w:gridCol").map((col) => twipsToPt(Number(attr(col, "w:w") ?? "0")));
-	const rawRows = childrenWithTag(tbl, "w:tr").map((tr) => childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
+	const trs = childrenWithTag(tbl, "w:tr");
+	const rawRows = trs.map((tr) => childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
 	const rowColumnIndices = rawRows.map((row) => {
 		const indices = [];
 		let col = 0;
@@ -281,23 +289,26 @@ function readTable(tbl, context, rels, pkg) {
 	return {
 		kind: "table",
 		columnWidthsPt,
-		rows: rawRows.map((row, rowIndex) => ({ cells: row.map((cell, cellIndex) => {
-			if (cell.isVMergeContinuation) return { blocks: [] };
-			const colIndex = rowColumnIndices[rowIndex][cellIndex];
-			let rowSpan = 1;
-			for (let r = rowIndex + 1; r < rawRows.length; r++) {
-				const matchIndex = rowColumnIndices[r].indexOf(colIndex);
-				if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
-				rowSpan++;
-			}
-			return {
-				blocks: cell.blocks,
-				colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
-				rowSpan: rowSpan > 1 ? rowSpan : void 0,
-				background: cell.background,
-				borders: cell.borders
-			};
-		}) }))
+		rows: rawRows.map((row, rowIndex) => ({
+			heightPt: readRowHeightPt(trs[rowIndex]),
+			cells: row.map((cell, cellIndex) => {
+				if (cell.isVMergeContinuation) return { blocks: [] };
+				const colIndex = rowColumnIndices[rowIndex][cellIndex];
+				let rowSpan = 1;
+				for (let r = rowIndex + 1; r < rawRows.length; r++) {
+					const matchIndex = rowColumnIndices[r].indexOf(colIndex);
+					if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
+					rowSpan++;
+				}
+				return {
+					blocks: cell.blocks,
+					colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
+					rowSpan: rowSpan > 1 ? rowSpan : void 0,
+					background: cell.background,
+					borders: cell.borders
+				};
+			})
+		}))
 	};
 }
 function readBodyBlocks(nodes, context, rels, pkg) {

package/dist/typed/xlsx/build.cjs

@@ -194,28 +194,55 @@ function buildStylesPart(cellFormats) {
 		}));
 		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", {
+	const fillElements = cellFormats.fillDeclarations().map((fill) => {
+		if (fill.patternType === "solid") {
+			const rgb = fill.rgb ?? "000000";
+			return require_xml_fragment.el("fill", {}, [require_xml_fragment.el("patternFill", { patternType: "solid" }, [require_xml_fragment.el("fgColor", { rgb: `FF${rgb}` }), require_xml_fragment.el("bgColor", { indexed: "64" })])]);
+		}
+		return require_xml_fragment.el("fill", {}, [require_xml_fragment.el("patternFill", { patternType: fill.patternType })]);
+	});
+	const borderElements = cellFormats.borderDeclarations().map((border) => {
+		const edgeElements = [];
+		for (const edge of [
+			"left",
+			"right",
+			"top",
+			"bottom"
+		]) {
+			const present = border.edges[edge];
+			if (present !== void 0) edgeElements.push(require_xml_fragment.el(edge, { style: present.style }, [require_xml_fragment.el("color", { rgb: `FF${present.rgb}` })]));
+			else edgeElements.push(require_xml_fragment.el(edge));
+		}
+		edgeElements.push(require_xml_fragment.el("diagonal"));
+		return require_xml_fragment.el("border", {}, edgeElements);
+	});
+	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: String(fillElements.length) }, fillElements), require_xml_fragment.el("borders", { count: String(borderElements.length) }, borderElements), 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 xfElements = cellFormats.cellFormatRecords().map((record) => {
 		const attrs = {
-			numFmtId: String(numFmtId),
+			numFmtId: String(record.numFmtId),
 			fontId: "0",
-			fillId: "0",
-			borderId: "0",
+			fillId: String(record.fillId),
+			borderId: String(record.borderId),
 			xfId: "0"
 		};
-		if (numFmtId !== 0) attrs.applyNumberFormat = require_typed_xlsx_util.writeXmlBool(true);
-		return require_xml_fragment.el("xf", attrs);
+		if (record.numFmtId !== 0) attrs.applyNumberFormat = require_typed_xlsx_util.writeXmlBool(true);
+		if (record.fillId !== require_typed_xlsx_styles.RESERVED_FILL_INDICES.none) attrs.applyFill = require_typed_xlsx_util.writeXmlBool(true);
+		if (record.borderId !== require_typed_xlsx_styles.RESERVED_BORDER_INDICES.empty) attrs.applyBorder = require_typed_xlsx_util.writeXmlBool(true);
+		const xfChildren = [];
+		if (record.alignment !== void 0) {
+			attrs.applyAlignment = require_typed_xlsx_util.writeXmlBool(true);
+			const alignmentAttrs = {};
+			if (record.alignment.horizontal !== void 0) alignmentAttrs.horizontal = record.alignment.horizontal;
+			if (record.alignment.vertical === "top") alignmentAttrs.vertical = "top";
+			else if (record.alignment.vertical === "middle") alignmentAttrs.vertical = "center";
+			xfChildren.push(require_xml_fragment.el("alignment", alignmentAttrs));
+		}
+		return require_xml_fragment.el("xf", attrs, xfChildren);
 	});
 	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", {
@@ -332,7 +359,17 @@ function renderTemporal(serial, iso, format, isFormulaResult, sharedStrings) {
 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 decoration = cell.background !== void 0 || cell.borders !== void 0 || cell.alignment !== void 0 || cell.verticalAlignment !== void 0 ? {
+		background: cell.background,
+		borders: cell.borders,
+		alignment: cell.alignment,
+		verticalAlignment: cell.verticalAlignment
+	} : void 0;
+	const format = rendered?.format;
+	const styleIndex = format === void 0 && decoration === void 0 ? 0 : cellFormats.intern(format ?? {
+		kind: "builtin",
+		id: 0
+	}, decoration);
 	const attrs = {
 		r: require_typed_xlsx_a1.cellReference(cell.row, cell.column),
 		s: String(styleIndex)

package/dist/typed/xlsx/build.js

@@ -8,7 +8,7 @@ import { BOOLEAN_NUMBER_FORMAT, DATE_NUMBER_FORMAT, DATE_TIME_NUMBER_FORMAT, PER
 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 { CellFormatTable, RESERVED_BORDER_INDICES, RESERVED_FILL_INDICES } from "./styles.js";
 import { ptToColumnWidthChars } from "./units.js";
 //#region src/typed/xlsx/build.ts
 const SML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
@@ -193,28 +193,55 @@ function buildStylesPart(cellFormats) {
 		}));
 		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", {
+	const fillElements = cellFormats.fillDeclarations().map((fill) => {
+		if (fill.patternType === "solid") {
+			const rgb = fill.rgb ?? "000000";
+			return el("fill", {}, [el("patternFill", { patternType: "solid" }, [el("fgColor", { rgb: `FF${rgb}` }), el("bgColor", { indexed: "64" })])]);
+		}
+		return el("fill", {}, [el("patternFill", { patternType: fill.patternType })]);
+	});
+	const borderElements = cellFormats.borderDeclarations().map((border) => {
+		const edgeElements = [];
+		for (const edge of [
+			"left",
+			"right",
+			"top",
+			"bottom"
+		]) {
+			const present = border.edges[edge];
+			if (present !== void 0) edgeElements.push(el(edge, { style: present.style }, [el("color", { rgb: `FF${present.rgb}` })]));
+			else edgeElements.push(el(edge));
+		}
+		edgeElements.push(el("diagonal"));
+		return el("border", {}, edgeElements);
+	});
+	children.push(el("fonts", { count: "1" }, [el("font", {}, [el("sz", { val: "11" }), el("name", { val: "Calibri" })])]), el("fills", { count: String(fillElements.length) }, fillElements), el("borders", { count: String(borderElements.length) }, borderElements), el("cellStyleXfs", { count: "1" }, [el("xf", {
 		numFmtId: "0",
 		fontId: "0",
 		fillId: "0",
 		borderId: "0"
 	})]));
-	const xfElements = cellFormats.cellFormats().map((numFmtId) => {
+	const xfElements = cellFormats.cellFormatRecords().map((record) => {
 		const attrs = {
-			numFmtId: String(numFmtId),
+			numFmtId: String(record.numFmtId),
 			fontId: "0",
-			fillId: "0",
-			borderId: "0",
+			fillId: String(record.fillId),
+			borderId: String(record.borderId),
 			xfId: "0"
 		};
-		if (numFmtId !== 0) attrs.applyNumberFormat = writeXmlBool(true);
-		return el("xf", attrs);
+		if (record.numFmtId !== 0) attrs.applyNumberFormat = writeXmlBool(true);
+		if (record.fillId !== RESERVED_FILL_INDICES.none) attrs.applyFill = writeXmlBool(true);
+		if (record.borderId !== RESERVED_BORDER_INDICES.empty) attrs.applyBorder = writeXmlBool(true);
+		const xfChildren = [];
+		if (record.alignment !== void 0) {
+			attrs.applyAlignment = writeXmlBool(true);
+			const alignmentAttrs = {};
+			if (record.alignment.horizontal !== void 0) alignmentAttrs.horizontal = record.alignment.horizontal;
+			if (record.alignment.vertical === "top") alignmentAttrs.vertical = "top";
+			else if (record.alignment.vertical === "middle") alignmentAttrs.vertical = "center";
+			xfChildren.push(el("alignment", alignmentAttrs));
+		}
+		return el("xf", attrs, xfChildren);
 	});
 	children.push(el("cellXfs", { count: String(xfElements.length) }, xfElements));
 	children.push(el("cellStyles", { count: "1" }, [el("cellStyle", {
@@ -331,7 +358,17 @@ function renderTemporal(serial, iso, format, isFormulaResult, sharedStrings) {
 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 decoration = cell.background !== void 0 || cell.borders !== void 0 || cell.alignment !== void 0 || cell.verticalAlignment !== void 0 ? {
+		background: cell.background,
+		borders: cell.borders,
+		alignment: cell.alignment,
+		verticalAlignment: cell.verticalAlignment
+	} : void 0;
+	const format = rendered?.format;
+	const styleIndex = format === void 0 && decoration === void 0 ? 0 : cellFormats.intern(format ?? {
+		kind: "builtin",
+		id: 0
+	}, decoration);
 	const attrs = {
 		r: cellReference(cell.row, cell.column),
 		s: String(styleIndex)

package/dist/typed/xlsx/content.cjs

@@ -98,16 +98,21 @@ function deriveDisplayText(value) {
 }
 const DEFAULT_CELL_STYLE_INDEX = 0;
 const PLAIN_NUMBER = { kind: "number" };
-function readNumericFormatContext(pkg) {
+function readCellFormatContext(pkg) {
 	return {
-		classes: require_typed_xlsx_styles.readCellFormatCodes(pkg).map((code) => code === void 0 ? PLAIN_NUMBER : require_typed_xlsx_number_format.classifyNumberFormat(code)),
+		entries: require_typed_xlsx_styles.readCellStyles(pkg),
 		date1904: require_typed_xlsx_serial.readDate1904(pkg)
 	};
 }
-function numberFormatOf(cell, context) {
+function entryOf(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;
+	return Number.isInteger(index) ? context.entries[index] : void 0;
+}
+function numberFormatOf(cell, context) {
+	const entry = entryOf(cell, context);
+	if (entry?.numberFormatCode === void 0) return PLAIN_NUMBER;
+	return require_typed_xlsx_number_format.classifyNumberFormat(entry.numberFormatCode);
 }
 function resolveNumericValue(num, cell, context) {
 	const format = numberFormatOf(cell, context);
@@ -231,13 +236,13 @@ function readCellValue(cell, sharedStrings, numericFormats) {
 		displayText: deriveDisplayText(value)
 	};
 }
-function readCell(cell, sharedStrings, numericFormats) {
+function readCell(cell, sharedStrings, context) {
 	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, numericFormats);
+	const resolved = readCellValue(cell, sharedStrings, context);
 	if (resolved === void 0) {
 		if (formula === void 0) return;
 		return {
@@ -255,6 +260,13 @@ function readCell(cell, sharedStrings, numericFormats) {
 		displayText: resolved.displayText
 	};
 	if (formula !== void 0) cellEntry.formula = formula;
+	const entry = entryOf(cell, context);
+	if (entry !== void 0) {
+		if (entry.background !== void 0) cellEntry.background = entry.background;
+		if (entry.borders !== void 0) cellEntry.borders = entry.borders;
+		if (entry.alignment !== void 0) cellEntry.alignment = entry.alignment;
+		if (entry.verticalAlignment !== void 0) cellEntry.verticalAlignment = entry.verticalAlignment;
+	}
 	return cellEntry;
 }
 function applyMergedRanges(worksheet, cells) {
@@ -274,18 +286,18 @@ function applyMergedRanges(worksheet, cells) {
 		if (rowSpan > 1) anchor.rowSpan = rowSpan;
 	}
 }
-function readCells(worksheet, sharedStrings, numericFormats) {
+function readCells(worksheet, sharedStrings, context) {
 	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, numericFormats);
+		const read = readCell(cell, sharedStrings, context);
 		if (read !== void 0) cells.push(read);
 	}
 	applyMergedRanges(worksheet, cells);
 	return cells;
 }
-function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats) {
+function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, context) {
 	const worksheet = require_typed_util.rootElement(pkg.parts[entry.path]);
 	if (worksheet === void 0) return {
 		name: entry.name,
@@ -297,7 +309,7 @@ function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, n
 	};
 	return {
 		name: entry.name,
-		cells: readCells(worksheet, sharedStrings, numericFormats),
+		cells: readCells(worksheet, sharedStrings, context),
 		columns: readColumns(worksheet),
 		rows: readRows(worksheet),
 		images: [],
@@ -315,8 +327,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 numericFormats = readNumericFormatContext(pkg);
-	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats));
+	const context = readCellFormatContext(pkg);
+	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, context));
 	return {
 		kind: "spreadsheet",
 		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,

package/dist/typed/xlsx/content.js

@@ -7,7 +7,7 @@ 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 { readCellStyles } from "./styles.js";
 import { columnWidthCharsToPt } from "./units.js";
 import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/typed/xlsx/content.ts
@@ -97,16 +97,21 @@ function deriveDisplayText(value) {
 }
 const DEFAULT_CELL_STYLE_INDEX = 0;
 const PLAIN_NUMBER = { kind: "number" };
-function readNumericFormatContext(pkg) {
+function readCellFormatContext(pkg) {
 	return {
-		classes: readCellFormatCodes(pkg).map((code) => code === void 0 ? PLAIN_NUMBER : classifyNumberFormat(code)),
+		entries: readCellStyles(pkg),
 		date1904: readDate1904(pkg)
 	};
 }
-function numberFormatOf(cell, context) {
+function entryOf(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;
+	return Number.isInteger(index) ? context.entries[index] : void 0;
+}
+function numberFormatOf(cell, context) {
+	const entry = entryOf(cell, context);
+	if (entry?.numberFormatCode === void 0) return PLAIN_NUMBER;
+	return classifyNumberFormat(entry.numberFormatCode);
 }
 function resolveNumericValue(num, cell, context) {
 	const format = numberFormatOf(cell, context);
@@ -230,13 +235,13 @@ function readCellValue(cell, sharedStrings, numericFormats) {
 		displayText: deriveDisplayText(value)
 	};
 }
-function readCell(cell, sharedStrings, numericFormats) {
+function readCell(cell, sharedStrings, context) {
 	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, numericFormats);
+	const resolved = readCellValue(cell, sharedStrings, context);
 	if (resolved === void 0) {
 		if (formula === void 0) return;
 		return {
@@ -254,6 +259,13 @@ function readCell(cell, sharedStrings, numericFormats) {
 		displayText: resolved.displayText
 	};
 	if (formula !== void 0) cellEntry.formula = formula;
+	const entry = entryOf(cell, context);
+	if (entry !== void 0) {
+		if (entry.background !== void 0) cellEntry.background = entry.background;
+		if (entry.borders !== void 0) cellEntry.borders = entry.borders;
+		if (entry.alignment !== void 0) cellEntry.alignment = entry.alignment;
+		if (entry.verticalAlignment !== void 0) cellEntry.verticalAlignment = entry.verticalAlignment;
+	}
 	return cellEntry;
 }
 function applyMergedRanges(worksheet, cells) {
@@ -273,18 +285,18 @@ function applyMergedRanges(worksheet, cells) {
 		if (rowSpan > 1) anchor.rowSpan = rowSpan;
 	}
 }
-function readCells(worksheet, sharedStrings, numericFormats) {
+function readCells(worksheet, sharedStrings, context) {
 	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, numericFormats);
+		const read = readCell(cell, sharedStrings, context);
 		if (read !== void 0) cells.push(read);
 	}
 	applyMergedRanges(worksheet, cells);
 	return cells;
 }
-function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats) {
+function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, context) {
 	const worksheet = rootElement(pkg.parts[entry.path]);
 	if (worksheet === void 0) return {
 		name: entry.name,
@@ -296,7 +308,7 @@ function readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, n
 	};
 	return {
 		name: entry.name,
-		cells: readCells(worksheet, sharedStrings, numericFormats),
+		cells: readCells(worksheet, sharedStrings, context),
 		columns: readColumns(worksheet),
 		rows: readRows(worksheet),
 		images: [],
@@ -314,8 +326,8 @@ function fallbackEmptyWorksheet() {
 function readXlsxContent(pkg) {
 	const sharedStrings = loadSharedStrings(pkg);
 	const definedNamesBySheet = readDefinedNamesBySheet(pkg);
-	const numericFormats = readNumericFormatContext(pkg);
-	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, numericFormats));
+	const context = readCellFormatContext(pkg);
+	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet, context));
 	return {
 		kind: "spreadsheet",
 		formatVersion: CONTENT_FORMAT_VERSION,