@stll/folio-core 0.45.0 → 0.47.0

package/dist/prosemirror/sectionCarrier.d.ts

@@ -0,0 +1,37 @@
+import { document_d_exports } from "../types/document.js";
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/sectionCarrier.d.ts
+/**
+ * `ST_SectionMark` in full (§17.18.77). The list is total over the model union:
+ * `sectionBreakTypeOf` returns a record's `SectionStart` as a
+ * `SectionBreakType`, so a member missing here fails to compile rather than
+ * going typeless to every reader. Which members the *insert* commands offer is
+ * a separate, narrower question (`InsertableSectionBreak`).
+ */
+declare const SECTION_BREAK_TYPES: readonly ["nextPage", "nextColumn", "continuous", "evenPage", "oddPage"];
+/** A section start a `w:sectPr` can state. */
+type SectionBreakType = (typeof SECTION_BREAK_TYPES)[number];
+/** A break type read off an untrusted boundary (a `data-` attribute, a snapshot). */
+declare const parseSectionBreakType: (value: unknown) => SectionBreakType | null;
+/** The section record a paragraph holds, or `null` when it ends no section. */
+declare const sectionPropertiesOf: (paragraph: Node) => document_d_exports.SectionProperties | null;
+/**
+ * The break type a section record states, or `null` when it states none.
+ *
+ * The single derivation every reader goes through. Every producer of a record
+ * already validated `w:type` against the enumeration (the parser, the insert
+ * commands, the Yjs migration's `parseSectionBreakType`), so the field needs no
+ * second check here; declaring the narrower return type is what proves
+ * `SECTION_BREAK_TYPES` still covers the model union.
+ */
+declare const sectionBreakTypeOf: (properties: document_d_exports.SectionProperties | null | undefined) => SectionBreakType | null;
+/**
+ * Mint the one record a newly inserted break carries.
+ *
+ * A minted record states only its type: every other setting of the new section
+ * is inherited from the section that follows it, which is what a reader of the
+ * package does with a `w:sectPr` that omits them.
+ */
+declare const mintSectionProperties: (breakType: SectionBreakType) => document_d_exports.SectionProperties;
+//#endregion
+export { SECTION_BREAK_TYPES, SectionBreakType, mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf, sectionPropertiesOf };

package/dist/prosemirror/sectionCarrier.js

@@ -0,0 +1,40 @@
+//#region src/prosemirror/sectionCarrier.ts
+/**
+* `ST_SectionMark` in full (§17.18.77). The list is total over the model union:
+* `sectionBreakTypeOf` returns a record's `SectionStart` as a
+* `SectionBreakType`, so a member missing here fails to compile rather than
+* going typeless to every reader. Which members the *insert* commands offer is
+* a separate, narrower question (`InsertableSectionBreak`).
+*/
+const SECTION_BREAK_TYPES = [
+	"nextPage",
+	"nextColumn",
+	"continuous",
+	"evenPage",
+	"oddPage"
+];
+const isSectionBreakType = (value) => SECTION_BREAK_TYPES.some((type) => type === value);
+/** A break type read off an untrusted boundary (a `data-` attribute, a snapshot). */
+const parseSectionBreakType = (value) => isSectionBreakType(value) ? value : null;
+/** The section record a paragraph holds, or `null` when it ends no section. */
+const sectionPropertiesOf = (paragraph) => paragraph.attrs["_sectionProperties"] ?? null;
+/**
+* The break type a section record states, or `null` when it states none.
+*
+* The single derivation every reader goes through. Every producer of a record
+* already validated `w:type` against the enumeration (the parser, the insert
+* commands, the Yjs migration's `parseSectionBreakType`), so the field needs no
+* second check here; declaring the narrower return type is what proves
+* `SECTION_BREAK_TYPES` still covers the model union.
+*/
+const sectionBreakTypeOf = (properties) => properties?.sectionStart ?? null;
+/**
+* Mint the one record a newly inserted break carries.
+*
+* A minted record states only its type: every other setting of the new section
+* is inherited from the section that follows it, which is what a reader of the
+* package does with a `w:sectPr` that omits them.
+*/
+const mintSectionProperties = (breakType) => ({ sectionStart: breakType });
+//#endregion
+export { SECTION_BREAK_TYPES, mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf, sectionPropertiesOf };

package/dist/prosemirror/selectionState.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../types/document.js";
+import { ListState } from "./listState.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/selectionState.d.ts
 /**
@@ -21,6 +22,8 @@ type SelectionSnapshot = {
   startParagraphIndex: number;
   /** End paragraph index */
   endParagraphIndex: number;
+  /** Which list the selection is in, resolved against the numbering definitions. */
+  listState: ListState;
 };
 /** Compatibility name for the public toolbar selection contract. */
 type SelectionState = SelectionSnapshot;

package/dist/prosemirror/selectionState.js

@@ -1,6 +1,8 @@
 import { FONT_THEME_VALUES } from "../types/documentEnumValues.js";
 import { expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectHighlightMarkAttrs, expectParagraphAttrs, expectStrikeMarkAttrs, expectTextColorMarkAttrs, expectUnderlineMarkAttrs } from "./attrs/index.js";
+import { resolveListState } from "./listState.js";
 import { directionIsRtl } from "./paragraphDirection.js";
+import { getDocumentNumbering } from "./plugins/documentNumbering.js";
 import { collectMarksInRange } from "./selectionMarks.js";
 //#region src/prosemirror/selectionState.ts
 const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
@@ -43,7 +45,8 @@ function extractSelectionSnapshot(state) {
 		paragraphFormatting,
 		styleId,
 		startParagraphIndex,
-		endParagraphIndex
+		endParagraphIndex,
+		listState: resolveListState(getDocumentNumbering(state), paragraphFormatting.numPr)
 	};
 }
 /** Compatibility entry point used by existing React and Vue integrations. */

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

@@ -1,3 +1,4 @@
+import { ParagraphAttrsPatch } from "../schema/nodes.js";
 import { ResolvedParagraphStyle } from "./styleResolver.js";
 import { NumberingMap } from "../../docx/numberingParser.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.d.ts
@@ -11,7 +12,7 @@ type ResolvedStyleIdentity = {
  * style's properties (e.g. a heading's spacing) never leak through. Returns
  * a partial attrs object to merge over the paragraph's existing attrs.
  */
-declare function paragraphAttrsFromResolvedStyle(resolved: ResolvedParagraphStyle, identity: ResolvedStyleIdentity): Record<string, unknown>;
+declare function paragraphAttrsFromResolvedStyle(resolved: ResolvedParagraphStyle, identity: ResolvedStyleIdentity): ParagraphAttrsPatch;
 /**
  * The list attrs a style's `w:pPr/w:numPr` controls (numbering reference plus
  * the baked marker-rendering attrs that `toProseDoc` normally derives from
@@ -30,18 +31,18 @@ declare function paragraphAttrsFromResolvedStyle(resolved: ResolvedParagraphStyl
  * paragraph's inline LISTNUM fields, which the picker has no view of. A
  * subsequent save + reload re-derives them from the document content.
  */
-declare function listAttrsFromResolvedStyle(resolved: ResolvedParagraphStyle, numbering: NumberingMap | null | undefined): Record<string, unknown> | null;
+declare function listAttrsFromResolvedStyle(resolved: ResolvedParagraphStyle, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch | null;
 /** Project one resolved numbering level into the complete editor attr group. */
 declare function listAttrsFromNumbering(numPr: {
   numId: number;
   ilvl: number;
-}, numbering: NumberingMap | null | undefined): Record<string, unknown>;
+}, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
 /** Recompute every level-dependent attr when a paragraph changes list level. */
 declare function listLevelAttrPatch(attrs: {
   listImplicitChildLevelAdvances?: number | null;
 }, numPr: {
   numId: number;
   ilvl: number;
-}, numbering: NumberingMap | null | undefined): Record<string, unknown>;
+}, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
 //#endregion
 export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listLevelAttrPatch, paragraphAttrsFromResolvedStyle };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -1,9 +1,10 @@
 import { computeListRendering, numberingLevelHasMarkerSlot } from "../../docx/numberingParser.js";
-import { isNumberingReference } from "../../docx/numberingReference.js";
+import { paragraphNumberingReference } from "../../docx/numberingReference.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
+import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.ts
 /**
@@ -77,22 +78,23 @@ function autospacingBaseFromResolvedParagraphFormatting(ppr) {
 */
 function listAttrsFromResolvedStyle(resolved, numbering) {
 	const numPr = resolved.paragraphFormatting?.numPr;
-	if (!numPr || !isNumberingReference(numPr.numId)) return null;
+	if (numPr?.kind !== "reference") return null;
+	const { numId, ilvl = 0 } = numPr;
 	const attrs = listAttrsFromNumbering({
-		numId: numPr.numId,
-		ilvl: numPr.ilvl ?? 0
+		numId,
+		ilvl
 	}, numbering);
-	const level = numbering?.getLevel(numPr.numId, numPr.ilvl ?? 0);
-	attrs["numPrFromStyle"] = {
-		numId: numPr.numId,
-		ilvl: numPr.ilvl ?? 0
-	};
+	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?.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;
+			if (level.pPr.indentFirstLine !== void 0) attrs.indentFirstLine = level.pPr.indentFirstLine;
+			if (level.pPr.hangingIndent !== void 0) attrs.hangingIndent = level.pPr.hangingIndent;
 		}
 	}
 	return attrs;
@@ -106,7 +108,7 @@ function listAttrsFromNumbering(numPr, numbering) {
 	const rendering = numbering ? computeListRendering(targetNumPr, numbering) : null;
 	return {
 		...CLEARED_LIST_RENDERING_ATTRS,
-		numPr: targetNumPr,
+		numPr: paragraphNumberingAttr(paragraphNumberingReference(targetNumPr)),
 		...rendering && listRenderingAttrPatch(rendering)
 	};
 }

package/dist/prosemirror/tableResize.js

@@ -1,3 +1,4 @@
+import { mergeTableCellAttrs } from "./attrs/index.js";
 //#region src/prosemirror/tableResize.ts
 /** 1px ≈ 15 twips at 96dpi (20 twips/pt × 72pt/in ÷ 96px/in). */
 const TWIPS_PER_PIXEL = 15;
@@ -88,12 +89,11 @@ function commitColumnResize(view, opts) {
 			const colspan = cell.attrs["colspan"] || 1;
 			if (cellColIdx === colIdx || cellColIdx === colIdx + 1) {
 				const newWidth = cellColIdx === colIdx ? newLeft : newRight;
-				tr.setNodeMarkup(tr.mapping.map(cellOffset), void 0, {
-					...cell.attrs,
+				tr.setNodeMarkup(tr.mapping.map(cellOffset), void 0, mergeTableCellAttrs(cell, {
 					width: newWidth,
 					widthType: "dxa",
 					colwidth: null
-				});
+				}));
 			}
 			cellOffset += cell.nodeSize;
 			cellColIdx += colspan;
@@ -145,12 +145,11 @@ function commitRightEdgeResize(view, opts) {
 		let cellColIdx = 0;
 		row.forEach((cell) => {
 			const colspan = cell.attrs["colspan"] || 1;
-			if (cellColIdx === colIdx) tr.setNodeMarkup(tr.mapping.map(cellOffset), void 0, {
-				...cell.attrs,
+			if (cellColIdx === colIdx) tr.setNodeMarkup(tr.mapping.map(cellOffset), void 0, mergeTableCellAttrs(cell, {
 				width: newWidth,
 				widthType: "dxa",
 				colwidth: null
-			});
+			}));
 			cellOffset += cell.nodeSize;
 			cellColIdx += colspan;
 		});

package/dist/prosemirror/trackedRunInlineAtoms.d.ts

@@ -11,11 +11,15 @@ type TrackedRunInlineAtomDisposition = "carry" | "field-carrier" | "outside-wrap
  */
 declare const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS: Readonly<{
   readonly bookmarkBoundary: "carry";
+  readonly commentReference: "transparent";
   readonly field: "field-carrier";
   readonly hardBreak: "carry";
   readonly image: "carry";
   readonly math: "carry";
+  readonly moveRangeBoundary: "transparent";
   readonly pageBreakRun: "page-break-carrier";
+  readonly preservedXml: "carry";
+  readonly rangeAnchor: "transparent";
   readonly renderedPageBreak: "transparent";
   readonly shape: "carry";
   readonly structuredField: "carry";

package/dist/prosemirror/trackedRunInlineAtoms.js

@@ -10,11 +10,15 @@ import { panic } from "better-result";
 */
 const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS = Object.freeze({
 	bookmarkBoundary: "carry",
+	commentReference: "transparent",
 	field: "field-carrier",
 	hardBreak: "carry",
 	image: "carry",
 	math: "carry",
+	moveRangeBoundary: "transparent",
 	pageBreakRun: "page-break-carrier",
+	preservedXml: "carry",
+	rangeAnchor: "transparent",
 	renderedPageBreak: "transparent",
 	shape: "carry",
 	structuredField: "carry",

package/dist/prosemirror/utils/extractTrackedChanges.d.ts

@@ -1,3 +1,4 @@
+import { PropertyRevisionCarrier } from "../revisionCarriers.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/utils/extractTrackedChanges.d.ts
 /**
@@ -20,18 +21,16 @@ type TrackedChangeEntry = {
    * - `paragraphMarkInsertion` / `paragraphMarkDeletion` — Enter /
    *   Backspace produced a tracked paragraph break (`<w:pPr><w:rPr><w:ins/>` /
    *   `<w:del/>`).
-   * - `paragraphPropertiesChanged` — formatting (alignment, spacing,
-   *   etc.) on the paragraph was changed (`<w:pPrChange>`).
-   * - `rowInserted` / `rowDeleted` / `rowPropertiesChanged` — table
-   *   row authored / removed / formatted (`<w:trPr><w:ins/>` / `<w:del/>`
-   *   / `<w:trPrChange>`).
-   * - `cellInserted` / `cellDeleted` / `cellMerged` /
-   *   `cellPropertiesChanged` — per-cell revisions
-   *   (`<w:cellIns>` / `<w:cellDel>` / `<w:cellMerge>` / `<w:tcPrChange>`).
-   * - `tablePropertiesChanged` — table-level formatting
-   *   (`<w:tblPrChange>`).
+   * - `rowInserted` / `rowDeleted` — table row authored / removed
+   *   (`<w:trPr><w:ins/>` / `<w:del/>`).
+   * - `cellInserted` / `cellDeleted` / `cellMerged` — per-cell structural
+   *   revisions (`<w:cellIns>` / `<w:cellDel>` / `<w:cellMerge>`).
+   * - {@link PropertyRevisionCarrier} — a tracked property revision carried on
+   *   a node's attrs (`<w:pPrChange>`, `<w:sectPrChange>`, `<w:tblPrChange>`,
+   *   `<w:tblPrExChange>`, `<w:trPrChange>`, `<w:tcPrChange>`). The set comes
+   *   from the site table, not from a list kept here.
    */
-  type: "insertion" | "deletion" | "replacement" | "runPropertiesChanged" | "paragraphMarkInsertion" | "paragraphMarkDeletion" | "paragraphPropertiesChanged" | "rowInserted" | "rowDeleted" | "rowPropertiesChanged" | "cellInserted" | "cellDeleted" | "cellMerged" | "cellPropertiesChanged" | "tableInserted" | "tableDeleted" | "tablePropertiesChanged";
+  type: "insertion" | "deletion" | "replacement" | "runPropertiesChanged" | "paragraphMarkInsertion" | "paragraphMarkDeletion" | "rowInserted" | "rowDeleted" | "cellInserted" | "cellDeleted" | "cellMerged" | "tableInserted" | "tableDeleted" | PropertyRevisionCarrier;
   /**
    * Affected text. For inline types this is the run's text; for
    * structural types it's the surrounding paragraph / cell content

package/dist/prosemirror/utils/extractTrackedChanges.js

@@ -1,4 +1,5 @@
 import { expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { nodePropertyRevisionSites, propertyRevisionMetadata, propertyRevisionRecords } from "../revisionCarriers.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 //#region src/prosemirror/utils/extractTrackedChanges.ts
 const EMPTY_RESULT = {
@@ -71,19 +72,6 @@ function extractTrackedChanges(state) {
 				to: pos + node.nodeSize,
 				revisionId: del.revisionId
 			});
-			const pPrChange = node.attrs["pPrChange"];
-			if (Array.isArray(pPrChange)) for (const entry of pPrChange) {
-				if (!entry?.info || typeof entry.info.id !== "number") continue;
-				raw.push({
-					type: "paragraphPropertiesChanged",
-					text: node.textContent || "",
-					author: entry.info.author || "",
-					date: entry.info.date ?? void 0,
-					from: pos,
-					to: pos + node.nodeSize,
-					revisionId: entry.info.id
-				});
-			}
 		}
 		if (node.type.name === "tableRow") {
 			const trIns = node.attrs["trIns"];
@@ -122,19 +110,6 @@ function extractTrackedChanges(state) {
 					entry
 				});
 			}
-			const trPrChange = node.attrs["trPrChange"];
-			if (Array.isArray(trPrChange)) for (const entry of trPrChange) {
-				if (!entry?.info || typeof entry.info.id !== "number") continue;
-				raw.push({
-					type: "rowPropertiesChanged",
-					text: node.textContent || "",
-					author: entry.info.author || "",
-					date: entry.info.date ?? void 0,
-					from: pos,
-					to: pos + node.nodeSize,
-					revisionId: entry.info.id
-				});
-			}
 		}
 		if (node.type.name === "tableCell" || node.type.name === "tableHeader") {
 			const cellMarker = node.attrs["cellMarker"];
@@ -168,34 +143,8 @@ function extractTrackedChanges(state) {
 					revisionId: change.info.id
 				});
 			}
-			const tcPrChange = node.attrs["tcPrChange"];
-			if (Array.isArray(tcPrChange)) for (const entry of tcPrChange) {
-				if (!entry?.info || typeof entry.info.id !== "number") continue;
-				raw.push({
-					type: "cellPropertiesChanged",
-					text: node.textContent || "",
-					author: entry.info.author || "",
-					date: entry.info.date ?? void 0,
-					from: pos,
-					to: pos + node.nodeSize,
-					revisionId: entry.info.id
-				});
-			}
 		}
 		if (node.type.name === "table") {
-			const tblPrChange = node.attrs["tblPrChange"];
-			if (Array.isArray(tblPrChange)) for (const entry of tblPrChange) {
-				if (!entry?.info || typeof entry.info.id !== "number") continue;
-				raw.push({
-					type: "tablePropertiesChanged",
-					text: "",
-					author: entry.info.author || "",
-					date: entry.info.date ?? void 0,
-					from: pos,
-					to: pos + node.nodeSize,
-					revisionId: entry.info.id
-				});
-			}
 			const firstRow = node.firstChild;
 			const firstIns = firstRow?.attrs["trIns"];
 			const firstDel = firstRow?.attrs["trDel"];
@@ -239,6 +188,19 @@ function extractTrackedChanges(state) {
 				}
 			}
 		}
+		for (const site of nodePropertyRevisionSites(node.type.name)) for (const record of propertyRevisionRecords(node, site)) {
+			const metadata = propertyRevisionMetadata(record.info);
+			if (!metadata) continue;
+			raw.push({
+				type: site.carrier,
+				text: node.textContent || "",
+				author: metadata.author,
+				date: metadata.date ?? void 0,
+				from: pos,
+				to: pos + node.nodeSize,
+				revisionId: metadata.id
+			});
+		}
 		if (!node.isInline) return;
 		let inlineText;
 		if (node.isText) inlineText = node.text || "";
@@ -293,39 +255,81 @@ function extractTrackedChanges(state) {
 		const rid = meta.revisions.values().next().value;
 		commentToRevision.set(cid, rid);
 	}
-	const STRUCTURAL_PRIORITY = {
-		tableInserted: 6,
-		tableDeleted: 6,
-		tablePropertiesChanged: 5,
-		rowInserted: 4,
-		rowDeleted: 4,
-		rowPropertiesChanged: 4,
-		cellInserted: 3,
-		cellDeleted: 3,
-		cellMerged: 3,
-		cellPropertiesChanged: 3,
-		paragraphMarkInsertion: 2,
-		paragraphMarkDeletion: 2,
-		paragraphPropertiesChanged: 2,
-		runPropertiesChanged: 1
-	};
-	const STRUCTURAL_FAMILY_BY_TYPE = {
-		tableInserted: "insertion",
-		rowInserted: "insertion",
-		cellInserted: "insertion",
-		paragraphMarkInsertion: "insertion",
-		tableDeleted: "deletion",
-		rowDeleted: "deletion",
-		cellDeleted: "deletion",
-		paragraphMarkDeletion: "deletion",
-		tablePropertiesChanged: "properties",
-		rowPropertiesChanged: "properties",
-		cellPropertiesChanged: "properties",
-		paragraphPropertiesChanged: "properties",
-		runPropertiesChanged: "properties",
-		cellMerged: "merge"
+	const STRUCTURAL_COALESCING = {
+		tableInserted: {
+			type: "coalesce",
+			family: "insertion",
+			priority: 6
+		},
+		tableDeleted: {
+			type: "coalesce",
+			family: "deletion",
+			priority: 6
+		},
+		tablePropertiesChanged: {
+			type: "coalesce",
+			family: "properties",
+			priority: 5
+		},
+		tablePropertyExceptionsChanged: { type: "separate" },
+		rowInserted: {
+			type: "coalesce",
+			family: "insertion",
+			priority: 4
+		},
+		rowDeleted: {
+			type: "coalesce",
+			family: "deletion",
+			priority: 4
+		},
+		rowPropertiesChanged: {
+			type: "coalesce",
+			family: "properties",
+			priority: 4
+		},
+		cellInserted: {
+			type: "coalesce",
+			family: "insertion",
+			priority: 3
+		},
+		cellDeleted: {
+			type: "coalesce",
+			family: "deletion",
+			priority: 3
+		},
+		cellMerged: {
+			type: "coalesce",
+			family: "merge",
+			priority: 3
+		},
+		cellPropertiesChanged: {
+			type: "coalesce",
+			family: "properties",
+			priority: 3
+		},
+		paragraphMarkInsertion: {
+			type: "coalesce",
+			family: "insertion",
+			priority: 2
+		},
+		paragraphMarkDeletion: {
+			type: "coalesce",
+			family: "deletion",
+			priority: 2
+		},
+		paragraphPropertiesChanged: {
+			type: "coalesce",
+			family: "properties",
+			priority: 2
+		},
+		sectionPropertiesChanged: { type: "separate" },
+		runPropertiesChanged: {
+			type: "coalesce",
+			family: "properties",
+			priority: 1
+		}
 	};
-	const isStructuralType = (t) => t in STRUCTURAL_PRIORITY;
+	const isStructuralType = (type) => type !== "insertion" && type !== "deletion" && type !== "replacement";
 	const slotByKey = /* @__PURE__ */ new Map();
 	const ordered = [];
 	const mergeIds = (survivor, dropped) => {
@@ -340,18 +344,31 @@ function extractTrackedChanges(state) {
 			ordered.push(entry);
 			continue;
 		}
-		const key = `${STRUCTURAL_FAMILY_BY_TYPE[entry.type] ?? entry.type}|${entry.author}|${entry.date ?? ""}`;
+		const policy = STRUCTURAL_COALESCING[entry.type];
+		if (policy.type === "separate") {
+			ordered.push(entry);
+			continue;
+		}
+		const key = `${policy.family}|${entry.author}|${entry.date ?? ""}`;
 		const slot = slotByKey.get(key);
 		if (slot === void 0) {
-			slotByKey.set(key, ordered.push(entry) - 1);
+			slotByKey.set(key, {
+				index: ordered.push(entry) - 1,
+				priority: policy.priority
+			});
 			continue;
 		}
-		const existing = ordered[slot];
-		if ((STRUCTURAL_PRIORITY[entry.type] ?? 0) > (STRUCTURAL_PRIORITY[existing.type] ?? 0)) ordered[slot] = {
-			...entry,
-			coalescedRevisionIds: mergeIds(entry, existing)
-		};
-		else ordered[slot] = {
+		const existing = ordered[slot.index];
+		if (policy.priority > slot.priority) {
+			ordered[slot.index] = {
+				...entry,
+				coalescedRevisionIds: mergeIds(entry, existing)
+			};
+			slotByKey.set(key, {
+				index: slot.index,
+				priority: policy.priority
+			});
+		} else ordered[slot.index] = {
 			...existing,
 			coalescedRevisionIds: mergeIds(existing, entry)
 		};

package/dist/prosemirror/validation.js

@@ -1,5 +1,9 @@
-import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readPageBreakRunOwnerMarkAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
+import { 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 { readMoveRangeBoundaryAttrs } from "./moveRangeBoundaryAttrs.js";
+import { readRangeAnchorAttrs } from "./rangeAnchorAttrs.js";
 import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
 //#region src/prosemirror/validation.ts
 var ProseMirrorDocumentValidationError = class extends Error {
@@ -83,7 +87,7 @@ const validateBookmarkBoundaryStructure = (doc, issues) => {
 				path: bookmarkPath
 			});
 		}
-		if (node.type.name === "bookmarkBoundary") {
+		if (node.type.name === "bookmarkBoundary" || node.type.name === "blockBookmarkBoundary") {
 			const result = readBookmarkBoundaryAttrs(node);
 			if (result.ok) {
 				const attrs = result.value;
@@ -140,14 +144,30 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "pageBreak":
 		case "renderedPageBreak": return;
 		case "bookmarkBoundary":
+		case "blockBookmarkBoundary":
 			appendAttrIssues(path, readBookmarkBoundaryAttrs(node), issues);
 			return;
+		case "commentReference":
+			appendAttrIssues(path, readCommentReferenceAttrs(node), issues);
+			return;
+		case "rangeAnchor":
+			appendAttrIssues(path, readRangeAnchorAttrs(node), issues);
+			return;
+		case "moveRangeBoundary":
+			appendAttrIssues(path, readMoveRangeBoundaryAttrs(node), issues);
+			return;
 		case "tab":
 			appendAttrIssues(path, readTabAttrs(node), issues);
 			return;
 		case "symbol":
 			appendAttrIssues(path, readSymbolAttrs(node), issues);
 			return;
+		case "preservedXml":
+			appendAttrIssues(path, readPreservedXmlAttrs(node), issues);
+			return;
+		case "preservedBlock":
+			appendAttrIssues(path, readPreservedBlockAttrs(node), issues);
+			return;
 		case "hardBreak":
 			appendAttrIssues(path, readHardBreakAttrs(node), issues);
 			return;
@@ -184,6 +204,8 @@ 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."
@@ -192,9 +214,9 @@ const validateNodeAttrs = (node, path, issues) => {
 						path: `${path}.content`,
 						message: "Complex field results cannot contain hyperlink content."
 					});
-					else if (!hasStructuredHyperlink && !hasPageBreakCarrier) issues.push({
+					else if (!hasStructuredHyperlink && !hasPageBreakCarrier && !hasPreservedCapture && !hasInlineWrapper) issues.push({
 						path: `${path}.content`,
-						message: "Structured simple fields require hyperlink content."
+						message: "Structured simple fields require hyperlink, page-break, preserved or wrapper content."
 					});
 					node.forEach((child, _offset, index) => {
 						const childPath = `${path}.content[${index}]`;
@@ -305,8 +327,8 @@ const validateMarks = (marks, path, issues) => {
 			case "runPropertyChange":
 				appendAttrIssues(markPath, readRunPropertyChangeMarkAttrs(mark), issues);
 				continue;
-			case "pageBreakRunOwner":
-				appendAttrIssues(markPath, readPageBreakRunOwnerMarkAttrs(mark), issues);
+			case "runIdentity":
+				appendAttrIssues(markPath, readRunIdentityMarkAttrs(mark), issues);
 				continue;
 			case "runFormattingOverride":
 				appendAttrIssues(markPath, readRunFormattingOverrideMarkAttrs(mark), issues);
@@ -314,6 +336,9 @@ const validateMarks = (marks, path, issues) => {
 			case "hyperlink":
 				appendAttrIssues(markPath, readHyperlinkMarkAttrs(mark), issues);
 				continue;
+			case "inlineWrapper":
+				appendAttrIssues(markPath, readInlineWrapperMarkAttrs(mark), issues);
+				continue;
 			default: issues.push({
 				path: `${markPath}.type.name`,
 				message: `Unsupported ProseMirror mark type ${mark.type.name}.`