@stll/folio-core 0.61.0 → 0.63.0

package/dist/content-controls/mutateContentControls.d.ts

@@ -4,8 +4,8 @@ import { ContentControlFilter } from "./findContentControls.js";
 type ForceOption = {
   force?: boolean;
 };
-type SetContentControlContentInput = string | document_d_exports.BlockContent[];
-type SetContentControlValueInput = {
+export type SetContentControlContentInput = string | document_d_exports.BlockContent[];
+export type SetContentControlValueInput = {
   kind: "dropdown";
   value: string;
 } | {
@@ -15,6 +15,17 @@ type SetContentControlValueInput = {
   kind: "date";
   date: string;
 };
+/**
+ * Refuse content mutations (setContentControlContent /
+ * setContentControlValue) when `w:lock` forbids them.
+ *
+ * Per OOXML §17.5.2.16:
+ * - `contentLocked` blocks content edits but allows the container to be
+ *   removed.
+ * - `sdtContentLocked` blocks both.
+ * - `sdtLocked` blocks only container removal, NOT content edits.
+ */
+export declare const isContentLocked: (lock: document_d_exports.SdtProperties["lock"]) => lock is "contentLocked" | "sdtContentLocked";
 /**
  * Replace a control's inner content. Plain text becomes one paragraph; an
  * explicit `BlockContent[]` is deep-cloned to preserve immutability. The
@@ -31,20 +42,20 @@ type SetContentControlValueInput = {
  * same session; persisting requires extending the selective-save layer
  * to re-serialize note parts.
  */
-declare function setContentControlContent(doc: document_d_exports.Document, filter: ContentControlFilter, input: SetContentControlContentInput, options?: ForceOption): document_d_exports.Document;
+export declare function setContentControlContent(doc: document_d_exports.Document, filter: ContentControlFilter, input: SetContentControlContentInput, options?: ForceOption): document_d_exports.Document;
 /**
  * Set a structured value on a typed control. Dropdown / checkbox / date
  * each get their own input shape so the input is type-checked at the
  * call site.
  */
-declare function setContentControlValue(doc: document_d_exports.Document, filter: ContentControlFilter, input: SetContentControlValueInput, options?: ForceOption): document_d_exports.Document;
+export declare function setContentControlValue(doc: document_d_exports.Document, filter: ContentControlFilter, input: SetContentControlValueInput, options?: ForceOption): document_d_exports.Document;
 /**
  * Remove a control. With `{ keepContent: true }` the inner blocks survive
  * in-place; otherwise the control and its children are dropped. Refuses to
  * unwrap a `w15:repeatingSection` (would orphan w15 row items).
  */
-declare function removeContentControl(doc: document_d_exports.Document, filter: ContentControlFilter, options?: ForceOption & {
+export declare function removeContentControl(doc: document_d_exports.Document, filter: ContentControlFilter, options?: ForceOption & {
   keepContent?: boolean;
 }): document_d_exports.Document;
 //#endregion
-export { SetContentControlContentInput, SetContentControlValueInput, removeContentControl, setContentControlContent, setContentControlValue };
+export {};

package/dist/content-controls/mutateContentControls.js

@@ -78,10 +78,11 @@ function throwLocked(control, lock) {
 * - `sdtContentLocked` blocks both.
 * - `sdtLocked` blocks only container removal, NOT content edits.
 */
+const isContentLocked = (lock) => lock === "contentLocked" || lock === "sdtContentLocked";
 function ensureContentNotLocked(control, force) {
 	if (force) return;
 	const lock = control.properties.lock;
-	if (lock === "contentLocked" || lock === "sdtContentLocked") throwLocked(control, lock);
+	if (isContentLocked(lock)) throwLocked(control, lock);
 }
 /**
 * Refuse container removal (removeContentControl) when `w:lock` forbids it.
@@ -388,4 +389,4 @@ function removeContentControl(doc, filter, options = {}) {
 	return withUpdatedBodyAndNotes(doc, nextContent, applyMatchToNotes(doc, match));
 }
 //#endregion
-export { removeContentControl, setContentControlContent, setContentControlValue };
+export { isContentLocked, removeContentControl, setContentControlContent, setContentControlValue };

package/dist/controller/activeEditorStory.d.ts

@@ -1,6 +1,6 @@
 import { EditorView } from "prosemirror-view";
 //#region src/controller/activeEditorStory.d.ts
-type ActiveEditorStoryTarget = {
+export type ActiveEditorStoryTarget = {
   type: "note";
   view: EditorView;
 } | {
@@ -13,7 +13,7 @@ type ActiveEditorStoryTarget = {
   type: "none";
   view: null;
 };
-type ActiveEditorStoryCandidates = {
+export type ActiveEditorStoryCandidates = {
   bodyView: EditorView | null;
   headerFooterView: EditorView | null;
   noteView: EditorView | null;
@@ -26,6 +26,5 @@ type ActiveEditorStoryCandidates = {
  * adapters from sending formatting, focus, or history commands to a story
  * hidden behind another active editor surface during an async UI transition.
  */
-declare const resolveActiveEditorStory: ({ bodyView, headerFooterView, noteView }: ActiveEditorStoryCandidates) => ActiveEditorStoryTarget;
-//#endregion
-export { ActiveEditorStoryCandidates, ActiveEditorStoryTarget, resolveActiveEditorStory };
+export declare const resolveActiveEditorStory: ({ bodyView, headerFooterView, noteView }: ActiveEditorStoryCandidates) => ActiveEditorStoryTarget;
+//#endregion

package/dist/controller/canonicalClipboard.d.ts

@@ -5,7 +5,7 @@ import { EditorState } from "prosemirror-state";
 import { Result } from "better-result";
 //#region src/controller/canonicalClipboard.d.ts
 /** Imported comments and notes require copying their source story parts. */
-declare const canonicalClipboardStoryPartRefusal: (paragraph: document_d_exports.Paragraph) => CanonicalSessionError | undefined;
+export declare const canonicalClipboardStoryPartRefusal: (paragraph: document_d_exports.Paragraph) => CanonicalSessionError | undefined;
 /** Clipboard slices are input payloads; their paragraph identities and private captures are not owners. */
 type PrepareCanonicalPasteOptions = {
   session: CanonicalSession;
@@ -20,6 +20,6 @@ type PrepareCanonicalPasteOptions = {
     to: number;
   };
 };
-declare const prepareCanonicalPaste: ({ session, state, slice, plain, moveTarget, pasteTarget, sourceDocument, moveSource }: PrepareCanonicalPasteOptions) => Result<CanonicalCommit, CanonicalSessionError>;
+export declare const prepareCanonicalPaste: ({ session, state, slice, plain, moveTarget, pasteTarget, sourceDocument, moveSource }: PrepareCanonicalPasteOptions) => Result<CanonicalCommit, CanonicalSessionError>;
 //#endregion
-export { canonicalClipboardStoryPartRefusal, prepareCanonicalPaste };
+export {};

package/dist/controller/canonicalClipboard.js

@@ -15,6 +15,7 @@ import { CanonicalSessionError } from "./canonicalSession.js";
 import { Result } from "better-result";
 import { NUMBER_FORMATS, paragraphNumberingReference, relationshipIdOf } from "@stll/docx-core/model";
 import { Fragment, Slice } from "prosemirror-model";
+import { CellSelection } from "prosemirror-tables";
 import { packageResourcesOpOf } from "@stll/docx-core/ops";
 //#region src/controller/canonicalClipboard.ts
 const refuse = (message) => Result.err(new CanonicalSessionError({
@@ -24,7 +25,7 @@ const refuse = (message) => Result.err(new CanonicalSessionError({
 }));
 const IMAGE_RELATIONSHIP = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
 const HYPERLINK_RELATIONSHIP = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
-const MAX_CLIPBOARD_IMAGE_BYTES = 16 * 1024 * 1024;
+const MAX_CLIPBOARD_IMAGE_BYTES = 16777216;
 const isNumberFormat = (format) => NUMBER_FORMATS.some((value) => value === format);
 const numberFormatFields = (format) => {
 	if (isNumberFormat(format)) return { numFmt: format };
@@ -230,6 +231,7 @@ const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarge
 		paragraphs.push(paragraph);
 	}
 	if (moveTarget === void 0 && (plain || sourceDocument === void 0)) flattenClipboardStyleReferences(paragraphs);
+	if (state.selection instanceof CellSelection) return refuse("Pasting over selected cells requires a per-cell paste operation.");
 	const selectionRange = canonicalSelectionRange(state);
 	const from = session.projection.addressAt(pasteTarget ?? moveSource?.from ?? selectionRange.from);
 	if (from.isErr()) return from;

package/dist/controller/canonicalClipboardResources.d.ts

@@ -3,7 +3,7 @@ import { Result } from "better-result";
 import { DocumentOpRefusal } from "@stll/docx-core/ops";
 //#region src/controller/canonicalClipboardResources.d.ts
 /** Normalized HTML states effective CSS; foreign style names carry no package ownership. */
-declare const flattenClipboardStyleReferences: (paragraphs: readonly document_d_exports.Paragraph[]) => void;
+export declare const flattenClipboardStyleReferences: (paragraphs: readonly document_d_exports.Paragraph[]) => void;
 type ImportClipboardStylesOptions = {
   destination: document_d_exports.Document;
   source: document_d_exports.Document;
@@ -16,6 +16,6 @@ type ImportedClipboardStyles = {
   numberingIds: ReadonlySet<number>;
 };
 /** Import the transitive style/numbering dependencies of the clipboard, retaining destination defaults. */
-declare const importClipboardStyles: ({ destination, source, paragraphs }: ImportClipboardStylesOptions) => Result<ImportedClipboardStyles, DocumentOpRefusal>;
+export declare const importClipboardStyles: ({ destination, source, paragraphs }: ImportClipboardStylesOptions) => Result<ImportedClipboardStyles, DocumentOpRefusal>;
 //#endregion
-export { flattenClipboardStyleReferences, importClipboardStyles };
+export {};

package/dist/controller/canonicalClipboardResources.js

@@ -93,12 +93,13 @@ const lowerSourceTheme = ({ value, source }) => {
 			unavailable = `The source package does not resolve theme colour ${item}.`;
 			return;
 		}
-		const resolved = resolveColorToHex({
+		const color = {
 			themeColor: item,
 			...typeof rgb === "string" ? { rgb } : {},
 			...typeof tint === "string" ? { themeTint: tint } : {},
 			...typeof shade === "string" ? { themeShade: shade } : {}
-		}, source.package.theme);
+		};
+		const resolved = resolveColorToHex(color, source.package.theme);
 		if (resolved === void 0) {
 			unavailable = `The source package does not resolve theme colour ${item}.`;
 			return;

package/dist/controller/canonicalComments.d.ts

@@ -4,11 +4,11 @@ import { Comment } from "../types/content.js";
 import { CreateCommentOp, DocumentOp } from "@stll/docx-core/ops";
 //#region src/controller/canonicalComments.d.ts
 declare const CanonicalCommentError_base: import("better-result").TaggedErrorClass<"CanonicalCommentError">;
-declare class CanonicalCommentError extends CanonicalCommentError_base<{
+export declare class CanonicalCommentError extends CanonicalCommentError_base<{
   message: string;
   gap: typeof CANONICAL_GAP.comments;
 }> {}
-type CanonicalCommentCommand = {
+export type CanonicalCommentCommand = {
   type: "create";
   comment: CreateCommentOp["comment"];
   anchor: CreateCommentOp["anchor"];
@@ -31,11 +31,11 @@ type CompileCanonicalCommentsOptions = {
   document: document_d_exports.Document;
   command: CanonicalCommentCommand;
 };
-declare const compileCanonicalComments: ({ document, command }: CompileCanonicalCommentsOptions) => import("better-result").Err<never, CanonicalCommentError> | import("better-result").Ok<{
+export declare const compileCanonicalComments: ({ document, command }: CompileCanonicalCommentsOptions) => import("better-result").Err<never, CanonicalCommentError> | import("better-result").Ok<{
   ops: DocumentOp[];
   document: document_d_exports.Document;
   commentId: number | undefined;
 }, never>;
-declare const canonicalCommentBody: (document: document_d_exports.Document, text: string) => Comment["content"];
+export declare const canonicalCommentBody: (document: document_d_exports.Document, text: string) => Comment["content"];
 //#endregion
-export { CanonicalCommentCommand, CanonicalCommentError, canonicalCommentBody, compileCanonicalComments };
+export {};

package/dist/controller/canonicalComposition.d.ts

@@ -43,7 +43,7 @@ type CompositionFinish = {
   text: string | null;
 };
 /** Native IME owns the provisional view; the captured canonical projection stays unchanged. */
-declare const createCanonicalComposition: (options: CompositionOptions) => {
+export declare const createCanonicalComposition: (options: CompositionOptions) => {
   readonly status: CompositionState["type"];
   readonly active: boolean;
   matchesCancellationRange: (view: EditorView, range: {
@@ -63,4 +63,4 @@ declare const createCanonicalComposition: (options: CompositionOptions) => {
   accept: (view: EditorView, transaction: Transaction) => boolean;
 };
 //#endregion
-export { createCanonicalComposition };
+export {};

package/dist/controller/canonicalComposition.js

@@ -253,20 +253,17 @@ const createCanonicalComposition = (options) => {
 						}
 					};
 					break;
-				case "refused":
-					state = {
-						type: "refused",
-						baseline: state.baseline,
-						view: state.view,
-						phase: {
-							type: "ended",
-							data,
-							completion: state.phase.completion
-						},
-						text: state.text
-					};
-					break;
-				default:
+				case "refused": state = {
+					type: "refused",
+					baseline: state.baseline,
+					view: state.view,
+					phase: {
+						type: "ended",
+						data,
+						completion: state.phase.completion
+					},
+					text: state.text
+				};
 			}
 			schedule(view);
 		},

package/dist/controller/canonicalInlineProjection.d.ts

@@ -2,7 +2,7 @@ import { document_d_exports } from "../types/document.js";
 import { Node } from "prosemirror-model";
 import { Result } from "better-result";
 //#region src/controller/canonicalInlineProjection.d.ts
-declare const CANONICAL_SOURCE_INLINE_POLICIES: {
+export declare const CANONICAL_SOURCE_INLINE_POLICIES: {
   readonly run: "container";
   readonly hyperlink: "container";
   readonly insertion: "container";
@@ -40,9 +40,10 @@ declare const CANONICAL_SOURCE_INLINE_POLICIES: {
   readonly drawing: "leaf";
   readonly shape: "leaf";
 };
-declare const CANONICAL_NATIVE_INLINE_POLICIES: {
+export declare const CANONICAL_NATIVE_INLINE_POLICIES: {
   readonly text: "text";
   readonly bookmarkBoundary: "markers";
+  readonly commentRangeBoundary: "markers";
   readonly moveRangeBoundary: "markers";
   readonly rangeAnchor: "markers";
   readonly noteMarker: "noteMarker";
@@ -66,7 +67,7 @@ declare class InlineProjectionError extends InlineProjectionError_base<{
   message: string;
 }> {}
 /** Every source variant makes a decision before conversion can discard its positions. */
-declare const canonicalInlineSourceIssue: (items: readonly (document_d_exports.ParagraphContent | document_d_exports.RunContent)[], context?: "paragraph" | "fieldPayload") => string | null;
+export declare const canonicalInlineSourceIssue: (items: readonly (document_d_exports.ParagraphContent | document_d_exports.RunContent)[], context?: "paragraph" | "fieldPayload") => string | null;
 type NativeCell = {
   type: "text";
   text: string;
@@ -93,8 +94,8 @@ type NativeCell = {
   node: Node;
 };
 /** Native positions and deletion geometry read the same inline-cell classification. */
-declare const canonicalNativeCells: (paragraph: Node) => Result<NativeCell[], InlineProjectionError>;
-type CanonicalInlineGap = {
+export declare const canonicalNativeCells: (paragraph: Node) => Result<NativeCell[], InlineProjectionError>;
+export type CanonicalInlineGap = {
   position: number;
   zeroWidthBefore: number;
 };
@@ -113,6 +114,6 @@ type CanonicalInlineProjectionArgs = {
   };
 };
 /** Bind rendered gaps to the operation owner's source leaf ordinals, including collapsed pairs. */
-declare const projectCanonicalInline: ({ source, paragraph, pairedBookmarkIds, commentContext }: CanonicalInlineProjectionArgs) => Result<InlineProjection, InlineProjectionError>;
+export declare const projectCanonicalInline: ({ source, paragraph, pairedBookmarkIds, commentContext }: CanonicalInlineProjectionArgs) => Result<InlineProjection, InlineProjectionError>;
 //#endregion
-export { CANONICAL_NATIVE_INLINE_POLICIES, CANONICAL_SOURCE_INLINE_POLICIES, CanonicalInlineGap, canonicalInlineSourceIssue, canonicalNativeCells, projectCanonicalInline };
+export {};

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",
@@ -103,7 +106,6 @@ const canonicalInlineSourceIssue = (items, context = "paragraph") => {
 			if (issue !== null) return issue;
 			break;
 		}
-		default:
 	}
 	return null;
 };
@@ -195,6 +197,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 +274,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 +294,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 +306,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 +328,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 +390,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 +410,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 +435,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 +465,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,7 @@
 //#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) => {
+export declare const normalizeCanonicalListRendering: (document: import("@stll/docx-core").Document) => {
   document: import("@stll/docx-core").Document;
   inverse: import("@stll/docx-core/ops").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 };