@stll/folio-core 0.58.5 → 0.60.0

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

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

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

@@ -1,12 +1,18 @@
 import { Extension } from "../types.js";
 import { Node } from "prosemirror-model";
-import { EditorState, PluginKey, Transaction } from "prosemirror-state";
+import { EditorState, Plugin, Transaction } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParaIdAllocatorExtension.d.ts
 type ParagraphPropertySourceSeed = {
   contract: string | null;
   tokens: ReadonlySet<string>;
 };
-declare const paraIdAllocatorKey: PluginKey<ParagraphPropertySourceSeed>;
+declare const paraIdAllocatorKey: Readonly<{
+  key: string;
+  createKey: () => import("prosemirror-state").PluginKey<ParagraphPropertySourceSeed>;
+  owns: (plugin: Plugin<ParagraphPropertySourceSeed>) => boolean;
+  get: (state: EditorState) => Plugin<ParagraphPropertySourceSeed> | undefined;
+  getState: (state: EditorState) => ParagraphPropertySourceSeed | undefined;
+}>;
 /**
  * Transaction meta asking this plugin to derive the ids it mints from a
  * caller-supplied seed instead of `Math.random()`.
@@ -17,7 +23,7 @@ declare const paraIdAllocatorKey: PluginKey<ParagraphPropertySourceSeed>;
  * be deterministic, so it says so on its own transaction rather than leaving
  * the plugin to guess.
  */
-declare const deterministicParaIdSeedKey: PluginKey<string>;
+declare const deterministicParaIdSeedKey = "stll.folio.meta.deterministicParaIdSeed";
 /** Ask the allocator to mint reproducible ids for the paragraphs `tr` creates. */
 declare const requestDeterministicParaIds: (tr: Transaction, seed: string) => Transaction;
 type ParagraphPropertySourceKeeper = {

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

@@ -1,11 +1,12 @@
 import { PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, getExplicitParagraphPropertySourceTransfers, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource } from "../../../docx/paragraphPropertySource.js";
 import { deterministicHexId, generateHexId } from "../../../utils/hexId.js";
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { sweepPositions } from "../../positionSweep.js";
 import { createExtension } from "../create.js";
 import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
 import { panic } from "better-result";
 import { Fragment } from "prosemirror-model";
-import { Plugin, PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParaIdAllocatorExtension.ts
 /**
 * ParaIdAllocator — assigns a stable `w14:paraId` to every paragraph.
@@ -44,7 +45,7 @@ import { Plugin, PluginKey } from "prosemirror-state";
 *   split therefore restores the same allocated id instead of minting
 *   another one.
 */
-const paraIdAllocatorKey = new PluginKey("paraIdAllocator");
+const paraIdAllocatorKey = createPluginKeyOwner("paraIdAllocator");
 /**
 * Transaction meta asking this plugin to derive the ids it mints from a
 * caller-supplied seed instead of `Math.random()`.
@@ -55,7 +56,7 @@ const paraIdAllocatorKey = new PluginKey("paraIdAllocator");
 * be deterministic, so it says so on its own transaction rather than leaving
 * the plugin to guess.
 */
-const deterministicParaIdSeedKey = new PluginKey("deterministicParaIdSeed");
+const deterministicParaIdSeedKey = "stll.folio.meta.deterministicParaIdSeed";
 /** Ask the allocator to mint reproducible ids for the paragraphs `tr` creates. */
 const requestDeterministicParaIds = (tr, seed) => tr.setMeta(deterministicParaIdSeedKey, seed);
 /**
@@ -297,7 +298,7 @@ const ensureParaIdsInState = (state) => {
 	return state.apply(tr);
 };
 const createParaIdAllocatorPlugin = () => new Plugin({
-	key: paraIdAllocatorKey,
+	key: paraIdAllocatorKey.createKey(),
 	state: {
 		init: (_config, state) => collectParagraphPropertySourceSeed(state.doc),
 		apply: (_transaction, seed) => seed
@@ -307,7 +308,7 @@ const createParaIdAllocatorPlugin = () => new Plugin({
 		const paragraphSourceSeed = paraIdAllocatorKey.getState(oldState);
 		if (!paragraphSourceSeed) panic("ParaId allocator lost its paragraph-property source seed");
 		const keeperPositions = mapParagraphKeepers(oldState.doc, transactions, paragraphSourceSeed);
-		const deterministicSeed = transactions.map((transaction) => transaction.getMeta(deterministicParaIdSeedKey)).find((value) => typeof value === "string") ?? null;
+		const deterministicSeed = transactions.map((transaction) => transaction.getMeta("stll.folio.meta.deterministicParaIdSeed")).find((value) => typeof value === "string") ?? null;
 		const census = collectParagraphCensus(newState.doc, paragraphSourceSeed);
 		const updates = collectParaIdUpdatesFromCensus(census, keeperPositions.paraIds, deterministicSeed);
 		const paragraphSourceUpdates = collectParagraphPropertySourceUpdates(census, keeperPositions.sourceTokens, transactions);

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

@@ -2,9 +2,15 @@ import { document_d_exports } from "../../../types/document.js";
 import { Extension } from "../types.js";
 import { RemovedSectionReference, TrackedSectionEndpointRemoval } from "../../../internal/sectionEndpointResolution.js";
 import { Node } from "prosemirror-model";
-import { EditorState, Plugin, PluginKey, Transaction } from "prosemirror-state";
+import { EditorState, Plugin, Transaction } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts
-declare const paragraphChangeTrackerKey: PluginKey<InternalParagraphChangeTrackerState>;
+declare const paragraphChangeTrackerKey: Readonly<{
+  key: string;
+  createKey: () => import("prosemirror-state").PluginKey<InternalParagraphChangeTrackerState>;
+  owns: (plugin: Plugin<InternalParagraphChangeTrackerState>) => boolean;
+  get: (state: EditorState) => Plugin<InternalParagraphChangeTrackerState> | undefined;
+  getState: (state: EditorState) => InternalParagraphChangeTrackerState | undefined;
+}>;
 type ParagraphChangeTrackerState = {
   /** Set of paraIds that were modified since last clear */
   changedParaIds: Set<string>;

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

@@ -1,15 +1,23 @@
 import { withTrackedSectionEndpointRemoval } from "../../../internal/sectionEndpointResolution.js";
 import { canonicalJson } from "../../../utils/canonicalJson.js";
 import { enclosingParagraphIndexed, nodeAtIndexed, nodesBetweenIndexed } from "../../indexedNodeLookup.js";
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { sweepPositions } from "../../positionSweep.js";
 import { sectionPropertiesOf } from "../../sectionCarrier.js";
 import { sectionMarkEditsOf } from "../../sectionMarkEdits.js";
 import { createExtension } from "../create.js";
 import { AddMarkStep, AddNodeMarkStep, AttrStep, RemoveMarkStep, RemoveNodeMarkStep } from "prosemirror-transform";
-import { Plugin, PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 import { isHistoryTransaction } from "prosemirror-history";
 //#region src/prosemirror/extensions/features/ParagraphChangeTrackerExtension.ts
-const paragraphChangeTrackerKey = new PluginKey("paragraphChangeTracker");
+/**
+* Paragraph Change Tracker Extension
+*
+* Watches ProseMirror transactions and records which paragraph IDs (paraId)
+* were modified. Also detects paragraph and block-structure changes.
+* Used by the selective save system to patch only changed paragraphs in document.xml.
+*/
+const paragraphChangeTrackerKey = createPluginKeyOwner("paragraphChangeTracker");
 const CLEAR_META = "clear";
 const IGNORE_META = "ignore";
 const STRUCTURAL_META = "structural";
@@ -196,7 +204,7 @@ const mapStepTouches = (tr, batches) => {
 };
 function createParagraphChangeTrackerPlugin() {
 	return new Plugin({
-		key: paragraphChangeTrackerKey,
+		key: paragraphChangeTrackerKey.createKey(),
 		state: {
 			init(_config, state) {
 				const counts = countDocumentStructure(state.doc);

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

@@ -1,9 +1,10 @@
 import { expectRunIdentityMarkAttrs } from "../../attrs/index.js";
 import { nodesBetweenIndexed } from "../../indexedNodeLookup.js";
+import { createPluginKeyOwner } from "../../pluginKeyOwner.js";
 import { sweepPositions } from "../../positionSweep.js";
 import { RUN_IDENTITY_ATTRIBUTE, RUN_IDENTITY_MARK_NAME, runIdentityAttrs } from "../../runIdentity.js";
 import { createMarkExtension } from "../create.js";
-import { Plugin, PluginKey } from "prosemirror-state";
+import { Plugin } from "prosemirror-state";
 import { isHistoryTransaction, undoDepth } from "prosemirror-history";
 //#region src/prosemirror/extensions/marks/RunIdentityExtension.ts
 /**
@@ -28,7 +29,7 @@ import { isHistoryTransaction, undoDepth } from "prosemirror-history";
 * supplies the session the format itself says such a run belongs to.
 */
 const CANONICAL_RUN_IDENTITY_ID = /^(?:0|[1-9]\d*)$/u;
-const runIdentityStripKey = new PluginKey("runIdentityStrip");
+const runIdentityStripKey = createPluginKeyOwner("runIdentityStrip");
 /**
 * Every range `transactions` inserted, in the document they produced.
 *
@@ -87,7 +88,7 @@ const insertedRanges = (transactions, skip = () => false) => {
 * collaborative apply all arrive here and nowhere else in common.
 */
 const createRunIdentityStripPlugin = () => new Plugin({
-	key: runIdentityStripKey,
+	key: runIdentityStripKey.createKey(),
 	appendTransaction(transactions, oldState, newState) {
 		if (!transactions.some((transaction) => transaction.docChanged)) return null;
 		const markType = newState.schema.marks[RUN_IDENTITY_MARK_NAME];

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

@@ -409,7 +409,7 @@ function isMarkActive(state, type, attrs) {
 	});
 	let hasMark = false;
 	state.doc.nodesBetween(from, to, (node) => {
-		if (node.isText) {
+		if (node.isText && !(RUN_FORMATTING_MARK_NAMES.has(markType.name) && node.marks.some((mark) => mark.type.name === "footnoteRef"))) {
 			const mark = markType.isInSet(node.marks);
 			if (mark) {
 				if (!attrs) {

package/dist/prosemirror/listInstanceReferences.js

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

package/dist/prosemirror/listLabels.d.ts

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

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