wpd-codec 3.4.5 → 3.5.0

package/dist/read.cjs

@@ -15,7 +15,9 @@ const require_stream_table = require("./stream/table.cjs");
 const require_stream_box = require("./stream/box.cjs");
 const require_stream_formula = require("./stream/formula.cjs");
 const require_stream_image = require("./stream/image.cjs");
+const require_stream_ole = require("./stream/ole.cjs");
 const require_stream_tab = require("./stream/tab.cjs");
+const require_stream_wpg = require("./stream/wpg.cjs");
 const require_stream_tokenise = require("./stream/tokenise.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/read.ts
@@ -437,10 +439,6 @@ function applyCharacterGroup(state, token, container, sink) {
 function applyHeaderFooterGroup(state, token, container, sink) {
 	const claim = require_stream_furniture.readFurnitureClaim(token.subgroup, token.nonDeletable);
 	if (claim === "none") return;
-	if (claim === "watermark") {
-		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a watermark, which is neither a header nor a footer and owns no parity -- the shared page-furniture vocabulary has no slot for one.");
-		return;
-	}
 	const slotKey = `${claim.kind}:${claim.slot}`;
 	if (state.furnitureFilled.has(slotKey)) {
 		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, `This document declares a second ${claim.kind} for the ${claim.slot} slot -- WordPerfect's own A/B two-slot-per-kind mechanism, which the shared one-flow-per-slot page-furniture vocabulary does not carry; the first ${claim.kind} to claim the slot is the one lifted.`);
@@ -449,19 +447,19 @@ function applyHeaderFooterGroup(state, token, container, sink) {
 	const blocks = furnitureBodyBlocks(state, token, container, sink);
 	if (blocks === void 0) return;
 	state.furnitureFilled.add(slotKey);
-	const furniture = claim.kind === "header" ? state.headers : state.footers;
+	const furniture = claim.kind === "header" ? state.headers : claim.kind === "footer" ? state.footers : state.watermarks;
 	furniture[claim.slot] = blocks;
 }
 function furnitureBodyBlocks(state, token, container, sink) {
 	const prefixId = token.prefixIds[0];
 	const packet = prefixId === void 0 ? void 0 : require_container_prefix.packetByPrefixId(container.packets, prefixId);
 	if (packet?.packetType !== 8) {
-		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not resolve; it was not lifted.");
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header, footer, or watermark whose body packet this reader could not resolve; it was not lifted.");
 		return;
 	}
 	const textBlocks = require_container_prefix.readGeneralWpTextBlocks(packet.bytes);
 	if (textBlocks === void 0) {
-		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not read; it was not lifted.");
+		reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header, footer, or watermark whose body packet this reader could not read; it was not lifted.");
 		return;
 	}
 	return foldTokens(require_stream_tokenise.tokeniseDocumentArea(textBlocks, 0, textBlocks.length), container, sink).blocks;
@@ -546,6 +544,16 @@ function applyMergeGroup(state, token, sink) {
 function plainTextOf(blocks) {
 	return blocks.filter((block) => block.kind === "paragraph").map((paragraph) => paragraph.runs.map((run) => run.text).join("")).join("\n");
 }
+function decodeBoxWpg(container, graphicsPacket, sink) {
+	const childIds = require_stream_ole.readGraphicsChildIds(graphicsPacket);
+	if (childIds === void 0) return;
+	for (const childId of childIds) {
+		const child = require_container_prefix.packetByPrefixId(container.packets, childId);
+		if (child?.packetType !== 111) continue;
+		const decoded = require_stream_wpg.decodeWpgGraphic(child.bytes, { foldTextData: (documentArea) => foldTokens(require_stream_tokenise.tokeniseDocumentArea(documentArea, 0, documentArea.length), container, sink).blocks });
+		if (decoded !== void 0) return decoded;
+	}
+}
 function applyBoxGroup(state, token, container, sink) {
 	const boxContent = require_stream_box.readBoxContent(token.nonDeletable, token.prefixIds);
 	if (boxContent === void 0) {
@@ -556,6 +564,50 @@ function applyBoxGroup(state, token, container, sink) {
 		const imagePacket = require_container_prefix.packetByPrefixId(container.packets, boxContent.contentPrefixId);
 		const payload = imagePacket === void 0 ? void 0 : require_stream_image.scanImagePayload(imagePacket.bytes);
 		if (payload === void 0) {
+			const ole = imagePacket?.packetType === 64 ? require_stream_ole.readOleObject(container.packets, imagePacket, container.oleObjectStreams) : void 0;
+			if (ole !== void 0) {
+				state.oleObjects.push(ole);
+				return;
+			}
+			const wpg = imagePacket?.packetType === 64 ? decodeBoxWpg(container, imagePacket, sink) : void 0;
+			if (wpg !== void 0) {
+				if (wpg.status === "refused") {
+					sink({
+						code: require_diagnostics.WpdDiagnosticCodes.WpgRecordsUndecoded,
+						message: wpg.reason === "wpg1" ? "This document embeds a WPG 1.0 vector graphic, whose type-and-length record vocabulary predates the framed WPG 2.x stream this reader decodes, so it was not lifted." : wpg.reason === "encrypted" ? "This document embeds an encrypted WPG vector graphic, which this reader does not decrypt, so it was not lifted." : "This document embeds a WPG graphic whose record stream this reader could not walk (no well-formed Start WPG record), so it was not lifted."
+					});
+					return;
+				}
+				if (boxContent.frame === void 0) {
+					reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.BoxFrameUnresolved, "This document contains a box whose content this reader could read, but whose function-level override states no width and height this reader can trust, so its content was not lifted.");
+					return;
+				}
+				if (wpg.skippedRecords.length > 0) sink({
+					code: require_diagnostics.WpdDiagnosticCodes.WpgRecordsUndecoded,
+					message: `This document embeds a WPG vector graphic that partially decoded; the following record types were skipped: ${wpg.skippedRecords.join(", ")}.`
+				});
+				flushParagraphIfContent(state, sink);
+				targetBlocks(state).push({
+					kind: "embeddedObject",
+					objectKind: "drawing",
+					frame: {
+						xPt: boxContent.frame.xPt,
+						yPt: boxContent.frame.yPt,
+						widthPt: boxContent.frame.widthPt,
+						heightPt: boxContent.frame.heightPt
+					},
+					document: {
+						kind: "drawing",
+						metadata: {},
+						pages: [{
+							size: wpg.sizePt,
+							shapes: [...wpg.shapes],
+							vectors: [...wpg.vectors]
+						}]
+					}
+				});
+				return;
+			}
 			reportOnce(state, sink, require_diagnostics.WpdDiagnosticCodes.BoxContentUnresolved, "This document contains an image box whose content packet carries no decodable PNG or JPEG payload -- a WPG graphic or other image spelling this reader does not decode.");
 			return;
 		}
@@ -788,9 +840,11 @@ function foldTokens(tokens, container, sink) {
 		openMergeFieldStartRun: void 0,
 		headers: {},
 		footers: {},
+		watermarks: {},
 		furnitureFilled: /* @__PURE__ */ new Set(),
 		openNote: void 0,
-		notes: []
+		notes: [],
+		oleObjects: []
 	};
 	for (const token of tokens) applyToken(state, token, container, sink);
 	flushRun(state);
@@ -804,7 +858,9 @@ function foldTokens(tokens, container, sink) {
 		page: state.page,
 		headers: state.headers,
 		footers: state.footers,
-		notes: state.notes
+		watermarks: state.watermarks,
+		notes: state.notes,
+		oleObjects: state.oleObjects
 	};
 }
 function readMetadata(container) {
@@ -814,11 +870,15 @@ function readMetadata(container) {
 function readWpdContent(bytes, options = {}) {
 	const sink = options.sink ?? require_diagnostics.NOOP_WPD_DIAGNOSTIC_SINK;
 	const container = require_container_container.openWpdDocument(bytes, { password: options.password });
-	const { blocks, page, headers, footers, notes } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
+	const { blocks, page, headers, footers, watermarks, notes, oleObjects } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
 	for (const note of notes) sink({
 		code: require_diagnostics.WpdDiagnosticCodes.NoteDropped,
 		message: `This document contains a ${note.anchorType} whose body the flat ContentDocument has no home for; its reference anchor survives and readWpd lifts the body into the tree form's definitions table.`
 	});
+	for (const oleObject of oleObjects) sink({
+		code: require_diagnostics.WpdDiagnosticCodes.OleObjectDropped,
+		message: `This document embeds a native OLE object ('${oleObject.name}') whose bytes the flat ContentDocument has no home for; readWpd lifts them into the tree form's attachments table.`
+	});
 	return {
 		kind: "wordprocessing",
 		metadata: readMetadata(container),
@@ -835,13 +895,14 @@ function readWpdContent(bytes, options = {}) {
 			},
 			...Object.keys(headers).length > 0 ? { headers } : {},
 			...Object.keys(footers).length > 0 ? { footers } : {},
+			...Object.keys(watermarks).length > 0 ? { watermarks } : {},
 			blocks
 		}]
 	};
 }
 function readWpd(bytes, options = {}) {
 	const container = require_container_container.openWpdDocument(bytes, { password: options.password });
-	const { notes, ...flatRest } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, options.sink ?? require_diagnostics.NOOP_WPD_DIAGNOSTIC_SINK);
+	const { notes, oleObjects, ...flatRest } = foldTokens(require_stream_tokenise.tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, options.sink ?? require_diagnostics.NOOP_WPD_DIAGNOSTIC_SINK);
 	const document = {
 		kind: "wordprocessing",
 		metadata: readMetadata(container),
@@ -858,22 +919,32 @@ function readWpd(bytes, options = {}) {
 			},
 			...Object.keys(flatRest.headers).length > 0 ? { headers: flatRest.headers } : {},
 			...Object.keys(flatRest.footers).length > 0 ? { footers: flatRest.footers } : {},
+			...Object.keys(flatRest.watermarks).length > 0 ? { watermarks: flatRest.watermarks } : {},
 			blocks: flatRest.blocks
 		}]
 	};
 	const assembled = (0, document_schema_js.assembleTree)(document);
-	if (notes.length === 0) return assembled;
+	const attachments = Object.fromEntries(oleObjects.map((oleObject) => [oleObject.name, {
+		kind: "attachment",
+		name: oleObject.name,
+		base64: require_bytes_base64.bytesToBase64(oleObject.bytes)
+	}]));
 	const definitions = Object.fromEntries(notes.map((note, index) => [`note-${index + 1}`, {
 		kind: note.anchorType,
 		marker: note.marker,
 		blocks: note.blocks
 	}]));
+	if (Object.keys(attachments).length === 0 && notes.length === 0) return assembled;
 	return {
 		...assembled,
-		definitions: {
+		...Object.keys(attachments).length > 0 ? { attachments: {
+			...assembled.attachments,
+			...attachments
+		} } : {},
+		...notes.length > 0 ? { definitions: {
 			...assembled.definitions,
 			...definitions
-		}
+		} } : {}
 	};
 }
 //#endregion

package/dist/read.d.cts

@@ -1,4 +1,4 @@
-import { i as WpdDiagnosticSink } from "./diagnostics-DhO7mgqJ.cjs";
+import { i as WpdDiagnosticSink } from "./diagnostics-fHTFHZ-d.cjs";
 import { ContentBlock, ContentDocument, DocumentTree } from "document-schema.js";
 //#region src/read.d.ts
 interface ReadWpdOptions {

package/dist/read.d.ts

@@ -1,4 +1,4 @@
-import { i as WpdDiagnosticSink } from "./diagnostics-DhO7mgqJ.js";
+import { i as WpdDiagnosticSink } from "./diagnostics-fHTFHZ-d.js";
 import { ContentBlock, ContentDocument, DocumentTree } from "document-schema.js";
 //#region src/read.d.ts
 interface ReadWpdOptions {

package/dist/read.js

@@ -14,7 +14,9 @@ import { findEmbeddedSubfunction, readCellFill, readCellInformation, readCellSpa
 import { readBoxContent } from "./stream/box.js";
 import { readTableFormula } from "./stream/formula.js";
 import { scanImagePayload } from "./stream/image.js";
+import { readGraphicsChildIds, readOleObject } from "./stream/ole.js";
 import { tabEffectFor } from "./stream/tab.js";
+import { decodeWpgGraphic } from "./stream/wpg.js";
 import { tokeniseDocumentArea } from "./stream/tokenise.js";
 import { assembleTree } from "document-schema.js";
 //#region src/read.ts
@@ -436,10 +438,6 @@ function applyCharacterGroup(state, token, container, sink) {
 function applyHeaderFooterGroup(state, token, container, sink) {
 	const claim = readFurnitureClaim(token.subgroup, token.nonDeletable);
 	if (claim === "none") return;
-	if (claim === "watermark") {
-		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a watermark, which is neither a header nor a footer and owns no parity -- the shared page-furniture vocabulary has no slot for one.");
-		return;
-	}
 	const slotKey = `${claim.kind}:${claim.slot}`;
 	if (state.furnitureFilled.has(slotKey)) {
 		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, `This document declares a second ${claim.kind} for the ${claim.slot} slot -- WordPerfect's own A/B two-slot-per-kind mechanism, which the shared one-flow-per-slot page-furniture vocabulary does not carry; the first ${claim.kind} to claim the slot is the one lifted.`);
@@ -448,19 +446,19 @@ function applyHeaderFooterGroup(state, token, container, sink) {
 	const blocks = furnitureBodyBlocks(state, token, container, sink);
 	if (blocks === void 0) return;
 	state.furnitureFilled.add(slotKey);
-	const furniture = claim.kind === "header" ? state.headers : state.footers;
+	const furniture = claim.kind === "header" ? state.headers : claim.kind === "footer" ? state.footers : state.watermarks;
 	furniture[claim.slot] = blocks;
 }
 function furnitureBodyBlocks(state, token, container, sink) {
 	const prefixId = token.prefixIds[0];
 	const packet = prefixId === void 0 ? void 0 : packetByPrefixId(container.packets, prefixId);
 	if (packet?.packetType !== 8) {
-		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not resolve; it was not lifted.");
+		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header, footer, or watermark whose body packet this reader could not resolve; it was not lifted.");
 		return;
 	}
 	const textBlocks = readGeneralWpTextBlocks(packet.bytes);
 	if (textBlocks === void 0) {
-		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header or footer whose body packet this reader could not read; it was not lifted.");
+		reportOnce(state, sink, WpdDiagnosticCodes.HeaderFooterDropped, "This document declares a header, footer, or watermark whose body packet this reader could not read; it was not lifted.");
 		return;
 	}
 	return foldTokens(tokeniseDocumentArea(textBlocks, 0, textBlocks.length), container, sink).blocks;
@@ -545,6 +543,16 @@ function applyMergeGroup(state, token, sink) {
 function plainTextOf(blocks) {
 	return blocks.filter((block) => block.kind === "paragraph").map((paragraph) => paragraph.runs.map((run) => run.text).join("")).join("\n");
 }
+function decodeBoxWpg(container, graphicsPacket, sink) {
+	const childIds = readGraphicsChildIds(graphicsPacket);
+	if (childIds === void 0) return;
+	for (const childId of childIds) {
+		const child = packetByPrefixId(container.packets, childId);
+		if (child?.packetType !== 111) continue;
+		const decoded = decodeWpgGraphic(child.bytes, { foldTextData: (documentArea) => foldTokens(tokeniseDocumentArea(documentArea, 0, documentArea.length), container, sink).blocks });
+		if (decoded !== void 0) return decoded;
+	}
+}
 function applyBoxGroup(state, token, container, sink) {
 	const boxContent = readBoxContent(token.nonDeletable, token.prefixIds);
 	if (boxContent === void 0) {
@@ -555,6 +563,50 @@ function applyBoxGroup(state, token, container, sink) {
 		const imagePacket = packetByPrefixId(container.packets, boxContent.contentPrefixId);
 		const payload = imagePacket === void 0 ? void 0 : scanImagePayload(imagePacket.bytes);
 		if (payload === void 0) {
+			const ole = imagePacket?.packetType === 64 ? readOleObject(container.packets, imagePacket, container.oleObjectStreams) : void 0;
+			if (ole !== void 0) {
+				state.oleObjects.push(ole);
+				return;
+			}
+			const wpg = imagePacket?.packetType === 64 ? decodeBoxWpg(container, imagePacket, sink) : void 0;
+			if (wpg !== void 0) {
+				if (wpg.status === "refused") {
+					sink({
+						code: WpdDiagnosticCodes.WpgRecordsUndecoded,
+						message: wpg.reason === "wpg1" ? "This document embeds a WPG 1.0 vector graphic, whose type-and-length record vocabulary predates the framed WPG 2.x stream this reader decodes, so it was not lifted." : wpg.reason === "encrypted" ? "This document embeds an encrypted WPG vector graphic, which this reader does not decrypt, so it was not lifted." : "This document embeds a WPG graphic whose record stream this reader could not walk (no well-formed Start WPG record), so it was not lifted."
+					});
+					return;
+				}
+				if (boxContent.frame === void 0) {
+					reportOnce(state, sink, WpdDiagnosticCodes.BoxFrameUnresolved, "This document contains a box whose content this reader could read, but whose function-level override states no width and height this reader can trust, so its content was not lifted.");
+					return;
+				}
+				if (wpg.skippedRecords.length > 0) sink({
+					code: WpdDiagnosticCodes.WpgRecordsUndecoded,
+					message: `This document embeds a WPG vector graphic that partially decoded; the following record types were skipped: ${wpg.skippedRecords.join(", ")}.`
+				});
+				flushParagraphIfContent(state, sink);
+				targetBlocks(state).push({
+					kind: "embeddedObject",
+					objectKind: "drawing",
+					frame: {
+						xPt: boxContent.frame.xPt,
+						yPt: boxContent.frame.yPt,
+						widthPt: boxContent.frame.widthPt,
+						heightPt: boxContent.frame.heightPt
+					},
+					document: {
+						kind: "drawing",
+						metadata: {},
+						pages: [{
+							size: wpg.sizePt,
+							shapes: [...wpg.shapes],
+							vectors: [...wpg.vectors]
+						}]
+					}
+				});
+				return;
+			}
 			reportOnce(state, sink, WpdDiagnosticCodes.BoxContentUnresolved, "This document contains an image box whose content packet carries no decodable PNG or JPEG payload -- a WPG graphic or other image spelling this reader does not decode.");
 			return;
 		}
@@ -787,9 +839,11 @@ function foldTokens(tokens, container, sink) {
 		openMergeFieldStartRun: void 0,
 		headers: {},
 		footers: {},
+		watermarks: {},
 		furnitureFilled: /* @__PURE__ */ new Set(),
 		openNote: void 0,
-		notes: []
+		notes: [],
+		oleObjects: []
 	};
 	for (const token of tokens) applyToken(state, token, container, sink);
 	flushRun(state);
@@ -803,7 +857,9 @@ function foldTokens(tokens, container, sink) {
 		page: state.page,
 		headers: state.headers,
 		footers: state.footers,
-		notes: state.notes
+		watermarks: state.watermarks,
+		notes: state.notes,
+		oleObjects: state.oleObjects
 	};
 }
 function readMetadata(container) {
@@ -813,11 +869,15 @@ function readMetadata(container) {
 function readWpdContent(bytes, options = {}) {
 	const sink = options.sink ?? NOOP_WPD_DIAGNOSTIC_SINK;
 	const container = openWpdDocument(bytes, { password: options.password });
-	const { blocks, page, headers, footers, notes } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
+	const { blocks, page, headers, footers, watermarks, notes, oleObjects } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, sink);
 	for (const note of notes) sink({
 		code: WpdDiagnosticCodes.NoteDropped,
 		message: `This document contains a ${note.anchorType} whose body the flat ContentDocument has no home for; its reference anchor survives and readWpd lifts the body into the tree form's definitions table.`
 	});
+	for (const oleObject of oleObjects) sink({
+		code: WpdDiagnosticCodes.OleObjectDropped,
+		message: `This document embeds a native OLE object ('${oleObject.name}') whose bytes the flat ContentDocument has no home for; readWpd lifts them into the tree form's attachments table.`
+	});
 	return {
 		kind: "wordprocessing",
 		metadata: readMetadata(container),
@@ -834,13 +894,14 @@ function readWpdContent(bytes, options = {}) {
 			},
 			...Object.keys(headers).length > 0 ? { headers } : {},
 			...Object.keys(footers).length > 0 ? { footers } : {},
+			...Object.keys(watermarks).length > 0 ? { watermarks } : {},
 			blocks
 		}]
 	};
 }
 function readWpd(bytes, options = {}) {
 	const container = openWpdDocument(bytes, { password: options.password });
-	const { notes, ...flatRest } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, options.sink ?? NOOP_WPD_DIAGNOSTIC_SINK);
+	const { notes, oleObjects, ...flatRest } = foldTokens(tokeniseDocumentArea(container.bytes, container.documentAreaOffset, container.documentAreaEnd), container, options.sink ?? NOOP_WPD_DIAGNOSTIC_SINK);
 	const document = {
 		kind: "wordprocessing",
 		metadata: readMetadata(container),
@@ -857,22 +918,32 @@ function readWpd(bytes, options = {}) {
 			},
 			...Object.keys(flatRest.headers).length > 0 ? { headers: flatRest.headers } : {},
 			...Object.keys(flatRest.footers).length > 0 ? { footers: flatRest.footers } : {},
+			...Object.keys(flatRest.watermarks).length > 0 ? { watermarks: flatRest.watermarks } : {},
 			blocks: flatRest.blocks
 		}]
 	};
 	const assembled = assembleTree(document);
-	if (notes.length === 0) return assembled;
+	const attachments = Object.fromEntries(oleObjects.map((oleObject) => [oleObject.name, {
+		kind: "attachment",
+		name: oleObject.name,
+		base64: bytesToBase64(oleObject.bytes)
+	}]));
 	const definitions = Object.fromEntries(notes.map((note, index) => [`note-${index + 1}`, {
 		kind: note.anchorType,
 		marker: note.marker,
 		blocks: note.blocks
 	}]));
+	if (Object.keys(attachments).length === 0 && notes.length === 0) return assembled;
 	return {
 		...assembled,
-		definitions: {
+		...Object.keys(attachments).length > 0 ? { attachments: {
+			...assembled.attachments,
+			...attachments
+		} } : {},
+		...notes.length > 0 ? { definitions: {
 			...assembled.definitions,
 			...definitions
-		}
+		} } : {}
 	};
 }
 //#endregion

package/dist/stream/furniture.cjs

@@ -10,8 +10,7 @@ const WATERMARK_B = 5;
 const OCCURS_ON_ODD = 1;
 const OCCURS_ON_EVEN = 2;
 function readFurnitureClaim(subgroup, nonDeletable) {
-	if (subgroup === 4 || subgroup === 5) return "watermark";
-	const kind = subgroup === 0 || subgroup === 1 ? "header" : subgroup === 2 || subgroup === 3 ? "footer" : void 0;
+	const kind = subgroup === 0 || subgroup === 1 ? "header" : subgroup === 2 || subgroup === 3 ? "footer" : subgroup === 4 || subgroup === 5 ? "watermark" : void 0;
 	if (kind === void 0) return "none";
 	const occurrence = nonDeletable[0] ?? 0;
 	const odd = (occurrence & OCCURS_ON_ODD) !== 0;

package/dist/stream/furniture.d.cts

@@ -7,9 +7,9 @@ declare const FOOTER_B = 3;
 declare const WATERMARK_A = 4;
 declare const WATERMARK_B = 5;
 interface WpdFurnitureClaim {
-  readonly kind: "header" | "footer";
+  readonly kind: "header" | "footer" | "watermark";
   readonly slot: "default" | "even";
 }
-declare function readFurnitureClaim(subgroup: number, nonDeletable: Uint8Array): WpdFurnitureClaim | "watermark" | "none";
+declare function readFurnitureClaim(subgroup: number, nonDeletable: Uint8Array): WpdFurnitureClaim | "none";
 //#endregion
 export { FOOTER_A, FOOTER_B, HEADER_A, HEADER_B, HEADER_FOOTER_GROUP, WATERMARK_A, WATERMARK_B, WpdFurnitureClaim, readFurnitureClaim };

package/dist/stream/furniture.d.ts

@@ -7,9 +7,9 @@ declare const FOOTER_B = 3;
 declare const WATERMARK_A = 4;
 declare const WATERMARK_B = 5;
 interface WpdFurnitureClaim {
-  readonly kind: "header" | "footer";
+  readonly kind: "header" | "footer" | "watermark";
   readonly slot: "default" | "even";
 }
-declare function readFurnitureClaim(subgroup: number, nonDeletable: Uint8Array): WpdFurnitureClaim | "watermark" | "none";
+declare function readFurnitureClaim(subgroup: number, nonDeletable: Uint8Array): WpdFurnitureClaim | "none";
 //#endregion
 export { FOOTER_A, FOOTER_B, HEADER_A, HEADER_B, HEADER_FOOTER_GROUP, WATERMARK_A, WATERMARK_B, WpdFurnitureClaim, readFurnitureClaim };

package/dist/stream/furniture.js

@@ -9,8 +9,7 @@ const WATERMARK_B = 5;
 const OCCURS_ON_ODD = 1;
 const OCCURS_ON_EVEN = 2;
 function readFurnitureClaim(subgroup, nonDeletable) {
-	if (subgroup === 4 || subgroup === 5) return "watermark";
-	const kind = subgroup === 0 || subgroup === 1 ? "header" : subgroup === 2 || subgroup === 3 ? "footer" : void 0;
+	const kind = subgroup === 0 || subgroup === 1 ? "header" : subgroup === 2 || subgroup === 3 ? "footer" : subgroup === 4 || subgroup === 5 ? "watermark" : void 0;
 	if (kind === void 0) return "none";
 	const occurrence = nonDeletable[0] ?? 0;
 	const odd = (occurrence & OCCURS_ON_ODD) !== 0;

package/dist/stream/ole.cjs

@@ -0,0 +1,71 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_bytes_view = require("../bytes/view.cjs");
+const require_stream_characters = require("./characters.cjs");
+const require_container_prefix = require("../container/prefix.cjs");
+//#region src/stream/ole.ts
+const PACKET_TYPE_GRAPHICS_FILENAME = 64;
+const PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA = 111;
+const PACKET_TYPE_OLE_OBJECT_DESCRIPTOR = 112;
+const PACKET_TYPE_OLE_OBJECT_DATA = 113;
+const PACKET_FLAG_CHILD_IDS = 1;
+const OLE2_MARKER = "WPWin7.0/OLE 2.0 Prefix Information Marker";
+const OLE1_MARKER = "WPWin6.0/OLE 1.0 Prefix Information Marker";
+function readGraphicsChildIds(packet) {
+	if ((packet.flags & PACKET_FLAG_CHILD_IDS) === 0) return;
+	if (packet.bytes.length < 2) return;
+	const count = require_bytes_view.uint16At(packet.bytes, 0);
+	if (2 + count * 2 > packet.bytes.length) return;
+	const childIds = [];
+	for (let index = 0; index < count; index += 1) childIds.push(require_bytes_view.uint16At(packet.bytes, 2 + index * 2));
+	return childIds;
+}
+function readOleDescriptor(bytes) {
+	const payloadOffset = 64;
+	if (bytes.length < payloadOffset) return;
+	let marker = "";
+	for (let index = 0; index < 42; index += 1) marker += String.fromCharCode(require_bytes_view.byteAt(bytes, index));
+	if (marker === OLE2_MARKER) {
+		const { text } = require_stream_characters.decodeWordString(bytes, payloadOffset, (bytes.length - payloadOffset) / 2);
+		if (text.length === 0) return;
+		return {
+			ole2: true,
+			streamName: text
+		};
+	}
+	if (marker === OLE1_MARKER) return {
+		ole2: false,
+		objectNumber: require_bytes_view.uint32At(bytes, 60)
+	};
+}
+function readOleObject(packets, graphicsPacket, oleObjectStreams) {
+	const childIds = readGraphicsChildIds(graphicsPacket);
+	if (childIds === void 0) return;
+	for (const childId of childIds) {
+		const child = require_container_prefix.packetByPrefixId(packets, childId);
+		if (child?.packetType !== 112) continue;
+		const descriptor = readOleDescriptor(child.bytes);
+		if (descriptor === void 0) return;
+		const payloadOffset = 64;
+		if (descriptor.ole2) {
+			const streamBytes = oleObjectStreams.get(descriptor.streamName);
+			if (streamBytes === void 0) return;
+			return {
+				name: descriptor.streamName,
+				bytes: streamBytes
+			};
+		}
+		if (child.bytes.length <= payloadOffset) return;
+		return {
+			name: `ole1-${String(descriptor.objectNumber)}`,
+			bytes: child.bytes.subarray(payloadOffset)
+		};
+	}
+}
+//#endregion
+exports.PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA = PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA;
+exports.PACKET_TYPE_GRAPHICS_FILENAME = PACKET_TYPE_GRAPHICS_FILENAME;
+exports.PACKET_TYPE_OLE_OBJECT_DATA = PACKET_TYPE_OLE_OBJECT_DATA;
+exports.PACKET_TYPE_OLE_OBJECT_DESCRIPTOR = PACKET_TYPE_OLE_OBJECT_DESCRIPTOR;
+exports.readGraphicsChildIds = readGraphicsChildIds;
+exports.readOleDescriptor = readOleDescriptor;
+exports.readOleObject = readOleObject;

package/dist/stream/ole.d.cts

@@ -0,0 +1,22 @@
+import { WpdPrefixPacket } from "../container/prefix.cjs";
+//#region src/stream/ole.d.ts
+declare const PACKET_TYPE_GRAPHICS_FILENAME = 64;
+declare const PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA = 111;
+declare const PACKET_TYPE_OLE_OBJECT_DESCRIPTOR = 112;
+declare const PACKET_TYPE_OLE_OBJECT_DATA = 113;
+type WpdOleDescriptor = {
+  readonly ole2: true;
+  readonly streamName: string;
+} | {
+  readonly ole2: false;
+  readonly objectNumber: number;
+};
+interface WpdOleObject {
+  readonly name: string;
+  readonly bytes: Uint8Array;
+}
+declare function readGraphicsChildIds(packet: WpdPrefixPacket): number[] | undefined;
+declare function readOleDescriptor(bytes: Uint8Array): WpdOleDescriptor | undefined;
+declare function readOleObject(packets: readonly WpdPrefixPacket[], graphicsPacket: WpdPrefixPacket, oleObjectStreams: ReadonlyMap<string, Uint8Array>): WpdOleObject | undefined;
+//#endregion
+export { PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA, PACKET_TYPE_GRAPHICS_FILENAME, PACKET_TYPE_OLE_OBJECT_DATA, PACKET_TYPE_OLE_OBJECT_DESCRIPTOR, WpdOleDescriptor, WpdOleObject, readGraphicsChildIds, readOleDescriptor, readOleObject };

package/dist/stream/ole.d.ts

@@ -0,0 +1,22 @@
+import { WpdPrefixPacket } from "../container/prefix.js";
+//#region src/stream/ole.d.ts
+declare const PACKET_TYPE_GRAPHICS_FILENAME = 64;
+declare const PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA = 111;
+declare const PACKET_TYPE_OLE_OBJECT_DESCRIPTOR = 112;
+declare const PACKET_TYPE_OLE_OBJECT_DATA = 113;
+type WpdOleDescriptor = {
+  readonly ole2: true;
+  readonly streamName: string;
+} | {
+  readonly ole2: false;
+  readonly objectNumber: number;
+};
+interface WpdOleObject {
+  readonly name: string;
+  readonly bytes: Uint8Array;
+}
+declare function readGraphicsChildIds(packet: WpdPrefixPacket): number[] | undefined;
+declare function readOleDescriptor(bytes: Uint8Array): WpdOleDescriptor | undefined;
+declare function readOleObject(packets: readonly WpdPrefixPacket[], graphicsPacket: WpdPrefixPacket, oleObjectStreams: ReadonlyMap<string, Uint8Array>): WpdOleObject | undefined;
+//#endregion
+export { PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA, PACKET_TYPE_GRAPHICS_FILENAME, PACKET_TYPE_OLE_OBJECT_DATA, PACKET_TYPE_OLE_OBJECT_DESCRIPTOR, WpdOleDescriptor, WpdOleObject, readGraphicsChildIds, readOleDescriptor, readOleObject };

package/dist/stream/ole.js

@@ -0,0 +1,64 @@
+import { byteAt, uint16At, uint32At } from "../bytes/view.js";
+import { decodeWordString } from "./characters.js";
+import { packetByPrefixId } from "../container/prefix.js";
+//#region src/stream/ole.ts
+const PACKET_TYPE_GRAPHICS_FILENAME = 64;
+const PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA = 111;
+const PACKET_TYPE_OLE_OBJECT_DESCRIPTOR = 112;
+const PACKET_TYPE_OLE_OBJECT_DATA = 113;
+const PACKET_FLAG_CHILD_IDS = 1;
+const OLE2_MARKER = "WPWin7.0/OLE 2.0 Prefix Information Marker";
+const OLE1_MARKER = "WPWin6.0/OLE 1.0 Prefix Information Marker";
+function readGraphicsChildIds(packet) {
+	if ((packet.flags & PACKET_FLAG_CHILD_IDS) === 0) return;
+	if (packet.bytes.length < 2) return;
+	const count = uint16At(packet.bytes, 0);
+	if (2 + count * 2 > packet.bytes.length) return;
+	const childIds = [];
+	for (let index = 0; index < count; index += 1) childIds.push(uint16At(packet.bytes, 2 + index * 2));
+	return childIds;
+}
+function readOleDescriptor(bytes) {
+	const payloadOffset = 64;
+	if (bytes.length < payloadOffset) return;
+	let marker = "";
+	for (let index = 0; index < 42; index += 1) marker += String.fromCharCode(byteAt(bytes, index));
+	if (marker === OLE2_MARKER) {
+		const { text } = decodeWordString(bytes, payloadOffset, (bytes.length - payloadOffset) / 2);
+		if (text.length === 0) return;
+		return {
+			ole2: true,
+			streamName: text
+		};
+	}
+	if (marker === OLE1_MARKER) return {
+		ole2: false,
+		objectNumber: uint32At(bytes, 60)
+	};
+}
+function readOleObject(packets, graphicsPacket, oleObjectStreams) {
+	const childIds = readGraphicsChildIds(graphicsPacket);
+	if (childIds === void 0) return;
+	for (const childId of childIds) {
+		const child = packetByPrefixId(packets, childId);
+		if (child?.packetType !== 112) continue;
+		const descriptor = readOleDescriptor(child.bytes);
+		if (descriptor === void 0) return;
+		const payloadOffset = 64;
+		if (descriptor.ole2) {
+			const streamBytes = oleObjectStreams.get(descriptor.streamName);
+			if (streamBytes === void 0) return;
+			return {
+				name: descriptor.streamName,
+				bytes: streamBytes
+			};
+		}
+		if (child.bytes.length <= payloadOffset) return;
+		return {
+			name: `ole1-${String(descriptor.objectNumber)}`,
+			bytes: child.bytes.subarray(payloadOffset)
+		};
+	}
+}
+//#endregion
+export { PACKET_TYPE_GRAPHICS_CACHED_FILE_DATA, PACKET_TYPE_GRAPHICS_FILENAME, PACKET_TYPE_OLE_OBJECT_DATA, PACKET_TYPE_OLE_OBJECT_DESCRIPTOR, readGraphicsChildIds, readOleDescriptor, readOleObject };