@stll/folio-core 0.55.0 → 0.57.0

package/dist/prosemirror/runPropertyChangeResolution.js

@@ -1,5 +1,6 @@
+import { runFormattingInlineAtomDisposition } from "./runFormattingInlineCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "./runFormattingMarkNames.js";
-import { reconcileRunFormattingMarks } from "./runFormattingReconciliation.js";
+import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "./runFormattingReconciliation.js";
 //#region src/prosemirror/runPropertyChangeResolution.ts
 /**
 * Rebuild the pre-change run marks against the paragraph's live style cascade.
@@ -14,5 +15,26 @@ const reconstructRejectedRunFormattingMarks = ({ node, paragraphContext, previou
 		...styleResolver !== void 0 ? { styleResolver } : {}
 	}).filter(({ type }) => RUN_FORMATTING_MARK_NAMES.has(type.name));
 };
+/** Restored deletions inherit the live paragraph cascade without authoring their historical visuals. */
+const restoreHistoricalRunFormatting = ({ node, paragraphContext, styleResolver }) => {
+	const disposition = runFormattingInlineAtomDisposition(node);
+	if (disposition === null || disposition === "not-a-run") return node.marks;
+	if (paragraphContext.paragraphMarkFormatting === void 0) return node.marks;
+	return reconcileRunFormattingMarks({
+		authoredFormatting: readAuthoredRunFormatting({
+			context: {
+				baseParagraphFormatting: paragraphContext.baseParagraphFormatting,
+				paragraphFormatting: paragraphContext.baseParagraphFormatting,
+				paragraphMarkFormatting: void 0,
+				paragraphMarkPrecedesStyle: false
+			},
+			marks: node.marks,
+			...styleResolver !== void 0 ? { styleResolver } : {}
+		}),
+		context: paragraphContext,
+		node,
+		...styleResolver !== void 0 ? { styleResolver } : {}
+	});
+};
 //#endregion
-export { reconstructRejectedRunFormattingMarks };
+export { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting };

package/dist/prosemirror/runStyleFormatting.d.ts

@@ -5,6 +5,8 @@ import { cascadeStyleTextFormatting } from "./styles/styleToggleCascade.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/runStyleFormatting.d.ts
 declare const hasDirectRunFormatting: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
+/** A stated run property or character style establishes paragraph-mark suppression. */
+declare const isParagraphMarkSuppressionEligible: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
 declare const stripParagraphMarkOnlyFormatting: (formatting: document_d_exports.TextFormatting) => document_d_exports.TextFormatting | undefined;
 declare const stripParagraphMarkFormattingForBodyRuns: (formatting: document_d_exports.TextFormatting) => document_d_exports.TextFormatting | undefined;
 type SuppressParagraphMarkFormattingOptions = {
@@ -66,4 +68,4 @@ type ResolveEffectiveRunStyleFormattingOptions = {
 /** Resolve the non-direct run cascade from shared document styles and the current paragraph. */
 declare const resolveEffectiveRunStyleFormatting: ({ marks, paragraphFormatting, styleResolver }: ResolveEffectiveRunStyleFormattingOptions) => document_d_exports.TextFormatting | undefined;
 //#endregion
-export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };
+export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };

package/dist/prosemirror/runStyleFormatting.js

@@ -20,6 +20,8 @@ const hasDirectRunFormatting = (formatting) => {
 	if (!formatting) return false;
 	return Object.entries(formatting).some(([property, value]) => property !== "styleId" && value !== void 0);
 };
+/** A stated run property or character style establishes paragraph-mark suppression. */
+const isParagraphMarkSuppressionEligible = (formatting) => hasDirectRunFormatting(formatting) || formatting?.styleId !== void 0;
 const stripParagraphMarkOnlyFormatting = (formatting) => {
 	const { allCaps: _allCaps, highlight: _highlight, shading: _shading, smallCaps: _smallCaps, vertAlign: _vertAlign, preserved: _preserved, ...formattingForBody } = formatting;
 	return Object.keys(formattingForBody).length > 0 ? formattingForBody : void 0;
@@ -182,4 +184,4 @@ const resolveEffectiveRunStyleFormatting = ({ marks, paragraphFormatting, styleR
 	});
 };
 //#endregion
-export { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };
+export { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };

package/dist/prosemirror/schema/marks.d.ts

@@ -78,6 +78,7 @@ type TextEffectAttrs = {
   effect: Exclude<document_d_exports.TextEffect, "none">;
 };
 type FootnoteRefAttrs = {
+  occurrenceId: string;
   id: string | number;
   noteType?: "footnote" | "endnote";
   vertAlign?: "baseline" | "superscript";

package/dist/prosemirror/schema/nodes.d.ts

@@ -272,6 +272,8 @@ type ParagraphAttrs = {
    * paragraph. `TableCellAttrs._resolvedBorders` is the same device.
    */
   _resolvedFormatting?: document_d_exports.ParagraphFormatting;
+  /** Style-only inheritance baseline, before numbering-level indentation. PM-only. */
+  _styleResolvedFormatting?: document_d_exports.ParagraphFormatting;
   /** Import-effective spacing baseline for HTML auto-spacing detection.
    *  PM-only; never serialized back into DOCX formatting. */
   _autospacingBase?: {

package/dist/prosemirror/styles/paragraphStyleCascade.js

@@ -59,7 +59,10 @@ function paragraphStyleCascadeAttrs({ styleId, formatting, styleResolver, tableP
 	};
 	const stylePpr = styleResolver.resolveParagraphStyleInTable(styleId, tableParagraphOverlay).paragraphFormatting;
 	const resolvedFormatting = styleResolvedParagraphFormatting(stylePpr);
-	if (resolvedFormatting) attrs._resolvedFormatting = resolvedFormatting;
+	if (resolvedFormatting) {
+		attrs._resolvedFormatting = resolvedFormatting;
+		attrs._styleResolvedFormatting = resolvedFormatting;
+	}
 	set("alignment", formatting?.alignment ?? stylePpr?.alignment);
 	set("alignmentFromStyle", stylePpr?.alignment);
 	set("spaceBefore", formatting?.spaceBefore ?? stylePpr?.spaceBefore);

package/dist/prosemirror/styles/resolvedStyleAttrs.d.ts

@@ -1,3 +1,4 @@
+import { document_d_exports } from "../../types/document.js";
 import { ParagraphAttrs, ParagraphAttrsPatch } from "../schema/nodes.js";
 import { ResolvedParagraphStyle } from "./styleResolver.js";
 import { NumberingMap } from "../../docx/numberingParser.js";
@@ -38,17 +39,18 @@ declare function listAttrsFromNumbering(numPr: {
   numId: number;
   ilvl: number;
 }, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
-/**
- * The numbering level's indentation a directly numbered paragraph reads as its
- * own where it states none: the load path folds the level's `w:ind` into the
- * paragraph (a direct `w:ind` wins per group, left vs first line/hanging), so
- * a paragraph a command numbers carries it too, and the save writes it where a
- * reopen reads it back.
- */
-declare function listLevelIndentAttrPatch(stated: DirectParagraphIndentation | undefined, numPr: {
-  numId: number;
-  ilvl: number;
-}, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
+type ListIndentationProvenanceOptions = {
+  direct: DirectParagraphIndentation | undefined;
+  styleFormatting: document_d_exports.ParagraphFormatting | undefined;
+  numberingSource: "style" | "paragraph";
+  numPr: {
+    numId: number;
+    ilvl: number;
+  } | undefined;
+  numbering: NumberingMap | null | undefined;
+};
+/** Project effective indentation and both inheritance layers together. */
+declare function listIndentationProvenancePatch({ direct, styleFormatting, numberingSource, numPr, numbering }: ListIndentationProvenanceOptions): ParagraphAttrsPatch;
 /**
  * The indentation a paragraph leaving its list keeps: the level's indentation
  * it only read from its numbering goes with the numbering, back to what its
@@ -57,11 +59,9 @@ declare function listLevelIndentAttrPatch(stated: DirectParagraphIndentation | u
  */
 declare function listLevelIndentRemovalPatch(attrs: Readonly<ParagraphAttrs>, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
 /** Recompute every level-dependent attr when a paragraph changes list level. */
-declare function listLevelAttrPatch(attrs: {
-  listImplicitChildLevelAdvances?: number | null;
-}, numPr: {
+declare function listLevelAttrPatch(attrs: Pick<ParagraphAttrs, "listImplicitChildLevelAdvances" | "_originalFormatting" | "_resolvedFormatting" | "_styleResolvedFormatting" | "numPr" | "numPrFromStyle" | "indentLeft" | "indentRight" | "indentFirstLine" | "hangingIndent">, numPr: {
   numId: number;
   ilvl: number;
 }, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
 //#endregion
-export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listLevelAttrPatch, listLevelIndentAttrPatch, listLevelIndentRemovalPatch, paragraphAttrsFromResolvedStyle };
+export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listIndentationProvenancePatch, listLevelAttrPatch, listLevelIndentRemovalPatch, paragraphAttrsFromResolvedStyle };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -6,6 +6,7 @@ import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
+import { directParagraphIndentation, paragraphIndentationAttrPatch, paragraphIndentationFromFormatting, withDirectParagraphIndentation } from "../paragraphIndentation.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.ts
 /**
 * Shared helper for projecting a resolved paragraph style onto ProseMirror
@@ -48,6 +49,7 @@ function paragraphAttrsFromResolvedStyle(resolved, identity) {
 		borders: ppr?.borders ?? null,
 		defaultTextFormatting: hasRunFormatting ? runFormatting : null,
 		_resolvedFormatting: styleResolvedParagraphFormatting(ppr),
+		_styleResolvedFormatting: styleResolvedParagraphFormatting(ppr),
 		_autospacingBase: autospacingBaseFromResolvedParagraphFormatting(ppr),
 		_tableOfContentsLevel: tableOfContentsStyleLevel(identity) ?? null
 	};
@@ -84,19 +86,26 @@ function listAttrsFromResolvedStyle(resolved, numbering) {
 		numId,
 		ilvl
 	}, numbering);
-	const level = numbering?.getLevel(numId, ilvl);
 	attrs.numPrFromStyle = paragraphNumberingAttr(paragraphNumberingReference({
 		numId,
 		ilvl
 	}));
-	const ppr = resolved.paragraphFormatting;
-	if (level?.pPr) {
-		if (ppr?.indentLeft === void 0 && level.pPr.indentLeft !== void 0) attrs.indentLeft = level.pPr.indentLeft;
-		if (!(ppr?.indentFirstLine !== void 0 || ppr?.hangingIndent !== void 0) && numberingLevelHasMarkerSlot(level)) {
-			if (level.pPr.indentFirstLine !== void 0) attrs.indentFirstLine = level.pPr.indentFirstLine;
-			if (level.pPr.hangingIndent !== void 0) attrs.hangingIndent = level.pPr.hangingIndent;
-		}
-	}
+	Object.assign(attrs, listIndentationProvenancePatch({
+		direct: void 0,
+		styleFormatting: resolved.paragraphFormatting,
+		numberingSource: "style",
+		numPr: {
+			numId,
+			ilvl
+		},
+		numbering
+	}));
+	for (const key of [
+		"indentLeft",
+		"indentRight",
+		"indentFirstLine"
+	]) if (attrs[key] == null) Reflect.deleteProperty(attrs, key);
+	if (attrs.indentFirstLine === void 0 && resolved.paragraphFormatting?.hangingIndent === void 0) Reflect.deleteProperty(attrs, "hangingIndent");
 	return attrs;
 }
 /** Project one resolved numbering level into the complete editor attr group. */
@@ -115,9 +124,9 @@ function listAttrsFromNumbering(numPr, numbering) {
 /**
 * The numbering level's indentation a directly numbered paragraph reads as its
 * own where it states none: the load path folds the level's `w:ind` into the
-* paragraph (a direct `w:ind` wins per group, left vs first line/hanging), so
-* a paragraph a command numbers carries it too, and the save writes it where a
-* reopen reads it back.
+* paragraph (a direct `w:ind` wins per group, left vs first line/hanging).
+* Keep this projection private: callers use the paired provenance helper so
+* effective level values cannot be mistaken for authored indentation.
 */
 function listLevelIndentAttrPatch(stated, numPr, numbering) {
 	const level = numbering?.getLevel(numPr.numId, numPr.ilvl);
@@ -130,6 +139,33 @@ function listLevelIndentAttrPatch(stated, numPr, numbering) {
 	}
 	return patch;
 }
+/** Project effective indentation and both inheritance layers together. */
+function listIndentationProvenancePatch({ direct, styleFormatting, numberingSource, numPr, numbering }) {
+	const style = {
+		...styleResolvedParagraphFormatting(styleFormatting),
+		...styleFormatting?.hangingIndent === void 0 ? {} : { hangingIndent: styleFormatting.hangingIndent }
+	};
+	const level = numPr === void 0 ? {} : listLevelIndentAttrPatch(numberingSource === "style" ? paragraphIndentationFromFormatting(style) : void 0, numPr, numbering);
+	if (level.indentLeft === 0 && style.indentLeft === void 0) Reflect.deleteProperty(level, "indentLeft");
+	if (level.indentFirstLine === 0 && style.indentFirstLine === void 0 && style.hangingIndent === void 0) {
+		Reflect.deleteProperty(level, "indentFirstLine");
+		Reflect.deleteProperty(level, "hangingIndent");
+	}
+	const resolved = {
+		...style,
+		...typeof level.indentLeft === "number" ? { indentLeft: level.indentLeft } : {},
+		...typeof level.indentFirstLine === "number" ? { indentFirstLine: level.indentFirstLine } : {},
+		...typeof level.hangingIndent === "boolean" ? { hangingIndent: level.hangingIndent } : {}
+	};
+	return {
+		...paragraphIndentationAttrPatch({
+			direct,
+			inherited: paragraphIndentationFromFormatting(resolved)
+		}),
+		_resolvedFormatting: Object.keys(resolved).length === 0 ? null : resolved,
+		_styleResolvedFormatting: Object.keys(style).length === 0 ? null : style
+	};
+}
 /**
 * The indentation a paragraph leaving its list keeps: the level's indentation
 * it only read from its numbering goes with the numbering, back to what its
@@ -138,28 +174,33 @@ function listLevelIndentAttrPatch(stated, numPr, numbering) {
 */
 function listLevelIndentRemovalPatch(attrs, numbering) {
 	if (attrs.numPr?.kind !== "reference") return {};
-	const level = numbering?.getLevel(attrs.numPr.numId, attrs.numPr.ilvl ?? 0);
-	if (!level?.pPr) return {};
-	const resolved = attrs.numPrFromStyle != null ? void 0 : attrs._resolvedFormatting;
-	const patch = {};
-	if (level.pPr.indentLeft !== void 0 && attrs.indentLeft === level.pPr.indentLeft) patch.indentLeft = resolved?.indentLeft ?? null;
-	if (level.pPr.indentFirstLine !== void 0 && attrs.indentFirstLine === level.pPr.indentFirstLine && attrs.hangingIndent === (level.pPr.hangingIndent ?? false)) {
-		patch.indentFirstLine = resolved?.indentFirstLine ?? null;
-		patch.hangingIndent = resolved?.hangingIndent ?? false;
-	}
-	return patch;
+	const direct = directParagraphIndentation(attrs);
+	return {
+		...listIndentationProvenancePatch({
+			direct,
+			styleFormatting: attrs._styleResolvedFormatting,
+			numberingSource: "paragraph",
+			numPr: void 0,
+			numbering
+		}),
+		_originalFormatting: withDirectParagraphIndentation(attrs._originalFormatting, direct) ?? null
+	};
 }
 /** Recompute every level-dependent attr when a paragraph changes list level. */
 function listLevelAttrPatch(attrs, numPr, numbering) {
-	const level = numbering?.getLevel(numPr.numId, numPr.ilvl);
-	const hasMarkerSlot = level ? numberingLevelHasMarkerSlot(level) : false;
+	const direct = directParagraphIndentation(attrs);
 	return {
 		...listAttrsFromNumbering(numPr, numbering),
 		listImplicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances ?? null,
-		indentLeft: level?.pPr?.indentLeft ?? null,
-		indentFirstLine: hasMarkerSlot ? level?.pPr?.indentFirstLine ?? null : null,
-		hangingIndent: hasMarkerSlot ? level?.pPr?.hangingIndent ?? null : null
+		...listIndentationProvenancePatch({
+			direct,
+			styleFormatting: attrs._styleResolvedFormatting,
+			numberingSource: attrs.numPrFromStyle == null ? "paragraph" : "style",
+			numPr,
+			numbering
+		}),
+		_originalFormatting: withDirectParagraphIndentation(attrs._originalFormatting, direct) ?? null
 	};
 }
 //#endregion
-export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listLevelAttrPatch, listLevelIndentAttrPatch, listLevelIndentRemovalPatch, paragraphAttrsFromResolvedStyle };
+export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listIndentationProvenancePatch, listLevelAttrPatch, listLevelIndentRemovalPatch, paragraphAttrsFromResolvedStyle };

package/dist/prosemirror/textInput.d.ts

@@ -13,6 +13,10 @@ type TextInput = {
   to: number;
 };
 declare const dispatchEditorTextInput: <TView extends TextInputDispatchTarget<TView>>(view: TView, input: string | TextInput) => void;
+declare const getEditorInputTargetRange: (view: EditorView, event: InputEvent) => {
+  from: number;
+  to: number;
+} | null;
 /** Shared DOM boundary for editor runtimes and standalone suggestion views. */
 declare const handleEditorBeforeInput: (view: EditorView, event: InputEvent) => boolean;
 /**
@@ -23,4 +27,4 @@ declare const afterNativeCompositionFlush: (callback: () => void) => void;
 /** Route committed text through the model before the browser mutates mark spans. */
 declare const createTextInputPlugin: () => Plugin<any>;
 //#endregion
-export { afterNativeCompositionFlush, createTextInputPlugin, dispatchEditorTextInput, handleEditorBeforeInput };
+export { afterNativeCompositionFlush, createTextInputPlugin, dispatchEditorTextInput, getEditorInputTargetRange, handleEditorBeforeInput };

package/dist/prosemirror/textInput.js

@@ -19,7 +19,7 @@ const dispatchEditorTextInput = (view, input) => {
 	};
 	if (!view.someProp("handleTextInput", (handler) => handler(view, from, to, text, defaultTransaction))) view.dispatch(defaultTransaction());
 };
-const replacementSelection = (view, event) => {
+const getEditorInputTargetRange = (view, event) => {
 	if (typeof event.getTargetRanges !== "function") return null;
 	const ranges = event.getTargetRanges();
 	if (ranges.length !== 1) return null;
@@ -39,7 +39,7 @@ const handleEditorBeforeInput = (view, event) => {
 	if (event.inputType !== "insertText" && event.inputType !== "insertReplacementText") return false;
 	const text = event.data ?? (event.dataTransfer?.types.includes("text/plain") ? event.dataTransfer.getData("text/plain") : null);
 	if (text === null) return false;
-	const selection = event.inputType === "insertReplacementText" ? replacementSelection(view, event) : view.state.selection;
+	const selection = event.inputType === "insertReplacementText" ? getEditorInputTargetRange(view, event) : view.state.selection;
 	if (!selection) return false;
 	event.preventDefault();
 	dispatchEditorTextInput(view, {
@@ -78,4 +78,4 @@ const createTextInputPlugin = () => {
 	} } });
 };
 //#endregion
-export { afterNativeCompositionFlush, createTextInputPlugin, dispatchEditorTextInput, handleEditorBeforeInput };
+export { afterNativeCompositionFlush, createTextInputPlugin, dispatchEditorTextInput, getEditorInputTargetRange, handleEditorBeforeInput };

package/dist/prosemirror/trackedRevisionPath.d.ts

@@ -13,5 +13,9 @@ type EnclosingInsertionAncestorsOptions = {
 };
 /** The deletion's ancestor path, with the insertion it sits in as the outermost layer. */
 declare const enclosingInsertionAncestors: ({ insertionMark, ancestors, node }: EnclosingInsertionAncestorsOptions) => readonly TrackedRevisionAncestor[];
+/** The authored revision layers already owned by a mark, outermost first. */
+declare const trackedRevisionPathOf: (mark: Mark) => readonly TrackedRevisionAncestor[];
+/** Promote a surviving existing layer; callers cannot supply a fresh identity. */
+declare const retainedTrackedRevisionMark: (mark: Mark, keepLayer: (layer: TrackedRevisionAncestor) => boolean) => Mark | null;
 //#endregion
-export { enclosingInsertionAncestors, inlineWrapperStackOf, trackedRevisionLayerOf };
+export { enclosingInsertionAncestors, inlineWrapperStackOf, retainedTrackedRevisionMark, trackedRevisionLayerOf, trackedRevisionPathOf };

package/dist/prosemirror/trackedRevisionPath.js

@@ -1,5 +1,6 @@
 import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "./attrs/index.js";
 import { INLINE_WRAPPER_MARK_NAME } from "./extensions/marks/InlineWrapperExtension.js";
+import { panic } from "better-result";
 //#region src/prosemirror/trackedRevisionPath.ts
 /** The wrappers `node` sits inside, outermost first; empty when it sits in none. */
 const inlineWrapperStackOf = (node) => {
@@ -29,5 +30,42 @@ const enclosingInsertionAncestors = ({ insertionMark, ancestors, node }) => {
 	if (ancestors.some(({ revisionId }) => revisionId === attrs.revisionId)) return ancestors;
 	return [trackedRevisionLayerOf(insertionMark, node), ...ancestors];
 };
+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
+	};
+};
+/** The authored revision layers already owned by a mark, outermost first. */
+const trackedRevisionPathOf = (mark) => [...expectTrackedChangeMarkAttrs(mark)._docxRevisionAncestors ?? [], revisionLayerOf(mark)];
+/** Promote a surviving existing layer; callers cannot supply a fresh identity. */
+const retainedTrackedRevisionMark = (mark, keepLayer) => {
+	const remaining = trackedRevisionPathOf(mark).filter(keepLayer);
+	const active = remaining.at(-1);
+	if (!active) return null;
+	const name = active.type === "insertion" || active.type === "moveTo" ? "insertion" : "deletion";
+	const type = mark.type.schema.marks[name];
+	if (!type) panic("A nested tracked revision has no editor mark type");
+	return 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
+	});
+};
 //#endregion
-export { enclosingInsertionAncestors, inlineWrapperStackOf, trackedRevisionLayerOf };
+export { enclosingInsertionAncestors, inlineWrapperStackOf, retainedTrackedRevisionMark, trackedRevisionLayerOf, trackedRevisionPathOf };

package/dist/prosemirror/validation.js

@@ -2,7 +2,7 @@ import { readNoteMarkerAttrs } from "../internal/noteMarkerAttrs.js";
 import { readBlockCustomXmlAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
 import { readBookmarkBoundaryAttrs } from "./bookmarkBoundaryAttrs.js";
 import { readCommentReferenceAttrs } from "./commentReferenceAttrs.js";
-import { INLINE_WRAPPER_MARK_NAME } from "./extensions/marks/InlineWrapperExtension.js";
+import { fieldRequiresStructuredContent } from "./fieldRepresentation.js";
 import { readMoveRangeBoundaryAttrs } from "./moveRangeBoundaryAttrs.js";
 import { readRangeAnchorAttrs } from "./rangeAnchorAttrs.js";
 import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
@@ -249,8 +249,6 @@ const validateNodeAttrs = (node, path, issues) => {
 				if (fieldAttrs.ok) {
 					const hasStructuredHyperlink = node.content.content.some((child) => child.marks.some((mark) => mark.type.name === "hyperlink"));
 					const hasPageBreakCarrier = node.content.content.some((child) => child.type.name === "pageBreakRun");
-					const hasPreservedCapture = node.content.content.some((child) => child.type.name === "preservedXml");
-					const hasInlineWrapper = node.content.content.some((child) => child.marks.some((mark) => mark.type.name === INLINE_WRAPPER_MARK_NAME));
 					if (fieldAttrs.value.fieldKind === "complex" && !hasPageBreakCarrier) issues.push({
 						path: `${path}.content`,
 						message: "Complex fields cannot contain structured result children."
@@ -259,9 +257,9 @@ const validateNodeAttrs = (node, path, issues) => {
 						path: `${path}.content`,
 						message: "Complex field results cannot contain hyperlink content."
 					});
-					else if (!hasStructuredHyperlink && !hasPageBreakCarrier && !hasPreservedCapture && !hasInlineWrapper) issues.push({
+					else if (!fieldRequiresStructuredContent(node.content.content)) issues.push({
 						path: `${path}.content`,
-						message: "Structured simple fields require hyperlink, page-break, preserved or wrapper content."
+						message: "Structured simple fields require non-text, hyperlink, wrapper or tracked content."
 					});
 					node.forEach((child, _offset, index) => {
 						const childPath = `${path}.content[${index}]`;

package/dist/prosemirror/yjsDocumentMetadata.d.ts

@@ -8,14 +8,20 @@ import * as Y from "yjs";
  */
 type AttrSchemaMigrationStep = (fragment: Y.XmlFragment) => number;
 /** Every attr-schema version this build reads, oldest first, with no gaps. */
-declare const FOLIO_YJS_ATTR_SCHEMA_VERSIONS: readonly [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+declare const FOLIO_YJS_ATTR_SCHEMA_VERSIONS: readonly [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 /** An attr-schema version this build can read. */
 type FolioYjsAttrSchemaVersion = (typeof FOLIO_YJS_ATTR_SCHEMA_VERSIONS)[number];
 /**
  * The attr-schema version this build writes. Derived against the migration map
  * so the constant and the map cannot disagree.
  */
-declare const FOLIO_YJS_ATTR_SCHEMA_VERSION = 11;
+declare const FOLIO_YJS_ATTR_SCHEMA_VERSION = 12;
+declare const FolioYjsNoteReferenceSchemaError_base: import("better-result").TaggedErrorClass<"FolioYjsNoteReferenceSchemaError">;
+declare class FolioYjsNoteReferenceSchemaError extends FolioYjsNoteReferenceSchemaError_base<{
+  message: string;
+  schemaVersion: FolioYjsAttrSchemaVersion;
+  requiredSchemaVersion: FolioYjsAttrSchemaVersion;
+}> {}
 /**
  * The steps that carry a snapshot written under `fromVersion` up to
  * {@link FOLIO_YJS_ATTR_SCHEMA_VERSION}, in order. Empty when the snapshot is
@@ -70,4 +76,4 @@ declare const writeYjsDocumentMetadata: (ydoc: Y.Doc, document: Node) => void;
 declare const readYjsParagraphSourceContract: (ydoc: Y.Doc) => string | null;
 declare const withParagraphSourceContract: (document: Node, contract: string) => Node;
 //#endregion
-export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };
+export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };

package/dist/prosemirror/yjsDocumentMetadata.js

@@ -1,4 +1,5 @@
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, getProseDocumentParagraphPropertySourceContract } from "../docx/paragraphPropertySource.js";
+import { isNoteReferenceOccurrenceId } from "./noteReferenceOccurrenceId.js";
 import { mintSectionProperties, parseSectionBreakType } from "./sectionCarrier.js";
 import { Result, TaggedError, panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, outlineLevelFromStatedValue, paragraphNumberingFromSlots } from "@stll/docx-core/model";
@@ -473,7 +474,8 @@ const FOLIO_YJS_ATTR_SCHEMA_VERSIONS = [
 	8,
 	9,
 	10,
-	11
+	11,
+	12
 ];
 /**
 * The one place a persisted attr-shape change is decided.
@@ -497,13 +499,39 @@ const ATTR_SCHEMA_MIGRATIONS = {
 	8: mintSectionPropertiesFromBreakType,
 	9: dropUnstatedPlaceholderFlags,
 	10: renamePageBreakRunOwnerMarkAttr,
-	11: "current"
+	11: stampMarkerOnly,
+	12: "current"
 };
 /**
 * The attr-schema version this build writes. Derived against the migration map
 * so the constant and the map cannot disagree.
 */
-const FOLIO_YJS_ATTR_SCHEMA_VERSION = 11;
+const FOLIO_YJS_ATTR_SCHEMA_VERSION = 12;
+var FolioYjsNoteReferenceSchemaError = class extends TaggedError("FolioYjsNoteReferenceSchemaError") {};
+/** Check before any migration mutates the snapshot or any PM builder can drop text. */
+const requireNoteOccurrenceAttribution = (fragment, schemaVersion) => {
+	const visit = (node) => {
+		for (const child of node.toArray()) {
+			if (typeof child === "string") continue;
+			if (!isXmlText(child)) {
+				if ("toArray" in child) visit(child);
+				continue;
+			}
+			for (const op of child.toDelta()) {
+				const attributes = op.attributes;
+				if (!isRecord(attributes) || attributes["footnoteRef"] == null) continue;
+				const reference = attributes["footnoteRef"];
+				if (isRecord(reference) && isNoteReferenceOccurrenceId(reference["occurrenceId"])) continue;
+				throw new FolioYjsNoteReferenceSchemaError({
+					schemaVersion,
+					requiredSchemaVersion: 12,
+					message: `Yjs schema ${schemaVersion} has unattributed note references; schema 12 requires occurrence identities. Rebuild the collaboration state from the saved DOCX.`
+				});
+			}
+		}
+	};
+	visit(fragment);
+};
 /**
 * The steps that carry a snapshot written under `fromVersion` up to
 * {@link FOLIO_YJS_ATTR_SCHEMA_VERSION}, in order. Empty when the snapshot is
@@ -528,7 +556,8 @@ const attrSchemaMigrationSteps = (fromVersion) => FOLIO_YJS_ATTR_SCHEMA_VERSIONS
 * Returns how many elements the steps rewrote.
 */
 const applyAttrSchemaMigrations = (ydoc, fragment, fromVersion) => {
-	if (fromVersion === 11) return 0;
+	requireNoteOccurrenceAttribution(fragment, fromVersion);
+	if (fromVersion === 12) return 0;
 	let rewritten = 0;
 	ydoc.transact(() => {
 		for (const step of attrSchemaMigrationSteps(fromVersion)) rewritten += step(fragment);
@@ -538,7 +567,7 @@ const applyAttrSchemaMigrations = (ydoc, fragment, fromVersion) => {
 };
 /** Raised when a snapshot's attr-schema marker is ahead of the running code. */
 var FolioYjsAttrSchemaVersionError = class extends TaggedError("FolioYjsAttrSchemaVersionError") {};
-const isReadableVersion = (marker) => typeof marker === "number" && Number.isInteger(marker) && marker >= 0 && marker <= 11;
+const isReadableVersion = (marker) => typeof marker === "number" && Number.isInteger(marker) && marker >= 0 && marker <= 12;
 /**
 * The attr-schema version a collaboration document was written under.
 *
@@ -556,7 +585,7 @@ const readYjsAttrSchemaVersion = (ydoc) => {
 	return Result.err(new FolioYjsAttrSchemaVersionError({
 		marker,
 		message: "The collaboration snapshot was written by a newer Folio attr schema than this build reads.",
-		supportedVersion: 11
+		supportedVersion: 12
 	}));
 };
 const proseDocumentParagraphSourceContract = (document) => {
@@ -564,7 +593,7 @@ const proseDocumentParagraphSourceContract = (document) => {
 };
 /** Stamp the attr-schema version of the build that wrote the current fragment. */
 const writeYjsAttrSchemaVersion = (ydoc) => {
-	ydoc.getMap(FOLIO_YJS_METADATA_MAP_NAME).set(ATTR_SCHEMA_VERSION_KEY, 11);
+	ydoc.getMap(FOLIO_YJS_METADATA_MAP_NAME).set(ATTR_SCHEMA_VERSION_KEY, 12);
 };
 /**
 * Write both metadata bindings for a freshly seeded collaboration document.
@@ -589,4 +618,4 @@ const withParagraphSourceContract = (document, contract) => {
 	}, document.content, document.marks);
 };
 //#endregion
-export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersionError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };
+export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };