reamkit 1.11.0 → 1.13.0

package/dist/esm/layout/styled-layout.js

@@ -44,9 +44,10 @@ function isOutOfFlowFloat(f) {
 	return f !== void 0 && f.wrap !== "topAndBottom";
 }
 var FOOTNOTE_RULE_WIDTH = 144;
-function assignNoteNumbers(body) {
+function assignNoteNumbers(body, commentIds) {
 	const footnotes = /* @__PURE__ */ new Map();
 	const endnotes = /* @__PURE__ */ new Map();
+	const comments = /* @__PURE__ */ new Map();
 	const paragraphFootnotes = /* @__PURE__ */ new Set();
 	const numberRun = (run, n) => ({
 		...run,
@@ -56,8 +57,17 @@ function assignNoteNumbers(body) {
 			verticalAlign: "superscript"
 		}
 	});
+	const commentMarkerRun = (run, n) => ({
+		...run,
+		text: `[${n}]`,
+		...run.commentRef !== void 0 && commentIds?.has(run.commentRef) ? { anchor: `comment-${n}` } : {},
+		properties: {
+			...run.properties,
+			verticalAlign: "superscript"
+		}
+	});
 	const mapParagraph = (paragraph) => {
-		if (!paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0)) return paragraph;
+		if (!paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0 || r.commentRef !== void 0)) return paragraph;
 		return {
 			...paragraph,
 			runs: paragraph.runs.map((run) => {
@@ -77,6 +87,14 @@ function assignNoteNumbers(body) {
 					}
 					return numberRun(run, n);
 				}
+				if (run.commentRef !== void 0) {
+					let n = comments.get(run.commentRef);
+					if (n === void 0) {
+						n = comments.size + 1;
+						comments.set(run.commentRef, n);
+					}
+					return commentMarkerRun(run, n);
+				}
 				return run;
 			})
 		};
@@ -117,7 +135,7 @@ function assignNoteNumbers(body) {
 		return el;
 	};
 	const hasRefs = (els) => els.some((el) => {
-		if (el.kind === "paragraph") return el.paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0);
+		if (el.kind === "paragraph") return el.paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0 || r.commentRef !== void 0);
 		if (el.kind === "table") return el.table.rows.some((row) => row.cells.some((c) => hasRefs(c.content)));
 		if (el.kind === "shape" && el.shape.text) return hasRefs(el.shape.text.content);
 		return false;
@@ -126,12 +144,14 @@ function assignNoteNumbers(body) {
 		body,
 		footnotes,
 		endnotes,
+		comments,
 		deferredFootnotes: []
 	};
 	return {
 		body: body.map((el) => mapElement(el, true)),
 		footnotes,
 		endnotes,
+		comments,
 		deferredFootnotes: [...footnotes.keys()].filter((id) => !paragraphFootnotes.has(id))
 	};
 }
@@ -169,9 +189,62 @@ function substituteNoteNumber(content, n) {
 		}
 	}, ...out.slice(1)];
 }
+function flattenCommentText(content) {
+	const lines = [];
+	const visit = (els) => {
+		for (const el of els) if (el.kind === "paragraph") lines.push(el.paragraph.runs.map((r) => r.text).join(""));
+		else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+	};
+	visit(content);
+	return lines.join("\n").trim();
+}
+function buildCommentNotes(numbers, comments) {
+	const out = /* @__PURE__ */ new Map();
+	for (const [id, n] of numbers) {
+		const c = comments.get(id);
+		if (!c) continue;
+		out.set(`comment-${n}`, {
+			...c.author !== void 0 ? { author: c.author } : {},
+			contents: flattenCommentText(c.content)
+		});
+	}
+	return out;
+}
+function commentTailBlocks(comment, n, opts) {
+	const who = [comment.author, comment.date].filter((s) => s !== void 0 && s.length > 0).join(", ");
+	const inReplyTo = opts?.parentN !== void 0 ? ` (in reply to [${opts.parentN}])` : "";
+	const resolved = opts?.done ? " (resolved)" : "";
+	const labelRun = {
+		text: who ? `[${n}] ${who}${inReplyTo}${resolved}: ` : `[${n}]${inReplyTo}${resolved} `,
+		properties: {}
+	};
+	const bm = `comment-${n}`;
+	const indent = opts?.depth && opts.depth > 0 ? { indentLeft: pt(18 * opts.depth) } : {};
+	const first = comment.content[0];
+	if (first && first.kind === "paragraph") return [{
+		kind: "paragraph",
+		paragraph: {
+			...first.paragraph,
+			properties: {
+				...first.paragraph.properties,
+				...indent
+			},
+			runs: [labelRun, ...first.paragraph.runs],
+			bookmarks: [bm, ...first.paragraph.bookmarks ?? []]
+		}
+	}, ...comment.content.slice(1)];
+	return [{
+		kind: "paragraph",
+		paragraph: {
+			properties: { ...indent },
+			runs: [labelRun],
+			bookmarks: [bm]
+		}
+	}, ...comment.content];
+}
 function layoutStyledDocument(body, options) {
 	const sectionList = resolveSectionList(body, options);
-	const noteAssigned = assignNoteNumbers(applyNumbering(body, options.numbering));
+	const noteAssigned = assignNoteNumbers(applyNumbering(body, options.numbering), options.comments ? new Set(options.comments.keys()) : void 0);
 	const numberedBody = noteAssigned.body;
 	const numberedHeadersFooters = applyNumberingToHeadersFooters(options.headersFooters, options.numbering);
 	const pdfaProfile = options.pdfA ? parsePdfAProfile(options.pdfA) : void 0;
@@ -229,8 +302,35 @@ function layoutStyledDocument(body, options) {
 			});
 		}
 		for (const note of tailNotes.sort((a, b) => a.n - b.n)) for (const el of substituteNoteNumber(note.content, note.n)) blocks.push(layoutBodyElement(el, options, fontResources, imageResources, lastCtx.contentWidth, lastCtx.pageContentHeight));
+		const commentNums = noteAssigned.comments;
+		const threadDepth = (id) => {
+			let depth = 0;
+			const seen = new Set([id]);
+			let cur = options.comments?.get(id)?.parentId;
+			while (cur !== void 0 && commentNums.has(cur) && !seen.has(cur)) {
+				depth++;
+				seen.add(cur);
+				cur = options.comments?.get(cur)?.parentId;
+			}
+			return depth;
+		};
+		const commentTail = [...commentNums].map(([id, n]) => ({
+			id,
+			comment: options.comments?.get(id),
+			n
+		})).filter((e) => e.comment !== void 0).sort((a, b) => a.n - b.n);
+		for (const { id, comment, n } of commentTail) {
+			const parentId = comment.parentId;
+			const parentN = parentId !== void 0 && commentNums.has(parentId) ? commentNums.get(parentId) : void 0;
+			for (const el of commentTailBlocks(comment, n, {
+				...parentN !== void 0 ? { parentN } : {},
+				depth: threadDepth(id),
+				...comment.done ? { done: true } : {}
+			})) blocks.push(layoutBodyElement(el, options, fontResources, imageResources, lastCtx.contentWidth, lastCtx.pageContentHeight));
+		}
 	}
 	const bookmarks = /* @__PURE__ */ new Map();
+	const commentNotes = options.commentAnnotations && options.comments ? buildCommentNotes(noteAssigned.comments, options.comments) : void 0;
 	const reflowParagraph = (paragraph, width, widths) => layoutParagraphBlock(paragraph, options, fontResources, imageResources, width, widths);
 	return {
 		pages: paginateSections(blocks, sectionCtxs, structBuilder, options.language ?? "en-US", notePlan, bookmarks, reflowParagraph),
@@ -242,7 +342,8 @@ function layoutStyledDocument(body, options) {
 			sectionCtxs,
 			pdfaProfile,
 			tagged,
-			bookmarks
+			bookmarks,
+			...commentNotes ? { commentNotes } : {}
 		}
 	};
 }
@@ -567,6 +668,24 @@ function rectAtPath(x, y, w, h) {
 var CF_ICON_SIZE_PT = 9;
 var CF_ICON_GUTTER_PT = 12;
 var CF_ICON_EMPTY_HEX = "BFBFBF";
+var DROPDOWN_BUTTON_PT = 11;
+var DROPDOWN_GUTTER_PT = 13;
+var DROPDOWN_FILL_HEX = "F0F0F0";
+var DROPDOWN_BORDER_HEX = "B0B0B0";
+var DROPDOWN_ARROW_HEX = "595959";
+function buildDropdownPrims(s) {
+	return [{
+		paths: [rectAtPath(0, 0, s, s)],
+		fillColorHex: DROPDOWN_FILL_HEX,
+		stroke: {
+			colorHex: DROPDOWN_BORDER_HEX,
+			widthPt: .5
+		}
+	}, {
+		paths: [trianglePath([s / 2, s * .34], [s * .26, s * .64], [s * .74, s * .64])],
+		fillColorHex: DROPDOWN_ARROW_HEX
+	}];
+}
 function buildCellIconShape(icon, s) {
 	const color = icon.colorHex;
 	switch (icon.shape) {
@@ -756,6 +875,7 @@ function collectImageResources(body, headersFooters, options) {
 	for (const hf of headersFooters.values()) visit(hf);
 	for (const note of options.footnotes?.values() ?? []) visit(note);
 	for (const note of options.endnotes?.values() ?? []) visit(note);
+	for (const comment of options.comments?.values() ?? []) visit(comment.content);
 	const flattenAlpha = options.pdfA ? parsePdfAProfile(options.pdfA).part === 1 : false;
 	let counter = 0;
 	for (const resourceId of seen) {
@@ -916,6 +1036,7 @@ function collectFontResources(body, headersFooters, options) {
 	for (const hf of headersFooters.values()) visit(hf);
 	for (const note of options.footnotes?.values() ?? []) visit(note);
 	for (const note of options.endnotes?.values() ?? []) visit(note);
+	for (const comment of options.comments?.values() ?? []) visit(comment.content);
 	if (used.size === 0) {
 		const regular = options.registry.resolveByStyle(false, false);
 		used.set(regular.variant, {
@@ -1086,6 +1207,7 @@ function tokenizePlansLtr(plans) {
 			});
 			continue;
 		}
+		const highlight = (plan.run.commentRangeRefs?.length ?? 0) > 0;
 		for (const t of tokenizeText(plan.run.text)) tokens.push({
 			kind: "text",
 			text: t.text,
@@ -1094,6 +1216,7 @@ function tokenizePlansLtr(plans) {
 			...plan.run.footnoteRef !== void 0 ? { footnoteRef: plan.run.footnoteRef } : {},
 			...plan.run.anchor !== void 0 ? { anchor: plan.run.anchor } : {},
 			...plan.run.listMarker ? { listMarker: true } : {},
+			...highlight ? { highlight: true } : {},
 			resolvedRun: plan.resolvedRun,
 			font: plan.font,
 			fontSizePt: plan.fontSizePt,
@@ -1148,6 +1271,7 @@ function tokenizePlansBidi(plans, realLevels) {
 				...plan.run.footnoteRef !== void 0 ? { footnoteRef: plan.run.footnoteRef } : {},
 				...plan.run.anchor !== void 0 ? { anchor: plan.run.anchor } : {},
 				...plan.run.listMarker ? { listMarker: true } : {},
+				...(plan.run.commentRangeRefs?.length ?? 0) > 0 ? { highlight: true } : {},
 				resolvedRun: plan.resolvedRun,
 				font: plan.font,
 				fontSizePt: plan.fontSizePt,
@@ -1565,8 +1689,9 @@ function layoutTableCell(cell, tableProps, widthPt, options, fontResources, imag
 	const padTopPt = cellMar?.top ?? tableMar?.top ?? 0;
 	const padBottomPt = cellMar?.bottom ?? tableMar?.bottom ?? 0;
 	const padLeftBase = cellMar?.left ?? tableMar?.left ?? DEFAULT_CELL_PADDING_TWIPS * TWIP_TO_PT;
-	const padRightPt = cellMar?.right ?? tableMar?.right ?? DEFAULT_CELL_PADDING_TWIPS * TWIP_TO_PT;
+	const padRightBase = cellMar?.right ?? tableMar?.right ?? DEFAULT_CELL_PADDING_TWIPS * TWIP_TO_PT;
 	const padLeftPt = padLeftBase + (cell.properties.icon ? CF_ICON_GUTTER_PT : 0);
+	const padRightPt = padRightBase + (cell.properties.dropdown ? DROPDOWN_GUTTER_PT : 0);
 	const innerWidth = Math.max(1, widthPt - padLeftPt - padRightPt);
 	const lines = [];
 	const nestedTables = [];
@@ -1599,6 +1724,7 @@ function layoutTableCell(cell, tableProps, widthPt, options, fontResources, imag
 		...cell.properties.dataBar ? { dataBar: cell.properties.dataBar } : {},
 		...cell.properties.icon ? { icon: cell.properties.icon } : {},
 		...cell.properties.sparkline ? { sparkline: cell.properties.sparkline } : {},
+		...cell.properties.dropdown ? { dropdown: true } : {},
 		lines,
 		...nestedTables.length > 0 ? { nestedTables } : {},
 		contentHeightPt,
@@ -2256,6 +2382,28 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 				});
 			}
 		}
+		if (cell.dropdown && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
+			const btn = Math.min(DROPDOWN_BUTTON_PT, Math.max(0, row.heightPt - 2));
+			if (btn > 1) {
+				const btnTransform = flipTransform([
+					1,
+					0,
+					0,
+					1,
+					cellX + cell.widthPt - btn - 1.5,
+					rowBottom + (row.heightPt - btn) / 2
+				], pageHeight);
+				for (const prim of buildDropdownPrims(btn)) out.push({
+					type: "shape",
+					shape: {
+						paths: prim.paths,
+						...prim.fillColorHex ? { fillColorHex: prim.fillColorHex } : {},
+						...prim.stroke ? { stroke: prim.stroke } : {},
+						transform: btnTransform
+					}
+				});
+			}
+		}
 		if (cell.sparkline && cell.sparkline.values.length > 0 && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
 			const inset = 1.5;
 			const sw = cell.widthPt - 2 * inset;

package/dist/esm/pdf/styled-page-emitter.js

@@ -33,6 +33,7 @@ async function emitStyledPdfEncrypted(laid, options, doc, encrypt) {
 function assembleStyledPdf(laid, options, doc) {
 	const { pages: renderedPages } = laid;
 	const { structBuilder, sectionCtxs, pdfaProfile, tagged } = laid.pdf;
+	const commentNotes = !pdfaProfile && !structBuilder ? laid.pdf.commentNotes : void 0;
 	const docInfo = options.pdfUA && !options.info?.title ? {
 		...options.info,
 		title: "Untitled document"
@@ -158,6 +159,24 @@ function assembleStyledPdf(laid, options, doc) {
 					annotParentCount++;
 				}
 				annots.push(ref(annotRef.id));
+				const note = l.anchor !== void 0 ? commentNotes?.get(l.anchor) : void 0;
+				if (note) {
+					const textAnnot = doc.add(dict({
+						Type: name("Annot"),
+						Subtype: name("Text"),
+						Name: name("Comment"),
+						Rect: [
+							l.rect[0],
+							l.rect[1],
+							l.rect[2],
+							l.rect[3]
+						],
+						F: 28,
+						Contents: note.contents,
+						...note.author !== void 0 ? { T: note.author } : {}
+					}));
+					annots.push(ref(textAnnot.id));
+				}
 			}
 			if (annots.length > 0) {
 				pageEntries["Annots"] = annots;
@@ -624,6 +643,25 @@ function emitPageContent(page, tagging, gradientNames) {
 				const text = tok.bidiLevel % 2 === 1 ? reverseByCodePoint(tok.text) : tok.text;
 				return tok.font.measure.encodeTextAsCidHex(text);
 			};
+			if (line.tokens.some((t) => t.kind === "text" && t.highlight === true)) {
+				if (inBT) {
+					out.push("ET");
+					inBT = false;
+				}
+				const hlAscent = Math.max(lineFs, line.mathAscentPt ?? 0);
+				const hlDescent = Math.max(lineFs * .2, line.mathDescentPt ?? 0);
+				const [hr, hg, hb] = hexToRgb01("fff3a3");
+				out.push("q");
+				out.push(`${formatNumber(hr)} ${formatNumber(hg)} ${formatNumber(hb)} rg`);
+				let hx = originX;
+				for (const tok of line.tokens) {
+					const w = tok.widthPt + (tok.kind === "text" && tok.isSpace ? extraPerSpace : 0);
+					if (tok.kind === "text" && tok.highlight === true) out.push(`${formatNumber(hx)} ${formatNumber(baselineY - hlDescent)} ${formatNumber(w)} ${formatNumber(hlAscent + hlDescent)} re`);
+					hx += w;
+				}
+				out.push("f");
+				out.push("Q");
+			}
 			if (extraPerSpace > 0 || hasImageToken || hasMathToken || hasRtl) {
 				const order = hasRtl ? lineVisualOrder(line) : line.tokens.map((_, i) => i);
 				let x = originX;

package/dist/esm/pptx/pptx-reader.d.ts

@@ -1,4 +1,6 @@
 import { DocumentReader, ReadResult } from '../core/ir/adapters.js';
 import { FlowDoc } from '../core/ir/flow.js';
+import { PoNode } from '../core/po-helpers.js';
 export declare function readPptx(bytes: Uint8Array): ReadResult<FlowDoc>;
+export declare function parseXml(data: Uint8Array): Array<PoNode>;
 export declare const pptxReader: DocumentReader<FlowDoc>;

package/dist/esm/pptx/pptx-reader.js

@@ -3,8 +3,8 @@ import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
 import { EMPTY_STYLE_SHEET, resolveBodyStyles } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
+import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs } from "../core/po-helpers.js";
 import { bytesInclude } from "../core/bytes.js";
-import { poAttr, poChildren, poIntAttr, poIs } from "../core/po-helpers.js";
 import { DEFAULT_THEME_PALETTE, defaultColorResolver, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
 import { parseTheme } from "../core/drawingml/theme-parser.js";
@@ -81,7 +81,12 @@ function readPptx(bytes) {
 				colors: styles.colors,
 				resolveImage: makeSlideImageResolver(pkg, part.path, resources),
 				resolveChart: makeSlideChartResolver(pkg, part.path, charts, styles.colors),
-				resolveHyperlink: makeHyperlinkResolver(pkg, part.path)
+				resolveHyperlink: makeHyperlinkResolver(pkg, part.path),
+				resolveDiagram: makeSlideDiagramResolver(pkg, part.path),
+				onLoss: (loss) => losses.push(loss.where ? loss : {
+					...loss,
+					where: `slide ${i + 1}`
+				})
 			};
 			body.push(...parseSlide(part.data, ctx, styles.background, pageW, pageH));
 		}
@@ -167,6 +172,28 @@ function makeSlideChartResolver(pkg, slidePath, charts, colors) {
 		return key;
 	};
 }
+function makeSlideDiagramResolver(pkg, slidePath) {
+	const cache = /* @__PURE__ */ new Map();
+	return (relId) => {
+		if (cache.has(relId)) return cache.get(relId);
+		let spTree;
+		const dataRel = pkg.getPartRelationships(slidePath).find((r) => r.id === relId);
+		const data = dataRel ? pkg.resolveRelatedPart(slidePath, dataRel) : void 0;
+		if (data) {
+			const drawRel = pkg.getPartRelationships(data.path).find((r) => r.type.endsWith("/diagramDrawing"));
+			const draw = drawRel ? pkg.resolveRelatedPart(data.path, drawRel) : void 0;
+			if (draw) for (const root of parseXml(draw.data)) {
+				const found = poFindDescendant(root, "dsp:spTree");
+				if (found) {
+					spTree = found;
+					break;
+				}
+			}
+		}
+		cache.set(relId, spTree);
+		return spTree;
+	};
+}
 function slideStylesFor(pkg, slidePath, cache) {
 	const layoutRel = pkg.getPartRelationships(slidePath).find((r) => r.type.endsWith("/slideLayout"));
 	const layout = layoutRel ? pkg.resolveRelatedPart(slidePath, layoutRel) : void 0;
@@ -210,4 +237,4 @@ var pptxReader = {
 	read: (bytes) => readPptx(bytes)
 };
 //#endregion
-export { pptxReader };
+export { parseXml, pptxReader };

package/dist/esm/pptx/slide-parser.d.ts

@@ -1,6 +1,6 @@
-import { BodyElement, ShapeFill } from '../core/document-model/index.js';
+import { BodyElement, FloatAnchor, ShapeBlock, ShapeFill } from '../core/document-model/index.js';
 import { ColorResolver } from '../core/drawingml/colors.js';
-import { Pt, ResourceId } from '../core/ir/index.js';
+import { Loss, Pt, ResourceId } from '../core/ir/index.js';
 import { PoNode } from '../core/po-helpers.js';
 import { PlaceholderCascade } from './placeholder-cascade.js';
 import { ShapeBoxEmu } from './sp-helpers.js';
@@ -10,9 +10,15 @@ export interface SlideContext {
     readonly resolveChart?: (relId: string) => string | undefined;
     readonly colors?: ColorResolver;
     readonly resolveHyperlink?: (relId: string) => string | undefined;
+    readonly resolveDiagram?: (relId: string) => PoNode | undefined;
+    readonly onLoss?: (loss: Loss) => void;
 }
+type LinkResolver = ((relId: string) => string | undefined) | undefined;
 type GroupTransform = (box: ShapeBoxEmu) => ShapeBoxEmu;
 export declare function parseSlideShapes(container: PoNode, ctx?: SlideContext, transform?: GroupTransform): Array<BodyElement>;
+export declare function diagramTransform(spTree: PoNode, frame: ShapeBoxEmu): GroupTransform;
+export declare function noDiagramOverrideLoss(where?: string): Loss;
+export declare function parseDiagramDrawing(spTree: PoNode, transform: GroupTransform, makeFloat: (box: ShapeBoxEmu) => FloatAnchor, colors: ColorResolver, resolveLink: LinkResolver): Array<ShapeBlock>;
 export declare function parseBackgroundFill(bg: PoNode, colors: ColorResolver): ShapeFill | undefined;
 export declare function backdropElement(fill: ShapeFill, widthPt: Pt, heightPt: Pt): BodyElement;
 export {};

package/dist/esm/pptx/slide-parser.js

@@ -1,11 +1,13 @@
 import { emuToPt } from "../core/ir/units.js";
+import { FEATURES } from "../core/ir/features.js";
 import { poAttr, poChildren, poFindDescendant, poIntAttr, poIs, poText } from "../core/po-helpers.js";
 import { defaultColorResolver, resolveColorNode } from "../core/drawingml/colors.js";
-import { parseCustGeom, parseFill, parseLine, parsePrstGeom } from "../word/drawing-parser.js";
 import { boxFromXfrm, parsePh, parseXfrmBox, rPrToRunProps } from "./sp-helpers.js";
+import { parseCustGeom, parseFill, parseLine, parsePrstGeom } from "../word/drawing-parser.js";
 //#region src/pptx/slide-parser.ts
 var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 var TABLE_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
+var DIAGRAM_URI = "http://schemas.openxmlformats.org/drawingml/2006/diagram";
 var ALGN_TO_ALIGNMENT = {
 	l: "left",
 	ctr: "center",
@@ -33,10 +35,8 @@ function parseSlideShapes(container, ctx = {}, transform = IDENTITY_TRANSFORM) {
 			kind: "image",
 			image
 		});
-	} else if (poIs(child, "p:graphicFrame")) {
-		const el = parseGraphicFrame(child, ctx, transform);
-		if (el) out.push(el);
-	} else if (poIs(child, "p:grpSp")) out.push(...parseSlideShapes(child, ctx, composeGroupTransform(child, transform)));
+	} else if (poIs(child, "p:graphicFrame")) out.push(...parseGraphicFrame(child, ctx, transform));
+	else if (poIs(child, "p:grpSp")) out.push(...parseSlideShapes(child, ctx, composeGroupTransform(child, transform)));
 	return out;
 }
 function composeGroupTransform(grpSp, parent) {
@@ -106,7 +106,7 @@ function parseSp(sp, ctx, transform) {
 }
 function parseGraphicFrame(gf, ctx, transform) {
 	const own = boxFromXfrm(poChildren(gf).find((c) => poIs(c, "p:xfrm")));
-	if (!own) return void 0;
+	if (!own) return [];
 	const box = transform(own);
 	const graphicData = poFindDescendant(gf, "a:graphicData");
 	const uri = graphicData ? poAttr(graphicData, "uri") : void 0;
@@ -114,8 +114,8 @@ function parseGraphicFrame(gf, ctx, transform) {
 		const cChart = poFindDescendant(gf, "c:chart");
 		const relId = cChart ? poAttr(cChart, "id") : void 0;
 		const key = relId !== void 0 ? ctx.resolveChart?.(relId) : void 0;
-		if (key === void 0) return void 0;
-		return {
+		if (key === void 0) return [];
+		return [{
 			kind: "chart",
 			chart: {
 				float: floatAt(box),
@@ -124,15 +124,83 @@ function parseGraphicFrame(gf, ctx, transform) {
 				height: emuToPt(box.cy),
 				paragraphProperties: {}
 			}
-		};
+		}];
 	}
 	if (uri === TABLE_URI) {
 		const tbl = poFindDescendant(gf, "a:tbl");
-		return tbl ? {
+		return tbl ? [{
 			kind: "table",
 			table: parseTable(tbl, ctx.colors ?? defaultColorResolver)
-		} : void 0;
+		}] : [];
 	}
+	if (uri === DIAGRAM_URI) {
+		const relIds = poFindDescendant(gf, "dgm:relIds");
+		const dmRelId = relIds ? poAttr(relIds, "dm") : void 0;
+		const spTree = dmRelId !== void 0 ? ctx.resolveDiagram?.(dmRelId) : void 0;
+		if (!spTree) {
+			if (dmRelId !== void 0) ctx.onLoss?.(noDiagramOverrideLoss());
+			return [];
+		}
+		return parseDiagramDrawing(spTree, diagramTransform(spTree, box), floatAt, ctx.colors ?? defaultColorResolver, ctx.resolveHyperlink).map((shape) => ({
+			kind: "shape",
+			shape
+		}));
+	}
+	return [];
+}
+function diagramTransform(spTree, frame) {
+	const grpSpPr = poChildren(spTree).find((c) => poIs(c, "dsp:grpSpPr"));
+	const xfrm = grpSpPr ? poChildren(grpSpPr).find((c) => poIs(c, "a:xfrm")) : void 0;
+	const chOff = xfrm ? poChildren(xfrm).find((c) => poIs(c, "a:chOff")) : void 0;
+	const chExt = xfrm ? poChildren(xfrm).find((c) => poIs(c, "a:chExt")) : void 0;
+	const chExtCx = chExt ? poIntAttr(chExt, "cx") : void 0;
+	const chExtCy = chExt ? poIntAttr(chExt, "cy") : void 0;
+	const chOffX = (chOff ? poIntAttr(chOff, "x") : void 0) ?? 0;
+	const chOffY = (chOff ? poIntAttr(chOff, "y") : void 0) ?? 0;
+	const sx = chExtCx && chExtCx > 0 ? frame.cx / chExtCx : 1;
+	const sy = chExtCy && chExtCy > 0 ? frame.cy / chExtCy : 1;
+	return (b) => ({
+		x: frame.x + (b.x - chOffX) * sx,
+		y: frame.y + (b.y - chOffY) * sy,
+		cx: b.cx * sx,
+		cy: b.cy * sy
+	});
+}
+function noDiagramOverrideLoss(where) {
+	return {
+		severity: "dropped",
+		feature: FEATURES.smartArt,
+		detail: "SmartArt diagram has no pre-rendered drawing override; its layout is not reconstructed",
+		...where ? { where } : {}
+	};
+}
+function parseDiagramDrawing(spTree, transform, makeFloat, colors, resolveLink) {
+	const out = [];
+	for (const sp of poChildren(spTree)) {
+		if (!poIs(sp, "dsp:sp")) continue;
+		const spPr = poChildren(sp).find((c) => poIs(c, "dsp:spPr"));
+		const own = parseXfrmBox(spPr);
+		if (!own) continue;
+		const box = transform(own);
+		const txBody = poChildren(sp).find((c) => poIs(c, "dsp:txBody"));
+		const text = txBody ? parseTxBody(txBody, void 0, void 0, colors, resolveLink) : void 0;
+		const geometry = parseGeometry(spPr);
+		const fill = spPr ? parseFill(spPr, colors) : { kind: "none" };
+		const line = spPr ? parseLine(spPr, colors) : void 0;
+		const visibleLine = line !== void 0 && line.fill !== "none";
+		if (!text && fill.kind === "none" && !visibleLine) continue;
+		out.push({
+			float: makeFloat(box),
+			width: emuToPt(box.cx),
+			height: emuToPt(box.cy),
+			geometry,
+			fill,
+			...line ? { line } : {},
+			...text ? { text } : {},
+			paragraphProperties: {}
+		});
+	}
+	return out;
 }
 function parseBackgroundFill(bg, colors) {
 	const bgPr = poChildren(bg).find((c) => poIs(c, "p:bgPr"));
@@ -356,4 +424,4 @@ function cellFillHex(tcPr, colors) {
 	}
 }
 //#endregion
-export { backdropElement, parseBackgroundFill, parseSlideShapes };
+export { backdropElement, diagramTransform, noDiagramOverrideLoss, parseBackgroundFill, parseDiagramDrawing, parseSlideShapes };

package/dist/esm/word/document-parser.d.ts

@@ -1,6 +1,6 @@
-import { BodyElement, Section, SectionProperties } from '../core/document-model/index.js';
+import { BodyElement, Comment, Section, SectionProperties } from '../core/document-model/index.js';
 import { ColorResolver } from '../core/drawingml/colors.js';
-import { ResourceId } from '../core/ir/index.js';
+import { Loss, ResourceId } from '../core/ir/index.js';
 import { PoNode } from '../core/po-helpers.js';
 export type ImageResolver = (relId: string) => ResourceId | undefined;
 export type HyperlinkResolver = (relId: string) => string | undefined;
@@ -8,6 +8,9 @@ export interface ParseContext {
     readonly resolveColor: ColorResolver;
     readonly resolveImage?: ImageResolver;
     readonly resolveHyperlink?: HyperlinkResolver;
+    readonly resolveDiagram?: (relId: string) => PoNode | undefined;
+    readonly onLoss?: (loss: Loss) => void;
+    readonly openCommentRanges?: Set<string>;
 }
 export declare const DEFAULT_PARSE_CONTEXT: ParseContext;
 export declare function parseDocument(documentXml: Uint8Array, ctx?: ParseContext): Array<BodyElement>;
@@ -17,3 +20,15 @@ export declare function parseSections(documentXml: Uint8Array): Array<Section>;
 export declare function parseHeaderFooter(xml: Uint8Array, ctx?: ParseContext): Array<BodyElement>;
 export declare function parseBodyElements(children: ReadonlyArray<PoNode>, ctx?: ParseContext): Array<BodyElement>;
 export declare function parseNotes(notesXml: Uint8Array, rootTag: 'w:footnotes' | 'w:endnotes', noteTag: 'w:footnote' | 'w:endnote', ctx?: ParseContext): Map<string, Array<BodyElement>>;
+export declare function parseComments(commentsXml: Uint8Array, ctx?: ParseContext): Map<string, Comment>;
+/** A commentsExtended entry, keyed by the comment's last-paragraph w14:paraId. */
+export interface CommentExtension {
+    /** The parent comment's paraId — present when this comment is a reply. */
+    readonly paraIdParent?: string;
+    /** w15:done — the thread is resolved. */
+    readonly done: boolean;
+}
+export declare function parseCommentsExtended(xml: Uint8Array): Map<string, CommentExtension>;
+export declare function parseCommentThreads(commentsXml: Uint8Array, commentsExtendedXml: Uint8Array | undefined, ctx?: ParseContext): Map<string, Comment>;
+export declare function parsePeople(xml: Uint8Array): Map<string, string>;
+export declare function applyAuthorIds(comments: Map<string, Comment>, people: Map<string, string>): Map<string, Comment>;