@stll/folio-core 0.54.0 → 0.54.2

package/dist/ai-edits/apply.d.ts

@@ -20,7 +20,7 @@ type FolioAIEditView = {
 /**
  * Fixed revision provenance, for callers whose output must be reproducible.
  * Both halves of the stamp travel together because either one left to the
- * ambient clock (`new Date()` for the date, a `Date.now()`-seeded cursor for
+ * ambient clock (`new Date()` for the date, the shared bounded allocator for
  * the ids) makes the produced package differ between two runs over the same
  * inputs. `idSeed` starts a contiguous range the batch allocates from, so it
  * must sit above every revision id the target document already carries.

package/dist/ai-edits/apply.js

@@ -21,6 +21,7 @@ import { carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, rec
 import { directParagraphSpacing, paragraphSpacingAttrPatch, paragraphSpacingEqual, paragraphSpacingFromFormatting, withDirectParagraphSpacing } from "../prosemirror/paragraphSpacing.js";
 import { getDocumentNumbering, getDocumentNumberingInstanceIds } from "../prosemirror/plugins/documentNumbering.js";
 import { getDocumentStyleDefinitions, getDocumentStyleResolver } from "../prosemirror/plugins/documentStyleState.js";
+import { claimRevisionIds, nextRevisionId, nextRevisionIdRange, reserveRevisionIds, seedRevisionIdsFromDoc } from "../prosemirror/plugins/revisionIds.js";
 import { rebaseParagraphRuns } from "../prosemirror/rebaseParagraphRuns.js";
 import { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, placeTrackedInsertion, surveyReplacedAnnotations } from "../prosemirror/replacedAnnotations.js";
 import { applyMarksToRunFormattingRepresentation, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations } from "../prosemirror/runFormattingInlineCarriers.js";
@@ -825,24 +826,6 @@ const applyTrackedInlineFormattingToRanges = ({ tr, schema, doc = tr.doc, ranges
 	};
 };
 /**
-* Module-scoped monotonic counter for tracked-change revision ids.
-* Seeded once from `Date.now()` so ids are roughly time-ordered for
-* humans reading raw DOCX, then incremented per allocation. A bare
-* `Date.now()` seed per applyAIEditOperations call would collide
-* across batches that fire within the same millisecond (the panel's
-* Accept-all loop does exactly that — multiple calls in tight
-* succession).
-*
-* A batch without a revision stamp allocates from it as it writes and claims
-* each operation's ids once they are written, rather than reserving a guess
-* up front: how many revisions an operation records is known only once it has
-* recorded them (clearing a background records one run-property change per
-* carrier). The claim also comes before anything that may start another
-* batch, a comment-id callback or the dispatch, so batches in one realm never
-* share an id and follow one another without a gap.
-*/
-let revisionIdCursor = Date.now() * 1e3;
-/**
 * Walk the live doc once and bucket every textblock by its
 * normalised text hash. Resolution then maps each snapshot anchor
 * to the live block at the same ordinal among same-hash siblings —
@@ -1486,6 +1469,13 @@ const finalParagraphPredecessor = (doc, at) => {
 	for (let index = $emptied.index() - 1; index >= 0; index--) {
 		const node = $emptied.parent.child(index);
 		position -= node.nodeSize;
+		if (node.type.spec["tableRole"] === "table" && node.childCount > 0) {
+			let allRowsDeleted = true;
+			node.forEach((row) => {
+				allRowsDeleted &&= expectTableRowAttrs(row).trDel != null;
+			});
+			if (allRowsDeleted) continue;
+		}
 		if (node.type !== emptied.type) return null;
 		if (isPlainDeletedPPrMark(node.attrs["pPrMark"]) && holdsOnlyDeletedContent(node)) continue;
 		return {
@@ -1701,6 +1691,24 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 	};
 	collectSupersededDeletedBreaks(tr.doc, 0);
 	for (const { preceding, inserted, deletedMark, precedingMark } of supersededDeletedBreaks) {
+		const insertionRevisionId = addedBreakRevisionId(precedingMark);
+		if (insertionRevisionId !== null) {
+			const previous = tr.doc.nodeAt(preceding);
+			const current = tr.doc.nodeAt(inserted);
+			if (!previous || !current) panic("A shifted paragraph break lost its carrier");
+			const previousFormatting = paragraphPropertiesOnReject(previous);
+			const existing = expectParagraphAttrs(current)._propertyChanges;
+			if (!hasSerializableParagraphPropertyChange(existing) && JSON.stringify(previousFormatting) !== JSON.stringify(paragraphPropertiesSnapshot(current))) tr.setNodeAttribute(inserted, "_propertyChanges", [...Array.isArray(existing) ? existing : [], {
+				type: "paragraphPropertyChange",
+				info: {
+					id: insertionRevisionId,
+					author,
+					date,
+					...initials ? { initials } : {}
+				},
+				previousFormatting
+			}]);
+		}
 		tr.setNodeAttribute(preceding, "pPrMark", precedingMark);
 		tr.setNodeAttribute(inserted, "pPrMark", deletedMark);
 	}
@@ -2035,6 +2043,7 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 	};
 };
 const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: requestedOperations, mode = "tracked-changes", author = "AI", initials, createCommentId, revisionStamp, revisionIdSeed, wordDiff, wordDiffMode = "bounded", tableTemplates, replacementBackground = "clear", undefinedStyles = "refuse" }) => {
+	seedRevisionIdsFromDoc(view.state.doc);
 	const applied = [];
 	const skipped = [];
 	const normalizations = [];
@@ -2091,7 +2100,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			id: operation.id,
 			reason: "unsupportedBlock"
 		})),
-		nextRevisionId: revisionIdSeed ?? revisionStamp?.idSeed ?? revisionIdCursor
+		nextRevisionId: revisionIdSeed ?? revisionStamp?.idSeed ?? nextRevisionId()
 	};
 	const liveBlocks = collectLiveBlocksByHash(view.state.doc);
 	const liveBlocksByParaId = collectLiveBlocksByParaId(view.state.doc);
@@ -2201,14 +2210,14 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 		item,
 		operationId: item.operation.id,
 		target: getTableMutationPlanTarget(item)
-	})));
+	})), view.state.doc);
 	skipped.push(...tablePlan.skipped);
 	const executableResolved = tablePlan.executable;
 	if (executableResolved.length === 0) return {
 		applied,
 		skipped,
 		...normalizations.length > 0 && { normalizations },
-		nextRevisionId: revisionIdSeed ?? revisionStamp?.idSeed ?? revisionIdCursor
+		nextRevisionId: revisionIdSeed ?? revisionStamp?.idSeed ?? nextRevisionId()
 	};
 	const moveSideCounts = /* @__PURE__ */ new Map();
 	for (const { operation } of executableResolved) {
@@ -2243,17 +2252,20 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 	const mergedPropertyTargets = [];
 	const deferredNoopFinalDeletions = /* @__PURE__ */ new Set();
 	const ownsSharedRevisionIdCursor = revisionIdSeed === void 0 && revisionStamp === void 0;
-	let revisionSeed = revisionIdSeed ?? revisionStamp?.idSeed ?? revisionIdCursor;
-	/**
-	* Claim the shared ids below `nextRevisionId` for this batch. A seeded or
-	* stamped batch allocates from its own range and claims nothing.
-	*/
-	const claimSharedRevisionIds = (nextRevisionId) => {
-		if (ownsSharedRevisionIdCursor) revisionIdCursor = Math.max(revisionIdCursor, nextRevisionId);
+	let revisionSeed = revisionIdSeed ?? revisionStamp?.idSeed ?? nextRevisionIdRange();
+	let claimedThrough = revisionSeed;
+	const claimSharedRevisionIds = (next) => {
+		if (revisionIdSeed !== void 0) return;
+		if (ownsSharedRevisionIdCursor) claimRevisionIds(claimedThrough, next);
+		else reserveRevisionIds(claimedThrough, next);
+		claimedThrough = next;
 	};
-	/** Continue past any shared id a batch the host started meanwhile claimed. */
+	/** Continue past ids a reentrant callback allocated in this realm. */
 	const continueSharedRevisionIds = () => {
-		if (ownsSharedRevisionIdCursor) revisionSeed = Math.max(revisionSeed, revisionIdCursor);
+		if (ownsSharedRevisionIdCursor && nextRevisionId() !== claimedThrough) {
+			revisionSeed = nextRevisionIdRange();
+			claimedThrough = revisionSeed;
+		}
 	};
 	const date = revisionStamp?.date ?? (/* @__PURE__ */ new Date()).toISOString();
 	const insertedColumnCounts = /* @__PURE__ */ new Map();
@@ -3713,7 +3725,7 @@ const previewFolioAIEditOperationsWithResult = (options) => {
 			applied: result.applied.map(({ id }) => ({ id })),
 			skipped: result.skipped,
 			...result.normalizations !== void 0 && { normalizations: result.normalizations },
-			nextRevisionId: options.revisionStamp?.idSeed ?? revisionIdCursor
+			nextRevisionId: options.revisionStamp?.idSeed ?? nextRevisionId()
 		},
 		doc: previewView.state.doc,
 		commentIds

package/dist/ai-edits/headless.d.ts

@@ -179,7 +179,7 @@ type FolioDocxComparisonStoryProjection = {
 type FolioDocxComparisonProjection = {
   stories: readonly FolioDocxComparisonStoryProjection[];
   revisions: {
-    highestId: number;
+    ids: readonly number[];
     present: boolean;
   };
 };
@@ -350,7 +350,6 @@ declare class FolioDocxReviewer {
   private readonly importedFooters;
   private readonly resolvedStoryExpectations;
   private readonly createdComments;
-  private readonly usedCommentIds;
   /** Comments the body anchored when it was loaded, read as the editor projects it. */
   private readonly loadedMainCommentIds;
   private readonly documentOperationUndoEntries;

package/dist/ai-edits/headless.js

@@ -7,6 +7,7 @@ import { applyReplyThreadMarkers } from "../docx/commentReplyMarkers.js";
 import { rebindDrawingImageRelationship } from "../docx/drawingRelationships.js";
 import { getEndnoteText, getFootnoteText, isSeparatorEndnote, isSeparatorFootnote } from "../docx/footnoteParser.js";
 import { getHeaderFooterText } from "../docx/headerFooterParser.js";
+import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { getCachedNumberingMap } from "../docx/numberingParser.js";
 import { recreateProseNodeWithParagraphPropertySource, transferProseParagraphPropertySource } from "../docx/paragraphPropertySource.js";
 import { parseDocx } from "../docx/parser.js";
@@ -20,6 +21,7 @@ import { captureSectionReferenceInventory, resolvedSectionReferenceLosses, withS
 import { expectCharacterStyleMarkAttrs, expectFootnoteRefMarkAttrs } from "../prosemirror/attrs/index.js";
 import { acceptAIEditRevision, acceptSuggestion, getSuggestions, rejectAIEditRevision, rejectAllSuggestions, rejectSuggestion, resolveAllChangesInHeadlessState, suggestionIdOfRevision } from "../prosemirror/commands/comments.js";
 import { sectionRejectProperties } from "../prosemirror/commands/propertyChangeScope.js";
+import { allocateCommentId, createCommentIdAllocator, seedCommentAllocator } from "../prosemirror/commentIdAllocator.js";
 import { proseDocToBlocks, updateDocumentContent } from "../prosemirror/conversion/fromProseDoc.js";
 import { footnoteToProseDoc, headerFooterToProseDoc, toProseDoc } from "../prosemirror/conversion/toProseDoc.js";
 import { ensureBaseDirectionInState } from "../prosemirror/extensions/features/AutoBidiDetectionExtension.js";
@@ -68,14 +70,6 @@ import JSZip from "jszip";
 *
 * Scope: main, header, footer, footnote, and endnote blocks.
 */
-/**
-* Standalone comment-id allocator for the reviewer. The React editor uses
-* `Date.now()`-seeded ids from `commentsHelpers`; that module is DOM-bound
-* (`EditorView`, `findBodyPmAnchors`) and unimportable here, so the reviewer
-* mints its own. Seeded once per realm and incremented so ids stay unique
-* across reviewers created within the same millisecond.
-*/
-let commentIdCursor = Date.now();
 let undoHandleCursor = Date.now();
 const createReviewerComment = ({ id, text, author, date }) => ({
 	id,
@@ -399,7 +393,6 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	importedFooters = /* @__PURE__ */ new Map();
 	resolvedStoryExpectations = /* @__PURE__ */ new Map();
 	createdComments = [];
-	usedCommentIds;
 	/** Comments the body anchored when it was loaded, read as the editor projects it. */
 	loadedMainCommentIds;
 	documentOperationUndoEntries = [];
@@ -418,7 +411,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		this.originalBuffer = args.originalBuffer;
 		this.state = args.state;
 		this.author = args.author;
-		this.usedCommentIds = new Set((args.baseDocument.package.document.comments ?? []).map(({ id }) => id));
+		seedCommentAllocator(createCommentIdAllocator(), args.baseDocument.package.document.comments, { state: args.state });
 		this.loadedMainCommentIds = anchoredCommentIdsInProseDoc(args.state.doc);
 		comparisonAccessByReviewer.set(this, Object.freeze({
 			stageTerminalTableReviewCarrier: (target) => this.stageTerminalTableReviewCarrier(target),
@@ -571,8 +564,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const targetAbstracts = new Map(target.abstractNums.map((entry) => [entry.abstractNumId, entry]));
 		const levelsByNumId = referencedNumberingLevelsByNumId({ references });
 		const importedAbstractIds = /* @__PURE__ */ new Map();
-		let nextAbstractId = 0;
-		for (const id of abstracts.keys()) nextAbstractId = Math.max(nextAbstractId, id + 1);
+		const abstractIds = createNumberingIdAllocator("abstract", [...abstracts.keys(), ...targetAbstracts.keys()]);
 		for (const numId of levelsByNumId.keys()) {
 			const targetNum = targetNums.get(numId);
 			if (!targetNum) return "conflict";
@@ -592,8 +584,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			if (abstractNumId === void 0) {
 				abstractNumId = targetAbstract.abstractNumId;
 				const collision = abstracts.get(abstractNumId);
-				if (collision && canonicalJson(collision) !== canonicalJson(targetAbstract)) abstractNumId = nextAbstractId++;
-				nextAbstractId = Math.max(nextAbstractId, abstractNumId + 1);
+				if (collision && canonicalJson(collision) !== canonicalJson(targetAbstract)) abstractNumId = abstractIds.next();
 				importedAbstractIds.set(targetAbstract.abstractNumId, abstractNumId);
 				abstracts.set(abstractNumId, {
 					...targetAbstract,
@@ -628,9 +619,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const targetNums = new Map(target.nums.map((entry) => [entry.numId, entry]));
 		const targetAbstracts = new Map(target.abstractNums.map((entry) => [entry.abstractNumId, entry]));
 		const levelsByNumId = referencedNumberingLevelsByNumId({ references });
-		let nextNumId = 0;
-		for (const id of nums.keys()) nextNumId = Math.max(nextNumId, id + 1);
-		for (const id of targetNums.keys()) nextNumId = Math.max(nextNumId, id + 1);
+		const numberingIds = createNumberingIdAllocator("num", [...nums.keys(), ...targetNums.keys()]);
 		const remapped = /* @__PURE__ */ new Map();
 		for (const numId of levelsByNumId.keys()) {
 			const targetNum = targetNums.get(numId);
@@ -642,7 +631,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 				target,
 				numId,
 				levelsByNumId
-			})) remapped.set(numId, nextNumId++);
+			})) remapped.set(numId, numberingIds.next());
 		}
 		return remapped;
 	}
@@ -759,18 +748,18 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	}
 	projectComparisonStoriesInternal(mode) {
 		const handles = this.listStoryHandlesInternal();
-		let highestId = 0;
+		const ids = /* @__PURE__ */ new Set();
 		let present = false;
 		if (mode === "with-revision-census") {
 			for (const change of this.currentFinalSectionProperties()?.propertyChanges ?? []) {
-				highestId = Math.max(highestId, change.info.id);
+				ids.add(change.info.id);
 				present = true;
 			}
 			for (const handle of handles) {
 				const state = this.getEditableStoryState(handle);
 				if (!state) continue;
 				const stats = getTrackedChangeStatsFromDoc(state.doc);
-				highestId = Math.max(highestId, stats.highestId);
+				for (const id of stats.ids) ids.add(id);
 				present ||= stats.present;
 			}
 		}
@@ -785,7 +774,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		return {
 			stories,
 			revisions: {
-				highestId,
+				ids: [...ids],
 				present
 			}
 		};
@@ -1231,7 +1220,6 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		});
 		if (!reply) return null;
 		this.createdComments.push(reply);
-		this.usedCommentIds.add(reply.id);
 		this.anchorReplyInEditor({
 			parentId: reply.parentId ?? parentId,
 			replyId: reply.id
@@ -2186,10 +2174,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	}
 	/** Allocate outside every parsed or newly-created comment and reply id. */
 	nextCommentId() {
-		while (this.usedCommentIds.has(commentIdCursor)) commentIdCursor += 1;
-		const id = commentIdCursor++;
-		this.usedCommentIds.add(id);
-		return id;
+		return allocateCommentId();
 	}
 	/**
 	* Drive a ProseMirror command against the reviewer's headless state via the

package/dist/ai-edits/read.d.ts

@@ -76,6 +76,7 @@ declare const getTrackedChangeGroupIdsFromDoc: (doc: Node, id: number) => number
 declare const getTrackedChangeStatsFromDoc: (doc: Node) => {
   highestId: number;
   present: boolean;
+  ids: readonly number[];
 };
 /**
  * The comment anchors present in the body, read from the `comment` mark the

package/dist/ai-edits/read.js

@@ -313,11 +313,16 @@ const getTrackedChangeGroupIdsFromDoc = (doc, id) => getTrackedChangeGroupsFromP
 /** @internal Read revision statistics without paying for an unrelated block projection. */
 const getTrackedChangeStatsFromDoc = (doc) => {
 	let highestId = 0;
+	const revisionIds = /* @__PURE__ */ new Set();
 	const groups = getTrackedChangeGroupsFromProjectedDoc(doc, null);
-	for (const { ids } of groups) for (const id of ids) highestId = Math.max(highestId, id);
+	for (const { ids } of groups) for (const id of ids) {
+		highestId = Math.max(highestId, id);
+		revisionIds.add(id);
+	}
 	return {
 		highestId,
-		present: groups.length > 0
+		present: groups.length > 0,
+		ids: [...revisionIds]
 	};
 };
 /**

package/dist/ai-edits/table-mutation-plan.d.ts

@@ -1,3 +1,4 @@
+import { Node } from "prosemirror-model";
 //#region src/ai-edits/table-mutation-plan.d.ts
 type TableRectangle = {
   left: number;
@@ -32,7 +33,7 @@ type TableMutationPlan<T> = {
   executable: T[];
   skipped: TableMutationPlanSkip[];
 };
-declare const planTableMutations: <T>(candidates: readonly TableMutationPlanCandidate<T>[]) => TableMutationPlan<T>;
+declare const planTableMutations: <T>(candidates: readonly TableMutationPlanCandidate<T>[], doc: Node) => TableMutationPlan<T>;
 declare const tableRectanglesEqual: (left: TableRectangle, right: TableRectangle) => boolean;
 //#endregion
 export { TableMutationPlanTarget, TableRectangle, planTableMutations, tableRectanglesEqual };

package/dist/ai-edits/table-mutation-plan.js

@@ -1,5 +1,7 @@
+import { panic } from "better-result";
+import { TableMap } from "prosemirror-tables";
 //#region src/ai-edits/table-mutation-plan.ts
-const planTableMutations = (candidates) => {
+const planTableMutations = (candidates, doc) => {
 	const tableStructureMutations = /* @__PURE__ */ new Set();
 	const mergeTables = /* @__PURE__ */ new Set();
 	const splitTables = /* @__PURE__ */ new Set();
@@ -44,6 +46,17 @@ const planTableMutations = (candidates) => {
 				});
 				continue;
 			}
+			if (claimedRectangles.length > 0 && mergesRemoveRow({
+				doc,
+				tablePosition: target.tablePosition,
+				rectangles: [...claimedRectangles, target.rectangle]
+			})) {
+				skipped.push({
+					id: candidate.operationId,
+					reason: "unsupportedBlock"
+				});
+				continue;
+			}
 			claimedRectangles.push(target.rectangle);
 			mergeRectanglesByTable.set(target.tablePosition, claimedRectangles);
 			executable.push(candidate.item);
@@ -84,6 +97,31 @@ const planTableMutations = (candidates) => {
 		skipped
 	};
 };
+/**
+* Disjoint merges can still share a row's survival. Direct merging closes a
+* row left without cells, invalidating other rectangles' original row indices;
+* tracked merging cannot record that removal. Keep a row-removing merge alone
+* and refuse the later merge when their combined folded cells empty a row.
+*/
+const mergesRemoveRow = ({ doc, tablePosition, rectangles }) => {
+	const table = doc.nodeAt(tablePosition);
+	if (table?.type.spec["tableRole"] !== "table") return panic("A planned cell merge lost its table", { position: tablePosition });
+	const map = TableMap.get(table);
+	const folded = /* @__PURE__ */ new Set();
+	for (const rectangle of rectangles) {
+		const kept = map.map[rectangle.top * map.width + rectangle.left];
+		for (const position of map.cellsInRect(rectangle)) if (position !== kept) folded.add(position);
+	}
+	let removesRow = false;
+	table.forEach((row, rowOffset) => {
+		let remaining = row.childCount;
+		row.forEach((_cell, cellOffset) => {
+			if (folded.has(rowOffset + 1 + cellOffset)) remaining--;
+		});
+		if (row.childCount > 0 && remaining === 0) removesRow = true;
+	});
+	return removesRow;
+};
 const tableRectanglesOverlap = (left, right) => left.left < right.right && right.left < left.right && left.top < right.bottom && right.top < left.bottom;
 const tableRectanglesEqual = (left, right) => left.left === right.left && left.top === right.top && left.right === right.right && left.bottom === right.bottom;
 //#endregion

package/dist/ai-suggestions/apply.d.ts

@@ -6,7 +6,7 @@ type ApplyResult = {
   stale: string[];
 };
 type ApplyOptions = {
-  view: EditorView;
+  view: Pick<EditorView, "state" | "dispatch">;
   suggestions: AISuggestion[];
   mode: AISuggestionApplyMode;
   author: string;

package/dist/ai-suggestions/apply.js

@@ -1,3 +1,4 @@
+import { mintRevisionId, seedRevisionIdsFromDoc } from "../prosemirror/plugins/revisionIds.js";
 import { resolveSuggestionAnchor } from "./conflict.js";
 //#region src/ai-suggestions/apply.ts
 function applySuggestions(options) {
@@ -39,10 +40,10 @@ function applySuggestions(options) {
 			stale: [...stale, ...resolved.map((r) => r.suggestion.id)]
 		};
 		const date = (/* @__PURE__ */ new Date()).toISOString();
-		let revisionSeed = Date.now();
+		seedRevisionIdsFromDoc(view.state.doc);
 		for (const { suggestion, from, to } of resolved) {
 			const attrs = {
-				revisionId: revisionSeed++,
+				revisionId: mintRevisionId(),
 				author,
 				date
 			};

package/dist/compare/compare.js

@@ -10,6 +10,7 @@ import { isAltChunkMarkup } from "../docx/altChunk.js";
 import { isOpaqueNestedRowMarkup, opaqueRevisionCarrierName } from "../docx/opaqueCarrier.js";
 import { sectionReferenceHistory } from "../docx/sectionReferenceHistory.js";
 import { sameCanonicalInlinePresentation } from "../internal/compare/inline-presentation.js";
+import { revisionIdSeedAbove } from "../prosemirror/plugins/revisionIds.js";
 import { createStyleResolver } from "../prosemirror/styles/styleResolver.js";
 import { canonicalJson } from "../utils/canonicalJson.js";
 import { createContentComparisonWorkSession } from "./content.js";
@@ -386,7 +387,7 @@ const parseComparison = async (base, target, options) => {
 		reviewer,
 		revisionStamp: {
 			date: options.timestamp,
-			idSeed: baseProjection.revisions.highestId + 1
+			idSeed: revisionIdSeedAbove(baseProjection.revisions.ids)
 		},
 		packageDate,
 		pairs: comparisonPairs,

package/dist/docx/bookmarkIds.d.ts

@@ -0,0 +1,11 @@
+import { Node } from "prosemirror-model";
+//#region src/docx/bookmarkIds.d.ts
+declare const reserveBookmarkIds: (ids: Iterable<number>) => void;
+declare const mintBookmarkId: () => number;
+declare const createBookmarkIdAllocator: (existingIds: Iterable<number>) => {
+  reserve: (ids: Iterable<number>) => void;
+  next: () => number;
+};
+declare const reserveProseBookmarkIds: (doc: Node) => void;
+//#endregion
+export { createBookmarkIdAllocator, mintBookmarkId, reserveBookmarkIds, reserveProseBookmarkIds };

package/dist/docx/bookmarkIds.js

@@ -0,0 +1,33 @@
+import { createNumericIdAllocator } from "./numericIdAllocator.js";
+//#region src/docx/bookmarkIds.ts
+let allocator;
+const getAllocator = () => allocator ??= createNumericIdAllocator({
+	space: "bookmark",
+	firstId: 0
+});
+const reserveBookmarkIds = (ids) => getAllocator().reserve(ids);
+const mintBookmarkId = () => getAllocator().next();
+const createBookmarkIdAllocator = (existingIds) => {
+	const scopedAllocator = createNumericIdAllocator({
+		space: "bookmark",
+		firstId: 0
+	});
+	scopedAllocator.reserve(existingIds);
+	return scopedAllocator;
+};
+const reserveProseBookmarkIds = (doc) => {
+	const ids = [];
+	doc.descendants((node) => {
+		const bookmarks = node.attrs["bookmarks"];
+		if (Array.isArray(bookmarks)) {
+			for (const bookmark of bookmarks) if (typeof bookmark === "object" && bookmark !== null && "id" in bookmark && typeof bookmark.id === "number") ids.push(bookmark.id);
+		}
+		if (node.type.name === "bookmarkBoundary" || node.type.name === "blockBookmarkBoundary") {
+			const id = node.attrs["id"];
+			if (typeof id === "number") ids.push(id);
+		}
+	});
+	reserveBookmarkIds(ids);
+};
+//#endregion
+export { createBookmarkIdAllocator, mintBookmarkId, reserveBookmarkIds, reserveProseBookmarkIds };

package/dist/docx/documentParser.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 import { ParseContext } from "./parseContext.js";
+import { XmlElement } from "./xmlParser.js";
 import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
 //#region src/docx/documentParser.d.ts
@@ -33,6 +34,18 @@ declare function extractAllTemplateVariables(content: document_d_exports.BlockCo
  * @returns DocumentBody with content, sections, and template variables
  */
 declare function parseDocumentBody(xml: string, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, context?: ParseContext, previews?: PreviewLedger): document_d_exports.DocumentBody;
+type ParsedDocumentBodyOptions = {
+  doc: XmlElement;
+  styles: StyleMap | null;
+  theme: document_d_exports.Theme | null;
+  numbering: NumberingMap | null;
+  rels: document_d_exports.RelationshipMap | null;
+  media: Map<string, document_d_exports.MediaFile> | null;
+  context?: ParseContext | undefined;
+  previews: PreviewLedger;
+};
+/** Consume the same tree the import identity pass repaired. */
+declare const parseDocumentBodyTree: ({ doc, styles, theme, numbering, rels, media, context, previews }: ParsedDocumentBodyOptions) => document_d_exports.DocumentBody;
 /**
  * Get all paragraphs from document body (flattened)
  */
@@ -66,4 +79,4 @@ declare function getSectionCount(body: document_d_exports.DocumentBody): number;
  */
 declare function hasTemplateVariables(body: document_d_exports.DocumentBody): boolean;
 //#endregion
-export { extractAllTemplateVariables, extractTemplateVariables, getAllParagraphs, getAllTables, getCharacterCount, getDocumentText, getParagraphCount, getSectionCount, getWordCount, hasTemplateVariables, parseDocumentBody };
+export { extractAllTemplateVariables, extractTemplateVariables, getAllParagraphs, getAllTables, getCharacterCount, getDocumentText, getParagraphCount, getSectionCount, getWordCount, hasTemplateVariables, parseDocumentBody, parseDocumentBodyTree };

package/dist/docx/documentParser.js

@@ -151,9 +151,22 @@ function parseDocumentBackground(documentEl, context) {
 * @returns DocumentBody with content, sections, and template variables
 */
 function parseDocumentBody(xml, styles = null, theme = null, numbering = null, rels = null, media = null, context, previews = standalonePreviewLedger()) {
+	if (!xml) return { content: [] };
+	return parseDocumentBodyTree({
+		doc: parseXml(xml),
+		styles,
+		theme,
+		numbering,
+		rels,
+		media,
+		context,
+		previews
+	});
+}
+/** Consume the same tree the import identity pass repaired. */
+const parseDocumentBodyTree = ({ doc, styles, theme, numbering, rels, media, context, previews }) => {
 	const result = { content: [] };
-	if (!xml) return result;
-	const documentEl = (parseXml(xml).elements ?? []).find((el) => el.type === "element" && getLocalName(el.name ?? "") === "document");
+	const documentEl = (doc.elements ?? []).find((el) => el.type === "element" && getLocalName(el.name ?? "") === "document");
 	if (!documentEl) return result;
 	const background = parseDocumentBackground(documentEl, context);
 	if (background !== void 0) result.background = background;
@@ -169,7 +182,7 @@ function parseDocumentBody(xml, styles = null, theme = null, numbering = null, r
 	canonicalizeLeadingBodySectionProperties(bodyEl, result);
 	result.sections = buildSections(result.content, result.finalSectionProperties);
 	return result;
-}
+};
 /**
 * Get all paragraphs from document body (flattened)
 */
@@ -290,4 +303,4 @@ function hasTemplateVariables(body) {
 	return extractAllTemplateVariables(body.content).length > 0;
 }
 //#endregion
-export { extractAllTemplateVariables, extractTemplateVariables, getAllParagraphs, getAllTables, getCharacterCount, getDocumentText, getParagraphCount, getSectionCount, getWordCount, hasTemplateVariables, parseDocumentBody };
+export { extractAllTemplateVariables, extractTemplateVariables, getAllParagraphs, getAllTables, getCharacterCount, getDocumentText, getParagraphCount, getSectionCount, getWordCount, hasTemplateVariables, parseDocumentBody, parseDocumentBodyTree };

package/dist/docx/drawingIdNormalization.js

@@ -4,6 +4,7 @@ import { toTransitionalNamespaceUri } from "./transitionalSpelling.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, getLocalName, getNamespaceUri, parseXml } from "./xmlParser.js";
 import { panic } from "better-result";
+import { assertValidOoxmlNumericId, isValidOoxmlNumericId } from "@stll/docx-core";
 //#region src/docx/drawingIdNormalization.ts
 const GENERATED_DRAWING_ID_START = 1e5;
 const isDetachedRawDrawing = (drawing) => drawing?.rawXml !== void 0 && isNewDataUrlDrawing(drawing);
@@ -27,7 +28,7 @@ const drawingXmlWithoutIdentity = (xml) => reassignRawDrawingId({
 	xml,
 	id: "0"
 }) ?? xml;
-const needsGeneratedId = ({ id }) => id === void 0 || id === "" || id === "0";
+const needsGeneratedId = ({ id }) => id === void 0 || !isValidOoxmlNumericId(id, "unsigned32");
 const normalizeDrawingIds = (surfaces) => {
 	const entries = [];
 	visitDocxParagraphs(surfaces, (paragraph) => {
@@ -48,22 +49,36 @@ const normalizeDrawingIds = (surfaces) => {
 			}
 		});
 	});
-	const usedIds = new Set(entries.flatMap(({ drawing, rawDrawing }) => needsGeneratedId(drawing) || isDetachedRawDrawing(rawDrawing) ? [] : [drawing.id]));
+	const usedIds = new Set(entries.flatMap(({ drawing, rawDrawing }) => needsGeneratedId(drawing) || isDetachedRawDrawing(rawDrawing) ? [] : [Number(drawing.id)]));
 	let nextId = GENERATED_DRAWING_ID_START;
 	for (const { drawing, generateWhenMissing } of entries) {
 		if (!generateWhenMissing || !needsGeneratedId(drawing)) continue;
-		while (usedIds.has(String(nextId))) nextId += 1;
+		while (usedIds.has(nextId)) nextId += 1;
+		assertValidOoxmlNumericId({
+			value: nextId,
+			domain: "unsigned32",
+			partPath: "drawing normalization",
+			elementName: "docPr",
+			attributeName: "id"
+		});
 		drawing.id = String(nextId);
-		usedIds.add(drawing.id);
+		usedIds.add(nextId);
 		nextId += 1;
 	}
 	for (const { drawing, rawDrawing } of entries) {
 		if (!isDetachedRawDrawing(rawDrawing)) continue;
-		if (!needsGeneratedId(drawing) && !usedIds.has(drawing.id)) {
-			usedIds.add(drawing.id);
+		if (!needsGeneratedId(drawing) && !usedIds.has(Number(drawing.id))) {
+			usedIds.add(Number(drawing.id));
 			continue;
 		}
-		while (usedIds.has(String(nextId))) nextId += 1;
+		while (usedIds.has(nextId)) nextId += 1;
+		assertValidOoxmlNumericId({
+			value: nextId,
+			domain: "unsigned32",
+			partPath: "drawing normalization",
+			elementName: "docPr",
+			attributeName: "id"
+		});
 		const sourceXml = rawDrawing.rawXml;
 		if (sourceXml === void 0) panic("Detached raw drawing must retain its XML.");
 		const rawXml = reassignRawDrawingId({
@@ -73,7 +88,7 @@ const normalizeDrawingIds = (surfaces) => {
 		if (rawXml === null) panic("Detached raw drawing must contain wp:docPr.");
 		drawing.id = String(nextId);
 		rawDrawing.rawXml = rawXml;
-		usedIds.add(drawing.id);
+		usedIds.add(nextId);
 		nextId += 1;
 	}
 };