js.documents 7.2.5 → 7.4.0

package/dist/metadata/core-patch.d.ts

@@ -0,0 +1,15 @@
+import { Package } from "ooxml.js";
+import { LayoutMetadata } from "document-schema.js";
+import { Package as Package$1 } from "odf.js";
+//#region src/metadata/core-patch.d.ts
+interface MetadataOverrides {
+  readonly title?: string;
+  readonly author?: string;
+  readonly subject?: string;
+  readonly keywords?: string[];
+}
+declare function mergeMetadata(current: LayoutMetadata, overrides: MetadataOverrides): LayoutMetadata;
+declare function patchOoxmlCorePropertiesOnPackage(pkg: Package, overrides: MetadataOverrides): void;
+declare function patchOdfMetadataOnPackage(pkg: Package$1, overrides: MetadataOverrides, version: string): void;
+//#endregion
+export { MetadataOverrides, mergeMetadata, patchOdfMetadataOnPackage, patchOoxmlCorePropertiesOnPackage };

package/dist/metadata/core-patch.js

@@ -0,0 +1,26 @@
+import { addCoreProperties } from "../opc/core-properties.js";
+import { hasCoreProperties, patchCoreProperties } from "ooxml.js";
+import { hasOdfMetadata, patchOdfMetadata, writeOdfMetadata } from "odf.js";
+//#region src/metadata/core-patch.ts
+function mergeMetadata(current, overrides) {
+	return {
+		...current,
+		...overrides.title !== void 0 ? { title: overrides.title } : {},
+		...overrides.author !== void 0 ? { author: overrides.author } : {},
+		...overrides.subject !== void 0 ? { subject: overrides.subject } : {},
+		...overrides.keywords !== void 0 ? { keywords: overrides.keywords } : {}
+	};
+}
+function hasWritableMetadataOverride(overrides) {
+	return overrides.title !== void 0 || overrides.author !== void 0 || overrides.subject !== void 0 || overrides.keywords !== void 0 && overrides.keywords.length > 0;
+}
+function patchOoxmlCorePropertiesOnPackage(pkg, overrides) {
+	if (hasCoreProperties(pkg)) patchCoreProperties(pkg, overrides);
+	else if (hasWritableMetadataOverride(overrides)) addCoreProperties(pkg, mergeMetadata({}, overrides));
+}
+function patchOdfMetadataOnPackage(pkg, overrides, version) {
+	if (hasOdfMetadata(pkg)) patchOdfMetadata(pkg, overrides);
+	else if (hasWritableMetadataOverride(overrides)) writeOdfMetadata(pkg, mergeMetadata({}, overrides), version);
+}
+//#endregion
+export { mergeMetadata, patchOdfMetadataOnPackage, patchOoxmlCorePropertiesOnPackage };

package/dist/metadata/write.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_model_bytes = require("../model/bytes.cjs");
-const require_opc_core_properties = require("../opc/core-properties.cjs");
+const require_metadata_core_patch = require("./core-patch.cjs");
 const require_ports_abort = require("../ports/abort.cjs");
 const require_codecs_registry = require("../codecs/registry.cjs");
 let ooxml_js = require("ooxml.js");
@@ -29,23 +29,10 @@ function buildBytesForRebuildFormat(format, content) {
 	if (!codec?.write) throw new Error(`RebuildFormat '${format}' has no content.write codec in DOCUMENT_FORMAT_CODECS -- this is an internal invariant violation, not a caller error`);
 	return require_model_bytes.requireArrayBufferBytes(codec.write(content));
 }
-function mergeMetadata(current, overrides) {
-	return {
-		...current,
-		...overrides.title !== void 0 ? { title: overrides.title } : {},
-		...overrides.author !== void 0 ? { author: overrides.author } : {},
-		...overrides.subject !== void 0 ? { subject: overrides.subject } : {},
-		...overrides.keywords !== void 0 ? { keywords: overrides.keywords } : {}
-	};
-}
-function hasWritableMetadataOverride(overrides) {
-	return overrides.title !== void 0 || overrides.author !== void 0 || overrides.subject !== void 0 || overrides.keywords !== void 0 && overrides.keywords.length > 0;
-}
 function patchDocxMetadata(bytes, overrides, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, ooxml_js.decodePackage)(bytes);
-	if ((0, ooxml_js.hasCoreProperties)(pkg)) (0, ooxml_js.patchCoreProperties)(pkg, overrides);
-	else if (hasWritableMetadataOverride(overrides)) require_opc_core_properties.addCoreProperties(pkg, mergeMetadata({}, overrides));
+	require_metadata_core_patch.patchOoxmlCorePropertiesOnPackage(pkg, overrides);
 	return (0, ooxml_js.encodePackage)(pkg);
 }
 function classifyWritePath(source, target) {
@@ -75,7 +62,7 @@ function setDocumentMetadata(sourceFormat, targetFormat, bytes, overrides, optio
 		const layout = (0, pdf_codec.readPdf)(bytes, { signal: options?.signal });
 		const patched = {
 			...layout,
-			metadata: mergeMetadata(layout.metadata, overrides)
+			metadata: require_metadata_core_patch.mergeMetadata(layout.metadata, overrides)
 		};
 		return (0, pdf_codec.writePdf)(patched, { signal: options?.signal });
 	}
@@ -86,7 +73,7 @@ function setDocumentMetadata(sourceFormat, targetFormat, bytes, overrides, optio
 	});
 	const nextContent = {
 		...content,
-		metadata: mergeMetadata(content.metadata, overrides)
+		metadata: require_metadata_core_patch.mergeMetadata(content.metadata, overrides)
 	};
 	return buildBytesForRebuildFormat(writePath.format, nextContent);
 }

package/dist/metadata/write.d.cts

@@ -1,12 +1,7 @@
 import { DocumentFormat } from "../convert/port.cjs";
+import { MetadataOverrides } from "./core-patch.cjs";
 import { MarkdownImageResolver } from "markdown-codec";
 //#region src/metadata/write.d.ts
-interface MetadataOverrides {
-  readonly title?: string;
-  readonly author?: string;
-  readonly subject?: string;
-  readonly keywords?: string[];
-}
 interface PatchDocxMetadataOptions {
   readonly signal?: AbortSignal;
 }
@@ -17,4 +12,4 @@ interface SetDocumentMetadataOptions {
 }
 declare function setDocumentMetadata(sourceFormat: DocumentFormat, targetFormat: DocumentFormat, bytes: Uint8Array<ArrayBuffer>, overrides: MetadataOverrides, options?: SetDocumentMetadataOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { MetadataOverrides, PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };
+export { PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };

package/dist/metadata/write.d.ts

@@ -1,12 +1,7 @@
 import { DocumentFormat } from "../convert/port.js";
+import { MetadataOverrides } from "./core-patch.js";
 import { MarkdownImageResolver } from "markdown-codec";
 //#region src/metadata/write.d.ts
-interface MetadataOverrides {
-  readonly title?: string;
-  readonly author?: string;
-  readonly subject?: string;
-  readonly keywords?: string[];
-}
 interface PatchDocxMetadataOptions {
   readonly signal?: AbortSignal;
 }
@@ -17,4 +12,4 @@ interface SetDocumentMetadataOptions {
 }
 declare function setDocumentMetadata(sourceFormat: DocumentFormat, targetFormat: DocumentFormat, bytes: Uint8Array<ArrayBuffer>, overrides: MetadataOverrides, options?: SetDocumentMetadataOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { MetadataOverrides, PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };
+export { PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };

package/dist/metadata/write.js

@@ -1,8 +1,8 @@
 import { requireArrayBufferBytes } from "../model/bytes.js";
-import { addCoreProperties } from "../opc/core-properties.js";
+import { mergeMetadata, patchOoxmlCorePropertiesOnPackage } from "./core-patch.js";
 import { throwIfAborted } from "../ports/abort.js";
 import { DOCUMENT_FORMAT_CODECS } from "../codecs/registry.js";
-import { decodePackage, encodePackage, hasCoreProperties, patchCoreProperties } from "ooxml.js";
+import { decodePackage, encodePackage } from "ooxml.js";
 import { readPdf, writePdf } from "pdf-codec";
 //#region src/metadata/write.ts
 const REBUILD_FORMATS = {
@@ -28,23 +28,10 @@ function buildBytesForRebuildFormat(format, content) {
 	if (!codec?.write) throw new Error(`RebuildFormat '${format}' has no content.write codec in DOCUMENT_FORMAT_CODECS -- this is an internal invariant violation, not a caller error`);
 	return requireArrayBufferBytes(codec.write(content));
 }
-function mergeMetadata(current, overrides) {
-	return {
-		...current,
-		...overrides.title !== void 0 ? { title: overrides.title } : {},
-		...overrides.author !== void 0 ? { author: overrides.author } : {},
-		...overrides.subject !== void 0 ? { subject: overrides.subject } : {},
-		...overrides.keywords !== void 0 ? { keywords: overrides.keywords } : {}
-	};
-}
-function hasWritableMetadataOverride(overrides) {
-	return overrides.title !== void 0 || overrides.author !== void 0 || overrides.subject !== void 0 || overrides.keywords !== void 0 && overrides.keywords.length > 0;
-}
 function patchDocxMetadata(bytes, overrides, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage(bytes);
-	if (hasCoreProperties(pkg)) patchCoreProperties(pkg, overrides);
-	else if (hasWritableMetadataOverride(overrides)) addCoreProperties(pkg, mergeMetadata({}, overrides));
+	patchOoxmlCorePropertiesOnPackage(pkg, overrides);
 	return encodePackage(pkg);
 }
 function classifyWritePath(source, target) {

package/dist/odf-package/formula.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("../xml/fragment.cjs");
 const require_xml_entities = require("../xml/entities.cjs");
+const require_xml_fragment = require("../xml/fragment.cjs");
 const require_odf_package_manifest = require("./manifest.cjs");
 //#region src/odf-package/formula.ts
 const OBJECT_PREFIX = "Object ";

package/dist/odf-package/formula.js

@@ -1,5 +1,5 @@
-import { el, txt } from "../xml/fragment.js";
 import { encodeXmlText } from "../xml/entities.js";
+import { el, txt } from "../xml/fragment.js";
 import { syncOdfManifest } from "./manifest.js";
 //#region src/odf-package/formula.ts
 const OBJECT_PREFIX = "Object ";

package/dist/omml/write.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_entities = require("../xml/entities.cjs");
 const require_xml_fragment = require("../xml/fragment.cjs");
 const require_mathml_length = require("../mathml/length.cjs");
 const require_mathml_nodes = require("../mathml/nodes.cjs");
 const require_mathml_operators = require("../mathml/operators.cjs");
 const require_mathml_variant = require("../mathml/variant.cjs");
-const require_xml_entities = require("../xml/entities.cjs");
 const require_omml_shared = require("./shared.cjs");
 //#region src/omml/write.ts
 const OMML_NS = "http://schemas.openxmlformats.org/officeDocument/2006/math";

package/dist/omml/write.js

@@ -1,9 +1,9 @@
+import { encodeXmlText, needsSpacePreserve } from "../xml/entities.js";
 import { el, txt } from "../xml/fragment.js";
 import { parseMathLength } from "../mathml/length.js";
 import { attrValue, elementChildren, elementLocalName, isMathMlElement, textContent } from "../mathml/nodes.js";
 import { operatorProperties } from "../mathml/operators.js";
 import { isMathVariant } from "../mathml/variant.js";
-import { encodeXmlText, needsSpacePreserve } from "../xml/entities.js";
 import { VARIANT_RUN_PROPERTIES, miIntrinsicDefault } from "./shared.js";
 //#region src/omml/write.ts
 const OMML_NS = "http://schemas.openxmlformats.org/officeDocument/2006/math";

package/dist/ooxml/docx/embedded-objects.cjs

@@ -1,20 +1,71 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_units = require("../../model/units.cjs");
 const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_model_formula = require("../../model/formula.cjs");
 const require_omml_read = require("../../omml/read.cjs");
 const require_model_block_splice = require("../../model/block-splice.cjs");
+const require_ooxml_legacy_embedded = require("../legacy-embedded.cjs");
 const require_ooxml_docx_vector = require("./vector.cjs");
 const require_ooxml_docx_formula = require("./formula.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/ooxml/docx/embedded-objects.ts
+const DOCUMENT_PART_PATH = "word/document.xml";
 function isVectorOnlyRun(run, vectors) {
 	const elementChildren = run.children.filter((child) => child.type === "element");
 	if (elementChildren.length !== 1) return false;
 	if (run.children.some((child) => child.type === "text" && child.value.trim().length > 0)) return false;
 	return vectors.some((detected) => detected.drawingElement === elementChildren[0]);
 }
-function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
-	if (equations.length === 0 && vectors.length === 0) return false;
+function objectFrame(object) {
+	const dxaOrig = (0, ooxml_js.attr)(object, "w:dxaOrig");
+	const dyaOrig = (0, ooxml_js.attr)(object, "w:dyaOrig");
+	if (dxaOrig === void 0 || dyaOrig === void 0) return;
+	const widthPt = require_model_units.twipsToPt(Number(dxaOrig));
+	const heightPt = require_model_units.twipsToPt(Number(dyaOrig));
+	return Number.isFinite(widthPt) && Number.isFinite(heightPt) ? {
+		widthPt,
+		heightPt
+	} : void 0;
+}
+function resolveLegacyOleObject(object, rels, pkg) {
+	const oleObject = (0, ooxml_js.elementsWithTag)([object], "o:OLEObject")[0];
+	const rId = oleObject === void 0 ? void 0 : (0, ooxml_js.attr)(oleObject, "r:id");
+	const rel = rId === void 0 ? void 0 : rels.get(rId);
+	const payloadPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
+	if (payloadPart?.kind !== "binary") return;
+	const frame = objectFrame(object);
+	if (frame === void 0) return;
+	const payload = require_ooxml_legacy_embedded.decodeLegacyEmbeddedObject((0, ooxml_js.base64ToBytes)(payloadPart.base64));
+	return payload === void 0 ? void 0 : {
+		kind: "embeddedObject",
+		objectKind: payload.objectKind,
+		document: payload.document,
+		frame: {
+			xPt: 0,
+			yPt: 0,
+			...frame
+		}
+	};
+}
+function collectParagraphOleObjects(paragraph, rels, pkg) {
+	const out = [];
+	for (const object of (0, ooxml_js.elementsWithTag)(paragraph.children, "w:object")) {
+		const block = resolveLegacyOleObject(object, rels, pkg);
+		if (block !== void 0) out.push({
+			objectElement: object,
+			block
+		});
+	}
+	return out;
+}
+function isOleObjectOnlyRun(run, oleObjects) {
+	const elementChildren = run.children.filter((child) => child.type === "element");
+	if (elementChildren.length !== 1) return false;
+	if (run.children.some((child) => child.type === "text" && child.value.trim().length > 0)) return false;
+	return oleObjects.some((detected) => detected.objectElement === elementChildren[0]);
+}
+function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors, oleObjects) {
+	if (equations.length === 0 && vectors.length === 0 && oleObjects.length === 0) return false;
 	for (const child of paragraph.children) {
 		if (child.type === "text") {
 			if (child.value.trim().length > 0) return false;
@@ -24,14 +75,16 @@ function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
 		if (require_ooxml_docx_formula.PARAGRAPH_NON_CONTENT_TAGS.has(child.tag) || equations.includes(child)) continue;
 		if (child.tag === "m:oMathPara" && require_omml_read.collectOfficeMathElements(child.children).every((math) => equations.includes(math))) continue;
 		if (child.tag === "w:r" && isVectorOnlyRun(child, vectors)) continue;
+		if (child.tag === "w:r" && isOleObjectOnlyRun(child, oleObjects)) continue;
 		return false;
 	}
 	return true;
 }
-function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
+function paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic) {
 	const equations = require_omml_read.collectOfficeMathElements(paragraph.children);
 	const vectors = require_ooxml_docx_vector.collectParagraphVectors(paragraph);
-	if (equations.length === 0 && vectors.length === 0) return {
+	const oleObjects = collectParagraphOleObjects(paragraph, rels, pkg);
+	if (equations.length === 0 && vectors.length === 0 && oleObjects.length === 0) return {
 		placements: [],
 		consume: false
 	};
@@ -40,7 +93,7 @@ function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
 		...require_omml_read.readOfficeMath(equation)
 	}));
 	const rendered = converted.filter((result) => result.mathml.length > 0);
-	if (rendered.length === 0 && vectors.length === 0) {
+	if (rendered.length === 0 && vectors.length === 0 && oleObjects.length === 0) {
 		for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
 		return {
 			placements: [],
@@ -73,12 +126,19 @@ function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
 			})
 		});
 	}
+	for (const detected of oleObjects) placements.push({
+		index: insertAt,
+		build: (sourcePath) => ({
+			...detected.block,
+			sourcePath
+		})
+	});
 	return {
 		placements,
-		consume: isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)
+		consume: isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors, oleObjects)
 	};
 }
-function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPrefix, onMathDiagnostic) {
+function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPrefix, rels, pkg, onMathDiagnostic) {
 	const paragraphElements = [];
 	require_ooxml_docx_formula.collectBodyParagraphs(containerChildren, paragraphElements);
 	const tableElements = [];
@@ -92,7 +152,7 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 			const paragraph = paragraphElements[paragraphOrdinal];
 			paragraphOrdinal += 1;
 			if (paragraph === void 0) return block;
-			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
 			if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
 			if (consume) consumedIndices.add(blockIndex);
 			return block;
@@ -101,14 +161,14 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 			const tableElement = tableElements[tableOrdinal];
 			tableOrdinal += 1;
 			if (tableElement === void 0) return block;
-			return rebuildTable(block, tableElement, pageSize, `${sourcePathPrefix}[${blockIndex}]`, onMathDiagnostic);
+			return rebuildTable(block, tableElement, pageSize, `${sourcePathPrefix}[${blockIndex}]`, rels, pkg, onMathDiagnostic);
 		}
 		return block;
 	});
 	if (!(consumedIndices.size > 0 || rebuiltBlocks.some((block, index) => block !== blocks[index])) && placements.length === 0) return [...blocks];
 	return require_model_block_splice.spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `${sourcePathPrefix}[${position}]`);
 }
-function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic) {
+function rebuildTable(table, tblElement, pageSize, blockPath, rels, pkg, onMathDiagnostic) {
 	const rowElements = (0, ooxml_js.childrenWithTag)(tblElement, "w:tr");
 	const rows = table.rows.map((row, rowIndex) => {
 		const rowElement = rowElements[rowIndex];
@@ -116,7 +176,7 @@ function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic)
 		const cells = row.cells.map((cell, cellIndex) => {
 			const cellElement = cellElements[cellIndex];
 			if (cellElement === void 0) return cell;
-			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, onMathDiagnostic);
+			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, rels, pkg, onMathDiagnostic);
 			return blocks === cell.blocks ? cell : {
 				...cell,
 				blocks
@@ -132,11 +192,12 @@ function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic)
 		rows
 	} : table;
 }
-function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
+function spliceDocxEmbeddedObjects(sections, bodyChildren, pkg, onMathDiagnostic) {
 	const paragraphElements = [];
 	require_ooxml_docx_formula.collectBodyParagraphs(bodyChildren, paragraphElements);
 	const tableElements = [];
 	require_ooxml_docx_formula.collectBodyTables(bodyChildren, tableElements);
+	const rels = (0, ooxml_js.resolveRelationships)(pkg, DOCUMENT_PART_PATH);
 	let paragraphOrdinal = 0;
 	let tableOrdinal = 0;
 	const out = [];
@@ -148,7 +209,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
 				const paragraph = paragraphElements[paragraphOrdinal];
 				paragraphOrdinal += 1;
 				if (paragraph === void 0) return block;
-				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
 				if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
 				if (consume) consumedIndices.add(blockIndex);
 				return block;
@@ -157,7 +218,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
 				const tableElement = tableElements[tableOrdinal];
 				tableOrdinal += 1;
 				if (tableElement === void 0) return block;
-				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, onMathDiagnostic);
+				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, rels, pkg, onMathDiagnostic);
 			}
 			return block;
 		});

package/dist/ooxml/docx/embedded-objects.d.cts

@@ -1,7 +1,7 @@
 import { t as OmmlDiagnosticSink } from "../../formula-BpuJ3ae0.cjs";
 import { ContentSection } from "document-schema.js";
-import { XmlNode } from "ooxml.js";
+import { Package, XmlNode } from "ooxml.js";
 //#region src/ooxml/docx/embedded-objects.d.ts
-declare function spliceDocxEmbeddedObjects(sections: readonly ContentSection[], bodyChildren: readonly XmlNode[], onMathDiagnostic?: OmmlDiagnosticSink): ContentSection[];
+declare function spliceDocxEmbeddedObjects(sections: readonly ContentSection[], bodyChildren: readonly XmlNode[], pkg: Package, onMathDiagnostic?: OmmlDiagnosticSink): ContentSection[];
 //#endregion
 export { spliceDocxEmbeddedObjects };

package/dist/ooxml/docx/embedded-objects.d.ts

@@ -1,7 +1,7 @@
 import { t as OmmlDiagnosticSink } from "../../formula-Cb-LRoIE.js";
-import { XmlNode } from "ooxml.js";
+import { Package, XmlNode } from "ooxml.js";
 import { ContentSection } from "document-schema.js";
 //#region src/ooxml/docx/embedded-objects.d.ts
-declare function spliceDocxEmbeddedObjects(sections: readonly ContentSection[], bodyChildren: readonly XmlNode[], onMathDiagnostic?: OmmlDiagnosticSink): ContentSection[];
+declare function spliceDocxEmbeddedObjects(sections: readonly ContentSection[], bodyChildren: readonly XmlNode[], pkg: Package, onMathDiagnostic?: OmmlDiagnosticSink): ContentSection[];
 //#endregion
 export { spliceDocxEmbeddedObjects };

package/dist/ooxml/docx/embedded-objects.js

@@ -1,19 +1,70 @@
+import { twipsToPt } from "../../model/units.js";
 import { buildDrawingBlock } from "../../model/embedded-drawing.js";
 import { buildFormulaBlock } from "../../model/formula.js";
 import { collectOfficeMathElements, readOfficeMath } from "../../omml/read.js";
 import { spliceBlocks } from "../../model/block-splice.js";
+import { decodeLegacyEmbeddedObject } from "../legacy-embedded.js";
 import { collectParagraphVectors } from "./vector.js";
 import { PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, collectBodyTables, equationFrame } from "./formula.js";
-import { childrenWithTag } from "ooxml.js";
+import { attr, base64ToBytes, childrenWithTag, elementsWithTag, resolveRelationships } from "ooxml.js";
 //#region src/ooxml/docx/embedded-objects.ts
+const DOCUMENT_PART_PATH = "word/document.xml";
 function isVectorOnlyRun(run, vectors) {
 	const elementChildren = run.children.filter((child) => child.type === "element");
 	if (elementChildren.length !== 1) return false;
 	if (run.children.some((child) => child.type === "text" && child.value.trim().length > 0)) return false;
 	return vectors.some((detected) => detected.drawingElement === elementChildren[0]);
 }
-function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
-	if (equations.length === 0 && vectors.length === 0) return false;
+function objectFrame(object) {
+	const dxaOrig = attr(object, "w:dxaOrig");
+	const dyaOrig = attr(object, "w:dyaOrig");
+	if (dxaOrig === void 0 || dyaOrig === void 0) return;
+	const widthPt = twipsToPt(Number(dxaOrig));
+	const heightPt = twipsToPt(Number(dyaOrig));
+	return Number.isFinite(widthPt) && Number.isFinite(heightPt) ? {
+		widthPt,
+		heightPt
+	} : void 0;
+}
+function resolveLegacyOleObject(object, rels, pkg) {
+	const oleObject = elementsWithTag([object], "o:OLEObject")[0];
+	const rId = oleObject === void 0 ? void 0 : attr(oleObject, "r:id");
+	const rel = rId === void 0 ? void 0 : rels.get(rId);
+	const payloadPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
+	if (payloadPart?.kind !== "binary") return;
+	const frame = objectFrame(object);
+	if (frame === void 0) return;
+	const payload = decodeLegacyEmbeddedObject(base64ToBytes(payloadPart.base64));
+	return payload === void 0 ? void 0 : {
+		kind: "embeddedObject",
+		objectKind: payload.objectKind,
+		document: payload.document,
+		frame: {
+			xPt: 0,
+			yPt: 0,
+			...frame
+		}
+	};
+}
+function collectParagraphOleObjects(paragraph, rels, pkg) {
+	const out = [];
+	for (const object of elementsWithTag(paragraph.children, "w:object")) {
+		const block = resolveLegacyOleObject(object, rels, pkg);
+		if (block !== void 0) out.push({
+			objectElement: object,
+			block
+		});
+	}
+	return out;
+}
+function isOleObjectOnlyRun(run, oleObjects) {
+	const elementChildren = run.children.filter((child) => child.type === "element");
+	if (elementChildren.length !== 1) return false;
+	if (run.children.some((child) => child.type === "text" && child.value.trim().length > 0)) return false;
+	return oleObjects.some((detected) => detected.objectElement === elementChildren[0]);
+}
+function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors, oleObjects) {
+	if (equations.length === 0 && vectors.length === 0 && oleObjects.length === 0) return false;
 	for (const child of paragraph.children) {
 		if (child.type === "text") {
 			if (child.value.trim().length > 0) return false;
@@ -23,14 +74,16 @@ function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
 		if (PARAGRAPH_NON_CONTENT_TAGS.has(child.tag) || equations.includes(child)) continue;
 		if (child.tag === "m:oMathPara" && collectOfficeMathElements(child.children).every((math) => equations.includes(math))) continue;
 		if (child.tag === "w:r" && isVectorOnlyRun(child, vectors)) continue;
+		if (child.tag === "w:r" && isOleObjectOnlyRun(child, oleObjects)) continue;
 		return false;
 	}
 	return true;
 }
-function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
+function paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic) {
 	const equations = collectOfficeMathElements(paragraph.children);
 	const vectors = collectParagraphVectors(paragraph);
-	if (equations.length === 0 && vectors.length === 0) return {
+	const oleObjects = collectParagraphOleObjects(paragraph, rels, pkg);
+	if (equations.length === 0 && vectors.length === 0 && oleObjects.length === 0) return {
 		placements: [],
 		consume: false
 	};
@@ -39,7 +92,7 @@ function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
 		...readOfficeMath(equation)
 	}));
 	const rendered = converted.filter((result) => result.mathml.length > 0);
-	if (rendered.length === 0 && vectors.length === 0) {
+	if (rendered.length === 0 && vectors.length === 0 && oleObjects.length === 0) {
 		for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
 		return {
 			placements: [],
@@ -72,12 +125,19 @@ function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
 			})
 		});
 	}
+	for (const detected of oleObjects) placements.push({
+		index: insertAt,
+		build: (sourcePath) => ({
+			...detected.block,
+			sourcePath
+		})
+	});
 	return {
 		placements,
-		consume: isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)
+		consume: isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors, oleObjects)
 	};
 }
-function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPrefix, onMathDiagnostic) {
+function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPrefix, rels, pkg, onMathDiagnostic) {
 	const paragraphElements = [];
 	collectBodyParagraphs(containerChildren, paragraphElements);
 	const tableElements = [];
@@ -91,7 +151,7 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 			const paragraph = paragraphElements[paragraphOrdinal];
 			paragraphOrdinal += 1;
 			if (paragraph === void 0) return block;
-			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
 			if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
 			if (consume) consumedIndices.add(blockIndex);
 			return block;
@@ -100,14 +160,14 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 			const tableElement = tableElements[tableOrdinal];
 			tableOrdinal += 1;
 			if (tableElement === void 0) return block;
-			return rebuildTable(block, tableElement, pageSize, `${sourcePathPrefix}[${blockIndex}]`, onMathDiagnostic);
+			return rebuildTable(block, tableElement, pageSize, `${sourcePathPrefix}[${blockIndex}]`, rels, pkg, onMathDiagnostic);
 		}
 		return block;
 	});
 	if (!(consumedIndices.size > 0 || rebuiltBlocks.some((block, index) => block !== blocks[index])) && placements.length === 0) return [...blocks];
 	return spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `${sourcePathPrefix}[${position}]`);
 }
-function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic) {
+function rebuildTable(table, tblElement, pageSize, blockPath, rels, pkg, onMathDiagnostic) {
 	const rowElements = childrenWithTag(tblElement, "w:tr");
 	const rows = table.rows.map((row, rowIndex) => {
 		const rowElement = rowElements[rowIndex];
@@ -115,7 +175,7 @@ function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic)
 		const cells = row.cells.map((cell, cellIndex) => {
 			const cellElement = cellElements[cellIndex];
 			if (cellElement === void 0) return cell;
-			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, onMathDiagnostic);
+			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, rels, pkg, onMathDiagnostic);
 			return blocks === cell.blocks ? cell : {
 				...cell,
 				blocks
@@ -131,11 +191,12 @@ function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic)
 		rows
 	} : table;
 }
-function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
+function spliceDocxEmbeddedObjects(sections, bodyChildren, pkg, onMathDiagnostic) {
 	const paragraphElements = [];
 	collectBodyParagraphs(bodyChildren, paragraphElements);
 	const tableElements = [];
 	collectBodyTables(bodyChildren, tableElements);
+	const rels = resolveRelationships(pkg, DOCUMENT_PART_PATH);
 	let paragraphOrdinal = 0;
 	let tableOrdinal = 0;
 	const out = [];
@@ -147,7 +208,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
 				const paragraph = paragraphElements[paragraphOrdinal];
 				paragraphOrdinal += 1;
 				if (paragraph === void 0) return block;
-				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
 				if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
 				if (consume) consumedIndices.add(blockIndex);
 				return block;
@@ -156,7 +217,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
 				const tableElement = tableElements[tableOrdinal];
 				tableOrdinal += 1;
 				if (tableElement === void 0) return block;
-				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, onMathDiagnostic);
+				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, rels, pkg, onMathDiagnostic);
 			}
 			return block;
 		});

package/dist/ooxml/docx/read.cjs

@@ -10,7 +10,7 @@ function documentBody(pkg) {
 function readDocxContent(pkg, options) {
 	const docxDoc = (0, ooxml_js.readDocxContent)(pkg);
 	const body = documentBody(pkg);
-	const sections = body === void 0 ? docxDoc.sections : require_ooxml_docx_embedded_objects.spliceDocxEmbeddedObjects(docxDoc.sections, body.children, options?.onMathDiagnostic);
+	const sections = body === void 0 ? docxDoc.sections : require_ooxml_docx_embedded_objects.spliceDocxEmbeddedObjects(docxDoc.sections, body.children, pkg, options?.onMathDiagnostic);
 	return {
 		kind: "wordprocessing",
 		metadata: { ...docxDoc.metadata },

package/dist/ooxml/docx/read.js

@@ -9,7 +9,7 @@ function documentBody(pkg) {
 function readDocxContent(pkg, options) {
 	const docxDoc = readDocxContent$1(pkg);
 	const body = documentBody(pkg);
-	const sections = body === void 0 ? docxDoc.sections : spliceDocxEmbeddedObjects(docxDoc.sections, body.children, options?.onMathDiagnostic);
+	const sections = body === void 0 ? docxDoc.sections : spliceDocxEmbeddedObjects(docxDoc.sections, body.children, pkg, options?.onMathDiagnostic);
 	return {
 		kind: "wordprocessing",
 		metadata: { ...docxDoc.metadata },