@stll/folio-core 0.60.0 → 0.61.0

package/dist/prosemirror/commands/comments.js

@@ -13,11 +13,13 @@ import "../extensions/nodes/SdtExtension.js";
 import { canonicalFieldNode } from "../fieldRepresentation.js";
 import { resolveStateStory } from "../markupViewProjection.js";
 import { joinAtParagraphMark } from "../paragraphMarkJoin.js";
+import { carryParagraphProperties, paragraphLeftAfter } from "../paragraphPropertyCarry.js";
 import { getDocumentNumbering } from "../plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "../plugins/documentStyleState.js";
 import { resolvedPreservedXmlAttrs } from "../preservedXmlReview.js";
 import { setParagraphAttrsWithRebasedRunFormatting } from "../rebaseParagraphRunFormatting.js";
 import { rejoinRunsAt } from "../rejoinRunCarriers.js";
+import { commentPoint, resolvedCommentPoints } from "../replacedAnnotations.js";
 import { getFolioNodeRevisionCarriers, nodePropertyRevisionSites } from "../revisionCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting } from "../runPropertyChangeResolution.js";
@@ -100,6 +102,16 @@ function resolveChange(from, to, mode, revisionIds) {
 		const removeKeptMarksInBulk = revisionSet === null && keepType !== void 0;
 		const matchesRevision = (mark) => revisionSet === null || typeof mark.attrs["revisionId"] === "number" && revisionSet.has(mark.attrs["revisionId"]);
 		if (dispatch) {
+			const points = mode === "accept" ? resolvedCommentPoints({
+				doc: state.doc,
+				retiresStructure: (node, position) => {
+					if (node.type.name === "paragraph") return collectPPrMarkOp(node, position, from, to, mode, revisionSet)?.action === "join";
+					if (!rangeCoversNode(from, to, position, node)) return false;
+					if (node.type.name === "tableRow") return collectTableRowStructuralOp(node, position, mode, revisionSet)?.action === "remove";
+					return collectTableCellStructuralOps(node, position, mode, revisionSet).some((op) => op.type === "membership" && op.action === "remove");
+				},
+				removes: (node, position) => position >= from && position + node.nodeSize <= to && node.marks.some((mark) => mark.type === removeType && matchesRevision(mark))
+			}) : /* @__PURE__ */ new Map();
 			const tr = state.tr;
 			tr.setMeta(JOINED_RUNS_RESTYLED_META, true);
 			const deleteRanges = [];
@@ -110,6 +122,25 @@ function resolveChange(from, to, mode, revisionIds) {
 			const tableCellStructuralOps = [];
 			let removedSectionEndpointCount = 0;
 			const removedSectionReferences = [];
+			const carryRestoredProperties = (position) => {
+				if (mode !== "reject" || revisionSet === null) return;
+				const source = tr.doc.nodeAt(position);
+				const mark = source ? expectParagraphAttrs(source).pPrMark : null;
+				if (!source || mark?.kind !== "del" && mark?.kind !== "moveFrom" || revisionSet.has(mark.info.id)) return;
+				const survivor = paragraphLeftAfter({
+					doc: tr.doc,
+					paragraphPos: position
+				});
+				if (survivor === null) return;
+				carryParagraphProperties({
+					tr,
+					position: survivor,
+					source,
+					styleResolver,
+					numbering,
+					revision: mark.info
+				});
+			};
 			state.doc.nodesBetween(from, to, (node, pos) => {
 				if (node.type.name === "paragraph") {
 					const op = collectPPrMarkOp(node, pos, from, to, mode, revisionSet);
@@ -122,18 +153,21 @@ function resolveChange(from, to, mode, revisionIds) {
 						styleResolver,
 						numbering
 					});
-					if (nextAttrs) if (nextAttrs["styleId"] !== node.attrs["styleId"] && styleResolver) setParagraphAttrsWithRebasedRunFormatting({
-						nextAttrs,
-						paragraphPosition: pos,
-						styleResolver,
-						tr,
-						...mode === "reject" && { shouldRebase: (inline) => {
-							const deleted = inline.marks.some(({ type }) => type.name === "deletion");
-							const direct = inline.marks.some(({ type }) => type.name === "runFormattingOverride");
-							return !deleted || !direct;
-						} }
-					});
-					else tr.setNodeMarkup(pos, void 0, nextAttrs);
+					if (nextAttrs) {
+						if (nextAttrs["styleId"] !== node.attrs["styleId"] && styleResolver) setParagraphAttrsWithRebasedRunFormatting({
+							nextAttrs,
+							paragraphPosition: pos,
+							styleResolver,
+							tr,
+							...mode === "reject" && { shouldRebase: (inline) => {
+								const deleted = inline.marks.some(({ type }) => type.name === "deletion");
+								const direct = inline.marks.some(({ type }) => type.name === "runFormattingOverride");
+								return !deleted || !direct;
+							} }
+						});
+						else tr.setNodeMarkup(pos, void 0, nextAttrs);
+						carryRestoredProperties(pos);
+					}
 					return true;
 				}
 				if (node.type.name === "tableRow" && rangeCoversNode(from, to, pos, node)) {
@@ -388,7 +422,10 @@ function resolveChange(from, to, mode, revisionIds) {
 						removedSectionEndpointCount++;
 						removedSectionReferences.push(...sectionReferencesOf(paragraph));
 					}
-				} catch {}
+				} catch {
+					continue;
+				}
+				if (op.markWasAdded) carryRestoredProperties(mappedPos);
 			}
 			if (removedSectionEndpointCount > 0) markTrackedSectionEndpointRemoval(tr, {
 				sourceDoc: state.doc,
@@ -416,6 +453,7 @@ function resolveChange(from, to, mode, revisionIds) {
 				if (field.type === node.type) tr.setNodeMarkup(position, void 0, node.attrs, node.marks);
 				else tr.replaceWith(position, position + field.nodeSize, node);
 			}
+			for (const [id, position] of [...points].toReversed()) tr.insert(tr.mapping.map(position, -1), commentPoint(tr.doc.type.schema, id));
 			if (tr.steps.length > 0) dispatch(tr);
 		}
 		return true;

package/dist/prosemirror/containerFinalParagraph.d.ts

@@ -2,15 +2,15 @@ import { Node, ResolvedPos } from "prosemirror-model";
 //#region src/prosemirror/containerFinalParagraph.d.ts
 /**
  * Whether the paragraph starting at `at` is the one its container ENDS with,
- * which is the one place a paragraph mark cannot carry a revision.
+ * where a paragraph break cannot join into a following paragraph.
  *
- * A deleted mark asks a reader to join the paragraph it ends with the one
- * after it, and an inserted mark says that break was added, so rejecting it
- * closes the paragraph back over the next one. A body, a table cell, a header
- * or footer, a note and a text box each end with a paragraph that nothing
- * follows, so neither direction can be resolved there: a consumer is left with
- * a revision it can only ignore, and the redline no longer resolves to the two
- * documents it was written from.
+ * Added boundaries normally rotate onto a preceding paragraph, so rejecting
+ * them joins back into this one. If an occupied boundary or a table prevents
+ * rotation, the final inserted paragraph must retain its own revision: the
+ * resolver removes the whole paragraph after rejecting its inserted content.
+ * A terminal deletion, by contrast, clears without removing the container's
+ * required ending. Bodies, table cells, headers, footers, notes and text boxes
+ * share these rules.
  *
  * A paragraph before a TABLE is not one of those: the table is a following
  * sibling, so the paragraph does not end anything and carries its own mark

package/dist/prosemirror/containerFinalParagraph.js

@@ -14,15 +14,15 @@ const nothingFollowsIn = (parent, fromIndex, paragraphTypeName) => {
 };
 /**
 * Whether the paragraph starting at `at` is the one its container ENDS with,
-* which is the one place a paragraph mark cannot carry a revision.
+* where a paragraph break cannot join into a following paragraph.
 *
-* A deleted mark asks a reader to join the paragraph it ends with the one
-* after it, and an inserted mark says that break was added, so rejecting it
-* closes the paragraph back over the next one. A body, a table cell, a header
-* or footer, a note and a text box each end with a paragraph that nothing
-* follows, so neither direction can be resolved there: a consumer is left with
-* a revision it can only ignore, and the redline no longer resolves to the two
-* documents it was written from.
+* Added boundaries normally rotate onto a preceding paragraph, so rejecting
+* them joins back into this one. If an occupied boundary or a table prevents
+* rotation, the final inserted paragraph must retain its own revision: the
+* resolver removes the whole paragraph after rejecting its inserted content.
+* A terminal deletion, by contrast, clears without removing the container's
+* required ending. Bodies, table cells, headers, footers, notes and text boxes
+* share these rules.
 *
 * A paragraph before a TABLE is not one of those: the table is a following
 * sibling, so the paragraph does not end anything and carries its own mark

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,5 +1,6 @@
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
+import { buildSections } from "../../docx/documentParser.js";
 import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
 import { getDocumentSourceStyles } from "../../docx/headerFooterVerbatim.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
@@ -397,7 +398,7 @@ function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" })
 	const documentBody = { content: blocks };
 	if (baseDocument?.package.document.background) documentBody.background = baseDocument.package.document.background;
 	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.sections) documentBody.sections = buildSections(blocks, documentBody.finalSectionProperties);
 	if (baseDocument?.package.document.comments) documentBody.comments = baseDocument.package.document.comments;
 	const numbering = completeNumberingForDoc(baseDocument?.package.numbering, pmDoc);
 	if (baseDocument) {
@@ -1582,12 +1583,16 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 	};
 	const appendDirectRun = (node, run, coalescePlainText = false) => {
 		if (currentHyperlink) flushCurrentInline();
-		const marksKey = getMarksKey(node.marks);
+		const marksKey = getMarksKey(node.marks.filter((mark) => {
+			if (mark.type.name !== "runIdentity") return true;
+			const { emptyFormatting, preservedAttributes, preserved } = expectRunIdentityMarkAttrs(mark);
+			return emptyFormatting !== true || (preservedAttributes?.length ?? 0) > 0 || (preserved?.children?.length ?? 0) > 0;
+		}));
 		const ownerId = runIdentityId(node);
 		const currentOwnerId = currentRun ? sourceRunOwners.get(currentRun) : void 0;
 		const currentRunIsPlainText = currentRun?.content.every((runContent) => runContent.type === "text");
 		const joinsOwnedSourceRun = ownerId !== void 0 && ownerId === currentOwnerId && currentRun !== null && runsShareProperties(currentRun, run);
-		const joinsOrdinaryText = coalescePlainText && ownerId === void 0 && currentOwnerId === void 0 && currentRunIsPlainText === true && currentMarksKey === marksKey;
+		const joinsOrdinaryText = coalescePlainText && currentRun !== null && runsShareProperties(currentRun, run) && currentRunIsPlainText === true && currentMarksKey === marksKey;
 		if (currentRun && (joinsOwnedSourceRun || joinsOrdinaryText)) {
 			if (joinsOrdinaryText) {
 				for (const runContent of run.content) if (runContent.type === "text") appendTextToRun(currentRun, runContent.text);
@@ -3319,7 +3324,7 @@ function tableCellAttrsToFormatting(attrs) {
 		if (attrs.margins && !sameResolvedValue(attrs.margins, attrs._resolvedMargins)) result.margins = buildCellMarginsFromAttrs(attrs.margins);
 		if (attrs.textDirection !== (orig.textDirection ?? void 0)) if (attrs.textDirection) result.textDirection = attrs.textDirection;
 		else delete result.textDirection;
-		return result;
+		return Object.keys(result).length > 0 ? result : void 0;
 	}
 	const authoredWidth = attrs._authoredWidth;
 	if (!(attrs.colspan > 1 || attrs.rowspan > 1 || authoredWidth !== void 0 || attrs.verticalAlign || backgroundChanged || attrs.borders || attrs.margins || attrs.textDirection)) return;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -42,7 +42,7 @@ import { directionFromBidi } from "../paragraphDirection.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
-import { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
+import { continueSourceCarrierIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
@@ -112,7 +112,7 @@ const runIdentityMark = (run, nextRunIdentityId) => {
 	const payload = {
 		preservedAttributes: run.preservedAttributes,
 		preserved: run.formatting?.preserved,
-		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 && (run.propertyChanges?.length ?? 0) === 0 ? true : void 0
+		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 ? true : void 0
 	};
 	if (!runHasPageBreakContent(run) && !runHasMixedContent(run) && !hasRunIdentityPayload(payload)) return null;
 	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
@@ -676,7 +676,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
 	return createProseParagraphWithPropertySource(schema.nodes["paragraph"], paragraph, {
 		attrs,
-		content: continueRunIdentitiesAcrossRevisions(inlineNodes)
+		content: continueSourceCarrierIdentitiesAcrossRevisions(inlineNodes)
 	});
 }
 /**
@@ -1256,7 +1256,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		attrs.margins = effectiveFormatting.margins;
 		attrs._resolvedMargins = effectiveFormatting.margins;
 	}
-	if (formatting) attrs._originalFormatting = formatting;
+	attrs._originalFormatting = formatting ?? {};
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
 	if (cell.contentControls && cell.contentControls.length > 0) attrs.contentControls = cell.contentControls;
 	if (cell.carrierStack?.length) attrs.carrierStack = cell.carrierStack;

package/dist/prosemirror/extensions/nodes/CommentReferenceExtension.js

@@ -1,6 +1,7 @@
 import { readCommentReferenceAttrs } from "../../commentReferenceAttrs.js";
 import { planCommentReferenceRepairs } from "../../commentReferenceIntegrity.js";
 import { readRangeAnchorAttrs } from "../../rangeAnchorAttrs.js";
+import { trackedRunInlineAtomDisposition } from "../../trackedRunInlineAtoms.js";
 import { createNodeExtension } from "../create.js";
 import "./RangeAnchorExtension.js";
 import { Plugin } from "prosemirror-state";
@@ -10,7 +11,16 @@ const COMMENT_REFERENCE_NODE_NAME = "commentReference";
 const surveyCommentReferences = (doc) => {
 	const references = [];
 	const markEnds = /* @__PURE__ */ new Map();
+	const unanchoredMarks = [];
 	doc.descendants((node, position) => {
+		const transparent = trackedRunInlineAtomDisposition(node) === "transparent";
+		if (transparent) {
+			for (const mark of node.marks) if (mark.type.name === "comment") unanchoredMarks.push({
+				position,
+				size: node.nodeSize,
+				mark
+			});
+		}
 		if (node.type.name === "commentReference") {
 			const attrs = readCommentReferenceAttrs(node);
 			references.push(attrs.ok ? {
@@ -33,6 +43,7 @@ const surveyCommentReferences = (doc) => {
 			}
 			return false;
 		}
+		if (transparent) return false;
 		if (!node.isInline) return true;
 		for (const mark of node.marks) {
 			if (mark.type.name !== "comment") continue;
@@ -44,6 +55,7 @@ const surveyCommentReferences = (doc) => {
 	});
 	return {
 		references,
+		unanchoredMarks,
 		markExtents: [...markEnds].map(([commentId, end]) => ({
 			commentId,
 			end
@@ -84,9 +96,11 @@ const CommentReferenceExtension = createNodeExtension({
 		if (!transactions.some(({ docChanged }) => docChanged)) return null;
 		const referenceType = newState.schema.nodes[COMMENT_REFERENCE_NODE_NAME];
 		if (!referenceType) return null;
-		const repairs = planCommentReferenceRepairs(surveyCommentReferences(newState.doc));
-		if (repairs.length === 0) return null;
+		const survey = surveyCommentReferences(newState.doc);
+		const repairs = planCommentReferenceRepairs(survey);
+		if (repairs.length === 0 && survey.unanchoredMarks.length === 0) return null;
 		const transaction = newState.tr;
+		for (const { position, size, mark } of survey.unanchoredMarks) transaction.removeMark(position, position + size, mark);
 		for (const repair of repairs) {
 			if (repair.type === "delete") {
 				transaction.delete(repair.position, repair.position + repair.size);

package/dist/prosemirror/findReplaceSelection.d.ts

@@ -1,5 +1,7 @@
+import { DisplayMode } from "../managers/EditorModeManager.js";
 import { FindOptions } from "../utils/findReplace.js";
 import { Node } from "prosemirror-model";
+import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/findReplaceSelection.d.ts
 /**
  * Positional fields of a document search match that the range resolver needs.
@@ -26,5 +28,13 @@ type ProseMirrorFindMatch = FindMatchPosition & FindMatchRange & {
 };
 declare function resolveFindMatchRange(doc: Node, match: FindMatchPosition): FindMatchRange | null;
 declare function findInProseMirrorDocument(doc: Node, searchText: string, options: FindOptions): ProseMirrorFindMatch[];
+type FindInMarkupViewOptions = {
+  state: EditorState;
+  markupView: DisplayMode;
+  searchText: string;
+  options: FindOptions;
+};
+/** Search the displayed story; returned ranges address the authored editor document. */
+declare const findInMarkupView: ({ state, markupView, searchText, options }: FindInMarkupViewOptions) => ProseMirrorFindMatch[];
 //#endregion
-export { FindMatchPosition, FindMatchRange, ProseMirrorFindMatch, findInProseMirrorDocument, resolveFindMatchRange };
+export { FindMatchPosition, FindMatchRange, ProseMirrorFindMatch, findInMarkupView, findInProseMirrorDocument, resolveFindMatchRange };

package/dist/prosemirror/findReplaceSelection.js

@@ -1,6 +1,7 @@
 import { findAllMatches } from "../utils/findReplace.js";
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { expectSymbolAttrs } from "./attrs/index.js";
+import { projectMarkupView } from "./markupViewProjection.js";
 //#region src/prosemirror/findReplaceSelection.ts
 function resolveFindMatchRange(doc, match) {
 	let resolved = null;
@@ -40,6 +41,19 @@ function findInProseMirrorDocument(doc, searchText, options) {
 	});
 	return matches;
 }
+/** Search the displayed story; returned ranges address the authored editor document. */
+const findInMarkupView = ({ state, markupView, searchText, options }) => {
+	const projection = projectMarkupView(state, markupView);
+	if (projection.type === "authored") return findInProseMirrorDocument(state.doc, searchText, options);
+	return findInProseMirrorDocument(projection.doc, searchText, options).map((match) => ({
+		paragraphIndex: match.paragraphIndex,
+		startOffset: match.startOffset,
+		endOffset: match.endOffset,
+		text: match.text,
+		from: projection.toEditor(match.from, 1),
+		to: projection.toEditor(match.to, -1)
+	}));
+};
 function forEachSearchParagraph(doc, visit) {
 	let paragraphIndex = 0;
 	const walkBlocks = (container, contentStart) => {
@@ -139,4 +153,4 @@ function getSearchableParagraphText(paragraph) {
 	return text;
 }
 //#endregion
-export { findInProseMirrorDocument, resolveFindMatchRange };
+export { findInMarkupView, findInProseMirrorDocument, resolveFindMatchRange };

package/dist/prosemirror/markupViewProjection.d.ts

@@ -1,3 +1,4 @@
+import { document_d_exports } from "../types/document.js";
 import { DisplayMode } from "../managers/EditorModeManager.js";
 import { RemovedSectionReference } from "../internal/sectionEndpointResolution.js";
 import { indexedPositionMap } from "../internal/indexedPositionMap.js";
@@ -93,5 +94,13 @@ declare const projectMarkupView: (state: EditorState, view: DisplayMode) => Mark
  * of text it cannot enter.
  */
 declare const visibleCaretPosition: (projection: MarkupViewProjection, position: number) => number;
+type ProjectStoryMarkupViewOptions = {
+  doc: Node;
+  markupView: DisplayMode;
+  styles?: document_d_exports.StyleDefinitions | null | undefined;
+  numbering?: document_d_exports.NumberingDefinitions | undefined;
+};
+/** Detached stories use the same state-aware projection owner as the body. */
+declare const projectStoryMarkupView: ({ doc, markupView, styles, numbering }: ProjectStoryMarkupViewOptions) => MarkupViewProjection;
 //#endregion
-export { MarkupViewProjection, markupViewResolutionMode, projectMarkupView, resolveStateStory, visibleCaretPosition };
+export { MarkupViewProjection, markupViewResolutionMode, projectMarkupView, projectStoryMarkupView, resolveStateStory, visibleCaretPosition };

package/dist/prosemirror/markupViewProjection.js

@@ -1,9 +1,10 @@
 import { indexedPositionMap } from "../internal/indexedPositionMap.js";
 import { finalRevisionParagraphRanges } from "../internal/revisionResolutionTracking.js";
 import { resolveWholeStory } from "../internal/wholeStoryRevisionResolution.js";
-import { getDocumentNumbering } from "./plugins/documentNumbering.js";
+import { createDocumentNumberingPlugin, getDocumentNumbering } from "./plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "./plugins/documentStyleState.js";
-import { Selection } from "prosemirror-state";
+import { createDocumentStyleContextPlugin } from "./plugins/documentStyles.js";
+import { EditorState, Selection } from "prosemirror-state";
 //#region src/prosemirror/markupViewProjection.ts
 /** Resolve every revision in the state's story with the state's own styles and numbering. */
 const resolveStateStory = (state, mode) => resolveWholeStory({
@@ -84,5 +85,22 @@ const visibleCaretPosition = (projection, position) => {
 	const near = Selection.near(projection.doc.resolve(bounded), -1);
 	return projection.toEditor(near.head, -1);
 };
+const storyProjectionStates = /* @__PURE__ */ new WeakMap();
+/** Detached stories use the same state-aware projection owner as the body. */
+const projectStoryMarkupView = ({ doc, markupView, styles, numbering }) => {
+	if (markupView === "all-markup") return AUTHORED;
+	const cached = storyProjectionStates.get(doc);
+	if (cached && cached.styles === styles && cached.numbering === numbering) return projectMarkupView(cached.state, markupView);
+	const state = EditorState.create({
+		doc,
+		plugins: [createDocumentStyleContextPlugin(styles), createDocumentNumberingPlugin(numbering)]
+	});
+	storyProjectionStates.set(doc, {
+		styles,
+		numbering,
+		state
+	});
+	return projectMarkupView(state, markupView);
+};
 //#endregion
-export { markupViewResolutionMode, projectMarkupView, resolveStateStory, visibleCaretPosition };
+export { markupViewResolutionMode, projectMarkupView, projectStoryMarkupView, resolveStateStory, visibleCaretPosition };

package/dist/prosemirror/plugins/transactionInvariants.js

@@ -1,3 +1,4 @@
+import { sliceText } from "../../utils/sliceText.js";
 import { expectParagraphAttrs } from "../attrs/index.js";
 import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { createPluginKeyOwner } from "../pluginKeyOwner.js";
@@ -30,7 +31,11 @@ const MAX_REPORTED_STEPS_LENGTH = 4e3;
 const describeSteps = (transactions) => {
 	const steps = transactions.flatMap((transaction) => transaction.steps.map((step) => step.toJSON()));
 	const json = JSON.stringify(steps);
-	return json.length > MAX_REPORTED_STEPS_LENGTH ? `${json.slice(0, MAX_REPORTED_STEPS_LENGTH)}… (${json.length} characters)` : json;
+	return json.length > MAX_REPORTED_STEPS_LENGTH ? `${sliceText({
+		text: json,
+		units: "codeUnits",
+		end: MAX_REPORTED_STEPS_LENGTH
+	})}… (${json.length} characters)` : json;
 };
 var TransactionInvariantError = class extends Error {
 	issues;

package/dist/prosemirror/replacedAnnotations.d.ts

@@ -19,6 +19,20 @@ declare const NON_INCLUSIVE_MARK_DISPOSITION: {
 };
 /** The mark names in the schema that a replacement must not silently drop. */
 declare const nonInclusiveMarkNames: (schema: Schema) => string[];
+/** One typed point for a comment whose aligned coverage has no content left. */
+declare const commentPoint: (schema: Schema, id: number) => Node;
+type ResolvedCommentPointsOptions = {
+  doc: Node;
+  removes: (node: Node, position: number) => boolean;
+  retiresStructure: (node: Node, position: number) => boolean;
+};
+/** The same collector serves standalone commands and the existing bulk walk. */
+declare const createResolvedCommentPointCollector: ({ removes, retiresStructure }: Omit<ResolvedCommentPointsOptions, "doc">) => {
+  visit: (node: Node, position: number, previous?: Node) => boolean;
+  finish: () => Map<number, number>;
+};
+/** Point fallback excludes comments belonging to retired blocks and table cells. */
+declare const resolvedCommentPoints: ({ doc, removes, retiresStructure }: ResolvedCommentPointsOptions) => Map<number, number>;
 type ReplacedAnnotations = {
   /** Marks the replacement must carry, in document order. */
   carried: readonly Mark[];
@@ -88,4 +102,4 @@ declare const annotatedReplacement: ({ annotations: { carried, leading, trailing
  */
 declare const inheritedReplacementMarks: (doc: Node, from: number, to: number) => readonly Mark[];
 //#endregion
-export { NON_INCLUSIVE_MARK_DISPOSITION, ReplacedAnnotations, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, nonInclusiveMarkNames, placeTrackedInsertion, surveyReplacedAnnotations };
+export { NON_INCLUSIVE_MARK_DISPOSITION, ReplacedAnnotations, addCarriedMarks, annotatedReplacement, commentPoint, commentsAcrossBlockBoundary, commentsForTrackedInsertion, createResolvedCommentPointCollector, hasReplacedAnnotations, inheritedReplacementMarks, nonInclusiveMarkNames, placeTrackedInsertion, resolvedCommentPoints, surveyReplacedAnnotations };

package/dist/prosemirror/replacedAnnotations.js

@@ -1,9 +1,11 @@
+import { expectParagraphAttrs, expectTableCellAttrs, expectTableRowAttrs } from "./attrs/index.js";
 import { BOOKMARK_BOUNDARY_NODE_NAME } from "./extensions/nodes/BookmarkBoundaryExtension.js";
 import { COMMENT_REFERENCE_NODE_NAME } from "./extensions/nodes/CommentReferenceExtension.js";
 import { MOVE_RANGE_BOUNDARY_NODE_NAME } from "./extensions/nodes/MoveRangeBoundaryExtension.js";
 import { RANGE_ANCHOR_NODE_NAME } from "./extensions/nodes/RangeAnchorExtension.js";
 import { TEXT_BOX_ANCHOR_NODE_NAME } from "./extensions/nodes/TextBoxAnchorExtension.js";
 import { readMoveRangeBoundaryAttrs } from "./moveRangeBoundaryAttrs.js";
+import { readRangeAnchorAttrs } from "./rangeAnchorAttrs.js";
 import { isZeroWidthAnchor } from "./zeroWidthAnchors.js";
 import { Fragment, Mark } from "prosemirror-model";
 //#region src/prosemirror/replacedAnnotations.ts
@@ -21,15 +23,12 @@ import { Fragment, Mark } from "prosemirror-model";
 * hyperlink simply stops being a link. Zero-width anchors fare worse still: a
 * plain replace deletes them outright.
 *
-* Word moves a range start that sits inside a replaced span to the beginning
-* of the replacement and lets the range keep covering the new text; it keeps
-* a link across a replacement of its display text. A range wholly inside the
-* span collapses onto the replacement, and disappears only when every
-* character it covered is gone. One rule per marker kind, and that is the
-* whole contract:
+* Text replacement preserves a comment's aligned coverage. Unchanged text
+* keeps its ranges; inserted text takes the comments of the replaced aligned
+* span. A range with no remaining content becomes a point at the replacement
+* start. The applier decides alignment once for direct and tracked edits.
 *
-* - `comment` mark: the replacement carries every comment the span covered, so
-*   a range that started inside it starts at the replacement instead.
+* - `comment` mark: carried over its aligned replacement span.
 * - `hyperlink` mark: the replacement carries the first link the span held, so
 *   replacing a link's display text leaves the link on the new text. A span
 *   crossing two links keeps the one it opens in, because the mark excludes
@@ -66,9 +65,8 @@ import { Fragment, Mark } from "prosemirror-model";
 * - every other mark: formatting, and left to boundary inheritance, which
 *   already gives the replacement the formatting of the text it replaces.
 *
-* Deleting the whole of a comment's span leaves it no mark anywhere, so
-* `CommentReferenceExtension` drops the orphan reference and the save drops
-* the comment: the one case where a range is meant to disappear.
+* Removing the owning block removes its comment. Replacing its last covered
+* text within a surviving block retains a point rather than dropping it.
 */
 /**
 * What a replacement does with each mark the schema declares
@@ -90,6 +88,67 @@ const NON_INCLUSIVE_MARK_DISPOSITION = {
 /** The mark names in the schema that a replacement must not silently drop. */
 const nonInclusiveMarkNames = (schema) => Object.entries(schema.marks).filter(([, type]) => type.spec.inclusive === false).map(([name]) => name);
 const isCarried = (mark) => NON_INCLUSIVE_MARK_DISPOSITION[mark.type.name] === "carry";
+/** One typed point for a comment whose aligned coverage has no content left. */
+const commentPoint = (schema, id) => schema.node(RANGE_ANCHOR_NODE_NAME, {
+	start: {
+		type: "commentRangeStart",
+		id
+	},
+	end: {
+		type: "commentRangeEnd",
+		id
+	}
+});
+/** The same collector serves standalone commands and the existing bulk walk. */
+const createResolvedCommentPointCollector = ({ removes, retiresStructure }) => {
+	const points = /* @__PURE__ */ new Map();
+	const retained = /* @__PURE__ */ new Set();
+	const visit = (node, position, previous) => {
+		if (node.type.name === "paragraph") {
+			const mark = expectParagraphAttrs(node).pPrMark;
+			const precedingMark = previous?.type.name === "paragraph" ? expectParagraphAttrs(previous).pPrMark : null;
+			if ((mark?.kind === "del" || mark?.kind === "moveFrom") && retiresStructure(node, position) || (precedingMark?.kind === "del" || precedingMark?.kind === "moveFrom") && previous !== void 0 && retiresStructure(previous, position - previous.nodeSize)) {
+				let survivingContent = false;
+				node.descendants((inline, offset) => {
+					if (inline.isInline && !isZeroWidthAnchor(inline) && !removes(inline, position + 1 + offset)) survivingContent = true;
+					return !survivingContent;
+				});
+				if (!survivingContent) return false;
+			}
+		}
+		if (node.type.name === "tableRow" && expectTableRowAttrs(node).trDel && retiresStructure(node, position)) return false;
+		if ((node.type.name === "tableCell" || node.type.name === "tableHeader") && expectTableCellAttrs(node).cellMarker?.kind === "del" && retiresStructure(node, position)) return false;
+		if (node.type.name === "rangeAnchor") {
+			const attrs = readRangeAnchorAttrs(node);
+			if (attrs.ok && attrs.value.start.type === "commentRangeStart") retained.add(attrs.value.start.id);
+		}
+		if (!node.isInline || isZeroWidthAnchor(node)) return true;
+		for (const mark of node.marks) {
+			if (mark.type.name !== "comment") continue;
+			const id = mark.attrs["commentId"];
+			if (!removes(node, position)) retained.add(id);
+			else if (!points.has(id)) points.set(id, position);
+		}
+		return true;
+	};
+	const finish = () => {
+		for (const id of retained) points.delete(id);
+		return points;
+	};
+	return {
+		visit,
+		finish
+	};
+};
+/** Point fallback excludes comments belonging to retired blocks and table cells. */
+const resolvedCommentPoints = ({ doc, removes, retiresStructure }) => {
+	const collector = createResolvedCommentPointCollector({
+		removes,
+		retiresStructure
+	});
+	doc.descendants((node, position, parent, index) => collector.visit(node, position, index > 0 ? parent?.maybeChild(index - 1) ?? void 0 : void 0));
+	return collector.finish();
+};
 /** Anchors an edit must put back, and where relative to the replacement. */
 const ANCHOR_PLACEMENT = {
 	[COMMENT_REFERENCE_NODE_NAME]: "after",
@@ -349,4 +408,4 @@ const inheritedReplacementMarks = (doc, from, to) => {
 	return (to === from ? $from.marks() : $from.marksAcross(doc.resolve(to))) ?? Mark.none;
 };
 //#endregion
-export { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, nonInclusiveMarkNames, placeTrackedInsertion, surveyReplacedAnnotations };
+export { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentPoint, commentsAcrossBlockBoundary, commentsForTrackedInsertion, createResolvedCommentPointCollector, hasReplacedAnnotations, inheritedReplacementMarks, nonInclusiveMarkNames, placeTrackedInsertion, resolvedCommentPoints, surveyReplacedAnnotations };

package/dist/prosemirror/runFormattingReconciliation.d.ts

@@ -9,6 +9,8 @@ type ReadAuthoredRunFormattingOptions = {
 };
 /** Read authored run properties without confusing inherited visuals for direct formatting. */
 declare const readAuthoredRunFormatting: ({ context, marks, styleResolver }: ReadAuthoredRunFormattingOptions) => document_d_exports.TextFormatting;
+/** Preserve the authored distinction between an absent and empty property set in revisions. */
+declare const readAuthoredRunPropertySnapshot: (options: ReadAuthoredRunFormattingOptions) => document_d_exports.TextFormatting | undefined;
 type ReconcileRunFormattingMarksOptions = {
   authoredFormatting: document_d_exports.TextFormatting;
   context: ParagraphRunStyleContext;
@@ -22,4 +24,4 @@ type ReconcileRunFormattingMarksOptions = {
  */
 declare const reconcileRunFormattingMarks: ({ authoredFormatting, context, node, styleResolver }: ReconcileRunFormattingMarksOptions) => readonly Mark[];
 //#endregion
-export { readAuthoredRunFormatting, reconcileRunFormattingMarks };
+export { readAuthoredRunFormatting, readAuthoredRunPropertySnapshot, reconcileRunFormattingMarks };

package/dist/prosemirror/runFormattingReconciliation.js

@@ -1,8 +1,9 @@
 import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
-import { expectCharacterStyleMarkAttrs } from "./attrs/index.js";
+import { expectCharacterStyleMarkAttrs, expectRunIdentityMarkAttrs } from "./attrs/index.js";
 import { textFormattingToMarks } from "./extensions/marks/markUtils.js";
 import { marksToTextFormatting } from "./runFormattingFromMarks.js";
 import { RUN_FORMATTING_MARK_NAMES } from "./runFormattingMarkNames.js";
+import { RUN_IDENTITY_MARK_NAME } from "./runIdentity.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, paragraphFormattingForRun, resolveEffectiveRunStyleFormatting } from "./runStyleFormatting.js";
 import { Mark } from "prosemirror-model";
 //#region src/prosemirror/runFormattingReconciliation.ts
@@ -14,6 +15,13 @@ const readAuthoredRunFormatting = ({ context, marks, styleResolver }) => marksTo
 	paragraphMarkPrecedesStyle: context.paragraphMarkPrecedesStyle,
 	...styleResolver !== void 0 ? { styleResolver } : {}
 });
+/** Preserve the authored distinction between an absent and empty property set in revisions. */
+const readAuthoredRunPropertySnapshot = (options) => {
+	const formatting = readAuthoredRunFormatting(options);
+	if (Object.keys(formatting).length > 0) return formatting;
+	const identity = options.marks.find(({ type }) => type.name === RUN_IDENTITY_MARK_NAME);
+	return identity && expectRunIdentityMarkAttrs(identity).emptyFormatting ? formatting : void 0;
+};
 /**
 * Rebuild a run's physical formatting marks from its authored properties and
 * current style context. This is the inverse of {@link readAuthoredRunFormatting}:
@@ -54,4 +62,4 @@ const reconcileRunFormattingMarks = ({ authoredFormatting, context, node, styleR
 	]);
 };
 //#endregion
-export { readAuthoredRunFormatting, reconcileRunFormattingMarks };
+export { readAuthoredRunFormatting, readAuthoredRunPropertySnapshot, reconcileRunFormattingMarks };