ooxml.js 2.6.18 → 2.7.0

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,

package/dist/typed/xlsx/styles.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_typed_util = require("../util.cjs");
 const require_typed_xlsx_number_format = require("./number-format.cjs");
+let document_schema_js = require("document-schema.js");
 //#region src/typed/xlsx/styles.ts
 const STYLES_PATH = "xl/styles.xml";
 const GENERAL_NUM_FMT_ID = 0;
@@ -17,37 +18,249 @@ function readNumberFormatCodesById(styleSheet) {
 	}
 	return codes;
 }
-function readCellFormatCodes(pkg) {
+const BORDER_WIDTH_PT = {
+	hair: .5,
+	thin: .75,
+	medium: 1.5,
+	thick: 2.25
+};
+const XLSX_BORDER_STYLE = {
+	thin: {
+		weight: "thin",
+		pattern: "solid"
+	},
+	medium: {
+		weight: "medium",
+		pattern: "solid"
+	},
+	thick: {
+		weight: "thick",
+		pattern: "solid"
+	},
+	hair: {
+		weight: "hair",
+		pattern: "solid"
+	},
+	dashed: {
+		weight: "thin",
+		pattern: "dashed"
+	},
+	dotted: {
+		weight: "thin",
+		pattern: "dotted"
+	},
+	double: {
+		weight: "thin",
+		pattern: "double"
+	},
+	mediumDashed: {
+		weight: "medium",
+		pattern: "dashed"
+	},
+	dashDot: {
+		weight: "thin",
+		pattern: "dashed"
+	},
+	mediumDashDot: {
+		weight: "medium",
+		pattern: "dashed"
+	},
+	dashDotDot: {
+		weight: "thin",
+		pattern: "dashed"
+	},
+	mediumDashDotDot: {
+		weight: "medium",
+		pattern: "dashed"
+	},
+	slantDashDot: {
+		weight: "medium",
+		pattern: "dashed"
+	}
+};
+const BORDER_WEIGHT_UPPER_PT = {
+	hair: .625,
+	thin: 1.125,
+	medium: 1.875
+};
+function readColorRgb(container, colorTag) {
+	const colorEl = require_typed_util.childrenWithTag(container, colorTag)[0];
+	if (colorEl === void 0) return;
+	const raw = require_typed_util.attr(colorEl, "rgb");
+	if (raw === void 0) return;
+	const hex = raw.length >= 6 ? raw.slice(-6) : raw;
+	if (!/^[0-9a-fA-F]{6}$/.test(hex)) return;
+	try {
+		return (0, document_schema_js.rgbHexToColor)(hex);
+	} catch {
+		return;
+	}
+}
+function readFillBackground(fill) {
+	const patternFill = require_typed_util.childrenWithTag(fill, "patternFill")[0];
+	if (patternFill === void 0 || require_typed_util.attr(patternFill, "patternType") !== "solid") return;
+	return readColorRgb(patternFill, "fgColor") ?? readColorRgb(patternFill, "bgColor");
+}
+function readFills(styleSheet) {
+	const fillsEl = require_typed_util.childrenWithTag(styleSheet, "fills")[0];
+	if (fillsEl === void 0) return [];
+	return require_typed_util.childrenWithTag(fillsEl, "fill").map(readFillBackground);
+}
+function readBorderEdge(border, edge) {
+	const edgeEl = require_typed_util.childrenWithTag(border, edge)[0];
+	if (edgeEl === void 0) return;
+	const styleToken = require_typed_util.attr(edgeEl, "style");
+	if (styleToken === void 0 || styleToken === "none") return;
+	const resolved = XLSX_BORDER_STYLE[styleToken];
+	if (resolved === void 0) return;
+	const color = readColorRgb(edgeEl, "color");
+	if (color === void 0) return;
+	const result = {
+		color,
+		widthPt: BORDER_WIDTH_PT[resolved.weight]
+	};
+	if (resolved.pattern !== "solid") result.style = resolved.pattern;
+	return result;
+}
+function readBorders(styleSheet) {
+	const bordersEl = require_typed_util.childrenWithTag(styleSheet, "borders")[0];
+	if (bordersEl === void 0) return [];
+	return require_typed_util.childrenWithTag(bordersEl, "border").map((border) => {
+		const left = readBorderEdge(border, "left");
+		const right = readBorderEdge(border, "right");
+		const top = readBorderEdge(border, "top");
+		const bottom = readBorderEdge(border, "bottom");
+		if (left === void 0 && right === void 0 && top === void 0 && bottom === void 0) return;
+		const result = {};
+		if (left !== void 0) result.left = left;
+		if (right !== void 0) result.right = right;
+		if (top !== void 0) result.top = top;
+		if (bottom !== void 0) result.bottom = bottom;
+		return result;
+	});
+}
+function readHorizontalAlignment(alignment) {
+	const value = require_typed_util.attr(alignment, "horizontal");
+	if (value === "left" || value === "center" || value === "right" || value === "justify") return value;
+}
+function readVerticalAlignment(alignment) {
+	const value = require_typed_util.attr(alignment, "vertical");
+	if (value === "top") return "top";
+	if (value === "center") return "middle";
+}
+function readAlignment(xf) {
+	const alignment = require_typed_util.childrenWithTag(xf, "alignment")[0];
+	if (alignment === void 0) return {};
+	return {
+		alignment: readHorizontalAlignment(alignment),
+		verticalAlignment: readVerticalAlignment(alignment)
+	};
+}
+function readCellStyles(pkg) {
 	const styleSheet = require_typed_util.rootElement(pkg.parts[STYLES_PATH]);
 	if (styleSheet === void 0) return [];
 	const cellXfsEl = require_typed_util.childrenWithTag(styleSheet, "cellXfs")[0];
 	if (cellXfsEl === void 0) return [];
 	const codes = readNumberFormatCodesById(styleSheet);
+	const fills = readFills(styleSheet);
+	const borders = readBorders(styleSheet);
 	return require_typed_util.childrenWithTag(cellXfsEl, "xf").map((xf) => {
-		const raw = require_typed_util.attr(xf, "numFmtId");
-		const id = raw === void 0 ? 0 : Number.parseInt(raw, 10);
-		return Number.isInteger(id) ? codes.get(id) : void 0;
+		const numFmtRaw = require_typed_util.attr(xf, "numFmtId");
+		const numFmtId = numFmtRaw === void 0 ? 0 : Number.parseInt(numFmtRaw, 10);
+		const entry = {};
+		if (Number.isInteger(numFmtId)) {
+			const code = codes.get(numFmtId);
+			if (code !== void 0) entry.numberFormatCode = code;
+		}
+		const fillId = parseChildIndex(require_typed_util.attr(xf, "fillId"));
+		if (fillId !== void 0) entry.background = fills[fillId];
+		const borderId = parseChildIndex(require_typed_util.attr(xf, "borderId"));
+		if (borderId !== void 0) entry.borders = borders[borderId];
+		const { alignment, verticalAlignment } = readAlignment(xf);
+		if (alignment !== void 0) entry.alignment = alignment;
+		if (verticalAlignment !== void 0) entry.verticalAlignment = verticalAlignment;
+		return entry;
 	});
 }
+function parseChildIndex(value) {
+	if (value === void 0) return;
+	const n = Number.parseInt(value, 10);
+	return Number.isInteger(n) ? n : void 0;
+}
+function readCellFormatCodes(pkg) {
+	return readCellStyles(pkg).map((entry) => entry.numberFormatCode);
+}
 const FIRST_CUSTOM_NUM_FMT_ID = 164;
 const DEFAULT_CELL_FORMAT_INDEX = 0;
-function signatureOf(format) {
+const NONE_FILL_INDEX = 0;
+const GRAY125_FILL_INDEX = 1;
+const FIRST_REAL_FILL_INDEX = 2;
+const EMPTY_BORDER_INDEX = 0;
+const FIRST_REAL_BORDER_INDEX = 1;
+function signatureOfNumberFormat(format) {
 	return format.kind === "builtin" ? `builtin:${format.id}` : `custom:${format.code}`;
 }
+const EMPTY_DECORATION = {};
+function signatureOfDecoration(decoration) {
+	let sig = "";
+	if (decoration.background !== void 0) sig += `|bg:${(0, document_schema_js.colorToRgbHex)(decoration.background)}`;
+	const borders = decoration.borders;
+	if (borders !== void 0) for (const edge of [
+		"left",
+		"right",
+		"top",
+		"bottom"
+	]) {
+		const border = borders[edge];
+		if (border !== void 0) sig += `|${edge}:${border.style ?? "solid"}:${(0, document_schema_js.colorToRgbHex)(border.color)}:${border.widthPt.toFixed(4)}`;
+	}
+	if (decoration.alignment !== void 0) sig += `|h:${decoration.alignment}`;
+	if (decoration.verticalAlignment !== void 0) sig += `|v:${decoration.verticalAlignment}`;
+	return sig;
+}
+function borderToXlsxStyle(border) {
+	switch (border.style) {
+		case "double": return "double";
+		case "dotted": return "dotted";
+		case "dashed": return border.widthPt >= BORDER_WEIGHT_UPPER_PT.thin ? "mediumDashed" : "dashed";
+		case "solid":
+		case void 0:
+			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.hair) return "hair";
+			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.thin) return "thin";
+			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.medium) return "medium";
+			return "thick";
+	}
+}
 var CellFormatTable = class {
-	indexBySignature = /* @__PURE__ */ new Map([[signatureOf({
+	indexBySignature = /* @__PURE__ */ new Map([[signatureOfNumberFormat({
 		kind: "builtin",
 		id: 0
-	}), 0]]);
-	numFmtIdByIndex = [0];
+	}) + signatureOfDecoration(EMPTY_DECORATION), 0]]);
+	records = [{
+		numFmtId: 0,
+		fillId: NONE_FILL_INDEX,
+		borderId: EMPTY_BORDER_INDEX
+	}];
 	declared = [];
-	intern(format) {
-		const signature = signatureOf(format);
+	fillIndexByRgb = /* @__PURE__ */ new Map();
+	fills = [{ patternType: "none" }, { patternType: "gray125" }];
+	borderIndexBySignature = /* @__PURE__ */ new Map();
+	borders = [{ edges: {} }];
+	intern(format, decoration = EMPTY_DECORATION) {
+		const signature = signatureOfNumberFormat(format) + signatureOfDecoration(decoration);
 		const existing = this.indexBySignature.get(signature);
 		if (existing !== void 0) return existing;
-		const numFmtId = format.kind === "builtin" ? format.id : this.declare(format.code);
-		const index = this.numFmtIdByIndex.length;
-		this.numFmtIdByIndex.push(numFmtId);
+		const record = {
+			numFmtId: format.kind === "builtin" ? format.id : this.declareNumberFormat(format.code),
+			fillId: decoration.background === void 0 ? NONE_FILL_INDEX : this.internFill(decoration.background),
+			borderId: decoration.borders === void 0 ? EMPTY_BORDER_INDEX : this.internBorder(decoration.borders)
+		};
+		if (decoration.alignment !== void 0 || decoration.verticalAlignment !== void 0) record.alignment = {
+			horizontal: decoration.alignment,
+			vertical: decoration.verticalAlignment
+		};
+		const index = this.records.length;
+		this.records.push(record);
 		this.indexBySignature.set(signature, index);
 		return index;
 	}
@@ -55,9 +268,18 @@ var CellFormatTable = class {
 		return this.declared;
 	}
 	cellFormats() {
-		return this.numFmtIdByIndex;
+		return this.records.map((record) => record.numFmtId);
 	}
-	declare(code) {
+	cellFormatRecords() {
+		return this.records;
+	}
+	fillDeclarations() {
+		return this.fills;
+	}
+	borderDeclarations() {
+		return this.borders;
+	}
+	declareNumberFormat(code) {
 		const id = FIRST_CUSTOM_NUM_FMT_ID + this.declared.length;
 		this.declared.push({
 			id,
@@ -65,9 +287,60 @@ var CellFormatTable = class {
 		});
 		return id;
 	}
+	internFill(background) {
+		const rgb = (0, document_schema_js.colorToRgbHex)(background);
+		const existing = this.fillIndexByRgb.get(rgb);
+		if (existing !== void 0) return existing;
+		const index = this.fills.length;
+		this.fills.push({
+			patternType: "solid",
+			rgb
+		});
+		this.fillIndexByRgb.set(rgb, index);
+		return index;
+	}
+	internBorder(borders) {
+		const edges = {};
+		let signature = "";
+		for (const edge of [
+			"left",
+			"right",
+			"top",
+			"bottom"
+		]) {
+			const border = borders[edge];
+			if (border !== void 0) {
+				const style = borderToXlsxStyle(border);
+				const rgb = (0, document_schema_js.colorToRgbHex)(border.color);
+				edges[edge] = {
+					style,
+					rgb
+				};
+				signature += `|${edge}:${style}:${rgb}`;
+			}
+		}
+		const existing = this.borderIndexBySignature.get(signature);
+		if (existing !== void 0) return existing;
+		const index = this.borders.length;
+		this.borders.push({ edges });
+		this.borderIndexBySignature.set(signature, index);
+		return index;
+	}
+};
+const RESERVED_FILL_INDICES = {
+	none: NONE_FILL_INDEX,
+	gray125: GRAY125_FILL_INDEX,
+	firstReal: FIRST_REAL_FILL_INDEX
+};
+const RESERVED_BORDER_INDICES = {
+	empty: EMPTY_BORDER_INDEX,
+	firstReal: FIRST_REAL_BORDER_INDEX
 };
 //#endregion
 exports.CellFormatTable = CellFormatTable;
 exports.DEFAULT_CELL_FORMAT_INDEX = DEFAULT_CELL_FORMAT_INDEX;
 exports.GENERAL_NUM_FMT_ID = GENERAL_NUM_FMT_ID;
+exports.RESERVED_BORDER_INDICES = RESERVED_BORDER_INDICES;
+exports.RESERVED_FILL_INDICES = RESERVED_FILL_INDICES;
 exports.readCellFormatCodes = readCellFormatCodes;
+exports.readCellStyles = readCellStyles;

package/dist/typed/xlsx/styles.d.cts

@@ -1,21 +1,87 @@
 import { r as Package } from "../../package-L24lkba-.cjs";
 import { CellNumberFormat } from "./number-format.cjs";
+import { Alignment, Color, ContentCellBorders } from "document-schema.js";
 //#region src/typed/xlsx/styles.d.ts
 declare const GENERAL_NUM_FMT_ID = 0;
+interface CellStyleEntry {
+  numberFormatCode?: string;
+  background?: Color;
+  borders?: ContentCellBorders;
+  alignment?: Alignment;
+  verticalAlignment?: 'top' | 'middle' | 'bottom';
+}
+declare function readCellStyles(pkg: Package): readonly CellStyleEntry[];
 declare function readCellFormatCodes(pkg: Package): readonly (string | undefined)[];
 declare const DEFAULT_CELL_FORMAT_INDEX = 0;
 interface DeclaredNumberFormat {
   id: number;
   code: string;
 }
+interface CellFormatDecoration {
+  background?: Color;
+  borders?: ContentCellBorders;
+  alignment?: Alignment;
+  verticalAlignment?: 'top' | 'middle' | 'bottom';
+}
+interface DeclaredFill {
+  patternType: 'none' | 'gray125' | 'solid';
+  rgb?: string;
+}
+interface DeclaredBorder {
+  edges: {
+    left?: {
+      style: string;
+      rgb: string;
+    };
+    right?: {
+      style: string;
+      rgb: string;
+    };
+    top?: {
+      style: string;
+      rgb: string;
+    };
+    bottom?: {
+      style: string;
+      rgb: string;
+    };
+  };
+}
+interface CellFormatRecord {
+  numFmtId: number;
+  fillId: number;
+  borderId: number;
+  alignment?: {
+    horizontal?: Alignment;
+    vertical?: 'top' | 'middle' | 'bottom';
+  };
+}
 declare class CellFormatTable {
   private readonly indexBySignature;
-  private readonly numFmtIdByIndex;
+  private readonly records;
   private readonly declared;
-  intern(format: CellNumberFormat): number;
+  private readonly fillIndexByRgb;
+  private readonly fills;
+  private readonly borderIndexBySignature;
+  private readonly borders;
+  intern(format: CellNumberFormat, decoration?: CellFormatDecoration): number;
   declarations(): readonly DeclaredNumberFormat[];
   cellFormats(): readonly number[];
-  private declare;
+  cellFormatRecords(): readonly CellFormatRecord[];
+  fillDeclarations(): readonly DeclaredFill[];
+  borderDeclarations(): readonly DeclaredBorder[];
+  private declareNumberFormat;
+  private internFill;
+  private internBorder;
 }
+declare const RESERVED_FILL_INDICES: {
+  readonly none: 0;
+  readonly gray125: 1;
+  readonly firstReal: 2;
+};
+declare const RESERVED_BORDER_INDICES: {
+  readonly empty: 0;
+  readonly firstReal: 1;
+};
 //#endregion
-export { CellFormatTable, DEFAULT_CELL_FORMAT_INDEX, DeclaredNumberFormat, GENERAL_NUM_FMT_ID, readCellFormatCodes };
+export { CellFormatDecoration, CellFormatRecord, CellFormatTable, CellStyleEntry, DEFAULT_CELL_FORMAT_INDEX, DeclaredBorder, DeclaredFill, DeclaredNumberFormat, GENERAL_NUM_FMT_ID, RESERVED_BORDER_INDICES, RESERVED_FILL_INDICES, readCellFormatCodes, readCellStyles };

package/dist/typed/xlsx/styles.d.ts

@@ -1,21 +1,87 @@
 import { r as Package } from "../../package-BUojjTXf.js";
 import { CellNumberFormat } from "./number-format.js";
+import { Alignment, Color, ContentCellBorders } from "document-schema.js";
 //#region src/typed/xlsx/styles.d.ts
 declare const GENERAL_NUM_FMT_ID = 0;
+interface CellStyleEntry {
+  numberFormatCode?: string;
+  background?: Color;
+  borders?: ContentCellBorders;
+  alignment?: Alignment;
+  verticalAlignment?: 'top' | 'middle' | 'bottom';
+}
+declare function readCellStyles(pkg: Package): readonly CellStyleEntry[];
 declare function readCellFormatCodes(pkg: Package): readonly (string | undefined)[];
 declare const DEFAULT_CELL_FORMAT_INDEX = 0;
 interface DeclaredNumberFormat {
   id: number;
   code: string;
 }
+interface CellFormatDecoration {
+  background?: Color;
+  borders?: ContentCellBorders;
+  alignment?: Alignment;
+  verticalAlignment?: 'top' | 'middle' | 'bottom';
+}
+interface DeclaredFill {
+  patternType: 'none' | 'gray125' | 'solid';
+  rgb?: string;
+}
+interface DeclaredBorder {
+  edges: {
+    left?: {
+      style: string;
+      rgb: string;
+    };
+    right?: {
+      style: string;
+      rgb: string;
+    };
+    top?: {
+      style: string;
+      rgb: string;
+    };
+    bottom?: {
+      style: string;
+      rgb: string;
+    };
+  };
+}
+interface CellFormatRecord {
+  numFmtId: number;
+  fillId: number;
+  borderId: number;
+  alignment?: {
+    horizontal?: Alignment;
+    vertical?: 'top' | 'middle' | 'bottom';
+  };
+}
 declare class CellFormatTable {
   private readonly indexBySignature;
-  private readonly numFmtIdByIndex;
+  private readonly records;
   private readonly declared;
-  intern(format: CellNumberFormat): number;
+  private readonly fillIndexByRgb;
+  private readonly fills;
+  private readonly borderIndexBySignature;
+  private readonly borders;
+  intern(format: CellNumberFormat, decoration?: CellFormatDecoration): number;
   declarations(): readonly DeclaredNumberFormat[];
   cellFormats(): readonly number[];
-  private declare;
+  cellFormatRecords(): readonly CellFormatRecord[];
+  fillDeclarations(): readonly DeclaredFill[];
+  borderDeclarations(): readonly DeclaredBorder[];
+  private declareNumberFormat;
+  private internFill;
+  private internBorder;
 }
+declare const RESERVED_FILL_INDICES: {
+  readonly none: 0;
+  readonly gray125: 1;
+  readonly firstReal: 2;
+};
+declare const RESERVED_BORDER_INDICES: {
+  readonly empty: 0;
+  readonly firstReal: 1;
+};
 //#endregion
-export { CellFormatTable, DEFAULT_CELL_FORMAT_INDEX, DeclaredNumberFormat, GENERAL_NUM_FMT_ID, readCellFormatCodes };
+export { CellFormatDecoration, CellFormatRecord, CellFormatTable, CellStyleEntry, DEFAULT_CELL_FORMAT_INDEX, DeclaredBorder, DeclaredFill, DeclaredNumberFormat, GENERAL_NUM_FMT_ID, RESERVED_BORDER_INDICES, RESERVED_FILL_INDICES, readCellFormatCodes, readCellStyles };

package/dist/typed/xlsx/styles.js

@@ -1,5 +1,6 @@
 import { attr, childrenWithTag, decodeEntities, rootElement } from "../util.js";
 import { BUILTIN_NUMBER_FORMATS } from "./number-format.js";
+import { colorToRgbHex, rgbHexToColor } from "document-schema.js";
 //#region src/typed/xlsx/styles.ts
 const STYLES_PATH = "xl/styles.xml";
 const GENERAL_NUM_FMT_ID = 0;
@@ -16,37 +17,249 @@ function readNumberFormatCodesById(styleSheet) {
 	}
 	return codes;
 }
-function readCellFormatCodes(pkg) {
+const BORDER_WIDTH_PT = {
+	hair: .5,
+	thin: .75,
+	medium: 1.5,
+	thick: 2.25
+};
+const XLSX_BORDER_STYLE = {
+	thin: {
+		weight: "thin",
+		pattern: "solid"
+	},
+	medium: {
+		weight: "medium",
+		pattern: "solid"
+	},
+	thick: {
+		weight: "thick",
+		pattern: "solid"
+	},
+	hair: {
+		weight: "hair",
+		pattern: "solid"
+	},
+	dashed: {
+		weight: "thin",
+		pattern: "dashed"
+	},
+	dotted: {
+		weight: "thin",
+		pattern: "dotted"
+	},
+	double: {
+		weight: "thin",
+		pattern: "double"
+	},
+	mediumDashed: {
+		weight: "medium",
+		pattern: "dashed"
+	},
+	dashDot: {
+		weight: "thin",
+		pattern: "dashed"
+	},
+	mediumDashDot: {
+		weight: "medium",
+		pattern: "dashed"
+	},
+	dashDotDot: {
+		weight: "thin",
+		pattern: "dashed"
+	},
+	mediumDashDotDot: {
+		weight: "medium",
+		pattern: "dashed"
+	},
+	slantDashDot: {
+		weight: "medium",
+		pattern: "dashed"
+	}
+};
+const BORDER_WEIGHT_UPPER_PT = {
+	hair: .625,
+	thin: 1.125,
+	medium: 1.875
+};
+function readColorRgb(container, colorTag) {
+	const colorEl = childrenWithTag(container, colorTag)[0];
+	if (colorEl === void 0) return;
+	const raw = attr(colorEl, "rgb");
+	if (raw === void 0) return;
+	const hex = raw.length >= 6 ? raw.slice(-6) : raw;
+	if (!/^[0-9a-fA-F]{6}$/.test(hex)) return;
+	try {
+		return rgbHexToColor(hex);
+	} catch {
+		return;
+	}
+}
+function readFillBackground(fill) {
+	const patternFill = childrenWithTag(fill, "patternFill")[0];
+	if (patternFill === void 0 || attr(patternFill, "patternType") !== "solid") return;
+	return readColorRgb(patternFill, "fgColor") ?? readColorRgb(patternFill, "bgColor");
+}
+function readFills(styleSheet) {
+	const fillsEl = childrenWithTag(styleSheet, "fills")[0];
+	if (fillsEl === void 0) return [];
+	return childrenWithTag(fillsEl, "fill").map(readFillBackground);
+}
+function readBorderEdge(border, edge) {
+	const edgeEl = childrenWithTag(border, edge)[0];
+	if (edgeEl === void 0) return;
+	const styleToken = attr(edgeEl, "style");
+	if (styleToken === void 0 || styleToken === "none") return;
+	const resolved = XLSX_BORDER_STYLE[styleToken];
+	if (resolved === void 0) return;
+	const color = readColorRgb(edgeEl, "color");
+	if (color === void 0) return;
+	const result = {
+		color,
+		widthPt: BORDER_WIDTH_PT[resolved.weight]
+	};
+	if (resolved.pattern !== "solid") result.style = resolved.pattern;
+	return result;
+}
+function readBorders(styleSheet) {
+	const bordersEl = childrenWithTag(styleSheet, "borders")[0];
+	if (bordersEl === void 0) return [];
+	return childrenWithTag(bordersEl, "border").map((border) => {
+		const left = readBorderEdge(border, "left");
+		const right = readBorderEdge(border, "right");
+		const top = readBorderEdge(border, "top");
+		const bottom = readBorderEdge(border, "bottom");
+		if (left === void 0 && right === void 0 && top === void 0 && bottom === void 0) return;
+		const result = {};
+		if (left !== void 0) result.left = left;
+		if (right !== void 0) result.right = right;
+		if (top !== void 0) result.top = top;
+		if (bottom !== void 0) result.bottom = bottom;
+		return result;
+	});
+}
+function readHorizontalAlignment(alignment) {
+	const value = attr(alignment, "horizontal");
+	if (value === "left" || value === "center" || value === "right" || value === "justify") return value;
+}
+function readVerticalAlignment(alignment) {
+	const value = attr(alignment, "vertical");
+	if (value === "top") return "top";
+	if (value === "center") return "middle";
+}
+function readAlignment(xf) {
+	const alignment = childrenWithTag(xf, "alignment")[0];
+	if (alignment === void 0) return {};
+	return {
+		alignment: readHorizontalAlignment(alignment),
+		verticalAlignment: readVerticalAlignment(alignment)
+	};
+}
+function readCellStyles(pkg) {
 	const styleSheet = rootElement(pkg.parts[STYLES_PATH]);
 	if (styleSheet === void 0) return [];
 	const cellXfsEl = childrenWithTag(styleSheet, "cellXfs")[0];
 	if (cellXfsEl === void 0) return [];
 	const codes = readNumberFormatCodesById(styleSheet);
+	const fills = readFills(styleSheet);
+	const borders = readBorders(styleSheet);
 	return childrenWithTag(cellXfsEl, "xf").map((xf) => {
-		const raw = attr(xf, "numFmtId");
-		const id = raw === void 0 ? 0 : Number.parseInt(raw, 10);
-		return Number.isInteger(id) ? codes.get(id) : void 0;
+		const numFmtRaw = attr(xf, "numFmtId");
+		const numFmtId = numFmtRaw === void 0 ? 0 : Number.parseInt(numFmtRaw, 10);
+		const entry = {};
+		if (Number.isInteger(numFmtId)) {
+			const code = codes.get(numFmtId);
+			if (code !== void 0) entry.numberFormatCode = code;
+		}
+		const fillId = parseChildIndex(attr(xf, "fillId"));
+		if (fillId !== void 0) entry.background = fills[fillId];
+		const borderId = parseChildIndex(attr(xf, "borderId"));
+		if (borderId !== void 0) entry.borders = borders[borderId];
+		const { alignment, verticalAlignment } = readAlignment(xf);
+		if (alignment !== void 0) entry.alignment = alignment;
+		if (verticalAlignment !== void 0) entry.verticalAlignment = verticalAlignment;
+		return entry;
 	});
 }
+function parseChildIndex(value) {
+	if (value === void 0) return;
+	const n = Number.parseInt(value, 10);
+	return Number.isInteger(n) ? n : void 0;
+}
+function readCellFormatCodes(pkg) {
+	return readCellStyles(pkg).map((entry) => entry.numberFormatCode);
+}
 const FIRST_CUSTOM_NUM_FMT_ID = 164;
 const DEFAULT_CELL_FORMAT_INDEX = 0;
-function signatureOf(format) {
+const NONE_FILL_INDEX = 0;
+const GRAY125_FILL_INDEX = 1;
+const FIRST_REAL_FILL_INDEX = 2;
+const EMPTY_BORDER_INDEX = 0;
+const FIRST_REAL_BORDER_INDEX = 1;
+function signatureOfNumberFormat(format) {
 	return format.kind === "builtin" ? `builtin:${format.id}` : `custom:${format.code}`;
 }
+const EMPTY_DECORATION = {};
+function signatureOfDecoration(decoration) {
+	let sig = "";
+	if (decoration.background !== void 0) sig += `|bg:${colorToRgbHex(decoration.background)}`;
+	const borders = decoration.borders;
+	if (borders !== void 0) for (const edge of [
+		"left",
+		"right",
+		"top",
+		"bottom"
+	]) {
+		const border = borders[edge];
+		if (border !== void 0) sig += `|${edge}:${border.style ?? "solid"}:${colorToRgbHex(border.color)}:${border.widthPt.toFixed(4)}`;
+	}
+	if (decoration.alignment !== void 0) sig += `|h:${decoration.alignment}`;
+	if (decoration.verticalAlignment !== void 0) sig += `|v:${decoration.verticalAlignment}`;
+	return sig;
+}
+function borderToXlsxStyle(border) {
+	switch (border.style) {
+		case "double": return "double";
+		case "dotted": return "dotted";
+		case "dashed": return border.widthPt >= BORDER_WEIGHT_UPPER_PT.thin ? "mediumDashed" : "dashed";
+		case "solid":
+		case void 0:
+			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.hair) return "hair";
+			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.thin) return "thin";
+			if (border.widthPt < BORDER_WEIGHT_UPPER_PT.medium) return "medium";
+			return "thick";
+	}
+}
 var CellFormatTable = class {
-	indexBySignature = /* @__PURE__ */ new Map([[signatureOf({
+	indexBySignature = /* @__PURE__ */ new Map([[signatureOfNumberFormat({
 		kind: "builtin",
 		id: 0
-	}), 0]]);
-	numFmtIdByIndex = [0];
+	}) + signatureOfDecoration(EMPTY_DECORATION), 0]]);
+	records = [{
+		numFmtId: 0,
+		fillId: NONE_FILL_INDEX,
+		borderId: EMPTY_BORDER_INDEX
+	}];
 	declared = [];
-	intern(format) {
-		const signature = signatureOf(format);
+	fillIndexByRgb = /* @__PURE__ */ new Map();
+	fills = [{ patternType: "none" }, { patternType: "gray125" }];
+	borderIndexBySignature = /* @__PURE__ */ new Map();
+	borders = [{ edges: {} }];
+	intern(format, decoration = EMPTY_DECORATION) {
+		const signature = signatureOfNumberFormat(format) + signatureOfDecoration(decoration);
 		const existing = this.indexBySignature.get(signature);
 		if (existing !== void 0) return existing;
-		const numFmtId = format.kind === "builtin" ? format.id : this.declare(format.code);
-		const index = this.numFmtIdByIndex.length;
-		this.numFmtIdByIndex.push(numFmtId);
+		const record = {
+			numFmtId: format.kind === "builtin" ? format.id : this.declareNumberFormat(format.code),
+			fillId: decoration.background === void 0 ? NONE_FILL_INDEX : this.internFill(decoration.background),
+			borderId: decoration.borders === void 0 ? EMPTY_BORDER_INDEX : this.internBorder(decoration.borders)
+		};
+		if (decoration.alignment !== void 0 || decoration.verticalAlignment !== void 0) record.alignment = {
+			horizontal: decoration.alignment,
+			vertical: decoration.verticalAlignment
+		};
+		const index = this.records.length;
+		this.records.push(record);
 		this.indexBySignature.set(signature, index);
 		return index;
 	}
@@ -54,9 +267,18 @@ var CellFormatTable = class {
 		return this.declared;
 	}
 	cellFormats() {
-		return this.numFmtIdByIndex;
+		return this.records.map((record) => record.numFmtId);
 	}
-	declare(code) {
+	cellFormatRecords() {
+		return this.records;
+	}
+	fillDeclarations() {
+		return this.fills;
+	}
+	borderDeclarations() {
+		return this.borders;
+	}
+	declareNumberFormat(code) {
 		const id = FIRST_CUSTOM_NUM_FMT_ID + this.declared.length;
 		this.declared.push({
 			id,
@@ -64,6 +286,54 @@ var CellFormatTable = class {
 		});
 		return id;
 	}
+	internFill(background) {
+		const rgb = colorToRgbHex(background);
+		const existing = this.fillIndexByRgb.get(rgb);
+		if (existing !== void 0) return existing;
+		const index = this.fills.length;
+		this.fills.push({
+			patternType: "solid",
+			rgb
+		});
+		this.fillIndexByRgb.set(rgb, index);
+		return index;
+	}
+	internBorder(borders) {
+		const edges = {};
+		let signature = "";
+		for (const edge of [
+			"left",
+			"right",
+			"top",
+			"bottom"
+		]) {
+			const border = borders[edge];
+			if (border !== void 0) {
+				const style = borderToXlsxStyle(border);
+				const rgb = colorToRgbHex(border.color);
+				edges[edge] = {
+					style,
+					rgb
+				};
+				signature += `|${edge}:${style}:${rgb}`;
+			}
+		}
+		const existing = this.borderIndexBySignature.get(signature);
+		if (existing !== void 0) return existing;
+		const index = this.borders.length;
+		this.borders.push({ edges });
+		this.borderIndexBySignature.set(signature, index);
+		return index;
+	}
+};
+const RESERVED_FILL_INDICES = {
+	none: NONE_FILL_INDEX,
+	gray125: GRAY125_FILL_INDEX,
+	firstReal: FIRST_REAL_FILL_INDEX
+};
+const RESERVED_BORDER_INDICES = {
+	empty: EMPTY_BORDER_INDEX,
+	firstReal: FIRST_REAL_BORDER_INDEX
 };
 //#endregion
-export { CellFormatTable, DEFAULT_CELL_FORMAT_INDEX, GENERAL_NUM_FMT_ID, readCellFormatCodes };
+export { CellFormatTable, DEFAULT_CELL_FORMAT_INDEX, GENERAL_NUM_FMT_ID, RESERVED_BORDER_INDICES, RESERVED_FILL_INDICES, readCellFormatCodes, readCellStyles };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "2.6.18",
+  "version": "2.7.0",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -69,7 +69,7 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "document-schema.js": "^2.3.3",
+    "document-schema.js": "^2.3.4",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"