@stll/folio-core 0.54.1 → 0.55.0

package/dist/prosemirror/extensions/nodes/NoteMarkerExtension.js

@@ -0,0 +1,36 @@
+import { expectNoteMarkerAttrs } from "../../../internal/noteMarkerAttrs.js";
+import { createNodeExtension } from "../create.js";
+//#region src/prosemirror/extensions/nodes/NoteMarkerExtension.ts
+/** An authored automatic note mark: invisible, but retained through PM JSON and edits. */
+const NOTE_MARKER_NODE_NAME = "noteMarker";
+const NoteMarkerExtension = createNodeExtension({
+	name: NOTE_MARKER_NODE_NAME,
+	schemaNodeName: NOTE_MARKER_NODE_NAME,
+	nodeSpec: {
+		inline: true,
+		group: "inline",
+		atom: true,
+		marks: "_",
+		selectable: false,
+		attrs: { kind: {} },
+		parseDOM: [{
+			tag: "span[data-docx-note-marker]",
+			getAttrs(node) {
+				if (!(node instanceof HTMLElement)) return false;
+				const kind = node.dataset["docxNoteMarker"];
+				return kind === "footnote" || kind === "endnote" ? { kind } : false;
+			}
+		}],
+		toDOM(node) {
+			const { kind } = expectNoteMarkerAttrs(node);
+			return ["span", {
+				"data-docx-note-marker": kind,
+				"aria-hidden": "true",
+				contenteditable: "false",
+				style: "display: none;"
+			}];
+		}
+	}
+});
+//#endregion
+export { NOTE_MARKER_NODE_NAME, NoteMarkerExtension };

package/dist/prosemirror/extensions/nodes/PreservedXmlExtension.js

@@ -25,7 +25,8 @@ const PreservedXmlExtension = createNodeExtension({
 		attrs: {
 			xml: {},
 			text: { default: "" },
-			level: { default: PRESERVED_XML_LEVELS.run }
+			level: { default: PRESERVED_XML_LEVELS.run },
+			foldedListNumber: { default: void 0 }
 		},
 		parseDOM: [{
 			tag: "span[data-docx-preserved-xml]",
@@ -42,7 +43,8 @@ const PreservedXmlExtension = createNodeExtension({
 			}
 		}],
 		toDOM(node) {
-			const { xml, text, level } = expectPreservedXmlAttrs(node);
+			const { xml, text, level, foldedListNumber } = expectPreservedXmlAttrs(node);
+			if (foldedListNumber) return ["span", { contenteditable: "false" }];
 			return [
 				"span",
 				{

package/dist/prosemirror/extensions/nodes/ShapeExtension.js

@@ -268,9 +268,9 @@ function createShapeElement(type, w, h, adjustments) {
 		case "straightConnector1": {
 			const el = document.createElementNS(SVG_NS, "line");
 			setNum(el, "x1", 0);
-			setNum(el, "y1", h / 2);
+			setNum(el, "y1", 0);
 			setNum(el, "x2", w);
-			setNum(el, "y2", h / 2);
+			setNum(el, "y2", h);
 			return el;
 		}
 		case "rightBrace": {
@@ -537,9 +537,11 @@ const ShapeExtension = createNodeExtension({
 			const strokeWidth = finiteNumber(attrs.outlineWidth) ?? 1;
 			const svg = document.createElementNS(SVG_NS, "svg");
 			svg.setAttribute("xmlns", SVG_NS);
-			setNum(svg, "width", w);
-			setNum(svg, "height", h);
-			svg.setAttribute("viewBox", `0 0 ${w} ${h}`);
+			const viewportWidth = w === 0 ? 1 : w;
+			const viewportHeight = h === 0 ? 1 : h;
+			setNum(svg, "width", viewportWidth);
+			setNum(svg, "height", viewportHeight);
+			svg.setAttribute("viewBox", `0 0 ${viewportWidth} ${viewportHeight}`);
 			let gradient = null;
 			let fillAttr;
 			if (attrs.fillType === "gradient" && attrs.gradientStops) {
@@ -548,7 +550,7 @@ const ShapeExtension = createNodeExtension({
 				fillAttr = gradient ? `url(#${gradId})` : safeFillColor;
 			} else fillAttr = attrs.fillType === "none" ? "none" : safeFillColor;
 			const strokeAttr = attrs.outlineStyle === "none" ? "none" : safeStrokeColor;
-			svg.setAttribute("style", `fill:${fillAttr};stroke:${strokeAttr};stroke-width:${strokeWidth}`);
+			svg.setAttribute("style", `fill:${fillAttr};stroke:${strokeAttr};stroke-width:${strokeWidth};overflow:visible`);
 			if (gradient) {
 				const defs = document.createElementNS(SVG_NS, "defs");
 				defs.append(gradient);

package/dist/prosemirror/listMarker.d.ts

@@ -55,6 +55,7 @@ declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
   listMarkerSuffix: null;
   listMarkerAllCaps: null;
   listImplicitChildLevelAdvances: null;
+  listFoldedMarkerSuffix: null;
   listMarkerSecondSlotOffsetTwips: null;
   listLevelNumFmts: null;
   listLevelStarts: null;

package/dist/prosemirror/listMarker.js

@@ -17,6 +17,7 @@ const CLEARED_LIST_RENDERING_ATTRS = Object.freeze({
 	listMarkerSuffix: null,
 	listMarkerAllCaps: null,
 	listImplicitChildLevelAdvances: null,
+	listFoldedMarkerSuffix: null,
 	listMarkerSecondSlotOffsetTwips: null,
 	listLevelNumFmts: null,
 	listLevelStarts: null,
@@ -76,6 +77,7 @@ function previousListAttrs(attrs) {
 		...previous.listNumFmt !== void 0 ? { listNumFmt: previous.listNumFmt } : {},
 		...previous.listMarker !== void 0 ? { listMarker: previous.listMarker } : {},
 		...previous.listMarkerTemplate !== void 0 ? { listMarkerTemplate: previous.listMarkerTemplate } : {},
+		...previous.listFoldedMarkerSuffix !== void 0 ? { listFoldedMarkerSuffix: previous.listFoldedMarkerSuffix } : {},
 		...previous.listMarkerHidden !== void 0 ? { listMarkerHidden: previous.listMarkerHidden } : {},
 		...previous.listMarkerFormatting !== void 0 ? { listMarkerFormatting: previous.listMarkerFormatting } : {},
 		...previous.listMarkerAlignment !== void 0 ? { listMarkerAlignment: previous.listMarkerAlignment } : {},
@@ -178,6 +180,7 @@ function formatNumberedMarker(counters, level) {
 }
 function advanceListMarker(attrs, state) {
 	const markerTemplate = attrs.listMarkerTemplate ?? attrs.listMarker;
+	const foldedMarkerSuffix = attrs.listFoldedMarkerSuffix ?? void 0;
 	const level = paragraphNumberingLevel(attrs.numPr) ?? 0;
 	if (!Number.isInteger(level) || level < 0 || level > 8) return null;
 	const numId = paragraphNumberingReferenceId(attrs.numPr);
@@ -205,7 +208,9 @@ function advanceListMarker(attrs, state) {
 			fromStyle: false,
 			numId: null
 		};
-		return convertBulletToUnicode(attrs.listMarker ?? markerTemplate ?? "", bulletMarkerFontName(attrs.listMarkerFormatting));
+		if (foldedMarkerSuffix !== void 0 && attrs.listMarkerTemplate == null) return attrs.listMarker ?? null;
+		const marker = convertBulletToUnicode(attrs.listMarkerTemplate ?? attrs.listMarker ?? "", bulletMarkerFontName(attrs.listMarkerFormatting));
+		return foldedMarkerSuffix === void 0 ? marker : `${marker}\t${foldedMarkerSuffix}`;
 	}
 	const firstInstanceEncounter = !state.counters.has(numId);
 	let counters = state.counters.get(numId) ?? Array.from({ length: 9 }, () => NaN);
@@ -250,12 +255,16 @@ function advanceListMarker(attrs, state) {
 		numId
 	};
 	const levelFormats = attrs.listLevelNumFmts ?? (attrs.listNumFmt ? [attrs.listNumFmt] : void 0);
-	if (markerTemplate?.includes("%")) return resolveListTemplate({
-		template: markerTemplate,
-		counters,
-		levelFormats,
-		forceDecimal: attrs.listIsLegal
-	});
+	if (markerTemplate?.includes("%") && (foldedMarkerSuffix === void 0 || attrs.listMarkerTemplate != null)) {
+		const marker = resolveListTemplate({
+			template: markerTemplate,
+			counters,
+			levelFormats,
+			forceDecimal: attrs.listIsLegal
+		});
+		return foldedMarkerSuffix === void 0 ? marker : `${marker}\t${foldedMarkerSuffix}`;
+	}
+	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;
 	return formatNumberedMarker(counters, level);

package/dist/prosemirror/listNumbering.js

@@ -2,6 +2,7 @@ import { mintListInstance, restartListInstance } from "../docx/listNumberingInst
 import { createNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
 import { paragraphNumberingLevel, 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";
@@ -11,6 +12,22 @@ import { getDocumentStyleResolver } from "./plugins/documentStyleState.js";
 import { SUGGESTION_META, makeRevisionInfo } from "./plugins/suggestionMode.js";
 import { listAttrsFromNumbering, listLevelIndentAttrPatch } 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
@@ -187,6 +204,7 @@ const listItemAttrs = (attrs, { numId, ilvl }, numbering) => ({
 		ilvl
 	}, numbering),
 	listImplicitChildLevelAdvances: attrs["listImplicitChildLevelAdvances"] ?? null,
+	listFoldedMarkerSuffix: attrs["listFoldedMarkerSuffix"] ?? void 0,
 	listMarkerSecondSlotOffsetTwips: attrs["listMarkerSecondSlotOffsetTwips"] ?? null
 });
 /**
@@ -260,7 +278,7 @@ const moveItems = ({ state, items, numId, numbering }) => {
 * its list move to a new instance of the same definition, whose
 * `w:startOverride` at the item's level is `value`.
 */
-const setNumberingValue = (value) => (state, dispatch) => {
+const setNumberingValue = (value) => withCanonicalCommand((state, dispatch) => {
 	if (!Number.isSafeInteger(value) || value < 0) return false;
 	const selected = selectedListParagraph(state);
 	const numbering = getDocumentNumbering(state);
@@ -279,9 +297,12 @@ const setNumberingValue = (value) => (state, dispatch) => {
 		numbering: createNumberingMap(restarted.definitions)
 	}));
 	return true;
-};
+}, () => [{
+	type: "restartNumbering",
+	start: value
+}]);
 /** *Restart at 1*: the selected item starts its list over at one. */
-const restartNumbering = (state, dispatch) => setNumberingValue(1)(state, dispatch);
+const restartNumbering = withCanonicalCommand((state, dispatch) => setNumberingValue(1)(state, dispatch), () => [{ type: "restartNumbering" }]);
 /** The nearest list before `beforePos` of the kind `membership` has, other than its own. */
 const previousListOfKind = (state, beforePos, membership) => {
 	const numbering = getDocumentNumbering(state);
@@ -301,7 +322,7 @@ const previousListOfKind = (state, beforePos, membership) => {
 * 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.
 */
-const continueNumbering = (state, dispatch) => {
+const continueNumbering = withCanonicalCommand((state, dispatch) => {
 	const selected = selectedListParagraph(state);
 	const numbering = getDocumentNumbering(state);
 	if (!selected || !numbering) return false;
@@ -315,7 +336,7 @@ const continueNumbering = (state, dispatch) => {
 		numbering
 	}));
 	return true;
-};
+}, () => [{ type: "continueNumbering" }]);
 const NO_LIST_NUMBERING_MENU = { type: "none" };
 /**
 * Whether the selection is in a list item whose numbering can be restarted

package/dist/prosemirror/listRenderingAttrs.d.ts

@@ -6,6 +6,7 @@ type ListRenderingAttrField = Exclude<keyof document_d_exports.ListRendering, "l
 declare const LIST_RENDERING_ATTR_BY_FIELD: {
   readonly marker: "listMarker";
   readonly markerTemplate: "listMarkerTemplate";
+  readonly foldedMarkerSuffix: "listFoldedMarkerSuffix";
   readonly isBullet: "listIsBullet";
   readonly isLegal: "listIsLegal";
   readonly numFmt: "listNumFmt";

package/dist/prosemirror/listRenderingAttrs.js

@@ -12,6 +12,7 @@ import { paragraphNumberingLevel } from "@stll/docx-core/model";
 const LIST_RENDERING_ATTR_BY_FIELD = {
 	marker: "listMarker",
 	markerTemplate: "listMarkerTemplate",
+	foldedMarkerSuffix: "listFoldedMarkerSuffix",
 	isBullet: "listIsBullet",
 	isLegal: "listIsLegal",
 	numFmt: "listNumFmt",
@@ -41,6 +42,7 @@ const listRenderingAttrPatch = (rendering) => {
 	const patch = {
 		listMarker: rendering.marker || void 0,
 		listMarkerTemplate: rendering.markerTemplate || void 0,
+		listFoldedMarkerSuffix: rendering.foldedMarkerSuffix,
 		listIsBullet: rendering.isBullet || void 0,
 		listIsLegal: rendering.isLegal || void 0,
 		listNumFmt: rendering.numFmt || void 0,
@@ -73,6 +75,7 @@ const hasListRendering = (attrs) => attrs.listMarker != null || attrs.listIsBull
 const listRenderingFromAttrs = ({ attrs, numId }) => {
 	const optional = {
 		markerTemplate: attrs.listMarkerTemplate ?? void 0,
+		foldedMarkerSuffix: attrs.listFoldedMarkerSuffix ?? void 0,
 		isLegal: attrs.listIsLegal ?? void 0,
 		numFmt: attrs.listNumFmt ?? void 0,
 		markerHidden: attrs.listMarkerHidden ?? void 0,

package/dist/prosemirror/markupViewNotes.js

@@ -10,10 +10,11 @@ const resolvedNote = (note, mode, state, document) => {
 	const styleResolver = getDocumentStyleResolver(state);
 	const cached = resolvedNotes.get(note)?.get(mode);
 	if (cached?.styleResolver === styleResolver) return cached.note;
-	const { styles, theme } = document.package;
+	const { styles, theme, numbering } = document.package;
 	const doc = footnoteToProseDoc(note.content, {
 		...styles !== void 0 && { styles },
-		...theme !== void 0 && { theme }
+		...theme !== void 0 && { theme },
+		...numbering !== void 0 && { numbering }
 	});
 	const result = resolveWholeStory({
 		doc,

package/dist/prosemirror/moveRangeBoundaryAttrs.d.ts

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../types/document.js";
-import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/moveRangeBoundaryAttrs.d.ts
 type MoveRangeMarker = Extract<document_d_exports.ParagraphContent, {

package/dist/prosemirror/noteReferenceReview.js

@@ -64,7 +64,8 @@ const restoredNote = (note, document, reference) => {
 	const { styles, theme, numbering } = document.package;
 	const doc = footnoteToProseDoc(note.content, {
 		...styles !== void 0 && { styles },
-		...theme !== void 0 && { theme }
+		...theme !== void 0 && { theme },
+		...numbering !== void 0 && { numbering }
 	});
 	const revisions = noteDeletionRevisions(doc, reference);
 	if (revisions.length === 0) return note;
@@ -164,10 +165,11 @@ const deleteNoteWithReference = (transform, reference) => {
 * deleted too, by the reference's author at the reference's date.
 */
 const deletedNote = (note, document, reference) => {
-	const { styles, theme } = document.package;
+	const { styles, theme, numbering } = document.package;
 	const doc = footnoteToProseDoc(note.content, {
 		...styles !== void 0 && { styles },
-		...theme !== void 0 && { theme }
+		...theme !== void 0 && { theme },
+		...numbering !== void 0 && { numbering }
 	});
 	const transform = deleteNoteWithReference(new Transform(doc), reference);
 	if (!transform.docChanged) return note;

package/dist/prosemirror/plugins/revisionIds.d.ts

@@ -1,31 +1,35 @@
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/plugins/revisionIds.d.ts
+declare const RevisionIdAllocationError_base: import("better-result").TaggedErrorClass<"RevisionIdAllocationError">;
+declare class RevisionIdAllocationError extends RevisionIdAllocationError_base<{
+  message: string;
+  first: number;
+  next: number;
+}> {}
+/** Deterministic package-local batches prefer ids above loaded revisions, then a free interval. */
+declare const revisionIdSeedAbove: (existingIds: Iterable<number>) => number;
+/** The next free id, including after the signed 32-bit boundary wraps. */
+declare const nextRevisionId: () => number;
 /**
- * Mint the next tracked-revision id (`w:id`). Strictly monotonic per realm,
- * and always inside the range serialized `w:id` may occupy.
+ * A shared batch increments its seed locally, so a single free id is not
+ * enough: start in the largest free interval. Every contiguous batch that
+ * can fit anywhere fits here, including after loaded ids shorten the tail.
+ * Continue within this interval until another producer changes the cursor.
  */
+declare const nextRevisionIdRange: () => number;
+/** Reserve a deterministic batch without changing its caller-supplied ids. */
+declare const reserveRevisionIds: (first: number, next: number) => void;
+/** Shared producers must never cross a loaded or already issued id on wrap. */
+declare const claimRevisionIds: (first: number, next: number) => void;
+/** Mint a bounded id without reusing loaded or previously issued ids. */
 declare function mintRevisionId(): number;
-/**
- * Raise the counter above `maxId` so freshly minted ids cannot collide with
- * ids already present in a loaded document. Only ever raises.
- *
- * `maxId` is derived from file content, so it is untrusted: a malformed or
- * out-of-range value is ignored outright rather than folded into range.
- */
+/** Reserve a valid loaded id and prefer the range above it. */
 declare function seedRevisionIdsAbove(maxId: number): void;
-/**
- * The highest id in `doc` from any part of the annotation space.
- *
- * A revision, a comment and a bookmark draw their `w:id` from one space, so a
- * counter seeded above its own kind alone still mints over another kind's id.
- * Both allocators seed from this, and the save-time normalization avoids the
- * same space, so the three agree on what is taken.
- */
-declare function maxAnnotationIdInDoc(doc: Node): number;
+declare const maxAnnotationIdInDoc: (doc: Node) => number;
 /**
  * Raise the counter above every annotation id already present in `doc`.
  * Called from the suggestion-mode plugin's `state.init`.
  */
 declare function seedRevisionIdsFromDoc(doc: Node): void;
 //#endregion
-export { maxAnnotationIdInDoc, mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };
+export { RevisionIdAllocationError, claimRevisionIds, maxAnnotationIdInDoc, mintRevisionId, nextRevisionId, nextRevisionIdRange, reserveRevisionIds, revisionIdSeedAbove, seedRevisionIdsAbove, seedRevisionIdsFromDoc };

package/dist/prosemirror/plugins/revisionIds.js

@@ -1,3 +1,4 @@
+import { TaggedError } from "better-result";
 import { MAX_REVISION_ID } from "@stll/docx-core/model";
 //#region src/prosemirror/plugins/revisionIds.ts
 /**
@@ -9,23 +10,98 @@ import { MAX_REVISION_ID } from "@stll/docx-core/model";
 * int consumers read `w:id` into.
 */
 let counter = 1;
+const occupiedIds = /* @__PURE__ */ new Set();
+var RevisionIdAllocationError = class extends TaggedError("RevisionIdAllocationError") {};
+/** Batches use contiguous ids; on rollover prefer the largest unused interval. */
+const largestFreeIntervalStart = (reservedIds) => {
+	let first = 1;
+	let bestFirst = 1;
+	let bestSize = 0;
+	const boundaries = [...reservedIds].filter((id) => id > 0).toSorted((a, b) => a - b);
+	boundaries.push(MAX_REVISION_ID + 1);
+	for (const boundary of boundaries) {
+		const size = boundary - first;
+		if (size > bestSize) {
+			bestFirst = first;
+			bestSize = size;
+		}
+		first = boundary + 1;
+	}
+	if (bestSize === 0) throw new RevisionIdAllocationError({
+		message: "Revision id space exhausted",
+		first: 1,
+		next: 1
+	});
+	return bestFirst;
+};
+/** Deterministic package-local batches prefer ids above loaded revisions, then a free interval. */
+const revisionIdSeedAbove = (existingIds) => {
+	const reservedIds = /* @__PURE__ */ new Set();
+	let maxId = 0;
+	for (const id of existingIds) {
+		if (!Number.isInteger(id) || id < 0 || id > MAX_REVISION_ID) continue;
+		reservedIds.add(id);
+		maxId = Math.max(maxId, id);
+	}
+	return maxId < MAX_REVISION_ID ? maxId + 1 : largestFreeIntervalStart(reservedIds);
+};
+/** The next free id, including after the signed 32-bit boundary wraps. */
+const nextRevisionId = () => {
+	if (counter > MAX_REVISION_ID) counter = largestFreeIntervalStart(occupiedIds);
+	while (occupiedIds.has(counter)) {
+		counter += 1;
+		if (counter > MAX_REVISION_ID) counter = largestFreeIntervalStart(occupiedIds);
+		if (occupiedIds.size >= MAX_REVISION_ID) throw new RevisionIdAllocationError({
+			message: "Revision id space exhausted",
+			first: counter,
+			next: counter
+		});
+	}
+	return counter;
+};
 /**
-* Mint the next tracked-revision id (`w:id`). Strictly monotonic per realm,
-* and always inside the range serialized `w:id` may occupy.
+* A shared batch increments its seed locally, so a single free id is not
+* enough: start in the largest free interval. Every contiguous batch that
+* can fit anywhere fits here, including after loaded ids shorten the tail.
+* Continue within this interval until another producer changes the cursor.
 */
+const nextRevisionIdRange = () => {
+	counter = largestFreeIntervalStart(occupiedIds);
+	return counter;
+};
+const validateRevisionIdRange = (first, next) => {
+	if (!Number.isInteger(first) || !Number.isInteger(next) || first < 0 || next < first || next > MAX_REVISION_ID + 1) throw new RevisionIdAllocationError({
+		message: "Revision id range exceeds the OOXML limit",
+		first,
+		next
+	});
+};
+/** Reserve a deterministic batch without changing its caller-supplied ids. */
+const reserveRevisionIds = (first, next) => {
+	validateRevisionIdRange(first, next);
+	for (let id = first; id < next; id += 1) occupiedIds.add(id);
+	if (next > counter) counter = next;
+};
+/** Shared producers must never cross a loaded or already issued id on wrap. */
+const claimRevisionIds = (first, next) => {
+	validateRevisionIdRange(first, next);
+	for (let id = first; id < next && id <= MAX_REVISION_ID; id += 1) if (occupiedIds.has(id)) throw new RevisionIdAllocationError({
+		message: "Revision id range overlaps an occupied id",
+		first,
+		next
+	});
+	reserveRevisionIds(first, next);
+};
+/** Mint a bounded id without reusing loaded or previously issued ids. */
 function mintRevisionId() {
-	if (counter > MAX_REVISION_ID) counter = 1;
-	return counter++;
+	const id = nextRevisionId();
+	claimRevisionIds(id, id + 1);
+	return id;
 }
-/**
-* Raise the counter above `maxId` so freshly minted ids cannot collide with
-* ids already present in a loaded document. Only ever raises.
-*
-* `maxId` is derived from file content, so it is untrusted: a malformed or
-* out-of-range value is ignored outright rather than folded into range.
-*/
+/** Reserve a valid loaded id and prefer the range above it. */
 function seedRevisionIdsAbove(maxId) {
-	if (!Number.isInteger(maxId) || maxId < 0 || maxId >= MAX_REVISION_ID) return;
+	if (!Number.isInteger(maxId) || maxId < 0 || maxId > MAX_REVISION_ID) return;
+	occupiedIds.add(maxId);
 	if (maxId >= counter) counter = maxId + 1;
 }
 /** Node attrs that carry a revision id directly (`revisionId` field). */
@@ -33,40 +109,45 @@ const DIRECT_REVISION_ATTR_KEYS = ["trIns", "trDel"];
 /**
 * The highest id in `doc` from any part of the annotation space.
 *
-* A revision, a comment and a bookmark draw their `w:id` from one space, so a
-* counter seeded above its own kind alone still mints over another kind's id.
-* Both allocators seed from this, and the save-time normalization avoids the
-* same space, so the three agree on what is taken.
+* Preserve the editor's conservative annotation seeding: revisions reserve
+* comment and bookmark ids too, although OOXML defines separate id spaces.
 */
-function maxAnnotationIdInDoc(doc) {
+const visitAnnotationIds = (doc, visit) => {
 	let max = 0;
 	const consider = (id) => {
-		if (typeof id === "number" && Number.isInteger(id) && id > max && id <= MAX_REVISION_ID) max = id;
+		if (typeof id === "number" && Number.isInteger(id) && id >= 0 && id <= MAX_REVISION_ID) {
+			visit(id);
+			max = Math.max(max, id);
+		}
+	};
+	const considerMetadata = (value) => {
+		if (typeof value !== "object" || value === null) return;
+		for (const [key, child] of Object.entries(value)) if (key === "id" || key === "revisionId" || key === "commentId") consider(child);
+		else considerMetadata(child);
 	};
 	doc.descendants((node) => {
 		for (const mark of node.marks) {
 			consider(mark.attrs["revisionId"]);
 			consider(mark.attrs["commentId"]);
+			considerMetadata(mark.attrs["_docxRevisionAncestors"]);
+			considerMetadata(mark.attrs["changes"]);
 		}
 		if (node.type.name === "bookmarkBoundary") consider(node.attrs["id"]);
 		const attrs = node.attrs;
-		const pPrMark = attrs["pPrMark"];
-		if (pPrMark?.info) consider(pPrMark.info.id);
-		for (const key of DIRECT_REVISION_ATTR_KEYS) {
-			const value = attrs[key];
-			if (value) consider(value.revisionId);
-		}
-		const cellMarker = attrs["cellMarker"];
-		if (cellMarker?.info) consider(cellMarker.info.revisionId);
+		considerMetadata(attrs["_propertyChanges"]);
+		considerMetadata(attrs["pPrMark"]);
+		for (const key of DIRECT_REVISION_ATTR_KEYS) considerMetadata(attrs[key]);
+		considerMetadata(attrs["cellMarker"]);
 	});
 	return max;
-}
+};
+const maxAnnotationIdInDoc = (doc) => visitAnnotationIds(doc, () => {});
 /**
 * Raise the counter above every annotation id already present in `doc`.
 * Called from the suggestion-mode plugin's `state.init`.
 */
 function seedRevisionIdsFromDoc(doc) {
-	seedRevisionIdsAbove(maxAnnotationIdInDoc(doc));
+	visitAnnotationIds(doc, seedRevisionIdsAbove);
 }
 //#endregion
-export { maxAnnotationIdInDoc, mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };
+export { RevisionIdAllocationError, claimRevisionIds, maxAnnotationIdInDoc, mintRevisionId, nextRevisionId, nextRevisionIdRange, reserveRevisionIds, revisionIdSeedAbove, seedRevisionIdsAbove, seedRevisionIdsFromDoc };

package/dist/prosemirror/plugins/suggestionMode.d.ts

@@ -66,8 +66,8 @@ declare function handleSuggestionEnter(view: EditorView, pluginState: Suggestion
  * - Delete-at-paragraph-end     → current paragraph.
  *
  * Returns `null` when there is no adjacent sibling paragraph (the join would
- * not produce paragraph-mark merging — e.g. doc start, doc end, or sibling
- * is a table). The default merge path then runs unchanged.
+ * not produce paragraph-mark merging, e.g. doc start, doc end, or a table).
+ * Bookmark markers at an edge do not hide the adjacent paragraph break.
  */
 declare function paragraphBoundaryTarget(state: EditorState, direction: "backward" | "forward"): number | null;
 /** Apply the editor's selected-content deletion path for a host cut action. */