@stll/folio-core 0.58.5 → 0.60.0

package/dist/prosemirror/commands/comments.js

@@ -1,5 +1,5 @@
 import { sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
-import { getProseParagraphPropertySourceToken, markParagraphPropertySourceTransfers } from "../../docx/paragraphPropertySource.js";
+import { markParagraphPropertySourceTransfers } from "../../docx/paragraphPropertySource.js";
 import { RevisionResolutionStep } from "../../internal/revisionResolutionStep.js";
 import { finalRevisionParagraphRanges } from "../../internal/revisionResolutionTracking.js";
 import { deleteTextBoxesAnchoredAt, droppedTextBoxAnchorIds, moveTextBoxesPastNextParagraph } from "../anchoredTextBoxes.js";
@@ -16,19 +16,18 @@ import { joinAtParagraphMark } from "../paragraphMarkJoin.js";
 import { getDocumentNumbering } from "../plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "../plugins/documentStyleState.js";
 import { resolvedPreservedXmlAttrs } from "../preservedXmlReview.js";
-import { rebaseParagraphRuns, setParagraphAttrsWithRebasedRunFormatting } from "../rebaseParagraphRunFormatting.js";
+import { setParagraphAttrsWithRebasedRunFormatting } from "../rebaseParagraphRunFormatting.js";
 import { rejoinRunsAt } from "../rejoinRunCarriers.js";
 import { getFolioNodeRevisionCarriers, nodePropertyRevisionSites } from "../revisionCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting } from "../runPropertyChangeResolution.js";
-import { paragraphRunStyleContext, paragraphRunStyleContextAt } from "../runStyleFormatting.js";
+import { paragraphRunStyleContextAt } from "../runStyleFormatting.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 import { isTableCellRetainedInReviewView } from "../tableCellRevisionVisibility.js";
 import { markRowEmptiedInBatch, reconcileTableGridAfterColumnRemoval, removeRowsWithoutCellsAfterBatch, removeTableRow } from "../tableGridMutation.js";
 import { runInCellPending, runParagraphIntoTable } from "../tableRunIn.js";
 import { retainedTrackedRevisionMark, trackedRevisionPathOf } from "../trackedRevisionPath.js";
 import { holdsNoContent } from "../zeroWidthAnchors.js";
-import { inlineBookmarksForParagraphJoin } from "./paragraphBookmarkJoin.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot } from "./propertyChangeScope.js";
 import { resolveNodePropertyChangeAttrs } from "./resolveNodePropertyChangeAttrs.js";
 import { resolveParagraphChangeAttrs } from "./resolveParagraphProperties.js";
@@ -338,8 +337,7 @@ function resolveChange(from, to, mode, revisionIds) {
 					continue;
 				}
 				if (moveTextBoxesPastNextParagraph(tr, mappedPos)) markStructuralChange(tr);
-				const joinPos = mappedPos + paragraph.nodeSize;
-				let nextPos = joinPos;
+				let nextPos = mappedPos + paragraph.nodeSize;
 				const boundaries = [];
 				while (nextPos < tr.doc.content.size) {
 					const boundary = tr.doc.nodeAt(nextPos);
@@ -375,32 +373,7 @@ function resolveChange(from, to, mode, revisionIds) {
 					continue;
 				}
 				try {
-					if (boundaries.length > 0) {
-						const leftToken = getProseParagraphPropertySourceToken(paragraph);
-						const rightToken = getProseParagraphPropertySourceToken(nextNode);
-						const inlineBookmarks = inlineBookmarksForParagraphJoin({
-							first: paragraph,
-							boundaries,
-							second: nextNode
-						});
-						if (!inlineBookmarks) continue;
-						tr.replaceWith(joinPos - 1, nextPos + 1, inlineBookmarks);
-						tr.setNodeMarkup(mappedPos, void 0, nextNode.attrs);
-						markParagraphPropertySourceTransfers(tr, [{
-							displacedToken: typeof leftToken === "string" ? leftToken : null,
-							selectedToken: typeof rightToken === "string" ? rightToken : null
-						}]);
-						if (styleResolver && paragraph.content.size > 0) rebaseParagraphRuns({
-							previousContext: paragraphRunStyleContext(paragraph, styleResolver),
-							paragraphPosition: mappedPos,
-							range: {
-								from: 0,
-								to: paragraph.content.size
-							},
-							styleResolver,
-							tr
-						});
-					} else joinAtParagraphMark({
+					joinAtParagraphMark({
 						tr,
 						paragraphPos: mappedPos,
 						paragraph,

package/dist/prosemirror/commands/paragraphBookmarkJoin.d.ts

@@ -9,5 +9,11 @@ type InlineBookmarksForParagraphJoinOptions = {
 declare const inlineBookmarksOf: (boundaries: readonly Node[]) => Node[] | null;
 /** Inline boundaries that can replace the paragraph break without replacing either paragraph's content. */
 declare const inlineBookmarksForParagraphJoin: ({ first, boundaries, second }: InlineBookmarksForParagraphJoinOptions) => Node[] | null;
+/** Paragraph siblings separated only by typed bookmark boundaries. */
+declare const paragraphJoinAfter: (doc: Node, position: number) => {
+  next: Node;
+  nextPosition: number;
+  inlineBookmarks: Node[];
+} | null;
 //#endregion
-export { inlineBookmarksForParagraphJoin, inlineBookmarksOf };
+export { inlineBookmarksForParagraphJoin, inlineBookmarksOf, paragraphJoinAfter };

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/AutoBidiDetectionExtension.d.ts

@@ -1,7 +1,13 @@
 import { Extension } from "../types.js";
-import { EditorState, PluginKey } from "prosemirror-state";
+import { EditorState, Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/AutoBidiDetectionExtension.d.ts
-declare const autoBidiDetectionKey: PluginKey<any>;
+declare const autoBidiDetectionKey: Readonly<{
+  key: string;
+  createKey: () => import("prosemirror-state").PluginKey<unknown>;
+  owns: (plugin: Plugin<unknown>) => boolean;
+  get: (state: EditorState) => Plugin<unknown> | undefined;
+  getState: (state: EditorState) => unknown;
+}>;
 /**
  * Imperatively apply auto-bidi detection to a freshly built state (initial
  * load: Markdown import, DOCX import, template). `appendTransaction` does not

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

@@ -2,11 +2,47 @@ import { setProseParagraphMarkupWithPropertySource } from "../../../docx/paragra
 import { getTransactionDirtyRange } from "../../../paged-layout/transactionDirtyRange.js";
 import { detectBaseDirection } from "../../../utils/baseDirection.js";
 import { directionIsAutoManaged } from "../../paragraphDirection.js";
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { createExtension } from "../create.js";
 import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
-import { Plugin, PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/AutoBidiDetectionExtension.ts
-const autoBidiDetectionKey = new PluginKey("autoBidiDetection");
+/**
+* AutoBidiDetection — sets the paragraph `direction` (to `{ source: "auto" }`)
+* on RTL-led paragraphs that arrived without an explicit direction decision.
+*
+* Why: Folio only ever rendered/exported RTL when a paragraph already carried
+* `w:bidi` (from a Word import) or the user toggled it by hand. Content that
+* never had a flag — AI-generated text, Markdown/HTML/plain-text imports, paste,
+* or just typing Arabic without the shortcut — stayed left-to-right both in the
+* editor and in the exported `.docx`. The ProseMirror doc is the single source
+* of truth for both the layout painter (`toFlowBlocks`) and the serializer
+* (`fromProseDoc`), so writing the attribute here fixes the editor and the Word
+* export from one place.
+*
+* Detection uses the first-strong-character rule (`detectBaseDirection`), the
+* same logic the layout painter uses for base direction.
+*
+* Auto vs. explicit: only "auto-managed" paragraphs are (re-)evaluated — those
+* whose `direction` is undecided (absent) or was set by this detector
+* (`source: "auto"`). A manual user toggle or imported `w:bidi`
+* (`source: "manual"`) is authoritative and never touched. Because the detector
+* re-evaluates its own decisions, replacing an auto-RTL paragraph's text with
+* Latin clears it again (no stale "sticky" RTL).
+*
+* The `direction` discriminated union is editor-runtime state. Its `"auto"`
+* source is a *rendering* aid only — `directionToAuthoredBidi` maps it to
+* `undefined`, so an auto-detected paragraph never serializes `w:bidi` on its
+* own; only a manual decision (an explicit user toggle, or `w:bidi` the
+* source document already carried) is authored content. This keeps a no-edit
+* save byte-identical on direction, while the editor and layout painter still
+* treat `"auto"` as RTL (`directionToBidi` / `directionIsRtl`) so detected
+* text displays correctly before the user ever makes it explicit.
+*
+* Mirrors the appendTransaction + ensure-in-state pattern of
+* `ParaIdAllocatorExtension`.
+*/
+const autoBidiDetectionKey = createPluginKeyOwner("autoBidiDetection");
 const paragraphDirectionalText = (node) => {
 	let text = "";
 	node.descendants((child) => {
@@ -95,7 +131,7 @@ const ensureBaseDirectionInState = (state) => {
 	return state.apply(applyBidiUpdates(state, updates));
 };
 const createAutoBidiDetectionPlugin = () => new Plugin({
-	key: autoBidiDetectionKey,
+	key: autoBidiDetectionKey.createKey(),
 	appendTransaction(transactions, _oldState, newState) {
 		if (!transactions.some((t) => t.docChanged)) return null;
 		const [first, ...rest] = transactions;

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

@@ -1,7 +1,13 @@
 import { Extension } from "../types.js";
-import { PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/EmptyParagraphFormatExtension.d.ts
-declare const emptyParagraphFormatKey: PluginKey<any>;
+declare const emptyParagraphFormatKey: Readonly<{
+  key: string;
+  createKey: () => import("prosemirror-state").PluginKey<unknown>;
+  owns: (plugin: Plugin<unknown>) => boolean;
+  get: (state: import("prosemirror-state").EditorState) => Plugin<unknown> | undefined;
+  getState: (state: import("prosemirror-state").EditorState) => unknown;
+}>;
 declare const EmptyParagraphFormatExtension: (options?: Partial<Record<string, unknown>> | undefined) => Extension;
 //#endregion
 export { EmptyParagraphFormatExtension, emptyParagraphFormatKey };

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

@@ -1,6 +1,7 @@
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { createExtension } from "../create.js";
 import { textFormattingToMarks } from "../marks/markUtils.js";
-import { Plugin, PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/EmptyParagraphFormatExtension.ts
 /**
 * EmptyParagraphFormat — re-establishes stored marks for an empty styled
@@ -22,7 +23,7 @@ import { Plugin, PluginKey } from "prosemirror-state";
 * (bold/italic/color/…). Plain body paragraphs (font + size only) are left
 * untouched so ordinary typed text stays mark-free and serializes cleanly.
 */
-const emptyParagraphFormatKey = new PluginKey("emptyParagraphFormat");
+const emptyParagraphFormatKey = createPluginKeyOwner("emptyParagraphFormat");
 /**
 * Run-formatting properties the painter does NOT reproduce from
 * `defaultTextFormatting` on its own (it forwards only font family + size).
@@ -37,7 +38,7 @@ function hasNonFontDefaults(dtf) {
 }
 function createEmptyParagraphFormatPlugin() {
 	return new Plugin({
-		key: emptyParagraphFormatKey,
+		key: emptyParagraphFormatKey.createKey(),
 		appendTransaction(transactions, _oldState, newState) {
 			if (!transactions.some((t) => t.selectionSet || t.docChanged)) return null;
 			const { selection } = newState;

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

@@ -1,5 +1,6 @@
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { createExtension } from "../create.js";
-import { NodeSelection, Plugin, PluginKey } from "prosemirror-state";
+import { NodeSelection, Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ImageDragExtension.ts
 /**
 * Image Drag Extension — handles drag-to-reposition for images
@@ -10,12 +11,12 @@ import { NodeSelection, Plugin, PluginKey } from "prosemirror-state";
 * - Inline images: reorder within text flow via ProseMirror's default drag
 * - Custom drag initiation from mousedown on selected images
 */
-const imageDragKey = new PluginKey("imageDrag");
+const imageDragKey = createPluginKeyOwner("imageDrag");
 const ImageDragExtension = createExtension({
 	name: "imageDrag",
 	onSchemaReady(_ctx) {
 		return { plugins: [new Plugin({
-			key: imageDragKey,
+			key: imageDragKey.createKey(),
 			props: { handleDOMEvents: {
 				dragstart(view, event) {
 					const { selection } = view.state;

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

@@ -1,5 +1,6 @@
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { createExtension } from "../create.js";
-import { Plugin, PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/JoinedRunStyleExtension.ts
 /**
 * Runs that a join moves into another paragraph take that paragraph's style.
@@ -16,7 +17,7 @@ import { Plugin, PluginKey } from "prosemirror-state";
 * {@link JOINED_RUNS_RESTYLED_META}, and is left as it is.
 */
 const JOINED_RUNS_RESTYLED_META = "joinedRunsRestyled";
-const pastedTableEndKey = new PluginKey("pastedTableEnd");
+const pastedTableEndKey = createPluginKeyOwner("pastedTableEnd");
 /**
 * A table pasted over a story's last paragraph leaves that paragraph, emptied,
 * after it: a story ends with a paragraph, and the paste replaced the words,
@@ -24,7 +25,7 @@ const pastedTableEndKey = new PluginKey("pastedTableEnd");
 * paragraph, so the empty one is put back.
 */
 const createPastedTableEndPlugin = () => new Plugin({
-	key: pastedTableEndKey,
+	key: pastedTableEndKey.createKey(),
 	appendTransaction(transactions, oldState, newState) {
 		if (!transactions.some((transaction) => transaction.docChanged && transaction.getMeta("uiEvent") === "paste")) return null;
 		if (newState.doc.lastChild?.type.spec["tableRole"] !== "table" || oldState.doc.lastChild?.type.name !== "paragraph") return null;