@stll/folio-core 0.58.4 → 0.59.0

package/dist/prosemirror/listLabels.js

@@ -1,6 +1,5 @@
 import { bulletMarkerFontName, convertBulletToUnicode } from "../docx/bulletMarkers.js";
-import { paragraphNumberingReference, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
-import { advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState } from "./listMarker.js";
+import { advanceVisibleListMarker, createListCounterState } from "./listMarker.js";
 import { hasListRendering } from "./listRenderingAttrs.js";
 import { paragraphNumberingAttr } from "./numberingAttr.js";
 //#region src/prosemirror/listLabels.ts
@@ -27,35 +26,23 @@ const foldedFieldSuffix = (attrs) => {
 	const tab = marker.indexOf("	");
 	return tab === -1 ? "" : marker.slice(tab);
 };
-const withoutNumbering = (attrs) => {
-	const unnumbered = { ...attrs };
-	Reflect.deleteProperty(unnumbered, "numPr");
-	return unnumbered;
-};
 const staticMarker = (attrs) => {
 	const marker = attrs.listMarker;
 	if (!marker) return;
 	return (attrs.listIsBullet ? convertBulletToUnicode(marker, bulletMarkerFontName(attrs.listMarkerFormatting)) : marker).trim() || void 0;
 };
-/** Most paragraphs: nothing to count and no marker to show. */
-const isPlainParagraph = (attrs) => attrs.numPr == null && attrs.listMarker == null && attrs.listMarkerTemplate == null && (attrs._propertyChanges == null || attrs._propertyChanges.length === 0);
-const NO_PREVIOUS_LIST = {
-	abstractNumId: null,
-	fromStyle: false,
-	numId: null
-};
 /**
 * The attrs the counter reads for a paragraph of the document model, as
 * `toProseDoc` projects them (`listRenderingAttrPatch`), without the layout
 * attrs no label depends on: a reader that walks the model (Markdown) counts
 * every list paragraph through here.
 */
-const listLabelAttrsFromRendering = (rendering, numPrFromStyle) => {
-	const attrs = { numPr: paragraphNumberingAttr(paragraphNumberingReference({
-		numId: rendering.numId,
-		ilvl: rendering.level
-	})) };
-	if (numPrFromStyle) attrs.numPrFromStyle = paragraphNumberingAttr(numPrFromStyle);
+const listLabelAttrsFromRendering = (rendering, { numPr, numPrFromStyle }) => {
+	const attrs = {
+		...numPr === void 0 ? {} : { numPr: paragraphNumberingAttr(numPr) },
+		...numPrFromStyle === void 0 ? {} : { numPrFromStyle: paragraphNumberingAttr(numPrFromStyle) }
+	};
+	if (rendering === void 0) return attrs;
 	if (rendering.marker) attrs.listMarker = rendering.marker;
 	if (rendering.markerTemplate) attrs.listMarkerTemplate = rendering.markerTemplate;
 	if (rendering.isBullet) attrs.listIsBullet = true;
@@ -75,37 +62,17 @@ const listLabelAttrsFromRendering = (rendering, numPrFromStyle) => {
 * paragraph, numbered or not: whether a list continues depends on what stands
 * between its items.
 */
-const createListLabelCounter = () => {
-	const final = createListCounterState();
-	let streams = null;
-	let originalPreviousList = NO_PREVIOUS_LIST;
-	const advance = (counted) => {
-		const tracked = counted.pPrMark != null || counted._propertyChanges != null && counted._propertyChanges.length > 0;
-		if (streams === null && tracked) {
-			const original = cloneListCounterState(final);
-			original.previousList = { ...originalPreviousList };
-			streams = {
-				final,
-				original
-			};
-		}
-		if (streams !== null) return advanceVisibleListMarker(counted, streams).marker;
-		const marker = advanceListMarker(counted, final);
-		if (counted.numPr) originalPreviousList = final.previousList ?? NO_PREVIOUS_LIST;
-		return marker;
-	};
-	return (attrs) => {
-		if (isPlainParagraph(attrs)) {
-			final.previousList = NO_PREVIOUS_LIST;
-			return;
-		}
-		const rendered = hasListRendering(attrs);
-		const marker = advance(rendered ? attrs : withoutNumbering(attrs));
-		if (attrs.listMarkerHidden === true || !rendered) return;
-		const counted = paragraphNumberingReferenceId(attrs.numPr) === void 0 ? null : marker?.trim();
-		if (counted) return `${counted}${foldedFieldSuffix(attrs)}`;
-		return staticMarker(attrs);
-	};
+const createListLabelCounter = (streams = {
+	final: createListCounterState(),
+	original: createListCounterState()
+}) => (attrs) => {
+	const visible = advanceVisibleListMarker(attrs, streams);
+	const rendered = hasListRendering(visible.counterAttrs);
+	const marker = visible.marker;
+	if (visible.counterAttrs.listMarkerHidden === true || !rendered) return void 0;
+	const counted = marker?.trim();
+	if (counted) return `${counted}${foldedFieldSuffix(visible.counterAttrs)}`;
+	return staticMarker(visible.counterAttrs);
 };
 //#endregion
 export { createListLabelCounter, listLabelAttrsFromRendering };

package/dist/prosemirror/listMarker.d.ts

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../types/document.js";
 import { ParagraphAttrs } from "./schema/nodes.js";
+import { ResolvedListComponent, ResolvedListTemplate, resolveListTemplate, resolveListTemplateWithComponents } from "../docx/listTemplate.js";
 import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
 //#region src/prosemirror/listMarker.d.ts
 type ListCounterState = {
@@ -32,16 +33,6 @@ type VisibleListMarker = {
   stream: ListCounterStream;
   advances: readonly AdvancedListMarker[];
 };
-type ResolvedListComponent = {
-  level: number;
-  relativeStart: number;
-  start: number;
-  end: number;
-};
-type ResolvedListTemplate = {
-  value: string;
-  components: readonly ResolvedListComponent[];
-};
 declare const MAX_LIST_LEVEL = 8;
 declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
   listIsBullet: null;
@@ -72,14 +63,6 @@ declare function cloneListCounterState(state: ListCounterState): ListCounterStat
  */
 declare function advanceVisibleListMarker(attrs: ParagraphAttrs, streams: ListCounterStreams): VisibleListMarker;
 declare function formatCounter(value: number, format: document_d_exports.CounterFormat | undefined): string;
-type ResolveListTemplateOptions = {
-  template: string;
-  counters: number[];
-  levelFormats?: document_d_exports.CounterFormat[] | undefined;
-  forceDecimal?: boolean | undefined;
-};
-declare function resolveListTemplate(options: ResolveListTemplateOptions): string;
-declare function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal }: ResolveListTemplateOptions): ResolvedListTemplate;
 declare function advanceListMarker(attrs: ParagraphAttrs, state: ListCounterState): string | null;
 //#endregion
-export { AdvancedListMarker, CLEARED_LIST_RENDERING_ATTRS, LIST_RENDERING_ATTR_KEYS, ListCounterState, ListCounterStream, ListCounterStreams, MAX_LIST_LEVEL, ResolvedListComponent, ResolvedListTemplate, VisibleListMarker, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };
+export { AdvancedListMarker, CLEARED_LIST_RENDERING_ATTRS, LIST_RENDERING_ATTR_KEYS, ListCounterState, ListCounterStream, ListCounterStreams, MAX_LIST_LEVEL, type ResolvedListComponent, type ResolvedListTemplate, VisibleListMarker, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };

package/dist/prosemirror/listMarker.js

@@ -1,8 +1,9 @@
 import { bulletMarkerFontName, convertBulletToUnicode } from "../docx/bulletMarkers.js";
-import { paragraphNumberingLevel, paragraphNumberingReferenceId, sameStatedParagraphNumbering } from "../docx/numberingReference.js";
+import { resolveListTemplate, resolveListTemplateWithComponents } from "../docx/listTemplate.js";
+import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { formatOoxmlCounter } from "../docx/ooxmlCounterFormatter.js";
-import { isListNumPr } from "../layout-engine/types.js";
-import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
+import { LIST_RENDERING_ATTR_KEYS, hasListRendering } from "./listRenderingAttrs.js";
+import { effectiveParagraphNumbering, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 //#region src/prosemirror/listMarker.ts
 const MAX_LIST_LEVEL = 8;
 const CLEARED_LIST_RENDERING_ATTRS = Object.freeze({
@@ -65,13 +66,12 @@ function cloneListCounterState(state) {
 	};
 }
 function previousListAttrs(attrs) {
-	const previous = (attrs._propertyChanges?.find(({ previousFormatting }) => {
-		const previousNumPr = previousFormatting?.numPr;
-		return isListNumPr(previousNumPr) && (!attrs.numPr || !sameStatedParagraphNumbering(previousNumPr, attrs.numPr));
-	}))?.previousFormatting;
-	if (!previous || !isListNumPr(previous.numPr)) return null;
+	const change = attrs._propertyChanges?.at(0);
+	if (!change) return null;
+	const previous = change.previousFormatting ?? {};
 	return {
-		numPr: previous.numPr,
+		...previous.numPr == null ? {} : { numPr: previous.numPr },
+		...previous.numPrFromStyle == null ? {} : { numPrFromStyle: previous.numPrFromStyle },
 		...previous.listIsBullet !== void 0 ? { listIsBullet: previous.listIsBullet } : {},
 		...previous.listIsLegal !== void 0 ? { listIsLegal: previous.listIsLegal } : {},
 		...previous.listNumFmt !== void 0 ? { listNumFmt: previous.listNumFmt } : {},
@@ -111,61 +111,20 @@ function advanceVisibleListMarker(attrs, streams) {
 		return advanced;
 	};
 	const previous = previousListAttrs(attrs);
-	if (!attrs.numPr) return {
-		...advance(previous ?? attrs, previous ? "original" : "final"),
-		advances
-	};
 	if (attrs.pPrMark?.kind === "del") return {
-		...advance(attrs, "original"),
+		...advance(previous ?? attrs, "original"),
 		advances
 	};
-	const numberingWasAdded = attrs._propertyChanges?.some(({ previousFormatting }) => previousFormatting && Object.hasOwn(previousFormatting, "numPr") && previousFormatting.numPr == null);
-	const numberingChanged = previous?.numPr !== void 0 && !sameStatedParagraphNumbering(previous.numPr, attrs.numPr);
-	const visible = advance(attrs, "final");
-	if (attrs.pPrMark?.kind !== "ins" && !numberingWasAdded && !numberingChanged) advance(attrs, "original");
-	else if (numberingChanged && previous) advance(previous, "original");
+	const final = advance(attrs, "final");
+	const original = attrs.pPrMark?.kind === "ins" ? void 0 : advance(previous ?? attrs, "original");
 	return {
-		...visible,
+		...attrs.numPr?.kind !== "none" && final.marker === null && original && original.marker !== null && previous?.numPr?.kind === "reference" ? original : final,
 		advances
 	};
 }
 function formatCounter(value, format) {
 	return formatOoxmlCounter(value, format);
 }
-function resolveListTemplate(options) {
-	return resolveListTemplateWithComponents(options).value;
-}
-function resolveListTemplateWithComponents({ template, counters, levelFormats, forceDecimal = false }) {
-	const components = [];
-	let value = "";
-	let sourceEnd = 0;
-	for (const match of template.matchAll(/%(?<digit>\d)(?<punct>[.):\]])?/gu)) {
-		const sourceStart = match.index;
-		const relativeStart = value.length;
-		value += template.slice(sourceEnd, sourceStart);
-		sourceEnd = sourceStart + match[0].length;
-		const index = Number.parseInt(match.groups?.["digit"] ?? "", 10) - 1;
-		if (index < 0) continue;
-		const counter = counters[index];
-		if (counter === void 0 || Number.isNaN(counter)) continue;
-		const formatted = formatCounter(counter, forceDecimal ? "decimal" : levelFormats?.[index]);
-		if (!formatted) continue;
-		const start = value.length;
-		value += formatted;
-		components.push({
-			level: index,
-			relativeStart,
-			start,
-			end: value.length
-		});
-		value += match.groups?.["punct"] ?? "";
-	}
-	value += template.slice(sourceEnd);
-	return {
-		value,
-		components
-	};
-}
 function getLastListCounters(state) {
 	return state.lastAdvancedNumId === void 0 ? void 0 : state.counters.get(state.lastAdvancedNumId);
 }
@@ -179,11 +138,23 @@ function formatNumberedMarker(counters, level) {
 	return parts.length === 0 ? "1." : `${parts.join(".")}.`;
 }
 function advanceListMarker(attrs, state) {
+	if (!hasListRendering(attrs)) {
+		state.previousList = {
+			abstractNumId: null,
+			fromStyle: false,
+			numId: null
+		};
+		return null;
+	}
 	const markerTemplate = attrs.listMarkerTemplate ?? attrs.listMarker;
 	const foldedMarkerSuffix = attrs.listFoldedMarkerSuffix ?? void 0;
-	const level = paragraphNumberingLevel(attrs.numPr) ?? 0;
+	const effectiveNumbering = effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	const level = paragraphNumberingLevel(effectiveNumbering) ?? 0;
 	if (!Number.isInteger(level) || level < 0 || level > 8) return null;
-	const numId = paragraphNumberingReferenceId(attrs.numPr);
+	const numId = paragraphNumberingReferenceId(effectiveNumbering);
 	if (numId === void 0) {
 		let marker = null;
 		if (markerTemplate?.includes("%") && !attrs.listIsBullet) {
@@ -222,7 +193,7 @@ function advanceListMarker(attrs, state) {
 	};
 	const restartedNumIds = state.restartedNumIds ??= /* @__PURE__ */ new Set();
 	const latestAbstractCounters = abstractNumId === void 0 ? void 0 : state.abstractCounters.get(abstractNumId);
-	const styleNumbering = attrs.numPrFromStyle;
+	const styleNumbering = attrs.numPr?.kind !== "reference" && attrs.numPrFromStyle?.kind === "reference";
 	const resumesRestartedInstance = firstInstanceEncounter && attrs.listStartOverride == null && abstractNumId !== void 0 && previousList.abstractNumId === abstractNumId && previousList.numId !== null && previousList.numId !== numId && restartedNumIds.has(previousList.numId);
 	const resumesStyleInstance = firstInstanceEncounter && !styleNumbering && attrs.listStartOverride == null && abstractNumId !== void 0 && previousList.abstractNumId === abstractNumId && previousList.fromStyle;
 	if (latestAbstractCounters && (styleNumbering || resumesRestartedInstance || resumesStyleInstance)) counters = latestAbstractCounters;

package/dist/prosemirror/listNumbering.js

@@ -1,11 +1,12 @@
 import { mintListInstance, restartListInstance } from "../docx/listNumberingInstances.js";
 import { createNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
-import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
+import { paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
 import { withCanonicalCommand } from "./canonicalCommands.js";
 import { paragraphPropertiesSnapshot } from "./commands/propertyChangeScope.js";
 import { listRenderingFor, recordsListRendering } from "./listRendering.js";
 import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
+import { effectiveParagraphNumbering, effectiveParagraphNumberingReference, paragraphNumberingAttr, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { directParagraphIndentation } from "./paragraphIndentation.js";
 import { getDocumentNumbering } from "./plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "./plugins/documentStyleState.js";
@@ -39,14 +40,19 @@ const PARAGRAPH_NODE = "paragraph";
 const listChangeSnapshot = (node, attrs) => {
 	const previousFormatting = paragraphPropertiesSnapshot(node.type.create(attrs, node.content, node.marks));
 	previousFormatting["numPr"] ??= null;
+	previousFormatting["numPrFromStyle"] = attrs["numPrFromStyle"] ?? null;
 	for (const key of LIST_RENDERING_ATTR_KEYS) previousFormatting[key] = attrs[key] ?? null;
 	return previousFormatting;
 };
 const originalListFormatting = ({ record, numbering, styleResolver }) => {
 	const original = { ...record };
+	const inherited = styleResolver ? styleResolver.resolveParagraphStyle(record.styleId ?? void 0).paragraphFormatting?.numPr : record.numPrFromStyle ?? void 0;
+	original["numPrFromStyle"] = inherited === void 0 ? null : paragraphNumberingAttr(inherited);
 	if (recordsListRendering(record)) return original;
-	const inherited = styleResolver?.resolveParagraphStyle(record.styleId ?? void 0).paragraphFormatting?.numPr;
-	Object.assign(original, listRenderingFor(record.numPr ?? inherited, numbering));
+	Object.assign(original, listRenderingFor(effectiveParagraphNumbering({
+		numPr: record.numPr ?? void 0,
+		numPrFromStyle: inherited
+	}), numbering));
 	original["numPr"] = record.numPr ?? null;
 	return original;
 };
@@ -113,9 +119,13 @@ const levelMatches = (level, request) => {
 const directListMembership = (node, numbering) => {
 	if (!node || node.type.name !== PARAGRAPH_NODE) return null;
 	const attrs = expectParagraphAttrs(node);
-	const numId = paragraphNumberingReferenceId(attrs.numPr);
-	if (numId === void 0 || numId === paragraphNumberingReferenceId(attrs.numPrFromStyle)) return null;
-	const ilvl = paragraphNumberingLevel(attrs.numPr) ?? 0;
+	const effective = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (attrs.numPr?.kind !== "reference" || effective === void 0) return null;
+	const numId = effective.numId;
+	const ilvl = effective.ilvl ?? 0;
 	const level = numbering?.getLevel(numId, ilvl) ?? null;
 	return level ? {
 		numId,

package/dist/prosemirror/listRendering.d.ts

@@ -1,5 +1,6 @@
 import { ParagraphAttrs, ParagraphPropertyChangeAttrs } from "./schema/nodes.js";
 import { NumberingMap } from "../docx/numberingParser.js";
+import { ListRenderingAttrKey } from "./listRenderingAttrs.js";
 import { ParagraphNumberingOverride } from "../docx/numberingReference.js";
 //#region src/prosemirror/listRendering.d.ts
 type PreviousFormatting = NonNullable<ParagraphPropertyChangeAttrs["previousFormatting"]>;
@@ -13,12 +14,12 @@ declare const listRenderingFor: (numPr: ParagraphNumberingOverride | null | unde
  * the scope it restores wholesale, so a record that does not state them (one
  * written by an operation, or read from a file) would leave the rendering of
  * the numbering it undoes: a paragraph restored to no numbering still showed
- * the marker it was given. When the reject changes the numbering, the
- * rendering is recomputed from the restored numbering; otherwise it stays.
+ * the marker it was given. Reconcile the rendering attrs with the restored
+ * numbering even when the effective reference itself did not change.
  */
 type RejectedListRenderingOptions = {
   /** The paragraph's attrs before the reject. */
-  current: Pick<ParagraphAttrs, "numPr">;
+  current: Pick<ParagraphAttrs, "numPr" | "numPrFromStyle" | ListRenderingAttrKey>;
   /** The previous state the rejected record restores. */
   previousFormatting: PreviousFormatting | null | undefined;
   numbering: NumberingMap | null;

package/dist/prosemirror/listRendering.js

@@ -1,8 +1,11 @@
 import { paragraphNumberingLevel, paragraphNumberingReferenceId, sameStatedParagraphNumbering } from "../docx/numberingReference.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "./listMarker.js";
 import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
+import { effectiveParagraphNumbering, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { listAttrsFromNumbering } from "./styles/resolvedStyleAttrs.js";
 //#region src/prosemirror/listRendering.ts
+/** These attrs come from inline content, not the numbering definition. */
+const CONTENT_DERIVED_LIST_RENDERING_ATTRS = /* @__PURE__ */ new Set(["listImplicitChildLevelAdvances", "listMarkerSecondSlotOffsetTwips"]);
 /** Whether a `w:pPrChange` record states the list rendering it had (a list command's does). */
 const recordsListRendering = (record) => LIST_RENDERING_ATTR_KEYS.some((key) => Object.hasOwn(record, key));
 /** Every list-rendering attr for `numPr`: its level's, or all cleared when it numbers nothing. */
@@ -17,10 +20,26 @@ const listRenderingFor = (numPr, numbering) => {
 	return attrs;
 };
 const rejectedListRenderingPatch = ({ current, previousFormatting, numbering, restoredNumbering }) => {
-	if (recordsListRendering(previousFormatting ?? {})) return {};
+	const record = previousFormatting ?? {};
+	if (recordsListRendering(record)) {
+		const patch = {};
+		for (const key of LIST_RENDERING_ATTR_KEYS) patch[key] = record[key] ?? null;
+		return patch;
+	}
 	const restored = restoredNumbering ?? void 0;
-	if (sameStatedParagraphNumbering(restored, current.numPr ?? void 0)) return {};
-	return listRenderingFor(restored, numbering);
+	if (!sameStatedParagraphNumbering(restored, effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: current.numPr,
+		numPrFromStyle: current.numPrFromStyle
+	})))) return listRenderingFor(restored, numbering);
+	const expected = listRenderingFor(restored, numbering);
+	const patch = {};
+	for (const key of LIST_RENDERING_ATTR_KEYS) {
+		if (CONTENT_DERIVED_LIST_RENDERING_ATTRS.has(key)) continue;
+		const currentValue = current[key] ?? null;
+		const expectedValue = expected[key] ?? null;
+		if (JSON.stringify(currentValue) !== JSON.stringify(expectedValue)) patch[key] = expectedValue;
+	}
+	return Object.keys(patch).length === 0 ? {} : patch;
 };
 //#endregion
 export { listRenderingFor, recordsListRendering, rejectedListRenderingPatch };

package/dist/prosemirror/listRenderingAttrs.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../types/document.js";
+import { ParagraphNumberingBoundarySources } from "./numberingAttr.js";
 import { ParagraphAttrs } from "./schema/nodes.js";
 //#region src/prosemirror/listRenderingAttrs.d.ts
 /** `ListRendering` fields that have their own editor attr. */
@@ -39,7 +40,7 @@ declare const listRenderingAttrPatch: (rendering: document_d_exports.ListRenderi
  */
 declare const hasListRendering: (attrs: Pick<ParagraphAttrs, "listMarker" | "listIsBullet" | "listNumFmt">) => boolean;
 /** The attrs a rendering is read back from: a paragraph's, or a recorded previous state's. */
-type ListRenderingSourceAttrs = Pick<ParagraphAttrs, ListRenderingAttrKey | "numPr">;
+type ListRenderingSourceAttrs = Pick<ParagraphAttrs, ListRenderingAttrKey> & Partial<ParagraphNumberingBoundarySources>;
 type ListRenderingFromAttrsOptions = {
   attrs: ListRenderingSourceAttrs;
   numId: number;

package/dist/prosemirror/listRenderingAttrs.js

@@ -1,14 +1,5 @@
-import { paragraphNumberingLevel } from "@stll/docx-core/model";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 //#region src/prosemirror/listRenderingAttrs.ts
-/**
-* The one table that ties `Paragraph.listRendering` to the editor's `list*`
-* attrs. Both projections (model → attrs in `toProseDoc`, attrs → model in
-* `fromProseDoc`) and the cleared-attr set derive from it, so a field added
-* to `ListRendering` without a projection fails to compile instead of being
-* silently dropped on the way out of the editor.
-*
-* `level` and `numId` are not here: they travel in `numPr`.
-*/
 const LIST_RENDERING_ATTR_BY_FIELD = {
 	marker: "listMarker",
 	markerTemplate: "listMarkerTemplate",
@@ -91,9 +82,13 @@ const listRenderingFromAttrs = ({ attrs, numId }) => {
 		implicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances ?? void 0,
 		markerSecondSlotOffsetTwips: attrs.listMarkerSecondSlotOffsetTwips ?? void 0
 	};
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
 	return {
 		marker: attrs.listMarker ?? "",
-		level: paragraphNumberingLevel(attrs.numPr) ?? 0,
+		level: numbering?.ilvl ?? 0,
 		numId,
 		isBullet: attrs.listIsBullet ?? false,
 		...definedFields(optional)

package/dist/prosemirror/numberedRefFields.js

@@ -1,7 +1,8 @@
-import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
+import { resolveListTemplateWithComponents } from "../docx/listTemplate.js";
 import { expectFieldAttrs, expectParagraphAttrs } from "./attrs/index.js";
 import { expectBookmarkBoundaryAttrs } from "./bookmarkBoundaryAttrs.js";
-import { advanceVisibleListMarker, createListCounterState, resolveListTemplateWithComponents } from "./listMarker.js";
+import { advanceVisibleListMarker, createListCounterState } from "./listMarker.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/numberedRefFields.ts
 const MAX_FIELD_INSTRUCTION_CHARS = 2048;
@@ -79,10 +80,13 @@ function numberTargetForParagraph(node, contextStreams, streams) {
 	return visibleTarget;
 }
 function numberTargetForAdvancedMarker(attrs, resolvedMarker, state, contexts) {
-	const numId = paragraphNumberingReferenceId(attrs.numPr);
-	if (numId === void 0 || attrs.listIsBullet || attrs.listMarkerHidden || attrs.listNumFmt === "none" || !resolvedMarker) return null;
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (numbering === void 0 || attrs.listIsBullet || attrs.listMarkerHidden || attrs.listNumFmt === "none" || !resolvedMarker) return null;
+	const { numId, ilvl: level } = numbering;
 	const marker = attrs.listMarkerAllCaps ? resolvedMarker.toLocaleUpperCase() : resolvedMarker;
-	const level = paragraphNumberingLevel(attrs.numPr) ?? 0;
 	if (!Number.isInteger(level) || level < 0 || level > 8) return null;
 	const counters = state.counters.get(numId)?.slice(0, level + 1);
 	const levelFormats = attrs.listLevelNumFmts ?? (attrs.listNumFmt ? [attrs.listNumFmt] : void 0);

package/dist/prosemirror/numberingAttr.d.ts

@@ -1,5 +1,23 @@
 import { ParagraphNumberingOverride } from "@stll/docx-core/model";
 //#region src/prosemirror/numberingAttr.d.ts
+type ParagraphNumberingSources = {
+  numPr: ParagraphNumberingOverride | undefined;
+  numPrFromStyle: ParagraphNumberingOverride | undefined;
+};
+type ParagraphNumberingBoundarySources = {
+  numPr: ParagraphNumberingOverride | null | undefined;
+  numPrFromStyle: ParagraphNumberingOverride | null | undefined;
+};
+/** Normalize attr absence at the boundary, while requiring both source tiers. */
+declare const paragraphNumberingSourcesFromBoundary: ({ numPr, numPrFromStyle }: ParagraphNumberingBoundarySources) => ParagraphNumberingSources;
+/** Effective membership is derived; neither source slot becomes an authored override. */
+declare const effectiveParagraphNumbering: ({ numPr, numPrFromStyle }: ParagraphNumberingSources) => import("@stll/docx-core/model").ResolvedParagraphNumbering;
+/** A list reference for membership consumers; cancellation and absence are not lists.
+ * OOXML defaults an omitted ilvl to zero only within an existing numbering reference.
+ */
+declare const effectiveParagraphNumberingReference: (sources: ParagraphNumberingSources) => (import("@stll/docx-core/model").ParagraphNumberingReference & {
+  readonly ilvl: number;
+}) | undefined;
 declare const PARAGRAPH_NUMBERING_ATTR: unique symbol;
 /**
  * The only value a persisted `numPr` attr slot may hold.
@@ -60,4 +78,4 @@ declare const paragraphNumberingFromAttrValue: (value: unknown) => ParagraphNumb
  */
 declare const readParagraphNumberingAttr: (value: unknown) => ParagraphNumberingAttr | null;
 //#endregion
-export { ParagraphNumberingAttr, paragraphNumberingAttr, paragraphNumberingFromAttrValue, readParagraphNumberingAttr, removedNumberingAttr };
+export { ParagraphNumberingAttr, ParagraphNumberingBoundarySources, ParagraphNumberingSources, effectiveParagraphNumbering, effectiveParagraphNumberingReference, paragraphNumberingAttr, paragraphNumberingFromAttrValue, paragraphNumberingSourcesFromBoundary, readParagraphNumberingAttr, removedNumberingAttr };

package/dist/prosemirror/numberingAttr.js

@@ -1,6 +1,20 @@
 import { panic } from "better-result";
-import { NO_PARAGRAPH_NUMBERING, paragraphNumberingFromSlots, paragraphNumberingReference } from "@stll/docx-core/model";
+import { NO_PARAGRAPH_NUMBERING, mergeParagraphNumbering, paragraphNumberingFromSlots, paragraphNumberingReference, resolveParagraphNumbering } from "@stll/docx-core/model";
 //#region src/prosemirror/numberingAttr.ts
+/** Normalize attr absence at the boundary, while requiring both source tiers. */
+const paragraphNumberingSourcesFromBoundary = ({ numPr, numPrFromStyle }) => ({
+	numPr: numPr ?? void 0,
+	numPrFromStyle: numPrFromStyle ?? void 0
+});
+/** Effective membership is derived; neither source slot becomes an authored override. */
+const effectiveParagraphNumbering = ({ numPr, numPrFromStyle }) => resolveParagraphNumbering(mergeParagraphNumbering(numPrFromStyle, numPr));
+/** A list reference for membership consumers; cancellation and absence are not lists.
+* OOXML defaults an omitted ilvl to zero only within an existing numbering reference.
+*/
+const effectiveParagraphNumberingReference = (sources) => {
+	const numbering = effectiveParagraphNumbering(sources);
+	return numbering.kind === "reference" ? numbering : void 0;
+};
 const branded = (numbering) => numbering;
 /** Mint the attr value for a stated override: the one model-to-attr crossing. */
 const paragraphNumberingAttr = (numbering) => {
@@ -79,4 +93,4 @@ const readParagraphNumberingAttr = (value) => {
 	return numbering;
 };
 //#endregion
-export { paragraphNumberingAttr, paragraphNumberingFromAttrValue, readParagraphNumberingAttr, removedNumberingAttr };
+export { effectiveParagraphNumbering, effectiveParagraphNumberingReference, paragraphNumberingAttr, paragraphNumberingFromAttrValue, paragraphNumberingSourcesFromBoundary, readParagraphNumberingAttr, removedNumberingAttr };

package/dist/prosemirror/paragraphIndentation.js

@@ -1,4 +1,4 @@
-import { paragraphNumberingReferenceId } from "../docx/numberingReference.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { panic } from "better-result";
 //#region src/prosemirror/paragraphIndentation.ts
 const DIRECT_PARAGRAPH_INDENTATION_KEYS = [
@@ -50,7 +50,10 @@ const PARAGRAPH_INDENTATION_VALUE_KEYS = [
 const directParagraphIndentation = (attrs) => {
 	const original = attrs._originalFormatting ?? void 0;
 	const resolved = attrs._resolvedFormatting;
-	const numbered = paragraphNumberingReferenceId(attrs.numPr ?? void 0) !== void 0;
+	const numbered = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	})) !== void 0;
 	const indentation = {};
 	for (const key of PARAGRAPH_INDENTATION_VALUE_KEYS) {
 		const value = attrs[key];

package/dist/prosemirror/paragraphMarkJoin.js

@@ -1,12 +1,26 @@
-import { joinProseParagraphsWithRightPropertySource } from "../docx/paragraphPropertySource.js";
+import { getProseParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, markParagraphPropertySourceTransfers } from "../docx/paragraphPropertySource.js";
+import { paragraphJoinAfter } from "./commands/paragraphBookmarkJoin.js";
 import { JOINED_RUNS_RESTYLED_META } from "./extensions/features/JoinedRunStyleExtension.js";
 import { rebaseParagraphRuns } from "./rebaseParagraphRunFormatting.js";
 import { paragraphRunStyleContext } from "./runStyleFormatting.js";
+import { panic } from "better-result";
 //#region src/prosemirror/paragraphMarkJoin.ts
 const joinAtParagraphMark = ({ tr, paragraphPos, paragraph, next, styleResolver }) => {
-	joinProseParagraphsWithRightPropertySource({
+	const boundary = paragraphPos + paragraph.nodeSize;
+	const join = paragraphJoinAfter(tr.doc, boundary);
+	if (!join || join.next !== next) panic("A paragraph-mark join lost its next paragraph");
+	if (join.inlineBookmarks.length > 0) {
+		const leftToken = getProseParagraphPropertySourceToken(paragraph);
+		const rightToken = getProseParagraphPropertySourceToken(next);
+		tr.replaceWith(boundary - 1, join.nextPosition + 1, join.inlineBookmarks);
+		tr.setNodeMarkup(paragraphPos, void 0, next.attrs);
+		markParagraphPropertySourceTransfers(tr, [{
+			displacedToken: typeof leftToken === "string" ? leftToken : null,
+			selectedToken: typeof rightToken === "string" ? rightToken : null
+		}]);
+	} else joinProseParagraphsWithRightPropertySource({
 		attrs: next.attrs,
-		pos: paragraphPos + paragraph.nodeSize,
+		pos: boundary,
 		transaction: tr
 	});
 	if (!styleResolver) return;

package/dist/prosemirror/paragraphPropertyCarry.js

@@ -1,4 +1,5 @@
 import { expectParagraphAttrs } from "./attrs/index.js";
+import { paragraphJoinAfter } from "./commands/paragraphBookmarkJoin.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot } from "./commands/propertyChangeScope.js";
 import { resolveParagraphChangeAttrs } from "./commands/resolveParagraphProperties.js";
 import { rebaseParagraphRuns } from "./rebaseParagraphRunFormatting.js";
@@ -106,13 +107,11 @@ const paragraphLeftAfter = ({ doc, paragraphPos, removedBreakPositions }) => {
 	if (!start) return null;
 	let node = start;
 	for (;;) {
-		const nextPos = position + node.nodeSize;
-		const next = doc.resolve(nextPos).nodeAfter;
-		if (!next || next.type !== node.type) return null;
+		const join = paragraphJoinAfter(doc, position + node.nodeSize);
+		if (!join) return null;
+		const { next, nextPosition: nextPos } = join;
 		const mark = expectParagraphAttrs(next).pPrMark;
-		const nextGoes = removedBreakPositions?.has(nextPos) || mark != null && (mark.kind === "del" || mark.kind === "moveFrom");
-		const afterNext = doc.resolve(nextPos + next.nodeSize).nodeAfter;
-		if (!nextGoes || afterNext?.type !== node.type) return nextPos;
+		if (!(removedBreakPositions?.has(nextPos) || mark != null && (mark.kind === "del" || mark.kind === "moveFrom")) || !paragraphJoinAfter(doc, nextPos + next.nodeSize)) return nextPos;
 		position = nextPos;
 		node = next;
 	}

package/dist/prosemirror/plugins/transactionInvariants.js

@@ -1,4 +1,5 @@
-import { paragraphNumberingReferenceId } from "../../docx/numberingReference.js";
+import { expectParagraphAttrs } from "../attrs/index.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { validateProseMirrorDocument } from "../validation.js";
 import { getDocumentNumbering, hasDocumentNumbering } from "./documentNumbering.js";
 import { Plugin, PluginKey } from "prosemirror-state";
@@ -27,7 +28,10 @@ const numberingReferenceIssues = (state) => {
 	const issues = [];
 	state.doc.descendants((node, pos) => {
 		if (node.type.name !== "paragraph") return true;
-		const numId = paragraphNumberingReferenceId(node.attrs["numPr"]);
+		const numId = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+			numPr: expectParagraphAttrs(node).numPr,
+			numPrFromStyle: expectParagraphAttrs(node).numPrFromStyle
+		}))?.numId;
 		if (numId !== void 0 && !numbering?.hasNumbering(numId)) issues.push({
 			path: `paragraph at ${pos}.numPr.numId`,
 			message: `Numbering definition ${numId} is missing.`,

package/dist/prosemirror/schema/nodes.d.ts

@@ -346,8 +346,9 @@ type ParagraphPropertyChangeAttrs = Omit<document_d_exports.ParagraphPropertyCha
     provenance?: TrackedChangeProvenance;
     suggestionId?: string | null;
   };
-  previousFormatting?: Omit<document_d_exports.ParagraphFormatting, "numPr"> & {
+  previousFormatting?: Omit<document_d_exports.ParagraphFormatting, "numPr" | "numPrFromStyle"> & {
     numPr?: ParagraphAttrs["numPr"] | null;
+    numPrFromStyle?: ParagraphAttrs["numPrFromStyle"] | null;
   } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerTemplate" | "listMarkerHidden" | "listMarkerFormatting" | "listMarkerAlignment" | "listMarkerSuffix" | "listMarkerAllCaps" | "listImplicitChildLevelAdvances" | "listFoldedMarkerSuffix" | "listMarkerSecondSlotOffsetTwips" | "listLevelNumFmts" | "listLevelStarts" | "listLevelTabs" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
   currentFormatting?: document_d_exports.ParagraphFormatting;
 };