reamkit 1.10.0 → 1.12.0

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.10.0",
+  "version": "1.12.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>",