ooxml.js 4.1.1 → 4.3.0

package/dist/typed/docx/write.js

@@ -1,8 +1,12 @@
+import { bytesToBase64 } from "../../util/base64.js";
+import { parseXml } from "../../xml/parse.js";
+import { encodePackage } from "../../codec.js";
 import { el, txt } from "../../xml/fragment.js";
 import { encodeXmlText } from "../../xml/entities.js";
 import { ptToEighthPoints, ptToEmu, ptToHalfPoints, ptToTwips } from "../shared/units.js";
 import { TABLE_OF_CONTENTS_GALLERY, isDeletedChange } from "./constructs.js";
-import { colorToRgbHex, findConstructMarkerImbalance } from "document-schema.js";
+import { buildXlsxPackageFromContent } from "../xlsx/build.js";
+import { colorToRgbHex, findConstructMarkerImbalance, findRunConstructFault } from "document-schema.js";
 //#region src/typed/docx/write.ts
 const WML_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 const REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
@@ -19,14 +23,18 @@ const DRAWING_PIC_NS = "http://schemas.openxmlformats.org/drawingml/2006/picture
 const MARKUP_COMPAT_NS = "http://schemas.openxmlformats.org/markup-compatibility/2006";
 const W14_NS = "http://schemas.microsoft.com/office/word/2010/wordml";
 const W15_NS = "http://schemas.microsoft.com/office/word/2012/wordml";
+const VML_OFFICE_NS = "urn:schemas-microsoft-com:office:office";
 const CT_DOCUMENT = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
 const CT_CORE_PROPS = "application/vnd.openxmlformats-package.core-properties+xml";
 const CT_EXTENDED_PROPS = "application/vnd.openxmlformats-officedocument.extended-properties+xml";
+const CT_EMBEDDED_DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+const CT_EMBEDDED_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 const REL_OFFICE_DOCUMENT = `${REL_NS}/officeDocument`;
 const REL_CORE_PROPS = `${PKG_RELS_NS}/metadata/core-properties`;
 const REL_EXTENDED_PROPS = `${REL_NS}/extended-properties`;
 const REL_HYPERLINK = `${REL_NS}/hyperlink`;
 const REL_IMAGE = `${REL_NS}/image`;
+const REL_OLE_OBJECT = `${REL_NS}/oleObject`;
 const DOCUMENT_PART_PATH = "word/document.xml";
 function newWriteState() {
 	return {
@@ -34,6 +42,8 @@ function newWriteState() {
 		hyperlinkIds: /* @__PURE__ */ new Map(),
 		mediaIds: /* @__PURE__ */ new Map(),
 		mediaParts: /* @__PURE__ */ new Map(),
+		embeddingIds: /* @__PURE__ */ new Map(),
+		embeddingParts: /* @__PURE__ */ new Map(),
 		nextDrawingId: 1,
 		nextMarkerId: 1
 	};
@@ -168,10 +178,49 @@ function buildParagraph(paragraph, state, pageBreakBefore, deleted, provenance)
 	const changeTag = provenance === void 0 ? void 0 : TRACKED_CHANGE_TAG_BY_CHANGE[provenance.change];
 	const pPr = properties === void 0 && changeTag !== void 0 ? el("w:pPr", {}, []) : properties;
 	if (pPr !== void 0 && changeTag !== void 0 && provenance !== void 0) pPr.children.push(el("w:rPr", {}, [el(changeTag, trackChangeAttrs(state, provenance))]));
-	const runs = paragraph.runs.map((run) => buildRun(run, state, deleted));
+	const runs = interleaveRunConstructExtents(paragraph.runs.map((run) => buildRun(run, state, deleted)), paragraph, state);
 	const content = changeTag === void 0 || provenance === void 0 ? runs : [el(changeTag, trackChangeAttrs(state, provenance), runs)];
 	return el("w:p", {}, [...pPr === void 0 ? [] : [pPr], ...content]);
 }
+function interleaveRunConstructExtents(runElements, paragraph, state) {
+	if (paragraph.constructs === void 0) return [...runElements];
+	const fault = findRunConstructFault(paragraph);
+	if (fault !== void 0) throw new Error(`buildDocxPackageFromContent: run-level construct extent at index ${String(fault.index)} of a paragraph does not name real runs (${fault.kind})`);
+	const bookmarks = paragraph.constructs.filter((extent) => extent.descriptor.kind === "anchor" && extent.descriptor.anchorType === "bookmark");
+	if (bookmarks.length === 0) return [...runElements];
+	const closingAt = /* @__PURE__ */ new Map();
+	const openingAt = /* @__PURE__ */ new Map();
+	const pointAt = /* @__PURE__ */ new Map();
+	const push = (map, position, element) => {
+		const existing = map.get(position);
+		if (existing === void 0) map.set(position, [element]);
+		else existing.push(element);
+	};
+	for (const bookmark of bookmarks) {
+		const id = String(state.nextMarkerId++);
+		const open = el("w:bookmarkStart", {
+			"w:id": id,
+			"w:name": encodeXmlText(bookmark.descriptor.name)
+		});
+		const close = el("w:bookmarkEnd", { "w:id": id });
+		if (bookmark.startRun === bookmark.endRun) {
+			push(pointAt, bookmark.startRun, open);
+			push(pointAt, bookmark.startRun, close);
+		} else {
+			push(openingAt, bookmark.startRun, open);
+			push(closingAt, bookmark.endRun, close);
+		}
+	}
+	const out = [];
+	for (let position = 0; position <= runElements.length; position++) {
+		for (const close of closingAt.get(position) ?? []) out.push(close);
+		for (const open of openingAt.get(position) ?? []) out.push(open);
+		for (const half of pointAt.get(position) ?? []) out.push(half);
+		const run = runElements[position];
+		if (run !== void 0) out.push(run);
+	}
+	return out;
+}
 function trailingEmptyRunElements(paragraph, element) {
 	const runElements = [];
 	for (const child of element.children) if (child.type === "element" && (child.tag === "w:r" || child.tag === "w:hyperlink")) runElements.push(child);
@@ -296,6 +345,43 @@ function buildDrawing(image, state) {
 		el("a:graphic", { "xmlns:a": DRAWINGML_NS }, [el("a:graphicData", { uri: DRAWING_PIC_NS }, [picture])])
 	])]);
 }
+function embeddedPayloadOf(document) {
+	switch (document.kind) {
+		case "wordprocessing": return {
+			extension: "docx",
+			progId: "Word.Document.12",
+			base64: bytesToBase64(encodePackage(buildDocxPackageFromContent(document)))
+		};
+		case "spreadsheet": return {
+			extension: "xlsx",
+			progId: "Excel.Sheet.12",
+			base64: bytesToBase64(encodePackage(buildXlsxPackageFromContent(document)))
+		};
+		default: throw new Error(`buildDocxPackageFromContent: an embedded object carrying a ${document.kind} document has no OOXML OLE payload this writer can produce (embedded wordprocessing and spreadsheet documents serialise through their own builders; presentation is read-only in this package, and drawing/formula are ODF/MathML spellings)`);
+	}
+}
+function embeddedObjectRelationshipId(state, payload) {
+	const existing = state.embeddingIds.get(payload.base64);
+	if (existing !== void 0) return existing;
+	const name = `oleObject${state.embeddingParts.size + 1}.${payload.extension}`;
+	state.embeddingParts.set(name, payload);
+	const id = addRelationship(state, REL_OLE_OBJECT, `embeddings/${name}`, false);
+	state.embeddingIds.set(payload.base64, id);
+	return id;
+}
+function buildObjectElement(block, state) {
+	const payload = embeddedPayloadOf(block.document);
+	const relId = embeddedObjectRelationshipId(state, payload);
+	return el("w:object", {
+		"w:dxaOrig": String(ptToTwips(block.frame.widthPt)),
+		"w:dyaOrig": String(ptToTwips(block.frame.heightPt))
+	}, [el("o:OLEObject", {
+		Type: "Embed",
+		ProgID: payload.progId,
+		DrawAspect: "Content",
+		"r:id": relId
+	})]);
+}
 const TRACKED_CHANGE_TAG_BY_CHANGE = {
 	insertion: "w:ins",
 	deletion: "w:del",
@@ -356,10 +442,29 @@ function buildSdtProperties(descriptor) {
 		children.push(el("w:date", descriptor.value === void 0 ? {} : { "w:fullDate": encodeXmlText(descriptor.value) }));
 		return el("w:sdtPr", {}, children);
 	}
+	const restored = restoreGalleryElement(descriptor);
+	if (restored !== void 0) {
+		children.push(restored);
+		return el("w:sdtPr", {}, children);
+	}
 	const typeTag = SDT_TYPE_ELEMENT[descriptor.controlType];
 	children.push(el(typeTag ?? "w:richText"));
 	return el("w:sdtPr", {}, children);
 }
+function restoreGalleryElement(descriptor) {
+	if (descriptor.controlType !== "richText") return;
+	const source = descriptor.source;
+	if (source?.format !== "docx") return;
+	let nodes;
+	try {
+		nodes = parseXml(source.xml);
+	} catch (error) {
+		throw new Error(`buildDocxPackageFromContent: a content control carries docx residue that does not parse as XML: ${source.xml}`, { cause: error });
+	}
+	const first = nodes[0];
+	if (nodes.length !== 1 || first?.type !== "element" || first.tag !== "w:docPartObj" && first.tag !== "w:docPartList") return;
+	return first;
+}
 function parseFlow(blocks) {
 	const imbalance = findConstructMarkerImbalance(blocks);
 	if (imbalance !== void 0) throw new Error(`buildDocxPackageFromContent: construct markers do not balance (${imbalance.kind} at block ${String(imbalance.index)})`);
@@ -503,8 +608,25 @@ function buildFlowItems(items, state, deleted, provenance) {
 			availableImageRuns = [];
 			continue;
 		}
-		lastParagraph = void 0;
-		availableImageRuns = [];
+		if (block.kind === "embeddedObject") {
+			if (pendingPageBreak) {
+				const breakParagraph = el("w:p", {}, [el("w:pPr", {}, [el("w:pageBreakBefore")])]);
+				nodes.push(breakParagraph);
+				lastParagraph = breakParagraph;
+				availableImageRuns = [];
+				pendingPageBreak = false;
+			}
+			const object = buildObjectElement(block, state);
+			const reusable = availableImageRuns.shift();
+			if (reusable !== void 0) reusable.children.push(object);
+			else if (lastParagraph !== void 0) lastParagraph.children.push(el("w:r", {}, [object]));
+			else {
+				const paragraph = el("w:p", {}, [el("w:r", {}, [object])]);
+				lastParagraph = paragraph;
+				nodes.push(paragraph);
+			}
+			continue;
+		}
 	}
 	if (pendingPageBreak) nodes.push(el("w:p", {}, [el("w:pPr", {}, [el("w:pageBreakBefore")])]));
 	return nodes;
@@ -554,12 +676,14 @@ function buildDocumentPart(sections, state) {
 		"xmlns:wp": DRAWING_WP_NS,
 		"xmlns:pic": DRAWING_PIC_NS,
 		"xmlns:mc": MARKUP_COMPAT_NS,
+		"xmlns:o": VML_OFFICE_NS,
 		"xmlns:w14": W14_NS,
 		"xmlns:w15": W15_NS,
 		"mc:Ignorable": "w14 w15"
 	}, [el("w:body", {}, bodyChildren)]));
 }
-function buildContentTypesPart(mediaFormats) {
+function buildContentTypesPart(state) {
+	const mediaFormats = new Set([...state.mediaParts.values()].map((media) => media.format));
 	const defaults = [el("Default", {
 		Extension: "rels",
 		ContentType: "application/vnd.openxmlformats-package.relationships+xml"
@@ -575,6 +699,10 @@ function buildContentTypesPart(mediaFormats) {
 		Extension: "jpeg",
 		ContentType: "image/jpeg"
 	}));
+	const embeddingOverrides = [...state.embeddingParts].map(([name, payload]) => el("Override", {
+		PartName: `/word/embeddings/${name}`,
+		ContentType: payload.extension === "docx" ? CT_EMBEDDED_DOCX : CT_EMBEDDED_XLSX
+	}));
 	return xmlPart(el("Types", { xmlns: CONTENT_TYPES_NS }, [
 		...defaults,
 		el("Override", {
@@ -588,7 +716,8 @@ function buildContentTypesPart(mediaFormats) {
 		el("Override", {
 			PartName: "/docProps/app.xml",
 			ContentType: CT_EXTENDED_PROPS
-		})
+		}),
+		...embeddingOverrides
 	]));
 }
 function buildPackageRelsPart() {
@@ -660,7 +789,7 @@ function buildDocxPackageFromContent(content) {
 	}] : content.sections, state);
 	const metadata = content.metadata ?? {};
 	const parts = {
-		"[Content_Types].xml": buildContentTypesPart(new Set([...state.mediaParts.values()].map((media) => media.format))),
+		"[Content_Types].xml": buildContentTypesPart(state),
 		"_rels/.rels": buildPackageRelsPart(),
 		[DOCUMENT_PART_PATH]: documentPart,
 		"word/_rels/document.xml.rels": buildDocumentRelsPart(state),
@@ -671,6 +800,10 @@ function buildDocxPackageFromContent(content) {
 		kind: "binary",
 		base64: media.base64
 	};
+	for (const [name, payload] of state.embeddingParts) parts[`word/embeddings/${name}`] = {
+		kind: "binary",
+		base64: payload.base64
+	};
 	return { parts };
 }
 //#endregion

package/dist/typed/embedded.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_read = require("../read-DPAy4uu8.cjs");
+const require_read = require("../read-Di5UfiSh.cjs");
 exports.readEmbeddedOoxmlPayload = require_read.readEmbeddedOoxmlPayload;
 exports.readEmbeddedPayloadPart = require_read.readEmbeddedPayloadPart;

package/dist/typed/embedded.js

@@ -1,2 +1,2 @@
-import { a as readEmbeddedOoxmlPayload, o as readEmbeddedPayloadPart } from "../read-Legu2Pt-.js";
+import { a as readEmbeddedOoxmlPayload, o as readEmbeddedPayloadPart } from "../read-BQoFiqsb.js";
 export { readEmbeddedOoxmlPayload, readEmbeddedPayloadPart };

package/dist/typed/pptx/read.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_read = require("../../read-DPAy4uu8.cjs");
+const require_read = require("../../read-Di5UfiSh.cjs");
 exports.PptxDocumentSchema = require_read.PptxDocumentSchema;
 exports.readPptxContent = require_read.readPptxContent;

package/dist/typed/pptx/read.d.cts

@@ -1,2 +1,2 @@
-import { n as PptxDocumentSchema, r as readPptxContent, t as PptxDocument } from "../../read-DY3Sm5T3.cjs";
+import { n as PptxDocumentSchema, r as readPptxContent, t as PptxDocument } from "../../read-BoV9SZy4.cjs";
 export { PptxDocument, PptxDocumentSchema, readPptxContent };

package/dist/typed/pptx/read.d.ts

@@ -1,2 +1,2 @@
-import { n as PptxDocumentSchema, r as readPptxContent, t as PptxDocument } from "../../read-DcJZITV9.js";
+import { n as PptxDocumentSchema, r as readPptxContent, t as PptxDocument } from "../../read-ZWJPDvG-.js";
 export { PptxDocument, PptxDocumentSchema, readPptxContent };

package/dist/typed/pptx/read.js

@@ -1,2 +1,2 @@
-import { c as readPptxContent, s as PptxDocumentSchema } from "../../read-Legu2Pt-.js";
+import { c as readPptxContent, s as PptxDocumentSchema } from "../../read-BQoFiqsb.js";
 export { PptxDocumentSchema, readPptxContent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "4.1.1",
+  "version": "4.3.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,8 +80,8 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "^1.0.2",
-    "document-schema.js": "^4.3.7",
+    "archive-codec": "^1.1.0",
+    "document-schema.js": "^4.5.0",
     "fast-xml-parser": "^5.10.1",
     "fflate": "^0.8.3",
     "zod": "^4.4.3"