reamkit 1.11.0 → 1.13.0

package/dist/esm/word/document-parser.js

@@ -1,8 +1,9 @@
-import { twipsToPt } from "../core/ir/units.js";
-import { poAttr, poChildren, poFindByPath, poFindDescendant, poIntAttr, poIs, poText } from "../core/po-helpers.js";
+import { emuToPt, twipsToPt } from "../core/ir/units.js";
+import { poAttr, poAttrLocal, poChildren, poFindByPath, poFindDescendant, poIntAttr, poIs, poIsLocal, poText } from "../core/po-helpers.js";
 import { defaultColorResolver } from "../core/drawingml/colors.js";
-import { parseOMath } from "./omml-parser.js";
 import { expandMcChildren, parseDrawing, parseVmlPicture } from "./drawing-parser.js";
+import { diagramTransform, noDiagramOverrideLoss, parseDiagramDrawing } from "../pptx/slide-parser.js";
+import { parseOMath } from "./omml-parser.js";
 import { parseRunProperties } from "./run-properties.js";
 import { parseParagraphProperties } from "./paragraph-properties.js";
 import { poElementToFlat } from "./po-to-flat.js";
@@ -162,12 +163,15 @@ function parseBodyElements(children, ctx = DEFAULT_PARSE_CONTEXT) {
 		const bookmarkName = poAttr(child, "name");
 		if (bookmarkName !== void 0 && bookmarkName !== "" && bookmarkName !== "_GoBack") (pendingBookmarks ??= []).push(bookmarkName);
 	} else if (poIs(child, "w:p")) {
-		const drawing = tryExtractDrawingFromParagraph(child, ctx);
-		out.push(drawing ?? {
-			kind: "paragraph",
-			paragraph: parseParagraph(child, ctx, pendingBookmarks)
-		});
-		if (!drawing) pendingBookmarks = void 0;
+		const drawings = tryExtractDrawingFromParagraph(child, ctx);
+		if (drawings) out.push(...drawings);
+		else {
+			out.push({
+				kind: "paragraph",
+				paragraph: parseParagraph(child, ctx, pendingBookmarks)
+			});
+			pendingBookmarks = void 0;
+		}
 	} else if (poIs(child, "w:tbl")) out.push({
 		kind: "table",
 		table: parseTable(child, ctx)
@@ -220,7 +224,7 @@ function tryExtractDrawingFromParagraph(p, ctx) {
 	const paragraphProperties = pPrNode ? parseParagraphProperties(poElementToFlat(pPrNode)) : {};
 	if (content.kind === "image") {
 		const resource = ctx.resolveImage?.(content.imageId);
-		return {
+		return [{
 			kind: "image",
 			image: {
 				...resource ? { resource } : {},
@@ -230,9 +234,9 @@ function tryExtractDrawingFromParagraph(p, ctx) {
 				...content.altText ? { altText: content.altText } : {},
 				...content.float ? { float: content.float } : {}
 			}
-		};
+		}];
 	}
-	if (content.kind === "chart") return {
+	if (content.kind === "chart") return [{
 		kind: "chart",
 		chart: {
 			chartRelId: content.chartRelId,
@@ -242,8 +246,35 @@ function tryExtractDrawingFromParagraph(p, ctx) {
 			...content.altText ? { altText: content.altText } : {},
 			...content.float ? { float: content.float } : {}
 		}
-	};
-	return {
+	}];
+	if (content.kind === "diagram") {
+		const spTree = ctx.resolveDiagram?.(content.dmRelId);
+		if (!spTree) {
+			ctx.onLoss?.(noDiagramOverrideLoss());
+			return null;
+		}
+		const shapes = parseDiagramDrawing(spTree, diagramTransform(spTree, {
+			x: 0,
+			y: 0,
+			cx: content.widthEmu,
+			cy: content.heightEmu
+		}), (box) => ({
+			wrap: "none",
+			posH: {
+				relativeFrom: "column",
+				offsetPt: emuToPt(box.x)
+			},
+			posV: {
+				relativeFrom: "paragraph",
+				offsetPt: emuToPt(box.y)
+			}
+		}), ctx.resolveColor, void 0);
+		return shapes.length > 0 ? shapes.map((shape) => ({
+			kind: "shape",
+			shape
+		})) : null;
+	}
+	return [{
 		kind: "shape",
 		shape: {
 			...content.data,
@@ -251,7 +282,7 @@ function tryExtractDrawingFromParagraph(p, ctx) {
 			...content.altText ? { altText: content.altText } : {},
 			...content.float ? { float: content.float } : {}
 		}
-	};
+	}];
 }
 function parseParagraph(p, ctx, extraBookmarks) {
 	const bookmarks = [...extraBookmarks ?? []];
@@ -349,12 +380,24 @@ function applyFieldFsm(collected) {
 function collectRuns(container, out, ctx, href, anchor) {
 	for (const child of poChildren(container)) {
 		if (poIs(child, "w:pPr")) continue;
+		if (poIs(child, "w:commentRangeStart")) {
+			const id = poAttr(child, "id");
+			if (id !== void 0) ctx.openCommentRanges?.add(id);
+			continue;
+		}
+		if (poIs(child, "w:commentRangeEnd")) {
+			const id = poAttr(child, "id");
+			if (id !== void 0) ctx.openCommentRanges?.delete(id);
+			continue;
+		}
 		if (poIs(child, "w:r")) {
 			const parsed = parseRun(child, ctx);
-			const run = href !== void 0 || anchor !== void 0 ? {
+			const ranges = ctx.openCommentRanges && ctx.openCommentRanges.size > 0 ? [...ctx.openCommentRanges] : void 0;
+			const run = href !== void 0 || anchor !== void 0 || ranges !== void 0 ? {
 				...parsed.run,
 				...href !== void 0 ? { href } : {},
-				...anchor !== void 0 ? { anchor } : {}
+				...anchor !== void 0 ? { anchor } : {},
+				...ranges !== void 0 ? { commentRangeRefs: ranges } : {}
 			} : parsed.run;
 			out.push({
 				run,
@@ -417,6 +460,7 @@ function parseRun(r, ctx) {
 	let instrText;
 	let footnoteRef;
 	let endnoteRef;
+	let commentRef;
 	let noteNumber = false;
 	for (const child of expandMcChildren(poChildren(r))) {
 		if (poIs(child, "w:rPr")) continue;
@@ -439,6 +483,11 @@ function parseRun(r, ctx) {
 			if (id !== void 0) endnoteRef = id;
 			continue;
 		}
+		if (poIs(child, "w:commentReference")) {
+			const id = poAttr(child, "id");
+			if (id !== void 0) commentRef = id;
+			continue;
+		}
 		if (poIs(child, "w:footnoteRef") || poIs(child, "w:endnoteRef")) {
 			noteNumber = true;
 			continue;
@@ -479,6 +528,7 @@ function parseRun(r, ctx) {
 			...pageBreak ? { pageBreak: true } : {},
 			...footnoteRef !== void 0 ? { footnoteRef } : {},
 			...endnoteRef !== void 0 ? { endnoteRef } : {},
+			...commentRef !== void 0 ? { commentRef } : {},
 			...noteNumber ? { noteNumber: true } : {}
 		},
 		...fldChar ? { fldChar } : {},
@@ -503,5 +553,115 @@ function parseNotes(notesXml, rootTag, noteTag, ctx = DEFAULT_PARSE_CONTEXT) {
 	}
 	return out;
 }
+function parseCommentsRaw(commentsXml, ctx) {
+	const xml = decoder.decode(commentsXml);
+	const root = poFindByPath(parser.parse(xml), ["w:comments"]);
+	const comments = /* @__PURE__ */ new Map();
+	const paraIds = /* @__PURE__ */ new Map();
+	if (!root) return {
+		comments,
+		paraIds
+	};
+	for (const c of poChildren(root)) {
+		if (!poIs(c, "w:comment")) continue;
+		const id = poAttr(c, "id");
+		if (id === void 0) continue;
+		const author = poAttr(c, "author");
+		const initials = poAttr(c, "initials");
+		const date = poAttr(c, "date");
+		comments.set(id, {
+			content: parseBodyElements(poChildren(c), ctx),
+			...author !== void 0 ? { author } : {},
+			...initials !== void 0 ? { initials } : {},
+			...date !== void 0 ? { date } : {}
+		});
+		let paraId;
+		for (const child of poChildren(c)) {
+			if (!poIs(child, "w:p")) continue;
+			const pid = poAttrLocal(child, "paraId");
+			if (pid !== void 0) paraId = pid;
+		}
+		if (paraId !== void 0) paraIds.set(id, paraId);
+	}
+	return {
+		comments,
+		paraIds
+	};
+}
+function parseCommentsExtended(xml) {
+	const tree = parser.parse(decoder.decode(xml));
+	const out = /* @__PURE__ */ new Map();
+	const root = tree.find((n) => poIsLocal(n, "commentsEx"));
+	if (!root) return out;
+	for (const ex of poChildren(root)) {
+		if (!poIsLocal(ex, "commentEx")) continue;
+		const paraId = poAttrLocal(ex, "paraId");
+		if (paraId === void 0) continue;
+		const paraIdParent = poAttrLocal(ex, "paraIdParent");
+		const done = poAttrLocal(ex, "done");
+		out.set(paraId, {
+			...paraIdParent !== void 0 ? { paraIdParent } : {},
+			done: done === "1" || done === "true"
+		});
+	}
+	return out;
+}
+function linkCommentThreads(comments, paraIdByComment, ext) {
+	if (ext.size === 0) return comments;
+	const commentByParaId = /* @__PURE__ */ new Map();
+	for (const [id, pid] of paraIdByComment) commentByParaId.set(pid, id);
+	const out = /* @__PURE__ */ new Map();
+	for (const [id, c] of comments) {
+		const pid = paraIdByComment.get(id);
+		const e = pid !== void 0 ? ext.get(pid) : void 0;
+		if (!e) {
+			out.set(id, c);
+			continue;
+		}
+		const parentId = e.paraIdParent !== void 0 ? commentByParaId.get(e.paraIdParent) : void 0;
+		out.set(id, {
+			...c,
+			...parentId !== void 0 ? { parentId } : {},
+			...e.done ? { done: true } : {}
+		});
+	}
+	return out;
+}
+function parseCommentThreads(commentsXml, commentsExtendedXml, ctx = DEFAULT_PARSE_CONTEXT) {
+	const { comments, paraIds } = parseCommentsRaw(commentsXml, ctx);
+	if (!commentsExtendedXml) return comments;
+	return linkCommentThreads(comments, paraIds, parseCommentsExtended(commentsExtendedXml));
+}
+function parsePeople(xml) {
+	const tree = parser.parse(decoder.decode(xml));
+	const out = /* @__PURE__ */ new Map();
+	const root = tree.find((n) => poIsLocal(n, "people"));
+	if (!root) return out;
+	for (const person of poChildren(root)) {
+		if (!poIsLocal(person, "person")) continue;
+		const author = poAttrLocal(person, "author");
+		if (author === void 0) continue;
+		let userId;
+		for (const child of poChildren(person)) {
+			if (!poIsLocal(child, "presenceInfo")) continue;
+			const uid = poAttrLocal(child, "userId");
+			if (uid !== void 0) userId = uid;
+		}
+		if (userId !== void 0) out.set(author, userId);
+	}
+	return out;
+}
+function applyAuthorIds(comments, people) {
+	if (people.size === 0) return comments;
+	const out = /* @__PURE__ */ new Map();
+	for (const [id, c] of comments) {
+		const userId = c.author !== void 0 ? people.get(c.author) : void 0;
+		out.set(id, userId !== void 0 ? {
+			...c,
+			authorId: userId
+		} : c);
+	}
+	return out;
+}
 //#endregion
-export { DEFAULT_PARSE_CONTEXT, EMPTY_SECTION, parseBodyElements, parseDocument, parseHeaderFooter, parseNotes, parseSections };
+export { DEFAULT_PARSE_CONTEXT, EMPTY_SECTION, applyAuthorIds, parseBodyElements, parseCommentThreads, parseCommentsExtended, parseDocument, parseHeaderFooter, parseNotes, parsePeople, parseSections };

package/dist/esm/word/docx-reader.js

@@ -4,6 +4,7 @@ import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numberin
 import { EMPTY_STYLE_SHEET, resolveBodyStyles, resolveHeadersFootersStyles } from "../core/style-cascade/resolver.js";
 import { resolveTableStyles } from "../core/style-cascade/table.js";
 import "../core/style-cascade/index.js";
+import { poFindDescendant } from "../core/po-helpers.js";
 import { bytesInclude } from "../core/bytes.js";
 import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
@@ -12,7 +13,8 @@ import { isOoxmlRel } from "../core/opc/relationship-types.js";
 import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
 import "../core/opc/index.js";
-import { EMPTY_SECTION, parseDocument, parseHeaderFooter, parseNotes, parseSections } from "./document-parser.js";
+import { parseXml } from "../pptx/pptx-reader.js";
+import { EMPTY_SECTION, applyAuthorIds, parseCommentThreads, parseDocument, parseHeaderFooter, parseNotes, parsePeople, parseSections } from "./document-parser.js";
 import { parseStyles } from "./styles-parser.js";
 import { loadEmbeddedFonts } from "./font-table.js";
 import { EMPTY_NUMBERING, parseNumbering } from "./numbering-parser.js";
@@ -22,6 +24,9 @@ import "./index.js";
 var STYLES_PART = "word/styles.xml";
 var FOOTNOTES_PART = "word/footnotes.xml";
 var ENDNOTES_PART = "word/endnotes.xml";
+var COMMENTS_PART = "word/comments.xml";
+var COMMENTS_EXTENDED_PART = "word/commentsExtended.xml";
+var PEOPLE_PART = "word/people.xml";
 var NUMBERING_PART = "word/numbering.xml";
 var SETTINGS_PART = "word/settings.xml";
 var CORE_PROPS_PART = "docProps/core.xml";
@@ -33,10 +38,16 @@ function readDocx(docx) {
 	const main = pkg.getMainDocument();
 	const resolveColor = buildColorResolver(pkg);
 	const resources = new ResourceStore();
+	const resolveImage = makeImageResolver(pkg, resources);
+	const resolveHyperlink = makeHyperlinkResolver(pkg);
+	const losses = [];
 	const ctx = {
 		resolveColor,
-		resolveImage: makeImageResolver(pkg, resources),
-		resolveHyperlink: makeHyperlinkResolver(pkg)
+		resolveImage,
+		resolveHyperlink,
+		resolveDiagram: makeDiagramResolver(pkg, MAIN_DOCUMENT_PART),
+		onLoss: (loss) => losses.push(loss),
+		openCommentRanges: /* @__PURE__ */ new Set()
 	};
 	const body = parseDocument(main.data, ctx);
 	const rawSections = parseSections(main.data);
@@ -53,6 +64,11 @@ function readDocx(docx) {
 	const rawFootnotes = footnotesData ? parseNotes(footnotesData, "w:footnotes", "w:footnote", noteCtx(FOOTNOTES_PART)) : void 0;
 	const endnotesData = pkg.getPart(ENDNOTES_PART);
 	const rawEndnotes = endnotesData ? parseNotes(endnotesData, "w:endnotes", "w:endnote", noteCtx(ENDNOTES_PART)) : void 0;
+	const commentsData = pkg.getPart(COMMENTS_PART);
+	const commentsExtendedData = pkg.getPart(COMMENTS_EXTENDED_PART);
+	const peopleData = pkg.getPart(PEOPLE_PART);
+	let rawComments = commentsData ? parseCommentThreads(commentsData, commentsExtendedData, noteCtx(COMMENTS_PART)) : void 0;
+	if (rawComments && peopleData) rawComments = applyAuthorIds(rawComments, parsePeople(peopleData));
 	const settingsData = pkg.getPart(SETTINGS_PART);
 	const settings = settingsData ? parseSettings(settingsData) : EMPTY_SETTINGS;
 	const sections = rawSections.length > 0 ? rawSections.map((s) => ({
@@ -83,6 +99,7 @@ function readDocx(docx) {
 			numbering,
 			...rawFootnotes && rawFootnotes.size > 0 ? { footnotes: transformNotes(rawFootnotes, styles, numbering) } : {},
 			...rawEndnotes && rawEndnotes.size > 0 ? { endnotes: transformNotes(rawEndnotes, styles, numbering) } : {},
+			...rawComments && rawComments.size > 0 ? { comments: transformComments(rawComments, styles, numbering) } : {},
 			headersFooters: resolveHeadersFootersStyles(applyNumberingToHeadersFooters(headersFooters, numbering), styles),
 			charts,
 			resources,
@@ -90,7 +107,7 @@ function readDocx(docx) {
 			...info ? { info } : {},
 			...language ? { language } : {}
 		},
-		losses: []
+		losses
 	};
 }
 var docxReader = {
@@ -125,6 +142,28 @@ function infoFromCore(core) {
 		...core.modified ? { modificationDate: core.modified } : {}
 	};
 }
+function makeDiagramResolver(pkg, partName) {
+	const cache = /* @__PURE__ */ new Map();
+	return (relId) => {
+		if (cache.has(relId)) return cache.get(relId);
+		let spTree;
+		const dataRel = pkg.getPartRelationships(partName).find((r) => r.id === relId);
+		const data = dataRel ? pkg.resolveRelatedPart(partName, 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 makeImageResolver(pkg, store, partName = MAIN_DOCUMENT_PART) {
 	const byRelId = /* @__PURE__ */ new Map();
 	for (const rel of pkg.getPartRelationships(partName)) {
@@ -145,6 +184,17 @@ function transformNotes(notes, styles, numbering) {
 	for (const content of notes.values()) resolveTableStyles(content, styles);
 	return resolveHeadersFootersStyles(applyNumberingToHeadersFooters(notes, numbering), styles);
 }
+function transformComments(comments, styles, numbering) {
+	const contentById = /* @__PURE__ */ new Map();
+	for (const [id, c] of comments) contentById.set(id, [...c.content]);
+	const transformed = transformNotes(contentById, styles, numbering);
+	const out = /* @__PURE__ */ new Map();
+	for (const [id, c] of comments) out.set(id, {
+		...c,
+		content: transformed.get(id) ?? c.content
+	});
+	return out;
+}
 function makeHyperlinkResolver(pkg, partName = MAIN_DOCUMENT_PART) {
 	const byRelId = /* @__PURE__ */ new Map();
 	for (const rel of pkg.getPartRelationships(partName)) if (rel.type === REL_HYPERLINK && rel.targetMode === "External") byRelId.set(rel.id, rel.target);

package/dist/esm/word/docx-writer.js

@@ -23,6 +23,14 @@ var FOOTNOTES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.word
 var ENDNOTES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml";
 var FOOTNOTES_PART = "word/footnotes.xml";
 var ENDNOTES_PART = "word/endnotes.xml";
+var REL_COMMENTS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
+var COMMENTS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
+var COMMENTS_PART = "word/comments.xml";
+var REL_COMMENTS_EXTENDED = "http://schemas.microsoft.com/office/2011/relationships/commentsExtended";
+var COMMENTS_EXTENDED_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml";
+var COMMENTS_EXTENDED_PART = "word/commentsExtended.xml";
+var W14_NS = "http://schemas.microsoft.com/office/word/2010/wordml";
+var W15_NS = "http://schemas.microsoft.com/office/word/2012/wordml";
 var REL_CHART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
 var CHART_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
 var EMU_PER_PT = 12700;
@@ -143,6 +151,8 @@ function writeDocx(flow) {
 		relType: REL_ENDNOTES,
 		target: "endnotes.xml"
 	}, state, losses, docScope, extraParts, extraPartRels);
+	const commentParaIds = emitComments(flow.comments, state, losses, docScope, extraParts, extraPartRels);
+	emitCommentsExtended(flow.comments, commentParaIds, docScope, extraParts);
 	const partRelationships = [...docScope.rels.length > 0 ? [{
 		sourcePart: "word/document.xml",
 		relationships: docScope.rels
@@ -199,6 +209,78 @@ function emitNotes(notes, cfg, state, losses, docScope, extraParts, extraPartRel
 		targetMode: "Internal"
 	});
 }
+function paraIdFor(commentId) {
+	let h = 2166136261;
+	for (let i = 0; i < commentId.length; i++) {
+		h ^= commentId.charCodeAt(i);
+		h = Math.imul(h, 16777619);
+	}
+	return (h >>> 0 || 1).toString(16).toUpperCase().padStart(8, "0");
+}
+var PARA_OPEN = "<w:p>";
+function injectParaId(paragraphXmlString, paraId) {
+	return paragraphXmlString.startsWith(PARA_OPEN) ? `<w:p w14:paraId="${paraId}">` + paragraphXmlString.slice(5) : paragraphXmlString;
+}
+function emitComments(comments, state, losses, docScope, extraParts, extraPartRels) {
+	const paraIds = /* @__PURE__ */ new Map();
+	if (!comments || comments.size === 0) return paraIds;
+	const scope = newScope();
+	const commentXmls = [];
+	for (const [id, c] of comments) {
+		let lastParaIdx = -1;
+		for (let i = 0; i < c.content.length; i++) if (c.content[i].kind === "paragraph") lastParaIdx = i;
+		const paraId = lastParaIdx >= 0 ? paraIdFor(id) : void 0;
+		const inner = [];
+		for (let i = 0; i < c.content.length; i++) if (i === lastParaIdx && paraId !== void 0) {
+			const buf = [];
+			emitBlock(buf, c.content[i], losses, state, scope);
+			inner.push(injectParaId(buf.join(""), paraId));
+		} else emitBlock(inner, c.content[i], losses, state, scope);
+		if (paraId !== void 0) paraIds.set(id, paraId);
+		const attrs = `w:id="${escapeAttr(id)}"` + (c.author !== void 0 ? ` w:author="${escapeAttr(c.author)}"` : "") + (c.date !== void 0 ? ` w:date="${escapeAttr(c.date)}"` : "") + (c.initials !== void 0 ? ` w:initials="${escapeAttr(c.initials)}"` : "");
+		commentXmls.push(`<w:comment ${attrs}>${inner.join("") || "<w:p/>"}</w:comment>`);
+	}
+	const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:comments xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w14="${W14_NS}">` + commentXmls.join("") + "</w:comments>";
+	extraParts.push({
+		path: COMMENTS_PART,
+		data: encoder.encode(xml),
+		contentType: COMMENTS_CONTENT_TYPE
+	});
+	if (scope.rels.length > 0) extraPartRels.push({
+		sourcePart: COMMENTS_PART,
+		relationships: scope.rels
+	});
+	docScope.rels.push({
+		id: `rId${++docScope.relSeq}`,
+		type: REL_COMMENTS,
+		target: "comments.xml",
+		targetMode: "Internal"
+	});
+	return paraIds;
+}
+function emitCommentsExtended(comments, paraIds, docScope, extraParts) {
+	if (!comments || paraIds.size === 0) return;
+	if (![...comments].some(([id, c]) => paraIds.has(id) && (c.parentId !== void 0 && paraIds.has(c.parentId) || c.done === true))) return;
+	const rows = [];
+	for (const [id, c] of comments) {
+		const pid = paraIds.get(id);
+		if (pid === void 0) continue;
+		const parentPid = c.parentId !== void 0 ? paraIds.get(c.parentId) : void 0;
+		rows.push(`<w15:commentEx w15:paraId="${pid}"` + (parentPid !== void 0 ? ` w15:paraIdParent="${parentPid}"` : "") + ` w15:done="${c.done === true ? "1" : "0"}"/>`);
+	}
+	const xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w15:commentsEx xmlns:w15="${W15_NS}">` + rows.join("") + "</w15:commentsEx>";
+	extraParts.push({
+		path: COMMENTS_EXTENDED_PART,
+		data: encoder.encode(xml),
+		contentType: COMMENTS_EXTENDED_CONTENT_TYPE
+	});
+	docScope.rels.push({
+		id: `rId${++docScope.relSeq}`,
+		type: REL_COMMENTS_EXTENDED,
+		target: "commentsExtended.xml",
+		targetMode: "Internal"
+	});
+}
 function emitHeadersFooters(flow, section, state, docScope, extraParts, extraPartRels, hfCache, losses) {
 	const refs = {
 		headers: [],
@@ -494,7 +576,7 @@ function cellMarginsXml(tag, margins) {
 	return inner ? `<${tag}>${inner}</${tag}>` : "";
 }
 function paragraphXml(p, state, scope, closingSectPr) {
-	const visible = p.runs.filter((run) => !run.listMarker && (run.math !== void 0 || run.text !== "" || run.inlineImage !== void 0 || run.pageBreak || run.footnoteRef !== void 0 || run.endnoteRef !== void 0 || run.noteNumber === true || run.href !== void 0 || run.anchor !== void 0));
+	const visible = p.runs.filter((run) => !run.listMarker && (run.math !== void 0 || run.text !== "" || run.inlineImage !== void 0 || run.pageBreak || run.footnoteRef !== void 0 || run.endnoteRef !== void 0 || run.noteNumber === true || run.commentRef !== void 0 || run.href !== void 0 || run.anchor !== void 0));
 	const inner = [];
 	let i = 0;
 	while (i < visible.length) {
@@ -543,6 +625,7 @@ function runXml(run, state, scope) {
 	if (run.footnoteRef !== void 0) return `<w:r>${rPr}<w:footnoteReference w:id="${escapeAttr(run.footnoteRef)}"/></w:r>`;
 	if (run.endnoteRef !== void 0) return `<w:r>${rPr}<w:endnoteReference w:id="${escapeAttr(run.endnoteRef)}"/></w:r>`;
 	if (run.noteNumber) return `<w:r>${rPr}<${scope.noteKind === "endnote" ? "w:endnoteRef" : "w:footnoteRef"}/></w:r>`;
+	if (run.commentRef !== void 0) return `<w:r>${rPr}<w:commentReference w:id="${escapeAttr(run.commentRef)}"/></w:r>`;
 	const brk = run.pageBreak ? "<w:br w:type=\"page\"/>" : "";
 	if (run.text === "") return brk ? `<w:r>${rPr}${brk}</w:r>` : "";
 	return `<w:r>${rPr}<w:t xml:space="preserve">${escapeXml(run.text)}</w:t>${brk}</w:r>`;

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

@@ -31,6 +31,13 @@ export type DrawingContent = {
     readonly height: Pt;
     readonly altText?: string;
     readonly float?: FloatAnchor;
+} | {
+    readonly kind: 'diagram';
+    readonly dmRelId: string;
+    readonly widthEmu: number;
+    readonly heightEmu: number;
+    readonly altText?: string;
+    readonly float?: FloatAnchor;
 };
 export declare function resolveMc(altContent: PoNode): ReadonlyArray<PoNode>;
 export declare function expandMcChildren(children: ReadonlyArray<PoNode>): Array<PoNode>;

package/dist/esm/word/drawing-parser.js

@@ -4,6 +4,7 @@ import { resolveColorNode } from "../core/drawingml/colors.js";
 //#region src/word/drawing-parser.ts
 var WPS_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
 var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+var DIAGRAM_URI = "http://schemas.openxmlformats.org/drawingml/2006/diagram";
 var UNDERSTOOD_NS = new Set(["wps"]);
 function parseFloatAnchor(anchor) {
 	if (!poIs(anchor, "wp:anchor")) return void 0;
@@ -104,6 +105,18 @@ function parseDrawing(drawing, resolveColor, parseBody) {
 		};
 		return null;
 	}
+	if (graphicData && uri === DIAGRAM_URI) {
+		const relIds = poFindDescendant(graphicData, "dgm:relIds");
+		const dmRelId = relIds ? poAttr(relIds, "dm") : void 0;
+		if (dmRelId && extentCx !== void 0 && extentCy !== void 0) return {
+			kind: "diagram",
+			dmRelId,
+			widthEmu: extentCx,
+			heightEmu: extentCy,
+			...alt
+		};
+		return null;
+	}
 	const blip = poFindDescendant(anchor, "a:blip");
 	const rId = blip ? poAttr(blip, "embed") : void 0;
 	if (extentCx !== void 0 && extentCy !== void 0 && rId) return {

package/dist/esm/word/index.d.ts

@@ -1,6 +1,7 @@
 export type { HyperlinkResolver, ImageResolver, ParseContext } from './document-parser.js';
+export type { CommentExtension } from './document-parser.js';
 export { extractParagraphs } from './text-extractor.js';
-export { parseDocument, parseBodyElements, parseSection, parseSections, parseHeaderFooter, parseNotes, EMPTY_SECTION, } from './document-parser.js';
+export { parseDocument, parseBodyElements, parseSection, parseSections, parseHeaderFooter, parseNotes, parseComments, parseCommentThreads, parseCommentsExtended, parsePeople, applyAuthorIds, EMPTY_SECTION, } from './document-parser.js';
 export { parseRunProperties } from './run-properties.js';
 export { parseParagraphProperties } from './paragraph-properties.js';
 export { parseStyles } from './styles-parser.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Ream — convert DOCX, XLSX, PPTX and PDF to PDF, SVG, HTML, DOCX and XLSX, built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
   "license": "MIT",
   "author": "Alex Krassavin <info@reamkit.dev>",