@stll/folio-core 0.54.1 → 0.55.0

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 };

package/dist/prosemirror/conversion/listRenderingDefinition.js

@@ -0,0 +1,97 @@
+import { canonicalJson } from "../../utils/canonicalJson.js";
+//#region src/prosemirror/conversion/listRenderingDefinition.ts
+const DEFINITION_FIELDS = Object.values({
+	marker: {
+		key: "marker",
+		source: "paragraph"
+	},
+	foldedMarkerSuffix: {
+		key: "foldedMarkerSuffix",
+		source: "paragraph"
+	},
+	implicitChildLevelAdvances: {
+		key: "implicitChildLevelAdvances",
+		source: "paragraph"
+	},
+	markerSecondSlotOffsetTwips: {
+		key: "markerSecondSlotOffsetTwips",
+		source: "paragraph"
+	},
+	markerTemplate: {
+		key: "markerTemplate",
+		source: "definition"
+	},
+	level: {
+		key: "level",
+		source: "definition"
+	},
+	numId: {
+		key: "numId",
+		source: "definition"
+	},
+	isBullet: {
+		key: "isBullet",
+		source: "definition"
+	},
+	isLegal: {
+		key: "isLegal",
+		source: "definition"
+	},
+	numFmt: {
+		key: "numFmt",
+		source: "definition"
+	},
+	markerHidden: {
+		key: "markerHidden",
+		source: "definition"
+	},
+	markerFormatting: {
+		key: "markerFormatting",
+		source: "definition"
+	},
+	markerAlignment: {
+		key: "markerAlignment",
+		source: "definition"
+	},
+	markerAllCaps: {
+		key: "markerAllCaps",
+		source: "definition"
+	},
+	markerSuffix: {
+		key: "markerSuffix",
+		source: "definition"
+	},
+	levelTabs: {
+		key: "levelTabs",
+		source: "definition"
+	},
+	levelNumFmts: {
+		key: "levelNumFmts",
+		source: "definition"
+	},
+	levelStarts: {
+		key: "levelStarts",
+		source: "definition"
+	},
+	abstractNumId: {
+		key: "abstractNumId",
+		source: "definition"
+	},
+	startOverride: {
+		key: "startOverride",
+		source: "definition"
+	}
+}).filter((field) => field.source === "definition");
+/** Compare scalar fields directly; only nested records need canonical ordering. */
+const listRenderingDefinitionsMatch = (left, right) => {
+	for (const { key } of DEFINITION_FIELDS) {
+		const before = left[key];
+		const after = right[key];
+		if (before === after) continue;
+		if (typeof before !== "object" || typeof after !== "object") return false;
+		if (canonicalJson(before) !== canonicalJson(after)) return false;
+	}
+	return true;
+};
+//#endregion
+export { listRenderingDefinitionsMatch };

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

@@ -8,6 +8,8 @@ import { Node } from "prosemirror-model";
 type ToProseDocOptions = {
   /** Style definitions for resolving paragraph styles */
   styles?: document_d_exports.StyleDefinitions;
+  /** Package definitions used to recompute secondary-story list rendering. */
+  numbering?: document_d_exports.NumberingDefinitions;
   /** Theme used when converting themed table/cell values in nested content. */
   theme?: document_d_exports.Theme | null;
   /**
@@ -28,9 +30,8 @@ declare function standaloneTableCellToProseMirror(cell: document_d_exports.Table
  * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
  * Used for editing headers/footers in their own ProseMirror editor and for
  * the unified header/footer render pipeline (see
- * `core/layout-bridge/headerFooterLayout.ts`). `theme` lives in
- * `ToProseDocOptions` for future themeColor cell-shading resolution; folio's
- * `convertTable` does not yet thread it (orthogonal upstream divergence).
+ * `core/layout-bridge/headerFooterLayout.ts`). Package numbering definitions
+ * recompute list rendering for direct paragraphs and nested table content.
  */
 declare function headerFooterToProseDoc(content: document_d_exports.BlockContent[], options?: ToProseDocOptions): Node;
 declare function footnoteToProseDoc(content: document_d_exports.BlockContent[], options?: ToProseDocOptions): Node;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,6 +1,7 @@
 import { rangedCommentIds } from "../../docx/commentAnchorIndex.js";
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inlineWrapperContent.js";
+import { computeListRendering, getCachedNumberingMap } from "../../docx/numberingParser.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
@@ -30,6 +31,7 @@ import { MOVE_RANGE_BOUNDARY_NODE_NAME } from "../extensions/nodes/MoveRangeBoun
 import { RANGE_ANCHOR_NODE_NAME } from "../extensions/nodes/RangeAnchorExtension.js";
 import "../extensions/nodes/SdtExtension.js";
 import { inlineWrapperLayer } from "../inlineWrapperStack.js";
+import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
@@ -47,11 +49,12 @@ import { tableCellStyleRegions, tableRowBand } from "../styles/tableStyleRegions
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
+import { listRenderingDefinitionsMatch } from "./listRenderingDefinition.js";
 import { createMarkInterner } from "./markInterner.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
-import { DRAWING_RAW_XML_MODES, PARSE_WARNING_CODES } from "@stll/docx-core/model";
+import { DRAWING_RAW_XML_MODES, PARSE_WARNING_CODES, mergeParagraphNumbering } from "@stll/docx-core/model";
 //#region src/prosemirror/conversion/toProseDoc.ts
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 const noPageBreakProjectionWarning = () => {};
@@ -227,11 +230,15 @@ function toProseDoc(document, options) {
 	const styleResolver = createStyleEngine(options?.styles ?? document.package.styles);
 	const theme = options?.theme ?? document.package.theme ?? null;
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
+	const nextHyperlinkInstanceIndex = createHyperlinkInstanceIndexAllocator();
+	const pairedBookmarkIds = collectPairedBookmarkIds(paragraphs);
 	const conversionContext = {
+		listRenderings: /* @__PURE__ */ new Map(),
+		numbering: document.package.numbering === void 0 ? void 0 : getCachedNumberingMap(document.package.numbering),
 		theme,
 		nextTextBoxGroupId,
-		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator(),
-		pairedBookmarkIds: collectPairedBookmarkIds(paragraphs),
+		nextHyperlinkInstanceIndex,
+		pairedBookmarkIds,
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(paragraphs),
 		storyRangedCommentIds: rangedCommentIds(paragraphs),
 		openCommentIds: /* @__PURE__ */ new Set(),
@@ -328,7 +335,8 @@ function preservedInlineNode(content) {
 	return schema.node("preservedXml", {
 		xml: content.xml,
 		text: content.text,
-		level: PRESERVED_XML_LEVELS.inline
+		level: PRESERVED_XML_LEVELS.inline,
+		...content.foldedListNumber ? { foldedListNumber: content.foldedListNumber } : {}
 	});
 }
 /**
@@ -372,6 +380,20 @@ function convertBlockCustomXml(block, convertBlocks) {
 		_originallyEmpty: block.content.length === 0
 	}, children);
 }
+const resolveListRendering = (numPr, context) => {
+	const key = `${numPr.numId}:${numPr.ilvl ?? 0}`;
+	const cached = context.listRenderings.get(key);
+	if (cached !== void 0) return cached;
+	const numbering = context.numbering;
+	const rendering = numbering === void 0 ? null : computeListRendering(numPr, numbering);
+	const nextLevel = numbering?.getLevel(numPr.numId, (numPr.ilvl ?? 0) + 1);
+	const resolved = {
+		rendering,
+		nextSlotOffset: nextLevel?.pPr?.hangingIndent === true && nextLevel.pPr.indentFirstLine !== void 0 && nextLevel.pPr.indentFirstLine < 0 ? -nextLevel.pPr.indentFirstLine : void 0
+	};
+	context.listRenderings.set(key, resolved);
+	return resolved;
+};
 /**
 * Convert a Paragraph to a ProseMirror paragraph node
 *
@@ -386,6 +408,15 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		createMark: context.createMark
 	};
 	const { attrs, effectiveFrame } = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
+	const numPr = mergeParagraphNumbering(attrs.numPrFromStyle ?? void 0, attrs.numPr ?? void 0);
+	if (numPr?.kind === "none") Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
+	else if (context.numbering !== void 0 && numPr?.kind === "reference") {
+		const { rendering, nextSlotOffset } = resolveListRendering(numPr, context);
+		if (rendering !== null) {
+			const cached = paragraph.listRendering;
+			if (!(cached !== void 0 && listRenderingDefinitionsMatch(cached, rendering) && (cached.markerSecondSlotOffsetTwips === void 0 || cached.markerSecondSlotOffsetTwips === nextSlotOffset))) Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS, listRenderingAttrPatch(rendering));
+		} else Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
+	}
 	reportParagraphPageBreakProjection({
 		paragraph,
 		attrs,
@@ -724,6 +755,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runS
 		initials: change.info.initials ?? null,
 		moveKind,
 		_docxOuterWrapperCount: wrappedBy.length,
+		_docxResolutionJoins: change.resolutionJoins ?? null,
 		...markType === "deletion" ? { _historicalFormatting: true } : {}
 	});
 	const ancestor = {
@@ -733,7 +765,8 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runS
 		...change.info.date ? { date: change.info.date } : {},
 		...change.info.utcDate ? { utcDate: change.info.utcDate.value } : {},
 		...change.info.initials ? { initials: change.info.initials } : {},
-		outerWrapperCount: wrappedBy.length
+		outerWrapperCount: wrappedBy.length,
+		...change.resolutionJoins === void 0 ? {} : { resolutionJoins: change.resolutionJoins }
 	};
 	return nodes.map((node) => withTrackedRunMark(node, mark, ancestor));
 }
@@ -753,7 +786,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (tableOfContentsLevel !== void 0) attrs._tableOfContentsLevel = tableOfContentsLevel;
 	if (formatting?.numPr) attrs.numPr = paragraphNumberingAttr(formatting.numPr);
 	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = paragraphNumberingAttr(formatting.numPrFromStyle);
-	if (paragraph.listRendering) Object.assign(attrs, listRenderingAttrPatch(paragraph.listRendering));
+	if (paragraph.listRendering && formatting?.numPr?.kind !== "none") Object.assign(attrs, listRenderingAttrPatch(paragraph.listRendering));
 	if (formatting) attrs._originalFormatting = formatting;
 	if (paragraph.propertyChanges && paragraph.propertyChanges.length > 0) attrs._propertyChanges = paragraph.propertyChanges.map(({ previousFormatting, ...change }) => {
 		if (previousFormatting === void 0) return change;
@@ -1262,7 +1295,9 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		cell,
 		styleResolver: null,
 		context: {
+			listRenderings: /* @__PURE__ */ new Map(),
 			theme: null,
+			numbering: void 0,
 			nextTextBoxGroupId,
 			nextHyperlinkInstanceIndex,
 			pairedBookmarkIds: collectPairedBookmarkIds(cell.content),
@@ -1725,6 +1760,7 @@ function reportRunContentBesidePageBreak(run, owner, warn) {
 		case "drawing":
 		case "endnoteRef":
 		case "footnoteRef":
+		case "noteMarker":
 		case "preservedXml":
 		case "renderedPageBreak":
 		case "symbol":
@@ -1938,6 +1974,7 @@ const carriedRunFormatting = (formatting) => formatting && Object.keys(formattin
 */
 function convertRunContent(content, marks, formatting, textBoxAnchors, authoredFormatting) {
 	switch (content.type) {
+		case "noteMarker": return [schema.node("noteMarker", { kind: content.kind }).mark(marks)];
 		case "text":
 			if (content.text) return [schema.text(content.text, marks)];
 			return [];
@@ -2648,20 +2685,23 @@ function convertTextBox(textBox, styleResolver, options) {
 * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
 * Used for editing headers/footers in their own ProseMirror editor and for
 * the unified header/footer render pipeline (see
-* `core/layout-bridge/headerFooterLayout.ts`). `theme` lives in
-* `ToProseDocOptions` for future themeColor cell-shading resolution; folio's
-* `convertTable` does not yet thread it (orthogonal upstream divergence).
+* `core/layout-bridge/headerFooterLayout.ts`). Package numbering definitions
+* recompute list rendering for direct paragraphs and nested table content.
 */
 function headerFooterToProseDoc(content, options) {
 	const nodes = [];
 	const styleResolver = options?.styles ? createStyleEngine(options.styles) : null;
 	const theme = options?.theme ?? null;
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
+	const nextHyperlinkInstanceIndex = createHyperlinkInstanceIndexAllocator();
+	const pairedBookmarkIds = collectPairedBookmarkIds(content);
 	const conversionContext = {
+		listRenderings: /* @__PURE__ */ new Map(),
 		theme,
+		numbering: options?.numbering === void 0 ? void 0 : getCachedNumberingMap(options.numbering),
 		nextTextBoxGroupId,
-		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator(),
-		pairedBookmarkIds: collectPairedBookmarkIds(content),
+		nextHyperlinkInstanceIndex,
+		pairedBookmarkIds,
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(content),
 		storyRangedCommentIds: rangedCommentIds(content),
 		openCommentIds: /* @__PURE__ */ new Set(),

package/dist/prosemirror/executeEditorCommand.d.ts

@@ -0,0 +1,11 @@
+import { Command } from "prosemirror-state";
+import { EditorView } from "prosemirror-view";
+//#region src/prosemirror/executeEditorCommand.d.ts
+/** The view's controller owns canonical command interpretation. */
+declare const registerEditorCommandOwner: (view: EditorView, execute: (command: Command) => boolean | undefined) => () => void;
+/** Keep commands on their selected view; a handled refusal must not fall through. */
+declare const executeEditorCommand: (view: EditorView, command: Command) => boolean;
+/** Legacy command chains stop at the first owner decision, including refusal. */
+declare const executeFirstEditorCommand: (view: EditorView, commands: readonly Command[]) => boolean;
+//#endregion
+export { executeEditorCommand, executeFirstEditorCommand, registerEditorCommandOwner };

package/dist/prosemirror/executeEditorCommand.js

@@ -0,0 +1,26 @@
+//#region src/prosemirror/executeEditorCommand.ts
+const owners = /* @__PURE__ */ new WeakMap();
+/** The view's controller owns canonical command interpretation. */
+const registerEditorCommandOwner = (view, execute) => {
+	owners.set(view, execute);
+	return () => {
+		owners.delete(view);
+	};
+};
+/** Keep commands on their selected view; a handled refusal must not fall through. */
+const executeEditorCommand = (view, command) => {
+	const handled = owners.get(view)?.(command);
+	if (handled !== void 0) return handled;
+	return command(view.state, (transaction) => view.dispatch(transaction), view);
+};
+/** Legacy command chains stop at the first owner decision, including refusal. */
+const executeFirstEditorCommand = (view, commands) => {
+	for (const command of commands) {
+		const handled = owners.get(view)?.(command);
+		if (handled !== void 0) return handled;
+		if (command(view.state, (transaction) => view.dispatch(transaction), view)) return true;
+	}
+	return false;
+};
+//#endregion
+export { executeEditorCommand, executeFirstEditorCommand, registerEditorCommandOwner };

package/dist/prosemirror/extensions/StarterKit.js

@@ -30,6 +30,7 @@ import { HorizontalRuleExtension } from "./nodes/HorizontalRuleExtension.js";
 import { ImageExtension } from "./nodes/ImageExtension.js";
 import { MathExtension } from "./nodes/MathExtension.js";
 import { MoveRangeBoundaryExtension } from "./nodes/MoveRangeBoundaryExtension.js";
+import { NoteMarkerExtension } from "./nodes/NoteMarkerExtension.js";
 import { PageBreakExtension } from "./nodes/PageBreakExtension.js";
 import { PageBreakRunExtension } from "./nodes/PageBreakRunExtension.js";
 import { PreservedBlockExtension } from "./nodes/PreservedBlockExtension.js";
@@ -76,6 +77,7 @@ function createStarterKit(options = {}) {
 	add("tab", TabExtension());
 	add("symbol", SymbolExtension());
 	add("preservedXml", PreservedXmlExtension());
+	add("noteMarker", NoteMarkerExtension());
 	add("image", ImageExtension());
 	add("textBox", TextBoxExtension());
 	add("textBoxAnchor", TextBoxAnchorExtension({ getInternalClipboardToken }));