@stll/folio-core 0.62.0 → 0.63.1

package/dist/ai-edits/batch-claims.d.ts

@@ -22,7 +22,7 @@
  * position before its node.
  */
 /** Equal snapshot coordinates execute in reverse input order. */
-declare const compareBatchTieOrder: (leftIndex: number, rightIndex: number) => number;
+export declare const compareBatchTieOrder: (leftIndex: number, rightIndex: number) => number;
 type PositionRange = {
   from: number;
   to: number;
@@ -34,7 +34,7 @@ type InlineClaim = {
   from: number;
   to: number;
 };
-type BatchClaim = InlineClaim |
+export type BatchClaim = InlineClaim |
 /** Every character of the block: `replaceBlock` changing its text. */
 {
   type: "rewriteBlock";
@@ -68,6 +68,15 @@ type BatchClaim = InlineClaim |
   block: number;
   next: number;
   joinsNow: boolean;
+  /**
+   * The merge sets the merged paragraph's properties
+   * (`mergedParagraphProperties`). Which paragraph takes them depends on
+   * the break: `block` when the join lands now (applied directly, or a
+   * pending inserted break retracted), `next`, whose mark survives
+   * acceptance, when the break stays pending. Either paragraph's other
+   * property edits therefore conflict with it, in both modes.
+   */
+  setsProperties: boolean;
 } |
 /** A new block between two others, at `at`. */
 {
@@ -108,7 +117,7 @@ type BatchClaim = InlineClaim |
  * batch of thousands of operations checks each one against its neighbours
  * rather than against every other operation.
  */
-declare class BatchClaims {
+export declare class BatchClaims {
   private readonly blocks;
   private readonly insertions;
   private readonly joins;
@@ -144,4 +153,4 @@ declare class BatchClaims {
   add(operationId: string, claim: BatchClaim): void;
 }
 //#endregion
-export { BatchClaim, BatchClaims, compareBatchTieOrder };
+export {};

package/dist/ai-edits/batch-claims.js

@@ -50,13 +50,15 @@ const blockRolesOf = (claim) => {
 			block: claim.block,
 			role: {
 				kind: "mergeOwn",
-				joinsNow: claim.joinsNow
+				joinsNow: claim.joinsNow,
+				setsProperties: claim.setsProperties
 			}
 		}, {
 			block: claim.next,
 			role: {
 				kind: "mergeNext",
-				joinsNow: claim.joinsNow
+				joinsNow: claim.joinsNow,
+				setsProperties: claim.setsProperties
 			}
 		}];
 		default: return [];
@@ -114,13 +116,13 @@ const rolesConflict = (left, right) => {
 			default: return true;
 		}
 		case "mergeOwn": switch (right.kind) {
+			case "paragraphProperties": return left.setsProperties;
 			case "text":
 			case "annotation":
-			case "paragraphProperties":
 			case "mergeNext": return false;
 			default: return true;
 		}
-		case "mergeNext": return right.kind === "paragraphProperties" && left.joinsNow;
+		case "mergeNext": return right.kind === "paragraphProperties" && (left.joinsNow || left.setsProperties);
 		case "paragraphProperties": return right.kind === "split" || right.kind === "paragraphProperties";
 		case "split":
 		case "text":
@@ -290,8 +292,6 @@ var BatchClaims = class {
 					claim
 				});
 				if (!this.tables.has(claim.table)) this.tables.set(claim.table, operationId);
-				break;
-			default: break;
 		}
 	}
 };

package/dist/ai-edits/block-identity.d.ts

@@ -1,7 +1,6 @@
 import { FolioAIBlock } from "./types.js";
 //#region src/ai-edits/block-identity.d.ts
 /** Resolve explicit snapshot provenance, falling back to the legacy id-shape convention. */
-declare const folioAIBlockIdStability: ({ id, idStability }: FolioAIBlock) => "stable" | "positional";
-declare const stripBlockIdentityAttrs: (attrs: Record<string, unknown>) => Record<string, unknown>;
-//#endregion
-export { folioAIBlockIdStability, stripBlockIdentityAttrs };
+export declare const folioAIBlockIdStability: ({ id, idStability }: FolioAIBlock) => "stable" | "positional";
+export declare const stripBlockIdentityAttrs: (attrs: Record<string, unknown>) => Record<string, unknown>;
+//#endregion

package/dist/ai-edits/block-identity.js

@@ -1,6 +1,20 @@
 import { getFolioParaIdFromBlockId } from "../types/block-id.js";
 //#region src/ai-edits/block-identity.ts
-const IDENTITY_BLOCK_ATTRS = /* @__PURE__ */ new Set(["paraId", "textId"]);
+/**
+* What a paragraph's copy must not claim: its ids, what its source authored
+* once (the editing sessions its `w:rsid*` attributes name, its bookmark
+* boundaries), and where a past layout broke the page before it. A save
+* writes the authored ones on one record only, the first in document order,
+* so a copy placed before its source would take them from it; a copy placed
+* after it would write the page break again.
+*/
+const IDENTITY_BLOCK_ATTRS = /* @__PURE__ */ new Set([
+	"paraId",
+	"textId",
+	"_preservedAttributes",
+	"bookmarks",
+	"renderedPageBreakBefore"
+]);
 /** Resolve explicit snapshot provenance, falling back to the legacy id-shape convention. */
 const folioAIBlockIdStability = ({ id, idStability }) => idStability ?? (getFolioParaIdFromBlockId(id) === null ? "positional" : "stable");
 const stripBlockIdentityAttrs = (attrs) => {

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

@@ -1,7 +1,7 @@
 import { FolioAIBlockAnchor, FolioAIEditSnapshot, FolioAITextRangeHandle } from "./types.js";
 import { Node } from "prosemirror-model";
 //#region src/ai-edits/blockRange.d.ts
-type DocPositionRange = {
+export type DocPositionRange = {
   from: number;
   to: number;
 };
@@ -10,14 +10,14 @@ type ResolveFolioAIBlockRangeOptions = {
   doc: Node;
   snapshot?: FolioAIEditSnapshot | null | undefined;
 };
-declare const resolveFolioAIBlockRange: ({ blockId, doc, snapshot }: ResolveFolioAIBlockRangeOptions) => DocPositionRange | null;
+export declare const resolveFolioAIBlockRange: ({ blockId, doc, snapshot }: ResolveFolioAIBlockRangeOptions) => DocPositionRange | null;
 type ResolveFolioAITextRangeOptions = {
   range: FolioAITextRangeHandle;
   doc: Node;
   snapshot?: FolioAIEditSnapshot | null | undefined;
 };
 /** Resolve and validate a stable text-range handle against the live document. */
-declare const resolveFolioAITextRange: ({ range, doc, snapshot }: ResolveFolioAITextRangeOptions) => DocPositionRange | null;
+export declare const resolveFolioAITextRange: ({ range, doc, snapshot }: ResolveFolioAITextRangeOptions) => DocPositionRange | null;
 type ResolvePassageRangeOptions = {
   blockId: string;
   text: string;
@@ -39,7 +39,7 @@ type ResolvePassageRangeOptions = {
  * match wins. Returns null when the block does not resolve, is not a textblock,
  * the needle is empty, or the text does not occur in the block.
  */
-declare const resolvePassageRange: ({ blockId, text, doc, snapshot }: ResolvePassageRangeOptions) => DocPositionRange | null;
+export declare const resolvePassageRange: ({ blockId, text, doc, snapshot }: ResolvePassageRangeOptions) => DocPositionRange | null;
 /**
  * Resolve a `seq-NNNN` fallback id by document position.
  *
@@ -58,7 +58,7 @@ declare const resolvePassageRange: ({ blockId, text, doc, snapshot }: ResolvePas
  * count. So the position is counted here over the blocks that carry
  * text, which is what the number means.
  */
-declare const resolveSequentialBlockAnchor: (blockId: string, snapshot: FolioAIEditSnapshot) => FolioAIBlockAnchor | undefined;
+export declare const resolveSequentialBlockAnchor: (blockId: string, snapshot: FolioAIEditSnapshot) => FolioAIBlockAnchor | undefined;
 /**
  * Clamp a `{from, to}` pair so both endpoints fit inside a document of
  * `docSize` (in PM content positions). Block-boundary snapshots and stale
@@ -71,6 +71,6 @@ declare const resolveSequentialBlockAnchor: (blockId: string, snapshot: FolioAIE
  * Order is preserved: if both endpoints exceed `docSize`, the returned
  * `from` may equal `to`, yielding a cursor selection at the doc end.
  */
-declare function clampRangeToDocSize(docSize: number, range: DocPositionRange): DocPositionRange;
+export declare function clampRangeToDocSize(docSize: number, range: DocPositionRange): DocPositionRange;
 //#endregion
-export { DocPositionRange, clampRangeToDocSize, resolveFolioAIBlockRange, resolveFolioAITextRange, resolvePassageRange, resolveSequentialBlockAnchor };
+export {};

package/dist/ai-edits/blockRange.js

@@ -37,7 +37,8 @@ const resolveFolioAITextRange = ({ range, doc, snapshot }) => {
 		endOffset: range.endOffset
 	});
 	if (resolved === null) return null;
-	if (hashFolioAIBlockText(cleanBlock.text.slice(range.startOffset, range.endOffset)) !== range.selectedTextHash) return null;
+	const selectedText = cleanBlock.text.slice(range.startOffset, range.endOffset);
+	if (hashFolioAIBlockText(selectedText) !== range.selectedTextHash) return null;
 	return clampRangeToDocSize(doc.content.size, resolved);
 };
 /**

package/dist/ai-edits/character-boundaries.d.ts

@@ -22,14 +22,14 @@
  * Operations that change text or break a paragraph are refused there as well.
  */
 /** Whether `offset` falls between the two halves of one surrogate pair of `text`. */
-declare const splitsSurrogatePair: (text: string, offset: number) => boolean;
+export declare const splitsSurrogatePair: (text: string, offset: number) => boolean;
 /**
  * Whether `offset` falls inside one grapheme cluster of `text`, or between
  * the halves of a surrogate pair. Without `Intl.Segmenter` only the surrogate
  * pair is recognised.
  */
-declare const splitsGraphemeCluster: (text: string, offset: number) => boolean;
-type CharacterBoundaryStrictness =
+export declare const splitsGraphemeCluster: (text: string, offset: number) => boolean;
+export type CharacterBoundaryStrictness =
 /** Refuse only an offset inside a surrogate pair: annotations. */
 "codePoint" |
 /** Refuse any offset inside a grapheme cluster: edits of text and breaks. */
@@ -38,6 +38,5 @@ type CharacterBoundaryStrictness =
  * Why `offsets` do not all stand on a character boundary of `text`, naming
  * the first that does not and the character it cuts; `null` when they all do.
  */
-declare const describeCharacterSplit: (text: string, offsets: readonly number[], strictness: CharacterBoundaryStrictness) => string | null;
-//#endregion
-export { CharacterBoundaryStrictness, describeCharacterSplit, splitsGraphemeCluster, splitsSurrogatePair };
+export declare const describeCharacterSplit: (text: string, offsets: readonly number[], strictness: CharacterBoundaryStrictness) => string | null;
+//#endregion

package/dist/ai-edits/clean-text.d.ts

@@ -21,7 +21,7 @@ import { Node } from "prosemirror-model";
  * sent us still resolve to the right PM positions on a doc with
  * pending tracked changes).
  */
-type CleanBlockText = {
+export type CleanBlockText = {
   text: string;
   offsets: number[];
   /**
@@ -35,7 +35,7 @@ type CleanBlockText = {
    */
   structuralBoundaries: readonly CleanTextStructuralBoundary[];
 };
-type CleanTextStructuralBoundary = {
+export type CleanTextStructuralBoundary = {
   type: "pageBreakRun";
   /** Clean-text offset at which the zero-width carrier occurs. */
   offset: number;
@@ -86,11 +86,11 @@ type ResolveCleanTextRangeOptions = {
  * unrepresentable as a generic text selection and returns `null`; a structural
  * operation must own that mutation instead.
  */
-declare const resolveCleanTextRange: ({ cleanBlock, startOffset, endOffset }: ResolveCleanTextRangeOptions) => {
+export declare const resolveCleanTextRange: ({ cleanBlock, startOffset, endOffset }: ResolveCleanTextRangeOptions) => {
   from: number;
   to: number;
 } | null;
-type BuildCleanBlockTextOptions = {
+export type BuildCleanBlockTextOptions = {
   /**
    * `"text"` reads a field as the result Word shows, which is the view a reader
    * and the AI reason against. `"omitted"` drops it, which is what an alignment
@@ -107,7 +107,7 @@ type BuildCleanBlockTextOptions = {
    */
   noteReferences?: NoteReferenceLabels | "sourceText";
 };
-declare const buildCleanBlockText: (blockNode: Node, blockFrom: number, { fieldResults, noteReferences }?: BuildCleanBlockTextOptions) => CleanBlockText;
+export declare const buildCleanBlockText: (blockNode: Node, blockFrom: number, { fieldResults, noteReferences }?: BuildCleanBlockTextOptions) => CleanBlockText;
 /**
  * A "redline-aware" view of a textblock: the same left-to-right traversal as
  * {@link buildCleanBlockText}, but every tracked change and comment anchor is
@@ -128,11 +128,11 @@ declare const buildCleanBlockText: (blockNode: Node, blockFrom: number, { fieldR
  * post-tracked-changes view. A footnote or endnote reference reads as its
  * marker (`[^1]`), numbered within the block.
  */
-declare const buildAnnotatedBlockText: (blockNode: Node) => string;
+export declare const buildAnnotatedBlockText: (blockNode: Node) => string;
 /**
  * {@link buildAnnotatedBlockText} with a story's reference numbering, so a
  * reference reads as the marker every other reader of the story shows.
  */
-declare const buildAnnotatedBlockTextWithNoteReferences: (blockNode: Node, noteReferences: NoteReferenceLabels | undefined) => string;
+export declare const buildAnnotatedBlockTextWithNoteReferences: (blockNode: Node, noteReferences: NoteReferenceLabels | undefined) => string;
 //#endregion
-export { BuildCleanBlockTextOptions, CleanBlockText, CleanTextStructuralBoundary, buildAnnotatedBlockText, buildAnnotatedBlockTextWithNoteReferences, buildCleanBlockText, resolveCleanTextRange };
+export {};

package/dist/ai-edits/comment-lifecycle.d.ts

@@ -1,18 +1,27 @@
 import { document_d_exports } from "../types/document.js";
 import { Node } from "prosemirror-model";
 //#region src/ai-edits/comment-lifecycle.d.ts
-/** Ids of the comments an editor document anchors: by mark, reference or point anchor. */
-declare const anchoredCommentIdsInProseDoc: (doc: Node) => Set<number>;
+/** Comment ids anchored by one editor node, regardless of anchor representation. */
+export declare const commentAnchorIdsForNode: (node: Node) => readonly number[];
+/** Whether an inline node only locates a comment rather than being covered content. */
+export declare const isCommentAnchorCarrier: (node: Node) => boolean;
+/**
+ * Ids of the comments an editor document anchors: by mark, reference or point anchor.
+ * `beforePendingDeletions` supplies markers displaced by a deletion mark at the
+ * same position; those markers remain anchored until that deletion is accepted.
+ */
+export declare const anchoredCommentIdsInProseDoc: (doc: Node, beforePendingDeletions?: Node) => Set<number>;
+/** Ids whose mark covers content rather than a zero-width anchor carrier. */
+export declare const coveredCommentIdsInProseDoc: (doc: Node) => Set<number>;
 /** Ids of the comments a model story's blocks hold any marker of. */
-declare const anchoredCommentIdsInBlocks: (blocks: readonly document_d_exports.BlockContent[]) => Set<number>;
+export declare const anchoredCommentIdsInBlocks: (blocks: readonly document_d_exports.BlockContent[]) => Set<number>;
 /**
  * `comments` without the threads whose root lost its anchor: the root, and
  * every reply that threads under it. A reply's own markers repeat its root's
  * range, so a reply is judged by its root, never on its own.
  */
-declare const withoutLostCommentThreads: (comments: readonly document_d_exports.Comment[], { anchoredBefore, anchoredNow }: {
+export declare const withoutLostCommentThreads: (comments: readonly document_d_exports.Comment[], { anchoredBefore, anchoredNow }: {
   anchoredBefore: ReadonlySet<number>;
   anchoredNow: ReadonlySet<number>;
 }) => document_d_exports.Comment[];
-//#endregion
-export { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, withoutLostCommentThreads };
+//#endregion

package/dist/ai-edits/comment-lifecycle.js

@@ -1,20 +1,80 @@
 import { visitCommentMarkers } from "../docx/commentAnchorIndex.js";
+import { expectCommentRangeBoundaryAttrs } from "../prosemirror/commentRangeBoundaryAttrs.js";
 import { readCommentReferenceAttrs } from "../prosemirror/commentReferenceAttrs.js";
-import "../prosemirror/extensions/nodes/CommentReferenceExtension.js";
+import "../prosemirror/commentReferenceIntegrity.js";
+import "../prosemirror/extensions/nodes/CommentRangeBoundaryExtension.js";
 import "../prosemirror/extensions/nodes/RangeAnchorExtension.js";
 import { readRangeAnchorAttrs } from "../prosemirror/rangeAnchorAttrs.js";
+import { isCommentAnchorCarrierType, withoutCommentThreads } from "@stll/docx-core/ops";
 //#region src/ai-edits/comment-lifecycle.ts
-/** Ids of the comments an editor document anchors: by mark, reference or point anchor. */
-const anchoredCommentIdsInProseDoc = (doc) => {
+/** Comment ids anchored by one editor node, regardless of anchor representation. */
+const commentAnchorIdsForNode = (node) => {
+	const ids = [];
+	if (node.type.name === "commentReference") {
+		const attrs = readCommentReferenceAttrs(node);
+		if (attrs.ok) ids.push(attrs.value.commentId);
+	} else if (node.type.name === "rangeAnchor") {
+		const attrs = readRangeAnchorAttrs(node);
+		if (attrs.ok && attrs.value.start.type === "commentRangeStart") ids.push(attrs.value.start.id);
+	} else if (node.type.name === "commentRangeBoundary") ids.push(expectCommentRangeBoundaryAttrs(node).marker.id);
+	for (const mark of node.marks) {
+		const commentId = mark.attrs["commentId"];
+		if (mark.type.name === "comment" && typeof commentId === "number") ids.push(commentId);
+	}
+	return ids;
+};
+/** Whether an inline node only locates a comment rather than being covered content. */
+const isCommentAnchorCarrier = (node) => {
+	let type = node.type.name;
+	if (type === "rangeAnchor") type = "commentRangeStart";
+	if (type === "commentReference") type = "commentReference";
+	if (type === "commentRangeBoundary") type = "commentRangeStart";
+	return isCommentAnchorCarrierType(type);
+};
+/**
+* Ids of the comments an editor document anchors: by mark, reference or point anchor.
+* `beforePendingDeletions` supplies markers displaced by a deletion mark at the
+* same position; those markers remain anchored until that deletion is accepted.
+*/
+const anchoredCommentIdsInProseDoc = (doc, beforePendingDeletions) => {
 	const ids = /* @__PURE__ */ new Set();
-	doc.descendants((node) => {
-		if (node.type.name === "commentReference") {
-			const attrs = readCommentReferenceAttrs(node);
-			if (attrs.ok) ids.add(attrs.value.commentId);
-		} else if (node.type.name === "rangeAnchor") {
-			const attrs = readRangeAnchorAttrs(node);
-			if (attrs.ok && attrs.value.start.type === "commentRangeStart") ids.add(attrs.value.start.id);
+	const addNode = (node, target = ids) => {
+		for (const id of commentAnchorIdsForNode(node)) target.add(id);
+	};
+	const pendingDeletionRanges = [];
+	let liveText = false;
+	let pendingDeletedText = false;
+	doc.descendants((node, position) => {
+		addNode(node);
+		const pendingDeletion = node.marks.some(({ type }) => type.name === "deletion");
+		if (node.isText) {
+			pendingDeletedText ||= pendingDeletion;
+			liveText ||= !pendingDeletion;
 		}
+		if (pendingDeletion) pendingDeletionRanges.push({
+			from: position,
+			to: position + node.nodeSize
+		});
+		return true;
+	});
+	if (beforePendingDeletions && pendingDeletionRanges.length > 0) {
+		beforePendingDeletions.descendants((node, position) => {
+			const end = position + node.nodeSize;
+			if (pendingDeletionRanges.some(({ from, to }) => position < to && end > from)) addNode(node);
+			return true;
+		});
+		if (pendingDeletedText && !liveText) beforePendingDeletions.descendants((node) => {
+			addNode(node);
+			return true;
+		});
+	}
+	return ids;
+};
+/** Ids whose mark covers content rather than a zero-width anchor carrier. */
+const coveredCommentIdsInProseDoc = (doc) => {
+	const ids = /* @__PURE__ */ new Set();
+	doc.descendants((node) => {
+		if (!node.isInline || isCommentAnchorCarrier(node)) return true;
 		for (const mark of node.marks) {
 			const commentId = mark.attrs["commentId"];
 			if (mark.type.name === "comment" && typeof commentId === "number") ids.add(commentId);
@@ -35,18 +95,9 @@ const anchoredCommentIdsInBlocks = (blocks) => {
 * range, so a reply is judged by its root, never on its own.
 */
 const withoutLostCommentThreads = (comments, { anchoredBefore, anchoredNow }) => {
-	const dropped = /* @__PURE__ */ new Set();
-	for (const comment of comments) if (comment.parentId === void 0 && anchoredBefore.has(comment.id) && !anchoredNow.has(comment.id)) dropped.add(comment.id);
-	if (dropped.size === 0) return [...comments];
-	let grew = true;
-	while (grew) {
-		grew = false;
-		for (const comment of comments) if (!dropped.has(comment.id) && comment.parentId !== void 0 && dropped.has(comment.parentId)) {
-			dropped.add(comment.id);
-			grew = true;
-		}
-	}
-	return comments.filter((comment) => !dropped.has(comment.id));
+	const droppedRootIds = /* @__PURE__ */ new Set();
+	for (const comment of comments) if (comment.parentId === void 0 && anchoredBefore.has(comment.id) && !anchoredNow.has(comment.id)) droppedRootIds.add(comment.id);
+	return withoutCommentThreads(comments, droppedRootIds);
 };
 //#endregion
-export { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, withoutLostCommentThreads };
+export { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, commentAnchorIdsForNode, coveredCommentIdsInProseDoc, isCommentAnchorCarrier, withoutLostCommentThreads };