ooxml.js 2.0.2 → 2.0.4

package/dist/index.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { XMLBuilder, XMLParser } from "fast-xml-parser";
 import { unzipSync, zipSync } from "fflate";
+import { AlignmentSchema, BoxSchema, COLOR_BLACK, ColorSchema, ContentBlockSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentRunSchema, ContentSectionSchema, ContentSectionSchema as ContentSectionSchema$1, ContentShapeSchema, ContentSlideSchema, ContentSlideSchema as ContentSlideSchema$1, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PAGE_SIZE_LETTER as PAGE_SIZE_LETTER$1, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, SLIDE_SIZE_WIDESCREEN as SLIDE_SIZE_WIDESCREEN$1, colorToRgbHex, isContentBlock, rgbHexToColor, rgbHexToColor as rgbHexToColor$1 } from "document-content-model";
 //#region src/model/node.ts
 const AttributeSchema = z.object({
 	name: z.string(),
@@ -27,14 +28,14 @@ const XmlPiSchema = z.object({
 	target: z.string(),
 	content: z.string()
 });
-function isRecord$2(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isAttribute(value) {
-	return isRecord$2(value) && typeof value.name === "string" && typeof value.value === "string";
+	return isRecord$1(value) && typeof value.name === "string" && typeof value.value === "string";
 }
 function isXmlNode(value) {
-	if (!isRecord$2(value)) return false;
+	if (!isRecord$1(value)) return false;
 	const t = value.type;
 	if (t === "text" || t === "cdata" || t === "comment") return typeof value.value === "string";
 	if (t === "declaration") return Array.isArray(value.attributes) && value.attributes.every(isAttribute);
@@ -129,7 +130,7 @@ const PARSER = new XMLParser({
 function parseXml(xml) {
 	return parseNodes(PARSER.parse(xml));
 }
-function isRecord$1(value) {
+function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isUnknownArray$1(value) {
@@ -144,7 +145,7 @@ function parseNodes(raw) {
 	return raw.map(parseNode);
 }
 function parseNode(raw) {
-	if (!isRecord$1(raw)) throw new Error("fast-xml-parser node was not an object");
+	if (!isRecord(raw)) throw new Error("fast-xml-parser node was not an object");
 	let tagKey;
 	for (const key of Object.keys(raw)) if (key !== ":@") {
 		if (tagKey !== void 0) throw new Error("XML node had multiple tag keys");
@@ -182,7 +183,7 @@ function parseNode(raw) {
 }
 function parseAttributes(raw) {
 	if (raw === void 0) return [];
-	if (!isRecord$1(raw)) throw new Error("XML attributes were not an object");
+	if (!isRecord(raw)) throw new Error("XML attributes were not an object");
 	const attrs = [];
 	for (const key of Object.keys(raw)) {
 		if (!key.startsWith("@_")) throw new Error(`unexpected attribute key without @_ prefix: ${key}`);
@@ -196,7 +197,7 @@ function parseAttributes(raw) {
 function scalarText(raw) {
 	if (!isUnknownArray$1(raw) || raw.length === 0) throw new Error("expected a scalar-text wrapper array");
 	const first = raw[0];
-	if (!isRecord$1(first)) throw new Error("scalar-text wrapper was not an object");
+	if (!isRecord(first)) throw new Error("scalar-text wrapper was not an object");
 	return asString(first["#text"]);
 }
 //#endregion
@@ -533,73 +534,7 @@ function encodeCompactPackage(cpkg) {
 	return z.encode(compactPackageCodec, cpkg);
 }
 //#endregion
-//#region src/typed/shared/geometry.ts
-const BoxSchema = z.object({
-	xPt: z.number(),
-	yPt: z.number(),
-	widthPt: z.number().nonnegative(),
-	heightPt: z.number().nonnegative()
-});
-const PageSizeSchema = z.object({
-	widthPt: z.number().positive(),
-	heightPt: z.number().positive()
-});
-const MarginsSchema = z.object({
-	topPt: z.number().nonnegative(),
-	rightPt: z.number().nonnegative(),
-	bottomPt: z.number().nonnegative(),
-	leftPt: z.number().nonnegative()
-});
-const PAGE_SIZE_LETTER = {
-	widthPt: 612,
-	heightPt: 792
-};
-const PAGE_SIZE_A4 = {
-	widthPt: 595.28,
-	heightPt: 841.89
-};
-const SLIDE_SIZE_WIDESCREEN = {
-	widthPt: 960,
-	heightPt: 540
-};
-const SLIDE_SIZE_STANDARD = {
-	widthPt: 720,
-	heightPt: 540
-};
-//#endregion
 //#region src/typed/shared/color.ts
-const ColorSchema = z.object({
-	r: z.number().min(0).max(1),
-	g: z.number().min(0).max(1),
-	b: z.number().min(0).max(1)
-});
-const COLOR_BLACK = {
-	r: 0,
-	g: 0,
-	b: 0
-};
-const HEX_COLOR_PATTERN = /^#?([0-9a-fA-F]{6})$/;
-const HEX_BYTE_MAX = 255;
-function rgbHexToColor(hex) {
-	const match = HEX_COLOR_PATTERN.exec(hex);
-	if (match === null) throw new Error(`not a 6-digit hex colour: ${hex}`);
-	const digits = match[1];
-	if (digits === void 0) throw new Error(`not a 6-digit hex colour: ${hex}`);
-	const r = Number.parseInt(digits.slice(0, 2), 16);
-	const g = Number.parseInt(digits.slice(2, 4), 16);
-	const b = Number.parseInt(digits.slice(4, 6), 16);
-	return {
-		r: r / HEX_BYTE_MAX,
-		g: g / HEX_BYTE_MAX,
-		b: b / HEX_BYTE_MAX
-	};
-}
-function toHexByte(component) {
-	return Math.round(component * HEX_BYTE_MAX).toString(16).padStart(2, "0");
-}
-function colorToRgbHex(color) {
-	return `${toHexByte(color.r)}${toHexByte(color.g)}${toHexByte(color.b)}`;
-}
 const OOXML_PERCENT_SCALE = 1e5;
 function clamp01(x) {
 	return Math.max(0, Math.min(1, x));
@@ -682,14 +617,6 @@ function applyColorTransforms(base, transforms) {
 	return color;
 }
 //#endregion
-//#region src/typed/shared/style.ts
-const AlignmentSchema = z.enum([
-	"left",
-	"center",
-	"right",
-	"justify"
-]);
-//#endregion
 //#region src/typed/shared/metadata.ts
 const DocumentMetadataSchema = z.object({
 	title: z.string().optional(),
@@ -729,103 +656,6 @@ function readCoreProperties(pkg) {
 	};
 }
 //#endregion
-//#region src/typed/shared/content.ts
-const ContentRunSchema = z.object({
-	text: z.string(),
-	bold: z.boolean().optional(),
-	italic: z.boolean().optional(),
-	underline: z.boolean().optional(),
-	strike: z.boolean().optional(),
-	fontFamily: z.string().optional(),
-	sizePt: z.number().positive().optional(),
-	color: ColorSchema.optional(),
-	hyperlink: z.string().optional()
-});
-const ContentListMembershipSchema = z.object({
-	numId: z.string(),
-	level: z.number().int().nonnegative()
-});
-const ContentParagraphSchema = z.object({
-	kind: z.literal("paragraph"),
-	runs: z.array(ContentRunSchema),
-	styleId: z.string().optional(),
-	alignment: AlignmentSchema.optional(),
-	list: ContentListMembershipSchema.optional(),
-	spacingBeforePt: z.number().optional(),
-	spacingAfterPt: z.number().optional(),
-	lineSpacing: z.number().positive().optional(),
-	indentLeftPt: z.number().optional(),
-	indentFirstLinePt: z.number().optional()
-});
-const ContentImageBlockSchema = z.object({
-	kind: z.literal("image"),
-	format: z.enum(["png", "jpeg"]),
-	base64: z.string(),
-	widthPt: z.number().positive(),
-	heightPt: z.number().positive(),
-	altText: z.string().optional()
-});
-const ContentPageBreakSchema = z.object({ kind: z.literal("pageBreak") });
-function isRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isContentRun(value) {
-	return isRecord(value) && typeof value.text === "string";
-}
-function isContentTableCell(value) {
-	return isRecord(value) && Array.isArray(value.blocks) && value.blocks.every(isContentBlock);
-}
-function isContentTableRow(value) {
-	return isRecord(value) && Array.isArray(value.cells) && value.cells.every(isContentTableCell) && (value.heightPt === void 0 || typeof value.heightPt === "number");
-}
-function isContentBlock(value) {
-	if (!isRecord(value)) return false;
-	const kind = value.kind;
-	if (kind === "paragraph") return Array.isArray(value.runs) && value.runs.every(isContentRun);
-	if (kind === "image") return (value.format === "png" || value.format === "jpeg") && typeof value.base64 === "string" && typeof value.widthPt === "number" && typeof value.heightPt === "number";
-	if (kind === "pageBreak") return true;
-	if (kind === "table") return Array.isArray(value.rows) && value.rows.every(isContentTableRow) && Array.isArray(value.columnWidthsPt) && value.columnWidthsPt.every((w) => typeof w === "number");
-	return false;
-}
-const ContentBlockSchema = z.custom(isContentBlock);
-const ContentTableCellSchema = z.object({
-	blocks: z.array(ContentBlockSchema),
-	colSpan: z.number().int().positive().optional(),
-	rowSpan: z.number().int().positive().optional(),
-	background: ColorSchema.optional()
-});
-const ContentTableRowSchema = z.object({
-	cells: z.array(ContentTableCellSchema),
-	heightPt: z.number().positive().optional()
-});
-const ContentTableSchema = z.object({
-	kind: z.literal("table"),
-	rows: z.array(ContentTableRowSchema),
-	columnWidthsPt: z.array(z.number().positive())
-});
-const ContentSectionSchema = z.object({
-	pageSize: PageSizeSchema,
-	margins: MarginsSchema,
-	blocks: z.array(ContentBlockSchema)
-});
-const ContentShapeSchema = z.object({
-	name: z.string().optional(),
-	frame: BoxSchema,
-	rotationDeg: z.number().optional(),
-	insetLeftPt: z.number().nonnegative(),
-	insetTopPt: z.number().nonnegative(),
-	insetRightPt: z.number().nonnegative(),
-	insetBottomPt: z.number().nonnegative(),
-	fontScale: z.number().positive().optional(),
-	lineSpacingReduction: z.number().nonnegative().optional(),
-	blocks: z.array(ContentBlockSchema)
-});
-const ContentSlideSchema = z.object({
-	size: PageSizeSchema,
-	shapes: z.array(ContentShapeSchema),
-	notes: z.string()
-});
-//#endregion
 //#region src/image/sniff.ts
 const PNG_SIGNATURE = [
 	137,
@@ -908,11 +738,11 @@ const CLR_SCHEME_SLOTS = [
 function readThemeSlotColor(colorEl) {
 	if (colorEl.tag === "a:srgbClr") {
 		const val = attr(colorEl, "val");
-		return val === void 0 ? void 0 : rgbHexToColor(val);
+		return val === void 0 ? void 0 : rgbHexToColor$1(val);
 	}
 	if (colorEl.tag === "a:sysClr") {
 		const lastClr = attr(colorEl, "lastClr");
-		if (lastClr !== void 0) return rgbHexToColor(lastClr);
+		if (lastClr !== void 0) return rgbHexToColor$1(lastClr);
 		return attr(colorEl, "val") === "window" ? {
 			r: 1,
 			g: 1,
@@ -1001,7 +831,7 @@ function readSchemeColor(schemeClrEl, colorMap, theme) {
 }
 function readSrgbColor(srgbClrEl) {
 	const val = attr(srgbClrEl, "val");
-	return val === void 0 ? void 0 : applyColorTransforms(rgbHexToColor(val), readColorTransforms(srgbClrEl));
+	return val === void 0 ? void 0 : applyColorTransforms(rgbHexToColor$1(val), readColorTransforms(srgbClrEl));
 }
 function readSolidFillColor(solidFillEl, colorMap, theme) {
 	if (solidFillEl === void 0) return;
@@ -1078,7 +908,7 @@ function readUnderline(u) {
 function readRunColor(colorEl) {
 	if (colorEl === void 0) return;
 	const val = attr(colorEl, "w:val");
-	return val === void 0 || val === "auto" ? void 0 : rgbHexToColor(val);
+	return val === void 0 || val === "auto" ? void 0 : rgbHexToColor$1(val);
 }
 function readRunFontFamily(rFonts, theme) {
 	if (rFonts === void 0) return;
@@ -1196,7 +1026,7 @@ const FootnoteSchema = z.object({
 });
 const DocxDocumentSchema = z.object({
 	metadata: DocumentMetadataSchema,
-	sections: z.array(ContentSectionSchema),
+	sections: z.array(ContentSectionSchema$1),
 	comments: z.array(CommentSchema),
 	footnotes: z.array(FootnoteSchema),
 	headers: z.array(z.string()),
@@ -1216,7 +1046,7 @@ function readPageSize(sectPr) {
 	const pgSz = childrenWithTag(sectPr, "w:pgSz")[0];
 	const w = pgSz === void 0 ? void 0 : attr(pgSz, "w:w");
 	const h = pgSz === void 0 ? void 0 : attr(pgSz, "w:h");
-	return w === void 0 || h === void 0 ? PAGE_SIZE_LETTER : {
+	return w === void 0 || h === void 0 ? PAGE_SIZE_LETTER$1 : {
 		widthPt: twipsToPt(Number(w)),
 		heightPt: twipsToPt(Number(h))
 	};
@@ -1332,7 +1162,7 @@ function readParagraph$1(paragraph, context, rels) {
 function readCellShading(tcPr) {
 	const shd = tcPr === void 0 ? void 0 : childrenWithTag(tcPr, "w:shd")[0];
 	const fill = shd === void 0 ? void 0 : attr(shd, "w:fill");
-	return fill === void 0 || fill === "auto" || fill === "none" ? void 0 : rgbHexToColor(fill);
+	return fill === void 0 || fill === "auto" || fill === "none" ? void 0 : rgbHexToColor$1(fill);
 }
 function readRawCell(tc, context, rels) {
 	const tcPr = childrenWithTag(tc, "w:tcPr")[0];
@@ -1432,7 +1262,7 @@ function readSections(body, context, rels) {
 		currentBlocks.push(...readBodyBlocks([node], context, rels));
 	}
 	if (currentBlocks.length > 0 || sections.length === 0) sections.push({
-		pageSize: PAGE_SIZE_LETTER,
+		pageSize: PAGE_SIZE_LETTER$1,
 		margins: DEFAULT_MARGINS,
 		blocks: currentBlocks
 	});
@@ -1592,7 +1422,7 @@ function resolveDefaultRunProperties(placeholderType, level, context) {
 //#region src/typed/pptx/read.ts
 const PptxDocumentSchema = z.object({
 	metadata: DocumentMetadataSchema,
-	slides: z.array(ContentSlideSchema)
+	slides: z.array(ContentSlideSchema$1)
 });
 const PRESENTATION_PATH = "ppt/presentation.xml";
 const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
@@ -1600,7 +1430,7 @@ function readSlideSize(presentationRoot) {
 	const sldSz = presentationRoot === void 0 ? void 0 : childrenWithTag(presentationRoot, "p:sldSz")[0];
 	const cx = sldSz === void 0 ? void 0 : attr(sldSz, "cx");
 	const cy = sldSz === void 0 ? void 0 : attr(sldSz, "cy");
-	return cx === void 0 || cy === void 0 ? SLIDE_SIZE_WIDESCREEN : {
+	return cx === void 0 || cy === void 0 ? SLIDE_SIZE_WIDESCREEN$1 : {
 		widthPt: emuToPt(Number(cx)),
 		heightPt: emuToPt(Number(cy))
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -43,6 +43,7 @@
     "typecheck": "tsc --noEmit",
     "test": "vitest run --project unit",
     "test:watch": "vitest --project unit",
+    "test:coverage": "vitest run --project unit --coverage",
     "test:smoke": "tsdown && vitest run --project smoke",
     "prepare": "husky",
     "release": "semantic-release"
@@ -60,6 +61,7 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
+    "document-content-model": "^1.0.0",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"
@@ -72,6 +74,7 @@
     "@semantic-release/changelog": "^7.0.0",
     "@semantic-release/git": "^11.0.1",
     "@types/node": "^26.1.1",
+    "@vitest/coverage-v8": "^4.1.10",
     "eslint": "^10.8.0",
     "globals": "^17.8.0",
     "husky": "^9.1.7",