ooxml.js 2.15.0 → 2.16.0

package/README.md

@@ -241,7 +241,7 @@ The package layers a lossless core outward to lossy convenience views:
 
 ## Gotchas and quirks
 
-- **`readDocx`/`readPptx` are not a round-trip path.** Numbering definitions, cell border styling/shading, and `w:themeColor` (without `themeShade`/`themeTint`) are read; images read into `ContentImageBlock` (floating `wp:anchor` position not recorded); `PAGE`/`NUMPAGES` fields resolve to Word's cached text. On pptx: connector shapes (`p:cxnSp`) are skipped; shape rotation composes through groups; a chart graphic frame reads its chart part's cached series/category model into a table block (header row = series names, one row per category index); a SmartArt graphic frame reads its diagram data model's node text as paragraphs in diagram order (depth-first over `parOf` connections, siblings by `srcOrd`); OLE graphic frames come through with geometry but empty content.
+- **`readDocx`/`readPptx` are not a round-trip path.** Numbering definitions, cell border styling/shading, and `w:themeColor` (without `themeShade`/`themeTint`) are read; images read into `ContentImageBlock` (floating `wp:anchor` position not recorded); `PAGE`/`NUMPAGES` fields resolve to Word's cached text. On pptx: connector shapes (`p:cxnSp`) are skipped; shape rotation composes through groups; a chart graphic frame reads its chart part's cached series/category model into a table block (header row = series names, one row per category index); a SmartArt graphic frame reads its diagram data model's node text as paragraphs in diagram order (depth-first over `parOf` connections, siblings by `srcOrd`); an OLE graphic frame reads the fallback picture its `mc:Fallback` carries (or, with none reachable, a paragraph naming the `p:oleObj`'s `progId`) — the embedded payload itself is an external application's data and is not decoded.
 - **xlsx has no native percentage/currency/date/time cell type.** Both directions are closed via the number-format engine: reading classifies style → format code → kind; writing emits interned `numFmt` codes, fed back through the classifier in tests. `displayText` is the typed-value spelling, not the producer's rendered string.
 - **`test:smoke` depends on a fresh build.** It runs `tsdown && vitest run --project smoke`, always rebuilding `dist/` first. A bare `vitest` runs both projects; `smoke` fails loudly (`Cannot find module '../dist/index.js'`) if `dist/` is unbuilt.
 - **Binary-vs-XML part classification is a byte sniff, not an extension check.** `looksLikeXml` looks for a leading `<` after skipping a UTF-8 BOM and whitespace; any future binary format starting with `<` would misclassify.

package/dist/typed/pptx/read.cjs

@@ -20,6 +20,7 @@ const PRESENTATION_PATH = "ppt/presentation.xml";
 const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
 const CHART_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 const DIAGRAM_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/diagram";
+const OLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/presentationml/2006/ole";
 function readSlideSize(presentationRoot) {
 	const sldSz = presentationRoot === void 0 ? void 0 : require_typed_util.childrenWithTag(presentationRoot, "p:sldSz")[0];
 	const cx = sldSz === void 0 ? void 0 : require_typed_util.attr(sldSz, "cx");
@@ -195,29 +196,26 @@ function readSpShape(sp, context, slideRels, parentTransform) {
 		blocks
 	};
 }
-function readPicShape(pic, context, slideRels, pkg, parentTransform) {
-	const resolved = resolveShapeFrame(pic, context, parentTransform);
-	if (resolved === void 0) return;
-	const blipFill = require_typed_util.childrenWithTag(pic, "p:blipFill")[0];
-	const blip = blipFill === void 0 ? void 0 : require_typed_util.childrenWithTag(blipFill, "a:blip")[0];
+function readBlipImage(parent, slideRels, pkg, frame) {
+	const blip = require_typed_util.elementsWithTag([parent], "a:blip")[0];
 	const rId = blip === void 0 ? void 0 : require_typed_util.attr(blip, "r:embed");
 	const rel = rId === void 0 ? void 0 : slideRels.get(rId);
 	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
-	const blocks = [];
-	if (mediaPart?.kind === "binary") {
-		const bytes = require_util_base64.base64ToBytes(mediaPart.base64);
-		const format = require_image_sniff.sniffImageFormat(bytes);
-		if (format !== void 0) {
-			const image = {
-				kind: "image",
-				format,
-				base64: mediaPart.base64,
-				widthPt: resolved.frame.widthPt,
-				heightPt: resolved.frame.heightPt
-			};
-			blocks.push(image);
-		}
-	}
+	if (mediaPart?.kind !== "binary") return;
+	const format = require_image_sniff.sniffImageFormat(require_util_base64.base64ToBytes(mediaPart.base64));
+	return format === void 0 ? void 0 : {
+		kind: "image",
+		format,
+		base64: mediaPart.base64,
+		widthPt: frame.widthPt,
+		heightPt: frame.heightPt
+	};
+}
+function readPicShape(pic, context, slideRels, pkg, parentTransform) {
+	const resolved = resolveShapeFrame(pic, context, parentTransform);
+	if (resolved === void 0) return;
+	const image = readBlipImage(pic, slideRels, pkg, resolved.frame);
+	const blocks = image === void 0 ? [] : [image];
 	return {
 		name: shapeName(pic),
 		frame: resolved.frame,
@@ -290,6 +288,17 @@ function readGraphicFrameShape(gf, context, slideRels, pkg, parentTransform) {
 		const relIds = require_typed_util.childrenWithTag(graphicData, "dgm:relIds")[0];
 		const dataModelRoot = relatedPartRoot(relIds === void 0 ? void 0 : require_typed_util.attr(relIds, "r:dm"), slideRels, pkg);
 		blocks = dataModelRoot === void 0 ? [] : require_typed_pptx_diagram.readDiagramText(dataModelRoot);
+	} else if (uri === OLE_GRAPHIC_URI && graphicData !== void 0) {
+		const image = readBlipImage(graphicData, slideRels, pkg, frame);
+		if (image !== void 0) blocks = [image];
+		else {
+			const oleObj = require_typed_util.elementsWithTag([graphicData], "p:oleObj")[0];
+			const progId = oleObj === void 0 ? void 0 : require_typed_util.attr(oleObj, "progId");
+			blocks = progId === void 0 ? [] : [{
+				kind: "paragraph",
+				runs: [{ text: progId }]
+			}];
+		}
 	} else blocks = [];
 	return {
 		name: shapeName(gf),

package/dist/typed/pptx/read.js

@@ -19,6 +19,7 @@ const PRESENTATION_PATH = "ppt/presentation.xml";
 const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
 const CHART_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 const DIAGRAM_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/diagram";
+const OLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/presentationml/2006/ole";
 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");
@@ -194,29 +195,26 @@ function readSpShape(sp, context, slideRels, parentTransform) {
 		blocks
 	};
 }
-function readPicShape(pic, context, slideRels, pkg, parentTransform) {
-	const resolved = resolveShapeFrame(pic, context, parentTransform);
-	if (resolved === void 0) return;
-	const blipFill = childrenWithTag(pic, "p:blipFill")[0];
-	const blip = blipFill === void 0 ? void 0 : childrenWithTag(blipFill, "a:blip")[0];
+function readBlipImage(parent, slideRels, pkg, frame) {
+	const blip = elementsWithTag([parent], "a:blip")[0];
 	const rId = blip === void 0 ? void 0 : attr(blip, "r:embed");
 	const rel = rId === void 0 ? void 0 : slideRels.get(rId);
 	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
-	const blocks = [];
-	if (mediaPart?.kind === "binary") {
-		const bytes = base64ToBytes(mediaPart.base64);
-		const format = sniffImageFormat(bytes);
-		if (format !== void 0) {
-			const image = {
-				kind: "image",
-				format,
-				base64: mediaPart.base64,
-				widthPt: resolved.frame.widthPt,
-				heightPt: resolved.frame.heightPt
-			};
-			blocks.push(image);
-		}
-	}
+	if (mediaPart?.kind !== "binary") return;
+	const format = sniffImageFormat(base64ToBytes(mediaPart.base64));
+	return format === void 0 ? void 0 : {
+		kind: "image",
+		format,
+		base64: mediaPart.base64,
+		widthPt: frame.widthPt,
+		heightPt: frame.heightPt
+	};
+}
+function readPicShape(pic, context, slideRels, pkg, parentTransform) {
+	const resolved = resolveShapeFrame(pic, context, parentTransform);
+	if (resolved === void 0) return;
+	const image = readBlipImage(pic, slideRels, pkg, resolved.frame);
+	const blocks = image === void 0 ? [] : [image];
 	return {
 		name: shapeName(pic),
 		frame: resolved.frame,
@@ -289,6 +287,17 @@ function readGraphicFrameShape(gf, context, slideRels, pkg, parentTransform) {
 		const relIds = childrenWithTag(graphicData, "dgm:relIds")[0];
 		const dataModelRoot = relatedPartRoot(relIds === void 0 ? void 0 : attr(relIds, "r:dm"), slideRels, pkg);
 		blocks = dataModelRoot === void 0 ? [] : readDiagramText(dataModelRoot);
+	} else if (uri === OLE_GRAPHIC_URI && graphicData !== void 0) {
+		const image = readBlipImage(graphicData, slideRels, pkg, frame);
+		if (image !== void 0) blocks = [image];
+		else {
+			const oleObj = elementsWithTag([graphicData], "p:oleObj")[0];
+			const progId = oleObj === void 0 ? void 0 : attr(oleObj, "progId");
+			blocks = progId === void 0 ? [] : [{
+				kind: "paragraph",
+				runs: [{ text: progId }]
+			}];
+		}
 	} else blocks = [];
 	return {
 		name: shapeName(gf),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {