@stll/folio-core 0.62.0 → 0.63.1

package/dist/prosemirror/listLabels.js

@@ -1,7 +1,9 @@
 import { bulletMarkerFontName, convertBulletToUnicode } from "../docx/bulletMarkers.js";
-import { advanceVisibleListMarker, createListCounterState } from "./listMarker.js";
-import { hasListRendering } from "./listRenderingAttrs.js";
-import { paragraphNumberingAttr } from "./numberingAttr.js";
+import { CLEARED_LIST_RENDERING_ATTRS, advanceVisibleListMarker, createListCounterState } from "./listMarker.js";
+import { listRenderingAttrPatch, listRenderingFromAttrs } from "./listRenderingAttrs.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingAttr, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
+import { resolveParagraphList } from "./paragraphList.js";
+import { panic } from "better-result";
 //#region src/prosemirror/listLabels.ts
 /**
 * The number or bullet a paragraph shows beside its text, as a reader reports
@@ -31,6 +33,17 @@ const staticMarker = (attrs) => {
 	if (!marker) return;
 	return (attrs.listIsBullet ? convertBulletToUnicode(marker, bulletMarkerFontName(attrs.listMarkerFormatting)) : marker).trim() || void 0;
 };
+const visibleLabel = (counterAttrs, marker) => {
+	if (counterAttrs.listMarkerHidden === true) return void 0;
+	const counted = marker?.trim();
+	if (counted) return `${counted}${foldedFieldSuffix(counterAttrs)}`;
+	if (counterAttrs.listMarker === "" || counterAttrs.listMarkerTemplate === "") return "";
+	return staticMarker(counterAttrs);
+};
+const projectedListRendering = (attrs, numId) => attrs.listMarker != null || attrs.listMarkerTemplate != null || attrs.listIsBullet === true || attrs.listNumFmt != null ? listRenderingFromAttrs({
+	attrs,
+	numId
+}) : void 0;
 /**
 * The attrs the counter reads for a paragraph of the document model, as
 * `toProseDoc` projects them (`listRenderingAttrPatch`), without the layout
@@ -43,8 +56,8 @@ const listLabelAttrsFromRendering = (rendering, { numPr, numPrFromStyle }) => {
 		...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.marker !== void 0) attrs.listMarker = rendering.marker;
+	if (rendering.markerTemplate !== void 0) attrs.listMarkerTemplate = rendering.markerTemplate;
 	if (rendering.isBullet) attrs.listIsBullet = true;
 	if (rendering.isLegal) attrs.listIsLegal = true;
 	if (rendering.numFmt) attrs.listNumFmt = rendering.numFmt;
@@ -62,17 +75,89 @@ const listLabelAttrsFromRendering = (rendering, { numPr, numPrFromStyle }) => {
 * paragraph, numbered or not: whether a list continues depends on what stands
 * between its items.
 */
-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);
+const createListLabelCounter = (numberingOrStreams = null, suppliedStreams) => {
+	const numbering = numberingOrStreams && "definitions" in numberingOrStreams ? numberingOrStreams : null;
+	const readsProjectedStreams = numberingOrStreams !== null && !("definitions" in numberingOrStreams);
+	const streams = suppliedStreams ?? (numberingOrStreams && !("definitions" in numberingOrStreams) ? numberingOrStreams : {
+		final: createListCounterState(),
+		original: createListCounterState()
+	});
+	return (attrs, standaloneRendering) => {
+		const sources = paragraphNumberingSourcesFromBoundary({
+			numPr: attrs.numPr,
+			numPrFromStyle: attrs.numPrFromStyle
+		});
+		const effective = effectiveParagraphNumberingReference(sources);
+		const projectedRendering = standaloneRendering ?? projectedListRendering(attrs, effective?.numId ?? 1);
+		const list = resolveParagraphList(sources, numbering, projectedRendering);
+		const counterInput = { ...attrs };
+		Object.assign(counterInput, CLEARED_LIST_RENDERING_ATTRS);
+		const contentDerived = {
+			listImplicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances,
+			listMarkerSecondSlotOffsetTwips: attrs.listMarkerSecondSlotOffsetTwips,
+			listFoldedMarkerSuffix: attrs.listFoldedMarkerSuffix
+		};
+		if (list.kind === "marker") Object.assign(counterInput, listRenderingAttrPatch(list.rendering));
+		else if (list.kind === "markerless" && list.rendering !== void 0) Object.assign(counterInput, listRenderingAttrPatch(list.rendering));
+		else if (list.kind === "markerless" && projectedRendering?.markerHidden === true) Object.assign(counterInput, listRenderingAttrPatch(projectedRendering));
+		Object.assign(counterInput, Object.fromEntries(Object.entries(contentDerived).filter(([, value]) => value !== void 0)));
+		if (counterInput._propertyChanges) counterInput._propertyChanges = counterInput._propertyChanges.map((change) => {
+			const previous = change.previousFormatting;
+			if (!previous) return change;
+			const previousSources = paragraphNumberingSourcesFromBoundary({
+				numPr: previous.numPr,
+				numPrFromStyle: previous.numPrFromStyle
+			});
+			const previousReference = effectiveParagraphNumberingReference(previousSources);
+			const previousProjected = projectedListRendering(previous, previousReference?.numId ?? 1);
+			const previousList = resolveParagraphList(previousSources, numbering, previousProjected);
+			const previousFormatting = { ...previous };
+			Object.assign(previousFormatting, CLEARED_LIST_RENDERING_ATTRS);
+			if (previousList.kind === "marker" || previousList.kind === "markerless" && previousList.rendering !== void 0) {
+				const rendering = previousList.rendering;
+				if (rendering) Object.assign(previousFormatting, listRenderingAttrPatch(rendering));
+			} else if (previousProjected?.markerHidden === true) Object.assign(previousFormatting, listRenderingAttrPatch(previousProjected));
+			return {
+				...change,
+				previousFormatting
+			};
+		});
+		const { counterAttrs, marker } = advanceVisibleListMarker(counterInput, streams);
+		const projectedLabel = visibleLabel(counterAttrs, marker);
+		if (readsProjectedStreams && projectedLabel !== void 0) return {
+			kind: "marker",
+			label: projectedLabel,
+			numbering: effective
+		};
+		const countedSources = paragraphNumberingSourcesFromBoundary({
+			numPr: counterAttrs.numPr,
+			numPrFromStyle: counterAttrs.numPrFromStyle
+		});
+		const countedNumbering = effectiveParagraphNumberingReference(countedSources);
+		const revisionSelectedRendering = counterInput._propertyChanges?.length && counterAttrs !== counterInput && numbering === null ? listRenderingFromAttrs({
+			attrs: counterAttrs,
+			numId: countedNumbering?.numId ?? 1
+		}) : void 0;
+		const countedList = resolveParagraphList(countedSources, numbering, revisionSelectedRendering ?? projectedRendering);
+		switch (countedList.kind) {
+			case "none": return {
+				kind: "none",
+				label: void 0,
+				numbering: void 0
+			};
+			case "markerless": return {
+				kind: "markerless",
+				label: void 0,
+				numbering: countedList.source === "authored" ? countedList.reference : void 0
+			};
+			case "marker": return {
+				kind: "marker",
+				label: projectedLabel,
+				numbering: countedList.source === "authored" ? countedList.reference : void 0
+			};
+			default: return panic(`Unhandled paragraph list ${JSON.stringify(countedList)}`);
+		}
+	};
 };
 //#endregion
 export { createListLabelCounter, listLabelAttrsFromRendering };

package/dist/prosemirror/listMarker.d.ts

@@ -3,7 +3,7 @@ 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 = {
+export type ListCounterState = {
   counters: Map<number, number[]>;
   abstractCounters: Map<number, number[]>;
   seenLevels: Set<string>;
@@ -15,26 +15,26 @@ type ListCounterState = {
   };
   lastAdvancedNumId?: number;
 };
-type ListCounterStreams = {
+export type ListCounterStreams = {
   final: ListCounterState;
   original: ListCounterState;
 };
-type ListCounterStream = keyof ListCounterStreams;
-type AdvancedListMarker = {
+export type ListCounterStream = keyof ListCounterStreams;
+export type AdvancedListMarker = {
   marker: string | null;
   counterAttrs: ParagraphAttrs;
   counterState: ListCounterState;
   stream: ListCounterStream;
 };
-type VisibleListMarker = {
+export type VisibleListMarker = {
   marker: string | null;
   counterAttrs: ParagraphAttrs;
   counterState: ListCounterState;
   stream: ListCounterStream;
   advances: readonly AdvancedListMarker[];
 };
-declare const MAX_LIST_LEVEL = 8;
-declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
+export declare const MAX_LIST_LEVEL = 8;
+export declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
   listIsBullet: null;
   listIsLegal: null;
   listNumFmt: null;
@@ -54,15 +54,15 @@ declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
   listAbstractNumId: null;
   listStartOverride: null;
 }>;
-declare function createListCounterState(): ListCounterState;
-declare function cloneListCounterState(state: ListCounterState): ListCounterState;
+export declare function createListCounterState(): ListCounterState;
+export declare function cloneListCounterState(state: ListCounterState): ListCounterState;
 /**
  * Advance the counter stream that paints this paragraph's marker. Normal
  * paragraphs advance both final and original streams; inserted/deleted list
  * paragraphs advance only the document view in which they exist.
  */
-declare function advanceVisibleListMarker(attrs: ParagraphAttrs, streams: ListCounterStreams): VisibleListMarker;
-declare function formatCounter(value: number, format: document_d_exports.CounterFormat | undefined): string;
-declare function advanceListMarker(attrs: ParagraphAttrs, state: ListCounterState): string | null;
+export declare function advanceVisibleListMarker(attrs: ParagraphAttrs, streams: ListCounterStreams): VisibleListMarker;
+export declare function formatCounter(value: number, format: document_d_exports.CounterFormat | undefined): string;
+export 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, type ResolvedListComponent, type ResolvedListTemplate, VisibleListMarker, advanceListMarker, advanceVisibleListMarker, cloneListCounterState, createListCounterState, formatCounter, resolveListTemplate, resolveListTemplateWithComponents };
+export { LIST_RENDERING_ATTR_KEYS, type ResolvedListComponent, type ResolvedListTemplate, resolveListTemplate, resolveListTemplateWithComponents };

package/dist/prosemirror/listMarker.js

@@ -117,8 +117,12 @@ function advanceVisibleListMarker(attrs, streams) {
 	};
 	const final = advance(attrs, "final");
 	const original = attrs.pPrMark?.kind === "ins" ? void 0 : advance(previous ?? attrs, "original");
+	const levelOnlyResolves = attrs.numPr?.kind !== "levelOnly" || effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	})).kind === "reference";
 	return {
-		...attrs.numPr?.kind !== "none" && final.marker === null && original && original.marker !== null && previous?.numPr?.kind === "reference" ? original : final,
+		...attrs.numPr?.kind !== "none" && levelOnlyResolves && final.marker === null && original && original.marker !== null && previous?.numPr?.kind === "reference" ? original : final,
 		advances
 	};
 }
@@ -237,7 +241,8 @@ function advanceListMarker(attrs, state) {
 	}
 	if (foldedMarkerSuffix !== void 0 && attrs.listMarkerTemplate != null) return `${attrs.listMarkerTemplate}\t${foldedMarkerSuffix}`;
 	if (attrs.listMarker) return attrs.listMarker;
-	if ((levelFormats?.[level] ?? attrs.listNumFmt) === "none" || attrs.listMarker === "") return null;
+	if (markerTemplate === "" || attrs.listMarker === "") return "";
+	if ((levelFormats?.[level] ?? attrs.listNumFmt) === "none") return "";
 	return formatNumberedMarker(counters, level);
 }
 //#endregion

package/dist/prosemirror/listNumbering.d.ts

@@ -5,7 +5,7 @@ import { Node, ResolvedPos } from "prosemirror-model";
 import { Command, EditorState, Transaction } from "prosemirror-state";
 //#region src/prosemirror/listNumbering.d.ts
 /** What a list command or typed marker asks for. */
-type ListRequest = {
+export type ListRequest = {
   kind: ListKind;
   /**
    * The first level's format. A neighbouring list is continued only when its
@@ -36,9 +36,9 @@ type ResolveListTargetOptions = {
  * an unused instance the package already defines for the first request, or
  * one defined for it.
  */
-declare const resolveListTarget: ({ numbering, $from, $to, requests }: ResolveListTargetOptions) => ListTarget | null;
+export declare const resolveListTarget: ({ numbering, $from, $to, requests }: ResolveListTargetOptions) => ListTarget | null;
 /** A paragraph's attrs as an item of `numId` at `ilvl`, resolved in `numbering`. */
-declare const listItemAttrs: (attrs: Readonly<ParagraphAttrs>, { numId, ilvl }: {
+export declare const listItemAttrs: (attrs: Readonly<ParagraphAttrs>, { numId, ilvl }: {
   numId: number;
   ilvl: number;
 }, numbering: NumberingMap) => Record<string, unknown>;
@@ -56,30 +56,30 @@ type ApplyParagraphUpdatesOptions = {
  * Write `updates` into `tr`, each recorded as a tracked change while the
  * editor is suggesting. `pos` is a position in `tr.doc`.
  */
-declare const applyParagraphUpdates: ({ tr, state, updates }: ApplyParagraphUpdatesOptions) => void;
+export declare const applyParagraphUpdates: ({ tr, state, updates }: ApplyParagraphUpdatesOptions) => void;
 /**
  * Start the list over at `value` from the selected item: *Set Numbering
  * Value* with *Start new list*. The item and every later item of
  * its list move to a new instance of the same definition, whose
  * `w:startOverride` at the item's level is `value`.
  */
-declare const setNumberingValue: (value: number) => Command;
+export declare const setNumberingValue: (value: number) => Command;
 /** *Restart at 1*: the selected item starts its list over at one. */
-declare const restartNumbering: Command;
+export declare const restartNumbering: Command;
 /**
  * *Continue Numbering*: the selected item and the rest of its list
  * join the nearest earlier list of the same kind, so their numbers carry on
  * from it. Not applicable when no such list precedes the item.
  */
-declare const continueNumbering: Command;
+export declare const continueNumbering: Command;
 /** What a context menu offers for the item the selection is in. */
-type ListNumberingMenuState = {
+export type ListNumberingMenuState = {
   readonly type: "none";
 } | {
   readonly type: "listItem";
   readonly canContinue: boolean;
 };
-declare const NO_LIST_NUMBERING_MENU: {
+export declare const NO_LIST_NUMBERING_MENU: {
   readonly type: "none";
 };
 /**
@@ -87,6 +87,6 @@ declare const NO_LIST_NUMBERING_MENU: {
  * or set, and whether an earlier list lets it continue: the enabled state of
  * those menu entries.
  */
-declare const listNumberingMenuState: (state: EditorState) => ListNumberingMenuState;
+export declare const listNumberingMenuState: (state: EditorState) => ListNumberingMenuState;
 //#endregion
-export { ListNumberingMenuState, ListRequest, NO_LIST_NUMBERING_MENU, applyParagraphUpdates, continueNumbering, listItemAttrs, listNumberingMenuState, resolveListTarget, restartNumbering, setNumberingValue };
+export {};

package/dist/prosemirror/listNumbering.js

@@ -13,22 +13,6 @@ import { getDocumentStyleResolver } from "./plugins/documentStyleState.js";
 import { SUGGESTION_META, makeRevisionInfo } from "./plugins/suggestionMode.js";
 import { listAttrsFromNumbering, listIndentationProvenancePatch } from "./styles/resolvedStyleAttrs.js";
 //#region src/prosemirror/listNumbering.ts
-/**
-* Which numbering instance a list command puts a paragraph in, and the
-* *Restart Numbering*, *Continue Numbering* and *Set Numbering Value* commands.
-*
-* A paragraph made into a list item continues the list directly above or below
-* it when that list is of the requested kind (and, for a typed marker, has the
-* typed format). Otherwise it starts a new list: a new `w:num`, defined on the
-* paragraphs it numbers (see `docx/listNumberingInstances.ts`). A list that a
-* paragraph style supplies (a heading's numbering from `styles.xml`) is never
-* joined implicitly; it belongs to the style, not to the body text around it.
-*
-* Every change made while suggesting is recorded as one `w:pPrChange` per
-* paragraph. A paragraph that already carries one keeps a single record whose
-* previous state is the paragraph's original, so rejecting it restores what the
-* paragraph was before any of the tracked changes.
-*/
 const PARAGRAPH_NODE = "paragraph";
 /**
 * The paragraph's properties as a `w:pPrChange` records them before a list

package/dist/prosemirror/listRendering.d.ts

@@ -5,9 +5,9 @@ import { ParagraphNumberingOverride } from "../docx/numberingReference.js";
 //#region src/prosemirror/listRendering.d.ts
 type PreviousFormatting = NonNullable<ParagraphPropertyChangeAttrs["previousFormatting"]>;
 /** Whether a `w:pPrChange` record states the list rendering it had (a list command's does). */
-declare const recordsListRendering: (record: PreviousFormatting) => boolean;
+export declare const recordsListRendering: (record: PreviousFormatting) => boolean;
 /** Every list-rendering attr for `numPr`: its level's, or all cleared when it numbers nothing. */
-declare const listRenderingFor: (numPr: ParagraphNumberingOverride | null | undefined, numbering: NumberingMap | null) => Record<string, unknown>;
+export declare const listRenderingFor: (numPr: ParagraphNumberingOverride | null | undefined, numbering: NumberingMap | null) => Record<string, unknown>;
 /**
  * The list rendering a paragraph takes when a `w:pPrChange` is rejected. A
  * reject restores the recorded numbering, but the rendering attrs sit outside
@@ -17,7 +17,7 @@ declare const listRenderingFor: (numPr: ParagraphNumberingOverride | null | unde
  * the marker it was given. Reconcile the rendering attrs with the restored
  * numbering even when the effective reference itself did not change.
  */
-type RejectedListRenderingOptions = {
+export type RejectedListRenderingOptions = {
   /** The paragraph's attrs before the reject. */
   current: Pick<ParagraphAttrs, "numPr" | "numPrFromStyle" | ListRenderingAttrKey>;
   /** The previous state the rejected record restores. */
@@ -25,6 +25,6 @@ type RejectedListRenderingOptions = {
   numbering: NumberingMap | null;
   restoredNumbering: ParagraphAttrs["numPr"] | null;
 };
-declare const rejectedListRenderingPatch: ({ current, previousFormatting, numbering, restoredNumbering }: RejectedListRenderingOptions) => Record<string, unknown>;
+export declare const rejectedListRenderingPatch: ({ current, previousFormatting, numbering, restoredNumbering }: RejectedListRenderingOptions) => Record<string, unknown>;
 //#endregion
-export { RejectedListRenderingOptions, listRenderingFor, recordsListRendering, rejectedListRenderingPatch };
+export {};

package/dist/prosemirror/listRendering.js

@@ -4,6 +4,10 @@ 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
+/**
+* The list rendering (marker, indentation bookkeeping) a paragraph's
+* numbering gives it, as a paragraph-property change records and restores it.
+*/
 /** 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). */

package/dist/prosemirror/listRenderingAttrs.d.ts

@@ -3,8 +3,8 @@ 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. */
-type ListRenderingAttrField = Exclude<keyof document_d_exports.ListRendering, "level" | "numId">;
-declare const LIST_RENDERING_ATTR_BY_FIELD: {
+export type ListRenderingAttrField = Exclude<keyof document_d_exports.ListRendering, "level" | "numId">;
+export declare const LIST_RENDERING_ATTR_BY_FIELD: {
   readonly marker: "listMarker";
   readonly markerTemplate: "listMarkerTemplate";
   readonly foldedMarkerSuffix: "listFoldedMarkerSuffix";
@@ -24,23 +24,24 @@ declare const LIST_RENDERING_ATTR_BY_FIELD: {
   readonly implicitChildLevelAdvances: "listImplicitChildLevelAdvances";
   readonly markerSecondSlotOffsetTwips: "listMarkerSecondSlotOffsetTwips";
 };
-type ListRenderingAttrKey = (typeof LIST_RENDERING_ATTR_BY_FIELD)[ListRenderingAttrField];
-declare const LIST_RENDERING_ATTR_KEYS: readonly ListRenderingAttrKey[];
+export type ListRenderingAttrKey = (typeof LIST_RENDERING_ATTR_BY_FIELD)[ListRenderingAttrField];
+export declare const LIST_RENDERING_ATTR_KEYS: readonly ListRenderingAttrKey[];
 /**
  * Editor attrs carrying `rendering`. A falsy marker, flag or format is left
- * unset: the editor treats `null` and absent alike for those, and the parser
- * never authors them as `false` or `""` deliberately.
+ * unset: the editor treats `null` and absent alike for those. An empty marker
+ * is distinct from an absent one: it keeps a numbered paragraph a list item
+ * while reserving the marker suffix's body spacing.
  */
-declare const listRenderingAttrPatch: (rendering: document_d_exports.ListRendering) => Partial<ParagraphAttrs>;
+export declare const listRenderingAttrPatch: (rendering: document_d_exports.ListRendering) => Partial<ParagraphAttrs>;
 /**
  * Whether `attrs` carry what their numbering level renders as. Only a level
  * the numbering defines gets a rendering (`toProseDoc` projects the parser's,
  * a list command or operation writes the level's), so a reference without one
  * names a level nothing defines: Word paints no marker for it.
  */
-declare const hasListRendering: (attrs: Pick<ParagraphAttrs, "listMarker" | "listIsBullet" | "listNumFmt">) => boolean;
+export declare const hasListRendering: (attrs: Pick<ParagraphAttrs, "listMarker" | "listMarkerTemplate" | "listIsBullet" | "listIsLegal" | "listNumFmt">) => boolean;
 /** The attrs a rendering is read back from: a paragraph's, or a recorded previous state's. */
-type ListRenderingSourceAttrs = Pick<ParagraphAttrs, ListRenderingAttrKey> & Partial<ParagraphNumberingBoundarySources>;
+export type ListRenderingSourceAttrs = Pick<ParagraphAttrs, ListRenderingAttrKey> & Partial<ParagraphNumberingBoundarySources>;
 type ListRenderingFromAttrsOptions = {
   attrs: ListRenderingSourceAttrs;
   numId: number;
@@ -49,6 +50,6 @@ type ListRenderingFromAttrsOptions = {
  * Inverse of `listRenderingAttrPatch`. The caller decides whether the
  * paragraph is a list item at all; this only reassembles the fields.
  */
-declare const listRenderingFromAttrs: ({ attrs, numId }: ListRenderingFromAttrsOptions) => document_d_exports.ListRendering;
+export declare const listRenderingFromAttrs: ({ attrs, numId }: ListRenderingFromAttrsOptions) => document_d_exports.ListRendering;
 //#endregion
-export { LIST_RENDERING_ATTR_BY_FIELD, LIST_RENDERING_ATTR_KEYS, ListRenderingAttrField, ListRenderingAttrKey, ListRenderingSourceAttrs, hasListRendering, listRenderingAttrPatch, listRenderingFromAttrs };
+export {};

package/dist/prosemirror/listRenderingAttrs.js

@@ -26,13 +26,14 @@ const definedAttrs = (patch) => Object.fromEntries(Object.entries(patch).filter(
 const definedFields = (fields) => Object.fromEntries(Object.entries(fields).filter(isDefinedEntry));
 /**
 * Editor attrs carrying `rendering`. A falsy marker, flag or format is left
-* unset: the editor treats `null` and absent alike for those, and the parser
-* never authors them as `false` or `""` deliberately.
+* unset: the editor treats `null` and absent alike for those. An empty marker
+* is distinct from an absent one: it keeps a numbered paragraph a list item
+* while reserving the marker suffix's body spacing.
 */
 const listRenderingAttrPatch = (rendering) => {
 	const patch = {
-		listMarker: rendering.marker || void 0,
-		listMarkerTemplate: rendering.markerTemplate || void 0,
+		listMarker: rendering.marker ?? void 0,
+		listMarkerTemplate: rendering.markerTemplate ?? void 0,
 		listFoldedMarkerSuffix: rendering.foldedMarkerSuffix,
 		listIsBullet: rendering.isBullet || void 0,
 		listIsLegal: rendering.isLegal || void 0,
@@ -58,7 +59,10 @@ const listRenderingAttrPatch = (rendering) => {
 * a list command or operation writes the level's), so a reference without one
 * names a level nothing defines: Word paints no marker for it.
 */
-const hasListRendering = (attrs) => attrs.listMarker != null || attrs.listIsBullet === true || attrs.listNumFmt != null;
+const hasListRendering = (attrs) => {
+	if (attrs.listNumFmt === "none" && attrs.listIsLegal !== true) return false;
+	return attrs.listMarker != null || attrs.listMarkerTemplate != null || attrs.listIsBullet === true || attrs.listNumFmt != null;
+};
 /**
 * Inverse of `listRenderingAttrPatch`. The caller decides whether the
 * paragraph is a list item at all; this only reassembles the fields.

package/dist/prosemirror/listState.d.ts

@@ -15,7 +15,7 @@ import { ParagraphNumberingOverride } from "@stll/docx-core/model";
  * `{ type: "none", isInList: true, numId: 7, level: -1 }` was representable and
  * meant nothing.
  */
-type ListState = {
+export type ListState = {
   readonly type: "none";
 } | {
   readonly type: "bullet";
@@ -27,22 +27,22 @@ type ListState = {
   readonly numId?: number;
 };
 /** The kinds of list a toolbar distinguishes. */
-type ListType = ListState["type"];
+export type ListType = ListState["type"];
 /** The selection is in no list. */
-declare const NO_LIST_STATE: {
+export declare const NO_LIST_STATE: {
   readonly type: "none";
 };
 /** A selection that is in a list, so it has a level. */
-type ActiveListState = Exclude<ListState, {
+export type ActiveListState = Exclude<ListState, {
   type: "none";
 }>;
 /**
  * Whether the selection is in a list at all: the one reader over the
  * discriminator, so no consumer spells the empty arm itself.
  */
-declare const isInListState: (state: ListState | undefined) => state is ActiveListState;
+export declare const isInListState: (state: ListState | undefined) => state is ActiveListState;
 /** The list level the selection sits at, zero when it is in no list. */
-declare const listStateLevel: (state: ListState | undefined) => number;
+export declare const listStateLevel: (state: ListState | undefined) => number;
 /**
  * The toolbar's view of a paragraph's stated numbering.
  *
@@ -55,8 +55,7 @@ declare const listStateLevel: (state: ListState | undefined) => number;
  * A cancellation and a level with no resolved id are not lists. Callers that
  * have a style tier must merge it before asking for toolbar state.
  */
-declare const resolveListState: (numbering: NumberingMap | null | undefined, numPr: ParagraphNumberingOverride | undefined) => ListState;
+export declare const resolveListState: (numbering: NumberingMap | null | undefined, numPr: ParagraphNumberingOverride | undefined) => ListState;
 /** Whether two toolbar list states say the same thing. */
-declare const sameListState: (left: ListState | undefined, right: ListState | undefined) => boolean;
-//#endregion
-export { ActiveListState, ListState, ListType, NO_LIST_STATE, isInListState, listStateLevel, resolveListState, sameListState };
+export declare const sameListState: (left: ListState | undefined, right: ListState | undefined) => boolean;
+//#endregion

package/dist/prosemirror/markupViewNotes.d.ts

@@ -3,6 +3,5 @@ import { DisplayMode } from "../managers/EditorModeManager.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/markupViewNotes.d.ts
 /** The footnotes or endnotes as `view` shows them. */
-declare const markupViewNotes: <TNote extends document_d_exports.Footnote | document_d_exports.Endnote>(notes: TNote[] | undefined, view: DisplayMode, state: EditorState, document: document_d_exports.Document | null) => TNote[] | undefined;
-//#endregion
-export { markupViewNotes };
+export declare const markupViewNotes: <TNote extends document_d_exports.Footnote | document_d_exports.Endnote>(notes: TNote[] | undefined, view: DisplayMode, state: EditorState, document: document_d_exports.Document | null) => TNote[] | undefined;
+//#endregion

package/dist/prosemirror/markupViewProjection.d.ts

@@ -5,19 +5,19 @@ import { indexedPositionMap } from "../internal/indexedPositionMap.js";
 import { RevisionResolutionMode } from "../internal/revisionResolutionInline.js";
 import { Node } from "prosemirror-model";
 import { EditorState } from "prosemirror-state";
-import { StepMap } from "prosemirror-transform";
+import { Mapping, Step, StepMap } from "prosemirror-transform";
 //#region src/prosemirror/markupViewProjection.d.ts
 /** Resolve every revision in the state's story with the state's own styles and numbering. */
-declare const resolveStateStory: (state: EditorState, mode: RevisionResolutionMode) => {
+export declare const resolveStateStory: (state: EditorState, mode: RevisionResolutionMode) => {
   resolved: Node;
-  mapping: import("prosemirror-transform").Mapping;
+  mapping: Mapping;
   positionMap: StepMap;
-  steps: import("prosemirror-transform").Step[];
+  steps: Step[];
   changedRanges: {
     from: number;
     to: number;
   }[];
-  inlineMap: StepMap;
+  preStructureMap: StepMap;
   tableRanges: {
     node: Node;
     inputNode: Node;
@@ -47,12 +47,13 @@ declare const resolveStateStory: (state: EditorState, mode: RevisionResolutionMo
   failed: boolean;
   removedEndpointCount: number;
   removedReferences: RemovedSectionReference[];
+  keptBoundaries: Set<Node>;
 };
 type PositionRange = {
   from: number;
   to: number;
 };
-type MarkupViewProjection =
+export type MarkupViewProjection =
 /** The view lays the authored document out as it stands. */
 {
   type: "authored";
@@ -84,8 +85,8 @@ type MarkupViewProjection =
  * plugins, which may change while the document node stays the same.
  */
 /** How a view resolves the revisions it reads, or null when it shows them inline. */
-declare const markupViewResolutionMode: (view: DisplayMode) => RevisionResolutionMode | null;
-declare const projectMarkupView: (state: EditorState, view: DisplayMode) => MarkupViewProjection;
+export declare const markupViewResolutionMode: (view: DisplayMode) => RevisionResolutionMode | null;
+export declare const projectMarkupView: (state: EditorState, view: DisplayMode) => MarkupViewProjection;
 /**
  * Where a caret at editor `position` is painted in a view. A position the view
  * shows is its own; one inside text the view does not show (a deletion in No
@@ -93,7 +94,7 @@ declare const projectMarkupView: (state: EditorState, view: DisplayMode) => Mark
  * nearest place the view shows before it, the way the caret sits at the edge
  * of text it cannot enter.
  */
-declare const visibleCaretPosition: (projection: MarkupViewProjection, position: number) => number;
+export declare const visibleCaretPosition: (projection: MarkupViewProjection, position: number) => number;
 type ProjectStoryMarkupViewOptions = {
   doc: Node;
   markupView: DisplayMode;
@@ -101,6 +102,6 @@ type ProjectStoryMarkupViewOptions = {
   numbering?: document_d_exports.NumberingDefinitions | undefined;
 };
 /** Detached stories use the same state-aware projection owner as the body. */
-declare const projectStoryMarkupView: ({ doc, markupView, styles, numbering }: ProjectStoryMarkupViewOptions) => MarkupViewProjection;
+export declare const projectStoryMarkupView: ({ doc, markupView, styles, numbering }: ProjectStoryMarkupViewOptions) => MarkupViewProjection;
 //#endregion
-export { MarkupViewProjection, markupViewResolutionMode, projectMarkupView, projectStoryMarkupView, resolveStateStory, visibleCaretPosition };
+export {};

package/dist/prosemirror/moveRangeBoundaryAttrs.d.ts

@@ -3,12 +3,13 @@ import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.
 import "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/moveRangeBoundaryAttrs.d.ts
-type MoveRangeMarker = Extract<document_d_exports.ParagraphContent, {
+export type MoveRangeMarker = Extract<document_d_exports.ParagraphContent, {
   type: "moveFromRangeStart" | "moveFromRangeEnd" | "moveToRangeStart" | "moveToRangeEnd";
 }>;
+export declare const withoutUntrustedCopyOrigin: (value: unknown) => unknown;
+export declare const moveRangeMarkerForDom: (marker: MoveRangeMarker, internalClipboardToken: string | undefined) => MoveRangeMarker;
 /** Read one hidden move-range boundary from an untyped editor or clipboard attribute. */
-declare const readMoveRangeMarker: (value: unknown, path?: string) => ReadProseMirrorAttrsResult<MoveRangeMarker>;
-declare const readMoveRangeBoundaryAttrs: (node: Node) => ReadProseMirrorAttrsResult<MoveRangeMarker>;
-declare const expectMoveRangeBoundaryAttrs: (node: Node) => MoveRangeMarker;
-//#endregion
-export { MoveRangeMarker, expectMoveRangeBoundaryAttrs, readMoveRangeBoundaryAttrs, readMoveRangeMarker };
+export declare const readMoveRangeMarker: (value: unknown, path?: string) => ReadProseMirrorAttrsResult<MoveRangeMarker>;
+export declare const readMoveRangeBoundaryAttrs: (node: Node) => ReadProseMirrorAttrsResult<MoveRangeMarker>;
+export declare const expectMoveRangeBoundaryAttrs: (node: Node) => MoveRangeMarker;
+//#endregion