ppt-codec 1.5.0 → 1.6.0

package/dist/record/types.d.ts

@@ -9,11 +9,13 @@ declare const RT_Environment = 1010;
 declare const RT_SlidePersistAtom = 1011;
 declare const RT_MainMaster = 1016;
 declare const RT_ExternalObjectList = 1033;
+declare const RT_ExternalObjectListAtom = 1034;
 declare const RT_DrawingGroup = 1035;
 declare const RT_Drawing = 1036;
 declare const RT_List = 2000;
 declare const RT_FontCollection = 2005;
 declare const RT_ColorSchemeAtom = 2032;
+declare const RT_ExternalObjectRefAtom = 3009;
 declare const RT_PlaceholderAtom = 3011;
 declare const RT_OutlineTextRefAtom = 3998;
 declare const RT_TextHeaderAtom = 3999;
@@ -27,17 +29,25 @@ declare const RT_TextSpecialInfoDefaultAtom = 4009;
 declare const RT_TextSpecialInfoAtom = 4010;
 declare const RT_FontEntityAtom = 4023;
 declare const RT_CString = 4026;
+declare const RT_ExternalOleObjectAtom = 4035;
+declare const RT_ExternalOleEmbed = 4044;
+declare const RT_ExternalOleEmbedAtom = 4045;
 declare const RT_SlideListWithText = 4080;
 declare const RT_UserEditAtom = 4085;
 declare const RT_CurrentUserAtom = 4086;
+declare const RT_ExternalOleObjectStg = 4113;
 declare const RT_PersistDirectoryAtom = 6002;
 declare const RT_CryptSession10Container = 12052;
 declare const SLIDE_LIST_INSTANCE_SLIDES = 0;
 declare const SLIDE_LIST_INSTANCE_MASTERS = 1;
 declare const SLIDE_LIST_INSTANCE_NOTES = 2;
+declare const OfficeArtDggContainer = 61440;
+declare const OfficeArtBStoreContainer = 61441;
 declare const OfficeArtDgContainer = 61442;
 declare const OfficeArtSpgrContainer = 61443;
 declare const OfficeArtSpContainer = 61444;
+declare const OfficeArtFDGGBlock = 61446;
+declare const OfficeArtFBSE = 61447;
 declare const OfficeArtFSPGR = 61449;
 declare const OfficeArtFSP = 61450;
 declare const OfficeArtFOPT = 61451;
@@ -45,5 +55,9 @@ declare const OfficeArtClientTextbox = 61453;
 declare const OfficeArtChildAnchor = 61455;
 declare const OfficeArtClientAnchor = 61456;
 declare const OfficeArtClientData = 61457;
+declare const OfficeArtSecondaryFOPT = 61729;
+declare const OfficeArtTertiaryFOPT = 61730;
+declare const OfficeArtBlipJPEG = 61469;
+declare const OfficeArtBlipPNG = 61470;
 //#endregion
-export { OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSpContainer, OfficeArtSpgrContainer, RT_CString, RT_ColorSchemeAtom, RT_CryptSession10Container, RT_CurrentUserAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_DrawingGroup, RT_Environment, RT_ExternalObjectList, RT_FontCollection, RT_FontEntityAtom, RT_List, RT_MainMaster, RT_MasterTextPropAtom, RT_Notes, RT_NotesAtom, RT_OutlineTextRefAtom, RT_PersistDirectoryAtom, RT_PlaceholderAtom, RT_Slide, RT_SlideAtom, RT_SlideListWithText, RT_SlidePersistAtom, RT_StyleTextPropAtom, RT_TextBytesAtom, RT_TextCharsAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom, RT_TextRulerAtom, RT_TextSpecialInfoAtom, RT_TextSpecialInfoDefaultAtom, RT_UserEditAtom, SLIDE_LIST_INSTANCE_MASTERS, SLIDE_LIST_INSTANCE_NOTES, SLIDE_LIST_INSTANCE_SLIDES };
+export { OfficeArtBStoreContainer, OfficeArtBlipJPEG, OfficeArtBlipPNG, OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtDggContainer, OfficeArtFBSE, OfficeArtFDGGBlock, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSecondaryFOPT, OfficeArtSpContainer, OfficeArtSpgrContainer, OfficeArtTertiaryFOPT, RT_CString, RT_ColorSchemeAtom, RT_CryptSession10Container, RT_CurrentUserAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_DrawingGroup, RT_Environment, RT_ExternalObjectList, RT_ExternalObjectListAtom, RT_ExternalObjectRefAtom, RT_ExternalOleEmbed, RT_ExternalOleEmbedAtom, RT_ExternalOleObjectAtom, RT_ExternalOleObjectStg, RT_FontCollection, RT_FontEntityAtom, RT_List, RT_MainMaster, RT_MasterTextPropAtom, RT_Notes, RT_NotesAtom, RT_OutlineTextRefAtom, RT_PersistDirectoryAtom, RT_PlaceholderAtom, RT_Slide, RT_SlideAtom, RT_SlideListWithText, RT_SlidePersistAtom, RT_StyleTextPropAtom, RT_TextBytesAtom, RT_TextCharsAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom, RT_TextRulerAtom, RT_TextSpecialInfoAtom, RT_TextSpecialInfoDefaultAtom, RT_UserEditAtom, SLIDE_LIST_INSTANCE_MASTERS, SLIDE_LIST_INSTANCE_NOTES, SLIDE_LIST_INSTANCE_SLIDES };

package/dist/record/types.js

@@ -9,11 +9,13 @@ const RT_Environment = 1010;
 const RT_SlidePersistAtom = 1011;
 const RT_MainMaster = 1016;
 const RT_ExternalObjectList = 1033;
+const RT_ExternalObjectListAtom = 1034;
 const RT_DrawingGroup = 1035;
 const RT_Drawing = 1036;
 const RT_List = 2e3;
 const RT_FontCollection = 2005;
 const RT_ColorSchemeAtom = 2032;
+const RT_ExternalObjectRefAtom = 3009;
 const RT_PlaceholderAtom = 3011;
 const RT_OutlineTextRefAtom = 3998;
 const RT_TextHeaderAtom = 3999;
@@ -27,17 +29,25 @@ const RT_TextSpecialInfoDefaultAtom = 4009;
 const RT_TextSpecialInfoAtom = 4010;
 const RT_FontEntityAtom = 4023;
 const RT_CString = 4026;
+const RT_ExternalOleObjectAtom = 4035;
+const RT_ExternalOleEmbed = 4044;
+const RT_ExternalOleEmbedAtom = 4045;
 const RT_SlideListWithText = 4080;
 const RT_UserEditAtom = 4085;
 const RT_CurrentUserAtom = 4086;
+const RT_ExternalOleObjectStg = 4113;
 const RT_PersistDirectoryAtom = 6002;
 const RT_CryptSession10Container = 12052;
 const SLIDE_LIST_INSTANCE_SLIDES = 0;
 const SLIDE_LIST_INSTANCE_MASTERS = 1;
 const SLIDE_LIST_INSTANCE_NOTES = 2;
+const OfficeArtDggContainer = 61440;
+const OfficeArtBStoreContainer = 61441;
 const OfficeArtDgContainer = 61442;
 const OfficeArtSpgrContainer = 61443;
 const OfficeArtSpContainer = 61444;
+const OfficeArtFDGGBlock = 61446;
+const OfficeArtFBSE = 61447;
 const OfficeArtFSPGR = 61449;
 const OfficeArtFSP = 61450;
 const OfficeArtFOPT = 61451;
@@ -45,5 +55,9 @@ const OfficeArtClientTextbox = 61453;
 const OfficeArtChildAnchor = 61455;
 const OfficeArtClientAnchor = 61456;
 const OfficeArtClientData = 61457;
+const OfficeArtSecondaryFOPT = 61729;
+const OfficeArtTertiaryFOPT = 61730;
+const OfficeArtBlipJPEG = 61469;
+const OfficeArtBlipPNG = 61470;
 //#endregion
-export { OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSpContainer, OfficeArtSpgrContainer, RT_CString, RT_ColorSchemeAtom, RT_CryptSession10Container, RT_CurrentUserAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_DrawingGroup, RT_Environment, RT_ExternalObjectList, RT_FontCollection, RT_FontEntityAtom, RT_List, RT_MainMaster, RT_MasterTextPropAtom, RT_Notes, RT_NotesAtom, RT_OutlineTextRefAtom, RT_PersistDirectoryAtom, RT_PlaceholderAtom, RT_Slide, RT_SlideAtom, RT_SlideListWithText, RT_SlidePersistAtom, RT_StyleTextPropAtom, RT_TextBytesAtom, RT_TextCharsAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom, RT_TextRulerAtom, RT_TextSpecialInfoAtom, RT_TextSpecialInfoDefaultAtom, RT_UserEditAtom, SLIDE_LIST_INSTANCE_MASTERS, SLIDE_LIST_INSTANCE_NOTES, SLIDE_LIST_INSTANCE_SLIDES };
+export { OfficeArtBStoreContainer, OfficeArtBlipJPEG, OfficeArtBlipPNG, OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtDggContainer, OfficeArtFBSE, OfficeArtFDGGBlock, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSecondaryFOPT, OfficeArtSpContainer, OfficeArtSpgrContainer, OfficeArtTertiaryFOPT, RT_CString, RT_ColorSchemeAtom, RT_CryptSession10Container, RT_CurrentUserAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_DrawingGroup, RT_Environment, RT_ExternalObjectList, RT_ExternalObjectListAtom, RT_ExternalObjectRefAtom, RT_ExternalOleEmbed, RT_ExternalOleEmbedAtom, RT_ExternalOleObjectAtom, RT_ExternalOleObjectStg, RT_FontCollection, RT_FontEntityAtom, RT_List, RT_MainMaster, RT_MasterTextPropAtom, RT_Notes, RT_NotesAtom, RT_OutlineTextRefAtom, RT_PersistDirectoryAtom, RT_PlaceholderAtom, RT_Slide, RT_SlideAtom, RT_SlideListWithText, RT_SlidePersistAtom, RT_StyleTextPropAtom, RT_TextBytesAtom, RT_TextCharsAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom, RT_TextRulerAtom, RT_TextSpecialInfoAtom, RT_TextSpecialInfoDefaultAtom, RT_UserEditAtom, SLIDE_LIST_INSTANCE_MASTERS, SLIDE_LIST_INSTANCE_NOTES, SLIDE_LIST_INSTANCE_SLIDES };

package/dist/write.cjs

@@ -1,10 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_base64 = require("./base64.cjs");
 const require_errors = require("./errors.cjs");
 const require_record_types = require("./record/types.cjs");
 const require_content_write = require("./content-write.cjs");
+const require_diagnostics = require("./diagnostics.cjs");
 const require_record_write = require("./record/write.cjs");
 const require_document_document_atom_write = require("./document/document-atom-write.cjs");
 const require_document_fonts_write = require("./document/fonts-write.cjs");
+const require_drawing_blips = require("./drawing/blips.cjs");
 const require_drawing_shapes_write = require("./drawing/shapes-write.cjs");
 const require_read = require("./read.cjs");
 const require_document_master_write = require("./document/master-write.cjs");
@@ -32,65 +35,125 @@ function requireOneSlideSize(slides) {
 	for (const slide of slides) if (slide.size.widthPt !== first.widthPt || slide.size.heightPt !== first.heightPt) throw new require_errors.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, fontIndexOf) {
-	return require_record_write.writeContainer(require_record_types.RT_Slide, [require_document_master_write.writeSlideAtomForSlide(notesIdRef), require_drawing_shapes_write.writeSlideDrawing(shapes, fontIndexOf)]);
+function writeSlideContainer(shapes, notesIdRef, context) {
+	const drawing = require_drawing_shapes_write.writeSlideDrawing(shapes.map((shape) => ({
+		shape,
+		clientData: void 0
+	})), context);
+	return {
+		bytes: require_record_write.writeContainer(require_record_types.RT_Slide, [require_document_master_write.writeSlideAtomForSlide(notesIdRef), drawing.bytes]),
+		shapeCount: drawing.shapeCount,
+		maxSpid: drawing.maxSpid
+	};
 }
-function writePptStreams(document) {
+function planBlipStore(slides) {
+	const blips = [];
+	const pibByKey = /* @__PURE__ */ new Map();
+	for (const slide of slides) for (const shape of slide.shapes) for (const block of shape.blocks) {
+		if (block.kind !== "image" || !require_drawing_blips.isBlipFormat(block.format)) continue;
+		const key = `${block.format}:${block.base64}`;
+		if (!pibByKey.has(key)) {
+			pibByKey.set(key, blips.length + 1);
+			blips.push({
+				format: block.format,
+				bytes: require_base64.base64ToBytes(block.base64)
+			});
+		}
+	}
+	return {
+		blips,
+		pibOf: (image) => {
+			const pib = pibByKey.get(`${image.format}:${image.base64}`);
+			if (pib === void 0) throw new require_errors.PptUnsupportedContentError("internal error: an image block reached the drawing writer without first being collected into the document's blip store");
+			return pib;
+		}
+	};
+}
+function writePptStreams(document, options = {}) {
+	options.signal?.throwIfAborted();
 	const { slides } = document;
 	const size = requireOneSlideSize(slides);
+	const sink = options.sink ?? require_diagnostics.NOOP_PPT_DIAGNOSTIC_SINK;
 	const fontNames = require_content_write.collectFontFamilies(slides.map((slide) => slide.shapes.flatMap((shape) => shape.blocks)));
 	const fontIndexOf = (family) => {
 		const index = fontNames.indexOf(family);
 		if (index === -1) throw new require_errors.PptUnsupportedContentError(`font family '${family}' was not collected into the document's font table before writing`);
 		return index;
 	};
+	const store = planBlipStore(slides);
+	const contextFor = (location) => ({
+		fontIndexOf,
+		blipIndexOf: store.pibOf,
+		sink,
+		location
+	});
 	const slidePersistRefs = slides.map((_slide, index) => ({
 		persistIdRef: FIRST_SLIDE_PERSIST_ID + index,
 		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);
+	let shapeCount = 0;
+	let maxSpid = 0;
+	let drawingCount = 0;
+	const account = (drawing) => {
+		shapeCount += drawing.shapeCount;
+		maxSpid = Math.max(maxSpid, drawing.maxSpid);
+		drawingCount += 1;
+	};
+	const mainMaster = require_document_master_write.writeMainMaster(size, contextFor("the main master"));
+	account(mainMaster);
+	const slideContainers = slides.map((slide, index) => {
+		const ref = slidePersistRefs[index];
+		const notesIdRef = notesIdRefs[index];
+		if (ref === void 0 || notesIdRef === void 0) throw new require_errors.PptUnsupportedContentError("internal error: slide persist reference missing for a slide being written");
+		const container = writeSlideContainer(slide.shapes, notesIdRef, contextFor(`slide ${index + 1}`));
+		account(container);
+		return {
+			persistId: ref.persistIdRef,
+			bytes: container.bytes
+		};
+	});
 	const notesPersists = [];
 	const notesContainers = [];
-	const notesIdRefs = slides.map((slide, index) => {
-		if (slide.notes.length === 0) return NO_NOTES_ID_REF;
-		const notesId = FIRST_NOTES_ID + notesPersists.length;
+	slides.forEach((slide, index) => {
+		const notesId = notesIdRefs[index];
+		if (notesId === void 0 || notesId === NO_NOTES_ID_REF) return;
+		const persistIdRef = FIRST_SLIDE_PERSIST_ID + slides.length + notesPersists.length;
 		notesPersists.push({
-			persistIdRef: FIRST_SLIDE_PERSIST_ID + slides.length + notesPersists.length,
+			persistIdRef,
 			notesId
 		});
-		notesContainers.push(require_document_notes_write.writeNotesContainer(FIRST_SLIDE_ID + index, slide.notes, size, fontIndexOf));
-		return notesId;
+		const container = require_document_notes_write.writeNotesContainer(FIRST_SLIDE_ID + index, slide.notes, size, contextFor(`slide ${index + 1}'s speaker notes`));
+		account(container);
+		notesContainers.push({
+			persistId: persistIdRef,
+			bytes: container.bytes
+		});
 	});
 	const environment = require_document_fonts_write.writeEnvironment(fontNames);
 	const documentChildren = [require_document_document_atom_write.writeDocumentAtom(size)];
 	if (environment !== void 0) documentChildren.push(environment);
+	documentChildren.push(require_drawing_blips.writeDrawingGroupContainer(store.blips, {
+		spidMax: maxSpid,
+		shapeCount,
+		drawingCount
+	}));
 	documentChildren.push(require_document_master_write.writeMasterListWithText(MASTER_PERSIST_ID));
 	documentChildren.push(require_document_slide_list_write.writeSlideListWithText(slidePersistRefs));
 	if (notesPersists.length > 0) documentChildren.push(require_document_notes_list_write.writeNotesListWithText(notesPersists));
 	const documentContainer = require_record_write.writeContainer(require_record_types.RT_Document, documentChildren);
-	const persistObjects = [{
-		persistId: DOCUMENT_PERSIST_ID,
-		bytes: documentContainer
-	}, {
-		persistId: MASTER_PERSIST_ID,
-		bytes: require_document_master_write.writeMainMaster(size, fontIndexOf)
-	}];
-	slides.forEach((slide, index) => {
-		const ref = slidePersistRefs[index];
-		const notesIdRef = notesIdRefs[index];
-		if (ref === void 0 || notesIdRef === void 0) throw new require_errors.PptUnsupportedContentError("internal error: slide persist reference missing for a slide being written");
-		persistObjects.push({
-			persistId: ref.persistIdRef,
-			bytes: writeSlideContainer(slide.shapes, notesIdRef, fontIndexOf)
-		});
-	});
-	notesPersists.forEach((persist, index) => {
-		const bytes = notesContainers[index];
-		if (bytes === void 0) throw new require_errors.PptUnsupportedContentError("internal error: notes container missing for a notes persist reference");
-		persistObjects.push({
-			persistId: persist.persistIdRef,
-			bytes
-		});
-	});
+	const persistObjects = [
+		{
+			persistId: DOCUMENT_PERSIST_ID,
+			bytes: documentContainer
+		},
+		{
+			persistId: MASTER_PERSIST_ID,
+			bytes: mainMaster.bytes
+		},
+		...slideContainers,
+		...notesContainers
+	];
 	const persistEntries = [];
 	let offset = 0;
 	for (const object of persistObjects) {
@@ -116,8 +179,8 @@ function writePptStreams(document) {
 		powerPointDocumentStream: require_record_write.concatBytes(...persistObjects.map((object) => object.bytes), persistDirectory, userEdit)
 	};
 }
-function writePptContent(document) {
-	const { currentUserStream, powerPointDocumentStream } = writePptStreams(document);
+function writePptContent(document, options = {}) {
+	const { currentUserStream, powerPointDocumentStream } = writePptStreams(document, options);
 	const streams = [{
 		path: require_read.CURRENT_USER_STREAM,
 		bytes: currentUserStream
@@ -131,13 +194,13 @@ function writePptContent(document) {
 	});
 	return (0, archive_codec.writeCompoundFile)(streams);
 }
-function writePpt(tree) {
+function writePpt(tree, options = {}) {
 	const content = (0, document_schema_js.flattenTree)(tree);
 	if (content.kind !== "presentation") throw new require_errors.PptUnsupportedContentError(`ppt-codec's writer only writes presentation documents; got a '${content.kind}' document`);
 	return writePptContent({
 		metadata: content.metadata,
 		slides: content.slides
-	});
+	}, options);
 }
 //#endregion
 exports.writePpt = writePpt;

package/dist/write.d.cts

@@ -1,11 +1,16 @@
+import { a as PptDiagnosticSink } from "./diagnostics-CqxAnubw.cjs";
 import { PptDocument } from "./read.cjs";
 import { DocumentTree } from "document-schema.js";
 //#region src/write.d.ts
-declare function writePptStreams(document: PptDocument): {
+interface WritePptOptions {
+  readonly signal?: AbortSignal;
+  readonly sink?: PptDiagnosticSink;
+}
+declare function writePptStreams(document: PptDocument, options?: WritePptOptions): {
   readonly currentUserStream: Uint8Array<ArrayBuffer>;
   readonly powerPointDocumentStream: Uint8Array<ArrayBuffer>;
 };
-declare function writePptContent(document: PptDocument): Uint8Array<ArrayBuffer>;
-declare function writePpt(tree: DocumentTree): Uint8Array<ArrayBuffer>;
+declare function writePptContent(document: PptDocument, options?: WritePptOptions): Uint8Array<ArrayBuffer>;
+declare function writePpt(tree: DocumentTree, options?: WritePptOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { writePpt, writePptContent, writePptStreams };
+export { WritePptOptions, writePpt, writePptContent, writePptStreams };

package/dist/write.d.ts

@@ -1,11 +1,16 @@
+import { a as PptDiagnosticSink } from "./diagnostics-CqxAnubw.js";
 import { PptDocument } from "./read.js";
 import { DocumentTree } from "document-schema.js";
 //#region src/write.d.ts
-declare function writePptStreams(document: PptDocument): {
+interface WritePptOptions {
+  readonly signal?: AbortSignal;
+  readonly sink?: PptDiagnosticSink;
+}
+declare function writePptStreams(document: PptDocument, options?: WritePptOptions): {
   readonly currentUserStream: Uint8Array<ArrayBuffer>;
   readonly powerPointDocumentStream: Uint8Array<ArrayBuffer>;
 };
-declare function writePptContent(document: PptDocument): Uint8Array<ArrayBuffer>;
-declare function writePpt(tree: DocumentTree): Uint8Array<ArrayBuffer>;
+declare function writePptContent(document: PptDocument, options?: WritePptOptions): Uint8Array<ArrayBuffer>;
+declare function writePpt(tree: DocumentTree, options?: WritePptOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { writePpt, writePptContent, writePptStreams };
+export { WritePptOptions, writePpt, writePptContent, writePptStreams };

package/dist/write.js

@@ -1,9 +1,12 @@
+import { base64ToBytes } from "./base64.js";
 import { PptUnsupportedContentError } from "./errors.js";
 import { RT_Document, RT_Slide } from "./record/types.js";
 import { collectFontFamilies } from "./content-write.js";
+import { NOOP_PPT_DIAGNOSTIC_SINK } from "./diagnostics.js";
 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 { writeMainMaster, writeMasterListWithText, writeSlideAtomForSlide } from "./document/master-write.js";
@@ -31,65 +34,125 @@ 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, fontIndexOf) {
-	return writeContainer(RT_Slide, [writeSlideAtomForSlide(notesIdRef), writeSlideDrawing(shapes, fontIndexOf)]);
+function writeSlideContainer(shapes, notesIdRef, context) {
+	const drawing = writeSlideDrawing(shapes.map((shape) => ({
+		shape,
+		clientData: void 0
+	})), context);
+	return {
+		bytes: writeContainer(RT_Slide, [writeSlideAtomForSlide(notesIdRef), drawing.bytes]),
+		shapeCount: drawing.shapeCount,
+		maxSpid: drawing.maxSpid
+	};
 }
-function writePptStreams(document) {
+function planBlipStore(slides) {
+	const blips = [];
+	const pibByKey = /* @__PURE__ */ new Map();
+	for (const slide of slides) for (const shape of slide.shapes) for (const block of shape.blocks) {
+		if (block.kind !== "image" || !isBlipFormat(block.format)) continue;
+		const key = `${block.format}:${block.base64}`;
+		if (!pibByKey.has(key)) {
+			pibByKey.set(key, blips.length + 1);
+			blips.push({
+				format: block.format,
+				bytes: base64ToBytes(block.base64)
+			});
+		}
+	}
+	return {
+		blips,
+		pibOf: (image) => {
+			const pib = pibByKey.get(`${image.format}:${image.base64}`);
+			if (pib === void 0) throw new PptUnsupportedContentError("internal error: an image block reached the drawing writer without first being collected into the document's blip store");
+			return pib;
+		}
+	};
+}
+function writePptStreams(document, options = {}) {
+	options.signal?.throwIfAborted();
 	const { slides } = document;
 	const size = requireOneSlideSize(slides);
+	const sink = options.sink ?? NOOP_PPT_DIAGNOSTIC_SINK;
 	const fontNames = collectFontFamilies(slides.map((slide) => slide.shapes.flatMap((shape) => shape.blocks)));
 	const fontIndexOf = (family) => {
 		const index = fontNames.indexOf(family);
 		if (index === -1) throw new PptUnsupportedContentError(`font family '${family}' was not collected into the document's font table before writing`);
 		return index;
 	};
+	const store = planBlipStore(slides);
+	const contextFor = (location) => ({
+		fontIndexOf,
+		blipIndexOf: store.pibOf,
+		sink,
+		location
+	});
 	const slidePersistRefs = slides.map((_slide, index) => ({
 		persistIdRef: FIRST_SLIDE_PERSIST_ID + index,
 		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);
+	let shapeCount = 0;
+	let maxSpid = 0;
+	let drawingCount = 0;
+	const account = (drawing) => {
+		shapeCount += drawing.shapeCount;
+		maxSpid = Math.max(maxSpid, drawing.maxSpid);
+		drawingCount += 1;
+	};
+	const mainMaster = writeMainMaster(size, contextFor("the main master"));
+	account(mainMaster);
+	const slideContainers = slides.map((slide, index) => {
+		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}`));
+		account(container);
+		return {
+			persistId: ref.persistIdRef,
+			bytes: container.bytes
+		};
+	});
 	const notesPersists = [];
 	const notesContainers = [];
-	const notesIdRefs = slides.map((slide, index) => {
-		if (slide.notes.length === 0) return NO_NOTES_ID_REF;
-		const notesId = FIRST_NOTES_ID + notesPersists.length;
+	slides.forEach((slide, index) => {
+		const notesId = notesIdRefs[index];
+		if (notesId === void 0 || notesId === NO_NOTES_ID_REF) return;
+		const persistIdRef = FIRST_SLIDE_PERSIST_ID + slides.length + notesPersists.length;
 		notesPersists.push({
-			persistIdRef: FIRST_SLIDE_PERSIST_ID + slides.length + notesPersists.length,
+			persistIdRef,
 			notesId
 		});
-		notesContainers.push(writeNotesContainer(FIRST_SLIDE_ID + index, slide.notes, size, fontIndexOf));
-		return notesId;
+		const container = writeNotesContainer(FIRST_SLIDE_ID + index, slide.notes, size, contextFor(`slide ${index + 1}'s speaker notes`));
+		account(container);
+		notesContainers.push({
+			persistId: persistIdRef,
+			bytes: container.bytes
+		});
 	});
 	const environment = writeEnvironment(fontNames);
 	const documentChildren = [writeDocumentAtom(size)];
 	if (environment !== void 0) documentChildren.push(environment);
+	documentChildren.push(writeDrawingGroupContainer(store.blips, {
+		spidMax: maxSpid,
+		shapeCount,
+		drawingCount
+	}));
 	documentChildren.push(writeMasterListWithText(MASTER_PERSIST_ID));
 	documentChildren.push(writeSlideListWithText(slidePersistRefs));
 	if (notesPersists.length > 0) documentChildren.push(writeNotesListWithText(notesPersists));
 	const documentContainer = writeContainer(RT_Document, documentChildren);
-	const persistObjects = [{
-		persistId: DOCUMENT_PERSIST_ID,
-		bytes: documentContainer
-	}, {
-		persistId: MASTER_PERSIST_ID,
-		bytes: writeMainMaster(size, fontIndexOf)
-	}];
-	slides.forEach((slide, index) => {
-		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");
-		persistObjects.push({
-			persistId: ref.persistIdRef,
-			bytes: writeSlideContainer(slide.shapes, notesIdRef, fontIndexOf)
-		});
-	});
-	notesPersists.forEach((persist, index) => {
-		const bytes = notesContainers[index];
-		if (bytes === void 0) throw new PptUnsupportedContentError("internal error: notes container missing for a notes persist reference");
-		persistObjects.push({
-			persistId: persist.persistIdRef,
-			bytes
-		});
-	});
+	const persistObjects = [
+		{
+			persistId: DOCUMENT_PERSIST_ID,
+			bytes: documentContainer
+		},
+		{
+			persistId: MASTER_PERSIST_ID,
+			bytes: mainMaster.bytes
+		},
+		...slideContainers,
+		...notesContainers
+	];
 	const persistEntries = [];
 	let offset = 0;
 	for (const object of persistObjects) {
@@ -115,8 +178,8 @@ function writePptStreams(document) {
 		powerPointDocumentStream: concatBytes(...persistObjects.map((object) => object.bytes), persistDirectory, userEdit)
 	};
 }
-function writePptContent(document) {
-	const { currentUserStream, powerPointDocumentStream } = writePptStreams(document);
+function writePptContent(document, options = {}) {
+	const { currentUserStream, powerPointDocumentStream } = writePptStreams(document, options);
 	const streams = [{
 		path: CURRENT_USER_STREAM,
 		bytes: currentUserStream
@@ -130,13 +193,13 @@ function writePptContent(document) {
 	});
 	return writeCompoundFile(streams);
 }
-function writePpt(tree) {
+function writePpt(tree, options = {}) {
 	const content = flattenTree(tree);
 	if (content.kind !== "presentation") throw new PptUnsupportedContentError(`ppt-codec's writer only writes presentation documents; got a '${content.kind}' document`);
 	return writePptContent({
 		metadata: content.metadata,
 		slides: content.slides
-	});
+	}, options);
 }
 //#endregion
 export { writePpt, writePptContent, writePptStreams };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppt-codec",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Hand-written PowerPoint 97-2003 binary (.ppt, [MS-PPT]) reader and writer against the shared document-schema.js content pivot.",
   "type": "module",
   "repository": {
@@ -88,6 +88,7 @@
     "@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",