ooxml.js 4.1.1 → 4.3.0

package/dist/typed/docx/constructs.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_build = require("../../xml/build.cjs");
 const require_typed_util = require("../util.cjs");
 //#region src/typed/docx/constructs.ts
 const NON_CONTENT_PARAGRAPH_CHILDREN = /* @__PURE__ */ new Set([
@@ -85,6 +86,37 @@ function insertConstructMarkers(blocks, extents) {
 	}
 	return out;
 }
+function isBlockScopedHalf(half, index) {
+	const position = index.elements.indexOf(half.element);
+	if (position === -1) return false;
+	const leading = index.firstContentIndex === -1 || position < index.firstContentIndex;
+	const trailing = index.lastContentIndex === -1 || position > index.lastContentIndex;
+	return leading || trailing;
+}
+function runBookmarkExtents(halves, index) {
+	const byId = /* @__PURE__ */ new Map();
+	for (const half of halves) {
+		const existing = byId.get(half.id);
+		if (existing === void 0) byId.set(half.id, [half]);
+		else existing.push(half);
+	}
+	const extents = [];
+	for (const pair of byId.values()) {
+		const starts = pair.filter((half) => half.kind === "start");
+		const ends = pair.filter((half) => half.kind === "end");
+		const open = starts[0];
+		const close = ends[0];
+		if (starts.length !== 1 || ends.length !== 1 || open === void 0 || close === void 0) continue;
+		if (open.name === void 0 || close.runPosition < open.runPosition) continue;
+		if (isBlockScopedHalf(open, index) && isBlockScopedHalf(close, index)) continue;
+		extents.push({
+			descriptor: bookmarkAnchorDescriptor(open.name),
+			startRun: open.runPosition,
+			endRun: close.runPosition
+		});
+	}
+	return extents;
+}
 const CONTROL_TYPE_BY_TAG = /* @__PURE__ */ new Map([
 	["w:richText", "richText"],
 	["w:text", "plainText"],
@@ -105,17 +137,36 @@ const LOCK_BY_VALUE = /* @__PURE__ */ new Map([
 ]);
 const TABLE_OF_CONTENTS_GALLERY = "Table of Contents";
 function readControlType(sdtPr) {
-	if (sdtPr === void 0) return "richText";
+	if (sdtPr === void 0) return {
+		controlType: "richText",
+		galleryResidue: void 0
+	};
 	for (const child of sdtPr.children) {
 		if (child.type !== "element") continue;
 		const mapped = CONTROL_TYPE_BY_TAG.get(child.tag);
-		if (mapped !== void 0) return mapped;
+		if (mapped !== void 0) return {
+			controlType: mapped,
+			galleryResidue: void 0
+		};
 		if (child.tag === "w:docPartObj" || child.tag === "w:docPartList") {
 			const gallery = require_typed_util.childrenWithTag(child, "w:docPartGallery")[0];
-			return (gallery === void 0 ? void 0 : require_typed_util.attr(gallery, "w:val")) === "Table of Contents" ? "index" : "richText";
+			if ((gallery === void 0 ? void 0 : require_typed_util.attr(gallery, "w:val")) === "Table of Contents") return {
+				controlType: "index",
+				galleryResidue: void 0
+			};
+			return {
+				controlType: "richText",
+				galleryResidue: {
+					format: "docx",
+					xml: require_xml_build.buildXml([child])
+				}
+			};
 		}
 	}
-	return "richText";
+	return {
+		controlType: "richText",
+		galleryResidue: void 0
+	};
 }
 function readListItemOptions(sdtPr) {
 	const list = require_typed_util.childrenWithTag(sdtPr, "w:dropDownList")[0] ?? require_typed_util.childrenWithTag(sdtPr, "w:comboBox")[0];
@@ -137,10 +188,12 @@ function readCheckboxState(sdtPr) {
 }
 function readContentControlDescriptor(sdt) {
 	const sdtPr = require_typed_util.childrenWithTag(sdt, "w:sdtPr")[0];
+	const { controlType, galleryResidue } = readControlType(sdtPr);
 	const descriptor = {
 		kind: "contentControl",
-		controlType: readControlType(sdtPr)
+		controlType
 	};
+	if (galleryResidue !== void 0) descriptor.source = galleryResidue;
 	if (sdtPr === void 0) return descriptor;
 	const tag = require_typed_util.childrenWithTag(sdtPr, "w:tag")[0];
 	const tagVal = tag === void 0 ? void 0 : require_typed_util.attr(tag, "w:val");
@@ -208,4 +261,5 @@ exports.insertConstructMarkers = insertConstructMarkers;
 exports.isDeletedChange = isDeletedChange;
 exports.readContentControlDescriptor = readContentControlDescriptor;
 exports.readProvenanceDescriptor = readProvenanceDescriptor;
+exports.runBookmarkExtents = runBookmarkExtents;
 exports.runInstructionText = runInstructionText;

package/dist/typed/docx/constructs.d.cts

@@ -1,5 +1,5 @@
 import { l as XmlElement } from "../../node-CkBWRjNR.cjs";
-import { AnchorDescriptor, ConstructDescriptor, ContentBlock, ContentControlDescriptor, ProvenanceChange, ProvenanceDescriptor } from "document-schema.js";
+import { AnchorDescriptor, ConstructDescriptor, ContentBlock, ContentControlDescriptor, ProvenanceChange, ProvenanceDescriptor, RunConstructExtent } from "document-schema.js";
 //#region src/typed/docx/constructs.d.ts
 interface ParagraphContentIndex {
   readonly elements: readonly XmlElement[];
@@ -15,6 +15,14 @@ interface ConstructExtent {
   readonly descriptor: ConstructDescriptor;
 }
 declare function insertConstructMarkers(blocks: readonly ContentBlock[], extents: readonly ConstructExtent[]): ContentBlock[];
+interface ParagraphBookmarkHalf {
+  readonly element: XmlElement;
+  readonly id: string;
+  readonly name: string | undefined;
+  readonly kind: 'start' | 'end';
+  readonly runPosition: number;
+}
+declare function runBookmarkExtents(halves: readonly ParagraphBookmarkHalf[], index: ParagraphContentIndex): RunConstructExtent[];
 declare const TABLE_OF_CONTENTS_GALLERY = "Table of Contents";
 declare function readContentControlDescriptor(sdt: XmlElement): ContentControlDescriptor;
 declare const PROVENANCE_CHANGE_BY_TAG: ReadonlyMap<string, ProvenanceChange>;
@@ -24,4 +32,4 @@ declare function bookmarkAnchorDescriptor(name: string): AnchorDescriptor;
 declare function runInstructionText(run: XmlElement): string;
 declare function fieldCharType(run: XmlElement): string | undefined;
 //#endregion
-export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphContentIndex, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runInstructionText };
+export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphBookmarkHalf, ParagraphContentIndex, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runBookmarkExtents, runInstructionText };

package/dist/typed/docx/constructs.d.ts

@@ -1,5 +1,5 @@
 import { l as XmlElement } from "../../node-CkBWRjNR.js";
-import { AnchorDescriptor, ConstructDescriptor, ContentBlock, ContentControlDescriptor, ProvenanceChange, ProvenanceDescriptor } from "document-schema.js";
+import { AnchorDescriptor, ConstructDescriptor, ContentBlock, ContentControlDescriptor, ProvenanceChange, ProvenanceDescriptor, RunConstructExtent } from "document-schema.js";
 //#region src/typed/docx/constructs.d.ts
 interface ParagraphContentIndex {
   readonly elements: readonly XmlElement[];
@@ -15,6 +15,14 @@ interface ConstructExtent {
   readonly descriptor: ConstructDescriptor;
 }
 declare function insertConstructMarkers(blocks: readonly ContentBlock[], extents: readonly ConstructExtent[]): ContentBlock[];
+interface ParagraphBookmarkHalf {
+  readonly element: XmlElement;
+  readonly id: string;
+  readonly name: string | undefined;
+  readonly kind: 'start' | 'end';
+  readonly runPosition: number;
+}
+declare function runBookmarkExtents(halves: readonly ParagraphBookmarkHalf[], index: ParagraphContentIndex): RunConstructExtent[];
 declare const TABLE_OF_CONTENTS_GALLERY = "Table of Contents";
 declare function readContentControlDescriptor(sdt: XmlElement): ContentControlDescriptor;
 declare const PROVENANCE_CHANGE_BY_TAG: ReadonlyMap<string, ProvenanceChange>;
@@ -24,4 +32,4 @@ declare function bookmarkAnchorDescriptor(name: string): AnchorDescriptor;
 declare function runInstructionText(run: XmlElement): string;
 declare function fieldCharType(run: XmlElement): string | undefined;
 //#endregion
-export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphContentIndex, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runInstructionText };
+export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphBookmarkHalf, ParagraphContentIndex, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runBookmarkExtents, runInstructionText };

package/dist/typed/docx/constructs.js

@@ -1,3 +1,4 @@
+import { buildXml } from "../../xml/build.js";
 import { attr, childrenWithTag, decodeEntities, textContent } from "../util.js";
 //#region src/typed/docx/constructs.ts
 const NON_CONTENT_PARAGRAPH_CHILDREN = /* @__PURE__ */ new Set([
@@ -84,6 +85,37 @@ function insertConstructMarkers(blocks, extents) {
 	}
 	return out;
 }
+function isBlockScopedHalf(half, index) {
+	const position = index.elements.indexOf(half.element);
+	if (position === -1) return false;
+	const leading = index.firstContentIndex === -1 || position < index.firstContentIndex;
+	const trailing = index.lastContentIndex === -1 || position > index.lastContentIndex;
+	return leading || trailing;
+}
+function runBookmarkExtents(halves, index) {
+	const byId = /* @__PURE__ */ new Map();
+	for (const half of halves) {
+		const existing = byId.get(half.id);
+		if (existing === void 0) byId.set(half.id, [half]);
+		else existing.push(half);
+	}
+	const extents = [];
+	for (const pair of byId.values()) {
+		const starts = pair.filter((half) => half.kind === "start");
+		const ends = pair.filter((half) => half.kind === "end");
+		const open = starts[0];
+		const close = ends[0];
+		if (starts.length !== 1 || ends.length !== 1 || open === void 0 || close === void 0) continue;
+		if (open.name === void 0 || close.runPosition < open.runPosition) continue;
+		if (isBlockScopedHalf(open, index) && isBlockScopedHalf(close, index)) continue;
+		extents.push({
+			descriptor: bookmarkAnchorDescriptor(open.name),
+			startRun: open.runPosition,
+			endRun: close.runPosition
+		});
+	}
+	return extents;
+}
 const CONTROL_TYPE_BY_TAG = /* @__PURE__ */ new Map([
 	["w:richText", "richText"],
 	["w:text", "plainText"],
@@ -104,17 +136,36 @@ const LOCK_BY_VALUE = /* @__PURE__ */ new Map([
 ]);
 const TABLE_OF_CONTENTS_GALLERY = "Table of Contents";
 function readControlType(sdtPr) {
-	if (sdtPr === void 0) return "richText";
+	if (sdtPr === void 0) return {
+		controlType: "richText",
+		galleryResidue: void 0
+	};
 	for (const child of sdtPr.children) {
 		if (child.type !== "element") continue;
 		const mapped = CONTROL_TYPE_BY_TAG.get(child.tag);
-		if (mapped !== void 0) return mapped;
+		if (mapped !== void 0) return {
+			controlType: mapped,
+			galleryResidue: void 0
+		};
 		if (child.tag === "w:docPartObj" || child.tag === "w:docPartList") {
 			const gallery = childrenWithTag(child, "w:docPartGallery")[0];
-			return (gallery === void 0 ? void 0 : attr(gallery, "w:val")) === "Table of Contents" ? "index" : "richText";
+			if ((gallery === void 0 ? void 0 : attr(gallery, "w:val")) === "Table of Contents") return {
+				controlType: "index",
+				galleryResidue: void 0
+			};
+			return {
+				controlType: "richText",
+				galleryResidue: {
+					format: "docx",
+					xml: buildXml([child])
+				}
+			};
 		}
 	}
-	return "richText";
+	return {
+		controlType: "richText",
+		galleryResidue: void 0
+	};
 }
 function readListItemOptions(sdtPr) {
 	const list = childrenWithTag(sdtPr, "w:dropDownList")[0] ?? childrenWithTag(sdtPr, "w:comboBox")[0];
@@ -136,10 +187,12 @@ function readCheckboxState(sdtPr) {
 }
 function readContentControlDescriptor(sdt) {
 	const sdtPr = childrenWithTag(sdt, "w:sdtPr")[0];
+	const { controlType, galleryResidue } = readControlType(sdtPr);
 	const descriptor = {
 		kind: "contentControl",
-		controlType: readControlType(sdtPr)
+		controlType
 	};
+	if (galleryResidue !== void 0) descriptor.source = galleryResidue;
 	if (sdtPr === void 0) return descriptor;
 	const tag = childrenWithTag(sdtPr, "w:tag")[0];
 	const tagVal = tag === void 0 ? void 0 : attr(tag, "w:val");
@@ -197,4 +250,4 @@ function fieldCharType(run) {
 	return fldChar === void 0 ? void 0 : attr(fldChar, "w:fldCharType");
 }
 //#endregion
-export { PROVENANCE_CHANGE_BY_TAG, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runInstructionText };
+export { PROVENANCE_CHANGE_BY_TAG, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runBookmarkExtents, runInstructionText };

package/dist/typed/docx/read.cjs

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

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

@@ -1,2 +1,2 @@
-import { a as Footnote, i as DocxDocumentSchema, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as readDocxContent, t as Comment } from "../../read-ClIHv1ef.cjs";
+import { a as Footnote, i as DocxDocumentSchema, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as readDocxContent, t as Comment } from "../../read-CDX1WbiF.cjs";
 export { Comment, CommentSchema, DocxDocument, DocxDocumentSchema, Footnote, FootnoteSchema, readDocxContent };

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

@@ -1,2 +1,2 @@
-import { a as Footnote, i as DocxDocumentSchema, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as readDocxContent, t as Comment } from "../../read-gB0H2bff.js";
+import { a as Footnote, i as DocxDocumentSchema, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as readDocxContent, t as Comment } from "../../read-CxMli3Om.js";
 export { Comment, CommentSchema, DocxDocument, DocxDocumentSchema, Footnote, FootnoteSchema, readDocxContent };

package/dist/typed/docx/read.js

@@ -1,2 +1,2 @@
-import { i as readDocxContent, n as DocxDocumentSchema, r as FootnoteSchema, t as CommentSchema } from "../../read-Legu2Pt-.js";
+import { i as readDocxContent, n as DocxDocumentSchema, r as FootnoteSchema, t as CommentSchema } from "../../read-BQoFiqsb.js";
 export { CommentSchema, DocxDocumentSchema, FootnoteSchema, readDocxContent };

package/dist/typed/docx/write.cjs

@@ -1,8 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_util_base64 = require("../../util/base64.cjs");
+const require_xml_parse = require("../../xml/parse.cjs");
+const require_codec = require("../../codec.cjs");
 const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_entities = require("../../xml/entities.cjs");
 const require_typed_shared_units = require("../shared/units.cjs");
 const require_typed_docx_constructs = require("./constructs.cjs");
+const require_typed_xlsx_build = require("../xlsx/build.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/docx/write.ts
 const WML_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
@@ -20,14 +24,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 {
@@ -35,6 +43,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
 	};
@@ -169,10 +179,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 ? require_xml_fragment.el("w:pPr", {}, []) : properties;
 	if (pPr !== void 0 && changeTag !== void 0 && provenance !== void 0) pPr.children.push(require_xml_fragment.el("w:rPr", {}, [require_xml_fragment.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 : [require_xml_fragment.el(changeTag, trackChangeAttrs(state, provenance), runs)];
 	return require_xml_fragment.el("w:p", {}, [...pPr === void 0 ? [] : [pPr], ...content]);
 }
+function interleaveRunConstructExtents(runElements, paragraph, state) {
+	if (paragraph.constructs === void 0) return [...runElements];
+	const fault = (0, document_schema_js.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 = require_xml_fragment.el("w:bookmarkStart", {
+			"w:id": id,
+			"w:name": require_xml_entities.encodeXmlText(bookmark.descriptor.name)
+		});
+		const close = require_xml_fragment.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);
@@ -297,6 +346,43 @@ function buildDrawing(image, state) {
 		require_xml_fragment.el("a:graphic", { "xmlns:a": DRAWINGML_NS }, [require_xml_fragment.el("a:graphicData", { uri: DRAWING_PIC_NS }, [picture])])
 	])]);
 }
+function embeddedPayloadOf(document) {
+	switch (document.kind) {
+		case "wordprocessing": return {
+			extension: "docx",
+			progId: "Word.Document.12",
+			base64: require_util_base64.bytesToBase64(require_codec.encodePackage(buildDocxPackageFromContent(document)))
+		};
+		case "spreadsheet": return {
+			extension: "xlsx",
+			progId: "Excel.Sheet.12",
+			base64: require_util_base64.bytesToBase64(require_codec.encodePackage(require_typed_xlsx_build.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 require_xml_fragment.el("w:object", {
+		"w:dxaOrig": String(require_typed_shared_units.ptToTwips(block.frame.widthPt)),
+		"w:dyaOrig": String(require_typed_shared_units.ptToTwips(block.frame.heightPt))
+	}, [require_xml_fragment.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",
@@ -357,10 +443,29 @@ function buildSdtProperties(descriptor) {
 		children.push(require_xml_fragment.el("w:date", descriptor.value === void 0 ? {} : { "w:fullDate": require_xml_entities.encodeXmlText(descriptor.value) }));
 		return require_xml_fragment.el("w:sdtPr", {}, children);
 	}
+	const restored = restoreGalleryElement(descriptor);
+	if (restored !== void 0) {
+		children.push(restored);
+		return require_xml_fragment.el("w:sdtPr", {}, children);
+	}
 	const typeTag = SDT_TYPE_ELEMENT[descriptor.controlType];
 	children.push(require_xml_fragment.el(typeTag ?? "w:richText"));
 	return require_xml_fragment.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 = require_xml_parse.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 = (0, document_schema_js.findConstructMarkerImbalance)(blocks);
 	if (imbalance !== void 0) throw new Error(`buildDocxPackageFromContent: construct markers do not balance (${imbalance.kind} at block ${String(imbalance.index)})`);
@@ -504,8 +609,25 @@ function buildFlowItems(items, state, deleted, provenance) {
 			availableImageRuns = [];
 			continue;
 		}
-		lastParagraph = void 0;
-		availableImageRuns = [];
+		if (block.kind === "embeddedObject") {
+			if (pendingPageBreak) {
+				const breakParagraph = require_xml_fragment.el("w:p", {}, [require_xml_fragment.el("w:pPr", {}, [require_xml_fragment.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(require_xml_fragment.el("w:r", {}, [object]));
+			else {
+				const paragraph = require_xml_fragment.el("w:p", {}, [require_xml_fragment.el("w:r", {}, [object])]);
+				lastParagraph = paragraph;
+				nodes.push(paragraph);
+			}
+			continue;
+		}
 	}
 	if (pendingPageBreak) nodes.push(require_xml_fragment.el("w:p", {}, [require_xml_fragment.el("w:pPr", {}, [require_xml_fragment.el("w:pageBreakBefore")])]));
 	return nodes;
@@ -555,12 +677,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"
 	}, [require_xml_fragment.el("w:body", {}, bodyChildren)]));
 }
-function buildContentTypesPart(mediaFormats) {
+function buildContentTypesPart(state) {
+	const mediaFormats = new Set([...state.mediaParts.values()].map((media) => media.format));
 	const defaults = [require_xml_fragment.el("Default", {
 		Extension: "rels",
 		ContentType: "application/vnd.openxmlformats-package.relationships+xml"
@@ -576,6 +700,10 @@ function buildContentTypesPart(mediaFormats) {
 		Extension: "jpeg",
 		ContentType: "image/jpeg"
 	}));
+	const embeddingOverrides = [...state.embeddingParts].map(([name, payload]) => require_xml_fragment.el("Override", {
+		PartName: `/word/embeddings/${name}`,
+		ContentType: payload.extension === "docx" ? CT_EMBEDDED_DOCX : CT_EMBEDDED_XLSX
+	}));
 	return xmlPart(require_xml_fragment.el("Types", { xmlns: CONTENT_TYPES_NS }, [
 		...defaults,
 		require_xml_fragment.el("Override", {
@@ -589,7 +717,8 @@ function buildContentTypesPart(mediaFormats) {
 		require_xml_fragment.el("Override", {
 			PartName: "/docProps/app.xml",
 			ContentType: CT_EXTENDED_PROPS
-		})
+		}),
+		...embeddingOverrides
 	]));
 }
 function buildPackageRelsPart() {
@@ -661,7 +790,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),
@@ -672,6 +801,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