@stll/folio-core 0.47.5 → 0.47.7

package/dist/prosemirror/attrs/index.js

@@ -82,6 +82,12 @@ const NOTE_TYPES = ["footnote", "endnote"];
 const NOTE_REF_VERT_ALIGNS = ["baseline", "superscript"];
 const TEXT_BOX_DOCX_PLACEMENTS = ["standalone", "inlineWithPrevious"];
 const TRACKED_CHANGE_MOVE_KINDS = ["moveTo", "moveFrom"];
+const TRACKED_REVISION_ANCESTOR_TYPES = [
+	"insertion",
+	"deletion",
+	"moveFrom",
+	"moveTo"
+];
 const TEXT_BOX_TRACKED_CHANGE_TYPES = [
 	"insertion",
 	"deletion",
@@ -792,6 +798,7 @@ const readCommentMarkAttrs = (mark) => {
 	return attrsResult(attrs, issues);
 };
 const expectCommentMarkAttrs = (mark) => expectCachedMarkAttrs(mark, commentAttrsCache, readCommentMarkAttrs, "comment attrs");
+const isTrackedRevisionAncestorArray = (value) => Array.isArray(value) && value.length > 0 && value.every((ancestor) => isRecord(ancestor) && TRACKED_REVISION_ANCESTOR_TYPES.some((type) => type === ancestor["type"]) && typeof ancestor["revisionId"] === "number" && Number.isSafeInteger(ancestor["revisionId"]) && ancestor["revisionId"] >= 0 && typeof ancestor["author"] === "string" && (ancestor["date"] === void 0 || typeof ancestor["date"] === "string") && (ancestor["utcDate"] === void 0 || typeof ancestor["utcDate"] === "string") && (ancestor["initials"] === void 0 || typeof ancestor["initials"] === "string") && typeof ancestor["outerWrapperCount"] === "number" && Number.isSafeInteger(ancestor["outerWrapperCount"]) && ancestor["outerWrapperCount"] >= 0);
 const readTrackedChangeMarkAttrs = (mark) => {
 	const attrs = attrsRecord(mark.attrs);
 	const issues = [];
@@ -801,6 +808,16 @@ const readTrackedChangeMarkAttrs = (mark) => {
 	optionalString(attrs, "date", `${mark.type.name}.attrs.date`, issues);
 	optionalString(attrs, "utcDate", `${mark.type.name}.attrs.utcDate`, issues);
 	optionalString(attrs, "initials", `${mark.type.name}.attrs.initials`, issues);
+	const outerWrapperCount = attrs["_docxOuterWrapperCount"];
+	if (outerWrapperCount !== void 0 && outerWrapperCount !== null && (typeof outerWrapperCount !== "number" || !Number.isSafeInteger(outerWrapperCount) || outerWrapperCount < 0)) issues.push({
+		path: `${mark.type.name}.attrs._docxOuterWrapperCount`,
+		message: "Expected a non-negative safe integer."
+	});
+	const ancestors = attrs["_docxRevisionAncestors"];
+	if (ancestors !== void 0 && ancestors !== null && !isTrackedRevisionAncestorArray(ancestors)) issues.push({
+		path: `${mark.type.name}.attrs._docxRevisionAncestors`,
+		message: "Expected a non-empty array of valid revision ancestors."
+	});
 	optionalOneOf(attrs, "moveKind", `${mark.type.name}.attrs.moveKind`, issues, TRACKED_CHANGE_MOVE_KINDS);
 	optionalOneOf(attrs, "provenance", `${mark.type.name}.attrs.provenance`, issues, TRACKED_CHANGE_PROVENANCE_VALUES);
 	optionalString(attrs, "suggestionId", `${mark.type.name}.attrs.suggestionId`, issues);
@@ -2700,4 +2717,4 @@ const optionalEmptyHyperlinkArray = (value, issues) => {
 	}
 };
 //#endregion
-export { 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, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { 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, isTrackedRevisionAncestorArray, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readInlineWrapperStack, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };

package/dist/prosemirror/commands/comments.js

@@ -2,7 +2,7 @@ import { sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "
 import { joinProseParagraphsWithRightPropertySource } from "../../docx/paragraphPropertySource.js";
 import { appendHeadlessInlineResolution } from "../../internal/headlessRevisionResolution.js";
 import { stateAllowsHeadlessRevisionResolution } from "../../internal/headlessRevisionResolutionGuard.js";
-import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { addedBreakCarrierBefore, finalParagraphsOf, paragraphEndsItsContainer } from "../containerFinalParagraph.js";
 import { resolveParagraphDefaultTextFormatting } from "../conversion/toProseDoc.js";
 import { markChangedParagraphRanges, markStructuralChange, markTrackedSectionEndpointRemoval } from "../extensions/features/ParagraphChangeTrackerExtension.js";
@@ -19,6 +19,7 @@ import { reconcileTableGridAfterColumnRemoval } from "../tableGridMutation.js";
 import { holdsNoContent } from "../zeroWidthAnchors.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties, tableCellRejectAttrPatch, tablePropertyExceptionsRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch } from "./propertyChangeScope.js";
 import { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge } from "./tableCellMergeResolution.js";
+import { panic } from "better-result";
 import { PARAGRAPH_MARK_CHANGE_KINDS, REVIEW_CARRIERS } from "@stll/docx-core/model";
 import { TableMap, removeRow } from "prosemirror-tables";
 import { Mapping } from "prosemirror-transform";
@@ -55,6 +56,33 @@ function removeCommentMark(commentId) {
 		return true;
 	};
 }
+const revisionLayerOf = (mark) => {
+	const attrs = expectTrackedChangeMarkAttrs(mark);
+	let type;
+	if (mark.type.name === "insertion") type = attrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+	else type = attrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
+	return {
+		type,
+		revisionId: attrs.revisionId,
+		author: attrs.author,
+		...attrs.date ? { date: attrs.date } : {},
+		...attrs.utcDate ? { utcDate: attrs.utcDate } : {},
+		...attrs.initials ? { initials: attrs.initials } : {},
+		outerWrapperCount: attrs._docxOuterWrapperCount ?? 0
+	};
+};
+const revisionLayerRemovesContent = (layer, mode) => mode === "accept" ? layer.type === "deletion" || layer.type === "moveFrom" : layer.type === "insertion" || layer.type === "moveTo";
+const containsNestedRevision = (doc) => {
+	let found = false;
+	doc.descendants((node) => {
+		if (found) return false;
+		for (const mark of node.marks) if ((mark.type.name === "insertion" || mark.type.name === "deletion") && (expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors?.length ?? 0) > 0) {
+			found = true;
+			return false;
+		}
+	});
+	return found;
+};
 /**
 * Resolve a tracked change: accept or reject.
 * - Accept: keep insertions (remove mark), delete deletions (remove text)
@@ -76,7 +104,7 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 		const removeType = mode === "accept" ? deletionType : insertionType;
 		const revisionSet = revisionIds === void 0 ? null : new Set(revisionIds);
 		const removeKeptMarksInBulk = revisionSet === null && keepType !== void 0;
-		const canBulkInlineResolution = execution === "headless-bulk-inline" && revisionSet === null && from === 0 && to === state.doc.content.size && stateAllowsHeadlessRevisionResolution(state);
+		const canBulkInlineResolution = execution === "headless-bulk-inline" && revisionSet === null && from === 0 && to === state.doc.content.size && stateAllowsHeadlessRevisionResolution(state) && !containsNestedRevision(state.doc);
 		const matchesRevision = (mark) => revisionSet === null || typeof mark.attrs["revisionId"] === "number" && revisionSet.has(mark.attrs["revisionId"]);
 		if (dispatch) {
 			const tr = state.tr;
@@ -189,6 +217,36 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 					revisionSet,
 					styleResolver
 				});
+				const nestedMark = node.marks.find((mark) => (mark.type === insertionType || mark.type === deletionType) && (expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors?.length ?? 0) > 0);
+				if (nestedMark) {
+					const path = [...expectTrackedChangeMarkAttrs(nestedMark)._docxRevisionAncestors ?? [], revisionLayerOf(nestedMark)];
+					const selected = (layer) => revisionSet === null || revisionSet.has(layer.revisionId);
+					if (path.some(selected)) if (path.some((layer) => selected(layer) && revisionLayerRemovesContent(layer, mode))) deleteRanges.push({
+						from: rangeFrom,
+						to: rangeTo
+					});
+					else {
+						tr.removeMark(rangeFrom, rangeTo, nestedMark);
+						const remaining = path.filter((layer) => !selected(layer));
+						const active = remaining.at(-1);
+						if (active) {
+							const type = active.type === "insertion" || active.type === "moveTo" ? insertionType : deletionType;
+							if (!type) panic("A nested tracked revision has no editor mark type");
+							tr.addMark(rangeFrom, rangeTo, type.create({
+								revisionId: active.revisionId,
+								author: active.author,
+								date: active.date ?? null,
+								utcDate: active.utcDate ?? null,
+								initials: active.initials ?? null,
+								moveKind: active.type === "moveTo" || active.type === "moveFrom" ? active.type : null,
+								_historicalFormatting: active.type === "deletion" || active.type === "moveFrom" ? true : null,
+								_docxOuterWrapperCount: active.outerWrapperCount,
+								_docxRevisionAncestors: remaining.length > 1 ? remaining.slice(0, -1) : null
+							}));
+						}
+					}
+					return true;
+				}
 				if (removesNode) deleteRanges.push({
 					from: rangeFrom,
 					to: rangeTo
@@ -794,7 +852,7 @@ function findAIEditRevisionRange(state, revisionIds) {
 				includeRange(pos, pos + node.nodeSize);
 				break;
 			}
-			if ((mark.type === insertionType || mark.type === deletionType) && typeof mark.attrs["revisionId"] === "number" && idSet.has(mark.attrs["revisionId"])) {
+			if ((mark.type === insertionType || mark.type === deletionType) && (idSet.has(expectTrackedChangeMarkAttrs(mark).revisionId) || (expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors ?? []).some((ancestor) => idSet.has(ancestor.revisionId)))) {
 				includeRange(pos, pos + node.nodeSize);
 				break;
 			}

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1162,12 +1162,10 @@ const nestInlineWrappers = (stack, content) => {
 * The emitted sequence with each wrapper group nested back into the wrappers
 * `toProseDoc` lifted off it.
 *
-* The revision stays outermost. folio already writes a revision outside the
-* hyperlink it spans, the parse leg is revision-owned, and accepting or
-* rejecting one is a range operation over the revision's own content; a
-* wrapper placed outside two revisions would also have to mint one revision id
-* per wrapper. So a revision in the group keeps its place and takes the nest
-* inside it, and the items around it share a nest of their own.
+* A revision may be inside some wrapper layers and outside others. Its mark
+* records how many layers preceded it in the source, since a ProseMirror mark
+* set cannot express that order. Adjacent items with the same outer layers
+* share one wrapper rather than splitting it around each revision.
 *
 * A group with nothing in it writes no wrapper: an authored wrapper whose
 * content was deleted or rejected is gone, and an empty one says nothing.
@@ -1185,10 +1183,83 @@ const nestInsideHyperlink = (item, stack, hyperlinkIndex, indices) => {
 	}
 	return false;
 };
-const nestInlineWrapperGroups = (items, groups, hyperlinkIndices) => {
+const nestRevisionAwareInlineWrappers = (items, stack, revisionOuterWrapperCounts, layerIndex = 0) => {
+	if (layerIndex === stack.length) return [...items];
+	const nested = [];
+	let pending = [];
+	const closeLayer = () => {
+		if (pending.length === 0) return;
+		const layer = stack[layerIndex];
+		if (layer === void 0) panic("An inline wrapper layer disappeared during reconstruction");
+		nested.push(inlineWrapperMember(layer, nestRevisionAwareInlineWrappers(pending, stack, revisionOuterWrapperCounts, layerIndex + 1)));
+		pending = [];
+	};
+	for (const item of items) {
+		if (!isRevisionWrapper(item) || (revisionOuterWrapperCounts.get(item) ?? 0) > layerIndex) {
+			pending.push(item);
+			continue;
+		}
+		closeLayer();
+		item.content = [nestInlineWrappers(stack.slice(layerIndex), item.content)];
+		nested.push(item);
+	}
+	closeLayer();
+	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;
+const revisionInfoFromLayer = (layer) => ({
+	id: layer.revisionId,
+	author: layer.author,
+	...layer.date ? { date: layer.date } : {},
+	...layer.utcDate ? { utcDate: {
+		attribute: DATE_UTC_ATTRIBUTE,
+		value: layer.utcDate
+	} } : {},
+	...layer.initials ? { initials: layer.initials } : {}
+});
+const nestRevisionAncestors = (items, ancestorsByWrapper, revisionOuterWrapperCounts) => {
+	const nested = [];
+	const open = [];
+	for (const item of items) {
+		if (!isRevisionWrapper(item)) {
+			open.length = 0;
+			nested.push(item);
+			continue;
+		}
+		const ownLayer = {
+			type: item.type,
+			revisionId: item.info.id,
+			author: item.info.author,
+			...item.info.date ? { date: item.info.date } : {},
+			...item.info.utcDate ? { utcDate: item.info.utcDate.value } : {},
+			...item.info.initials ? { initials: item.info.initials } : {},
+			outerWrapperCount: revisionOuterWrapperCounts.get(item) ?? 0
+		};
+		const path = [...ancestorsByWrapper.get(item) ?? [], ownLayer];
+		let shared = 0;
+		while (shared < open.length && path[shared] && sameRevisionLayer(open[shared].layer, path[shared])) shared += 1;
+		open.length = shared;
+		for (const layer of path.slice(shared)) {
+			const wrapper = createTrackedRunWrapper(layer.type, revisionInfoFromLayer(layer));
+			revisionOuterWrapperCounts.set(wrapper, layer.outerWrapperCount);
+			const parent = open.at(-1)?.wrapper;
+			if (parent) parent.content.push(wrapper);
+			else nested.push(wrapper);
+			open.push({
+				layer,
+				wrapper
+			});
+		}
+		const owner = open.at(-1)?.wrapper;
+		if (!owner) panic("A tracked revision path has no owner");
+		owner.content.push(...item.content);
+	}
+	return nested;
+};
+const nestInlineWrapperGroups = (items, groups, hyperlinkIndices, revisionOuterWrapperCounts, ancestorsByWrapper) => {
 	const nested = [];
 	for (const [index, group] of groups.entries()) {
-		const slice = items.slice(group.start, groups[index + 1]?.start ?? items.length);
+		const slice = nestRevisionAncestors(items.slice(group.start, groups[index + 1]?.start ?? items.length), ancestorsByWrapper, revisionOuterWrapperCounts);
 		if (group.stack.length === 0) {
 			nested.push(...slice);
 			continue;
@@ -1205,24 +1276,18 @@ const nestInlineWrapperGroups = (items, groups, hyperlinkIndices) => {
 			nested.push(...slice);
 			continue;
 		}
-		let pending = [];
-		const closeNest = () => {
-			if (pending.length === 0) return;
-			nested.push(nestInlineWrappers(outerStack, pending));
-			pending = [];
-		};
-		for (const item of slice) {
-			if (!isRevisionWrapper(item)) {
-				pending.push(item);
-				continue;
-			}
-			closeNest();
-			if (item.content.length > 0) item.content = [nestInlineWrappers(outerStack, item.content)];
-			nested.push(item);
+		nested.push(...nestRevisionAwareInlineWrappers(slice, outerStack, revisionOuterWrapperCounts));
+	}
+	const coalesced = [];
+	for (const item of nested) {
+		const previous = coalesced.at(-1);
+		if (previous && isRevisionWrapper(previous) && isRevisionWrapper(item) && previous.type === item.type && JSON.stringify(previous.info) === JSON.stringify(item.info) && revisionOuterWrapperCounts.get(previous) === revisionOuterWrapperCounts.get(item)) {
+			previous.content.push(...item.content);
+			continue;
 		}
-		closeNest();
+		coalesced.push(item);
 	}
-	return nested;
+	return coalesced;
 };
 function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
 	const content = [];
@@ -1252,6 +1317,8 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	let currentTrackedChange;
 	const sourceRunOwners = /* @__PURE__ */ new WeakMap();
 	const sourceHyperlinkIndices = /* @__PURE__ */ new WeakMap();
+	const revisionOuterWrapperCounts = /* @__PURE__ */ new WeakMap();
+	const revisionAncestorsByWrapper = /* @__PURE__ */ new WeakMap();
 	const openedComments = /* @__PURE__ */ new Set();
 	const createIndexedHyperlink = (mark) => {
 		const hyperlink = createHyperlink(mark);
@@ -1416,16 +1483,13 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				} } : {},
 				...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
 			};
-			if (insertionMark) content.push({
-				type: changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion",
-				info,
-				content: [anchoredContent]
-			});
-			else content.push({
-				type: changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion",
-				info,
-				content: [anchoredContent]
-			});
+			let type;
+			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
+			const wrapper = createTrackedRunWrapper(type, info, anchoredContent);
+			revisionOuterWrapperCounts.set(wrapper, changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length);
+			revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
+			content.push(wrapper);
 			return;
 		}
 		if (insertionMark || deletionMark) {
@@ -1447,12 +1511,15 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			let type;
 			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
 			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
-			const trackedChangeKey = `${type}:${JSON.stringify(info)}`;
+			const outerWrapperCount = changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length;
+			const trackedChangeKey = `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(changeAttrs._docxRevisionAncestors ?? [])}`;
 			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 ?? []);
 					content.push(wrapper);
 					currentTrackedChange = {
 						type: "hyperlink",
@@ -1486,6 +1553,8 @@ 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 ?? []);
 				content.push(wrapper);
 				currentTrackedChange = {
 					type: "direct",
@@ -1640,7 +1709,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		type: "commentRangeEnd",
 		id: commentId
 	});
-	return nestInlineWrapperGroups(content, wrapperGroups, sourceHyperlinkIndices);
+	return nestInlineWrapperGroups(content, wrapperGroups, sourceHyperlinkIndices, revisionOuterWrapperCounts, revisionAncestorsByWrapper);
 }
 function createTrackedChangeRun({ baseParagraphFormatting, inheritedFormatting, marks, node, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver }) {
 	const formattingContext = {
@@ -2001,7 +2070,7 @@ function restoreRunRecord(run, marks) {
 	}
 	const identityMark = marks.find((mark) => mark.type.name === RUN_IDENTITY_MARK_NAME);
 	if (!identityMark) return;
-	const { preservedAttributes, preserved } = expectRunIdentityMarkAttrs(identityMark);
+	const { preservedAttributes, preserved, emptyFormatting } = expectRunIdentityMarkAttrs(identityMark);
 	if (preservedAttributes && preservedAttributes.length > 0) run.preservedAttributes = preservedAttributes.map(({ namespace, name, value }) => namespace === void 0 ? {
 		name,
 		value
@@ -2014,6 +2083,7 @@ function restoreRunRecord(run, marks) {
 		...run.formatting,
 		preserved
 	};
+	if (emptyFormatting && run.formatting === void 0) run.formatting = {};
 }
 function getRunFormattingFromMarks(marks, options) {
 	if (!marks || marks.length === 0 && !options) return;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -16,7 +16,7 @@ import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/pa
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
-import { expectInlineWrapperMarkAttrs } from "../attrs/index.js";
+import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
@@ -77,16 +77,17 @@ const createTextBoxGroupIdFactory = () => {
 * paragraph's and the hyperlink's — so the next payload field is added once
 * rather than to whichever site the author happened to open.
 *
-* Minted when the run holds a page break (the leaves it is cut into have to be
-* rejoined into one `w:r` on save), an attribute remainder, or a `w:rPr` sink.
-* 57.5% of corpus files hold none of the three and mint nothing.
+* Minted when the run holds a page break or multiple content items including
+* an inline atom (the leaves have to be rejoined into one `w:r` on save), an
+* attribute remainder, a `w:rPr` sink, or an authored empty `w:rPr`.
 */
 const runIdentityMark = (run, nextRunIdentityId) => {
 	const payload = {
 		preservedAttributes: run.preservedAttributes,
-		preserved: run.formatting?.preserved
+		preserved: run.formatting?.preserved,
+		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 ? true : void 0
 	};
-	if (!runHasPageBreakContent(run) && !hasRunIdentityPayload(payload)) return null;
+	if (!runHasPageBreakContent(run) && !runHasMixedContent(run) && !hasRunIdentityPayload(payload)) return null;
 	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
 };
 /** Keep imported hyperlink identity unique across every nested conversion scope. */
@@ -396,8 +397,8 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		type: "direct"
 	}], { ordinaryFormatting: ordinaryDefaultRunFormatting });
 	const defaultRunFormatting = defaultToggleCascade.formatting;
-	if (extraRunFormatting !== void 0) {
-		attrs._tableRunFormatting = extraRunFormatting;
+	if (extraRunFormatting !== void 0 || paragraph.content.length > 0) {
+		if (extraRunFormatting !== void 0) attrs._tableRunFormatting = extraRunFormatting;
 		if (defaultRunFormatting) attrs.defaultTextFormatting = defaultRunFormatting;
 		else delete attrs.defaultTextFormatting;
 	}
@@ -606,13 +607,21 @@ function anchorPointComment(nodes, commentId) {
 * and it is what lets the save leg hoist a revision covering all of them back
 * around the control instead of losing it.
 */
-const withTrackedRunMark = (node, mark) => {
-	if (node.marks.some(({ type }) => type.name === "insertion" || type.name === "deletion")) return node;
+const withTrackedRunMark = (node, mark, ancestor) => {
 	if (node.type.name === "sdt") {
 		const marked = [];
-		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark));
+		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark, ancestor));
 		return recreateProseNodeWithParagraphPropertySource(node, { content: marked });
 	}
+	const nestedMark = node.marks.find(({ type }) => type.name === "insertion" || type.name === "deletion");
+	if (nestedMark) {
+		const nestedAttrs = expectTrackedChangeMarkAttrs(nestedMark);
+		const updatedMark = schema.mark(nestedMark.type.name, {
+			...nestedMark.attrs,
+			_docxRevisionAncestors: [ancestor, ...nestedAttrs._docxRevisionAncestors ?? []]
+		});
+		return node.mark(updatedMark.addToSet(node.marks));
+	}
 	if (trackedRunInlineAtomDisposition(node) === "outside-wrapper") panic(`Inline atom ${JSON.stringify(node.type.name)} cannot occur in a tracked-run wrapper`);
 	if (canCarryTrackedRunMark(node)) return node.mark(mark.addToSet(node.marks));
 	return node;
@@ -652,7 +661,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		} else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
 			const nestedMarkType = item.type === "insertion" || item.type === "moveTo" ? "insertion" : "deletion";
 			const nestedMoveKind = item.type === "moveFrom" || item.type === "moveTo" ? item.type : null;
-			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors));
+			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors, [...wrappedBy, ...stack]));
 		} else if (item.type === "inlineSdt") {
 			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, nextRunIdentityId, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
 			if (sdtNode) itemNodes.push(sdtNode);
@@ -681,9 +690,19 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		utcDate: change.info.utcDate?.value ?? null,
 		initials: change.info.initials ?? null,
 		moveKind,
+		_docxOuterWrapperCount: wrappedBy.length,
 		...markType === "deletion" ? { _historicalFormatting: true } : {}
 	});
-	return nodes.map((node) => withTrackedRunMark(node, mark));
+	const ancestor = {
+		type: change.type,
+		revisionId: change.info.id,
+		author: change.info.author,
+		...change.info.date ? { date: change.info.date } : {},
+		...change.info.utcDate ? { utcDate: change.info.utcDate.value } : {},
+		...change.info.initials ? { initials: change.info.initials } : {},
+		outerWrapperCount: wrappedBy.length
+	};
+	return nodes.map((node) => withTrackedRunMark(node, mark, ancestor));
 }
 function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay) {
 	const formatting = paragraph.formatting;
@@ -1691,6 +1710,7 @@ function convertRun(run, resolvedStyleFormatting, nextRunIdentityId, styleResolv
 	return nodes;
 }
 const runHasPageBreakContent = (run) => run.content.some((content) => content.type === "break" && content.breakType === "page");
+const runHasMixedContent = (run) => run.content.length > 1 && run.content.some((content) => content.type !== "text");
 /**
 * Whether a field's result holds an explicit page break.
 *

package/dist/prosemirror/extensions/markRegistry.d.ts

@@ -44,13 +44,10 @@ type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
  * Five of these marks are containers on the save leg as well, and their
  * relative order is that leg's rather than a choice made here.
  * `extractParagraphContent` opens a comment range around everything a leaf
- * produces (it flushes the open run and hyperlink and drops the tracked wrapper
- * before pushing the marker: `fromProseDoc.ts:2359-2369`), then the revision
- * wrapper (`fromProseDoc.ts:2530`), then the wrapper stack inside that revision
- * (`nestInlineWrapperGroups`, `fromProseDoc.ts:2200`), then the hyperlink and
- * the runs it holds (`fromProseDoc.ts:2567`). So the save writes
- * `w:commentRangeStart … w:ins > w:bdo > w:hyperlink > w:r`, and the editor DOM
- * nests `span.docx-comment > span.docx-insertion > bdo > a`.
+ * produces. For an editor-created revision, the existing wrapper stack owns
+ * the change, followed by the hyperlink and the runs it holds. So the save
+ * writes `w:commentRangeStart … w:bdo > w:ins > w:hyperlink > w:r`, and the
+ * editor DOM nests `span.docx-comment > bdo > span.docx-insertion > a`.
  * `markNestingOrder.test.ts` holds the two legs to each other.
  *
  * `runIdentity` is the fifth: `w:r` is the element it names, and it is the
@@ -60,6 +57,6 @@ type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
  * own in OOXML, so the save leg ranks it against nothing and its place here is
  * a presentation decision.
  */
-declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "comment", "insertion", "deletion", "inlineWrapper", "hyperlink", "runPropertyChange", "runIdentity"];
+declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "comment", "inlineWrapper", "insertion", "deletion", "hyperlink", "runPropertyChange", "runIdentity"];
 //#endregion
 export { MARK_EXTENSIONS, MARK_NESTING_ORDER, SchemaMarkName };

package/dist/prosemirror/extensions/markRegistry.js

@@ -83,13 +83,10 @@ const markNestingOrder = (names) => names;
 * Five of these marks are containers on the save leg as well, and their
 * relative order is that leg's rather than a choice made here.
 * `extractParagraphContent` opens a comment range around everything a leaf
-* produces (it flushes the open run and hyperlink and drops the tracked wrapper
-* before pushing the marker: `fromProseDoc.ts:2359-2369`), then the revision
-* wrapper (`fromProseDoc.ts:2530`), then the wrapper stack inside that revision
-* (`nestInlineWrapperGroups`, `fromProseDoc.ts:2200`), then the hyperlink and
-* the runs it holds (`fromProseDoc.ts:2567`). So the save writes
-* `w:commentRangeStart … w:ins > w:bdo > w:hyperlink > w:r`, and the editor DOM
-* nests `span.docx-comment > span.docx-insertion > bdo > a`.
+* produces. For an editor-created revision, the existing wrapper stack owns
+* the change, followed by the hyperlink and the runs it holds. So the save
+* writes `w:commentRangeStart … w:bdo > w:ins > w:hyperlink > w:r`, and the
+* editor DOM nests `span.docx-comment > bdo > span.docx-insertion > a`.
 * `markNestingOrder.test.ts` holds the two legs to each other.
 *
 * `runIdentity` is the fifth: `w:r` is the element it names, and it is the
@@ -127,9 +124,9 @@ const MARK_NESTING_ORDER = markNestingOrder([
 	"runFormattingOverride",
 	"characterStyle",
 	"comment",
+	"inlineWrapper",
 	"insertion",
 	"deletion",
-	"inlineWrapper",
 	"hyperlink",
 	"runPropertyChange",
 	"runIdentity"

package/dist/prosemirror/extensions/marks/RunIdentityExtension.js

@@ -105,7 +105,8 @@ const RunIdentityExtension = createMarkExtension({
 		attrs: {
 			id: {},
 			preservedAttributes: { default: null },
-			preserved: { default: null }
+			preserved: { default: null },
+			emptyFormatting: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{