@stll/folio-core 0.54.2 → 0.55.0

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

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -8,6 +8,7 @@ import { collectHeadings } from "../../../utils/headingCollector.js";
 import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
+import { withCanonicalParagraphFormatting } from "../../canonicalCommands.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
@@ -232,6 +233,7 @@ const paragraphNodeSpec = {
 		listMarkerSuffix: { default: null },
 		listMarkerAllCaps: { default: null },
 		listImplicitChildLevelAdvances: { default: null },
+		listFoldedMarkerSuffix: { default: void 0 },
 		listMarkerSecondSlotOffsetTwips: { default: null },
 		listLevelNumFmts: { default: null },
 		listLevelStarts: { default: null },
@@ -631,27 +633,56 @@ const ParagraphExtension = createNodeExtension({
 	onSchemaReady() {
 		const applyStyleFn = makeApplyStyle();
 		return { commands: {
-			setAlignment: (alignment) => makeSetAlignment(alignment),
-			alignLeft: () => makeSetAlignment("left"),
-			alignCenter: () => makeSetAlignment("center"),
-			alignRight: () => makeSetAlignment("right"),
-			alignJustify: () => makeSetAlignment("both"),
-			setLineSpacing: (value, rule) => makeSetLineSpacing(value, rule),
-			singleSpacing: () => makeSetLineSpacing(240),
-			oneAndHalfSpacing: () => makeSetLineSpacing(360),
-			doubleSpacing: () => makeSetLineSpacing(480),
-			setSpaceBefore: (twips) => setParagraphSpacingAttr("before", twips),
-			setSpaceAfter: (twips) => setParagraphSpacingAttr("after", twips),
-			increaseIndent: (amount) => makeIncreaseIndent(amount),
-			decreaseIndent: (amount) => makeDecreaseIndent(amount),
-			setIndentLeft: (twips) => setParagraphAttr("indentLeft", twips > 0 ? twips : null),
-			setIndentRight: (twips) => setParagraphAttr("indentRight", twips > 0 ? twips : null),
-			setIndentFirstLine: (twips, hanging) => setParagraphAttrsCmd({
+			setAlignment: (alignment) => withCanonicalParagraphFormatting(makeSetAlignment(alignment), { alignment }),
+			alignLeft: () => withCanonicalParagraphFormatting(makeSetAlignment("left"), { alignment: "left" }),
+			alignCenter: () => withCanonicalParagraphFormatting(makeSetAlignment("center"), { alignment: "center" }),
+			alignRight: () => withCanonicalParagraphFormatting(makeSetAlignment("right"), { alignment: "right" }),
+			alignJustify: () => withCanonicalParagraphFormatting(makeSetAlignment("both"), { alignment: "both" }),
+			setLineSpacing: (value, rule) => withCanonicalParagraphFormatting(makeSetLineSpacing(value, rule), {
+				lineSpacing: value,
+				lineSpacingRule: rule ?? "auto"
+			}),
+			singleSpacing: () => withCanonicalParagraphFormatting(makeSetLineSpacing(240), {
+				lineSpacing: 240,
+				lineSpacingRule: "auto"
+			}),
+			oneAndHalfSpacing: () => withCanonicalParagraphFormatting(makeSetLineSpacing(360), {
+				lineSpacing: 360,
+				lineSpacingRule: "auto"
+			}),
+			doubleSpacing: () => withCanonicalParagraphFormatting(makeSetLineSpacing(480), {
+				lineSpacing: 480,
+				lineSpacingRule: "auto"
+			}),
+			setSpaceBefore: (twips) => withCanonicalParagraphFormatting(setParagraphSpacingAttr("before", twips), { spaceBefore: twips }),
+			setSpaceAfter: (twips) => withCanonicalParagraphFormatting(setParagraphSpacingAttr("after", twips), { spaceAfter: twips }),
+			increaseIndent: (amount) => withCanonicalParagraphFormatting(makeIncreaseIndent(amount), (node) => ({ indentLeft: (expectParagraphAttrs(node).indentLeft ?? 0) + (amount ?? 720) })),
+			decreaseIndent: (amount) => withCanonicalParagraphFormatting(makeDecreaseIndent(amount), (node) => {
+				const attrs = expectParagraphAttrs(node);
+				const indentLeft = Math.max(0, (attrs.indentLeft ?? 0) - (amount ?? 720));
+				return { indentLeft: indentLeft > 0 || paragraphNumberingReferenceId(attrs.numPr ?? void 0) !== void 0 ? indentLeft : null };
+			}),
+			setIndentLeft: (twips) => withCanonicalParagraphFormatting(setParagraphAttr("indentLeft", twips > 0 ? twips : null), { indentLeft: twips > 0 ? twips : null }),
+			setIndentRight: (twips) => withCanonicalParagraphFormatting(setParagraphAttr("indentRight", twips > 0 ? twips : null), { indentRight: twips > 0 ? twips : null }),
+			setIndentFirstLine: (twips, hanging) => withCanonicalParagraphFormatting(setParagraphAttrsCmd({
+				indentFirstLine: twips > 0 ? twips : null,
+				hangingIndent: hanging ?? false
+			}), {
 				indentFirstLine: twips > 0 ? twips : null,
 				hangingIndent: hanging ?? false
 			}),
-			applyStyle: (styleId, resolvedAttrs) => applyStyleFn(styleId, resolvedAttrs),
-			clearStyle: () => (state, dispatch) => {
+			applyStyle: (styleId, resolvedAttrs) => withCanonicalParagraphFormatting(applyStyleFn(styleId, resolvedAttrs), {
+				styleId,
+				...resolvedAttrs ? {
+					alignment: null,
+					outlineLevel: null,
+					spaceBefore: null,
+					spaceAfter: null,
+					lineSpacing: null,
+					lineSpacingRule: null
+				} : {}
+			}),
+			clearStyle: () => withCanonicalParagraphFormatting((state, dispatch) => {
 				const resolver = getDocumentStyleResolver(state);
 				if (!resolver) return applyStyleFn(null)(state, dispatch);
 				const resolved = resolver.resolveParagraphStyle(null);
@@ -662,7 +693,7 @@ const ParagraphExtension = createNodeExtension({
 					...styleName && { styleName },
 					numbering: getDocumentNumbering(state)
 				})(state, dispatch);
-			},
+			}, { styleId: null }),
 			insertSectionBreak: (breakType) => setSectionBreakType(breakType),
 			removeSectionBreak: () => removeSectionBreakAtSelection,
 			generateTOC: ({ title }) => (state, dispatch) => {

package/dist/prosemirror/extensions/features/ListExtension.js

@@ -1,5 +1,6 @@
 import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../../../docx/numberingReference.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
+import { withCanonicalCommand } from "../../canonicalCommands.js";
 import { LIST_MARKER_PATTERN, listRequestsForMarker } from "../../listAutoformatMarkers.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { applyParagraphUpdates, continueNumbering, listItemAttrs, resolveListTarget, restartNumbering, setNumberingValue } from "../../listNumbering.js";
@@ -107,8 +108,14 @@ function toggleList(intent) {
 		return true;
 	};
 }
-const toggleBulletList = (state, dispatch) => toggleList("bullet")(state, dispatch);
-const toggleNumberedList = (state, dispatch) => toggleList("numbered")(state, dispatch);
+const toggleBulletList = withCanonicalCommand((state, dispatch) => toggleList("bullet")(state, dispatch), () => [{
+	type: "toggleList",
+	kind: "bullet"
+}]);
+const toggleNumberedList = withCanonicalCommand((state, dispatch) => toggleList("numbered")(state, dispatch), () => [{
+	type: "toggleList",
+	kind: "decimal"
+}]);
 const attrsForListLevel = (state, attrs, level) => {
 	if (!hasActiveListNumbering(attrs)) panic("Cannot change the level of a list without a numbering id");
 	return {
@@ -394,9 +401,15 @@ const ListExtension = createExtension({
 			commands: {
 				toggleBulletList: () => toggleBulletList,
 				toggleNumberedList: () => toggleNumberedList,
-				increaseListLevel: () => increaseListLevel,
-				decreaseListLevel: () => decreaseListLevel,
-				removeList: () => removeList,
+				increaseListLevel: () => withCanonicalCommand(increaseListLevel, () => [{
+					type: "changeListLevel",
+					direction: "increase"
+				}]),
+				decreaseListLevel: () => withCanonicalCommand(decreaseListLevel, () => [{
+					type: "changeListLevel",
+					direction: "decrease"
+				}]),
+				removeList: () => withCanonicalCommand(removeList, () => [{ type: "removeList" }]),
 				restartNumbering: () => restartNumbering,
 				continueNumbering: () => continueNumbering,
 				setNumberingValue: (value) => setNumberingValue(value)

package/dist/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts

@@ -2,7 +2,7 @@ import { document_d_exports } from "../../../types/document.js";
 import { Extension } from "../types.js";
 import { RemovedSectionReference, TrackedSectionEndpointRemoval } from "../../../internal/sectionEndpointResolution.js";
 import { Node } from "prosemirror-model";
-import { EditorState, PluginKey, Transaction } from "prosemirror-state";
+import { EditorState, Plugin, PluginKey, Transaction } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts
 declare const paragraphChangeTrackerKey: PluginKey<InternalParagraphChangeTrackerState>;
 type ParagraphChangeTrackerState = {
@@ -30,6 +30,7 @@ type InternalParagraphChangeTrackerState = ParagraphChangeTrackerState & {
   /** The section records themselves, by identity. */
   sectionRecords: ReadonlySet<document_d_exports.SectionProperties>;
 };
+declare function createParagraphChangeTrackerPlugin(): Plugin<InternalParagraphChangeTrackerState>;
 /**
  * Get the change tracker state from an EditorState
  */
@@ -85,6 +86,8 @@ declare function markSectionBreakRemoval(tr: Transaction, sourceDoc: Node): Tran
  */
 declare function clearTrackedChanges(state: EditorState): Transaction;
 declare function ignoreTrackedChanges(tr: Transaction): Transaction;
+/** A committed package-story/property edit requires the full package serializer. */
+declare const markPackageChange: (tr: Transaction) => Transaction;
 declare function markStructuralChange(tr: Transaction): Transaction;
 type MarkChangedParagraphRangesOptions = {
   ranges: readonly {
@@ -98,4 +101,4 @@ type MarkChangedParagraphRangesOptions = {
 declare function markChangedParagraphRanges(tr: Transaction, batch: MarkChangedParagraphRangesOptions): Transaction;
 declare const ParagraphChangeTrackerExtension: (options?: Partial<{}> | undefined) => Extension;
 //#endregion
-export { ParagraphChangeTrackerExtension, ParagraphChangeTrackerState, clearTrackedChanges, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };
+export { ParagraphChangeTrackerExtension, ParagraphChangeTrackerState, clearTrackedChanges, createParagraphChangeTrackerPlugin, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markPackageChange, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };

package/dist/prosemirror/extensions/features/ParagraphChangeTrackerExtension.js

@@ -13,6 +13,7 @@ const paragraphChangeTrackerKey = new PluginKey("paragraphChangeTracker");
 const CLEAR_META = "clear";
 const IGNORE_META = "ignore";
 const STRUCTURAL_META = "structural";
+const PACKAGE_CHANGE_META = "package-change";
 const CHANGED_PARAGRAPH_RANGES_META = "folioChangedParagraphRanges";
 const SECTION_ENDPOINT_REMOVAL_META = "folioSectionEndpointRemoval";
 const SECTION_EDIT_META = "folioSectionEdit";
@@ -258,6 +259,11 @@ function createParagraphChangeTrackerPlugin() {
 						sectionRecords: counts.sectionRecords
 					};
 				}
+				if (meta === PACKAGE_CHANGE_META && !tr.docChanged) return {
+					...prevState,
+					hasUntrackedSourceChanges: true,
+					hasUntrackedChanges: true
+				};
 				if (!tr.docChanged) return isSectionEditMeta(sectionEditMeta) && sectionEditMeta.expectedEndpointFingerprint === prevState.sectionEndpointFingerprint ? {
 					...prevState,
 					sectionEndpointRemoval: sectionEditMeta.authorization
@@ -326,6 +332,10 @@ function createParagraphChangeTrackerPlugin() {
 						newState.hasUntrackedChanges = true;
 					}
 				}
+				if (meta === PACKAGE_CHANGE_META) {
+					newState.hasUntrackedSourceChanges = true;
+					newState.hasUntrackedChanges = true;
+				}
 				return newState;
 			}
 		},
@@ -503,6 +513,8 @@ function clearTrackedChanges(state) {
 function ignoreTrackedChanges(tr) {
 	return tr.setMeta(paragraphChangeTrackerKey, IGNORE_META);
 }
+/** A committed package-story/property edit requires the full package serializer. */
+const markPackageChange = (tr) => tr.setMeta(paragraphChangeTrackerKey, PACKAGE_CHANGE_META);
 function markStructuralChange(tr) {
 	return tr.setMeta(paragraphChangeTrackerKey, STRUCTURAL_META);
 }
@@ -523,4 +535,4 @@ const ParagraphChangeTrackerExtension = createExtension({
 	}
 });
 //#endregion
-export { ParagraphChangeTrackerExtension, clearTrackedChanges, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };
+export { ParagraphChangeTrackerExtension, clearTrackedChanges, createParagraphChangeTrackerPlugin, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markPackageChange, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };

package/dist/prosemirror/extensions/marks/TextColorExtension.js

@@ -1,5 +1,6 @@
 import { textToStyle } from "../../../utils/formatToStyle.js";
 import { expectTextColorMarkAttrs } from "../../attrs/index.js";
+import { canonicalRunFormatting, withCanonicalCommand } from "../../canonicalCommands.js";
 import { clearRunColor } from "../../clearRunColor.js";
 import { createMarkExtension } from "../create.js";
 import { setMark } from "./markUtils.js";
@@ -40,10 +41,10 @@ const TextColorExtension = createMarkExtension({
 		if (!textColorType) panic("Missing mark type: textColor");
 		return { commands: {
 			setTextColor: (attrs) => {
-				if (!attrs.rgb && !attrs.themeColor) return clearRunColor();
+				if (!attrs.rgb && !attrs.themeColor) return withCanonicalCommand(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }));
 				return setMark(textColorType, attrs);
 			},
-			clearTextColor: () => clearRunColor()
+			clearTextColor: () => withCanonicalCommand(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }))
 		} };
 	}
 });

package/dist/prosemirror/extensions/marks/TrackedChangeExtensions.js

@@ -58,6 +58,7 @@ const InsertionExtension = createMarkExtension({
 			provenance: { default: "user" },
 			suggestionId: { default: null },
 			_docxOuterWrapperCount: { default: null },
+			_docxResolutionJoins: { default: null },
 			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,
@@ -120,6 +121,7 @@ const DeletionExtension = createMarkExtension({
 			suggestionId: { default: null },
 			_historicalFormatting: { default: null },
 			_docxOuterWrapperCount: { default: null },
+			_docxResolutionJoins: { default: null },
 			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,