@stll/folio-core 0.52.0 → 0.53.0

package/dist/ai-edits/result-validation.js

@@ -0,0 +1,164 @@
+import { validateFolioDocumentModel } from "../docx/modelValidation.js";
+import { proseDocToBlocks } from "../prosemirror/conversion/fromProseDoc.js";
+import { sectionPropertiesOf } from "../prosemirror/sectionCarrier.js";
+import { anchoredCommentIdsInProseDoc } from "./comment-lifecycle.js";
+import { Fragment } from "prosemirror-model";
+//#region src/ai-edits/result-validation.ts
+/**
+* The check an operation batch's result passes before it is committed.
+*
+* An operation that reaches the document is a promise that the document can
+* still be saved: the batch reports it as applied, issues a receipt and an
+* undo handle, and the next thing the caller does may be `save()`. The model
+* validator the save runs (`validateFolioDocumentModel`, the one
+* `repackDocx` asserts) is therefore the judge here too, run on what the
+* batch produced, while the batch can still be refused.
+*
+* Two constraints shape it:
+*
+* - Cost. Converting a whole story back to the model and validating it costs
+*   about as much as the apply itself on a long document. A batch only
+*   changes the top-level blocks it touched, and ProseMirror keeps every
+*   untouched child node by identity, so only the window between the first
+*   and the last changed child is converted and validated.
+* - Blame. The apply layer holds the story, not the package: comments, notes
+*   and header/footer parts are the host's. A window can therefore report an
+*   error the batch did not cause (a comment the package defines, a range the
+*   window cuts). Only an error the same window did not already have before
+*   the batch counts; an error the document already carried is the
+*   document's, and refusing every later edit near it would help no one.
+*/
+/**
+* The top-level children that differ between two versions of one story,
+* found by node identity from both ends. `null` when every child is shared.
+*/
+const changedTopLevelWindow = (before, after) => {
+	if (before === after) return null;
+	const beforeCount = before.childCount;
+	const afterCount = after.childCount;
+	let from = 0;
+	while (from < beforeCount && from < afterCount && before.child(from) === after.child(from)) from += 1;
+	let beforeTo = beforeCount;
+	let afterTo = afterCount;
+	while (beforeTo > from && afterTo > from && before.child(beforeTo - 1) === after.child(afterTo - 1)) {
+		beforeTo -= 1;
+		afterTo -= 1;
+	}
+	if (from === beforeTo && from === afterTo) return null;
+	return {
+		from,
+		beforeTo,
+		afterTo
+	};
+};
+const TOP_LEVEL_PATH = /^package\.document\.content\[(\d+)\]/u;
+/** Rebase a window-relative block path onto the story's own block index. */
+const rebasePath = (path, offset) => path.replace(TOP_LEVEL_PATH, (_match, index) => `package.document.content[${String(Number(index) + offset)}]`);
+const syntheticComment = (id, author) => ({
+	id,
+	author,
+	content: []
+});
+/** A story can identify its existing references even though the host owns the parts. */
+const knownSectionParts = (doc) => {
+	const headers = /* @__PURE__ */ new Map();
+	const footers = /* @__PURE__ */ new Map();
+	doc.descendants((node) => {
+		if (node.type.name !== "paragraph") return true;
+		const section = sectionPropertiesOf(node);
+		for (const { rId, type } of section?.headerReferences ?? []) headers.set(rId, {
+			type: "header",
+			hdrFtrType: type,
+			content: []
+		});
+		for (const { rId, type } of section?.footerReferences ?? []) footers.set(rId, {
+			type: "footer",
+			hdrFtrType: type,
+			content: []
+		});
+		return false;
+	});
+	return {
+		headers,
+		footers
+	};
+};
+const windowErrors = ({ doc, from, to, context, knownParts, knownCommentIds }) => {
+	if (to <= from) return [];
+	const children = [];
+	for (let index = from; index < to; index += 1) children.push(doc.child(index));
+	let content;
+	try {
+		content = proseDocToBlocks(doc.copy(Fragment.fromArray(children)), []);
+	} catch (error) {
+		return [{
+			path: `package.document.content[${String(from)}]`,
+			message: `The content cannot be converted for saving: ${error instanceof Error ? error.message : String(error)}`,
+			severity: "error"
+		}];
+	}
+	return validateFolioDocumentModel({ package: {
+		document: {
+			content,
+			comments: [...[...knownCommentIds ?? []].map((id) => syntheticComment(id, "")), ...context.createdCommentIds.filter((id) => !knownCommentIds?.has(id)).map((id) => syntheticComment(id, context.commentAuthor ?? ""))]
+		},
+		...context.numbering !== null && context.numbering !== void 0 && { numbering: context.numbering },
+		...knownParts && {
+			headers: knownParts.headers,
+			footers: knownParts.footers
+		}
+	} }).issues.filter((issue) => issue.severity === "error" && !(context.numbering === void 0 && issue.path.endsWith(".numPr.numId"))).map(({ path, message, severity }) => ({
+		path: rebasePath(path, from),
+		message,
+		severity
+	}));
+};
+/**
+* The save-validator errors the batch introduced: errors in the changed window
+* of `after` that the same window of `before` did not already report. Empty
+* when the result is as saveable as the story it started from.
+*/
+const findIntroducedModelErrors = (before, after, context) => {
+	const window = changedTopLevelWindow(before, after);
+	if (window === null) return [];
+	let afterErrors = windowErrors({
+		doc: after,
+		from: window.from,
+		to: window.afterTo,
+		context
+	});
+	let parts;
+	if (afterErrors.some(({ message }) => message.startsWith("Section references missing "))) parts = knownSectionParts(before);
+	let knownCommentIds;
+	if (afterErrors.some(({ message }) => /^Comment \d+ is referenced but not present/u.test(message))) knownCommentIds = anchoredCommentIdsInProseDoc(before);
+	if (parts || knownCommentIds) afterErrors = windowErrors({
+		doc: after,
+		from: window.from,
+		to: window.afterTo,
+		context,
+		...parts !== void 0 && { knownParts: parts },
+		...knownCommentIds !== void 0 && { knownCommentIds }
+	});
+	if (afterErrors.length === 0) return afterErrors;
+	const known = /* @__PURE__ */ new Map();
+	for (const { message } of windowErrors({
+		doc: before,
+		from: window.from,
+		to: window.beforeTo,
+		context: {
+			...context,
+			createdCommentIds: []
+		},
+		...parts !== void 0 && { knownParts: parts },
+		...knownCommentIds !== void 0 && { knownCommentIds }
+	})) known.set(message, (known.get(message) ?? 0) + 1);
+	return afterErrors.filter(({ message }) => {
+		const remaining = known.get(message) ?? 0;
+		if (remaining === 0) return true;
+		known.set(message, remaining - 1);
+		return false;
+	});
+};
+const describeModelError = ({ path, message }) => `The result would not save: ${path}: ${message}`;
+//#endregion
+export { describeModelError, findIntroducedModelErrors };

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

@@ -1,4 +1,5 @@
 import { FolioAIBlock, FolioAIBlockStructuralBoundary, FolioAIEditSnapshot, FolioAITextRangeHandle } from "./types.js";
+import { NoteReferenceLabels } from "./note-references.js";
 import { CleanBlockText } from "./clean-text.js";
 import { RunStyleResolver } from "../prosemirror/runStyleFormatting.js";
 import { Node } from "prosemirror-model";
@@ -67,10 +68,12 @@ declare const isFolioAIContentBlock: ({ text }: Pick<FolioAIBlock, "text">) => b
 declare const trailingBodyBlockId: ({ blocks }: FolioAIEditSnapshot) => string | null;
 declare const hashFolioAIBlockText: (text: string) => string;
 /**
- * Canonical public projection of the clean view's zero-width structure.
+ * Canonical public projection of the clean view's inline structure.
  *
  * A field boundary stays internal: it marks text the reader already sees, so it
- * belongs to range resolution rather than to a block's published structure.
+ * belongs to range resolution rather than to a block's published structure. A
+ * note reference is published: its marker reads like text, and a reader has to
+ * be able to tell it is not.
  */
 declare const projectFolioAIBlockStructuralBoundaries: ({ structuralBoundaries }: Pick<CleanBlockText, "structuralBoundaries">) => readonly FolioAIBlockStructuralBoundary[];
 /** Stable precondition fingerprint for a block's zero-width structure. */
@@ -90,6 +93,36 @@ declare const createFolioAITextRangeHandle: ({ blockId, text, startOffset, endOf
  * whole subtree, so a table nested inside a hidden row is hidden with it.
  */
 declare const isHiddenTableRow: (node: Node) => boolean;
+/**
+ * The marker every footnote/endnote reference of a story reads as: numbered in
+ * reading order over the blocks {@link createFolioAIEditSnapshot} reads (a
+ * hidden row's references are as absent as its text), so the applier, the
+ * range resolvers and the snapshot all read the same text.
+ *
+ * The story is numbered on the first label asked for, not here: a reader
+ * whose walk meets no reference (most documents, and every revision-stats
+ * read) never pays for a second walk of the story.
+ */
+declare const collectNoteReferenceLabels: (doc: Node) => NoteReferenceLabels;
+/**
+ * @internal The markers a comparison reads a revised story's references as:
+ * each note the base story references keeps the base's marker, and a note
+ * only the revised story references is numbered after them.
+ *
+ * Each story's own reading-order numbering would renumber every later marker
+ * of the revised story as soon as a reference is added or removed before it,
+ * and a text comparison would then read a reference both stories keep as an
+ * edit of it. Numbering the revised story on from the base keeps a kept
+ * reference's marker identical, and makes a reference the comparison brings
+ * write the marker the base story (which the edits resolve against) gives it.
+ */
+declare const alignedNoteReferenceLabels: (base: Node, revised: Node) => NoteReferenceLabels;
+/**
+ * @internal The same snapshot with every note reference read through `labels`
+ * rather than the story's own numbering. Only the text and structural
+ * boundaries can change: block ids, anchors and the source document do not.
+ */
+declare const relabelFolioAIEditSnapshotNoteReferences: (snapshot: FolioAIEditSnapshot, labels: NoteReferenceLabels) => FolioAIEditSnapshot;
 /** One table of a story, numbered the way {@link createFolioAIEditSnapshot} numbers it. */
 type FolioStoryTable = {
   /** Document-order index over every table, nested ones included. */
@@ -110,4 +143,4 @@ declare const createFolioAIEditSnapshot: (doc: Node) => FolioAIEditSnapshot;
 /** @internal Use for an EditorState that owns the document's style resolver. */
 declare const createFolioAIEditSnapshotWithStyleResolver: (doc: Node, styleResolver: RunStyleResolver | null) => FolioAIEditSnapshot;
 //#endregion
-export { FolioStoryTable, createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, detachFolioAIEditSnapshotExternalHyperlinks, folioStoryTables, hashFolioAIBlockStructuralBoundaries, hashFolioAIBlockText, isFolioAIContentBlock, isHiddenTableRow, normalizeFolioAIBlockText, numberingReferenceKeysOf, projectFolioAIBlockStructuralBoundaries, remapFolioAIEditSnapshotNumberingReferences, remapFolioAIEditSnapshotStyleReferences, sourceDocumentOf, storyTablesOf, styleResolverOf, trailingBodyBlockId };
+export { FolioStoryTable, alignedNoteReferenceLabels, collectNoteReferenceLabels, createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, detachFolioAIEditSnapshotExternalHyperlinks, folioStoryTables, hashFolioAIBlockStructuralBoundaries, hashFolioAIBlockText, isFolioAIContentBlock, isHiddenTableRow, normalizeFolioAIBlockText, numberingReferenceKeysOf, projectFolioAIBlockStructuralBoundaries, relabelFolioAIEditSnapshotNoteReferences, remapFolioAIEditSnapshotNumberingReferences, remapFolioAIEditSnapshotStyleReferences, sourceDocumentOf, storyTablesOf, styleResolverOf, trailingBodyBlockId };

package/dist/ai-edits/snapshot.js

@@ -1,8 +1,11 @@
+import { isAltChunkMarkup } from "../docx/altChunk.js";
 import { EMPTY_BUILT_IN_STYLE_INDEX, resolveHeadingLevel } from "../docx/builtInStyles.js";
 import { resolveParagraphNumbering } from "../docx/numberingReference.js";
+import { OPAQUE_REVISION_CARRIER_READER_DIAGNOSTIC, isOpaqueNestedRowMarkup, opaqueRevisionCarrierName } from "../docx/opaqueCarrier.js";
 import { recreateProseNodeWithParagraphPropertySource } from "../docx/paragraphPropertySource.js";
 import { expectCharacterStyleMarkAttrs, expectHyperlinkMarkAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs } from "../prosemirror/attrs/index.js";
 import { marksToTextFormatting } from "../prosemirror/conversion/fromProseDoc.js";
+import { createListLabelCounter } from "../prosemirror/listLabels.js";
 import { paragraphNumberingAttr, readParagraphNumberingAttr } from "../prosemirror/numberingAttr.js";
 import { readOutlineLevelAttr } from "../prosemirror/outlineLevelAttr.js";
 import { directParagraphAlignment } from "../prosemirror/paragraphAlignment.js";
@@ -11,9 +14,11 @@ import { directParagraphSpacing } from "../prosemirror/paragraphSpacing.js";
 import { runFormattingInlineAtomCleanText } from "../prosemirror/runFormattingInlineCarriers.js";
 import { authoredRunFormattingFromAttrs } from "../prosemirror/runFormattingProvenance.js";
 import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
-import { paragraphRunStyleContext } from "../prosemirror/runStyleFormatting.js";
+import { paragraphRunStyleContext, resolveParagraphBodyRunFormatting } from "../prosemirror/runStyleFormatting.js";
 import { deriveBlankBlockId, deriveBlockId } from "../types/block-id.js";
+import { splitsSurrogatePair } from "./character-boundaries.js";
 import { buildCleanBlockText } from "./clean-text.js";
+import { createNoteReferenceLabeler } from "./note-references.js";
 import { panic } from "better-result";
 import { Fragment } from "prosemirror-model";
 import { TableMap } from "prosemirror-tables";
@@ -234,14 +239,25 @@ const hashFolioAIBlockText = (text) => {
 const EMPTY_FOLIO_AI_BLOCK_STRUCTURAL_BOUNDARIES = Object.freeze([]);
 const EMPTY_FOLIO_AI_BLOCK_STRUCTURAL_BOUNDARY_HASH = hashFolioAIBlockText(JSON.stringify(EMPTY_FOLIO_AI_BLOCK_STRUCTURAL_BOUNDARIES));
 /**
-* Canonical public projection of the clean view's zero-width structure.
+* Canonical public projection of the clean view's inline structure.
 *
 * A field boundary stays internal: it marks text the reader already sees, so it
-* belongs to range resolution rather than to a block's published structure.
+* belongs to range resolution rather than to a block's published structure. A
+* note reference is published: its marker reads like text, and a reader has to
+* be able to tell it is not.
 */
 const projectFolioAIBlockStructuralBoundaries = ({ structuralBoundaries }) => {
 	let projected;
 	for (const boundary of structuralBoundaries) {
+		if (boundary.type === "noteReference") {
+			(projected ??= []).push({
+				type: "noteReference",
+				noteType: boundary.noteType,
+				offset: boundary.offset,
+				length: boundary.length
+			});
+			continue;
+		}
 		if (boundary.type !== "pageBreakRun" || !boundary.presentInCleanView) continue;
 		(projected ??= []).push({
 			type: "pageBreak",
@@ -255,7 +271,7 @@ const hashFolioAIBlockStructuralBoundaryProjection = (structuralBoundaries) => s
 /** Stable precondition fingerprint for a block's zero-width structure. */
 const hashFolioAIBlockStructuralBoundaries = (cleanBlock) => hashFolioAIBlockStructuralBoundaryProjection(projectFolioAIBlockStructuralBoundaries(cleanBlock));
 const createFolioAITextRangeHandle = ({ blockId, text, startOffset, endOffset }) => {
-	if (blockId.length === 0 || !Number.isInteger(startOffset) || !Number.isInteger(endOffset) || startOffset < 0 || endOffset <= startOffset || endOffset > text.length) return null;
+	if (blockId.length === 0 || !Number.isInteger(startOffset) || !Number.isInteger(endOffset) || startOffset < 0 || endOffset <= startOffset || endOffset > text.length || splitsSurrogatePair(text, startOffset) || splitsSurrogatePair(text, endOffset)) return null;
 	return {
 		type: "textRange",
 		story: "main",
@@ -276,6 +292,64 @@ const TABLE_ROLE_ROW = "row";
 * whole subtree, so a table nested inside a hidden row is hidden with it.
 */
 const isHiddenTableRow = (node) => node.type.name === TABLE_ROW_NODE_NAME && node.attrs["hidden"] === true;
+const noteReferenceLabelsByStory = /* @__PURE__ */ new WeakMap();
+/**
+* The marker every footnote/endnote reference of a story reads as: numbered in
+* reading order over the blocks {@link createFolioAIEditSnapshot} reads (a
+* hidden row's references are as absent as its text), so the applier, the
+* range resolvers and the snapshot all read the same text.
+*
+* The story is numbered on the first label asked for, not here: a reader
+* whose walk meets no reference (most documents, and every revision-stats
+* read) never pays for a second walk of the story.
+*/
+const collectNoteReferenceLabels = (doc) => {
+	const cached = noteReferenceLabelsByStory.get(doc);
+	if (cached !== void 0) return cached;
+	const labels = numberNoteReferencesLazily([doc]);
+	noteReferenceLabelsByStory.set(doc, labels);
+	return labels;
+};
+/** Number the stories' references in reading order, one story after another, on first use. */
+const numberNoteReferencesLazily = (stories) => {
+	let numbered;
+	const numberStories = () => {
+		const labeler = createNoteReferenceLabeler();
+		for (const doc of stories) doc.descendants((node) => {
+			if (isHiddenTableRow(node)) return false;
+			if (node.isTextblock) {
+				labeler.numberBlock(node);
+				return false;
+			}
+			return true;
+		});
+		return labeler;
+	};
+	return { labelOf: (reference) => (numbered ??= numberStories()).labelOf(reference) };
+};
+/**
+* @internal The markers a comparison reads a revised story's references as:
+* each note the base story references keeps the base's marker, and a note
+* only the revised story references is numbered after them.
+*
+* Each story's own reading-order numbering would renumber every later marker
+* of the revised story as soon as a reference is added or removed before it,
+* and a text comparison would then read a reference both stories keep as an
+* edit of it. Numbering the revised story on from the base keeps a kept
+* reference's marker identical, and makes a reference the comparison brings
+* write the marker the base story (which the edits resolve against) gives it.
+*/
+const alignedNoteReferenceLabels = (base, revised) => numberNoteReferencesLazily([base, revised]);
+/**
+* @internal The same snapshot with every note reference read through `labels`
+* rather than the story's own numbering. Only the text and structural
+* boundaries can change: block ids, anchors and the source document do not.
+*/
+const relabelFolioAIEditSnapshotNoteReferences = (snapshot, labels) => {
+	const metadata = metadataOf(snapshot);
+	if (!snapshot.blocks.some((block) => block.structuralBoundaries?.some(({ type }) => type === "noteReference"))) return snapshot;
+	return createFolioAIEditSnapshotInternal(metadata.sourceDocument, metadata.styleResolver, labels);
+};
 const STORY_TABLE_CONTAINER = "container";
 const STORY_TABLE_HIDDEN_SUBTREE = "hidden-subtree";
 const STORY_TABLE = "table";
@@ -336,12 +410,17 @@ const getTableLocation = ({ path, blockIndex, tableIndexByStart }) => {
 		};
 	}
 };
-const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
+const createFolioAIEditSnapshotInternal = (doc, styleResolver, noteReferenceLabels) => {
 	const builtInStyles = styleResolver?.builtInStyles ?? EMPTY_BUILT_IN_STYLE_INDEX;
+	const noteReferences = noteReferenceLabels ? {
+		labelOf: noteReferenceLabels.labelOf,
+		numberBlock: () => {}
+	} : createNoteReferenceLabeler();
 	const draftBlocks = [];
 	const hashCounts = /* @__PURE__ */ new Map();
 	const usedBlockIds = /* @__PURE__ */ new Set();
 	const numberingReferenceKeys = /* @__PURE__ */ new Set();
+	const nextListLabel = createListLabelCounter();
 	const tables = [];
 	const tableIndexByStart = /* @__PURE__ */ new Map();
 	const path = [];
@@ -352,6 +431,44 @@ const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
 		if (!node.isTextblock) {
 			const disposition = classifyNonTextblockStoryTableNode(node);
 			if (disposition === STORY_TABLE_HIDDEN_SUBTREE) return false;
+			const preserved = node.attrs["_preserved"];
+			const preservedChildren = preserved !== null && typeof preserved === "object" && "children" in preserved ? preserved.children : void 0;
+			if (Array.isArray(preservedChildren)) for (const [carrierIndex, child] of preservedChildren.entries()) {
+				if (child === null || typeof child !== "object" || !("xml" in child)) continue;
+				const xml = child.xml;
+				if (typeof xml !== "string") continue;
+				const diagnostic = getOpaqueCarrierDiagnostic(xml);
+				if (diagnostic === void 0) continue;
+				draftBlocks.push({ block: {
+					id: `opaque-${String(pos)}-${String(carrierIndex)}`,
+					kind: "diagnostic",
+					text: diagnostic.text,
+					diagnostic: {
+						type: "opaqueCarrier",
+						carrier: diagnostic.carrier
+					}
+				} });
+			}
+			if (node.type.name === "preservedBlock") {
+				const xml = node.attrs["xml"];
+				if (typeof xml === "string") {
+					const readerText = node.attrs["readerText"];
+					const diagnostic = getOpaqueCarrierDiagnostic(xml, typeof readerText === "string" ? readerText : void 0);
+					if (diagnostic !== void 0) {
+						const id = `opaque-${String(pos)}`;
+						draftBlocks.push({ block: {
+							id,
+							kind: "diagnostic",
+							text: diagnostic.text,
+							diagnostic: {
+								type: "opaqueCarrier",
+								carrier: diagnostic.carrier
+							}
+						} });
+					}
+				}
+				return false;
+			}
 			if (disposition === STORY_TABLE) {
 				const tableIndex = tables.length;
 				tables.push({
@@ -369,7 +486,11 @@ const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
 			});
 			return true;
 		}
-		const cleanBlock = buildCleanBlockText(node, pos);
+		noteReferences.numberBlock(node);
+		const cleanBlock = buildCleanBlockText(node, pos, {
+			fieldResults: "text",
+			noteReferences
+		});
 		const { text } = cleanBlock;
 		const structuralBoundaries = projectFolioAIBlockStructuralBoundaries(cleanBlock);
 		const structuralBoundaryHash = hashFolioAIBlockStructuralBoundaryProjection(structuralBoundaries);
@@ -398,9 +519,11 @@ const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
 		}
 		usedBlockIds.add(id);
 		const headingLevel = getHeadingLevel(node, builtInStyles);
-		const kind = getBlockKind(node, headingLevel);
-		const displayLabel = getDisplayLabel(node, kind === "heading");
+		const listLabel = node.type.name === "paragraph" ? nextListLabel(expectParagraphAttrs(node)) : void 0;
+		const kind = getBlockKind(headingLevel, listLabel);
+		const displayLabel = getDisplayLabel(node, listLabel, kind === "heading");
 		const styleId = getStyleId(node);
+		const directOutlineLevel = node.type.name === "paragraph" ? expectParagraphAttrs(node)._originalFormatting?.outlineLevel : void 0;
 		const listLevel = getListLevel(node);
 		const listReference = getListReference(node);
 		const numberingReferenceKey = getNumberingReferenceKey(node);
@@ -428,6 +551,7 @@ const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
 				...headingLevel !== void 0 && { headingLevel },
 				...displayLabel !== void 0 && { displayLabel },
 				...styleId !== void 0 && { styleId },
+				...directOutlineLevel !== void 0 && { directOutlineLevel },
 				...listLevel !== void 0 && { listLevel },
 				...listReference !== void 0 && { listReference },
 				...directAlignment !== void 0 && { directAlignment },
@@ -453,6 +577,7 @@ const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
 	const anchors = {};
 	for (const draft of draftBlocks) {
 		blocks.push(draft.block);
+		if (draft.anchor === void 0) continue;
 		anchors[draft.block.id] = {
 			...draft.anchor,
 			hashOccurrenceCount: hashCounts.get(draft.anchor.textHash) ?? 0
@@ -470,15 +595,37 @@ const createFolioAIEditSnapshotInternal = (doc, styleResolver) => {
 	});
 	return snapshot;
 };
+const getOpaqueCarrierDiagnostic = (xml, readerText) => {
+	if (isAltChunkMarkup(xml)) return {
+		carrier: "w:altChunk",
+		text: readerText === void 0 ? "[Unsupported w:altChunk content]" : `[Unsupported w:altChunk content] ${readerText}`
+	};
+	const elementName = opaqueRevisionCarrierName(xml);
+	if (elementName !== void 0) return {
+		carrier: elementName,
+		text: OPAQUE_REVISION_CARRIER_READER_DIAGNOSTIC
+	};
+	return isOpaqueNestedRowMarkup(xml) ? {
+		carrier: "w:tr",
+		text: "[Unsupported nested w:tr content]"
+	} : void 0;
+};
 const createFolioAIEditSnapshot = (doc) => createFolioAIEditSnapshotInternal(doc, null);
 /** @internal Use for an EditorState that owns the document's style resolver. */
 const createFolioAIEditSnapshotWithStyleResolver = (doc, styleResolver) => createFolioAIEditSnapshotInternal(doc, styleResolver);
-const getBlockKind = (node, headingLevel) => {
-	const listMarker = node.attrs["listMarker"];
-	const numPr = node.attrs["numPr"];
-	if (typeof listMarker === "string" && listMarker.trim().length > 0 || numPr !== void 0 && numPr !== null) return "listItem";
+/**
+* What a reader sees the block as, heading first: a numbered heading (`1.
+* Scope`, numbered through its style or its own `w:numPr`) is a heading that
+* shows a number, with the number in `displayLabel` and its level in
+* `listLevel`. A paragraph is a list item when it shows a marker, which is
+* when it has a label. One whose numbering shows none (a `w:vanish` level, a
+* level its list does not define, or `w:numId="0"` cancelling its style's
+* numbering) reads as prose and is a paragraph, keeping its `listLevel` and
+* `listReference`.
+*/
+const getBlockKind = (headingLevel, listLabel) => {
 	if (headingLevel !== void 0) return "heading";
-	return "paragraph";
+	return listLabel === void 0 ? "paragraph" : "listItem";
 };
 /** The block's 1-based heading level, as {@link resolveHeadingLevel} classifies it. */
 const getHeadingLevel = (node, styles) => {
@@ -489,9 +636,8 @@ const getHeadingLevel = (node, styles) => {
 	}, styles);
 	return level === void 0 ? void 0 : level + 1;
 };
-const getDisplayLabel = (node, isHeading) => {
-	const listMarker = node.attrs["listMarker"];
-	if (typeof listMarker === "string" && listMarker.trim().length > 0) return listMarker.trim();
+const getDisplayLabel = (node, listLabel, isHeading) => {
+	if (listLabel !== void 0) return listLabel;
 	const styleId = node.attrs["styleId"];
 	if (isHeading && typeof styleId === "string") return styleId;
 };
@@ -541,16 +687,19 @@ const RUN_FORMATTING_OVERRIDE_MARK = "runFormattingOverride";
 const CHARACTER_STYLE_MARK = "characterStyle";
 const getPreviewRuns = ({ node, nodeFrom, cleanBlock, styleResolver }) => {
 	const runs = [];
-	const defaultStyle = getDefaultPreviewRunStyle(node);
+	const defaultStyle = getDefaultPreviewRunStyle(node, styleResolver);
 	let paragraphStyleContext;
 	let cleanOffset = 0;
 	node.descendants((child, relativePosition) => {
-		const text = child.isText ? child.text : runFormattingInlineAtomCleanText(child);
+		const start = nodeFrom + 1 + relativePosition;
+		const noteReference = cleanBlock.structuralBoundaries.find((boundary) => boundary.type === "noteReference" && boundary.from === start);
+		let text;
+		if (noteReference !== void 0) text = cleanBlock.text.slice(noteReference.offset, noteReference.offset + noteReference.length);
+		else text = child.isText ? child.text : runFormattingInlineAtomCleanText(child);
 		if (text === void 0 || text === null || text.length === 0) return true;
 		if (child.marks.some((mark) => mark.type.name === DELETION_MARK || mark.type.name === HIDDEN_MARK)) return false;
-		const start = nodeFrom + 1 + relativePosition;
 		while ((cleanBlock.offsets[cleanOffset] ?? Number.POSITIVE_INFINITY) < start) cleanOffset++;
-		const lastCharacterPosition = child.isText ? start + text.length - 1 : start;
+		const lastCharacterPosition = child.isText && noteReference === void 0 ? start + text.length - 1 : start;
 		if (cleanBlock.offsets[cleanOffset] !== start || cleanBlock.offsets[cleanOffset + text.length - 1] !== lastCharacterPosition) return false;
 		cleanOffset += text.length;
 		const style = getPreviewRunStyle(child.marks, defaultStyle);
@@ -583,8 +732,13 @@ const getPreviewRuns = ({ node, nodeFrom, cleanBlock, styleResolver }) => {
 	if (runs.every(isUnstyledPreviewRun)) return;
 	return runs;
 };
-const getDefaultPreviewRunStyle = (node) => {
-	const formatting = node.attrs["defaultTextFormatting"];
+const getDefaultPreviewRunStyle = (node, styleResolver) => {
+	const attrs = expectParagraphAttrs(node);
+	const formatting = attrs.defaultTextFormatting ?? resolveParagraphBodyRunFormatting({
+		styleId: attrs.styleId,
+		tableRunFormatting: attrs._tableRunFormatting,
+		styleResolver
+	}).defaultFormatting;
 	if (typeof formatting !== "object" || formatting === null) return {};
 	return {
 		...getBooleanTextFormatting(formatting),
@@ -717,4 +871,4 @@ const isEmptyPreviewRunStyle = ({ bold, italic, underline, strike, fontFamily, f
 const sameDirectFormatting = (left, right) => left === void 0 && isEmptyPreviewRunStyle(right) || left !== void 0 && left.bold === right.bold && left.italic === right.italic && left.underline === right.underline && left.strike === right.strike && left.fontFamily === right.fontFamily && left.fontSizePt === right.fontSizePt && left.color === right.color;
 const isUnstyledPreviewRun = ({ directFormatting, ...style }) => isEmptyPreviewRunStyle(style) && (directFormatting === void 0 || isEmptyPreviewRunStyle(directFormatting));
 //#endregion
-export { createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, detachFolioAIEditSnapshotExternalHyperlinks, folioStoryTables, hashFolioAIBlockStructuralBoundaries, hashFolioAIBlockText, isFolioAIContentBlock, isHiddenTableRow, normalizeFolioAIBlockText, numberingReferenceKeysOf, projectFolioAIBlockStructuralBoundaries, remapFolioAIEditSnapshotNumberingReferences, remapFolioAIEditSnapshotStyleReferences, sourceDocumentOf, storyTablesOf, styleResolverOf, trailingBodyBlockId };
+export { alignedNoteReferenceLabels, collectNoteReferenceLabels, createFolioAIEditSnapshot, createFolioAIEditSnapshotWithStyleResolver, createFolioAITextRangeHandle, detachFolioAIEditSnapshotExternalHyperlinks, folioStoryTables, hashFolioAIBlockStructuralBoundaries, hashFolioAIBlockText, isFolioAIContentBlock, isHiddenTableRow, normalizeFolioAIBlockText, numberingReferenceKeysOf, projectFolioAIBlockStructuralBoundaries, relabelFolioAIEditSnapshotNoteReferences, remapFolioAIEditSnapshotNumberingReferences, remapFolioAIEditSnapshotStyleReferences, sourceDocumentOf, storyTablesOf, styleResolverOf, trailingBodyBlockId };

package/dist/ai-edits/table-cell-mutations.d.ts

@@ -1,6 +1,6 @@
 import { TableRectangle } from "./table-mutation-plan.js";
-import { Transaction } from "prosemirror-state";
 import { Node } from "prosemirror-model";
+import { Transaction } from "prosemirror-state";
 //#region src/ai-edits/table-cell-mutations.d.ts
 type TableCellRectangleMutationOptions = {
   tr: Transaction;

package/dist/ai-edits/table-cell-mutations.js

@@ -3,6 +3,7 @@ import { expectTableCellAttrs } from "../prosemirror/attrs/index.js";
 import { standaloneTableCellFromProseMirror } from "../prosemirror/conversion/fromProseDoc.js";
 import { standaloneTableCellToProseMirror } from "../prosemirror/conversion/toProseDoc.js";
 import { markStructuralChange } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
+import { removeRowsWithoutCells } from "../prosemirror/tableGridMutation.js";
 import { tableRectanglesEqual } from "./table-mutation-plan.js";
 import { tableRectangleCutsMergedCell } from "./table-targets.js";
 import { Result } from "better-result";
@@ -62,6 +63,7 @@ const mergeTableRectangle = ({ tr, tablePosition, table, rectangle }) => {
 		const contentStart = isEmptyTableCell(merged.cell) ? absoluteMergedPosition + 1 : contentEnd;
 		tr = tr.replaceWith(contentStart, contentEnd, appendedContent);
 	}
+	removeRowsWithoutCells(tr, tablePosition);
 	return tr;
 };
 const mergeTopRowColwidths = (cells, mergedColspan) => {
@@ -121,7 +123,8 @@ const mergeTrackedVerticalTableCells = ({ tr, tablePosition, table, rectangle, r
 		});
 	}
 	const origin = cells.at(0);
-	if (!origin || cells.length !== rectangle.bottom - rectangle.top || cells.some(({ cell }) => cell.type !== origin.cell.type) || cells.slice(1).some(({ cell }) => !isEmptyTableCell(cell))) return null;
+	const leavesRowWithoutCells = cells.slice(1).some(({ position }) => table.child(map.findCell(position).top).childCount === 1);
+	if (!origin || leavesRowWithoutCells || cells.length !== rectangle.bottom - rectangle.top || cells.some(({ cell }) => cell.type !== origin.cell.type) || cells.slice(1).some(({ cell }) => !isEmptyTableCell(cell))) return null;
 	const continuationCells = [];
 	for (const { cell } of cells.slice(1)) {
 		const continuation = standaloneTableCellFromProseMirror(cell);

package/dist/ai-edits/table-geometry.d.ts

@@ -1,6 +1,6 @@
 import { FolioStoryTable } from "./snapshot.js";
-import { Transaction } from "prosemirror-state";
 import { Node } from "prosemirror-model";
+import { Transaction } from "prosemirror-state";
 //#region src/ai-edits/table-geometry.d.ts
 /** Where a cell sits: which table, which row of it, which cell of that row. */
 type TableCellCoordinate = {