@stll/folio-core 0.62.0 → 0.63.1

package/dist/controller/canonicalInlineProjection.js

@@ -1,7 +1,9 @@
 import { readNoteMarkerAttrs } from "../internal/noteMarkerAttrs.js";
 import { readCommentMarkAttrs, readFootnoteRefMarkAttrs, readPreservedXmlAttrs } from "../prosemirror/attrs/index.js";
 import { bookmarkMarkerFromAttrs, readBookmarkBoundaryAttrs } from "../prosemirror/bookmarkBoundaryAttrs.js";
+import { readCommentRangeBoundaryAttrs } from "../prosemirror/commentRangeBoundaryAttrs.js";
 import { HYPHEN_TEXT_CARRIERS } from "../prosemirror/conversion/hyphenTextCarriers.js";
+import "../prosemirror/extensions/nodes/CommentRangeBoundaryExtension.js";
 import { readMoveRangeBoundaryAttrs } from "../prosemirror/moveRangeBoundaryAttrs.js";
 import { readRangeAnchorAttrs } from "../prosemirror/rangeAnchorAttrs.js";
 import { PRESERVED_XML_LEVELS } from "../prosemirror/schema/nodes.js";
@@ -50,6 +52,7 @@ const CANONICAL_SOURCE_INLINE_POLICIES = {
 const CANONICAL_NATIVE_INLINE_POLICIES = {
 	text: "text",
 	bookmarkBoundary: "markers",
+	commentRangeBoundary: "markers",
 	moveRangeBoundary: "markers",
 	rangeAnchor: "markers",
 	noteMarker: "noteMarker",
@@ -69,7 +72,8 @@ const CANONICAL_NATIVE_INLINE_POLICIES = {
 	sdt: "refused"
 };
 const nativePolicies = new Map(Object.entries(CANONICAL_NATIVE_INLINE_POLICIES));
-var InlineProjectionError = class extends TaggedError("InlineProjectionError") {};
+const InlineProjectionErrorBase = TaggedError("InlineProjectionError");
+var InlineProjectionError = class extends InlineProjectionErrorBase {};
 const refuse = (message) => Result.err(new InlineProjectionError({ message }));
 /** Every source variant makes a decision before conversion can discard its positions. */
 const canonicalInlineSourceIssue = (items, context = "paragraph") => {
@@ -103,7 +107,6 @@ const canonicalInlineSourceIssue = (items, context = "paragraph") => {
 			if (issue !== null) return issue;
 			break;
 		}
-		default:
 	}
 	return null;
 };
@@ -195,6 +198,19 @@ const canonicalNativeCells = (paragraph) => {
 						to,
 						node
 					});
+				} else if (node.type.name === "commentRangeBoundary") {
+					const attrs = readCommentRangeBoundaryAttrs(node);
+					if (!attrs.ok) {
+						issue = "Canonical editing requires valid comment range boundary attributes.";
+						return;
+					}
+					cells.push({
+						type: "zeroWidth",
+						sources: [attrs.value.marker],
+						from,
+						to,
+						node
+					});
 				} else {
 					const attrs = readRangeAnchorAttrs(node);
 					if (!attrs.ok) {
@@ -259,7 +275,6 @@ const canonicalNativeCells = (paragraph) => {
 			case void 0:
 				issue = `Canonical editing has no position mapping for inline ${node.type.name}.`;
 				return;
-			default:
 		}
 	});
 	return issue === void 0 ? Result.ok(cells) : refuse(issue);
@@ -280,7 +295,7 @@ const sameSourceMarker = (left, right) => {
 	}
 };
 /** Marks carry nonempty ranges; explicit range anchors carry empty ranges. */
-const commentMarkTransitions = ({ source, paragraph, commentContext }) => {
+const commentMarkTransitions = ({ source, paragraph, commentContext, explicitCommentIds }) => {
 	const spans = inlineLeafSpans(source.content);
 	const rangedIds = new Set(commentContext?.rangedIds);
 	const pointIds = new Set(commentContext?.pointIds);
@@ -292,7 +307,7 @@ const commentMarkTransitions = ({ source, paragraph, commentContext }) => {
 		if (node.type === "commentRangeEnd") finalIds.delete(node.id);
 	}
 	const transitions = /* @__PURE__ */ new Map();
-	let previous = new Set(commentContext?.openIds);
+	let previous = new Set([...commentContext?.openIds ?? []].filter((id) => !explicitCommentIds.has(id)));
 	let issue;
 	const record = (position, current) => {
 		const starts = new Set([...current].filter((id) => !previous.has(id)));
@@ -314,24 +329,32 @@ const commentMarkTransitions = ({ source, paragraph, commentContext }) => {
 				return;
 			}
 			const id = attrs.value.commentId;
-			if (rangedIds.has(id)) current.add(id);
-			else if (!pointIds.has(id)) {
+			if (rangedIds.has(id)) {
+				if (!explicitCommentIds.has(id)) current.add(id);
+			} else if (!pointIds.has(id)) {
 				issue = "Canonical editing cannot attribute a comment mark to its source.";
 				return;
 			}
 		}
 		record(position, current);
 	});
-	record(paragraph.content.size, finalIds);
+	record(paragraph.content.size, new Set([...finalIds].filter((id) => !explicitCommentIds.has(id))));
 	return issue === void 0 ? Result.ok(transitions) : refuse(issue);
 };
 /** Bind rendered gaps to the operation owner's source leaf ordinals, including collapsed pairs. */
 const projectCanonicalInline = ({ source, paragraph, pairedBookmarkIds, commentContext }) => {
 	const native = canonicalNativeCells(paragraph);
 	if (native.isErr()) return native;
+	const explicitCommentIds = /* @__PURE__ */ new Set();
+	for (const cell of native.value) {
+		if (cell.type !== "zeroWidth" || cell.node.type.name !== "commentRangeBoundary") continue;
+		for (const marker of cell.sources) if (marker.type === "commentRangeStart" || marker.type === "commentRangeEnd") explicitCommentIds.add(marker.id);
+	}
+	const openExplicitCommentIds = new Set([...commentContext?.openIds ?? []].filter((id) => explicitCommentIds.has(id)));
 	const comments = commentMarkTransitions({
 		source,
 		paragraph,
+		explicitCommentIds,
 		...commentContext === void 0 ? {} : { commentContext }
 	});
 	if (comments.isErr()) return comments;
@@ -368,7 +391,7 @@ const projectCanonicalInline = ({ source, paragraph, pairedBookmarkIds, commentC
 	for (const { node } of spans) {
 		if (node.type !== "commentRangeStart" && node.type !== "commentRangeEnd") continue;
 		const offsets = commentRangeOffsets.get(node.id);
-		if (!(offsets?.start !== void 0 && offsets.end !== void 0 && offsets.start === offsets.end) && markedCommentIds.has(node.id)) erasedCommentMarkers.add(node);
+		if (!(offsets?.start !== void 0 && offsets.end !== void 0 && offsets.start === offsets.end) && markedCommentIds.has(node.id) && !explicitCommentIds.has(node.id)) erasedCommentMarkers.add(node);
 	}
 	const text = paragraphLogicalText(source);
 	const boundaries = Array.from({ length: text.length + 1 }, () => []);
@@ -388,7 +411,7 @@ const projectCanonicalInline = ({ source, paragraph, pairedBookmarkIds, commentC
 	const consumeErasedLeaves = (position) => {
 		while (consumed === 0) {
 			const span = spans.at(index);
-			if (position !== null && span && (span.node.type === "commentRangeStart" || span.node.type === "commentRangeEnd")) {
+			if (position !== null && span && (span.node.type === "commentRangeStart" || span.node.type === "commentRangeEnd") && !explicitCommentIds.has(span.node.id)) {
 				const transition = comments.value.get(position);
 				if ((span.node.type === "commentRangeStart" ? transition?.starts : transition?.ends)?.delete(span.node.id)) {
 					index += 1;
@@ -413,12 +436,24 @@ const projectCanonicalInline = ({ source, paragraph, pairedBookmarkIds, commentC
 			offset: span.before.offset + consumed,
 			zeroWidthBefore: 0
 		});
+		if (cell.type !== "zeroWidth" && explicitCommentIds.size > 0) {
+			const coveredExplicitCommentIds = /* @__PURE__ */ new Set();
+			for (const mark of cell.node.marks) {
+				if (mark.type.name !== "comment") continue;
+				const attrs = readCommentMarkAttrs(mark);
+				if (!attrs.ok) return refuse("Canonical editing requires valid comment mark attributes.");
+				if (explicitCommentIds.has(attrs.value.commentId)) coveredExplicitCommentIds.add(attrs.value.commentId);
+			}
+			if (coveredExplicitCommentIds.size !== openExplicitCommentIds.size || [...coveredExplicitCommentIds].some((id) => !openExplicitCommentIds.has(id))) return refuse("Canonical comment marks do not match their explicit source boundaries.");
+		}
 		switch (cell.type) {
 			case "zeroWidth":
 				for (const marker of cell.sources) {
 					consumeErasedLeaves(null);
 					span = spans.at(index);
 					if (!span || consumed !== 0 || span.before.offset !== span.after.offset || !sameSourceMarker(span.node, marker)) return refuse(`Canonical editing cannot preserve ${marker.type} source boundary positions.`);
+					if (marker.type === "commentRangeStart" && explicitCommentIds.has(marker.id)) openExplicitCommentIds.add(marker.id);
+					if (marker.type === "commentRangeEnd" && explicitCommentIds.has(marker.id)) openExplicitCommentIds.delete(marker.id);
 					index += 1;
 				}
 				if (!span) return refuse("Canonical editing lost a source range boundary.");
@@ -431,35 +466,32 @@ const projectCanonicalInline = ({ source, paragraph, pairedBookmarkIds, commentC
 				index += 1;
 				addGap(cell.to, span.after);
 				break;
-			case "text":
-				for (let unit = 0; unit < cell.text.length; unit += 1) {
-					consumeErasedLeaves(cell.from + unit);
-					span = spans.at(index);
-					if (!span) return refuse("Canonical editing cannot map missing source text to native text positions.");
-					let value;
-					switch (span.node.type) {
-						case "text":
-							value = span.node.text;
-							break;
-						case "softHyphen":
-						case "noBreakHyphen":
-							value = HYPHEN_TEXT_CARRIERS[span.node.type];
-							break;
-						default: return refuse(`Canonical editing cannot map ${span.node.type} to native text positions.`);
-					}
-					if (value.charAt(consumed) !== cell.text.charAt(unit)) return refuse("Canonical editing cannot preserve the source text carrier.");
-					consumed += 1;
-					addGap(cell.from + unit + 1, {
-						offset: span.before.offset + consumed,
-						zeroWidthBefore: 0
-					});
-					if (consumed === value.length) {
-						index += 1;
-						consumed = 0;
-					}
+			case "text": for (let unit = 0; unit < cell.text.length; unit += 1) {
+				consumeErasedLeaves(cell.from + unit);
+				span = spans.at(index);
+				if (!span) return refuse("Canonical editing cannot map missing source text to native text positions.");
+				let value;
+				switch (span.node.type) {
+					case "text":
+						value = span.node.text;
+						break;
+					case "softHyphen":
+					case "noBreakHyphen":
+						value = HYPHEN_TEXT_CARRIERS[span.node.type];
+						break;
+					default: return refuse(`Canonical editing cannot map ${span.node.type} to native text positions.`);
 				}
-				break;
-			default:
+				if (value.charAt(consumed) !== cell.text.charAt(unit)) return refuse("Canonical editing cannot preserve the source text carrier.");
+				consumed += 1;
+				addGap(cell.from + unit + 1, {
+					offset: span.before.offset + consumed,
+					zeroWidthBefore: 0
+				});
+				if (consumed === value.length) {
+					index += 1;
+					consumed = 0;
+				}
+			}
 		}
 	}
 	consumeErasedLeaves(paragraph.content.size);

package/dist/controller/canonicalInput.d.ts

@@ -1,7 +1,7 @@
 import { EditorState, Transaction } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 //#region src/controller/canonicalInput.d.ts
-declare const CANONICAL_COMPOSITION_INPUT_TYPES: readonly ["insertCompositionText", "insertFromComposition", "deleteCompositionText", "deleteByComposition"];
+export declare const CANONICAL_COMPOSITION_INPUT_TYPES: readonly ["insertCompositionText", "insertFromComposition", "deleteCompositionText", "deleteByComposition"];
 type ReplaceTextInput = {
   from: number;
   to: number;
@@ -27,7 +27,7 @@ type CanonicalInputOptions = {
   refuse: (reason: string) => void;
 };
 /** Native changes require a preceding, classified input event at the same state. */
-declare const createCanonicalInputBoundary: (options: CanonicalInputOptions) => {
+export declare const createCanonicalInputBoundary: (options: CanonicalInputOptions) => {
   reset: () => void;
   readonly isComposing: boolean;
   acceptComposition: (view: EditorView, transaction: Transaction) => boolean;
@@ -51,4 +51,4 @@ declare const createCanonicalInputBoundary: (options: CanonicalInputOptions) =>
   commitNativeProposal: (view: EditorView, transaction: Transaction) => boolean;
 };
 //#endregion
-export { CANONICAL_COMPOSITION_INPUT_TYPES, createCanonicalInputBoundary };
+export {};

package/dist/controller/canonicalInput.js

@@ -146,9 +146,7 @@ const createCanonicalInputBoundary = (options) => {
 					case "i":
 						options.command("toggleItalic");
 						break;
-					case "u":
-						options.command("toggleUnderline");
-						break;
+					case "u": options.command("toggleUnderline");
 				}
 				return true;
 			}

package/dist/controller/canonicalInputTimer.d.ts

@@ -1,16 +1,15 @@
 import { EditorView } from "prosemirror-view";
 //#region src/controller/canonicalInputTimer.d.ts
 /** Shared by timer producers and browser diagnostics, regardless of bundling. */
-declare const CANONICAL_INPUT_TIMER_OWNER = "folio.canonical-input-timer";
+export declare const CANONICAL_INPUT_TIMER_OWNER = "folio.canonical-input-timer";
 /** Delay after native composition end before the canonical session settles it. */
-declare const CANONICAL_COMPOSITION_FLUSH_DELAY_MS = 25;
+export declare const CANONICAL_COMPOSITION_FLUSH_DELAY_MS = 25;
 /** Mark the scheduled wrapper, never the caller's potentially shared callback. */
-declare const setCanonicalInputTimer: (callback: () => void, delay: number) => NodeJS.Timeout;
+export declare const setCanonicalInputTimer: (callback: () => void, delay: number) => NodeJS.Timeout;
 /**
  * Run `retry` once the view's canonical composition has settled. The session
  * settles on an equal-delay timer armed at native composition end, so a retry
  * armed at or after that point runs after it. Returns a disposer.
  */
-declare const afterCanonicalCompositionSettles: (view: EditorView, retry: () => void) => (() => void);
-//#endregion
-export { CANONICAL_COMPOSITION_FLUSH_DELAY_MS, CANONICAL_INPUT_TIMER_OWNER, afterCanonicalCompositionSettles, setCanonicalInputTimer };
+export declare const afterCanonicalCompositionSettles: (view: EditorView, retry: () => void) => (() => void);
+//#endregion

package/dist/controller/canonicalListRendering.d.ts

@@ -1,8 +1,9 @@
+import { DocumentOp } from "./canonicalOperations.js";
+import { Document } from "@stll/docx-core";
 //#region src/controller/canonicalListRendering.d.ts
 /** Canonical edits share list model normalization with the headless projection. */
-declare const normalizeCanonicalListRendering: (document: import("@stll/docx-core").Document) => {
-  document: import("@stll/docx-core").Document;
-  inverse: import("@stll/docx-core/ops").DocumentOp[];
+export declare const normalizeCanonicalListRendering: (document: Document) => {
+  document: Document;
+  inverse: DocumentOp[];
 };
-//#endregion
-export { normalizeCanonicalListRendering };
+//#endregion

package/dist/controller/canonicalOperations.d.ts

@@ -1,22 +1,22 @@
 import { document_d_exports } from "../types/document.js";
 import { CreateHeaderFooterOp, DOCUMENT_OP_TYPES, DocumentOp, FormattingPatch, FormattingPatch as FormattingPatch$1, OpStory, RemoveHeaderFooterOp, SetSectionPropsOp, TextPosition } from "@stll/docx-core/ops";
 //#region src/controller/canonicalOperations.d.ts
-declare const canonicalFinalSectionIndex: (document: document_d_exports.Document) => number;
-declare const withCanonicalParagraphIds: (content: document_d_exports.BlockContent[], document: document_d_exports.Document) => document_d_exports.BlockContent[];
+export declare const canonicalFinalSectionIndex: (document: document_d_exports.Document) => number;
+export declare const withCanonicalParagraphIds: (content: document_d_exports.BlockContent[], document: document_d_exports.Document) => document_d_exports.BlockContent[];
 type CreateCanonicalHeaderFooterOptions = {
   document: document_d_exports.Document;
   position: "header" | "footer";
   referenceType: document_d_exports.HeaderFooterType;
   sectionIndex?: number;
 };
-declare const createCanonicalHeaderFooterOperation: ({ document, position, referenceType, sectionIndex }: CreateCanonicalHeaderFooterOptions) => CreateHeaderFooterOp;
+export declare const createCanonicalHeaderFooterOperation: ({ document, position, referenceType, sectionIndex }: CreateCanonicalHeaderFooterOptions) => CreateHeaderFooterOp;
 type RemoveCanonicalHeaderFooterOptions = {
   document: document_d_exports.Document;
   position: "header" | "footer";
   rId: string;
 };
 /** Remove each explicit binding, leaving inherited sections to inherit the remaining parts. */
-declare const removeCanonicalHeaderFooterOperations: ({ document, position, rId }: RemoveCanonicalHeaderFooterOptions) => RemoveHeaderFooterOp[];
-declare const createCanonicalSectionPropertiesOperation: (document: document_d_exports.Document, patch: FormattingPatch$1<document_d_exports.SectionProperties>) => SetSectionPropsOp;
+export declare const removeCanonicalHeaderFooterOperations: ({ document, position, rId }: RemoveCanonicalHeaderFooterOptions) => RemoveHeaderFooterOp[];
+export declare const createCanonicalSectionPropertiesOperation: (document: document_d_exports.Document, patch: FormattingPatch$1<document_d_exports.SectionProperties>) => SetSectionPropsOp;
 //#endregion
-export { DOCUMENT_OP_TYPES, type DocumentOp, type FormattingPatch, type OpStory, type TextPosition, canonicalFinalSectionIndex, createCanonicalHeaderFooterOperation, createCanonicalSectionPropertiesOperation, removeCanonicalHeaderFooterOperations, withCanonicalParagraphIds };
+export { DOCUMENT_OP_TYPES, type DocumentOp, type FormattingPatch, type OpStory, type TextPosition };

package/dist/controller/canonicalPublicOperations.d.ts

@@ -4,7 +4,7 @@ import { EditorState } from "prosemirror-state";
 import { OpStory } from "@stll/docx-core/ops";
 //#region src/controller/canonicalPublicOperations.d.ts
 /** A new public kind cannot bypass a canonical compiler/refusal decision. */
-declare const CANONICAL_PUBLIC_OPERATION_DISPOSITIONS: {
+export declare const CANONICAL_PUBLIC_OPERATION_DISPOSITIONS: {
   readonly replaceInBlock: "compile";
   readonly replaceRange: "compile";
   readonly replaceBlock: "compile";
@@ -17,24 +17,24 @@ declare const CANONICAL_PUBLIC_OPERATION_DISPOSITIONS: {
   readonly deleteBlock: "publicOps.unsupportedInline";
   readonly commentOnBlock: "compile";
   readonly commentOnRange: "compile";
-  readonly insertTable: "publicOps.tableProjection";
-  readonly insertSignatureTable: "publicOps.tableProjection";
-  readonly deleteTable: "publicOps.tableProjection";
-  readonly insertTableRow: "publicOps.tableProjection";
-  readonly deleteTableRow: "publicOps.tableProjection";
-  readonly insertTableColumn: "publicOps.tableProjection";
-  readonly deleteTableColumn: "publicOps.tableProjection";
-  readonly mergeTableCells: "publicOps.tableProjection";
-  readonly splitTableCell: "publicOps.tableProjection";
+  readonly insertTable: "publicOps.tableStructure";
+  readonly insertSignatureTable: "publicOps.tableStructure";
+  readonly deleteTable: "publicOps.tableStructure";
+  readonly insertTableRow: "publicOps.tableStructure";
+  readonly deleteTableRow: "publicOps.tableStructure";
+  readonly insertTableColumn: "publicOps.tableStructure";
+  readonly deleteTableColumn: "publicOps.tableStructure";
+  readonly mergeTableCells: "publicOps.tableStructure";
+  readonly splitTableCell: "publicOps.tableStructure";
 };
-type CanonicalPublicOperationOptions = Omit<ApplyFolioDocumentOperationsOptions, "view" | "createUndoHandle" | "createCommentId">;
+export type CanonicalPublicOperationOptions = Omit<ApplyFolioDocumentOperationsOptions, "view" | "createUndoHandle" | "createCommentId">;
 type CanonicalPublicOperationsOptions = {
   session: CanonicalSession;
   getState: (story: OpStory) => EditorState | null;
   publish: (commit: CanonicalCommit) => boolean;
 };
 /** Handles address isolated journal groups; no second document or PM history is retained. */
-declare class CanonicalPublicOperations {
+export declare class CanonicalPublicOperations {
   private readonly options;
   private readonly handles;
   private nextHandle;
@@ -45,4 +45,4 @@ declare class CanonicalPublicOperations {
   private resolve;
 }
 //#endregion
-export { CANONICAL_PUBLIC_OPERATION_DISPOSITIONS, CanonicalPublicOperationOptions, CanonicalPublicOperations };
+export {};

package/dist/controller/canonicalPublicOperations.js

@@ -26,15 +26,15 @@ const CANONICAL_PUBLIC_OPERATION_DISPOSITIONS = {
 	deleteBlock: CANONICAL_GAP.publicUnsupportedInline,
 	commentOnBlock: "compile",
 	commentOnRange: "compile",
-	insertTable: CANONICAL_GAP.publicTableProjection,
-	insertSignatureTable: CANONICAL_GAP.publicTableProjection,
-	deleteTable: CANONICAL_GAP.publicTableProjection,
-	insertTableRow: CANONICAL_GAP.publicTableProjection,
-	deleteTableRow: CANONICAL_GAP.publicTableProjection,
-	insertTableColumn: CANONICAL_GAP.publicTableProjection,
-	deleteTableColumn: CANONICAL_GAP.publicTableProjection,
-	mergeTableCells: CANONICAL_GAP.publicTableProjection,
-	splitTableCell: CANONICAL_GAP.publicTableProjection
+	insertTable: CANONICAL_GAP.publicTableStructure,
+	insertSignatureTable: CANONICAL_GAP.publicTableStructure,
+	deleteTable: CANONICAL_GAP.publicTableStructure,
+	insertTableRow: CANONICAL_GAP.publicTableStructure,
+	deleteTableRow: CANONICAL_GAP.publicTableStructure,
+	insertTableColumn: CANONICAL_GAP.publicTableStructure,
+	deleteTableColumn: CANONICAL_GAP.publicTableStructure,
+	mergeTableCells: CANONICAL_GAP.publicTableStructure,
+	splitTableCell: CANONICAL_GAP.publicTableStructure
 };
 const resolveComment = ({ operation, from, to }) => {
 	if ("comment" in operation && operation.comment !== void 0) return {
@@ -96,7 +96,8 @@ const compilePublicIntents = ({ document, intents, mode, author, date, nextRevis
 		nextRevisionId
 	});
 };
-var CanonicalPublicOperationResolutionError = class extends TaggedError("CanonicalPublicOperationResolutionError") {};
+const CanonicalPublicOperationResolutionErrorBase = TaggedError("CanonicalPublicOperationResolutionError");
+var CanonicalPublicOperationResolutionError = class extends CanonicalPublicOperationResolutionErrorBase {};
 const canonicalPublicStory = (story) => {
 	if (story === "main") return story;
 	switch (story.type) {
@@ -509,15 +510,13 @@ var CanonicalPublicOperations = class {
 				};
 				break;
 			case "mergeBlockWithNext": {
-				const body = this.options.session.document.package.document.content;
-				if (story !== "main") return refusal("unsupportedBlock", "Canonical public joins currently require the main story.");
-				const next = body.at(body.findIndex((block) => block.type === "paragraph" && block.paraId === blockId) + 1);
-				if (next?.type !== "paragraph" || !next.paraId) return refusal("missingBlock");
+				const next = projection.value.nextParagraphInContainer(blockId);
+				if (next === void 0) return refusal("missingBlock");
 				intent = {
 					type: "joinParagraphs",
 					story,
 					blockId,
-					nextBlockId: next.paraId
+					nextBlockId: next.blockId
 				};
 				break;
 			}

package/dist/controller/canonicalReview.d.ts

@@ -7,6 +7,6 @@ type ResolveCanonicalReviewRangeOptions = {
   resolution: "accept" | "reject";
 };
 /** Null delegates to the default session's ProseMirror review commands. */
-declare const resolveCanonicalReviewRange: ({ editor, from, to, resolution }: ResolveCanonicalReviewRangeOptions) => boolean | null;
+export declare const resolveCanonicalReviewRange: ({ editor, from, to, resolution }: ResolveCanonicalReviewRangeOptions) => boolean | null;
 //#endregion
-export { resolveCanonicalReviewRange };
+export {};

package/dist/controller/canonicalSelection.d.ts

@@ -13,6 +13,6 @@ type RestoreCanonicalSelectionOptions = {
   };
 };
 /** Restore the admitted selection kind after a canonical projection changes. */
-declare const restoreCanonicalSelection: ({ transaction, projection, selection, unavailable }: RestoreCanonicalSelectionOptions) => boolean;
+export declare const restoreCanonicalSelection: ({ transaction, projection, selection, unavailable }: RestoreCanonicalSelectionOptions) => boolean;
 //#endregion
-export { restoreCanonicalSelection };
+export {};

package/dist/controller/canonicalSelection.js

@@ -1,9 +1,24 @@
 import { panic } from "better-result";
+import { CellSelection } from "prosemirror-tables";
 import { AllSelection, NodeSelection, TextSelection } from "prosemirror-state";
 //#region src/controller/canonicalSelection.ts
 /** Restore the admitted selection kind after a canonical projection changes. */
 const restoreCanonicalSelection = ({ transaction, projection, selection, unavailable }) => {
 	switch (selection.type) {
+		case "cell": {
+			const anchor = projection.positionAt(selection.anchor);
+			const head = projection.positionAt(selection.head);
+			if (anchor.isErr() || head.isErr()) return false;
+			const cellPosition = (position) => {
+				const resolved = transaction.doc.resolve(position);
+				for (let depth = resolved.depth; depth > 0; depth--) if (resolved.node(depth).type.spec["tableRole"] === "cell") return resolved.before(depth);
+			};
+			const anchorCell = cellPosition(anchor.value);
+			const headCell = cellPosition(head.value);
+			if (anchorCell === void 0 || headCell === void 0) return false;
+			transaction.setSelection(CellSelection.create(transaction.doc, anchorCell, headCell));
+			return true;
+		}
 		case "inlineNode": {
 			const anchor = projection.positionAt(selection.anchor);
 			const head = projection.positionAt(selection.head);

package/dist/controller/canonicalSession.d.ts

@@ -4,30 +4,31 @@ import { CanonicalSaveSnapshot } from "../types/canonicalSave.js";
 import { CanonicalInlineGap } from "./canonicalInlineProjection.js";
 import { Node } from "prosemirror-model";
 import { EditorState, Transaction } from "prosemirror-state";
-import { Result } from "better-result";
+import { Err, Ok, Result, TaggedErrorClass } from "better-result";
 import { DocumentOp, EditorIntent, OpStory, TextPosition, TouchedBlocks } from "@stll/docx-core/ops";
 //#region src/controller/canonicalSession.d.ts
-declare const CanonicalSessionError_base: import("better-result").TaggedErrorClass<"CanonicalSessionError">;
-declare class CanonicalSessionError extends CanonicalSessionError_base<{
+declare const CanonicalSessionErrorBase: TaggedErrorClass<"CanonicalSessionError">;
+export declare class CanonicalSessionError extends CanonicalSessionErrorBase<{
   message: string;
   gap: CanonicalGap;
   reason: "refused" | "noChange";
 }> {}
-type CanonicalSelection = {
-  type: "text" | "inlineNode" | "all";
+export type CanonicalSelection = {
+  type: "text" | "inlineNode" | "cell" | "all";
   anchor: TextPosition;
   head: TextPosition;
 };
-type CanonicalOrigin = "input" | "undo" | "redo";
-type CanonicalSessionMode = {
+export type CanonicalOrigin = "input" | "undo" | "redo";
+export type CanonicalSessionMode = {
   type: "editing";
 } | {
   type: "suggesting";
   author: string;
 };
-declare const CANONICAL_PROJECTION_META = "folioCanonicalProjection";
+export declare const CANONICAL_PROJECTION_META = "folioCanonicalProjection";
 type ParagraphAddress = {
   blockId: string;
+  container: readonly document_d_exports.BlockContent[];
   start: number;
   text: string;
   boundaries: readonly (readonly CanonicalInlineGap[])[];
@@ -51,10 +52,11 @@ declare class CanonicalProjection {
   positionAt(address: TextPosition): Result<number, CanonicalSessionError>;
   selectionAt(state: EditorState): Result<CanonicalSelection, CanonicalSessionError>;
   paragraph(blockId: string): ParagraphAddress | undefined;
+  nextParagraphInContainer(blockId: string): ParagraphAddress | undefined;
 }
 /** Input intent, never projection-step adjacency, determines the journal partition. */
-type CanonicalInputSemantic = "typing" | "deleteBackward" | "deleteForward" | "paste" | "composition" | "replacement" | "structure";
-type CanonicalCommit = {
+export type CanonicalInputSemantic = "typing" | "deleteBackward" | "deleteForward" | "paste" | "composition" | "replacement" | "structure";
+export type CanonicalCommit = {
   transaction: Transaction;
   document: document_d_exports.Document;
   projection: CanonicalProjection;
@@ -67,14 +69,14 @@ type CanonicalCommit = {
   publish: () => Result<void, CanonicalSessionError>;
 };
 /** Metadata is descriptive; transaction identity and session version authorize mutations. */
-declare const isCanonicalProjectionTransaction: (transaction: Transaction, session: CanonicalSession) => boolean;
+export declare const isCanonicalProjectionTransaction: (transaction: Transaction, session: CanonicalSession) => boolean;
 type PublishCanonicalProjectionOptions = {
   state: EditorState;
   commit: CanonicalCommit;
   session: CanonicalSession;
 };
 /** The model publishes only after PM and every plugin accept its exact projection. */
-declare const publishCanonicalProjection: ({ state, commit, session }: PublishCanonicalProjectionOptions) => import("better-result").Err<never, CanonicalSessionError> | import("better-result").Ok<{
+export declare const publishCanonicalProjection: ({ state, commit, session }: PublishCanonicalProjectionOptions) => Err<never, CanonicalSessionError> | Ok<{
   state: EditorState;
   transactions: readonly Transaction[];
 }, never>;
@@ -118,11 +120,17 @@ declare class CanonicalSession {
   private readonly styles;
   constructor({ document, projection, styles }: CanonicalSessionSeedOptions);
   /** Render only the committed comment projection while provisional IME blocks document snapshots. */
-  getCommittedComments(): import("@stll/docx-core/model").Comment[];
+  getCommittedComments(): document_d_exports.Comment[];
   setMode(mode: CanonicalSessionMode): void;
   hasStyle(styleId: string): boolean;
   private advanceBlockId;
   private freshBlockId;
+  /**
+   * Paragraph identities for one prepared batch, one group per requested count;
+   * none matches a live or retired identity and no two groups overlap. Nothing is
+   * reserved until the batch applies, so a batch asks once for all its groups.
+   */
+  freshBlockIds(counts: readonly number[]): Result<string[][], CanonicalSessionError>;
   private intentMode;
   private intentNeedsIdentityIds;
   private rememberSources;
@@ -159,12 +167,12 @@ declare class CanonicalSession {
   prepareRedo(state: EditorState, story?: OpStory): Result<CanonicalCommit, CanonicalSessionError>;
   private stage;
 }
-declare const createCanonicalSession: (document: document_d_exports.Document, styles?: document_d_exports.StyleDefinitions | null) => Result<CanonicalSession, CanonicalSessionError>;
-declare const isCanonicalJoinBoundary: (state: EditorState, direction: "backward" | "forward") => boolean;
+export declare const createCanonicalSession: (document: document_d_exports.Document, styles?: document_d_exports.StyleDefinitions | null) => Result<CanonicalSession, CanonicalSessionError>;
+export declare const isCanonicalJoinBoundary: (state: EditorState, direction: "backward" | "forward") => boolean;
 /** Native character deletion consumes one whole visible grapheme. */
-declare const deletionRange: (state: EditorState, direction: "backward" | "forward") => Result<{
+export declare const deletionRange: (state: EditorState, direction: "backward" | "forward") => Result<{
   from: number;
   to: number;
 }, CanonicalSessionError>;
 //#endregion
-export { CANONICAL_PROJECTION_META, CanonicalCommit, CanonicalInputSemantic, CanonicalOrigin, type CanonicalProjection, CanonicalSelection, type CanonicalSession, CanonicalSessionError, CanonicalSessionMode, createCanonicalSession, deletionRange, isCanonicalJoinBoundary, isCanonicalProjectionTransaction, publishCanonicalProjection };
+export type { CanonicalProjection, CanonicalSession };