@stll/folio-core 0.58.4 → 0.59.0

package/dist/prosemirror/commands/paragraphBookmarkJoin.js

@@ -1,4 +1,5 @@
 import { Fragment } from "prosemirror-model";
+import { canJoin } from "prosemirror-transform";
 //#region src/prosemirror/commands/paragraphBookmarkJoin.ts
 /** The inline form of boundaries whose enclosing paragraph break was removed. */
 const inlineBookmarksOf = (boundaries) => {
@@ -18,5 +19,38 @@ const inlineBookmarksForParagraphJoin = ({ first, boundaries, second }) => {
 	]);
 	return first.type.validContent(content) ? inline : null;
 };
+/** Paragraph siblings separated only by typed bookmark boundaries. */
+const paragraphJoinAfter = (doc, position) => {
+	const at = doc.resolve(position);
+	const first = at.nodeBefore;
+	if (first?.type.name !== "paragraph") return null;
+	const boundaries = [];
+	let nextPosition = position;
+	let index = at.index();
+	while (index < at.parent.childCount) {
+		const boundary = at.parent.child(index);
+		if (boundary.type.name !== "blockBookmarkBoundary") break;
+		boundaries.push(boundary);
+		nextPosition += boundary.nodeSize;
+		index++;
+	}
+	const next = index < at.parent.childCount ? at.parent.child(index) : null;
+	if (!next || next.type !== first.type) return null;
+	if (boundaries.length === 0) return canJoin(doc, position) ? {
+		next,
+		nextPosition,
+		inlineBookmarks: []
+	} : null;
+	const inlineBookmarks = inlineBookmarksForParagraphJoin({
+		first,
+		boundaries,
+		second: next
+	});
+	return inlineBookmarks ? {
+		next,
+		nextPosition,
+		inlineBookmarks
+	} : null;
+};
 //#endregion
-export { inlineBookmarksForParagraphJoin, inlineBookmarksOf };
+export { inlineBookmarksForParagraphJoin, inlineBookmarksOf, paragraphJoinAfter };

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -1,5 +1,6 @@
 import { isStyleSourcedParagraphNumbering } from "../../internal/paragraphFormattingSerialization.js";
 import { expectParagraphAttrs } from "../attrs/index.js";
+import { LIST_RENDERING_ATTR_KEYS, hasListRendering } from "../listRenderingAttrs.js";
 import { readParagraphNumberingAttr } from "../numberingAttr.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionFromBidi } from "../paragraphDirection.js";
@@ -135,6 +136,11 @@ const paragraphPropertiesSnapshot = (node) => {
 	}
 	const directAlignment = directParagraphAlignment(attrs);
 	if (directAlignment !== void 0) snapshot["alignment"] = directAlignment;
+	snapshot["numPrFromStyle"] = attrs.numPrFromStyle ?? null;
+	if (hasListRendering(attrs)) for (const key of LIST_RENDERING_ATTR_KEYS) {
+		const value = attrs[key];
+		if (value != null) snapshot[key] = value;
+	}
 	Object.assign(snapshot, directParagraphSpacing(attrs), directParagraphIndentation(attrs));
 	return snapshot;
 };

package/dist/prosemirror/commands/resolveParagraphProperties.js

@@ -1,7 +1,7 @@
 import { resolveParagraphNumbering } from "../../docx/numberingReference.js";
 import { expectParagraphAttrs } from "../attrs/index.js";
 import { rejectedListRenderingPatch } from "../listRendering.js";
-import { paragraphNumberingAttr } from "../numberingAttr.js";
+import { effectiveParagraphNumbering, paragraphNumberingAttr, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { resolveParagraphDefaultTextFormatting } from "../styles/paragraphStyleCascade.js";
 import { listIndentationProvenancePatch } from "../styles/resolvedStyleAttrs.js";
@@ -38,12 +38,17 @@ const resolveParagraphChangeAttrs = ({ node, boundaryCovered, mode, revisionSet,
 				if (!styleResolver && sameStyle) styleNumbering = currentAttrs.numPrFromStyle ?? void 0;
 				const inheritedNumbering = styleNumbering == null ? null : paragraphNumberingAttr(resolveParagraphNumbering(styleNumbering));
 				const recordedNumbering = rejection.previousFormatting?.numPr;
-				const restoredNumbering = recordedNumbering ?? inheritedNumbering;
+				const restoredNumPrFromStyle = recordedNumbering?.kind === "reference" || recordedNumbering?.kind === "none" ? null : inheritedNumbering;
+				const effectiveNumbering = effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+					numPr: recordedNumbering,
+					numPrFromStyle: restoredNumPrFromStyle
+				}));
+				const restoredNumbering = effectiveNumbering === void 0 ? null : paragraphNumberingAttr(effectiveNumbering);
 				const restoredFormatting = paragraphRejectOriginalFormatting(rejection.previousFormatting, node.attrs["_originalFormatting"]);
 				const indentation = listIndentationProvenancePatch({
 					direct: paragraphIndentationFromFormatting(restoredFormatting ?? void 0),
 					styleFormatting: previousFormattingFromStyle,
-					numberingSource: recordedNumbering == null ? "style" : "paragraph",
+					numberingSource: recordedNumbering?.kind === "reference" ? "paragraph" : "style",
 					numPr: restoredNumbering?.kind === "reference" ? {
 						numId: restoredNumbering.numId,
 						ilvl: restoredNumbering.ilvl ?? 0
@@ -60,8 +65,8 @@ const resolveParagraphChangeAttrs = ({ node, boundaryCovered, mode, revisionSet,
 					numbering,
 					restoredNumbering
 				}), {
-					numPr: restoredNumbering,
-					numPrFromStyle: recordedNumbering == null ? inheritedNumbering : null
+					numPr: recordedNumbering ?? null,
+					numPrFromStyle: restoredNumPrFromStyle
 				});
 				Object.assign(nextAttrs, indentation);
 				nextAttrs["_originalFormatting"] = restoredFormatting;

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -4,7 +4,7 @@ import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js
 import { getDocumentSourceStyles } from "../../docx/headerFooterVerbatim.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 { paragraphNumberingReferenceId, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, assignParagraphIndentationProjection, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphFormattingWithAuthoredIndentation, 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";
@@ -32,10 +32,11 @@ import "../extensions/nodes/MoveRangeBoundaryExtension.js";
 import "../extensions/nodes/RangeAnchorExtension.js";
 import { inlineWrapperMember, inlineWrapperStackKey } from "../inlineWrapperStack.js";
 import { completeNumberingForDoc } from "../listInstanceReferences.js";
-import { hasListRendering, listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
+import { LIST_RENDERING_ATTR_KEYS, hasListRendering, listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
 import { expectMoveRangeBoundaryAttrs } from "../moveRangeBoundaryAttrs.js";
 import { assertNoteReferenceOccurrences, coalesceNoteReferenceOccurrences } from "../noteReferenceOccurrences.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
+import { effectiveParagraphNumbering, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionToAuthoredBidi } from "../paragraphDirection.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
@@ -172,11 +173,11 @@ const restoreParagraphPropertySource = (paragraph, baseParagraph) => {
 		}
 	}
 	const { numPr, numPrFromStyle } = baseFormatting;
-	if (!numPr || !numPrFromStyle || !isStyleSourcedParagraphNumbering(numPr, numPrFromStyle)) return;
+	if (numPrFromStyle == null || numPr != null && numPr.kind !== "levelOnly") return;
 	if (canonicalJson(modelParagraphFormattingEmission(paragraph.formatting)) !== canonicalJson(modelParagraphFormattingEmission(baseFormatting))) return;
 	paragraph.formatting = {
 		...paragraph.formatting,
-		numPr,
+		...numPr === void 0 ? {} : { numPr },
 		numPrFromStyle
 	};
 };
@@ -1024,7 +1025,10 @@ function removeTextBoxAnchorFromBlocks(blocks, marker) {
 * list markers on the way out of the editor.
 */
 function listRenderingFromAttrs(attrs) {
-	const numId = paragraphNumberingReferenceId$1(attrs.numPr);
+	const numId = paragraphNumberingReferenceId(effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	})));
 	if (numId === void 0) return;
 	if (!hasListRendering(attrs)) return;
 	return listRenderingFromAttrs$1({
@@ -1101,7 +1105,10 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleRes
 	if (attrs.reviewCarrier) paragraph.reviewCarrier = attrs.reviewCarrier;
 	const pFormatting = paragraphAttrsToFormatting(attrs);
 	if (pFormatting) paragraph.formatting = pFormatting;
-	if (attrs.numPr?.kind === "reference") {
+	if (effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}))?.kind === "reference") {
 		const inheritedIndentation = paragraphIndentationFromFormatting(attrs._resolvedFormatting);
 		if (inheritedIndentation) assignParagraphIndentationProjection({
 			paragraph,
@@ -1133,14 +1140,18 @@ const propertyChangeFromAttrs = (change) => {
 		...normalizedChangeInfo,
 		currentFormatting
 	};
-	const { numPr, ...previousWithoutNumPr } = previousFormatting;
+	const { numPr, numPrFromStyle, ...previousWithoutNumPr } = previousFormatting;
 	const normalizedPrevious = numPr == null ? previousWithoutNumPr : {
 		...previousWithoutNumPr,
 		numPr
 	};
+	for (const key of LIST_RENDERING_ATTR_KEYS) if (normalizedPrevious[key] == null) Reflect.deleteProperty(normalizedPrevious, key);
 	return {
 		...normalizedChangeInfo,
-		previousFormatting: normalizedPrevious,
+		previousFormatting: {
+			...normalizedPrevious,
+			...numPrFromStyle == null ? {} : { numPrFromStyle }
+		},
 		...currentFormatting !== void 0 && { currentFormatting }
 	};
 };
@@ -1269,7 +1280,10 @@ function paragraphAttrsToFormatting(attrs) {
 	const outlineLevel = authored("outlineLevel", Reflect.get(attrs, "outlineLevel"));
 	const bidi = authored("bidi", directionToAuthoredBidi(attrs.direction));
 	const snapToGrid = authored("snapToGrid", attrs.snapToGrid);
-	const numbered = paragraphNumberingReferenceId$1(attrs.numPr ?? void 0) !== void 0;
+	const numbered = paragraphNumberingReferenceId(effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}))) !== void 0;
 	const statedIndent = (value) => value === 0 && !numbered ? void 0 : value;
 	const indentLeft = statedIndent(authored("indentLeft", attrs.indentLeft));
 	const indentRight = authored("indentRight", attrs.indentRight);

package/dist/prosemirror/conversion/toProseDoc.js

@@ -33,9 +33,10 @@ import "../extensions/nodes/SdtExtension.js";
 import { fieldRequiresStructuredContent } from "../fieldRepresentation.js";
 import { inlineWrapperLayer } from "../inlineWrapperStack.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
+import { listRenderingFor } from "../listRendering.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
-import { paragraphNumberingAttr } from "../numberingAttr.js";
+import { effectiveParagraphNumbering, paragraphNumberingAttr, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
@@ -57,7 +58,7 @@ 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, mergeParagraphNumbering } from "@stll/docx-core/model";
+import { DRAWING_RAW_XML_MODES, PARSE_WARNING_CODES } from "@stll/docx-core/model";
 //#region src/prosemirror/conversion/toProseDoc.ts
 /**
 * Document to ProseMirror Conversion
@@ -429,8 +430,11 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	const { attrs, effectiveFrame } = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
 	if (directFormatting === void 0) Reflect.deleteProperty(attrs, "_originalFormatting");
 	else attrs._originalFormatting = directFormatting;
-	const numPr = mergeParagraphNumbering(attrs.numPrFromStyle ?? void 0, attrs.numPr ?? void 0);
-	if (numPr?.kind === "none" || paragraph.listRendering !== void 0 && context.numbering !== void 0 && numPr === void 0) Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
+	const numPr = effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (numPr.kind === "none" && (paragraph.formatting?.numPr?.kind === "none" || paragraph.listRendering !== void 0 && context.numbering !== void 0)) Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
 	else if (context.numbering !== void 0 && numPr?.kind === "reference") {
 		Object.assign(attrs, listIndentationProvenancePatch({
 			direct: paragraphIndentationFromFormatting(directFormatting),
@@ -448,6 +452,25 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 			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);
 	}
+	if (attrs._propertyChanges) attrs._propertyChanges = attrs._propertyChanges.map((change) => {
+		const previous = change.previousFormatting;
+		if (!previous) return change;
+		const inherited = styleResolver?.resolveParagraphStyle(previous.styleId ?? void 0).paragraphFormatting?.numPr;
+		const sources = paragraphNumberingSourcesFromBoundary({
+			numPr: previous.numPr,
+			numPrFromStyle: inherited ?? previous.numPrFromStyle
+		});
+		const originalNumbering = effectiveParagraphNumbering(sources);
+		const originalRendering = originalNumbering.kind === "reference" ? listRenderingFor(originalNumbering, context.numbering ?? null) : {};
+		return {
+			...change,
+			previousFormatting: {
+				...originalRendering,
+				...previous,
+				numPrFromStyle: sources.numPrFromStyle === void 0 ? null : paragraphNumberingAttr(sources.numPrFromStyle)
+			}
+		};
+	});
 	reportParagraphPageBreakProjection({
 		paragraph,
 		attrs,
@@ -813,12 +836,13 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	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;
-		const { numPr, ...rest } = previousFormatting;
+		const { numPr, numPrFromStyle, ...rest } = previousFormatting;
 		return {
 			...change,
-			previousFormatting: numPr === void 0 ? rest : {
+			previousFormatting: {
 				...rest,
-				numPr: paragraphNumberingAttr(numPr)
+				...numPr === void 0 ? {} : { numPr: paragraphNumberingAttr(numPr) },
+				...numPrFromStyle === void 0 ? {} : { numPrFromStyle: paragraphNumberingAttr(numPrFromStyle) }
 			}
 		};
 	});

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

@@ -11,6 +11,7 @@ import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { withCanonicalCommand, withCanonicalParagraphFormatting, withCanonicalStartParagraphFormatting } from "../../canonicalCommands.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "../../numberingAttr.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
 import { directParagraphIndentation } from "../../paragraphIndentation.js";
@@ -23,7 +24,7 @@ import { rebaseParagraphRuns } from "../../rebaseParagraphRuns.js";
 import { mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf } from "../../sectionCarrier.js";
 import { listAttrsFromResolvedStyle, listIndentationProvenancePatch, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createNodeExtension } from "../create.js";
-import { headingOutlineLevel, paragraphNumberingLevel, paragraphNumberingReferenceId } from "@stll/docx-core/model";
+import { headingOutlineLevel } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/extensions/core/ParagraphExtension.ts
 /**
@@ -36,7 +37,11 @@ import { Fragment } from "prosemirror-model";
 function paragraphAttrsToDOMStyle(attrs) {
 	const rawIndentLeft = Reflect.get(attrs, "indentLeft");
 	let indentLeft = typeof rawIndentLeft === "number" ? rawIndentLeft : void 0;
-	if (paragraphNumberingReferenceId(attrs.numPr) !== void 0 && (rawIndentLeft === null || rawIndentLeft === void 0)) indentLeft = ((paragraphNumberingLevel(attrs.numPr) ?? 0) + 1) * 720;
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (numbering !== void 0 && (rawIndentLeft === null || rawIndentLeft === void 0)) indentLeft = (numbering.ilvl + 1) * 720;
 	const style = paragraphToStyle({
 		...attrs.alignment !== void 0 ? { alignment: attrs.alignment } : {},
 		...attrs.spaceBefore !== void 0 ? { spaceBefore: attrs.spaceBefore } : {},
@@ -71,11 +76,15 @@ function numFmtToClass(numFmt) {
 		default: return "docx-list-decimal";
 	}
 }
-function getListClass(numPr, listIsBullet, listNumFmt) {
-	if (paragraphNumberingReferenceId(numPr) === void 0) return "";
-	const level = paragraphNumberingLevel(numPr) ?? 0;
-	if (listIsBullet) return `docx-list-bullet docx-list-level-${level}`;
-	return `docx-list-numbered ${numFmtToClass(listNumFmt)} docx-list-level-${level}`;
+function getListClass(attrs) {
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (numbering === void 0) return "";
+	const level = numbering.ilvl;
+	if (attrs.listIsBullet) return `docx-list-bullet docx-list-level-${level}`;
+	return `docx-list-numbered ${numFmtToClass(attrs.listNumFmt)} docx-list-level-${level}`;
 }
 /**
 * Parse a CSS length value to twips.
@@ -342,7 +351,7 @@ const paragraphNodeSpec = {
 	toDOM(node) {
 		const attrs = expectParagraphAttrs(node);
 		const style = paragraphAttrsToDOMStyle(attrs);
-		const listClass = getListClass(attrs.numPr, attrs.listIsBullet, attrs.listNumFmt);
+		const listClass = getListClass(attrs);
 		const domAttrs = {};
 		if (style) domAttrs["style"] = style;
 		if (listClass) domAttrs["class"] = listClass;
@@ -535,7 +544,10 @@ function makeDecreaseIndent(amount = 720) {
 				seen.add(pos);
 				const currentIndent = node.attrs["indentLeft"] || 0;
 				const newIndent = Math.max(0, currentIndent - amount);
-				const numbered = paragraphNumberingReferenceId(expectParagraphAttrs(node).numPr ?? void 0) !== void 0;
+				const numbered = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+					numPr: expectParagraphAttrs(node).numPr,
+					numPrFromStyle: expectParagraphAttrs(node).numPrFromStyle
+				})) !== void 0;
 				tr = tr.setNodeMarkup(pos, void 0, {
 					...node.attrs,
 					indentLeft: newIndent > 0 || numbered ? newIndent : null
@@ -581,19 +593,19 @@ function makeApplyStyle() {
 					} else Object.assign(newAttrs, directParagraphAttrs(current));
 					newAttrs["_originalFormatting"] = restyledOriginal ?? null;
 					const listAttrs = listAttrsFromResolvedStyle(resolvedAttrs, resolvedAttrs.numbering);
-					const directNumId = current.numPrFromStyle == null ? paragraphNumberingReferenceId(current.numPr ?? void 0) : void 0;
+					const directNumbering = current.numPrFromStyle == null && current.numPr?.kind === "reference" ? current.numPr : void 0;
 					if (listAttrs) Object.assign(newAttrs, listAttrs);
 					else if (isStyleSourcedParagraphNumbering(current.numPr, current.numPrFromStyle)) Object.assign(newAttrs, CLEARED_LIST_RENDERING_ATTRS, {
 						numPr: null,
 						numPrFromStyle: null
 					});
-					else if (directNumId !== void 0) Object.assign(newAttrs, listIndentationProvenancePatch({
+					else if (directNumbering !== void 0) Object.assign(newAttrs, listIndentationProvenancePatch({
 						direct: restyledIndentation(styleAttrs, restyledOriginal),
 						styleFormatting: resolvedAttrs.paragraphFormatting,
 						numberingSource: "paragraph",
 						numPr: {
-							numId: directNumId,
-							ilvl: paragraphNumberingLevel(current.numPr ?? void 0) ?? 0
+							numId: directNumbering.numId,
+							ilvl: directNumbering.ilvl ?? 0
 						},
 						numbering: resolvedAttrs.numbering ?? getDocumentNumbering(state)
 					}));
@@ -677,7 +689,10 @@ const ParagraphExtension = createNodeExtension({
 			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 };
+				return { indentLeft: indentLeft > 0 || effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+					numPr: attrs.numPr,
+					numPrFromStyle: attrs.numPrFromStyle
+				})) !== 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 }),

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

@@ -5,7 +5,7 @@ import { LIST_MARKER_PATTERN, listRequestsForMarker } from "../../listAutoformat
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { applyParagraphUpdates, continueNumbering, listItemAttrs, resolveListTarget, restartNumbering, setNumberingValue } from "../../listNumbering.js";
 import { resolveListState } from "../../listState.js";
-import { removedNumberingAttr } from "../../numberingAttr.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary, removedNumberingAttr } from "../../numberingAttr.js";
 import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
 import { SUGGESTION_META, makeRevisionInfo, suggestRangeDeletion } from "../../plugins/suggestionMode.js";
 import { listLevelAttrPatch, listLevelIndentRemovalPatch } from "../../styles/resolvedStyleAttrs.js";
@@ -36,9 +36,10 @@ function clearListAttrs(attrs, numbering) {
 		...CLEARED_LIST_RENDERING_ATTRS
 	};
 }
-function hasActiveListNumbering(attrs) {
-	return attrs.numPr?.kind === "reference";
-}
+const hasActiveListNumbering = (attrs) => effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+	numPr: attrs.numPr,
+	numPrFromStyle: attrs.numPrFromStyle
+})) !== void 0;
 const paragraphsBetween = (doc, from, to) => {
 	const paragraphs = [];
 	doc.nodesBetween(from, to, (node, pos) => {
@@ -73,7 +74,10 @@ const numberParagraphs = ({ state, tr, from, to, requests }) => {
 			node,
 			next: listItemAttrs(expectParagraphAttrs(node), {
 				numId: target.numId,
-				ilvl: paragraphNumberingLevel(expectParagraphAttrs(node).numPr) ?? target.ilvl
+				ilvl: paragraphNumberingLevel(effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+					numPr: expectParagraphAttrs(node).numPr,
+					numPrFromStyle: expectParagraphAttrs(node).numPrFromStyle
+				}))) ?? target.ilvl
 			}, target.numbering)
 		}))
 	});
@@ -86,7 +90,10 @@ function toggleList(intent) {
 		if (paragraph.type.name !== "paragraph") return false;
 		if (!dispatch) return true;
 		const numbering = getDocumentNumbering(state);
-		const isItemOfKind = (node) => resolveListState(numbering, expectParagraphAttrs(node).numPr).type === intent;
+		const isItemOfKind = (node) => resolveListState(numbering, effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+			numPr: expectParagraphAttrs(node).numPr,
+			numPrFromStyle: expectParagraphAttrs(node).numPrFromStyle
+		}))).type === intent;
 		const tr = state.tr;
 		if (isItemOfKind(paragraph)) applyParagraphUpdates({
 			tr,
@@ -117,13 +124,13 @@ const toggleNumberedList = withCanonicalCommand((state, dispatch) => toggleList(
 	kind: "decimal"
 }]);
 const attrsForListLevel = (state, attrs, level) => {
-	if (!hasActiveListNumbering(attrs)) panic("Cannot change the level of a list without a numbering id");
+	if (effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	})) === void 0) panic("Cannot change the level of a list without a numbering id");
 	return {
 		...attrs,
-		...listLevelAttrPatch(attrs, {
-			numId: attrs.numPr.numId,
-			ilvl: level
-		}, getDocumentNumbering(state))
+		...listLevelAttrPatch(attrs, level, getDocumentNumbering(state))
 	};
 };
 const increaseListLevel = (state, dispatch) => {
@@ -132,7 +139,10 @@ const increaseListLevel = (state, dispatch) => {
 	if (paragraph.type.name !== "paragraph") return false;
 	const attrs = expectParagraphAttrs(paragraph);
 	if (!hasActiveListNumbering(attrs)) return false;
-	const currentLevel = attrs.numPr.ilvl ?? 0;
+	const currentLevel = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}))?.ilvl ?? 0;
 	if (currentLevel >= 8) return false;
 	if (!dispatch) return true;
 	const paragraphPos = $from.before($from.depth);
@@ -145,7 +155,10 @@ const decreaseListLevel = (state, dispatch) => {
 	if (paragraph.type.name !== "paragraph") return false;
 	const attrs = expectParagraphAttrs(paragraph);
 	if (!hasActiveListNumbering(attrs)) return false;
-	const currentLevel = attrs.numPr.ilvl ?? 0;
+	const currentLevel = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}))?.ilvl ?? 0;
 	if (!dispatch) return true;
 	const paragraphPos = $from.before($from.depth);
 	if (currentLevel <= 0) dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, {
@@ -182,10 +195,14 @@ function getListInfo(state) {
 	const paragraph = $from.parent;
 	if (paragraph.type.name !== "paragraph") return null;
 	const attrs = expectParagraphAttrs(paragraph);
-	if (!hasActiveListNumbering(attrs)) return null;
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (numbering === void 0) return null;
 	return {
-		numId: attrs.numPr.numId,
-		ilvl: attrs.numPr.ilvl ?? 0
+		numId: numbering.numId,
+		ilvl: numbering.ilvl ?? 0
 	};
 }
 function exitListOnEmptyEnter() {
@@ -219,7 +236,8 @@ function splitListItem() {
 		if (!empty) return false;
 		const paragraph = $from.parent;
 		if (paragraph.type.name !== "paragraph") return false;
-		if (!hasActiveListNumbering(expectParagraphAttrs(paragraph))) return false;
+		const attrs = expectParagraphAttrs(paragraph);
+		if (!hasActiveListNumbering(attrs)) return false;
 		if (dispatch) {
 			const { tr } = state;
 			const pos = $from.pos;
@@ -274,7 +292,10 @@ function increaseListIndent() {
 			if (node.type.name === "paragraph") {
 				const attrs = expectParagraphAttrs(node);
 				if (!hasActiveListNumbering(attrs)) return;
-				if ((attrs.numPr.ilvl ?? 0) < 8) positions.push({
+				if ((effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+					numPr: attrs.numPr,
+					numPrFromStyle: attrs.numPrFromStyle
+				}))?.ilvl ?? 0) < 8) positions.push({
 					pos,
 					attrs
 				});
@@ -283,7 +304,10 @@ function increaseListIndent() {
 		if (positions.length === 0) return false;
 		if (dispatch) {
 			let tr = state.tr;
-			for (const { pos, attrs } of positions) tr = tr.setNodeMarkup(pos, void 0, attrsForListLevel(state, attrs, (attrs.numPr.ilvl ?? 0) + 1));
+			for (const { pos, attrs } of positions) tr = tr.setNodeMarkup(pos, void 0, attrsForListLevel(state, attrs, (effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+				numPr: attrs.numPr,
+				numPrFromStyle: attrs.numPrFromStyle
+			}))?.ilvl ?? 0) + 1));
 			dispatch(tr);
 		}
 		return true;
@@ -306,7 +330,10 @@ function decreaseListIndent() {
 		if (dispatch) {
 			let tr = state.tr;
 			for (const { pos, attrs } of positions) {
-				const currentLevel = attrs.numPr.ilvl ?? 0;
+				const currentLevel = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+					numPr: attrs.numPr,
+					numPrFromStyle: attrs.numPrFromStyle
+				}))?.ilvl ?? 0;
 				if (currentLevel <= 0) tr = tr.setNodeMarkup(pos, void 0, {
 					...clearListAttrs(attrs, getDocumentNumbering(state)),
 					indentLeft: null,
@@ -330,7 +357,10 @@ function insertTab() {
 	};
 }
 /** Whether a typed marker may become a list here at all. */
-const acceptsListMarker = (paragraph) => paragraph.type.name === "paragraph" && paragraphNumberingReferenceId(expectParagraphAttrs(paragraph).numPr) === void 0;
+const acceptsListMarker = (paragraph) => paragraph.type.name === "paragraph" && paragraphNumberingReferenceId(effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+	numPr: expectParagraphAttrs(paragraph).numPr,
+	numPrFromStyle: expectParagraphAttrs(paragraph).numPrFromStyle
+}))) === void 0;
 /**
 * Replace a typed marker with the list the toolbar button produces: the same
 * target resolution and the same attrs, so an autoformatted list saves exactly

package/dist/prosemirror/listInstanceReferences.js

@@ -1,7 +1,7 @@
 import { completeListNumbering } from "../docx/listNumberingInstances.js";
-import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
 import { hasListRendering, listRenderingFromAttrs } from "./listRenderingAttrs.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 //#region src/prosemirror/listInstanceReferences.ts
 const PARAGRAPH_NODE = "paragraph";
 /**
@@ -10,15 +10,18 @@ const PARAGRAPH_NODE = "paragraph";
 * define an instance from.
 */
 const collectReference = (attrs, sink) => {
-	const numId = paragraphNumberingReferenceId(attrs.numPr);
-	if (numId === void 0 || sink.isDefined(numId)) return;
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (numbering === void 0 || sink.isDefined(numbering.numId)) return;
 	if (!hasListRendering(attrs)) return;
 	sink.references.push({
-		numId,
-		ilvl: paragraphNumberingLevel(attrs.numPr) ?? 0,
+		numId: numbering.numId,
+		ilvl: numbering.ilvl,
 		rendering: listRenderingFromAttrs({
 			attrs,
-			numId
+			numId: numbering.numId
 		})
 	});
 };
@@ -38,10 +41,7 @@ const undefinedListInstanceReferences = (doc, isDefined) => {
 		collectReference(attrs, sink);
 		for (const change of attrs._propertyChanges ?? []) {
 			const previous = change.previousFormatting;
-			if (previous?.numPr) collectReference({
-				...previous,
-				numPr: previous.numPr
-			}, sink);
+			if (previous) collectReference(previous, sink);
 		}
 		return false;
 	});
@@ -52,12 +52,18 @@ const paragraphListReferences = (node) => {
 	if (node.type.name !== PARAGRAPH_NODE) return [];
 	const attrs = expectParagraphAttrs(node);
 	const numIds = [];
-	const add = (numPr) => {
-		const numId = paragraphNumberingReferenceId(numPr ?? void 0);
-		if (numId !== void 0) numIds.push(numId);
+	const add = (source) => {
+		const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+			numPr: source.numPr,
+			numPrFromStyle: source.numPrFromStyle
+		}));
+		if (numbering !== void 0) numIds.push(numbering.numId);
 	};
-	add(attrs.numPr);
-	for (const change of attrs._propertyChanges ?? []) add(change.previousFormatting?.numPr);
+	add(attrs);
+	for (const change of attrs._propertyChanges ?? []) {
+		const previous = change.previousFormatting;
+		if (previous) add(previous);
+	}
 	return numIds;
 };
 /**

package/dist/prosemirror/listLabels.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
+import { ParagraphNumberingSources } from "./numberingAttr.js";
 import { ParagraphAttrs } from "./schema/nodes.js";
-import { ParagraphNumberingOverride } from "../docx/numberingReference.js";
+import { ListCounterStreams } from "./listMarker.js";
 //#region src/prosemirror/listLabels.d.ts
 /**
  * The attrs the counter reads for a paragraph of the document model, as
@@ -8,7 +9,7 @@ import { ParagraphNumberingOverride } from "../docx/numberingReference.js";
  * attrs no label depends on: a reader that walks the model (Markdown) counts
  * every list paragraph through here.
  */
-declare const listLabelAttrsFromRendering: (rendering: document_d_exports.ListRendering, numPrFromStyle: ParagraphNumberingOverride | undefined) => ParagraphAttrs;
+declare const listLabelAttrsFromRendering: (rendering: document_d_exports.ListRendering | undefined, { numPr, numPrFromStyle }: ParagraphNumberingSources) => ParagraphAttrs;
 /**
  * Advances past one paragraph and answers the label it shows, or `undefined`
  * when it shows none.
@@ -19,6 +20,6 @@ type ListLabelCounter = (attrs: Readonly<ParagraphAttrs>) => string | undefined;
  * paragraph, numbered or not: whether a list continues depends on what stands
  * between its items.
  */
-declare const createListLabelCounter: () => ListLabelCounter;
+declare const createListLabelCounter: (streams?: ListCounterStreams) => ListLabelCounter;
 //#endregion
 export { ListLabelCounter, createListLabelCounter, listLabelAttrsFromRendering };