ooxml.js 2.2.2 → 2.2.3

package/README.md

@@ -176,13 +176,13 @@ The package is layered from a lossless core outward to lossy convenience views:
 - **`src/package-io/`** — `read.ts` and `write.ts` sit between the zip and XML layers: unzip a package into path -> bytes, classify each entry as XML or binary (`looksLikeXml` sniffs the leading non-whitespace byte for `<`), and parse/serialize accordingly.
 - **`src/codec.ts`** — the public round-trip surface: `packageCodec`/`xmlCodec` are `z.codec()` pairs, and `decodePackage`/`encodePackage` are the ergonomic wrappers around them.
 - **`src/compact.ts`** — the ooxml.js format: `compactCodec` (`z.codec(PackageSchema, CompactPackageSchema, …)`) maps `Package ⇄ CompactPackage`, with `toCompact`/`fromCompact` as the ergonomic wrappers. `compactPackageCodec` composes `packageCodec` and `compactCodec` into a direct bytes ⇄ `CompactPackage` codec (`decodeCompactPackage`/`encodeCompactPackage`), so all three format pairs — bytes/`Package`, `Package`/`CompactPackage`, bytes/`CompactPackage` — have a named codec rather than requiring callers to chain two.
-- **`src/typed/`** — one-way, lossy projections that read the generic `Package` into ergonomic document/presentation/workbook models. `docx/` and `pptx/` share one block content model — `ContentParagraph`/`ContentTable`/`ContentImageBlock`/`ContentPageBreak`, discriminated as `ContentBlock`, imported from the sibling [`document-content-model`](https://github.com/ExaDev/document-schema.js) package rather than defined here (see below) — instead of each keeping its own, disjoint shape: `readDocx` resolves the full WordprocessingML style cascade (`docx/styles.ts`: `docDefaults` → named-style `basedOn` chains → paragraph-mark run properties → character styles → direct formatting) into ordered `sections` of paragraphs/tables/page-breaks (document order preserved, including inside tables), plus `comments`, `footnotes`, and `headers`/`footers`; `readPptx` resolves the placeholder → layout → master → theme inheritance cascade (`pptx/inherit.ts`) into `slides` of positioned, styled `shapes` (geometry, run/paragraph formatting, embedded images, tables, speaker notes) in presentation order (`p:sldIdLst`, never slide filename order); `readXlsx` covers cell values and formulas, merged ranges and defined names. `typed/shared/` holds the OOXML-specific primitives both `docx/` and `pptx/` build on: `drawingml.ts` (DrawingML `a:xfrm` geometry, theme/colour resolution, group-transform composition — including `ColorTransform`/`applyColorTransforms`, the shade/tint/lumMod/lumOff cascade maths, which stays here rather than in `document-content-model` since it's OOXML-cascade-resolution logic, not a content-model shape), `units.ts` (OOXML unit conversions — EMU/twip/half-point), `metadata.ts` (`docProps/core.xml` + `docProps/app.xml` → `DocumentMetadata`, shared verbatim across docx/pptx/xlsx), and `source-path.ts` (stamps a deterministic, document-order path like `sections[0].blocks[2].runs[1]` onto every `ContentRun`/`ContentBlock`/`ContentShape`, so a downstream consumer can trace a rendered item back to where it came from — see `document-content-model`'s own `sourcePath` field). Geometry (`Box`/`PageSize`/`Margins`), colour (`Color`/`ColorSchema`), and alignment (`Alignment`) types are imported from `document-content-model`, not defined locally. `src/image/sniff.ts` (magic-byte PNG/JPEG detection) supports `readPptx`'s picture-shape reading. None of `readDocx`/`readPptx`/`readXlsx` can be encoded back to a `Package` — round-tripping those always goes through `decodePackage`/`encodePackage`, never through a typed view; see `src/typed/xlsx/` below for this package's one write-back exception. `typed/util.ts` holds the shared XML-walking helpers (`walk`, `elementsWithTag`, `childrenWithTag`, `attr`, `rootElement`, `textContent`, entity decoding, `resolveRelationships`) every typed reader builds on.
+- **`src/typed/`** — one-way, lossy projections that read the generic `Package` into ergonomic document/presentation/workbook models. `docx/` and `pptx/` share one block content model — `ContentParagraph`/`ContentTable`/`ContentImageBlock`/`ContentPageBreak`, discriminated as `ContentBlock`, imported from the sibling [`document-schema.js`](https://github.com/ExaDev/document-schema.js) package rather than defined here (see below) — instead of each keeping its own, disjoint shape: `readDocx` resolves the full WordprocessingML style cascade (`docx/styles.ts`: `docDefaults` → named-style `basedOn` chains → paragraph-mark run properties → character styles → direct formatting) into ordered `sections` of paragraphs/tables/page-breaks (document order preserved, including inside tables), plus `comments`, `footnotes`, and `headers`/`footers`; `readPptx` resolves the placeholder → layout → master → theme inheritance cascade (`pptx/inherit.ts`) into `slides` of positioned, styled `shapes` (geometry, run/paragraph formatting, embedded images, tables, speaker notes) in presentation order (`p:sldIdLst`, never slide filename order); `readXlsx` covers cell values and formulas, merged ranges and defined names. `typed/shared/` holds the OOXML-specific primitives both `docx/` and `pptx/` build on: `drawingml.ts` (DrawingML `a:xfrm` geometry, theme/colour resolution, group-transform composition — including `ColorTransform`/`applyColorTransforms`, the shade/tint/lumMod/lumOff cascade maths, which stays here rather than in `document-schema.js` since it's OOXML-cascade-resolution logic, not a content-model shape), `units.ts` (OOXML unit conversions — EMU/twip/half-point), `metadata.ts` (`docProps/core.xml` + `docProps/app.xml` → `DocumentMetadata`, shared verbatim across docx/pptx/xlsx), and `source-path.ts` (stamps a deterministic, document-order path like `sections[0].blocks[2].runs[1]` onto every `ContentRun`/`ContentBlock`/`ContentShape`, so a downstream consumer can trace a rendered item back to where it came from — see `document-schema.js`'s own `sourcePath` field). Geometry (`Box`/`PageSize`/`Margins`), colour (`Color`/`ColorSchema`), and alignment (`Alignment`) types are imported from `document-schema.js`, not defined locally. `src/image/sniff.ts` (magic-byte PNG/JPEG detection) supports `readPptx`'s picture-shape reading. None of `readDocx`/`readPptx`/`readXlsx` can be encoded back to a `Package` — round-tripping those always goes through `decodePackage`/`encodePackage`, never through a typed view; see `src/typed/xlsx/` below for this package's one write-back exception. `typed/util.ts` holds the shared XML-walking helpers (`walk`, `elementsWithTag`, `childrenWithTag`, `attr`, `rootElement`, `textContent`, entity decoding, `resolveRelationships`) every typed reader builds on.
 - **`src/typed/xlsx/`** — a second, `ContentDocument`-shaped xlsx pair alongside the lossy `readXlsx` above, not a replacement for it (both stay exported; they serve different callers). `content.ts`'s `readXlsxContent` reads a `Package` straight into `ContentDocument` (`kind: 'spreadsheet'`): real column widths, row heights, hidden rows/columns, merged ranges (resolved onto the anchor cell's `colSpan`/`rowSpan`), every cell value kind xlsx itself distinguishes, and a genuinely populated `ContentSheetPrintSettings` — matching the bar the sibling `odf.js` package's own `readOds` already sets, rather than `readXlsx`'s flattened `XlsxWorkbook`/`XlsxCell` shape. `build.ts`'s `buildXlsxPackage` is `readXlsxContent`'s write-side inverse and this package's first writer of genuinely new content: given a `ContentDocument`, it constructs a complete xlsx `Package` from scratch — workbook, worksheets, a minimal-but-real `xl/styles.xml`, shared strings, core/app properties — via `xml/fragment.ts`'s `el`/`txt`, rather than editing whatever package `readXlsxContent` itself decoded. Both stay scoped to what `ContentDocument`'s `spreadsheet` variant models: no number-format engine (a numeric cell's percentage/currency/date semantics live in `xl/styles.xml`'s own `numFmt` codes, which neither side interprets) and no per-cell rich-text runs.
 
 ## Conventions
 
 - **Zod-first schema/type/guard.** Every model type is inferred from its Zod schema (`z.infer<typeof XSchema>`), not hand-written — schema, type, and validator stay in lockstep.
-- **`XmlNode` uses a recursive structural guard, not `z.lazy`.** `z.lazy` collapses to `unknown` for the element-children case in the Zod version this project pins, so `XmlElementSchema` validates `children` via `z.custom<XmlNode>(isXmlNode)`, a hand-written recursive type guard in `model/node.ts`. Any change to `XmlNode`'s shape must update `isXmlNode` in step. `src/compact.ts`'s `CompactXmlNode` (`isCompactXmlNode` + `z.custom`) reuses the same pattern for the same reason; `document-content-model`'s own `ContentBlock` (`isContentBlock` + `z.custom`, since a table cell's blocks can themselves contain a table) does too, one level up the dependency graph.
+- **`XmlNode` uses a recursive structural guard, not `z.lazy`.** `z.lazy` collapses to `unknown` for the element-children case in the Zod version this project pins, so `XmlElementSchema` validates `children` via `z.custom<XmlNode>(isXmlNode)`, a hand-written recursive type guard in `model/node.ts`. Any change to `XmlNode`'s shape must update `isXmlNode` in step. `src/compact.ts`'s `CompactXmlNode` (`isCompactXmlNode` + `z.custom`) reuses the same pattern for the same reason; `document-schema.js`'s own `ContentBlock` (`isContentBlock` + `z.custom`, since a table cell's blocks can themselves contain a table) does too, one level up the dependency graph.
 - **Lossless core vs. lossy views is a hard boundary.** `decodePackage`/`encodePackage` (and the underlying codecs) must stay byte/part faithful — every part round-trips unchanged. `src/typed/*`'s lossy readers (`readDocx`, `readPptx`, `readXlsx`) are explicitly one-way and are allowed to drop information (documented per-reader, e.g. `readDocx` resolves cached field-result text rather than re-evaluating live `PAGE`/`NUMPAGES` fields, docx's own `w:themeColor` references aren't resolved, and `readXlsx` drops cell styles, formats and charts). Don't blur this line by adding write-back support to one of those readers; a full round-trip of a package one of them decoded always goes through the generic `Package`. `readXlsxContent`/`buildXlsxPackage` (`src/typed/xlsx/`) are a deliberate, separate exception, not a violation of this rule: they were designed together as a genuine read/write pair around the shared `ContentDocument` model — matching the sibling `odf.js`/`documents.js` packages' own established convention of building fresh output from a `ContentDocument`, rather than editing a decoded package in place — and `buildXlsxPackage` never touches whatever package `readXlsxContent` itself decoded.
 - **XML entities stay raw in the lossless layer.** `parseXml` runs with `processEntities: false` so encoded entities (e.g. `&amp;`) are preserved verbatim for round-trip fidelity; typed readers decode the five standard entities (`decodeEntities` in `typed/util.ts`) only in their own lossy projection, never in the core model.
 - **No type assertions.** `eslint.config.ts` runs `@typescript-eslint/consistent-type-assertions` with `assertionStyle: "never"`, banning `as` and angle-bracket casts outright, with `linterOptions.noInlineConfig: true` so there is no `eslint-disable` escape hatch either — narrow with a guard or parse with Zod. An exception would have to be scoped structurally, as a `files`-matched override block in `eslint.config.ts`, not an inline comment.
@@ -215,8 +215,8 @@ Commits follow Conventional Commits (`feat:`, `fix:`, `test:`, `chore:`, …), e
 
 ## References
 
-- [document-content-model](https://github.com/ExaDev/document-schema.js) — the canonical `ContentBlock`/`ContentSection`/`ContentSlide`/geometry/colour/alignment schemas `readDocx`/`readPptx` return, plus the `ContentDocument`/`LayoutMetadata` types `readXlsxContent`/`buildXlsxPackage` read and write directly, all imported here rather than defined locally — the single source of truth this package shares with `odf.js` and `documents.js` so none of the three maintains an independent, drift-prone copy.
-- [odf.js](https://github.com/ExaDev/odf.js) — a sibling package doing the equivalent job for the OpenDocument Format (odt/ods/odp/odg/…), also built on `document-content-model`.
+- [document-schema.js](https://github.com/ExaDev/document-schema.js) — the canonical `ContentBlock`/`ContentSection`/`ContentSlide`/geometry/colour/alignment schemas `readDocx`/`readPptx` return, plus the `ContentDocument`/`LayoutMetadata` types `readXlsxContent`/`buildXlsxPackage` read and write directly, all imported here rather than defined locally — the single source of truth this package shares with `odf.js` and `documents.js` so none of the three maintains an independent, drift-prone copy.
+- [odf.js](https://github.com/ExaDev/odf.js) — a sibling package doing the equivalent job for the OpenDocument Format (odt/ods/odp/odg/…), also built on `document-schema.js`.
 - [documents.js](https://github.com/ExaDev/documents.js) — depends on this package for lossless OOXML handling and its cascade-resolved typed readers, adding PDF conversion and a read-and-write docx/pptx editor on top.
 
 ## License

package/dist/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let zod = require("zod");
 let fast_xml_parser = require("fast-xml-parser");
 let fflate = require("fflate");
-let document_content_model = require("document-content-model");
+let document_schema_js = require("document-schema.js");
 //#region src/model/node.ts
 const AttributeSchema = zod.z.object({
 	name: zod.z.string(),
@@ -763,11 +763,11 @@ const CLR_SCHEME_SLOTS = [
 function readThemeSlotColor(colorEl) {
 	if (colorEl.tag === "a:srgbClr") {
 		const val = attr(colorEl, "val");
-		return val === void 0 ? void 0 : (0, document_content_model.rgbHexToColor)(val);
+		return val === void 0 ? void 0 : (0, document_schema_js.rgbHexToColor)(val);
 	}
 	if (colorEl.tag === "a:sysClr") {
 		const lastClr = attr(colorEl, "lastClr");
-		if (lastClr !== void 0) return (0, document_content_model.rgbHexToColor)(lastClr);
+		if (lastClr !== void 0) return (0, document_schema_js.rgbHexToColor)(lastClr);
 		return attr(colorEl, "val") === "window" ? {
 			r: 1,
 			g: 1,
@@ -856,7 +856,7 @@ function readSchemeColor(schemeClrEl, colorMap, theme) {
 }
 function readSrgbColor(srgbClrEl) {
 	const val = attr(srgbClrEl, "val");
-	return val === void 0 ? void 0 : applyColorTransforms((0, document_content_model.rgbHexToColor)(val), readColorTransforms(srgbClrEl));
+	return val === void 0 ? void 0 : applyColorTransforms((0, document_schema_js.rgbHexToColor)(val), readColorTransforms(srgbClrEl));
 }
 function readSolidFillColor(solidFillEl, colorMap, theme) {
 	if (solidFillEl === void 0) return;
@@ -949,7 +949,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 : (0, document_content_model.rgbHexToColor)(val);
+	return val === void 0 || val === "auto" ? void 0 : (0, document_schema_js.rgbHexToColor)(val);
 }
 function readRunFontFamily(rFonts, theme) {
 	if (rFonts === void 0) return;
@@ -1067,7 +1067,7 @@ const FootnoteSchema = zod.z.object({
 });
 const DocxDocumentSchema = zod.z.object({
 	metadata: DocumentMetadataSchema,
-	sections: zod.z.array(document_content_model.ContentSectionSchema),
+	sections: zod.z.array(document_schema_js.ContentSectionSchema),
 	comments: zod.z.array(CommentSchema),
 	footnotes: zod.z.array(FootnoteSchema),
 	headers: zod.z.array(zod.z.string()),
@@ -1087,7 +1087,7 @@ function readPageSize$1(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 ? document_content_model.PAGE_SIZE_LETTER : {
+	return w === void 0 || h === void 0 ? document_schema_js.PAGE_SIZE_LETTER : {
 		widthPt: twipsToPt(Number(w)),
 		heightPt: twipsToPt(Number(h))
 	};
@@ -1203,7 +1203,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 : (0, document_content_model.rgbHexToColor)(fill);
+	return fill === void 0 || fill === "auto" || fill === "none" ? void 0 : (0, document_schema_js.rgbHexToColor)(fill);
 }
 function readRawCell(tc, context, rels) {
 	const tcPr = childrenWithTag(tc, "w:tcPr")[0];
@@ -1303,7 +1303,7 @@ function readSections(body, context, rels) {
 		currentBlocks.push(...readBodyBlocks([node], context, rels));
 	}
 	if (currentBlocks.length > 0 || sections.length === 0) sections.push({
-		pageSize: document_content_model.PAGE_SIZE_LETTER,
+		pageSize: document_schema_js.PAGE_SIZE_LETTER,
 		margins: DEFAULT_MARGINS$1,
 		blocks: currentBlocks
 	});
@@ -1464,7 +1464,7 @@ function resolveDefaultRunProperties(placeholderType, level, context) {
 //#region src/typed/pptx/read.ts
 const PptxDocumentSchema = zod.z.object({
 	metadata: DocumentMetadataSchema,
-	slides: zod.z.array(document_content_model.ContentSlideSchema)
+	slides: zod.z.array(document_schema_js.ContentSlideSchema)
 });
 const PRESENTATION_PATH = "ppt/presentation.xml";
 const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
@@ -1472,7 +1472,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 ? document_content_model.SLIDE_SIZE_WIDESCREEN : {
+	return cx === void 0 || cy === void 0 ? document_schema_js.SLIDE_SIZE_WIDESCREEN : {
 		widthPt: emuToPt(Number(cx)),
 		heightPt: emuToPt(Number(cy))
 	};
@@ -2142,8 +2142,8 @@ function ptToUniversalMeasure(pt) {
 	return `${(pt / 72 * 2.54).toFixed(2)}cm`;
 }
 const PAPER_SIZE_BY_CODE = {
-	"1": document_content_model.PAGE_SIZE_LETTER,
-	"9": document_content_model.PAGE_SIZE_A4
+	"1": document_schema_js.PAGE_SIZE_LETTER,
+	"9": document_schema_js.PAGE_SIZE_A4
 };
 function paperSizeCodeToPageSize(code) {
 	return PAPER_SIZE_BY_CODE[code];
@@ -2153,8 +2153,8 @@ function approximatelyEquals(a, b) {
 	return Math.abs(a - b) <= PAPER_SIZE_TOLERANCE_PT;
 }
 function pageSizeToPaperSizeCode(pageSize) {
-	if (approximatelyEquals(pageSize.widthPt, document_content_model.PAGE_SIZE_LETTER.widthPt) && approximatelyEquals(pageSize.heightPt, document_content_model.PAGE_SIZE_LETTER.heightPt)) return "1";
-	if (approximatelyEquals(pageSize.widthPt, document_content_model.PAGE_SIZE_A4.widthPt) && approximatelyEquals(pageSize.heightPt, document_content_model.PAGE_SIZE_A4.heightPt)) return "9";
+	if (approximatelyEquals(pageSize.widthPt, document_schema_js.PAGE_SIZE_LETTER.widthPt) && approximatelyEquals(pageSize.heightPt, document_schema_js.PAGE_SIZE_LETTER.heightPt)) return "1";
+	if (approximatelyEquals(pageSize.widthPt, document_schema_js.PAGE_SIZE_A4.widthPt) && approximatelyEquals(pageSize.heightPt, document_schema_js.PAGE_SIZE_A4.heightPt)) return "9";
 }
 //#endregion
 //#region src/typed/xlsx/print-settings.ts
@@ -2174,7 +2174,7 @@ function applyOrientation(pageSize, pageSetup) {
 	};
 }
 function readPageSize(pageSetup) {
-	if (pageSetup === void 0) return document_content_model.PAGE_SIZE_LETTER;
+	if (pageSetup === void 0) return document_schema_js.PAGE_SIZE_LETTER;
 	const paperSize = attr(pageSetup, "paperSize");
 	const byCode = paperSize === void 0 ? void 0 : paperSizeCodeToPageSize(paperSize);
 	if (byCode !== void 0) return applyOrientation(byCode, pageSetup);
@@ -2182,7 +2182,7 @@ function readPageSize(pageSetup) {
 	const paperHeight = attr(pageSetup, "paperHeight");
 	const widthPt = paperWidth === void 0 ? void 0 : parseUniversalMeasureToPt(paperWidth);
 	const heightPt = paperHeight === void 0 ? void 0 : parseUniversalMeasureToPt(paperHeight);
-	return widthPt === void 0 || heightPt === void 0 ? document_content_model.PAGE_SIZE_LETTER : applyOrientation({
+	return widthPt === void 0 || heightPt === void 0 ? document_schema_js.PAGE_SIZE_LETTER : applyOrientation({
 		widthPt,
 		heightPt
 	}, pageSetup);
@@ -2514,7 +2514,7 @@ function readXlsxContent(pkg) {
 	const sheets = resolveSheetEntries(pkg).map((entry, sheetIndex) => readSheet(pkg, entry, sheetIndex, sharedStrings, definedNamesBySheet));
 	return {
 		kind: "spreadsheet",
-		formatVersion: document_content_model.CONTENT_FORMAT_VERSION,
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
 		metadata: readCoreProperties(pkg),
 		sheets
 	};
@@ -2968,7 +2968,7 @@ function buildXlsxPackage(document) {
 Object.defineProperty(exports, "AlignmentSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.AlignmentSchema;
+		return document_schema_js.AlignmentSchema;
 	}
 });
 exports.AttributeSchema = AttributeSchema;
@@ -2976,25 +2976,25 @@ exports.BinaryPartSchema = BinaryPartSchema;
 Object.defineProperty(exports, "BoxSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.BoxSchema;
+		return document_schema_js.BoxSchema;
 	}
 });
 Object.defineProperty(exports, "COLOR_BLACK", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.COLOR_BLACK;
+		return document_schema_js.COLOR_BLACK;
 	}
 });
 Object.defineProperty(exports, "CONTENT_FORMAT_VERSION", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.CONTENT_FORMAT_VERSION;
+		return document_schema_js.CONTENT_FORMAT_VERSION;
 	}
 });
 Object.defineProperty(exports, "ColorSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ColorSchema;
+		return document_schema_js.ColorSchema;
 	}
 });
 exports.CommentSchema = CommentSchema;
@@ -3004,133 +3004,133 @@ exports.CompactXmlNodeSchema = CompactXmlNodeSchema;
 Object.defineProperty(exports, "ContentBlockSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentBlockSchema;
+		return document_schema_js.ContentBlockSchema;
 	}
 });
 Object.defineProperty(exports, "ContentCellValueSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentCellValueSchema;
+		return document_schema_js.ContentCellValueSchema;
 	}
 });
 Object.defineProperty(exports, "ContentDocumentSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentDocumentSchema;
+		return document_schema_js.ContentDocumentSchema;
 	}
 });
 Object.defineProperty(exports, "ContentImageBlockSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentImageBlockSchema;
+		return document_schema_js.ContentImageBlockSchema;
 	}
 });
 Object.defineProperty(exports, "ContentListMembershipSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentListMembershipSchema;
+		return document_schema_js.ContentListMembershipSchema;
 	}
 });
 Object.defineProperty(exports, "ContentPageBreakSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentPageBreakSchema;
+		return document_schema_js.ContentPageBreakSchema;
 	}
 });
 Object.defineProperty(exports, "ContentParagraphSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentParagraphSchema;
+		return document_schema_js.ContentParagraphSchema;
 	}
 });
 Object.defineProperty(exports, "ContentRunSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentRunSchema;
+		return document_schema_js.ContentRunSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSectionSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSectionSchema;
+		return document_schema_js.ContentSectionSchema;
 	}
 });
 Object.defineProperty(exports, "ContentShapeSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentShapeSchema;
+		return document_schema_js.ContentShapeSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetCellSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetCellSchema;
+		return document_schema_js.ContentSheetCellSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetColumnSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetColumnSchema;
+		return document_schema_js.ContentSheetColumnSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetImageSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetImageSchema;
+		return document_schema_js.ContentSheetImageSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetPrintRangeSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetPrintRangeSchema;
+		return document_schema_js.ContentSheetPrintRangeSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetPrintSettingsSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetPrintSettingsSchema;
+		return document_schema_js.ContentSheetPrintSettingsSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetRepeatRangeSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetRepeatRangeSchema;
+		return document_schema_js.ContentSheetRepeatRangeSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetRowSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetRowSchema;
+		return document_schema_js.ContentSheetRowSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSheetSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSheetSchema;
+		return document_schema_js.ContentSheetSchema;
 	}
 });
 Object.defineProperty(exports, "ContentSlideSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentSlideSchema;
+		return document_schema_js.ContentSlideSchema;
 	}
 });
 Object.defineProperty(exports, "ContentTableCellSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentTableCellSchema;
+		return document_schema_js.ContentTableCellSchema;
 	}
 });
 Object.defineProperty(exports, "ContentTableRowSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentTableRowSchema;
+		return document_schema_js.ContentTableRowSchema;
 	}
 });
 Object.defineProperty(exports, "ContentTableSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.ContentTableSchema;
+		return document_schema_js.ContentTableSchema;
 	}
 });
 exports.DefinedNameSchema = DefinedNameSchema;
@@ -3140,26 +3140,26 @@ exports.FootnoteSchema = FootnoteSchema;
 Object.defineProperty(exports, "MarginsSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.MarginsSchema;
+		return document_schema_js.MarginsSchema;
 	}
 });
 Object.defineProperty(exports, "PAGE_SIZE_A4", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.PAGE_SIZE_A4;
+		return document_schema_js.PAGE_SIZE_A4;
 	}
 });
 Object.defineProperty(exports, "PAGE_SIZE_LETTER", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.PAGE_SIZE_LETTER;
+		return document_schema_js.PAGE_SIZE_LETTER;
 	}
 });
 exports.PackageSchema = PackageSchema;
 Object.defineProperty(exports, "PageSizeSchema", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.PageSizeSchema;
+		return document_schema_js.PageSizeSchema;
 	}
 });
 exports.PartSchema = PartSchema;
@@ -3167,13 +3167,13 @@ exports.PptxDocumentSchema = PptxDocumentSchema;
 Object.defineProperty(exports, "SLIDE_SIZE_STANDARD", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.SLIDE_SIZE_STANDARD;
+		return document_schema_js.SLIDE_SIZE_STANDARD;
 	}
 });
 Object.defineProperty(exports, "SLIDE_SIZE_WIDESCREEN", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.SLIDE_SIZE_WIDESCREEN;
+		return document_schema_js.SLIDE_SIZE_WIDESCREEN;
 	}
 });
 exports.XlsxCellSchema = XlsxCellSchema;
@@ -3197,7 +3197,7 @@ exports.childrenWithTag = childrenWithTag;
 Object.defineProperty(exports, "colorToRgbHex", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.colorToRgbHex;
+		return document_schema_js.colorToRgbHex;
 	}
 });
 exports.compactCodec = compactCodec;
@@ -3215,7 +3215,7 @@ exports.isCompactXmlNode = isCompactXmlNode;
 Object.defineProperty(exports, "isContentBlock", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.isContentBlock;
+		return document_schema_js.isContentBlock;
 	}
 });
 exports.isXmlNode = isXmlNode;
@@ -3230,7 +3230,7 @@ exports.resolveRelationships = resolveRelationships;
 Object.defineProperty(exports, "rgbHexToColor", {
 	enumerable: true,
 	get: function() {
-		return document_content_model.rgbHexToColor;
+		return document_schema_js.rgbHexToColor;
 	}
 });
 exports.rootElement = rootElement;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { Alignment, AlignmentSchema, Box, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, Color, Color as Color$1, ColorSchema, ContentBlock, ContentBlock as ContentBlock$1, ContentBlockSchema, ContentCellValue, ContentCellValueSchema, ContentDocument, ContentDocument as ContentDocument$1, ContentDocumentSchema, ContentImageBlock, ContentImageBlockSchema, ContentListMembership, ContentListMembershipSchema, ContentPageBreak, ContentPageBreakSchema, ContentParagraph, ContentParagraphSchema, ContentRun, ContentRunSchema, ContentSection, ContentSectionSchema, ContentShape, ContentShapeSchema, ContentSheet, ContentSheetCell, ContentSheetCellSchema, ContentSheetColumn, ContentSheetColumnSchema, ContentSheetImage, ContentSheetImageSchema, ContentSheetPrintRange, ContentSheetPrintRangeSchema, ContentSheetPrintSettings, ContentSheetPrintSettingsSchema, ContentSheetRepeatRange, ContentSheetRepeatRangeSchema, ContentSheetRow, ContentSheetRowSchema, ContentSheetSchema, ContentSlide, ContentSlideSchema, ContentTable, ContentTableCell, ContentTableCellSchema, ContentTableRow, ContentTableRowSchema, ContentTableSchema, Margins, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PageSize, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor } from "document-content-model";
+import { Alignment, AlignmentSchema, Box, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, Color, Color as Color$1, ColorSchema, ContentBlock, ContentBlock as ContentBlock$1, ContentBlockSchema, ContentCellValue, ContentCellValueSchema, ContentDocument, ContentDocument as ContentDocument$1, ContentDocumentSchema, ContentImageBlock, ContentImageBlockSchema, ContentListMembership, ContentListMembershipSchema, ContentPageBreak, ContentPageBreakSchema, ContentParagraph, ContentParagraphSchema, ContentRun, ContentRunSchema, ContentSection, ContentSectionSchema, ContentShape, ContentShapeSchema, ContentSheet, ContentSheetCell, ContentSheetCellSchema, ContentSheetColumn, ContentSheetColumnSchema, ContentSheetImage, ContentSheetImageSchema, ContentSheetPrintRange, ContentSheetPrintRangeSchema, ContentSheetPrintSettings, ContentSheetPrintSettingsSchema, ContentSheetRepeatRange, ContentSheetRepeatRangeSchema, ContentSheetRow, ContentSheetRowSchema, ContentSheetSchema, ContentSlide, ContentSlideSchema, ContentTable, ContentTableCell, ContentTableCellSchema, ContentTableRow, ContentTableRowSchema, ContentTableSchema, Margins, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PageSize, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor } from "document-schema.js";
 //#region src/model/node.d.ts
 declare const AttributeSchema: z.ZodObject<{
   name: z.ZodString;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { Alignment, AlignmentSchema, Box, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, Color, Color as Color$1, ColorSchema, ContentBlock, ContentBlock as ContentBlock$1, ContentBlockSchema, ContentCellValue, ContentCellValueSchema, ContentDocument, ContentDocument as ContentDocument$1, ContentDocumentSchema, ContentImageBlock, ContentImageBlockSchema, ContentListMembership, ContentListMembershipSchema, ContentPageBreak, ContentPageBreakSchema, ContentParagraph, ContentParagraphSchema, ContentRun, ContentRunSchema, ContentSection, ContentSectionSchema, ContentShape, ContentShapeSchema, ContentSheet, ContentSheetCell, ContentSheetCellSchema, ContentSheetColumn, ContentSheetColumnSchema, ContentSheetImage, ContentSheetImageSchema, ContentSheetPrintRange, ContentSheetPrintRangeSchema, ContentSheetPrintSettings, ContentSheetPrintSettingsSchema, ContentSheetRepeatRange, ContentSheetRepeatRangeSchema, ContentSheetRow, ContentSheetRowSchema, ContentSheetSchema, ContentSlide, ContentSlideSchema, ContentTable, ContentTableCell, ContentTableCellSchema, ContentTableRow, ContentTableRowSchema, ContentTableSchema, Margins, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PageSize, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor } from "document-content-model";
+import { Alignment, AlignmentSchema, Box, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, Color, Color as Color$1, ColorSchema, ContentBlock, ContentBlock as ContentBlock$1, ContentBlockSchema, ContentCellValue, ContentCellValueSchema, ContentDocument, ContentDocument as ContentDocument$1, ContentDocumentSchema, ContentImageBlock, ContentImageBlockSchema, ContentListMembership, ContentListMembershipSchema, ContentPageBreak, ContentPageBreakSchema, ContentParagraph, ContentParagraphSchema, ContentRun, ContentRunSchema, ContentSection, ContentSectionSchema, ContentShape, ContentShapeSchema, ContentSheet, ContentSheetCell, ContentSheetCellSchema, ContentSheetColumn, ContentSheetColumnSchema, ContentSheetImage, ContentSheetImageSchema, ContentSheetPrintRange, ContentSheetPrintRangeSchema, ContentSheetPrintSettings, ContentSheetPrintSettingsSchema, ContentSheetRepeatRange, ContentSheetRepeatRangeSchema, ContentSheetRow, ContentSheetRowSchema, ContentSheetSchema, ContentSlide, ContentSlideSchema, ContentTable, ContentTableCell, ContentTableCellSchema, ContentTableRow, ContentTableRowSchema, ContentTableSchema, Margins, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PageSize, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor } from "document-schema.js";
 //#region src/model/node.d.ts
 declare const AttributeSchema: z.ZodObject<{
   name: z.ZodString;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { XMLBuilder, XMLParser } from "fast-xml-parser";
 import { unzipSync, zipSync } from "fflate";
-import { AlignmentSchema, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, CONTENT_FORMAT_VERSION as CONTENT_FORMAT_VERSION$1, ColorSchema, ContentBlockSchema, ContentCellValueSchema, ContentDocumentSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentRunSchema, ContentSectionSchema, ContentSectionSchema as ContentSectionSchema$1, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetImageSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentSlideSchema as ContentSlideSchema$1, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_A4 as PAGE_SIZE_A4$1, 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";
+import { AlignmentSchema, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, CONTENT_FORMAT_VERSION as CONTENT_FORMAT_VERSION$1, ColorSchema, ContentBlockSchema, ContentCellValueSchema, ContentDocumentSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentRunSchema, ContentSectionSchema, ContentSectionSchema as ContentSectionSchema$1, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetImageSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentSlideSchema as ContentSlideSchema$1, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_A4 as PAGE_SIZE_A4$1, 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-schema.js";
 //#region src/model/node.ts
 const AttributeSchema = z.object({
 	name: z.string(),

package/package.json

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