js.documents 7.2.5 → 7.4.0

package/dist/ooxml/legacy-embedded.cjs

@@ -0,0 +1,29 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_ppt_read = require("../ppt/read.cjs");
+let doc_codec = require("doc-codec");
+let xls_codec = require("xls-codec");
+let archive_codec = require("archive-codec");
+//#region src/ooxml/legacy-embedded.ts
+function decodeLegacyEmbeddedObject(bytes) {
+	if (!(0, archive_codec.isCompoundFile)(bytes)) return;
+	try {
+		return {
+			objectKind: "wordprocessing",
+			document: (0, doc_codec.readDocContent)(bytes)
+		};
+	} catch {}
+	try {
+		return {
+			objectKind: "spreadsheet",
+			document: (0, xls_codec.readXlsContent)(bytes)
+		};
+	} catch {}
+	try {
+		return {
+			objectKind: "presentation",
+			document: require_ppt_read.readPptContent(bytes)
+		};
+	} catch {}
+}
+//#endregion
+exports.decodeLegacyEmbeddedObject = decodeLegacyEmbeddedObject;

package/dist/ooxml/legacy-embedded.d.cts

@@ -0,0 +1,9 @@
+import { ContentDocument, ContentEmbeddedObjectKind } from "document-schema.js";
+//#region src/ooxml/legacy-embedded.d.ts
+interface LegacyEmbeddedPayload {
+  readonly objectKind: Extract<ContentEmbeddedObjectKind, "wordprocessing" | "spreadsheet" | "presentation">;
+  readonly document: ContentDocument;
+}
+declare function decodeLegacyEmbeddedObject(bytes: Uint8Array<ArrayBuffer>): LegacyEmbeddedPayload | undefined;
+//#endregion
+export { LegacyEmbeddedPayload, decodeLegacyEmbeddedObject };

package/dist/ooxml/legacy-embedded.d.ts

@@ -0,0 +1,9 @@
+import { ContentDocument, ContentEmbeddedObjectKind } from "document-schema.js";
+//#region src/ooxml/legacy-embedded.d.ts
+interface LegacyEmbeddedPayload {
+  readonly objectKind: Extract<ContentEmbeddedObjectKind, "wordprocessing" | "spreadsheet" | "presentation">;
+  readonly document: ContentDocument;
+}
+declare function decodeLegacyEmbeddedObject(bytes: Uint8Array<ArrayBuffer>): LegacyEmbeddedPayload | undefined;
+//#endregion
+export { LegacyEmbeddedPayload, decodeLegacyEmbeddedObject };

package/dist/ooxml/legacy-embedded.js

@@ -0,0 +1,28 @@
+import { readPptContent } from "../ppt/read.js";
+import { readDocContent } from "doc-codec";
+import { readXlsContent } from "xls-codec";
+import { isCompoundFile } from "archive-codec";
+//#region src/ooxml/legacy-embedded.ts
+function decodeLegacyEmbeddedObject(bytes) {
+	if (!isCompoundFile(bytes)) return;
+	try {
+		return {
+			objectKind: "wordprocessing",
+			document: readDocContent(bytes)
+		};
+	} catch {}
+	try {
+		return {
+			objectKind: "spreadsheet",
+			document: readXlsContent(bytes)
+		};
+	} catch {}
+	try {
+		return {
+			objectKind: "presentation",
+			document: readPptContent(bytes)
+		};
+	} catch {}
+}
+//#endregion
+export { decodeLegacyEmbeddedObject };

package/dist/ooxml/pptx/legacy-embedded.cjs

@@ -0,0 +1,56 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_ooxml_legacy_embedded = require("../legacy-embedded.cjs");
+let ooxml_js = require("ooxml.js");
+//#region src/ooxml/pptx/legacy-embedded.ts
+const OLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/presentationml/2006/ole";
+function collectLegacyOleShapes(children, state, out) {
+	for (const node of children) {
+		if (node.type !== "element") continue;
+		if (node.tag === "p:sp" || node.tag === "p:pic") state.shapeIndex += 1;
+		else if (node.tag === "p:graphicFrame") {
+			const shapeIndex = state.shapeIndex;
+			state.shapeIndex += 1;
+			const graphic = (0, ooxml_js.childrenWithTag)(node, "a:graphic")[0];
+			const graphicData = graphic === void 0 ? void 0 : (0, ooxml_js.childrenWithTag)(graphic, "a:graphicData")[0];
+			if (graphicData !== void 0 && (0, ooxml_js.attr)(graphicData, "uri") === OLE_GRAPHIC_URI) {
+				const oleObj = (0, ooxml_js.elementsWithTag)([graphicData], "p:oleObj")[0];
+				if (oleObj !== void 0) out.push({
+					shapeIndex,
+					oleObj
+				});
+			}
+		} else if (node.tag === "p:grpSp") collectLegacyOleShapes(node.children, state, out);
+	}
+}
+function spliceSlideLegacyEmbeddedObjects(slide, spTreeChildren, slideRels, pkg) {
+	const state = { shapeIndex: 0 };
+	const found = [];
+	collectLegacyOleShapes(spTreeChildren, state, found);
+	if (found.length === 0) return slide;
+	const shapes = [...slide.shapes];
+	for (const { shapeIndex, oleObj } of found) {
+		const shape = shapes[shapeIndex];
+		if (shape === void 0) continue;
+		const rId = (0, ooxml_js.attr)(oleObj, "r:id");
+		const rel = rId === void 0 ? void 0 : slideRels.get(rId);
+		const payloadPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
+		if (payloadPart?.kind !== "binary") continue;
+		const payload = require_ooxml_legacy_embedded.decodeLegacyEmbeddedObject((0, ooxml_js.base64ToBytes)(payloadPart.base64));
+		if (payload === void 0) continue;
+		shapes[shapeIndex] = {
+			...shape,
+			blocks: [...shape.blocks, {
+				kind: "embeddedObject",
+				objectKind: payload.objectKind,
+				document: payload.document,
+				frame: shape.frame
+			}]
+		};
+	}
+	return {
+		...slide,
+		shapes
+	};
+}
+//#endregion
+exports.spliceSlideLegacyEmbeddedObjects = spliceSlideLegacyEmbeddedObjects;

package/dist/ooxml/pptx/legacy-embedded.d.cts

@@ -0,0 +1,6 @@
+import { ContentSlide } from "document-schema.js";
+import { Package, Relationship, XmlNode } from "ooxml.js";
+//#region src/ooxml/pptx/legacy-embedded.d.ts
+declare function spliceSlideLegacyEmbeddedObjects(slide: ContentSlide, spTreeChildren: readonly XmlNode[], slideRels: ReadonlyMap<string, Relationship>, pkg: Package): ContentSlide;
+//#endregion
+export { spliceSlideLegacyEmbeddedObjects };

package/dist/ooxml/pptx/legacy-embedded.d.ts

@@ -0,0 +1,6 @@
+import { Package, Relationship, XmlNode } from "ooxml.js";
+import { ContentSlide } from "document-schema.js";
+//#region src/ooxml/pptx/legacy-embedded.d.ts
+declare function spliceSlideLegacyEmbeddedObjects(slide: ContentSlide, spTreeChildren: readonly XmlNode[], slideRels: ReadonlyMap<string, Relationship>, pkg: Package): ContentSlide;
+//#endregion
+export { spliceSlideLegacyEmbeddedObjects };

package/dist/ooxml/pptx/legacy-embedded.js

@@ -0,0 +1,55 @@
+import { decodeLegacyEmbeddedObject } from "../legacy-embedded.js";
+import { attr, base64ToBytes, childrenWithTag, elementsWithTag } from "ooxml.js";
+//#region src/ooxml/pptx/legacy-embedded.ts
+const OLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/presentationml/2006/ole";
+function collectLegacyOleShapes(children, state, out) {
+	for (const node of children) {
+		if (node.type !== "element") continue;
+		if (node.tag === "p:sp" || node.tag === "p:pic") state.shapeIndex += 1;
+		else if (node.tag === "p:graphicFrame") {
+			const shapeIndex = state.shapeIndex;
+			state.shapeIndex += 1;
+			const graphic = childrenWithTag(node, "a:graphic")[0];
+			const graphicData = graphic === void 0 ? void 0 : childrenWithTag(graphic, "a:graphicData")[0];
+			if (graphicData !== void 0 && attr(graphicData, "uri") === OLE_GRAPHIC_URI) {
+				const oleObj = elementsWithTag([graphicData], "p:oleObj")[0];
+				if (oleObj !== void 0) out.push({
+					shapeIndex,
+					oleObj
+				});
+			}
+		} else if (node.tag === "p:grpSp") collectLegacyOleShapes(node.children, state, out);
+	}
+}
+function spliceSlideLegacyEmbeddedObjects(slide, spTreeChildren, slideRels, pkg) {
+	const state = { shapeIndex: 0 };
+	const found = [];
+	collectLegacyOleShapes(spTreeChildren, state, found);
+	if (found.length === 0) return slide;
+	const shapes = [...slide.shapes];
+	for (const { shapeIndex, oleObj } of found) {
+		const shape = shapes[shapeIndex];
+		if (shape === void 0) continue;
+		const rId = attr(oleObj, "r:id");
+		const rel = rId === void 0 ? void 0 : slideRels.get(rId);
+		const payloadPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
+		if (payloadPart?.kind !== "binary") continue;
+		const payload = decodeLegacyEmbeddedObject(base64ToBytes(payloadPart.base64));
+		if (payload === void 0) continue;
+		shapes[shapeIndex] = {
+			...shape,
+			blocks: [...shape.blocks, {
+				kind: "embeddedObject",
+				objectKind: payload.objectKind,
+				document: payload.document,
+				frame: shape.frame
+			}]
+		};
+	}
+	return {
+		...slide,
+		shapes
+	};
+}
+//#endregion
+export { spliceSlideLegacyEmbeddedObjects };

package/dist/ooxml/pptx/read.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_ooxml_pptx_formula = require("./formula.cjs");
 const require_ooxml_pptx_vector = require("./vector.cjs");
+const require_ooxml_pptx_legacy_embedded = require("./legacy-embedded.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/ooxml/pptx/read.ts
 const PRESENTATION_PART = "ppt/presentation.xml";
@@ -23,12 +24,14 @@ function readPptxContent(pkg, options) {
 	const slidePaths = slidePathsInOrder(pkg);
 	const slides = pptxDoc.slides.map((slide, slideIndex) => {
 		const slidePath = slidePaths[slideIndex];
-		const slideRoot = slidePath === void 0 ? void 0 : (0, ooxml_js.rootElement)(pkg.parts[slidePath]);
+		if (slidePath === void 0) return slide;
+		const slideRoot = (0, ooxml_js.rootElement)(pkg.parts[slidePath]);
 		const cSld = slideRoot === void 0 ? void 0 : (0, ooxml_js.childrenWithTag)(slideRoot, "p:cSld")[0];
 		const spTree = cSld === void 0 ? void 0 : (0, ooxml_js.childrenWithTag)(cSld, "p:spTree")[0];
 		if (spTree === void 0) return slide;
 		const withFormulas = require_ooxml_pptx_formula.spliceSlideFormulas(slide, slideIndex, spTree.children, options?.onMathDiagnostic);
-		return require_ooxml_pptx_vector.collapseVectorShapeRuns(withFormulas, slideIndex, spTree.children);
+		const withLegacyEmbeddings = require_ooxml_pptx_legacy_embedded.spliceSlideLegacyEmbeddedObjects(withFormulas, spTree.children, (0, ooxml_js.resolveRelationships)(pkg, slidePath), pkg);
+		return require_ooxml_pptx_vector.collapseVectorShapeRuns(withLegacyEmbeddings, slideIndex, spTree.children);
 	});
 	return {
 		kind: "presentation",

package/dist/ooxml/pptx/read.js

@@ -1,5 +1,6 @@
 import { spliceSlideFormulas } from "./formula.js";
 import { collapseVectorShapeRuns } from "./vector.js";
+import { spliceSlideLegacyEmbeddedObjects } from "./legacy-embedded.js";
 import { attr, childrenWithTag, readPptxContent as readPptxContent$1, resolveRelationships, rootElement } from "ooxml.js";
 //#region src/ooxml/pptx/read.ts
 const PRESENTATION_PART = "ppt/presentation.xml";
@@ -22,12 +23,14 @@ function readPptxContent(pkg, options) {
 	const slidePaths = slidePathsInOrder(pkg);
 	const slides = pptxDoc.slides.map((slide, slideIndex) => {
 		const slidePath = slidePaths[slideIndex];
-		const slideRoot = slidePath === void 0 ? void 0 : rootElement(pkg.parts[slidePath]);
+		if (slidePath === void 0) return slide;
+		const slideRoot = rootElement(pkg.parts[slidePath]);
 		const cSld = slideRoot === void 0 ? void 0 : childrenWithTag(slideRoot, "p:cSld")[0];
 		const spTree = cSld === void 0 ? void 0 : childrenWithTag(cSld, "p:spTree")[0];
 		if (spTree === void 0) return slide;
 		const withFormulas = spliceSlideFormulas(slide, slideIndex, spTree.children, options?.onMathDiagnostic);
-		return collapseVectorShapeRuns(withFormulas, slideIndex, spTree.children);
+		const withLegacyEmbeddings = spliceSlideLegacyEmbeddedObjects(withFormulas, spTree.children, resolveRelationships(pkg, slidePath), pkg);
+		return collapseVectorShapeRuns(withLegacyEmbeddings, slideIndex, spTree.children);
 	});
 	return {
 		kind: "presentation",

package/dist/opc/core-properties.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("../xml/fragment.cjs");
-const require_opc_rels = require("./rels.cjs");
 const require_xml_entities = require("../xml/entities.cjs");
+const require_xml_fragment = require("../xml/fragment.cjs");
 const require_opc_content_types = require("./content-types.cjs");
+const require_opc_rels = require("./rels.cjs");
 //#region src/opc/core-properties.ts
 const CORE_PROPERTIES_PART_PATH = "docProps/core.xml";
 const CORE_PROPERTIES_CONTENT_TYPE = "application/vnd.openxmlformats-package.core-properties+xml";

package/dist/opc/core-properties.js

@@ -1,7 +1,7 @@
-import { el, txt } from "../xml/fragment.js";
-import { addRootRelationship } from "./rels.js";
 import { encodeXmlText } from "../xml/entities.js";
+import { el, txt } from "../xml/fragment.js";
 import { ensureContentTypeOverride } from "./content-types.js";
+import { addRootRelationship } from "./rels.js";
 //#region src/opc/core-properties.ts
 const CORE_PROPERTIES_PART_PATH = "docProps/core.xml";
 const CORE_PROPERTIES_CONTENT_TYPE = "application/vnd.openxmlformats-package.core-properties+xml";

package/dist/opc/media.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_opc_content_types = require("./content-types.cjs");
 const require_opc_paths = require("./paths.cjs");
 const require_opc_rels = require("./rels.cjs");
-const require_opc_content_types = require("./content-types.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/opc/media.ts
 const IMAGE_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";

package/dist/opc/media.js

@@ -1,6 +1,6 @@
+import { defaultContentTypeForExtension, ensureDefaultContentType } from "./content-types.js";
 import { buildRelativeTarget } from "./paths.js";
 import { addRelationship } from "./rels.js";
-import { defaultContentTypeForExtension, ensureDefaultContentType } from "./content-types.js";
 import { bytesToBase64 } from "ooxml.js";
 //#region src/opc/media.ts
 const IMAGE_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";

package/dist/xml/odf-text.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("./fragment.cjs");
 const require_xml_entities = require("./entities.cjs");
+const require_xml_fragment = require("./fragment.cjs");
 let odf_js = require("odf.js");
 //#region src/xml/odf-text.ts
 const MIN_SPACE_RUN_FOR_TEXT_S = 2;

package/dist/xml/odf-text.js

@@ -1,5 +1,5 @@
-import { el, txt } from "./fragment.js";
 import { encodeXmlText as encodeXmlText$1 } from "./entities.js";
+import { el, txt } from "./fragment.js";
 import { decodeOdfText as decodeOdfText$1 } from "odf.js";
 //#region src/xml/odf-text.ts
 const MIN_SPACE_RUN_FOR_TEXT_S = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "7.2.5",
+  "version": "7.4.0",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -83,8 +83,8 @@
     "document-schema.js": "^7.0.0",
     "fflate": "^0.8.3",
     "markdown-codec": "^6.3.6",
-    "odf.js": "^7.3.0",
-    "ooxml.js": "^8.2.0",
+    "odf.js": "^7.4.0",
+    "ooxml.js": "^8.3.0",
     "pdf-codec": "^4.0.5",
     "ppt-codec": "^1.2.6",
     "rtf-codec": "^4.0.1",