ooxml.js 6.3.7 → 7.0.0

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

@@ -1,12 +1,12 @@
 import { l as XmlElement } from "../../node-B6JX5CRX.cjs";
 import { r as Package } from "../../package-DMk9fuTI.cjs";
 import { CellNumberFormat } from "./number-format.cjs";
-import { Alignment, Color, ContentCellBorders } from "document-schema.js";
+import { Alignment, Color, ContentCellBorders, ContentCellFill, ContentCellPatternType } from "document-schema.js";
 //#region src/typed/xlsx/styles.d.ts
 declare const GENERAL_NUM_FMT_ID = 0;
 interface CellStyleEntry {
   numberFormatCode?: string;
-  background?: Color;
+  background?: ContentCellFill;
   borders?: ContentCellBorders;
   alignment?: Alignment;
   verticalAlignment?: "top" | "middle" | "bottom";
@@ -22,15 +22,24 @@ interface DeclaredNumberFormat {
   code: string;
 }
 interface CellFormatDecoration {
-  background?: Color;
+  background?: ContentCellFill;
   borders?: ContentCellBorders;
   alignment?: Alignment;
   verticalAlignment?: "top" | "middle" | "bottom";
 }
-interface DeclaredFill {
-  patternType: "none" | "gray125" | "solid";
-  rgb?: string;
-}
+type DeclaredFill = {
+  kind: "none";
+} | {
+  kind: "gray125";
+} | {
+  kind: "solid";
+  rgb: string;
+} | {
+  kind: "pattern";
+  patternType: ContentCellPatternType;
+  fgRgb?: string;
+  bgRgb?: string;
+};
 interface DeclaredBorder {
   edges: {
     left?: {
@@ -64,7 +73,7 @@ declare class CellFormatTable {
   private readonly indexBySignature;
   private readonly records;
   private readonly declared;
-  private readonly fillIndexByRgb;
+  private readonly fillIndexBySignature;
   private readonly fills;
   private readonly borderIndexBySignature;
   private readonly borders;

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

@@ -1,12 +1,12 @@
 import { l as XmlElement } from "../../node-B6JX5CRX.js";
 import { r as Package } from "../../package-otZYrxiO.js";
 import { CellNumberFormat } from "./number-format.js";
-import { Alignment, Color, ContentCellBorders } from "document-schema.js";
+import { Alignment, Color, ContentCellBorders, ContentCellFill, ContentCellPatternType } from "document-schema.js";
 //#region src/typed/xlsx/styles.d.ts
 declare const GENERAL_NUM_FMT_ID = 0;
 interface CellStyleEntry {
   numberFormatCode?: string;
-  background?: Color;
+  background?: ContentCellFill;
   borders?: ContentCellBorders;
   alignment?: Alignment;
   verticalAlignment?: "top" | "middle" | "bottom";
@@ -22,15 +22,24 @@ interface DeclaredNumberFormat {
   code: string;
 }
 interface CellFormatDecoration {
-  background?: Color;
+  background?: ContentCellFill;
   borders?: ContentCellBorders;
   alignment?: Alignment;
   verticalAlignment?: "top" | "middle" | "bottom";
 }
-interface DeclaredFill {
-  patternType: "none" | "gray125" | "solid";
-  rgb?: string;
-}
+type DeclaredFill = {
+  kind: "none";
+} | {
+  kind: "gray125";
+} | {
+  kind: "solid";
+  rgb: string;
+} | {
+  kind: "pattern";
+  patternType: ContentCellPatternType;
+  fgRgb?: string;
+  bgRgb?: string;
+};
 interface DeclaredBorder {
   edges: {
     left?: {
@@ -64,7 +73,7 @@ declare class CellFormatTable {
   private readonly indexBySignature;
   private readonly records;
   private readonly declared;
-  private readonly fillIndexByRgb;
+  private readonly fillIndexBySignature;
   private readonly fills;
   private readonly borderIndexBySignature;
   private readonly borders;

package/dist/typed/xlsx/styles.js

@@ -1,5 +1,5 @@
 import { attr, childrenWithTag, decodeEntities, rootElement } from "../util.js";
-import { BORDER_WIDTH_PT, borderWeightForWidthPt, colorToRgbHex, dashedBorderWeightForWidthPt, rgbHexToColor } from "document-schema.js";
+import { BORDER_WIDTH_PT, borderWeightForWidthPt, colorToRgbHex, dashedBorderWeightForWidthPt, rgbHexToColor, unrecognizedFillKind } from "document-schema.js";
 import { BUILTIN_NUMBER_FORMATS } from "excel-number-format";
 //#region src/typed/xlsx/styles.ts
 const STYLES_PATH = "xl/styles.xml";
@@ -17,6 +17,29 @@ function readNumberFormatCodesById(styleSheet) {
 	}
 	return codes;
 }
+const SPREADSHEETML_PATTERN_TYPES = /* @__PURE__ */ new Set([
+	"mediumGray",
+	"darkGray",
+	"lightGray",
+	"darkHorizontal",
+	"darkVertical",
+	"darkDown",
+	"darkUp",
+	"darkGrid",
+	"darkTrellis",
+	"lightHorizontal",
+	"lightVertical",
+	"lightDown",
+	"lightUp",
+	"lightGrid",
+	"lightTrellis",
+	"gray125",
+	"gray0625"
+]);
+/** Whether `value` is one of ST_PatternType's own seventeen non-solid, non-none members -- the only ContentCellPatternType members a `<patternFill>` can ever name, so a value this returns true for can be used as a ContentCellPatternType directly with no further mapping. */
+function isXlsxPatternType(value) {
+	return SPREADSHEETML_PATTERN_TYPES.has(value);
+}
 const XLSX_BORDER_STYLE = {
 	thin: {
 		weight: "thin",
@@ -88,8 +111,24 @@ function readColorRgb(container, colorTag) {
 }
 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");
+	if (patternFill === void 0) return;
+	const patternType = attr(patternFill, "patternType");
+	if (patternType === "solid") {
+		const color = readColorRgb(patternFill, "fgColor") ?? readColorRgb(patternFill, "bgColor");
+		return color === void 0 ? void 0 : {
+			kind: "solid",
+			color
+		};
+	}
+	if (patternType === void 0 || !isXlsxPatternType(patternType)) return;
+	const foregroundColor = readColorRgb(patternFill, "fgColor");
+	const backgroundColor = readColorRgb(patternFill, "bgColor");
+	return {
+		kind: "pattern",
+		patternType,
+		...foregroundColor !== void 0 ? { foregroundColor } : {},
+		...backgroundColor !== void 0 ? { backgroundColor } : {}
+	};
 }
 function readFills(styleSheet) {
 	const fillsEl = childrenWithTag(styleSheet, "fills")[0];
@@ -198,9 +237,12 @@ function signatureOfNumberFormat(format) {
 	return format.kind === "builtin" ? `builtin:${format.id}` : `custom:${format.code}`;
 }
 const EMPTY_DECORATION = {};
+function fillSignature(fill) {
+	return fill.kind === "solid" ? `solid:${colorToRgbHex(fill.color)}` : `pattern:${fill.patternType}:${fill.foregroundColor === void 0 ? "" : colorToRgbHex(fill.foregroundColor)}:${fill.backgroundColor === void 0 ? "" : colorToRgbHex(fill.backgroundColor)}`;
+}
 function signatureOfDecoration(decoration) {
 	let sig = "";
-	if (decoration.background !== void 0) sig += `|bg:${colorToRgbHex(decoration.background)}`;
+	if (decoration.background !== void 0) sig += `|bg:${fillSignature(decoration.background)}`;
 	const borders = decoration.borders;
 	if (borders !== void 0) for (const edge of [
 		"left",
@@ -235,8 +277,8 @@ var CellFormatTable = class {
 		borderId: EMPTY_BORDER_INDEX
 	}];
 	declared = [];
-	fillIndexByRgb = /* @__PURE__ */ new Map();
-	fills = [{ patternType: "none" }, { patternType: "gray125" }];
+	fillIndexBySignature = /* @__PURE__ */ new Map();
+	fills = [{ kind: "none" }, { kind: "gray125" }];
 	borderIndexBySignature = /* @__PURE__ */ new Map();
 	borders = [{ edges: {} }];
 	intern(format, decoration = EMPTY_DECORATION) {
@@ -281,15 +323,31 @@ var CellFormatTable = class {
 		return id;
 	}
 	internFill(background) {
-		const rgb = colorToRgbHex(background);
-		const existing = this.fillIndexByRgb.get(rgb);
+		const signature = fillSignature(background);
+		const existing = this.fillIndexBySignature.get(signature);
 		if (existing !== void 0) return existing;
+		let declared;
+		switch (background.kind) {
+			case "solid":
+				declared = {
+					kind: "solid",
+					rgb: colorToRgbHex(background.color)
+				};
+				break;
+			case "pattern":
+				if (!isXlsxPatternType(background.patternType)) throw new Error(`ooxml.js cannot write a '${background.patternType}' cell fill: ECMA-376's own ST_PatternType vocabulary has no member for it, that pattern name belonging only to WordprocessingML's ST_Shd half of ContentCellPatternType's shared vocabulary`);
+				declared = {
+					kind: "pattern",
+					patternType: background.patternType,
+					...background.foregroundColor === void 0 ? {} : { fgRgb: colorToRgbHex(background.foregroundColor) },
+					...background.backgroundColor === void 0 ? {} : { bgRgb: colorToRgbHex(background.backgroundColor) }
+				};
+				break;
+			default: throw new Error(`ooxml.js cannot write a cell fill with kind '${unrecognizedFillKind(background)}': ContentCellFillSchema's discriminated union only defines 'solid' and 'pattern'`);
+		}
 		const index = this.fills.length;
-		this.fills.push({
-			patternType: "solid",
-			rgb
-		});
-		this.fillIndexByRgb.set(rgb, index);
+		this.fills.push(declared);
+		this.fillIndexBySignature.set(signature, index);
 		return index;
 	}
 	internBorder(borders) {

package/dist/typed/xlsx/units.cjs

@@ -5,6 +5,7 @@ const PIXELS_PER_INCH = 96;
 const MAX_DIGIT_WIDTH_PX = 7;
 const DEFAULT_ROW_HEIGHT_PT = 15;
 const DEFAULT_COLUMN_WIDTH_CHARS = 8.43;
+const COLUMN_WIDTH_CHARS_DECIMAL_PLACES = 2;
 function columnWidthCharsToPt(width) {
 	const digitWidthAllowance = Math.trunc(128 / 7);
 	return Math.trunc((256 * width + digitWidthAllowance) / 256 * 7) / 96 * 72;
@@ -12,9 +13,12 @@ function columnWidthCharsToPt(width) {
 function ptToColumnWidthChars(widthPt) {
 	const pixels = widthPt / 72 * 96;
 	const digitWidthAllowance = Math.trunc(128 / 7);
-	return pixels / 7 - digitWidthAllowance / 256;
+	const exact = pixels / 7 - digitWidthAllowance / 256;
+	const scale = 100;
+	return Math.max(0, Math.ceil(exact * scale) / scale);
 }
 //#endregion
+exports.COLUMN_WIDTH_CHARS_DECIMAL_PLACES = COLUMN_WIDTH_CHARS_DECIMAL_PLACES;
 exports.DEFAULT_COLUMN_WIDTH_CHARS = DEFAULT_COLUMN_WIDTH_CHARS;
 exports.DEFAULT_ROW_HEIGHT_PT = DEFAULT_ROW_HEIGHT_PT;
 exports.MAX_DIGIT_WIDTH_PX = MAX_DIGIT_WIDTH_PX;

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

@@ -3,7 +3,8 @@ declare const PIXELS_PER_INCH = 96;
 declare const MAX_DIGIT_WIDTH_PX = 7;
 declare const DEFAULT_ROW_HEIGHT_PT = 15;
 declare const DEFAULT_COLUMN_WIDTH_CHARS = 8.43;
+declare const COLUMN_WIDTH_CHARS_DECIMAL_PLACES = 2;
 declare function columnWidthCharsToPt(width: number): number;
 declare function ptToColumnWidthChars(widthPt: number): number;
 //#endregion
-export { DEFAULT_COLUMN_WIDTH_CHARS, DEFAULT_ROW_HEIGHT_PT, MAX_DIGIT_WIDTH_PX, PIXELS_PER_INCH, columnWidthCharsToPt, ptToColumnWidthChars };
+export { COLUMN_WIDTH_CHARS_DECIMAL_PLACES, DEFAULT_COLUMN_WIDTH_CHARS, DEFAULT_ROW_HEIGHT_PT, MAX_DIGIT_WIDTH_PX, PIXELS_PER_INCH, columnWidthCharsToPt, ptToColumnWidthChars };

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

@@ -3,7 +3,8 @@ declare const PIXELS_PER_INCH = 96;
 declare const MAX_DIGIT_WIDTH_PX = 7;
 declare const DEFAULT_ROW_HEIGHT_PT = 15;
 declare const DEFAULT_COLUMN_WIDTH_CHARS = 8.43;
+declare const COLUMN_WIDTH_CHARS_DECIMAL_PLACES = 2;
 declare function columnWidthCharsToPt(width: number): number;
 declare function ptToColumnWidthChars(widthPt: number): number;
 //#endregion
-export { DEFAULT_COLUMN_WIDTH_CHARS, DEFAULT_ROW_HEIGHT_PT, MAX_DIGIT_WIDTH_PX, PIXELS_PER_INCH, columnWidthCharsToPt, ptToColumnWidthChars };
+export { COLUMN_WIDTH_CHARS_DECIMAL_PLACES, DEFAULT_COLUMN_WIDTH_CHARS, DEFAULT_ROW_HEIGHT_PT, MAX_DIGIT_WIDTH_PX, PIXELS_PER_INCH, columnWidthCharsToPt, ptToColumnWidthChars };

package/dist/typed/xlsx/units.js

@@ -4,6 +4,7 @@ const PIXELS_PER_INCH = 96;
 const MAX_DIGIT_WIDTH_PX = 7;
 const DEFAULT_ROW_HEIGHT_PT = 15;
 const DEFAULT_COLUMN_WIDTH_CHARS = 8.43;
+const COLUMN_WIDTH_CHARS_DECIMAL_PLACES = 2;
 function columnWidthCharsToPt(width) {
 	const digitWidthAllowance = Math.trunc(128 / 7);
 	return Math.trunc((256 * width + digitWidthAllowance) / 256 * 7) / 96 * 72;
@@ -11,7 +12,9 @@ function columnWidthCharsToPt(width) {
 function ptToColumnWidthChars(widthPt) {
 	const pixels = widthPt / 72 * 96;
 	const digitWidthAllowance = Math.trunc(128 / 7);
-	return pixels / 7 - digitWidthAllowance / 256;
+	const exact = pixels / 7 - digitWidthAllowance / 256;
+	const scale = 100;
+	return Math.max(0, Math.ceil(exact * scale) / scale);
 }
 //#endregion
-export { DEFAULT_COLUMN_WIDTH_CHARS, DEFAULT_ROW_HEIGHT_PT, MAX_DIGIT_WIDTH_PX, PIXELS_PER_INCH, columnWidthCharsToPt, ptToColumnWidthChars };
+export { COLUMN_WIDTH_CHARS_DECIMAL_PLACES, DEFAULT_COLUMN_WIDTH_CHARS, DEFAULT_ROW_HEIGHT_PT, MAX_DIGIT_WIDTH_PX, PIXELS_PER_INCH, columnWidthCharsToPt, ptToColumnWidthChars };

package/dist/{write-BGTpp3RS.d.cts → write-C81qQcnp.d.cts}

@@ -1,5 +1,5 @@
 import { r as Package } from "./package-DMk9fuTI.cjs";
-import { t as DocumentMetadata } from "./metadata-C74-XCrx.cjs";
+import { n as DocumentMetadata } from "./metadata-Di0PfE5h.cjs";
 import { ContentDocument, ContentSection } from "document-schema.js";
 //#region src/typed/docx/write.d.ts
 interface DocxContent {

package/dist/{write-Cnfu3zdB.d.ts → write-h7kU0YPl.d.ts}

@@ -1,5 +1,5 @@
 import { r as Package } from "./package-otZYrxiO.js";
-import { t as DocumentMetadata } from "./metadata-Bjfa88HQ.js";
+import { n as DocumentMetadata } from "./metadata-_k8PRY6p.js";
 import { ContentDocument, ContentSection } from "document-schema.js";
 //#region src/typed/docx/write.d.ts
 interface DocxContent {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "6.3.7",
+  "version": "7.0.0",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -80,9 +80,9 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "^1.4.2",
-    "document-schema.js": "^5.6.0",
-    "excel-number-format": "^1.0.1",
+    "archive-codec": "^1.4.3",
+    "document-schema.js": "^6.0.0",
+    "excel-number-format": "^1.0.2",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"