@stll/folio-core 0.52.0 → 0.53.0

package/dist/prosemirror/commands/resolveParagraphProperties.d.ts

@@ -0,0 +1,16 @@
+import { RunStyleResolver } from "../runStyleFormatting.js";
+import { NumberingMap } from "../../docx/numberingParser.js";
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/commands/resolveParagraphProperties.d.ts
+type ResolveParagraphPropertiesOptions = {
+  node: Node;
+  boundaryCovered: boolean;
+  mode: "accept" | "reject";
+  revisionSet: ReadonlySet<number> | null;
+  styleResolver: RunStyleResolver | null;
+  numbering: NumberingMap | null;
+};
+/** Resolve paragraph and section property records before resolving their inline content. */
+declare const resolveParagraphChangeAttrs: ({ node, boundaryCovered, mode, revisionSet, styleResolver, numbering }: ResolveParagraphPropertiesOptions) => Record<string, unknown> | null;
+//#endregion
+export { resolveParagraphChangeAttrs };

package/dist/prosemirror/commands/resolveParagraphProperties.js

@@ -0,0 +1,59 @@
+import { expectParagraphAttrs } from "../attrs/index.js";
+import { resolveParagraphDefaultTextFormatting } from "../conversion/toProseDoc.js";
+import { rejectedListRenderingPatch } from "../listNumbering.js";
+import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties } from "./propertyChangeScope.js";
+//#region src/prosemirror/commands/resolveParagraphProperties.ts
+/** Resolve paragraph and section property records before resolving their inline content. */
+const resolveParagraphChangeAttrs = ({ node, boundaryCovered, mode, revisionSet, styleResolver, numbering }) => {
+	let nextAttrs = null;
+	const propertyChanges = expectParagraphAttrs(node)._propertyChanges;
+	if (Array.isArray(propertyChanges) && propertyChanges.length > 0 && boundaryCovered) {
+		const matchesPropertyChange = (change) => revisionSet === null || revisionSet.has(change.info.id);
+		if (propertyChanges.some(matchesPropertyChange)) {
+			const rejection = mode === "reject" ? removeParagraphPropertyChanges(propertyChanges, matchesPropertyChange) : null;
+			let remaining;
+			if (rejection === null) remaining = propertyChanges.filter((change) => !matchesPropertyChange(change));
+			else if (rejection.type === "unchanged") remaining = propertyChanges;
+			else remaining = rejection.remaining;
+			nextAttrs = {
+				...node.attrs,
+				_propertyChanges: remaining.length > 0 ? remaining : null
+			};
+			if (rejection?.type === "restore-previous") {
+				const inheritedAlignment = expectParagraphAttrs(node).alignmentFromStyle;
+				let previousFormattingFromStyle;
+				if (styleResolver) previousFormattingFromStyle = styleResolver.resolveParagraphStyle(rejection.previousFormatting?.styleId).paragraphFormatting;
+				else if (inheritedAlignment !== void 0) previousFormattingFromStyle = { alignment: inheritedAlignment };
+				Object.assign(nextAttrs, paragraphRejectAttrPatch(rejection.previousFormatting, previousFormattingFromStyle), rejectedListRenderingPatch({
+					current: expectParagraphAttrs(node),
+					previousFormatting: rejection.previousFormatting,
+					numbering
+				}));
+				const restoredFormatting = paragraphRejectOriginalFormatting(rejection.previousFormatting, node.attrs["_originalFormatting"]);
+				nextAttrs["_originalFormatting"] = restoredFormatting;
+				if (styleResolver) nextAttrs["defaultTextFormatting"] = resolveParagraphDefaultTextFormatting(rejection.previousFormatting?.styleId, restoredFormatting ?? void 0, styleResolver) ?? null;
+			}
+		}
+	}
+	const sectionProperties = expectParagraphAttrs(node)._sectionProperties;
+	const sectionChanges = sectionProperties?.propertyChanges;
+	if (sectionProperties && Array.isArray(sectionChanges) && sectionChanges.length > 0 && boundaryCovered) {
+		const matches = sectionChanges.filter((c) => revisionSet === null || c.info && revisionSet.has(c.info.id));
+		if (matches.length > 0) {
+			const remaining = sectionChanges.filter((c) => revisionSet !== null && (!c.info || !revisionSet.has(c.info.id)));
+			let restored = { ...sectionProperties };
+			if (mode === "reject") for (const change of matches.toReversed()) restored = sectionRejectProperties({
+				live: restored,
+				previousProperties: change.previousProperties,
+				previousReferences: change.previousReferences
+			});
+			delete restored.propertyChanges;
+			if (remaining.length > 0) restored.propertyChanges = remaining;
+			nextAttrs = nextAttrs ?? { ...node.attrs };
+			nextAttrs["_sectionProperties"] = restored;
+		}
+	}
+	return nextAttrs;
+};
+//#endregion
+export { resolveParagraphChangeAttrs };

package/dist/prosemirror/commands/sectionBreak.js

@@ -1,3 +1,4 @@
+import { markSectionBreakRemoval } from "../extensions/features/ParagraphChangeTrackerExtension.js";
 import { mintSectionProperties, sectionPropertiesOf } from "../sectionCarrier.js";
 import { TextSelection } from "prosemirror-state";
 //#region src/prosemirror/commands/sectionBreak.ts
@@ -150,7 +151,7 @@ const rewriteSelectedSectionRecords = (rewrite) => (state, dispatch) => {
 			const paragraph = transaction.doc.nodeAt(position);
 			if (paragraph) transaction.setNodeMarkup(position, void 0, withSectionProperties(paragraph.attrs, properties));
 		}
-		dispatch(transaction.scrollIntoView());
+		dispatch(markSectionBreakRemoval(transaction, state.doc).scrollIntoView());
 	}
 	return true;
 };

package/dist/prosemirror/commands/tableCellMergeResolution.d.ts

@@ -1,8 +1,14 @@
-import { Transaction } from "prosemirror-state";
+import { document_d_exports } from "../../types/document.js";
+import { DecodedTableCellParagraphSourcePayload } from "../../docx/paragraphPropertySource.js";
 import { Node } from "prosemirror-model";
+import { Transaction } from "prosemirror-state";
 //#region src/prosemirror/commands/tableCellMergeResolution.d.ts
+declare const tableCellContinuationPayload: (node: Node) => DecodedTableCellParagraphSourcePayload | null;
 declare const hasMatchingCollapsedTableCellMerge: (node: Node, revisionSet: Set<number> | null) => boolean;
 declare const resolveVisibleTableCellMerge: (tr: Transaction, cellPos: number, mode: "accept" | "reject") => boolean;
+declare const tableCellContinuationCells: (cell: Node, rowspan: number) => document_d_exports.TableCell[];
+declare const tableCellContinuationFromNode: (cell: Node) => document_d_exports.TableCell;
 declare const resolveCollapsedTableCellMerge: (tr: Transaction, cellPos: number, mode: "accept" | "reject", revisionSet: Set<number> | null) => boolean;
+declare const createRestoredTableCell: (origin: Node, source: document_d_exports.TableCell) => Node | null;
 //#endregion
-export { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge };
+export { createRestoredTableCell, hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge, tableCellContinuationCells, tableCellContinuationFromNode, tableCellContinuationPayload };

package/dist/prosemirror/commands/tableCellMergeResolution.js

@@ -185,4 +185,4 @@ const createRestoredTableCell = (origin, source) => {
 	return Result.try(() => origin.type.schema.nodeFromJSON(restored.toJSON())).unwrapOr(null);
 };
 //#endregion
-export { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge };
+export { createRestoredTableCell, hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge, tableCellContinuationCells, tableCellContinuationFromNode, tableCellContinuationPayload };

package/dist/prosemirror/contentControlRevisions.d.ts

@@ -1,5 +1,5 @@
-import { Transaction } from "prosemirror-state";
 import { MarkType, Node } from "prosemirror-model";
+import { Transaction } from "prosemirror-state";
 //#region src/prosemirror/contentControlRevisions.d.ts
 declare const ENCLOSING_REVISION_IDS_ATTR = "_docxEnclosingRevisionIds";
 /** The revisions whose element encloses `control`. */

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -17,7 +17,7 @@ import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js"
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels, pixelsToEmu } from "../../utils/units.js";
 import { unchangedAlternateContentXml } from "../alternateContentAttrs.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
+import { expectBlockCustomXmlAttrs, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { readAuthoredTransform } from "../authoredTransformAttrs.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
 import { bookmarkMarkerFromAttrs, expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
@@ -30,7 +30,8 @@ import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
 import "../extensions/nodes/MoveRangeBoundaryExtension.js";
 import "../extensions/nodes/RangeAnchorExtension.js";
 import { inlineWrapperMember, inlineWrapperStackKey } from "../inlineWrapperStack.js";
-import { listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
+import { completeNumberingForDoc } from "../listInstanceReferences.js";
+import { hasListRendering, listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
 import { expectMoveRangeBoundaryAttrs } from "../moveRangeBoundaryAttrs.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
@@ -280,18 +281,23 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	if (baseDocument?.package.document.finalSectionProperties) documentBody.finalSectionProperties = baseDocument.package.document.finalSectionProperties;
 	if (baseDocument?.package.document.sections) documentBody.sections = baseDocument.package.document.sections;
 	if (baseDocument?.package.document.comments) documentBody.comments = baseDocument.package.document.comments;
+	const numbering = completeNumberingForDoc(baseDocument?.package.numbering, pmDoc);
 	if (baseDocument) {
 		const updatedDocument = {
 			...baseDocument,
 			package: {
 				...baseDocument.package,
-				document: documentBody
+				document: documentBody,
+				...numbering ? { numbering } : {}
 			}
 		};
 		copyDocumentParagraphPropertySourceContract(updatedDocument, baseDocument);
 		return updatedDocument;
 	}
-	return { package: { document: documentBody } };
+	return { package: {
+		document: documentBody,
+		...numbering ? { numbering } : {}
+	} };
 }
 const isSuggestedMark = (mark) => mark.attrs["provenance"] === "suggested";
 const hasSuggestedInsertion = (marks) => marks.some((mark) => mark.type.name === "insertion" && isSuggestedMark(mark));
@@ -341,12 +347,30 @@ function stripSuggestedInlineMarks(marks, { baseParagraphFormatting, inheritedFo
 	}
 	return next;
 }
+/** A paragraph's attrs without its suggested property changes, or `null` when it has none. */
+function stripSuggestedParagraphPropertyChanges(node) {
+	const propertyChanges = expectParagraphAttrs(node)._propertyChanges;
+	if (!Array.isArray(propertyChanges)) return null;
+	if (!propertyChanges.some(({ info }) => info.provenance === "suggested")) return null;
+	const removal = removeParagraphPropertyChanges(propertyChanges, ({ info }) => info.provenance === "suggested");
+	if (removal.type === "unchanged") return null;
+	const nextAttrs = {
+		...node.attrs,
+		_propertyChanges: removal.remaining.length > 0 ? removal.remaining : null
+	};
+	if (removal.type === "restore-previous") {
+		Object.assign(nextAttrs, paragraphRejectAttrPatch(removal.previousFormatting));
+		nextAttrs["_originalFormatting"] = paragraphRejectOriginalFormatting(removal.previousFormatting, nextAttrs["_originalFormatting"]);
+	}
+	return nextAttrs;
+}
 /**
 * Compute the node attrs a block/structural node keeps once its suggested
 * revision markers are neutralized. Returns `null` when nothing changes.
 *
-* - a suggested `trDel` / `cellMarker` (insertion or deletion) is cleared so
-*   the row/cell serializes as though the proposed change never happened;
+* - a suggested `trDel` / `cellMarker` (insertion or deletion) or paragraph
+*   mark revision (`pPrMark`) is cleared so the node serializes as though the
+*   proposed change never happened;
 *   merge markers never carry suggestion provenance (structurally excluded);
 * - suggested INSERT markers are handled by the caller, which drops the whole
 *   node instead of clearing an attr.
@@ -356,20 +380,13 @@ function stripSuggestedInlineMarks(marks, { baseParagraphFormatting, inheritedFo
 function stripSuggestedNodeAttrs(node) {
 	const name = node.type.name;
 	if (name === "paragraph") {
-		const propertyChanges = expectParagraphAttrs(node)._propertyChanges;
-		if (!Array.isArray(propertyChanges)) return null;
-		if (!propertyChanges.some(({ info }) => info.provenance === "suggested")) return null;
-		const removal = removeParagraphPropertyChanges(propertyChanges, ({ info }) => info.provenance === "suggested");
-		if (removal.type === "unchanged") return null;
-		const nextAttrs = {
-			...node.attrs,
-			_propertyChanges: removal.remaining.length > 0 ? removal.remaining : null
+		const stripped = stripSuggestedParagraphPropertyChanges(node);
+		const markInfo = expectParagraphAttrs(node).pPrMark?.info;
+		if (!(typeof markInfo === "object" && markInfo !== null && "provenance" in markInfo && markInfo.provenance === "suggested")) return stripped;
+		return {
+			...stripped ?? node.attrs,
+			pPrMark: null
 		};
-		if (removal.type === "restore-previous") {
-			Object.assign(nextAttrs, paragraphRejectAttrPatch(removal.previousFormatting));
-			nextAttrs["_originalFormatting"] = paragraphRejectOriginalFormatting(removal.previousFormatting, nextAttrs["_originalFormatting"]);
-		}
-		return nextAttrs;
 	}
 	if (name === "tableRow") {
 		const rowAttrs = expectTableRowAttrs(node);
@@ -536,10 +553,15 @@ function extractBlocks(inputDoc, refResolution = "resolve", styleResolver = null
 			if (pendingPageBreaks > 0 && !appendPendingPageBreaksToPreviousParagraph()) flushPendingPageBreaks();
 			blocks.push(convertPMBlockSdt(node, styleResolver));
 			previousStandaloneTextBox = null;
+		} else if (node.type.name === "blockCustomXml") {
+			blocks.push(convertPMBlockCustomXml(node, styleResolver));
+			previousStandaloneTextBox = null;
 		} else if (node.type.name === "preservedBlock") {
+			const { xml, readerText } = expectPreservedBlockAttrs(node);
 			blocks.push({
 				type: "preservedBlock",
-				xml: expectPreservedBlockAttrs(node).xml
+				xml,
+				...readerText === void 0 ? {} : { readerText }
 			});
 			previousStandaloneTextBox = null;
 		} else if (node.type.name === "blockBookmarkBoundary") {
@@ -669,6 +691,16 @@ function convertPMBlockSdt(node, styleResolver) {
 		content: attrs._originallyEmpty === true && isStillSyntheticFiller(extracted) ? [] : extracted
 	};
 }
+function convertPMBlockCustomXml(node, styleResolver) {
+	const { openingXml, closingXml, _originallyEmpty } = expectBlockCustomXmlAttrs(node);
+	const extracted = extractBlocks(node.type.schema.node("doc", null, node.content), "inherit", styleResolver);
+	return {
+		type: "blockCustomXml",
+		openingXml,
+		closingXml,
+		content: _originallyEmpty === true && isStillSyntheticFiller(extracted) ? [] : extracted
+	};
+}
 function isStillSyntheticFiller(blocks) {
 	if (blocks.length !== 1) return false;
 	const block = blocks[0];
@@ -776,7 +808,7 @@ function replaceTextBoxAnchorInBlocks(blocks, marker, textBoxRun) {
 			for (const row of block.rows) for (const cell of row.cells) if (replaceTextBoxAnchorInBlocks(cell.content, marker, textBoxRun)) return true;
 			continue;
 		}
-		if (block.type !== "blockSdt") continue;
+		if (block.type !== "blockSdt" && block.type !== "blockCustomXml") continue;
 		if (replaceTextBoxAnchorInBlocks(block.content, marker, textBoxRun)) return true;
 	}
 	return false;
@@ -845,7 +877,7 @@ function removeTextBoxAnchorFromBlocks(blocks, marker) {
 			for (const row of block.rows) for (const cell of row.cells) if (removeTextBoxAnchorFromBlocks(cell.content, marker)) return true;
 			continue;
 		}
-		if (block.type !== "blockSdt") continue;
+		if (block.type !== "blockSdt" && block.type !== "blockCustomXml") continue;
 		if (removeTextBoxAnchorFromBlocks(block.content, marker)) return true;
 	}
 	return false;
@@ -859,7 +891,7 @@ function removeTextBoxAnchorFromBlocks(blocks, marker) {
 function listRenderingFromAttrs(attrs) {
 	const numId = paragraphNumberingReferenceId$1(attrs.numPr);
 	if (numId === void 0) return;
-	if (!(attrs.listMarker != null || attrs.listIsBullet || attrs.listNumFmt != null)) return;
+	if (!hasListRendering(attrs)) return;
 	return listRenderingFromAttrs$1({
 		attrs,
 		numId
@@ -989,6 +1021,35 @@ function assignBooleanToggle(result, attrs, orig, key) {
 	if (value === void 0) Reflect.deleteProperty(result, key);
 	else result[key] = value;
 }
+const PARAGRAPH_INDENTATION_VALUE_FIELDS = [
+	"indentLeft",
+	"indentRight",
+	"indentFirstLine"
+];
+/**
+* `w:ind` as the paragraph states it now.
+*
+* An indentation command edits the attrs and leaves `_originalFormatting`
+* alone, so a paragraph that arrived with any `w:pPr` of its own saved its
+* source indentation whatever the editor showed. A field the source stated is
+* written at its current value; one it did not is written only when the style
+* cascade does not already supply that value, as for a paragraph without
+* `_originalFormatting`.
+*/
+function assignParagraphIndentation(result, attrs, orig) {
+	let changed = false;
+	for (const key of PARAGRAPH_INDENTATION_VALUE_FIELDS) {
+		const value = authoredParagraphValue(key, attrs[key] ?? void 0, orig, attrs._resolvedFormatting);
+		if (value === (orig[key] ?? void 0)) continue;
+		changed = true;
+		if (value === void 0) Reflect.deleteProperty(result, key);
+		else result[key] = value;
+	}
+	const hanging = result.indentFirstLine !== void 0 && attrs.hangingIndent === true;
+	if (!changed && hanging === (orig.hangingIndent === true)) return;
+	if (hanging) result.hangingIndent = true;
+	else Reflect.deleteProperty(result, "hangingIndent");
+}
 function paragraphAttrsToFormatting(attrs) {
 	const directAlignment = directParagraphAlignment(attrs);
 	const directSpacing = directParagraphSpacing(attrs);
@@ -1042,6 +1103,7 @@ function paragraphAttrsToFormatting(attrs) {
 		}
 		if (attrs.styleId !== (orig.styleId ?? void 0)) if (attrs.styleId) result.styleId = attrs.styleId;
 		else delete result.styleId;
+		assignParagraphIndentation(result, attrs, orig);
 		assignBooleanToggle(result, attrs, orig, "pageBreakBefore");
 		assignBooleanToggle(result, attrs, orig, "widowControl");
 		assignBooleanToggle(result, attrs, orig, "keepNext");
@@ -1217,6 +1279,21 @@ const nestRevisionAwareInlineWrappers = (items, stack, revisionOuterWrapperCount
 	return nested;
 };
 const sameRevisionLayer = (left, right) => left.type === right.type && left.revisionId === right.revisionId && left.author === right.author && left.date === right.date && left.utcDate === right.utcDate && left.initials === right.initials && left.outerWrapperCount === right.outerWrapperCount;
+/** The deletion's ancestor path, with the insertion it sits in as the outermost layer. */
+const enclosingInsertionAncestors = ({ insertionMark, ancestors, node }) => {
+	if (!insertionMark) return ancestors;
+	const attrs = expectTrackedChangeMarkAttrs(insertionMark);
+	if (ancestors.some(({ revisionId }) => revisionId === attrs.revisionId)) return ancestors;
+	return [{
+		type: attrs.moveKind === "moveTo" ? "moveTo" : "insertion",
+		revisionId: attrs.revisionId,
+		author: attrs.author || "Unknown",
+		...attrs.date ? { date: attrs.date } : {},
+		...attrs.utcDate ? { utcDate: attrs.utcDate } : {},
+		...attrs.initials ? { initials: attrs.initials } : {},
+		outerWrapperCount: attrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length
+	}, ...ancestors];
+};
 const revisionInfoFromLayer = (layer) => ({
 	id: layer.revisionId,
 	author: layer.author,
@@ -1505,9 +1582,14 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		}
 		if (insertionMark || deletionMark) {
 			flushCurrentInline();
-			const changeMark = insertionMark ?? deletionMark;
+			const changeMark = deletionMark ?? insertionMark;
 			if (!changeMark) return;
 			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
+			const revisionAncestors = enclosingInsertionAncestors({
+				insertionMark: deletionMark ? insertionMark : void 0,
+				ancestors: changeAttrs._docxRevisionAncestors ?? [],
+				node
+			});
 			const otherMarks = node.marks.filter((m) => m.type.name !== "insertion" && m.type.name !== "deletion");
 			const info = {
 				id: changeAttrs.revisionId,
@@ -1520,17 +1602,17 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			};
 			if (changeAttrs.initials) info.initials = changeAttrs.initials;
 			let type;
-			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+			if (changeMark === insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
 			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
 			const outerWrapperCount = changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length;
-			const trackedChangeKey = `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(changeAttrs._docxRevisionAncestors ?? [])}`;
+			const trackedChangeKey = `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(revisionAncestors)}`;
 			if (linkMark) {
 				const linkKey = getLinkKey(linkMark);
 				if (!currentTrackedChange || currentTrackedChange.type !== "hyperlink" || currentTrackedChange.key !== trackedChangeKey || currentTrackedChange.hyperlinkKey !== linkKey) {
 					const hyperlink = createIndexedHyperlink(linkMark);
 					const wrapper = createTrackedRunWrapper(type, info, hyperlink);
 					revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
-					revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
+					revisionAncestorsByWrapper.set(wrapper, revisionAncestors);
 					content.push(wrapper);
 					currentTrackedChange = {
 						type: "hyperlink",
@@ -1565,7 +1647,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			if (!currentTrackedChange || currentTrackedChange.type !== "direct" || currentTrackedChange.key !== trackedChangeKey) {
 				const wrapper = createTrackedRunWrapper(type, info);
 				revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
-				revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
+				revisionAncestorsByWrapper.set(wrapper, revisionAncestors);
 				content.push(wrapper);
 				currentTrackedChange = {
 					type: "direct",
@@ -2255,18 +2337,19 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 	};
 	if (marks && node.type.name === "field") restoreRunRecord(displayRun, marks);
 	const fieldContent = extractedContent.length > 0 ? synchronizeFieldDisplayText(extractedContent, displayText, displayRun) : [];
-	const fallbackFieldContent = displayText ? [displayRun] : [];
+	const fallbackFieldContent = displayText ? [displayRun] : reconcileEmptyFieldResultRuns(attrs._docxEmptyResultRuns, displayRun);
 	if (attrs.fieldKind === "complex") {
 		const complex = {
 			type: "complexField",
 			instruction: attrs.instruction,
 			fieldType: attrs.fieldType,
-			fieldCode: [],
+			fieldCode: attrs._docxFieldCode?.instruction === attrs.instruction ? attrs._docxFieldCode.runs : [],
 			fieldResult: fieldContent.length > 0 ? fieldContent.filter((content) => content.type === "run") : fallbackFieldContent
 		};
 		if (attrs.fldLock !== void 0) complex.fldLock = attrs.fldLock;
 		if (attrs.dirty !== void 0) complex.dirty = attrs.dirty;
 		if (attrs.fieldResultIsFallback !== void 0) complex.fieldResultIsFallback = attrs.fieldResultIsFallback;
+		if (attrs.formFieldDataXml !== void 0) complex.formFieldDataXml = attrs.formFieldDataXml;
 		return complex;
 	}
 	const simple = {
@@ -2279,6 +2362,48 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 	if (attrs.dirty !== void 0) simple.dirty = attrs.dirty;
 	return simple;
 }
+const reconcileEmptyFieldResultRuns = (runs, displayRun) => {
+	if (!runs?.length) return [];
+	const firstFormatting = runs.findIndex((run) => run.formatting !== void 0);
+	const formattingOwner = firstFormatting < 0 ? 0 : firstFormatting;
+	const projectedChanges = displayRun.propertyChanges ?? [];
+	const projectedById = /* @__PURE__ */ new Map();
+	projectedChanges.forEach((change, index) => {
+		const positions = projectedById.get(change.info.id) ?? [];
+		positions.push(index);
+		projectedById.set(change.info.id, positions);
+	});
+	const usedChanges = /* @__PURE__ */ new Set();
+	const reconciled = runs.map((run, index) => {
+		const propertyChanges = run.propertyChanges?.flatMap((change) => {
+			const projectedIndex = projectedById.get(change.info.id)?.shift();
+			if (projectedIndex === void 0) return [];
+			usedChanges.add(projectedIndex);
+			const projected = projectedChanges[projectedIndex];
+			return projected ? [projected] : [];
+		});
+		if (index !== formattingOwner && !run.propertyChanges && index !== 0) return run;
+		let formatting = index === formattingOwner ? displayRun.formatting : run.formatting;
+		if (index === formattingOwner && !formatting && run.formatting && Object.keys(run.formatting).length === 0) formatting = run.formatting;
+		const preservedAttributes = index === 0 ? displayRun.preservedAttributes ?? run.preservedAttributes : run.preservedAttributes;
+		return {
+			type: "run",
+			content: run.content,
+			...formatting ? { formatting } : {},
+			...propertyChanges?.length ? { propertyChanges } : {},
+			...preservedAttributes ? { preservedAttributes } : {}
+		};
+	});
+	const newChanges = projectedChanges.filter((_, index) => !usedChanges.has(index));
+	if (newChanges.length > 0) {
+		const first = reconciled[0];
+		if (first) reconciled[0] = {
+			...first,
+			propertyChanges: [...first.propertyChanges ?? [], ...newChanges]
+		};
+	}
+	return reconciled;
+};
 const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
 	let currentText = "";
 	const visitRunsIn = (items, visit) => {
@@ -3214,6 +3339,7 @@ function restoreCarriedTableAttrs(table, attrs) {
 	if (Array.isArray(attrs.tblPrChange) && attrs.tblPrChange.length > 0) table.propertyChanges = [...attrs.tblPrChange];
 	if (attrs._bookmarks && attrs._bookmarks.length > 0) table.bookmarks = attrs._bookmarks;
 	if (hasSinkChildren(attrs._preserved)) table.preserved = attrs._preserved;
+	if (attrs.carrierStack?.length) table.carrierStack = attrs.carrierStack;
 }
 function convertPMTableRows(node, documentCounts, styleResolver = null) {
 	const rows = [];
@@ -3316,7 +3442,7 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges, styleReso
 		let activeMerge = activeVerticalMerges.get(gridColumn);
 		while (activeMerge) {
 			const preservedCell = activeMerge.continuationCells?.shift();
-			cells.push(preservedCell ?? createVerticalMergeContinuationCell(activeMerge.colspan));
+			cells.push(preservedCell ? continuationCellSpanning(preservedCell, activeMerge.colspan) : createVerticalMergeContinuationCell(activeMerge.colspan));
 			activeMerge.remainingRows -= 1;
 			if (activeMerge.remainingRows <= 0) activeVerticalMerges.delete(gridColumn);
 			gridColumn += activeMerge.colspan;
@@ -3358,6 +3484,7 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges, styleReso
 	if (attrs._preservedAttributes && attrs._preservedAttributes.length > 0) row.preservedAttributes = attrs._preservedAttributes;
 	if (attrs._bookmarks && attrs._bookmarks.length > 0) row.bookmarks = attrs._bookmarks;
 	if (attrs.contentControls && attrs.contentControls.length > 0) row.contentControls = attrs.contentControls;
+	if (attrs.carrierStack?.length) row.carrierStack = attrs.carrierStack;
 	if (hasSinkChildren(attrs._preserved)) row.preserved = attrs._preserved;
 	if (attrs.trIns) row.structuralChange = {
 		type: "tableRowInsertion",
@@ -3387,6 +3514,25 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges, styleReso
 	};
 	return row;
 }
+/**
+* A continuation cell the package arrived with, spanning the columns its merge
+* spans NOW. The cell is carried whole for its `w:tcPr` and content, but a
+* column deleted or inserted through the merge changes the merge's width, and
+* a continuation still stating the old one leaves the row wider or narrower
+* than the grid and no longer under the cell it continues.
+*/
+function continuationCellSpanning(cell, colspan) {
+	if ((cell.formatting?.gridSpan ?? 1) === colspan) return cell;
+	const { gridSpan: _staleSpan, ...formatting } = cell.formatting ?? {};
+	return {
+		...cell,
+		formatting: {
+			...formatting,
+			vMerge: "continue",
+			...colspan > 1 && { gridSpan: colspan }
+		}
+	};
+}
 function createVerticalMergeContinuationCell(colspan) {
 	const formatting = { vMerge: "continue" };
 	if (colspan > 1) formatting.gridSpan = colspan;
@@ -3448,6 +3594,9 @@ function convertPMTableCell(node, documentCounts, styleResolver = null) {
 		} else if (contentNode.type.name === "blockSdt") {
 			content.push(convertPMBlockSdt(contentNode, styleResolver));
 			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "blockCustomXml") {
+			content.push(convertPMBlockCustomXml(contentNode, styleResolver));
+			previousStandaloneTextBox = null;
 		} else if (contentNode.type.name === "textBox") previousStandaloneTextBox = appendTextBoxBlock(content, contentNode, {
 			pendingPageBreaks: 0,
 			previousStandaloneTextBox,
@@ -3475,6 +3624,7 @@ function convertPMTableCell(node, documentCounts, styleResolver = null) {
 	if (cellFormatting) cell.formatting = cellFormatting;
 	if (Array.isArray(attrs.tcPrChange) && attrs.tcPrChange.length > 0) cell.propertyChanges = [...attrs.tcPrChange];
 	if (attrs.contentControls && attrs.contentControls.length > 0) cell.contentControls = attrs.contentControls;
+	if (attrs.carrierStack?.length) cell.carrierStack = attrs.carrierStack;
 	if (attrs.cellMarker) {
 		const info = {
 			id: attrs.cellMarker.info.revisionId,