@stll/folio-core 0.54.2 → 0.55.0

package/dist/prosemirror/attrs/index.js

@@ -1,7 +1,10 @@
 import { isSerializablePreservedAttribute } from "../../docx/attributeRemainder.js";
 import { DRAWING_ANCHOR_FLAG_KEYS } from "../../docx/drawingAnchor.js";
+import { isFoldedListNumber } from "../../docx/foldedListNumberFields.js";
 import { GRAPHIC_FRAME_LOCK_KEYS } from "../../docx/graphicFrameLocks.js";
 import { allowsDirectDrawingEdit, isDrawingRawXmlMode } from "../../docx/imageRawXml.js";
+import { isParagraphMarkResolutionJoin, isResolutionJoins } from "../../docx/reviewResolutionProvenance.js";
+import { attrsRecord, attrsResult, expectAttrs, expectCachedNodeAttrs, expectNodeType, isRecord } from "../../internal/prosemirrorAttrBoundary.js";
 import { COUNTER_FORMAT_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LINE_SPACING_RULE_VALUES, OUTLINE_STYLE_ATTR_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES } from "../../types/documentEnumValues.js";
 import { canonicalJson } from "../../utils/canonicalJson.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
@@ -10,7 +13,6 @@ import { outlineLevelFromAttrValue } from "../outlineLevelAttr.js";
 import { isParagraphDirection } from "../paragraphDirection.js";
 import { COMPLEX_SCRIPT_RUN_PROPERTY_KEYS, RUN_FORMATTING_BOOLEAN_PROPERTIES, RUN_FORMATTING_VALUE_PROPERTIES, TRACKED_CHANGE_PROVENANCE_VALUES } from "../schema/marks.js";
 import { PRESERVED_XML_LEVELS, TEXT_BOX_TEXT_BODY_CONTENT_STATE_TYPES } from "../schema/nodes.js";
-import { panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, THEME_COLORS, isOoxmlSymbolCharacter } from "@stll/docx-core/model";
 import { isSafePreservedChildXml, isWithinPreservedMarkupBudget } from "@stll/docx-core/schema";
 //#region src/prosemirror/attrs/index.ts
@@ -216,6 +218,11 @@ const readParagraphAttrsUncached = (node) => {
 	const attrs = attrsRecord(node.attrs);
 	const issues = [];
 	expectNodeType(node, "paragraph", issues);
+	const paragraphMark = attrs["pPrMark"];
+	if (isRecord(paragraphMark) && paragraphMark["resolutionJoin"] !== void 0 && !isParagraphMarkResolutionJoin(paragraphMark["resolutionJoin"])) issues.push({
+		path: "paragraph.attrs.pPrMark.resolutionJoin",
+		message: "Expected a non-negative bounded paragraph cut depth."
+	});
 	optionalString(attrs, "paraId", "paragraph.attrs.paraId", issues);
 	optionalString(attrs, "_docxParagraphSourceToken", "paragraph.attrs._docxParagraphSourceToken", issues);
 	optionalString(attrs, "textId", "paragraph.attrs.textId", issues);
@@ -243,6 +250,7 @@ const readParagraphAttrsUncached = (node) => {
 	optionalBoolean(attrs, "listIsLegal", "paragraph.attrs.listIsLegal", issues);
 	optionalString(attrs, "listMarker", "paragraph.attrs.listMarker", issues);
 	optionalString(attrs, "listMarkerTemplate", "paragraph.attrs.listMarkerTemplate", issues);
+	optionalString(attrs, "listFoldedMarkerSuffix", "paragraph.attrs.listFoldedMarkerSuffix", issues);
 	optionalBoolean(attrs, "listMarkerHidden", "paragraph.attrs.listMarkerHidden", issues);
 	optionalTextFormatting(attrs, "listMarkerFormatting", "paragraph.attrs.listMarkerFormatting", issues);
 	optionalOneOf(attrs, "listMarkerAlignment", "paragraph.attrs.listMarkerAlignment", issues, [
@@ -362,6 +370,11 @@ const readPreservedXmlAttrs = (node) => {
 	expectNodeType(node, "preservedXml", issues);
 	requiredString(attrs, "xml", "preservedXml.attrs.xml", issues);
 	requiredString(attrs, "text", "preservedXml.attrs.text", issues);
+	const folded = attrs["foldedListNumber"];
+	if (folded !== void 0 && folded !== null && !isFoldedListNumber(folded)) issues.push({
+		path: "preservedXml.attrs.foldedListNumber",
+		message: "Expected a folded list-number field or tab."
+	});
 	if (!PRESERVED_XML_LEVEL_VALUES.has(attrs["level"])) issues.push({
 		path: "preservedXml.attrs.level",
 		message: `Expected one of ${[...PRESERVED_XML_LEVEL_VALUES].join(", ")}.`
@@ -580,6 +593,7 @@ const isFieldCodeContent = (value) => {
 		case "symbol": return typeof value["font"] === "string" && typeof value["char"] === "string";
 		case "footnoteRef":
 		case "endnoteRef": return typeof value["id"] === "number";
+		case "noteMarker": return value["kind"] === "footnote" || value["kind"] === "endnote";
 		case "drawing": return isRecord(value["image"]);
 		case "shape": return isRecord(value["shape"]);
 		case "tab":
@@ -953,7 +967,7 @@ const readCommentMarkAttrs = (mark) => {
 	return attrsResult(attrs, issues);
 };
 const expectCommentMarkAttrs = (mark) => expectCachedMarkAttrs(mark, commentAttrsCache, readCommentMarkAttrs, "comment attrs");
-const isTrackedRevisionAncestorArray = (value) => Array.isArray(value) && value.length > 0 && value.every((ancestor) => isRecord(ancestor) && TRACKED_REVISION_ANCESTOR_TYPES.some((type) => type === ancestor["type"]) && typeof ancestor["revisionId"] === "number" && Number.isSafeInteger(ancestor["revisionId"]) && ancestor["revisionId"] >= 0 && typeof ancestor["author"] === "string" && (ancestor["date"] === void 0 || typeof ancestor["date"] === "string") && (ancestor["utcDate"] === void 0 || typeof ancestor["utcDate"] === "string") && (ancestor["initials"] === void 0 || typeof ancestor["initials"] === "string") && typeof ancestor["outerWrapperCount"] === "number" && Number.isSafeInteger(ancestor["outerWrapperCount"]) && ancestor["outerWrapperCount"] >= 0);
+const isTrackedRevisionAncestorArray = (value) => Array.isArray(value) && value.length > 0 && value.every((ancestor) => isRecord(ancestor) && TRACKED_REVISION_ANCESTOR_TYPES.some((type) => type === ancestor["type"]) && typeof ancestor["revisionId"] === "number" && Number.isSafeInteger(ancestor["revisionId"]) && ancestor["revisionId"] >= 0 && typeof ancestor["author"] === "string" && (ancestor["date"] === void 0 || typeof ancestor["date"] === "string") && (ancestor["utcDate"] === void 0 || typeof ancestor["utcDate"] === "string") && (ancestor["initials"] === void 0 || typeof ancestor["initials"] === "string") && typeof ancestor["outerWrapperCount"] === "number" && Number.isSafeInteger(ancestor["outerWrapperCount"]) && ancestor["outerWrapperCount"] >= 0 && (ancestor["resolutionJoins"] === void 0 || isResolutionJoins(ancestor["resolutionJoins"])));
 const readTrackedChangeMarkAttrs = (mark) => {
 	const attrs = attrsRecord(mark.attrs);
 	const issues = [];
@@ -969,6 +983,11 @@ const readTrackedChangeMarkAttrs = (mark) => {
 		message: "Expected a non-negative safe integer."
 	});
 	const ancestors = attrs["_docxRevisionAncestors"];
+	const resolutionJoins = attrs["_docxResolutionJoins"];
+	if (resolutionJoins !== void 0 && resolutionJoins !== null && !isResolutionJoins(resolutionJoins)) issues.push({
+		path: `${mark.type.name}.attrs._docxResolutionJoins`,
+		message: "Expected valid tracked-resolution provenance."
+	});
 	if (ancestors !== void 0 && ancestors !== null && !isTrackedRevisionAncestorArray(ancestors)) issues.push({
 		path: `${mark.type.name}.attrs._docxRevisionAncestors`,
 		message: "Expected a non-empty array of valid revision ancestors."
@@ -1310,46 +1329,6 @@ const mergeTableCellAttrs = (node, patch) => {
 		}
 	};
 };
-const attrsRecord = (attrs) => {
-	if (isRecord(attrs)) return attrs;
-	return {};
-};
-const isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
-const attrsResult = (attrs, issues) => {
-	if (issues.length > 0) return {
-		ok: false,
-		issues
-	};
-	let normalizedAttrs;
-	return {
-		ok: true,
-		get value() {
-			if (normalizedAttrs !== void 0) return normalizedAttrs;
-			const presentAttrs = {};
-			for (const key in attrs) {
-				if (!Object.hasOwn(attrs, key)) continue;
-				const value = attrs[key];
-				if (value !== null) presentAttrs[key] = value;
-			}
-			normalizedAttrs = presentAttrs;
-			return normalizedAttrs;
-		},
-		set value(value) {
-			normalizedAttrs = value;
-		}
-	};
-};
-const expectAttrs = (result, label) => {
-	if (result.ok) return result.value;
-	panic(`Invalid ProseMirror ${label}:\n${result.issues.map((issue) => `${issue.path}: ${issue.message}`).join("\n")}`);
-};
-function expectCachedNodeAttrs(node, cache, reader, label) {
-	const cached = cache.get(node);
-	if (cached) return cached;
-	const value = expectAttrs(reader(node), label);
-	cache.set(node, value);
-	return value;
-}
 function expectCachedMarkAttrs(mark, cache, reader, label) {
 	const cached = cache.get(mark);
 	if (cached) return cached;
@@ -1357,12 +1336,6 @@ function expectCachedMarkAttrs(mark, cache, reader, label) {
 	cache.set(mark, value);
 	return value;
 }
-const expectNodeType = (node, expected, issues) => {
-	if (node.type.name !== expected) issues.push({
-		path: "node.type.name",
-		message: `Expected ${expected}, got ${node.type.name}.`
-	});
-};
 const expectNodeTypeOneOf = (node, expected, issues) => {
 	if (!expected.includes(node.type.name)) issues.push({
 		path: "node.type.name",
@@ -2408,6 +2381,7 @@ const validateParagraphFormatting = (value, path, issues) => {
 	optionalOneOf(value, "listNumFmt", `${path}.listNumFmt`, issues, COUNTER_FORMAT_VALUES);
 	optionalString(value, "listMarker", `${path}.listMarker`, issues);
 	optionalString(value, "listMarkerTemplate", `${path}.listMarkerTemplate`, issues);
+	optionalString(value, "listFoldedMarkerSuffix", `${path}.listFoldedMarkerSuffix`, issues);
 	optionalTextFormatting(value, "listMarkerFormatting", `${path}.listMarkerFormatting`, issues);
 	optionalOneOf(value, "listMarkerAlignment", `${path}.listMarkerAlignment`, issues, [
 		"left",

package/dist/prosemirror/bookmarkBoundaryAttrs.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { BookmarkBoundaryAttrs } from "./schema/nodes.js";
-import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/bookmarkBoundaryAttrs.d.ts
 declare const isDisplacedByCustomXml: (value: unknown) => value is document_d_exports.DisplacedByCustomXml;

package/dist/prosemirror/canonicalCommands.d.ts

@@ -0,0 +1,97 @@
+import { Node } from "prosemirror-model";
+import { Command, EditorState } from "prosemirror-state";
+import { ParagraphPropsPatch, RunPropsPatch } from "@stll/docx-core/ops";
+//#region src/prosemirror/canonicalCommands.d.ts
+/** Command meaning before canonical positions are resolved by the session. */
+type CanonicalCommandIntent = {
+  type: "formatRun";
+  from: number;
+  to: number;
+  patch: RunPropsPatch;
+} | {
+  type: "formatParagraph";
+  at: number;
+  patch: ParagraphPropsPatch;
+} | {
+  type: "toggleList";
+  kind: "bullet" | "decimal";
+} | {
+  type: "changeListLevel";
+  direction: "increase" | "decrease";
+} | {
+  type: "removeList";
+} | {
+  type: "restartNumbering";
+  start?: number;
+} | {
+  type: "continueNumbering";
+} | {
+  type: "insertBreak";
+  from: number;
+  to: number;
+  breakType: "page" | "textWrapping";
+};
+type CanonicalCommandDescriptor = (state: EditorState) => readonly CanonicalCommandIntent[];
+/** Registration leaves execution and side-effect-free command probes unchanged. */
+declare const withCanonicalCommand: (command: Command, descriptor: CanonicalCommandDescriptor) => Command;
+declare const getCanonicalCommandIntents: (command: Command, state: EditorState) => readonly CanonicalCommandIntent[] | undefined;
+declare const canonicalRunFormatting: (state: EditorState, patch: RunPropsPatch) => readonly [{
+  readonly type: "formatRun";
+  readonly from: number;
+  readonly to: number;
+  readonly patch: import("@stll/docx-core/ops").FormattingPatch<{
+    bold?: boolean | undefined;
+    boldCs?: boolean | undefined;
+    italic?: boolean | undefined;
+    italicCs?: boolean | undefined;
+    underline?: {
+      style: import("@stll/docx-core/model").UnderlineStyle;
+      color?: import("@stll/docx-core/model").ColorValue;
+    } | undefined;
+    strike?: boolean | undefined;
+    doubleStrike?: boolean | undefined;
+    vertAlign?: "baseline" | "superscript" | "subscript" | undefined;
+    smallCaps?: boolean | undefined;
+    allCaps?: boolean | undefined;
+    hidden?: boolean | undefined;
+    noProof?: boolean | undefined;
+    color?: import("@stll/docx-core/model").ColorValue | undefined;
+    highlight?: "black" | "blue" | "cyan" | "darkBlue" | "darkCyan" | "darkGray" | "darkGreen" | "darkMagenta" | "darkRed" | "darkYellow" | "green" | "lightGray" | "magenta" | "none" | "red" | "white" | "yellow" | undefined;
+    shading?: import("@stll/docx-core/model").ShadingProperties | undefined;
+    fontSize?: number | undefined;
+    fontSizeCs?: number | undefined;
+    fontFamily?: {
+      ascii?: string;
+      hAnsi?: string;
+      eastAsia?: string;
+      cs?: string;
+      hint?: "default" | "eastAsia" | "cs";
+      asciiTheme?: "majorAscii" | "majorHAnsi" | "majorEastAsia" | "majorBidi" | "minorAscii" | "minorHAnsi" | "minorEastAsia" | "minorBidi";
+      hAnsiTheme?: string;
+      eastAsiaTheme?: string;
+      csTheme?: string;
+    } | undefined;
+    language?: {
+      val?: string;
+      eastAsia?: string;
+      bidi?: string;
+    } | undefined;
+    spacing?: number | undefined;
+    position?: number | undefined;
+    scale?: number | undefined;
+    kerning?: number | undefined;
+    effect?: import("@stll/docx-core/model").TextEffect | undefined;
+    emphasisMark?: import("@stll/docx-core/model").EmphasisMark | undefined;
+    emboss?: boolean | undefined;
+    imprint?: boolean | undefined;
+    outline?: boolean | undefined;
+    shadow?: boolean | undefined;
+    rtl?: boolean | undefined;
+    cs?: boolean | undefined;
+    styleId?: string | undefined;
+    preserved?: import("@stll/docx-core/model").PreservedMarkup | undefined;
+  }>;
+}];
+declare const withCanonicalParagraphFormatting: (command: Command, patch: ParagraphPropsPatch | ((paragraph: Node) => ParagraphPropsPatch)) => Command;
+//#endregion
+export { CanonicalCommandIntent, canonicalRunFormatting, getCanonicalCommandIntents, withCanonicalCommand, withCanonicalParagraphFormatting };

package/dist/prosemirror/canonicalCommands.js

@@ -0,0 +1,28 @@
+//#region src/prosemirror/canonicalCommands.ts
+const descriptors = /* @__PURE__ */ new WeakMap();
+/** Registration leaves execution and side-effect-free command probes unchanged. */
+const withCanonicalCommand = (command, descriptor) => {
+	descriptors.set(command, descriptor);
+	return command;
+};
+const getCanonicalCommandIntents = (command, state) => descriptors.get(command)?.(state);
+const canonicalRunFormatting = (state, patch) => [{
+	type: "formatRun",
+	from: state.selection.from,
+	to: state.selection.to,
+	patch
+}];
+const withCanonicalParagraphFormatting = (command, patch) => withCanonicalCommand(command, (state) => {
+	const intents = [];
+	state.doc.nodesBetween(state.selection.from, state.selection.to, (node, position) => {
+		if (node.type.name !== "paragraph") return;
+		intents.push({
+			type: "formatParagraph",
+			at: position + 1,
+			patch: typeof patch === "function" ? patch(node) : patch
+		});
+	});
+	return intents;
+});
+//#endregion
+export { canonicalRunFormatting, getCanonicalCommandIntents, withCanonicalCommand, withCanonicalParagraphFormatting };

package/dist/prosemirror/commands/pageBreak.js

@@ -1,3 +1,4 @@
+import { withCanonicalCommand } from "../canonicalCommands.js";
 import { pageBreakRunParagraphProjectionDisposition } from "../pageBreakRunProjection.js";
 //#region src/prosemirror/commands/pageBreak.ts
 const UNSUPPORTED_PAGE_BREAK_RUN_ANCESTORS = /* @__PURE__ */ new Set([
@@ -23,7 +24,7 @@ const hasTextBoxAnchorAtOrAfter = (paragraph, contentStart, position) => {
 * position among neighbouring run content. Block-level `pageBreak` remains a
 * legacy input boundary and is never emitted by this command.
 */
-const insertPageBreak = (state, dispatch) => {
+const insertPageBreakCommand = (state, dispatch) => {
 	const { schema } = state;
 	const pageBreakRunType = schema.nodes["pageBreakRun"];
 	const { $from } = state.selection;
@@ -36,5 +37,18 @@ const insertPageBreak = (state, dispatch) => {
 	}
 	return true;
 };
+/**
+* Insert a page-break run at the current text cursor.
+*
+* Keeping the atom inline preserves its authored run, revision marks, and exact
+* position among neighbouring run content. Block-level `pageBreak` remains a
+* legacy input boundary and is never emitted by this command.
+*/
+const insertPageBreak = withCanonicalCommand(insertPageBreakCommand, (state) => insertPageBreakCommand(state) ? [{
+	type: "insertBreak",
+	from: state.selection.from,
+	to: state.selection.to,
+	breakType: "page"
+}] : []);
 //#endregion
 export { insertPageBreak };

package/dist/prosemirror/commentReferenceAttrs.d.ts

@@ -1,5 +1,6 @@
 import { CommentReferenceAttrs } from "./schema/nodes.js";
-import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/commentReferenceAttrs.d.ts
 declare const readCommentReferenceAttrs: (node: Node) => ReadProseMirrorAttrsResult<CommentReferenceAttrs>;

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,13 +1,15 @@
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
+import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
 import { isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapperContent.js";
 import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
-import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
+import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
 import { BLOCK_TREE_DESCENT, visitBlockTreeRecords, visitDocxParagraphs } from "../../docx/paragraphTraversal.js";
 import { refingerprintShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { DATE_UTC_ATTRIBUTE } from "../../docx/trackedChangeInfo.js";
 import { copiedWrapPolygon } from "../../docx/wrapPolygon.js";
+import { expectNoteMarkerAttrs } from "../../internal/noteMarkerAttrs.js";
 import { isStyleSourcedParagraphNumbering, modelParagraphFormattingEmission } from "../../internal/paragraphFormattingSerialization.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { normalizeShapeTextAnchor, presetDashForOutlineAttr } from "../../types/documentEnumValues.js";
@@ -185,11 +187,16 @@ const validateParagraphPropertySourceTokens = (pmDoc, baseDocument, contract) =>
 	if (!sourceParagraphs) panic("A paragraph-property source contract lost its source registry");
 	const currentTokens = /* @__PURE__ */ new Set();
 	visitDocumentStoryParagraphs(baseDocument.package.document.content, (paragraph) => {
-		const token = getParagraphPropertySourceToken(paragraph);
-		if (!token) {
-			if (paragraphPropertySourceBelongsToDocument(paragraph, baseDocument)) throw sourceValidationError("invalid_token", "A source-bound paragraph is missing its paragraph-property token.");
-			return;
+		const identity = inspectParagraphSourceIdentity(paragraph, baseDocument);
+		switch (identity.type) {
+			case "authored":
+			case "capture-only": return;
+			case "missing-token": throw sourceValidationError("invalid_token", "A source-bound paragraph is missing its paragraph-property token.");
+			case "invalid": throw sourceValidationError("invalid_token", "The source paragraph identity is invalid.");
+			case "durable": break;
+			default: panic(`Unhandled paragraph source identity: ${String(identity)}`);
 		}
+		const { token } = identity;
 		if (!paragraphPropertySourceTokenMatchesContract(token, contract)) throw sourceValidationError("invalid_token", "The source document contains an invalid paragraph-property token.");
 		if (!sourceParagraphs.has(token)) throw sourceValidationError("unknown_token", "The source document contains an unknown paragraph-property token.");
 		if (currentTokens.has(token)) throw sourceValidationError("duplicate_token", "The source document contains a duplicate paragraph-property token.");
@@ -965,6 +972,7 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleRes
 	if (pFormatting) paragraph.formatting = pFormatting;
 	const listRendering = listRenderingFromAttrs(attrs);
 	if (listRendering) paragraph.listRendering = listRendering;
+	normalizeFoldedListNumbers(paragraph);
 	if (attrs.renderedPageBreakBefore) paragraph.renderedPageBreakBefore = true;
 	if (attrs._sectionProperties) paragraph.sectionProperties = attrs._sectionProperties;
 	if (attrs._propertyChanges && attrs._propertyChanges.length > 0) paragraph.propertyChanges = attrs._propertyChanges.map(propertyChangeFromAttrs);
@@ -1172,27 +1180,32 @@ function paragraphAttrsToFormatting(attrs) {
 	if (suppressAutoHyphens != null) f.suppressAutoHyphens = suppressAutoHyphens;
 	return f;
 }
-function createTrackedRunWrapper(type, info, child) {
+function createTrackedRunWrapper({ type, info, child, resolutionJoins }) {
 	const content = child ? [child] : [];
+	const provenance = resolutionJoins === void 0 ? {} : { resolutionJoins: structuredClone(resolutionJoins) };
 	if (type === "insertion") return {
 		type,
 		info,
-		content
+		content,
+		...provenance
 	};
 	if (type === "deletion") return {
 		type,
 		info,
-		content
+		content,
+		...provenance
 	};
 	if (type === "moveFrom") return {
 		type,
 		info,
-		content
+		content,
+		...provenance
 	};
 	return {
 		type,
 		info,
-		content
+		content,
+		...provenance
 	};
 }
 /**
@@ -1272,7 +1285,7 @@ const nestRevisionAwareInlineWrappers = (items, stack, revisionOuterWrapperCount
 	closeLayer();
 	return nested;
 };
-const sameRevisionLayer = (left, right) => left.type === right.type && left.revisionId === right.revisionId && left.author === right.author && left.date === right.date && left.utcDate === right.utcDate && left.initials === right.initials && left.outerWrapperCount === right.outerWrapperCount;
+const sameRevisionLayer = (left, right) => left.type === right.type && left.revisionId === right.revisionId && left.author === right.author && left.date === right.date && left.utcDate === right.utcDate && left.initials === right.initials && left.outerWrapperCount === right.outerWrapperCount && JSON.stringify(left.resolutionJoins) === JSON.stringify(right.resolutionJoins);
 const revisionInfoFromLayer = (layer) => ({
 	id: layer.revisionId,
 	author: layer.author,
@@ -1299,14 +1312,19 @@ const nestRevisionAncestors = (items, ancestorsByWrapper, revisionOuterWrapperCo
 			...item.info.date ? { date: item.info.date } : {},
 			...item.info.utcDate ? { utcDate: item.info.utcDate.value } : {},
 			...item.info.initials ? { initials: item.info.initials } : {},
-			outerWrapperCount: revisionOuterWrapperCounts.get(item) ?? 0
+			outerWrapperCount: revisionOuterWrapperCounts.get(item) ?? 0,
+			...item.resolutionJoins === void 0 ? {} : { resolutionJoins: item.resolutionJoins }
 		};
 		const path = [...ancestorsByWrapper.get(item) ?? [], ownLayer];
 		let shared = 0;
 		while (shared < open.length && path[shared] && sameRevisionLayer(open[shared].layer, path[shared])) shared += 1;
 		open.length = shared;
 		for (const layer of path.slice(shared)) {
-			const wrapper = createTrackedRunWrapper(layer.type, revisionInfoFromLayer(layer));
+			const wrapper = createTrackedRunWrapper({
+				type: layer.type,
+				info: revisionInfoFromLayer(layer),
+				resolutionJoins: layer.resolutionJoins
+			});
 			revisionOuterWrapperCounts.set(wrapper, layer.outerWrapperCount);
 			const parent = open.at(-1)?.wrapper;
 			if (parent) parent.content.push(wrapper);
@@ -1553,7 +1571,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			let type;
 			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
 			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
-			const wrapper = createTrackedRunWrapper(type, info, anchoredContent);
+			const wrapper = createTrackedRunWrapper({
+				type,
+				info,
+				child: anchoredContent,
+				resolutionJoins: changeAttrs._docxResolutionJoins ?? void 0
+			});
 			revisionOuterWrapperCounts.set(wrapper, changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length);
 			revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
 			content.push(wrapper);
@@ -1584,12 +1607,17 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			if (changeMark === insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
 			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
 			const outerWrapperCount = changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length;
-			const trackedChangeKey = `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(revisionAncestors)}`;
+			const trackedChangeKey = `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(revisionAncestors)}:${JSON.stringify(changeAttrs._docxResolutionJoins ?? void 0)}`;
 			if (linkMark) {
 				const linkKey = getLinkKey(linkMark);
 				if (!currentTrackedChange || currentTrackedChange.type !== "hyperlink" || currentTrackedChange.key !== trackedChangeKey || currentTrackedChange.hyperlinkKey !== linkKey) {
 					const hyperlink = createIndexedHyperlink(linkMark);
-					const wrapper = createTrackedRunWrapper(type, info, hyperlink);
+					const wrapper = createTrackedRunWrapper({
+						type,
+						info,
+						child: hyperlink,
+						resolutionJoins: changeAttrs._docxResolutionJoins ?? void 0
+					});
 					revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
 					revisionAncestorsByWrapper.set(wrapper, revisionAncestors);
 					content.push(wrapper);
@@ -1624,7 +1652,11 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				return;
 			}
 			if (!currentTrackedChange || currentTrackedChange.type !== "direct" || currentTrackedChange.key !== trackedChangeKey) {
-				const wrapper = createTrackedRunWrapper(type, info);
+				const wrapper = createTrackedRunWrapper({
+					type,
+					info,
+					resolutionJoins: changeAttrs._docxResolutionJoins ?? void 0
+				});
 				revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
 				revisionAncestorsByWrapper.set(wrapper, revisionAncestors);
 				content.push(wrapper);
@@ -1717,6 +1749,13 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				clear,
 				marks: node.marks
 			}));
+		} else if (node.type.name === "noteMarker") {
+			flushCurrentInline();
+			appendDirectRun(node, createNoteMarkerRun({
+				node,
+				marks: node.marks,
+				formattingContext
+			}));
 		} else if (node.type.name === "symbol") {
 			flushCurrentInline();
 			content.push(createSymbolRun(node, node.marks, formattingContext));
@@ -1806,6 +1845,11 @@ function createTrackedChangeRun({ baseParagraphFormatting, inheritedFormatting,
 		};
 		restoreRunRecord(run, marks);
 	} else if (node.type.name === "symbol") run = createSymbolRun(node, marks, formattingContext);
+	else if (node.type.name === "noteMarker") run = createNoteMarkerRun({
+		node,
+		marks,
+		formattingContext
+	});
 	else if (node.type.name === "preservedXml") run = createPreservedXmlRun(node, marks, formattingContext);
 	else if (node.type.name === "hardBreak") run = createBreakRun(expectHardBreakAttrs(node), marks, formattingContext);
 	else if (node.type.name === "pageBreakRun") {
@@ -1968,6 +2012,14 @@ function addNodeToHyperlink({ baseParagraphFormatting, hyperlink, inheritedForma
 		hyperlink.children.push(run);
 		return;
 	}
+	if (node.type.name === "noteMarker") {
+		hyperlink.children.push(createNoteMarkerRun({
+			node,
+			marks: nonLinkMarks,
+			formattingContext
+		}));
+		return;
+	}
 	if (node.type.name === "symbol") {
 		hyperlink.children.push(createSymbolRun(node, nonLinkMarks, {
 			baseParagraphFormatting,
@@ -2098,13 +2150,33 @@ function createSymbolRun(node, marks, formattingContext) {
 const isInlineLevelPreservedXml = (node) => node.type.name === "preservedXml" && expectPreservedXmlAttrs(node).level === PRESERVED_XML_LEVELS.inline;
 /** The paragraph-level capture an inline-level atom writes back. */
 const createPreservedInline = (node) => {
-	const { xml, text } = expectPreservedXmlAttrs(node);
-	return {
+	const { xml, text, foldedListNumber } = expectPreservedXmlAttrs(node);
+	return foldedListNumber ? {
+		type: "preservedInline",
+		xml,
+		text,
+		foldedListNumber
+	} : {
 		type: "preservedInline",
 		xml,
 		text
 	};
 };
+/** Rebuild the authored automatic mark and its run properties from the atom. */
+const createNoteMarkerRun = ({ node, marks, formattingContext }) => {
+	const { kind } = expectNoteMarkerAttrs(node);
+	const run = {
+		type: "run",
+		content: [{
+			type: "noteMarker",
+			kind
+		}]
+	};
+	const formatting = getAtomRunFormattingFromMarks(marks, formattingContext);
+	if (formatting) run.formatting = formatting;
+	restoreRunRecord(run, marks);
+	return run;
+};
 /**
 * Rebuild the run around a preserved child. The markup is opaque and comes
 * back byte for byte; only the run properties around it are rebuilt from the

package/dist/prosemirror/conversion/listRenderingDefinition.d.ts

@@ -0,0 +1,6 @@
+import { document_d_exports } from "../../types/document.js";
+//#region src/prosemirror/conversion/listRenderingDefinition.d.ts
+/** Compare scalar fields directly; only nested records need canonical ordering. */
+declare const listRenderingDefinitionsMatch: (left: document_d_exports.ListRendering, right: document_d_exports.ListRendering) => boolean;
+//#endregion
+export { listRenderingDefinitionsMatch };