@stll/folio-core 0.28.1 → 0.29.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -4,7 +4,9 @@ import { OUTLINE_STYLE_CSS_ALIASES } from "../../types/documentEnumValues.js";
 import { pixelsToEmu } from "../../utils/units.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
+import { expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
 import { applyRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
+import { resolveNumberedRefFields } from "../numberedRefFields.js";
 import { directionToBidi } from "../paragraphDirection.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
@@ -198,12 +200,33 @@ function mapSuggestionStrippedNode(node) {
 function stripSuggestedProvenance(doc) {
 	return mapSuggestionStrippedNode(doc) ?? doc;
 }
-/**
-* Extract block content (paragraphs, tables, block SDTs) from a ProseMirror
-* document.
-*/
-function extractBlocks(inputDoc) {
-	const pmDoc = stripSuggestedProvenance(inputDoc);
+function materializeNumberedRefValues(doc) {
+	const results = resolveNumberedRefFields(doc);
+	if (results.size === 0) return doc;
+	const visit = (node) => {
+		if (node.type.name === "field" || node.type.name === "structuredField") {
+			const displayText = results.get(node);
+			if (displayText !== void 0) return node.type.create({
+				...node.attrs,
+				displayText
+			}, node.content, node.marks);
+			return node;
+		}
+		if (node.childCount === 0) return node;
+		const children = [];
+		let changed = false;
+		node.forEach((child) => {
+			const mappedChild = visit(child);
+			children.push(mappedChild);
+			changed ||= mappedChild !== child;
+		});
+		return changed ? node.copy(Fragment.fromArray(children)) : node;
+	};
+	return visit(doc);
+}
+function extractBlocks(inputDoc, refResolution = "resolve") {
+	const strippedDoc = stripSuggestedProvenance(inputDoc);
+	const pmDoc = refResolution === "resolve" ? materializeNumberedRefValues(strippedDoc) : strippedDoc;
 	const blocks = [];
 	const textBoxAnchorMarkers = /* @__PURE__ */ new Map();
 	const documentCounts = buildDocumentTrackedChangeCounts(pmDoc);
@@ -271,7 +294,7 @@ function convertPMBlockSdt(node) {
 	if (attrs.rawEndPropertiesXml) properties.rawEndPropertiesXml = attrs.rawEndPropertiesXml;
 	if (attrs.rawSdtChildrenBeforeContent) properties.rawSdtChildrenBeforeContent = attrs.rawSdtChildrenBeforeContent;
 	if (attrs.rawSdtChildrenAfterContent) properties.rawSdtChildrenAfterContent = attrs.rawSdtChildrenAfterContent;
-	const extracted = extractBlocks(node.type.schema.node("doc", null, node.content));
+	const extracted = extractBlocks(node.type.schema.node("doc", null, node.content), "inherit");
 	return {
 		type: "blockSdt",
 		properties,
@@ -391,6 +414,7 @@ function editTextBoxAnchorInContent(content, marker, replacement) {
 		}
 		let nestedContent;
 		if (item?.type === "hyperlink") nestedContent = item.children;
+		else if (item?.type === "simpleField") nestedContent = item.content;
 		else if (item?.type === "inlineSdt" || item?.type === "insertion" || item?.type === "deletion" || item?.type === "moveFrom" || item?.type === "moveTo") nestedContent = item.content;
 		if (!nestedContent) continue;
 		const hadContent = nestedContent.length > 0;
@@ -640,12 +664,28 @@ function paragraphAttrsToFormatting(attrs) {
 	if (attrs.suppressAutoHyphens != null) f.suppressAutoHyphens = attrs.suppressAutoHyphens;
 	return f;
 }
-/**
-* Extract paragraph content (runs, hyperlinks) from ProseMirror paragraph
-*
-* Coalesces consecutive text with the same marks into single Runs
-* for efficient DOCX representation.
-*/
+function createTrackedRunWrapper(type, info, child) {
+	if (type === "insertion") return {
+		type,
+		info,
+		content: [child]
+	};
+	if (type === "deletion") return {
+		type,
+		info,
+		content: [child]
+	};
+	if (type === "moveFrom") return {
+		type,
+		info,
+		content: [child]
+	};
+	return {
+		type,
+		info,
+		content: [child]
+	};
+}
 function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false) {
 	const content = [];
 	const inheritedFormatting = paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph).defaultTextFormatting ?? void 0 : void 0;
@@ -659,6 +699,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	let currentMarksKey = null;
 	let currentHyperlink = null;
 	let currentHyperlinkKey = null;
+	let currentTrackedChange;
 	const openedComments = /* @__PURE__ */ new Set();
 	const commentLastOffset = /* @__PURE__ */ new Map();
 	paragraph.forEach((node, offset) => {
@@ -687,6 +728,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		for (const commentId of nodeCommentIds) if (!openedComments.has(commentId)) toOpen.push(commentId);
 		if (toClose.length === 0 && toOpen.length === 0) return;
 		flushCurrentInline();
+		currentTrackedChange = void 0;
 		for (const commentId of toClose.toSorted((a, b) => a - b)) {
 			content.push({
 				type: "commentRangeEnd",
@@ -708,6 +750,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			if (!item || item.attrs.offset > offset) break;
 			nextEmptyHyperlink += 1;
 			flushCurrentInline();
+			currentTrackedChange = void 0;
 			content.push(createEmptyHyperlink(item.attrs));
 		}
 	};
@@ -722,8 +765,10 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
 		const insertionMark = node.marks.find((m) => m.type.name === "insertion");
 		const deletionMark = node.marks.find((m) => m.type.name === "deletion");
+		if (!insertionMark && !deletionMark) currentTrackedChange = void 0;
 		if (node.type.name === "textBoxAnchor") {
 			flushCurrentInline();
+			currentTrackedChange = void 0;
 			if (!textBoxAnchorMarkers) return;
 			const { anchorId } = expectTextBoxAnchorAttrs(node);
 			const marker = {
@@ -766,42 +811,51 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			if (!changeMark) return;
 			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
 			const otherMarks = node.marks.filter((m) => m.type.name !== "insertion" && m.type.name !== "deletion");
-			const run = createTrackedChangeRun({
-				inheritedFormatting,
-				marks: otherMarks,
-				node
-			});
-			if (!run) return;
-			const trackedContent = linkMark ? {
-				...createHyperlink(linkMark),
-				children: [run]
-			} : run;
 			const info = {
 				id: changeAttrs.revisionId,
 				author: changeAttrs.author || "Unknown"
 			};
 			if (changeAttrs.date) info.date = changeAttrs.date;
 			if (changeAttrs.initials) info.initials = changeAttrs.initials;
-			if (insertionMark) if (changeAttrs.moveKind === "moveTo") content.push({
-				type: "moveTo",
-				info,
-				content: [trackedContent]
-			});
-			else content.push({
-				type: "insertion",
-				info,
-				content: [trackedContent]
-			});
-			else if (changeAttrs.moveKind === "moveFrom") content.push({
-				type: "moveFrom",
-				info,
-				content: [trackedContent]
-			});
-			else content.push({
-				type: "deletion",
-				info,
-				content: [trackedContent]
+			let type;
+			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
+			const trackedChangeKey = `${type}:${JSON.stringify(info)}`;
+			if (linkMark) {
+				const linkKey = getLinkKey(linkMark);
+				if (!currentTrackedChange || currentTrackedChange.key !== trackedChangeKey || currentTrackedChange.hyperlinkKey !== linkKey) {
+					const hyperlink = createHyperlink(linkMark);
+					const wrapper = createTrackedRunWrapper(type, info, hyperlink);
+					content.push(wrapper);
+					currentTrackedChange = {
+						key: trackedChangeKey,
+						hyperlink,
+						hyperlinkKey: linkKey
+					};
+				}
+				if (node.type.name === "bookmarkBoundary") {
+					addNodeToHyperlink({
+						hyperlink: currentTrackedChange.hyperlink,
+						inheritedFormatting,
+						node
+					});
+					return;
+				}
+				const run = createTrackedChangeRun({
+					inheritedFormatting,
+					marks: otherMarks,
+					node
+				});
+				if (run) currentTrackedChange.hyperlink.children.push(run);
+				return;
+			}
+			currentTrackedChange = void 0;
+			const run = createTrackedChangeRun({
+				inheritedFormatting,
+				marks: otherMarks,
+				node
 			});
+			if (run) content.push(createTrackedRunWrapper(type, info, run));
 			return;
 		}
 		if (noteRefMark && !linkMark) {
@@ -824,7 +878,21 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			return;
 		}
 		if (currentHyperlink) flushCurrentInline();
-		if (node.isText) {
+		if (node.type.name === "bookmarkBoundary") {
+			flushCurrentInline();
+			const attrs = expectBookmarkBoundaryAttrs(node);
+			if (attrs.type === "start") content.push({
+				type: "bookmarkStart",
+				id: attrs.id,
+				name: attrs.name,
+				...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
+				...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+			});
+			else content.push({
+				type: "bookmarkEnd",
+				id: attrs.id
+			});
+		} else if (node.isText) {
 			const marksKey = getMarksKey(node.marks);
 			if (currentRun && currentMarksKey === marksKey) appendTextToRun(currentRun, node.text || "");
 			else {
@@ -854,9 +922,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		} else if (node.type.name === "renderedPageBreak") {
 			flushCurrentInline();
 			content.push(createRenderedPageBreakRun());
-		} else if (node.type.name === "field") {
+		} else if (node.type.name === "field" || node.type.name === "structuredField") {
 			flushCurrentInline();
-			content.push(createFieldFromNode(node, node.marks));
+			content.push(createFieldFromNode(node, {
+				marks: node.marks,
+				textBoxAnchorMarkers
+			}));
 		} else if (node.type.name === "sdt") {
 			flushCurrentInline();
 			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers));
@@ -1005,6 +1076,21 @@ function createHyperlink(linkMark) {
 	return hyperlink;
 }
 function addNodeToHyperlink({ hyperlink, inheritedFormatting, node }) {
+	if (node.type.name === "bookmarkBoundary") {
+		const attrs = expectBookmarkBoundaryAttrs(node);
+		if (attrs.type === "start") hyperlink.children.push({
+			type: "bookmarkStart",
+			id: attrs.id,
+			name: attrs.name,
+			...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
+			...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+		});
+		else hyperlink.children.push({
+			type: "bookmarkEnd",
+			id: attrs.id
+		});
+		return;
+	}
 	const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
 	if (noteRefMark) {
 		hyperlink.children.push(createNoteReferenceRun(noteRefMark, node.marks));
@@ -1151,13 +1237,10 @@ function createTabRun(node, marks) {
 	if (formatting) run.formatting = formatting;
 	return run;
 }
-/**
-* Create a SimpleField or ComplexField from a PM field node
-*/
-function createFieldFromNode(node, marks) {
+function createFieldFromNode(node, { marks, textBoxAnchorMarkers }) {
 	const attrs = expectFieldAttrs(node);
 	const formatting = marks && marks.length > 0 ? marksToTextFormatting(marks) : void 0;
-	let displayText = attrs.displayText || "";
+	let displayText = attrs.displayText ?? "";
 	if (!displayText) switch (attrs.fieldType) {
 		case "PAGE":
 			displayText = "1";
@@ -1177,13 +1260,15 @@ function createFieldFromNode(node, marks) {
 		}],
 		...formatting && Object.keys(formatting).length > 0 ? { formatting } : {}
 	};
+	const extractedContent = extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers).filter((content) => content.type === "run" || content.type === "hyperlink");
+	const fieldContent = extractedContent.length > 0 ? synchronizeFieldDisplayText(extractedContent, displayText, displayRun) : [];
 	if (attrs.fieldKind === "complex") {
 		const complex = {
 			type: "complexField",
 			instruction: attrs.instruction,
 			fieldType: attrs.fieldType,
 			fieldCode: [],
-			fieldResult: [displayRun]
+			fieldResult: fieldContent.length > 0 ? fieldContent.filter((content) => content.type === "run") : [displayRun]
 		};
 		if (attrs.fldLock) complex.fldLock = true;
 		if (attrs.dirty) complex.dirty = true;
@@ -1193,12 +1278,45 @@ function createFieldFromNode(node, marks) {
 		type: "simpleField",
 		instruction: attrs.instruction,
 		fieldType: attrs.fieldType,
-		content: [displayRun]
+		content: fieldContent.length > 0 ? fieldContent : [displayRun]
 	};
 	if (attrs.fldLock) simple.fldLock = true;
 	if (attrs.dirty) simple.dirty = true;
 	return simple;
 }
+const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
+	let currentText = "";
+	const visitRuns = (visit) => {
+		for (const child of content) {
+			if (child.type === "run") {
+				visit(child);
+				continue;
+			}
+			for (const hyperlinkChild of child.children) if (hyperlinkChild.type === "run") visit(hyperlinkChild);
+		}
+	};
+	visitRuns((run) => {
+		for (const runContent of run.content) if (runContent.type === "text") currentText += runContent.text;
+	});
+	if (currentText === displayText) return content;
+	let replacedText = false;
+	visitRuns((run) => {
+		for (const runContent of run.content) {
+			if (runContent.type !== "text") continue;
+			runContent.text = replacedText ? "" : displayText;
+			replacedText = true;
+		}
+	});
+	if (replacedText) return content;
+	const hyperlink = content.find((child) => child.type === "hyperlink");
+	if (!hyperlink) {
+		content.push(fallbackRun);
+		return content;
+	}
+	const firstEnd = hyperlink.children.findIndex((child) => child.type === "bookmarkEnd");
+	hyperlink.children.splice(firstEnd < 0 ? hyperlink.children.length : firstEnd, 0, fallbackRun);
+	return content;
+};
 /**
 * Create a MathEquation from a PM math node
 */