@stll/folio-core 0.62.0 → 0.63.1

package/dist/prosemirror/utils/extractTrackedChanges.d.ts

@@ -8,7 +8,7 @@ import { EditorState } from "prosemirror-state";
  *
  * @public
  */
-type TrackedChangeEntry = {
+export type TrackedChangeEntry = {
   /**
    * Revision shape. Inline shapes (`insertion`, `deletion`, `replacement`)
    * wrap text runs; the rest are structural revisions on node attrs.
@@ -80,7 +80,7 @@ type TrackedChangeEntry = {
  *
  * @public
  */
-type TrackedChangesResult = {
+export type TrackedChangesResult = {
   /** Tracked-change entries, sorted by document position, with adjacent same-revision entries merged. */
   entries: TrackedChangeEntry[];
   /**
@@ -103,6 +103,5 @@ type TrackedChangesResult = {
  *
  * @public
  */
-declare function extractTrackedChanges(state: EditorState | null): TrackedChangesResult;
-//#endregion
-export { TrackedChangeEntry, TrackedChangesResult, extractTrackedChanges };
+export declare function extractTrackedChanges(state: EditorState | null): TrackedChangesResult;
+//#endregion

package/dist/prosemirror/utils/findParagraphByParaId.d.ts

@@ -11,7 +11,7 @@ import { Node } from "prosemirror-model";
  *
  * Returns null if no textblock with that paraId exists.
  */
-declare const findParagraphByParaId: (doc: Node, paraId: string) => {
+export declare const findParagraphByParaId: (doc: Node, paraId: string) => {
   node: Node;
   from: number;
   to: number;
@@ -20,6 +20,5 @@ declare const findParagraphByParaId: (doc: Node, paraId: string) => {
  * Sugar over {@link findParagraphByParaId} when callers only need the
  * `from` position (e.g. to feed `scrollToPosition`).
  */
-declare const findStartPosForParaId: (doc: Node, paraId: string) => number | null;
-//#endregion
-export { findParagraphByParaId, findStartPosForParaId };
+export declare const findStartPosForParaId: (doc: Node, paraId: string) => number | null;
+//#endregion

package/dist/prosemirror/utils/tabCalculator.js

@@ -1,2 +1 @@
-import { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels } from "../../layout-engine/measure/tabCalculator.js";
-export { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels };
+export { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels } from "../../layout-engine/measure/tabCalculator.js";

package/dist/prosemirror/utils/visualLineNavigation.d.ts

@@ -16,7 +16,7 @@ type VisualLineStep = {
   pmPos: number;
 };
 /** @internal */
-type VisualLineState = {
+export type VisualLineState = {
   /**
    * Only describes the caret while it is still at `step.pmPos`. Any other move
    * (a click, a find result, an agent edit, typing) leaves the caret elsewhere,
@@ -26,13 +26,13 @@ type VisualLineState = {
   step: VisualLineStep | null;
 };
 /** @internal */
-declare function createVisualLineState(): VisualLineState;
+export declare function createVisualLineState(): VisualLineState;
 /** @internal */
-declare function getCaretClientX(container: HTMLElement, pmPos: number): number | null;
+export declare function getCaretClientX(container: HTMLElement, pmPos: number): number | null;
 /** @internal */
-declare function findLineElementAtPosition(container: HTMLElement, pmPos: number): HTMLElement | null;
+export declare function findLineElementAtPosition(container: HTMLElement, pmPos: number): HTMLElement | null;
 /** @internal */
-declare function findPositionOnLineAtClientX(lineEl: HTMLElement, clientX: number): number | null;
+export declare function findPositionOnLineAtClientX(lineEl: HTMLElement, clientX: number): number | null;
 /**
  * Handle PM ArrowUp / ArrowDown with visual-line awareness + sticky
  * X. Returns true if the event was handled and PM should not run
@@ -41,6 +41,6 @@ declare function findPositionOnLineAtClientX(lineEl: HTMLElement, clientX: numbe
  *
  * @internal
  */
-declare function handleVisualLineKeyDown(state: VisualLineState, view: EditorView, event: KeyboardEvent, container: HTMLElement | null): boolean;
+export declare function handleVisualLineKeyDown(state: VisualLineState, view: EditorView, event: KeyboardEvent, container: HTMLElement | null): boolean;
 //#endregion
-export { VisualLineState, createVisualLineState, findLineElementAtPosition, findPositionOnLineAtClientX, getCaretClientX, handleVisualLineKeyDown };
+export {};

package/dist/prosemirror/utils/visualLineNavigation.js

@@ -4,19 +4,6 @@ import { createTextStreamRange, descendantTextNodes, totalTextLength } from "../
 import { scrollEditorElementIntoView } from "../../paged-layout/editorScrollRoot.js";
 import { Selection, TextSelection } from "prosemirror-state";
 //#region src/prosemirror/utils/visualLineNavigation.ts
-/**
-* Visual line navigation helpers — implements Word/Google-Docs-style
-* ArrowUp / ArrowDown with sticky X across visual lines (not just
-* paragraphs). Lifted from packages/react/src/paged-editor/
-* useVisualLineNavigation.ts so both adapters share the algorithm.
-*
-* Frontend-agnostic: takes a `getContainer: () => HTMLElement | null`
-* callback and a mutable sticky-state object, returns the same
-* function quartet React's hook returns.
-*
-* @packageDocumentation
-* @internal
-*/
 const CONTENT_LINE_SELECTOR = ".layout-page-content .layout-line";
 const PM_SPAN_SELECTOR = "span[data-pm-start][data-pm-end]";
 /** @internal */
@@ -111,7 +98,8 @@ function findPositionOnLineAtClientX(lineEl, clientX) {
 			continue;
 		}
 		if (clientX >= rect.left && clientX <= rect.right) {
-			const textLength = totalTextLength(descendantTextNodes(spanEl));
+			const textNodes = descendantTextNodes(spanEl);
+			const textLength = totalTextLength(textNodes);
 			if (textLength === 0) return pmStart;
 			let lo = 0;
 			let hi = textLength;

package/dist/prosemirror/validation.d.ts

@@ -1,19 +1,18 @@
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/validation.d.ts
-type ProseMirrorDocumentValidationIssue = {
+export type ProseMirrorDocumentValidationIssue = {
   path: string;
   message: string;
 };
-type ValidateProseMirrorDocumentResult = {
+export type ValidateProseMirrorDocumentResult = {
   valid: boolean;
   issues: ProseMirrorDocumentValidationIssue[];
 };
-declare class ProseMirrorDocumentValidationError extends Error {
+export declare class ProseMirrorDocumentValidationError extends Error {
   readonly issues: ProseMirrorDocumentValidationIssue[];
   constructor(context: string, issues: ProseMirrorDocumentValidationIssue[]);
 }
-declare const validateProseMirrorDocument: (doc: Node) => ValidateProseMirrorDocumentResult;
-declare const assertValidProseMirrorDocument: (doc: Node, context: string) => void;
-declare const formatProseMirrorDocumentIssues: (issues: ProseMirrorDocumentValidationIssue[]) => string[];
-//#endregion
-export { ProseMirrorDocumentValidationError, ProseMirrorDocumentValidationIssue, ValidateProseMirrorDocumentResult, assertValidProseMirrorDocument, formatProseMirrorDocumentIssues, validateProseMirrorDocument };
+export declare const validateProseMirrorDocument: (doc: Node) => ValidateProseMirrorDocumentResult;
+export declare const assertValidProseMirrorDocument: (doc: Node, context: string) => void;
+export declare const formatProseMirrorDocumentIssues: (issues: ProseMirrorDocumentValidationIssue[]) => string[];
+//#endregion

package/dist/prosemirror/validation.js

@@ -1,12 +1,28 @@
 import { readNoteMarkerAttrs } from "../internal/noteMarkerAttrs.js";
 import { readBlockCustomXmlAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readInlineWrapperMarkAttrs, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readParagraphAttrs, readPreservedBlockAttrs, readPreservedXmlAttrs, readRunFormattingOverrideMarkAttrs, readRunIdentityMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
 import { readBookmarkBoundaryAttrs } from "./bookmarkBoundaryAttrs.js";
+import { readCommentRangeBoundaryAttrs } from "./commentRangeBoundaryAttrs.js";
 import { readCommentReferenceAttrs } from "./commentReferenceAttrs.js";
 import { fieldRequiresStructuredContent } from "./fieldRepresentation.js";
 import { readMoveRangeBoundaryAttrs } from "./moveRangeBoundaryAttrs.js";
 import { readRangeAnchorAttrs } from "./rangeAnchorAttrs.js";
+import { isRunContentInlineNodeName } from "./runContentProjection.js";
+import { RUN_FORMATTING_MARK_NAMES } from "./runFormattingMarkNames.js";
+import { RUN_IDENTITY_MARK_NAME } from "./runIdentity.js";
+import { PRESERVED_XML_LEVELS } from "./schema/nodes.js";
 import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
 //#region src/prosemirror/validation.ts
+const COMPLEX_FIELD_RESULT_MARK_NAMES = /* @__PURE__ */ new Set([
+	...RUN_FORMATTING_MARK_NAMES,
+	RUN_IDENTITY_MARK_NAME,
+	"runPropertyChange",
+	"footnoteRef"
+]);
+const hasUnsupportedComplexFieldResultContent = (node) => node.content.content.some((child) => {
+	if (child.type.name === "bookmarkBoundary") return false;
+	const preservedXmlAttrs = child.type.name === "preservedXml" ? readPreservedXmlAttrs(child) : void 0;
+	return preservedXmlAttrs?.ok && preservedXmlAttrs.value.level === PRESERVED_XML_LEVELS.inline || !isRunContentInlineNodeName(child.type.name) || child.marks.some((mark) => !COMPLEX_FIELD_RESULT_MARK_NAMES.has(mark.type.name));
+});
 var ProseMirrorDocumentValidationError = class extends Error {
 	issues;
 	constructor(context, issues) {
@@ -192,10 +208,14 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "commentReference":
 			appendAttrIssues(path, readCommentReferenceAttrs(node), issues);
 			return;
+		case "commentRangeBoundary":
+			appendAttrIssues(path, readCommentRangeBoundaryAttrs(node), issues);
+			return;
 		case "rangeAnchor":
 			appendAttrIssues(path, readRangeAnchorAttrs(node), issues);
 			return;
 		case "moveRangeBoundary":
+		case "blockMoveRangeBoundary":
 			appendAttrIssues(path, readMoveRangeBoundaryAttrs(node), issues);
 			return;
 		case "tab":
@@ -248,27 +268,22 @@ const validateNodeAttrs = (node, path, issues) => {
 				appendAttrIssues(path, fieldAttrs, issues);
 				if (fieldAttrs.ok) {
 					const hasStructuredHyperlink = node.content.content.some((child) => child.marks.some((mark) => mark.type.name === "hyperlink"));
-					const hasPageBreakCarrier = node.content.content.some((child) => child.type.name === "pageBreakRun");
-					if (fieldAttrs.value.fieldKind === "complex" && !hasPageBreakCarrier) issues.push({
+					if (!fieldRequiresStructuredContent(node.content.content)) issues.push({
 						path: `${path}.content`,
-						message: "Complex fields cannot contain structured result children."
+						message: "Structured fields require run metadata, distinct run marks or inline structure."
 					});
 					else if (fieldAttrs.value.fieldKind === "complex" && hasStructuredHyperlink) issues.push({
 						path: `${path}.content`,
 						message: "Complex field results cannot contain hyperlink content."
 					});
-					else if (!fieldRequiresStructuredContent(node.content.content)) issues.push({
+					else if (fieldAttrs.value.fieldKind === "complex" && hasUnsupportedComplexFieldResultContent(node)) issues.push({
 						path: `${path}.content`,
-						message: "Structured simple fields require non-text, hyperlink, wrapper or tracked content."
+						message: "Complex field results can contain only run-representable content."
 					});
 					node.forEach((child, _offset, index) => {
 						const childPath = `${path}.content[${index}]`;
 						const hasHyperlink = child.marks.some((mark) => mark.type.name === "hyperlink");
-						if (fieldAttrs.value.fieldKind === "complex" && child.type.name === "textBoxAnchor") issues.push({
-							path: childPath,
-							message: "Complex field results cannot contain text-box anchors."
-						});
-						else if (fieldAttrs.value.fieldKind === "complex" && child.type.name === "bookmarkBoundary") issues.push({
+						if (fieldAttrs.value.fieldKind === "complex" && child.type.name === "bookmarkBoundary") issues.push({
 							path: childPath,
 							message: "Complex field results cannot contain bookmark boundaries."
 						});

package/dist/prosemirror/yjsDocumentMetadata.d.ts

@@ -1,29 +1,30 @@
 import { Node } from "prosemirror-model";
-import { Result } from "better-result";
+import { Result, TaggedErrorClass } from "better-result";
 import * as Y from "yjs";
 //#region src/prosemirror/yjsDocumentMetadata.d.ts
+declare const FolioYjsAttrSchemaVersionErrorBase: TaggedErrorClass<"FolioYjsAttrSchemaVersionError">;
 /**
  * Carry a snapshot written under `version` forward to the next version,
  * rewriting the fragment in place and answering how many paragraphs changed.
  */
 type AttrSchemaMigrationStep = (fragment: Y.XmlFragment) => number;
 /** Every attr-schema version this build reads, oldest first, with no gaps. */
-declare const FOLIO_YJS_ATTR_SCHEMA_VERSIONS: readonly [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
+declare const FOLIO_YJS_ATTR_SCHEMA_VERSIONS: readonly [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14];
 /** An attr-schema version this build can read. */
-type FolioYjsAttrSchemaVersion = (typeof FOLIO_YJS_ATTR_SCHEMA_VERSIONS)[number];
+export type FolioYjsAttrSchemaVersion = (typeof FOLIO_YJS_ATTR_SCHEMA_VERSIONS)[number];
 /**
  * The attr-schema version this build writes. Derived against the migration map
  * so the constant and the map cannot disagree.
  */
-declare const FOLIO_YJS_ATTR_SCHEMA_VERSION = 13;
-declare const FolioYjsNoteReferenceSchemaError_base: import("better-result").TaggedErrorClass<"FolioYjsNoteReferenceSchemaError">;
-declare class FolioYjsNoteReferenceSchemaError extends FolioYjsNoteReferenceSchemaError_base<{
+export declare const FOLIO_YJS_ATTR_SCHEMA_VERSION: 14;
+declare const FolioYjsNoteReferenceSchemaErrorBase: TaggedErrorClass<"FolioYjsNoteReferenceSchemaError">;
+export declare class FolioYjsNoteReferenceSchemaError extends FolioYjsNoteReferenceSchemaErrorBase<{
   message: string;
   schemaVersion: FolioYjsAttrSchemaVersion;
   requiredSchemaVersion: FolioYjsAttrSchemaVersion;
 }> {}
-declare const FolioYjsNumberingSourceSchemaError_base: import("better-result").TaggedErrorClass<"FolioYjsNumberingSourceSchemaError">;
-declare class FolioYjsNumberingSourceSchemaError extends FolioYjsNumberingSourceSchemaError_base<{
+declare const FolioYjsNumberingSourceSchemaErrorBase: TaggedErrorClass<"FolioYjsNumberingSourceSchemaError">;
+export declare class FolioYjsNumberingSourceSchemaError extends FolioYjsNumberingSourceSchemaErrorBase<{
   message: string;
   schemaVersion: FolioYjsAttrSchemaVersion;
   requiredSchemaVersion: FolioYjsAttrSchemaVersion;
@@ -33,7 +34,7 @@ declare class FolioYjsNumberingSourceSchemaError extends FolioYjsNumberingSource
  * {@link FOLIO_YJS_ATTR_SCHEMA_VERSION}, in order. Empty when the snapshot is
  * already current.
  */
-declare const attrSchemaMigrationSteps: (fromVersion: FolioYjsAttrSchemaVersion) => readonly AttrSchemaMigrationStep[];
+export declare const attrSchemaMigrationSteps: (fromVersion: FolioYjsAttrSchemaVersion) => readonly AttrSchemaMigrationStep[];
 /**
  * Carry a fragment this build is about to read or write up to the attr shape
  * this build writes, and stamp the marker.
@@ -48,10 +49,9 @@ declare const attrSchemaMigrationSteps: (fromVersion: FolioYjsAttrSchemaVersion)
  *
  * Returns how many elements the steps rewrote.
  */
-declare const applyAttrSchemaMigrations: (ydoc: Y.Doc, fragment: Y.XmlFragment, fromVersion: FolioYjsAttrSchemaVersion) => number;
-declare const FolioYjsAttrSchemaVersionError_base: import("better-result").TaggedErrorClass<"FolioYjsAttrSchemaVersionError">;
+export declare const applyAttrSchemaMigrations: (ydoc: Y.Doc, fragment: Y.XmlFragment, fromVersion: FolioYjsAttrSchemaVersion) => number;
 /** Raised when a snapshot's attr-schema marker is ahead of the running code. */
-declare class FolioYjsAttrSchemaVersionError extends FolioYjsAttrSchemaVersionError_base<{
+export declare class FolioYjsAttrSchemaVersionError extends FolioYjsAttrSchemaVersionErrorBase<{
   message: string;
   /** The marker exactly as stored, so the host can log what it refused. */
   marker: unknown;
@@ -68,18 +68,18 @@ declare class FolioYjsAttrSchemaVersionError extends FolioYjsAttrSchemaVersionEr
  * be a silent misread: ProseMirror copies unknown attr values into the node
  * verbatim and drops unknown keys without a trace. It fails instead.
  */
-declare const readYjsAttrSchemaVersion: (ydoc: Y.Doc) => Result<FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError>;
-declare const proseDocumentParagraphSourceContract: (document: Node) => string | null;
+export declare const readYjsAttrSchemaVersion: (ydoc: Y.Doc) => Result<FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError>;
+export declare const proseDocumentParagraphSourceContract: (document: Node) => string | null;
 /** Stamp the attr-schema version of the build that wrote the current fragment. */
-declare const writeYjsAttrSchemaVersion: (ydoc: Y.Doc) => void;
+export declare const writeYjsAttrSchemaVersion: (ydoc: Y.Doc) => void;
 /**
  * Write both metadata bindings for a freshly seeded collaboration document.
  * The attr-schema version is written unconditionally; the paragraph-source
  * contract only when the seeding document carries one, because a document
  * built in memory rather than parsed from a package has no source to bind to.
  */
-declare const writeYjsDocumentMetadata: (ydoc: Y.Doc, document: Node) => void;
-declare const readYjsParagraphSourceContract: (ydoc: Y.Doc) => string | null;
-declare const withParagraphSourceContract: (document: Node, contract: string) => Node;
+export declare const writeYjsDocumentMetadata: (ydoc: Y.Doc, document: Node) => void;
+export declare const readYjsParagraphSourceContract: (ydoc: Y.Doc) => string | null;
+export declare const withParagraphSourceContract: (document: Node, contract: string) => Node;
 //#endregion
-export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, FolioYjsNumberingSourceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };
+export {};

package/dist/prosemirror/yjsDocumentMetadata.js

@@ -4,6 +4,7 @@ import { mintSectionProperties, parseSectionBreakType } from "./sectionCarrier.j
 import { Result, TaggedError, panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, outlineLevelFromStatedValue, paragraphNumberingFromSlots } from "@stll/docx-core/model";
 //#region src/prosemirror/yjsDocumentMetadata.ts
+const FolioYjsAttrSchemaVersionErrorBase = TaggedError("FolioYjsAttrSchemaVersionError");
 /**
 * Folio's own keys inside a collaboration document: one map, two independent
 * bindings.
@@ -476,7 +477,8 @@ const FOLIO_YJS_ATTR_SCHEMA_VERSIONS = [
 	10,
 	11,
 	12,
-	13
+	13,
+	14
 ];
 /**
 * The one place a persisted attr-shape change is decided.
@@ -502,18 +504,22 @@ const ATTR_SCHEMA_MIGRATIONS = {
 	10: renamePageBreakRunOwnerMarkAttr,
 	11: stampMarkerOnly,
 	12: stampMarkerOnly,
-	13: "current"
+	13: stampMarkerOnly,
+	14: "current"
 };
 /**
 * The attr-schema version this build writes. Derived against the migration map
 * so the constant and the map cannot disagree.
 */
-const FOLIO_YJS_ATTR_SCHEMA_VERSION = 13;
-var FolioYjsNoteReferenceSchemaError = class extends TaggedError("FolioYjsNoteReferenceSchemaError") {};
-var FolioYjsNumberingSourceSchemaError = class extends TaggedError("FolioYjsNumberingSourceSchemaError") {};
+const FOLIO_YJS_ATTR_SCHEMA_VERSION = 14;
+const STATED_NUMBERING_SOURCE_SCHEMA_VERSION = 13;
+const FolioYjsNoteReferenceSchemaErrorBase = TaggedError("FolioYjsNoteReferenceSchemaError");
+var FolioYjsNoteReferenceSchemaError = class extends FolioYjsNoteReferenceSchemaErrorBase {};
+const FolioYjsNumberingSourceSchemaErrorBase = TaggedError("FolioYjsNumberingSourceSchemaError");
+var FolioYjsNumberingSourceSchemaError = class extends FolioYjsNumberingSourceSchemaErrorBase {};
 /** Older snapshots can hold a resolved style reference where a stated override belongs. */
 const requireStatedNumberingSources = (fragment, schemaVersion) => {
-	if (schemaVersion === 13) return;
+	if (schemaVersion >= STATED_NUMBERING_SOURCE_SCHEMA_VERSION) return;
 	const pending = [];
 	const visit = (node) => {
 		if ("getAttributes" in node) pending.push(node.getAttributes());
@@ -533,8 +539,8 @@ const requireStatedNumberingSources = (fragment, schemaVersion) => {
 		const numbering = value["numPr"];
 		if (isRecord(value["numPrFromStyle"]) && isRecord(numbering) && (numbering["kind"] === "reference" || "numId" in numbering)) throw new FolioYjsNumberingSourceSchemaError({
 			schemaVersion,
-			requiredSchemaVersion: 13,
-			message: `Yjs schema ${schemaVersion} has ambiguous numbering ownership; schema 13 requires stated numbering overrides. Rebuild the collaboration state from the saved DOCX.`
+			requiredSchemaVersion: STATED_NUMBERING_SOURCE_SCHEMA_VERSION,
+			message: `Yjs schema ${schemaVersion} has ambiguous numbering ownership; schema ${STATED_NUMBERING_SOURCE_SCHEMA_VERSION} requires stated numbering overrides. Rebuild the collaboration state from the saved DOCX.`
 		});
 		for (const entry of Object.values(value)) pending.push(entry);
 	}
@@ -555,8 +561,8 @@ const requireNoteOccurrenceAttribution = (fragment, schemaVersion) => {
 				if (isRecord(reference) && isNoteReferenceOccurrenceId(reference["occurrenceId"])) continue;
 				throw new FolioYjsNoteReferenceSchemaError({
 					schemaVersion,
-					requiredSchemaVersion: 13,
-					message: `Yjs schema ${schemaVersion} has unattributed note references; schema 13 requires occurrence identities. Rebuild the collaboration state from the saved DOCX.`
+					requiredSchemaVersion: 14,
+					message: `Yjs schema ${schemaVersion} has unattributed note references; schema 14 requires occurrence identities. Rebuild the collaboration state from the saved DOCX.`
 				});
 			}
 		}
@@ -589,7 +595,7 @@ const attrSchemaMigrationSteps = (fromVersion) => FOLIO_YJS_ATTR_SCHEMA_VERSIONS
 const applyAttrSchemaMigrations = (ydoc, fragment, fromVersion) => {
 	requireNoteOccurrenceAttribution(fragment, fromVersion);
 	requireStatedNumberingSources(fragment, fromVersion);
-	if (fromVersion === 13) return 0;
+	if (fromVersion === 14) return 0;
 	let rewritten = 0;
 	ydoc.transact(() => {
 		for (const step of attrSchemaMigrationSteps(fromVersion)) rewritten += step(fragment);
@@ -598,8 +604,8 @@ const applyAttrSchemaMigrations = (ydoc, fragment, fromVersion) => {
 	return rewritten;
 };
 /** Raised when a snapshot's attr-schema marker is ahead of the running code. */
-var FolioYjsAttrSchemaVersionError = class extends TaggedError("FolioYjsAttrSchemaVersionError") {};
-const isReadableVersion = (marker) => typeof marker === "number" && Number.isInteger(marker) && marker >= 0 && marker <= 13;
+var FolioYjsAttrSchemaVersionError = class extends FolioYjsAttrSchemaVersionErrorBase {};
+const isReadableVersion = (marker) => typeof marker === "number" && Number.isInteger(marker) && marker >= 0 && marker <= 14;
 /**
 * The attr-schema version a collaboration document was written under.
 *
@@ -617,7 +623,7 @@ const readYjsAttrSchemaVersion = (ydoc) => {
 	return Result.err(new FolioYjsAttrSchemaVersionError({
 		marker,
 		message: "The collaboration snapshot was written by a newer Folio attr schema than this build reads.",
-		supportedVersion: 13
+		supportedVersion: 14
 	}));
 };
 const proseDocumentParagraphSourceContract = (document) => {
@@ -625,7 +631,7 @@ const proseDocumentParagraphSourceContract = (document) => {
 };
 /** Stamp the attr-schema version of the build that wrote the current fragment. */
 const writeYjsAttrSchemaVersion = (ydoc) => {
-	ydoc.getMap(FOLIO_YJS_METADATA_MAP_NAME).set(ATTR_SCHEMA_VERSION_KEY, 13);
+	ydoc.getMap(FOLIO_YJS_METADATA_MAP_NAME).set(ATTR_SCHEMA_VERSION_KEY, 14);
 };
 /**
 * Write both metadata bindings for a freshly seeded collaboration document.

package/dist/prosemirror/zeroWidthAnchors.d.ts

@@ -1,10 +1,11 @@
 import { Node } from "prosemirror-model";
+import { ParagraphContentVerdict } from "@stll/docx-core/ops";
 //#region src/prosemirror/zeroWidthAnchors.d.ts
-declare const isZeroWidthAnchor: (node: Node) => boolean;
+export declare const isZeroWidthAnchor: (node: Node) => boolean;
 /**
- * Whether the textblock holds nothing but zero-width anchors, which is what
- * "everything in it was resolved away" looks like in the document.
+ * Whether the textblock holds content its paragraph mark must not take away,
+ * by the engine's rule: the paragraph's width, and each anchor directly in
+ * it counted as the engine item it stands for.
  */
-declare const holdsNoContent: (block: Node) => boolean;
-//#endregion
-export { holdsNoContent, isZeroWidthAnchor };
+export declare const paragraphContentOf: (block: Node) => ParagraphContentVerdict;
+//#endregion

package/dist/prosemirror/zeroWidthAnchors.js

@@ -1,29 +1,66 @@
+import { expectCommentRangeBoundaryAttrs } from "./commentRangeBoundaryAttrs.js";
+import { COMMENT_REFERENCE_NODE_NAME } from "./commentReferenceIntegrity.js";
 import { BOOKMARK_BOUNDARY_NODE_NAME } from "./extensions/nodes/BookmarkBoundaryExtension.js";
-import { COMMENT_REFERENCE_NODE_NAME } from "./extensions/nodes/CommentReferenceExtension.js";
+import { COMMENT_RANGE_BOUNDARY_NODE_NAME } from "./extensions/nodes/CommentRangeBoundaryExtension.js";
 import { MOVE_RANGE_BOUNDARY_NODE_NAME } from "./extensions/nodes/MoveRangeBoundaryExtension.js";
 import { RANGE_ANCHOR_NODE_NAME } from "./extensions/nodes/RangeAnchorExtension.js";
 import { RENDERED_PAGE_BREAK_NODE_NAME } from "./extensions/nodes/RenderedPageBreakExtension.js";
 import { TEXT_BOX_ANCHOR_NODE_NAME } from "./extensions/nodes/TextBoxAnchorExtension.js";
+import { paragraphContentVerdict } from "@stll/docx-core/ops";
 //#region src/prosemirror/zeroWidthAnchors.ts
-const ZERO_WIDTH_ANCHOR_NODE_NAMES = /* @__PURE__ */ new Set([
-	BOOKMARK_BOUNDARY_NODE_NAME,
-	COMMENT_REFERENCE_NODE_NAME,
-	MOVE_RANGE_BOUNDARY_NODE_NAME,
-	RANGE_ANCHOR_NODE_NAME,
-	RENDERED_PAGE_BREAK_NODE_NAME,
-	TEXT_BOX_ANCHOR_NODE_NAME
+/**
+* The engine item each anchor stands for in paragraph retention. Logical
+* offsets count comment references separately.
+*/
+const ANCHOR_ITEMS = /* @__PURE__ */ new Map([
+	[BOOKMARK_BOUNDARY_NODE_NAME, "bookmarkStart"],
+	[COMMENT_REFERENCE_NODE_NAME, "commentReference"],
+	[COMMENT_RANGE_BOUNDARY_NODE_NAME, "commentRangeStart"],
+	[MOVE_RANGE_BOUNDARY_NODE_NAME, "moveFromRangeStart"],
+	[RANGE_ANCHOR_NODE_NAME, "commentRangeStart"],
+	[RENDERED_PAGE_BREAK_NODE_NAME, "renderedPageBreak"],
+	[TEXT_BOX_ANCHOR_NODE_NAME, "unit"]
 ]);
-const isZeroWidthAnchor = (node) => ZERO_WIDTH_ANCHOR_NODE_NAMES.has(node.type.name);
+const isZeroWidthAnchor = (node) => ANCHOR_ITEMS.has(node.type.name);
 /**
-* Whether the textblock holds nothing but zero-width anchors, which is what
-* "everything in it was resolved away" looks like in the document.
+* A node's width the way the engine counts it: an atom or leaf (text, a
+* field, an image) is one unit or more, a container (an inline content
+* control) counts its children in place, and an anchor counts as the engine
+* item it stands for, which for a zero-width item is no width.
 */
-const holdsNoContent = (block) => {
-	let empty = true;
+const collectParagraphContent = (node, zeroWidthItems) => {
+	if (node.type.name === "commentRangeBoundary") {
+		zeroWidthItems.push(expectCommentRangeBoundaryAttrs(node).marker.type);
+		return 0;
+	}
+	const item = ANCHOR_ITEMS.get(node.type.name);
+	if (item !== void 0) {
+		if (item === "unit") return 1;
+		zeroWidthItems.push(item);
+		return 0;
+	}
+	if (node.isAtom || node.isLeaf) return 1;
+	let width = 0;
+	node.forEach((child) => {
+		width += collectParagraphContent(child, zeroWidthItems);
+	});
+	return width;
+};
+/**
+* Whether the textblock holds content its paragraph mark must not take away,
+* by the engine's rule: the paragraph's width, and each anchor directly in
+* it counted as the engine item it stands for.
+*/
+const paragraphContentOf = (block) => {
+	let width = 0;
+	const zeroWidthItems = [];
 	block.forEach((child) => {
-		if (!isZeroWidthAnchor(child)) empty = false;
+		width += collectParagraphContent(child, zeroWidthItems);
+	});
+	return paragraphContentVerdict({
+		width,
+		zeroWidthItems
 	});
-	return empty;
 };
 //#endregion
-export { holdsNoContent, isZeroWidthAnchor };
+export { isZeroWidthAnchor, paragraphContentOf };

package/dist/redline.d.ts

@@ -1,9 +1,12 @@
 import { FolioAIEditAppliedOperation, FolioAIEditSkippedOperation } from "./ai-edits/types.js";
 import { FolioDocumentStoryHandle, FolioResolvedReviewedView } from "./ai-edits/headless.js";
 import { FolioDocumentPrivacyOptions, FolioDocumentPrivacyReport } from "./docx/metadataPrivacy.js";
+import { TaggedErrorClass } from "better-result";
 //#region src/redline.d.ts
+declare const GenerateRedlineDocxResourceImportErrorBase: TaggedErrorClass<"GenerateRedlineDocxResourceImportError">;
+declare const InvalidGenerateRedlineDocxOptionsErrorBase: TaggedErrorClass<"InvalidGenerateRedlineDocxOptionsError">;
 /** Options for {@link generateRedlineDocx}. */
-type GenerateRedlineDocxOptions = {
+export type GenerateRedlineDocxOptions = {
   /** Author recorded on the generated tracked changes. (default: `"folio compare"`) */
   author?: string;
   /** Resolved base input state. (default: `"final"`) */
@@ -13,21 +16,19 @@ type GenerateRedlineDocxOptions = {
   /** Optional output-only package-metadata privacy transforms. */
   privacy?: FolioDocumentPrivacyOptions;
 };
-declare const InvalidGenerateRedlineDocxOptionsError_base: import("better-result").TaggedErrorClass<"InvalidGenerateRedlineDocxOptionsError">;
 /** Raised when a resolved input view is not `"original"` or `"final"`. */
-declare class InvalidGenerateRedlineDocxOptionsError extends InvalidGenerateRedlineDocxOptionsError_base<{
+export declare class InvalidGenerateRedlineDocxOptionsError extends InvalidGenerateRedlineDocxOptionsErrorBase<{
   message: string;
   option: "baseView" | "revisedView";
   receivedValue: unknown;
 }> {}
-declare const GenerateRedlineDocxResourceImportError_base: import("better-result").TaggedErrorClass<"GenerateRedlineDocxResourceImportError">;
 /** Raised before body operations when revised resources cannot be imported atomically. */
-declare class GenerateRedlineDocxResourceImportError extends GenerateRedlineDocxResourceImportError_base<{
+export declare class GenerateRedlineDocxResourceImportError extends GenerateRedlineDocxResourceImportErrorBase<{
   message: string;
   detail: string;
 }> {}
 /** A document story that could not be paired across the two input packages. */
-type GenerateRedlineUnprocessedStory = {
+export type GenerateRedlineUnprocessedStory = {
   /** Story in the base package, or `null` when it exists only in the revision. */
   baseStory: FolioDocumentStoryHandle | null;
   /** Story in the revised package, or `null` when it exists only in the base. */
@@ -36,7 +37,7 @@ type GenerateRedlineUnprocessedStory = {
   reason: "missing-base-story" | "missing-revised-story";
 };
 /** A source-undefined style cleared so it cannot acquire unrelated base meaning. */
-type GenerateRedlineReferenceWarning = {
+export type GenerateRedlineReferenceWarning = {
   /** Position in the revised story's ProseMirror projection. */
   paragraphPosition: number;
   story: FolioDocumentStoryHandle;
@@ -44,7 +45,7 @@ type GenerateRedlineReferenceWarning = {
   id: string;
 };
 /** Result of {@link generateRedlineDocx}. */
-type GenerateRedlineDocxResult = {
+export type GenerateRedlineDocxResult = {
   /** The base package with generated tracked changes. */
   buffer: ArrayBuffer;
   /** Operations applied across every matched story. */
@@ -59,6 +60,6 @@ type GenerateRedlineDocxResult = {
   privacyReport: FolioDocumentPrivacyReport;
 };
 /** Compare two buffers and return tracked changes for every matched editable story. */
-declare const generateRedlineDocx: (base: ArrayBuffer, revised: ArrayBuffer, options?: GenerateRedlineDocxOptions) => Promise<GenerateRedlineDocxResult>;
+export declare const generateRedlineDocx: (base: ArrayBuffer, revised: ArrayBuffer, options?: GenerateRedlineDocxOptions) => Promise<GenerateRedlineDocxResult>;
 //#endregion
-export { GenerateRedlineDocxOptions, GenerateRedlineDocxResourceImportError, GenerateRedlineDocxResult, GenerateRedlineReferenceWarning, GenerateRedlineUnprocessedStory, InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx };
+export {};

package/dist/redline.js

@@ -24,10 +24,12 @@ import { TaggedError, panic } from "better-result";
 *
 * @packageDocumentation
 */
+const GenerateRedlineDocxResourceImportErrorBase = TaggedError("GenerateRedlineDocxResourceImportError");
+const InvalidGenerateRedlineDocxOptionsErrorBase = TaggedError("InvalidGenerateRedlineDocxOptionsError");
 /** Raised when a resolved input view is not `"original"` or `"final"`. */
-var InvalidGenerateRedlineDocxOptionsError = class extends TaggedError("InvalidGenerateRedlineDocxOptionsError") {};
+var InvalidGenerateRedlineDocxOptionsError = class extends InvalidGenerateRedlineDocxOptionsErrorBase {};
 /** Raised before body operations when revised resources cannot be imported atomically. */
-var GenerateRedlineDocxResourceImportError = class extends TaggedError("GenerateRedlineDocxResourceImportError") {};
+var GenerateRedlineDocxResourceImportError = class extends GenerateRedlineDocxResourceImportErrorBase {};
 const nextBaseBlockIdByIndex = (events) => {
 	const nextIds = Array.from({ length: events.length });
 	let nextId = null;
@@ -303,7 +305,8 @@ const generateRedlineDocx = async (base, revised, options = {}) => {
 	}
 	const destinationStyles = new Set(baseAccess.styleDefinitions()?.styles.map(({ styleId }) => styleId));
 	for (const [index, { story, snapshot, revisedSnapshot, inserted }] of plannedStories.entries()) {
-		const insertedById = rebindInsertedResourceBlocks(inserted, resources.snapshots.at(index) ?? panic("A redline resource import lost its snapshot"));
+		const rebound = resources.snapshots.at(index) ?? panic("A redline resource import lost its snapshot");
+		const insertedById = rebindInsertedResourceBlocks(inserted, rebound);
 		const originalBlocksById = new Map(revisedSnapshot.blocks.map((block) => [block.id, block]));
 		for (const [id, imported] of insertedById) {
 			const original = originalBlocksById.get(id) ?? panic("A carried insertion lost its original block");

package/dist/redlineOperationLimit.d.ts

@@ -1,8 +1,9 @@
+import { TaggedErrorClass } from "better-result";
 //#region src/redlineOperationLimit.d.ts
-declare const MAX_GENERATED_REDLINE_OPERATIONS = 10000;
-declare const GenerateRedlineDocxOperationLimitError_base: import("better-result").TaggedErrorClass<"GenerateRedlineDocxOperationLimitError">;
-declare class GenerateRedlineDocxOperationLimitError extends GenerateRedlineDocxOperationLimitError_base<{
+export declare const MAX_GENERATED_REDLINE_OPERATIONS = 10000;
+declare const GenerateRedlineDocxOperationLimitErrorBase: TaggedErrorClass<"GenerateRedlineDocxOperationLimitError">;
+export declare class GenerateRedlineDocxOperationLimitError extends GenerateRedlineDocxOperationLimitErrorBase<{
   message: string;
 }> {}
 //#endregion
-export { GenerateRedlineDocxOperationLimitError, MAX_GENERATED_REDLINE_OPERATIONS };
+export {};

package/dist/redlineOperationLimit.js

@@ -1,6 +1,7 @@
 import { TaggedError } from "better-result";
 //#region src/redlineOperationLimit.ts
 const MAX_GENERATED_REDLINE_OPERATIONS = 1e4;
-var GenerateRedlineDocxOperationLimitError = class extends TaggedError("GenerateRedlineDocxOperationLimitError") {};
+const GenerateRedlineDocxOperationLimitErrorBase = TaggedError("GenerateRedlineDocxOperationLimitError");
+var GenerateRedlineDocxOperationLimitError = class extends GenerateRedlineDocxOperationLimitErrorBase {};
 //#endregion
 export { GenerateRedlineDocxOperationLimitError, MAX_GENERATED_REDLINE_OPERATIONS };