ppt-codec 1.6.0 → 1.7.1

package/dist/write.js

@@ -7,8 +7,8 @@ import { concatBytes, writeContainer } from "./record/write.js";
 import { writeDocumentAtom } from "./document/document-atom-write.js";
 import { writeEnvironment } from "./document/fonts-write.js";
 import { isBlipFormat, writeDrawingGroupContainer } from "./drawing/blips.js";
-import { writeSlideDrawing } from "./drawing/shapes-write.js";
 import { CURRENT_USER_STREAM, POWERPOINT_DOCUMENT_STREAM, SUMMARY_INFORMATION_STREAM } from "./read.js";
+import { writeSlideDrawing } from "./drawing/shapes-write.js";
 import { writeMainMaster, writeMasterListWithText, writeSlideAtomForSlide } from "./document/master-write.js";
 import { writeNotesListWithText } from "./document/notes-list-write.js";
 import { writeNotesContainer } from "./document/notes-write.js";
@@ -16,6 +16,7 @@ import { writeSlideListWithText } from "./document/slide-list-write.js";
 import { layoutMetadataToSummaryInformation as layoutMetadataToSummaryInformation$1 } from "./metadata.js";
 import { writeCurrentUserAtom } from "./stream/current-user-write.js";
 import { writePersistDirectoryAtom, writeUserEditAtom } from "./stream/persist-write.js";
+import { writeExObjListContainer, writeExOleObjStg, writeOleClientData } from "./ole/embedded-write.js";
 import { hasSummaryInformationFields, writeCompoundFile, writeSummaryInformationStream } from "archive-codec";
 import { flattenTree } from "document-schema.js";
 //#region src/write.ts
@@ -34,10 +35,10 @@ function requireOneSlideSize(slides) {
 	for (const slide of slides) if (slide.size.widthPt !== first.widthPt || slide.size.heightPt !== first.heightPt) throw new PptUnsupportedContentError(`ppt-codec's writer cannot express per-slide sizes: slide sizes ${JSON.stringify(first)} and ${JSON.stringify(slide.size)} both appear, but [MS-PPT]'s DocumentAtom states exactly one slide size for the whole presentation`);
 	return first;
 }
-function writeSlideContainer(shapes, notesIdRef, context) {
+function writeSlideContainer(shapes, notesIdRef, context, clientDataFor) {
 	const drawing = writeSlideDrawing(shapes.map((shape) => ({
 		shape,
-		clientData: void 0
+		clientData: clientDataFor(shape)
 	})), context);
 	return {
 		bytes: writeContainer(RT_Slide, [writeSlideAtomForSlide(notesIdRef), drawing.bytes]),
@@ -45,6 +46,34 @@ function writeSlideContainer(shapes, notesIdRef, context) {
 		maxSpid: drawing.maxSpid
 	};
 }
+function planOleEmbeds(slides, serialise, firstPersistId) {
+	const embeds = [];
+	const persistObjects = [];
+	const clientDataByShape = /* @__PURE__ */ new Map();
+	if (serialise !== void 0) for (const slide of slides) for (const shape of slide.shapes) {
+		const embedBlock = shape.blocks.find((block) => block.kind === "embeddedObject");
+		if (embedBlock === void 0) continue;
+		const storageBytes = serialise(embedBlock.document);
+		if (storageBytes === void 0) continue;
+		const exObjId = embeds.length + 1;
+		const persistId = firstPersistId + persistObjects.length;
+		embeds.push({
+			exObjId,
+			persistIdRef: persistId,
+			objectKind: embedBlock.objectKind
+		});
+		persistObjects.push({
+			persistId,
+			bytes: writeExOleObjStg(storageBytes)
+		});
+		clientDataByShape.set(shape, writeOleClientData(exObjId));
+	}
+	return {
+		embeds,
+		persistObjects,
+		clientDataFor: (shape) => clientDataByShape.get(shape)
+	};
+}
 function planBlipStore(slides) {
 	const blips = [];
 	const pibByKey = /* @__PURE__ */ new Map();
@@ -80,10 +109,12 @@ function writePptStreams(document, options = {}) {
 		return index;
 	};
 	const store = planBlipStore(slides);
+	const strict = options.onUnwritableBlock === "throw";
 	const contextFor = (location) => ({
 		fontIndexOf,
 		blipIndexOf: store.pibOf,
 		sink,
+		strict,
 		location
 	});
 	const slidePersistRefs = slides.map((_slide, index) => ({
@@ -91,6 +122,8 @@ function writePptStreams(document, options = {}) {
 		slideId: FIRST_SLIDE_ID + index
 	}));
 	const notesIdRefs = slides.map((slide, index) => slide.notes.length === 0 ? NO_NOTES_ID_REF : FIRST_NOTES_ID + slides.slice(0, index).filter((earlier) => earlier.notes.length > 0).length);
+	const notesCount = notesIdRefs.filter((id) => id !== NO_NOTES_ID_REF).length;
+	const oleEmbeds = planOleEmbeds(slides, options.serialiseEmbeddedObject, FIRST_SLIDE_PERSIST_ID + slides.length + notesCount);
 	let shapeCount = 0;
 	let maxSpid = 0;
 	let drawingCount = 0;
@@ -105,7 +138,7 @@ function writePptStreams(document, options = {}) {
 		const ref = slidePersistRefs[index];
 		const notesIdRef = notesIdRefs[index];
 		if (ref === void 0 || notesIdRef === void 0) throw new PptUnsupportedContentError("internal error: slide persist reference missing for a slide being written");
-		const container = writeSlideContainer(slide.shapes, notesIdRef, contextFor(`slide ${index + 1}`));
+		const container = writeSlideContainer(slide.shapes, notesIdRef, contextFor(`slide ${index + 1}`), oleEmbeds.clientDataFor);
 		account(container);
 		return {
 			persistId: ref.persistIdRef,
@@ -131,6 +164,8 @@ function writePptStreams(document, options = {}) {
 	});
 	const environment = writeEnvironment(fontNames);
 	const documentChildren = [writeDocumentAtom(size)];
+	const exObjList = writeExObjListContainer(oleEmbeds.embeds);
+	if (exObjList !== void 0) documentChildren.push(exObjList);
 	if (environment !== void 0) documentChildren.push(environment);
 	documentChildren.push(writeDrawingGroupContainer(store.blips, {
 		spidMax: maxSpid,
@@ -151,7 +186,8 @@ function writePptStreams(document, options = {}) {
 			bytes: mainMaster.bytes
 		},
 		...slideContainers,
-		...notesContainers
+		...notesContainers,
+		...oleEmbeds.persistObjects
 	];
 	const persistEntries = [];
 	let offset = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppt-codec",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "Hand-written PowerPoint 97-2003 binary (.ppt, [MS-PPT]) reader and writer against the shared document-schema.js content pivot.",
   "type": "module",
   "repository": {
@@ -59,7 +59,7 @@
     "_test": "vitest run --project unit",
     "_test:coverage": "vitest run --project unit --coverage",
     "test:mutation": "turbo run _test:mutation",
-    "_test:mutation": "stryker run stryker.config.mjs",
+    "_test:mutation": "stryker run stryker.config.ts",
     "test:watch": "vitest --project unit",
     "test:workers": "turbo run _test:workers",
     "_test:workers": "vitest run --config vitest.workers.config.ts",
@@ -78,8 +78,9 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "1.11.0",
-    "document-schema.js": "7.11.0"
+    "archive-codec": "1.11.1",
+    "byte-codec": "1.5.1",
+    "document-schema.js": "7.11.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
@@ -88,7 +89,6 @@
     "@stryker-mutator/typescript-checker": "10.0.0",
     "@stryker-mutator/vitest-runner": "10.0.0",
     "@types/node": "26.2.0",
-    "byte-codec": "1.5.0",
     "eslint": "10.8.1",
     "husky": "9.1.7",
     "jiti": "2.7.0",