@stll/folio-core 0.37.0 → 0.37.1

package/dist/ai-edits/apply.js

@@ -135,7 +135,12 @@ const hasRepresentableCommentAnchor = (item, mode) => {
 		default: return item.from < item.to;
 	}
 };
-const writesParagraphPropertyChange = (item) => item.operation.type === "setBlockParagraphProperties" || isResolvedReplaceBlockOperation(item) && REPLACE_BLOCK_IMPACT[item.replaceBlockImpact].changesStyle;
+const writesParagraphPropertyChange = (item) => {
+	if (item.operation.type === "setBlockParagraphProperties") return true;
+	if (item.operation.type === "splitBlock") return item.operation.firstParagraphProperties !== void 0 || item.operation.secondParagraphProperties !== void 0;
+	if (item.operation.type === "mergeBlockWithNext") return item.operation.mergedParagraphProperties !== void 0;
+	return isResolvedReplaceBlockOperation(item) && REPLACE_BLOCK_IMPACT[item.replaceBlockImpact].changesStyle;
+};
 const resolveReplaceBlockImpact = ({ changesText, changesStyle }) => {
 	if (changesText) return changesStyle ? "textAndStyle" : "text";
 	if (changesStyle) return "style";
@@ -266,6 +271,50 @@ const resolveFormattingFromStyle = ({ attrs, styleId, styleResolver }) => {
 	if (attrs.alignmentFromStyle !== void 0) fallback.alignment = attrs.alignmentFromStyle;
 	return Object.keys(fallback).length > 0 ? fallback : void 0;
 };
+/**
+* Apply one paragraph-property patch to a live node. A tracked patch stores
+* the complete previous pPr: a partial snapshot cannot distinguish a property
+* the change left alone from one it explicitly cleared when rejecting it.
+*/
+const applyBlockParagraphProperties = ({ tr, position, node, properties, styleResolver, numbering = null, revisionInfo }) => {
+	const attrs = expectParagraphAttrs(node);
+	const resolvedFormattingFromStyle = properties.styleId === void 0 ? resolveFormattingFromStyle({
+		attrs,
+		styleId: attrs.styleId,
+		styleResolver
+	}) : resolveFormattingFromStyle({
+		attrs,
+		styleId: properties.styleId,
+		styleResolver
+	});
+	const patch = paragraphPropertiesPatch({
+		node,
+		properties,
+		resolvedFormattingFromStyle,
+		numbering
+	});
+	if (patch === null) return {
+		tr,
+		changed: false,
+		revisionId: null
+	};
+	const changeInfo = revisionInfo?.();
+	const change = changeInfo ? {
+		type: "paragraphPropertyChange",
+		info: changeInfo,
+		previousFormatting: paragraphPropertiesSnapshot(node)
+	} : null;
+	const existing = attrs._propertyChanges;
+	return {
+		tr: tr.setNodeMarkup(position, void 0, {
+			...node.attrs,
+			...patch,
+			...change ? { _propertyChanges: [...Array.isArray(existing) ? existing : [], change] } : {}
+		}),
+		changed: true,
+		revisionId: change?.info.id ?? null
+	};
+};
 const applyReplaceBlockStyleId = ({ item, tr, styleResolver, revisionInfo }) => {
 	if (item.operation.type !== "replaceBlock" || item.operation.styleId === void 0) return {
 		tr,
@@ -1291,7 +1340,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 		const provisionalCommentId = item.commentText !== void 0 ? reserveProvisionalCommentId() : void 0;
 		const commentMark = provisionalCommentId !== void 0 && commentType ? commentType.create({ commentId: provisionalCommentId }) : null;
 		const stepsBefore = tr.steps.length;
-		let appliedRevisionIds;
+		let appliedRevisionIds = [];
 		if (isSuggested && !SUGGESTED_SUPPORTED_OPERATION_TYPES.has(item.operation.type)) {
 			skipped.push({
 				id: item.operation.id,
@@ -1900,85 +1949,89 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 			case "setBlockParagraphProperties": {
 				const blockPosition = tr.mapping.map(item.blockFrom);
 				const liveBlock = tr.doc.nodeAt(blockPosition) ?? item.blockNode;
-				const liveAttrs = expectParagraphAttrs(liveBlock);
-				const resolvedFormattingFromStyle = item.operation.properties.styleId === void 0 ? resolveFormattingFromStyle({
-					attrs: liveAttrs,
-					styleId: liveAttrs.styleId,
-					styleResolver
-				}) : resolveFormattingFromStyle({
-					attrs: liveAttrs,
-					styleId: item.operation.properties.styleId,
-					styleResolver
-				});
-				const patch = paragraphPropertiesPatch({
+				const appliedProperties = applyBlockParagraphProperties({
+					tr,
+					position: blockPosition,
 					node: liveBlock,
 					properties: item.operation.properties,
-					resolvedFormattingFromStyle,
-					numbering
+					styleResolver,
+					numbering,
+					...mode === "direct" ? {} : { revisionInfo: () => ({
+						id: operationRevisionSeed++,
+						author,
+						date,
+						...trackedRevisionExtras
+					}) }
 				});
-				if (patch === null) {
+				if (!appliedProperties.changed) {
 					skipped.push({
 						id: item.operation.id,
 						reason: "noopOperation"
 					});
 					continue;
 				}
-				if (mode === "direct") {
-					tr = tr.setNodeMarkup(blockPosition, void 0, {
-						...liveBlock.attrs,
-						...patch
-					});
-					break;
-				}
-				const revisionId = operationRevisionSeed++;
-				const change = {
-					type: "paragraphPropertyChange",
-					info: {
-						id: revisionId,
-						author,
-						date,
-						...trackedRevisionExtras
-					},
-					previousFormatting: paragraphPropertiesSnapshot(liveBlock)
-				};
-				const existing = expectParagraphAttrs(liveBlock)._propertyChanges;
-				tr = tr.setNodeMarkup(blockPosition, void 0, {
-					...liveBlock.attrs,
-					...patch,
-					_propertyChanges: [...Array.isArray(existing) ? existing : [], change]
-				});
-				appliedRevisionIds = [revisionId];
+				tr = appliedProperties.tr;
+				if (appliedProperties.revisionId !== null) appliedRevisionIds = [appliedProperties.revisionId];
 				break;
 			}
 			case "splitBlock": {
 				if (mode === "direct") {
 					if (item.to > item.from) tr = tr.delete(item.from, item.to);
 					tr = tr.split(item.from);
-					break;
-				}
-				const revisionIdMark = operationRevisionSeed++;
-				const info = {
-					id: revisionIdMark,
-					author,
-					date,
-					...trackedRevisionExtras
-				};
-				appliedRevisionIds = [revisionIdMark];
-				if (item.to > item.from && deletionType) {
-					const revisionIdSeparator = operationRevisionSeed++;
-					tr = tr.addMark(item.from, item.to, deletionType.create({
-						revisionId: revisionIdSeparator,
+				} else {
+					const revisionIdMark = operationRevisionSeed++;
+					const info = {
+						id: revisionIdMark,
 						author,
 						date,
 						...trackedRevisionExtras
-					}));
-					appliedRevisionIds = [revisionIdMark, revisionIdSeparator];
+					};
+					appliedRevisionIds = [revisionIdMark];
+					if (item.to > item.from && deletionType) {
+						const revisionIdSeparator = operationRevisionSeed++;
+						tr = tr.addMark(item.from, item.to, deletionType.create({
+							revisionId: revisionIdSeparator,
+							author,
+							date,
+							...trackedRevisionExtras
+						}));
+						appliedRevisionIds.push(revisionIdSeparator);
+					}
+					tr = tr.split(item.from);
+					tr = tr.setNodeAttribute(item.blockFrom, "pPrMark", {
+						kind: "ins",
+						info
+					});
 				}
-				tr = tr.split(item.from);
-				tr = tr.setNodeAttribute(item.blockFrom, "pPrMark", {
-					kind: "ins",
-					info
+				const allocateSplitParagraphPropertyRevisionInfo = () => ({
+					id: operationRevisionSeed++,
+					author,
+					date,
+					...trackedRevisionExtras
 				});
+				const paragraphPropertyTargets = [{
+					position: item.blockFrom,
+					properties: item.operation.firstParagraphProperties
+				}, {
+					position: item.from + 1,
+					properties: item.operation.secondParagraphProperties
+				}];
+				for (const { position, properties } of paragraphPropertyTargets) {
+					if (!properties) continue;
+					const paragraph = tr.doc.nodeAt(position);
+					if (!paragraph) panic("A resolved split did not produce two paragraphs");
+					const appliedProperties = applyBlockParagraphProperties({
+						tr,
+						position,
+						node: paragraph,
+						properties,
+						styleResolver,
+						numbering,
+						...mode === "direct" ? {} : { revisionInfo: allocateSplitParagraphPropertyRevisionInfo }
+					});
+					tr = appliedProperties.tr;
+					if (appliedProperties.revisionId !== null) appliedRevisionIds.push(appliedProperties.revisionId);
+				}
 				break;
 			}
 			case "mergeBlockWithNext": {
@@ -1987,30 +2040,50 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 				if (mode === "direct") {
 					if (separator.length > 0) tr = tr.insertText(separator, insertAt);
 					tr = tr.join(item.blockTo + separator.length);
-					break;
+				} else {
+					const revisionIdMark = operationRevisionSeed++;
+					appliedRevisionIds = [revisionIdMark];
+					if (separator.length > 0 && insertionType) {
+						const revisionIdSeparator = operationRevisionSeed++;
+						tr = tr.insertText(separator, insertAt);
+						tr = tr.addMark(insertAt, insertAt + separator.length, insertionType.create({
+							revisionId: revisionIdSeparator,
+							author,
+							date,
+							...trackedRevisionExtras
+						}));
+						appliedRevisionIds.push(revisionIdSeparator);
+					}
+					tr = tr.setNodeAttribute(item.blockFrom, "pPrMark", {
+						kind: "del",
+						info: {
+							id: revisionIdMark,
+							author,
+							date,
+							...trackedRevisionExtras
+						}
+					});
 				}
-				const revisionIdMark = operationRevisionSeed++;
-				appliedRevisionIds = [revisionIdMark];
-				if (separator.length > 0 && insertionType) {
-					const revisionIdSeparator = operationRevisionSeed++;
-					tr = tr.insertText(separator, insertAt);
-					tr = tr.addMark(insertAt, insertAt + separator.length, insertionType.create({
-						revisionId: revisionIdSeparator,
-						author,
-						date,
-						...trackedRevisionExtras
-					}));
-					appliedRevisionIds = [revisionIdMark, revisionIdSeparator];
+				if (item.operation.mergedParagraphProperties) {
+					const mergedParagraph = tr.doc.nodeAt(item.blockFrom);
+					if (!mergedParagraph) panic("A resolved merge did not produce a paragraph");
+					const appliedProperties = applyBlockParagraphProperties({
+						tr,
+						position: item.blockFrom,
+						node: mergedParagraph,
+						properties: item.operation.mergedParagraphProperties,
+						styleResolver,
+						numbering,
+						...mode === "direct" ? {} : { revisionInfo: () => ({
+							id: operationRevisionSeed++,
+							author,
+							date,
+							...trackedRevisionExtras
+						}) }
+					});
+					tr = appliedProperties.tr;
+					if (appliedProperties.revisionId !== null) appliedRevisionIds.push(appliedProperties.revisionId);
 				}
-				tr = tr.setNodeAttribute(item.blockFrom, "pPrMark", {
-					kind: "del",
-					info: {
-						id: revisionIdMark,
-						author,
-						date,
-						...trackedRevisionExtras
-					}
-				});
 				break;
 			}
 			case "commentOnBlock":
@@ -2043,7 +2116,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 		applied.push({
 			id: item.operation.id,
 			...committedCommentId !== void 0 && { commentId: committedCommentId },
-			...appliedRevisionIds !== void 0 && appliedRevisionIds[0] !== void 0 && {
+			...appliedRevisionIds[0] !== void 0 && {
 				revisionId: appliedRevisionIds[0],
 				revisionIds: appliedRevisionIds
 			},

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

@@ -312,6 +312,16 @@ type FolioAIEditOperation = FolioAIEditReviewMeta & {
    */
   separator?: string;
   blockId: string;
+  /**
+   * Paragraph properties for the first result. Omitted properties keep
+   * the source paragraph's value.
+   */
+  firstParagraphProperties?: FolioAIBlockParagraphProperties;
+  /**
+   * Paragraph properties for the second result. Omitted properties keep
+   * the source paragraph's value.
+   */
+  secondParagraphProperties?: FolioAIBlockParagraphProperties;
 } |
 /**
  * Add a whole table next to the anchor block, its rows marked inserted in
@@ -377,6 +387,11 @@ type FolioAIEditOperation = FolioAIEditReviewMeta & {
    */
   separator?: string;
   blockId: string;
+  /**
+   * Paragraph properties for the joined result. Omitted properties keep
+   * the first paragraph's value.
+   */
+  mergedParagraphProperties?: FolioAIBlockParagraphProperties;
 } | {
   id: string;
   type: "commentOnBlock";

package/dist/compare/plan.js

@@ -612,6 +612,10 @@ const planStoryCompare = ({ story, baseSnapshot, targetSnapshot, maxOperations,
 		const paragraphMarkPlan = paragraphMarkPlans.get(stepIndex);
 		if (paragraphMarkPlan?.type === "split") {
 			const { baseBlock, revisedBlocks: splitInto, offset, separator } = paragraphMarkPlan;
+			const firstParagraphFormatting = changedFolioContentParagraphFormatting(baseBlock, splitInto[0]);
+			const secondParagraphFormatting = changedFolioContentParagraphFormatting(baseBlock, splitInto[1]);
+			const firstParagraphProperties = firstParagraphFormatting ? toFolioAIBlockParagraphProperties(firstParagraphFormatting) : void 0;
+			const secondParagraphProperties = secondParagraphFormatting ? toFolioAIBlockParagraphProperties(secondParagraphFormatting) : void 0;
 			changes.push({
 				kind: "split",
 				location: locationOf(story, baseBlock),
@@ -619,17 +623,35 @@ const planStoryCompare = ({ story, baseSnapshot, targetSnapshot, maxOperations,
 				targetBlockIds: splitInto.map(({ id }) => id),
 				text: baseBlock.text
 			});
+			if (firstParagraphProperties) changes.push({
+				kind: "paragraph-format",
+				location: locationOf(story, baseBlock),
+				baseBlockId: baseBlock.id,
+				targetBlockId: splitInto[0].id,
+				properties: firstParagraphProperties
+			});
+			if (secondParagraphProperties) changes.push({
+				kind: "paragraph-format",
+				location: locationOf(story, baseBlock),
+				baseBlockId: baseBlock.id,
+				targetBlockId: splitInto[1].id,
+				properties: secondParagraphProperties
+			});
 			operations.push({
 				id: nextOperationId(),
 				type: "splitBlock",
 				blockId: baseBlock.id,
 				offset,
-				...separator.length > 0 && { separator }
+				...separator.length > 0 && { separator },
+				...firstParagraphProperties && { firstParagraphProperties },
+				...secondParagraphProperties && { secondParagraphProperties }
 			});
 			continue;
 		}
 		if (paragraphMarkPlan?.type === "merge") {
 			const { baseBlocks, revisedBlock: targetBlock, separator } = paragraphMarkPlan;
+			const mergedParagraphFormatting = changedFolioContentParagraphFormatting(baseBlocks[0], targetBlock);
+			const mergedParagraphProperties = mergedParagraphFormatting ? toFolioAIBlockParagraphProperties(mergedParagraphFormatting) : void 0;
 			changes.push({
 				kind: "merge",
 				location: locationOf(story, baseBlocks[0]),
@@ -637,11 +659,19 @@ const planStoryCompare = ({ story, baseSnapshot, targetSnapshot, maxOperations,
 				targetBlockId: targetBlock.id,
 				text: targetBlock.text
 			});
+			if (mergedParagraphProperties) changes.push({
+				kind: "paragraph-format",
+				location: locationOf(story, baseBlocks[0]),
+				baseBlockId: baseBlocks[0].id,
+				targetBlockId: targetBlock.id,
+				properties: mergedParagraphProperties
+			});
 			operations.push({
 				id: nextOperationId(),
 				type: "mergeBlockWithNext",
 				blockId: baseBlocks[0].id,
-				...separator.length > 0 && { separator }
+				...separator.length > 0 && { separator },
+				...mergedParagraphProperties && { mergedParagraphProperties }
 			});
 			continue;
 		}

package/dist/display-list/primitives.d.ts

@@ -15,7 +15,7 @@ import { hasComplexScript, isComplexScriptCodePoint } from "../utils/scriptSegme
  * advances rightward from its origin whatever the paragraph does.
  */
 declare const glyphCellOffsetsPx: (run: DisplayGlyphRun) => readonly number[];
-declare const DISPLAY_PRIMITIVE_KINDS: ("image" | "line" | "rect" | "glyphRun" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
+declare const DISPLAY_PRIMITIVE_KINDS: ("image" | "glyphRun" | "rect" | "line" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
 /**
  * Dash geometry of each stroke pattern, as multiples of the stroke thickness.
  *

package/dist/document-operations.d.ts

@@ -101,8 +101,8 @@ declare const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE: Readonly<{
   readonly insertBeforeBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "inheritFormatting", "alignment", "spacing", "listLevel", "moveId", "pageBreakBefore", "styleId", "comment"];
   readonly replaceBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "text", "preserveFormatting", "styleId", "comment"];
   readonly deleteBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "moveId", "comment"];
-  readonly splitBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "offset", "separator"];
-  readonly mergeBlockWithNext: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "separator"];
+  readonly splitBlock: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "offset", "separator", "firstParagraphProperties", "secondParagraphProperties"];
+  readonly mergeBlockWithNext: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "separator", "mergedParagraphProperties"];
   readonly setBlockParagraphProperties: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "properties"];
   readonly insertTable: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId", "position", "rows"];
   readonly deleteTable: readonly ["id", "type", "blockId", "severity", "area", "precondition", "suggestionId"];

package/dist/document-operations.js

@@ -262,9 +262,9 @@ const readTableRows = (value, path) => {
 	if (parsed.some((row) => row.length !== width)) return invalidBatch(rowsPath, "expected every row to hold the same number of cells");
 	return parsed;
 };
-const readParagraphProperties = (value, path) => {
-	const candidate = value["properties"];
-	const propertiesPath = `${path}.properties`;
+const readParagraphProperties = ({ value, key, path }) => {
+	const candidate = value[key];
+	const propertiesPath = `${path}.${key}`;
 	if (!isPlainObject(candidate)) return invalidBatch(propertiesPath, "expected an object");
 	assertAllowedKeys(candidate, propertiesPath, [
 		"styleId",
@@ -463,9 +463,15 @@ const FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE = Object.freeze({
 	splitBlock: [
 		...COMMON_OPERATION_KEYS,
 		"offset",
-		"separator"
+		"separator",
+		"firstParagraphProperties",
+		"secondParagraphProperties"
+	],
+	mergeBlockWithNext: [
+		...COMMON_OPERATION_KEYS,
+		"separator",
+		"mergedParagraphProperties"
 	],
-	mergeBlockWithNext: [...COMMON_OPERATION_KEYS, "separator"],
 	setBlockParagraphProperties: [...COMMON_OPERATION_KEYS, "properties"],
 	insertTable: [
 		...COMMON_OPERATION_KEYS,
@@ -588,24 +594,48 @@ const parseDocumentOperation = (value, index) => {
 		id,
 		type,
 		blockId,
-		properties: readParagraphProperties(value, path)
+		properties: readParagraphProperties({
+			value,
+			key: "properties",
+			path
+		})
 	};
 	if (type === "splitBlock" || type === "mergeBlockWithNext") {
 		const separator = readOptionalString(value, "separator", path);
-		if (type === "mergeBlockWithNext") return {
-			...operationMeta,
-			id,
-			type,
-			blockId,
-			...separator !== void 0 && { separator }
-		};
+		if (type === "mergeBlockWithNext") {
+			const mergedParagraphProperties = value["mergedParagraphProperties"] === void 0 ? void 0 : readParagraphProperties({
+				value,
+				key: "mergedParagraphProperties",
+				path
+			});
+			return {
+				...operationMeta,
+				id,
+				type,
+				blockId,
+				...separator !== void 0 && { separator },
+				...mergedParagraphProperties !== void 0 && { mergedParagraphProperties }
+			};
+		}
+		const firstParagraphProperties = value["firstParagraphProperties"] === void 0 ? void 0 : readParagraphProperties({
+			value,
+			key: "firstParagraphProperties",
+			path
+		});
+		const secondParagraphProperties = value["secondParagraphProperties"] === void 0 ? void 0 : readParagraphProperties({
+			value,
+			key: "secondParagraphProperties",
+			path
+		});
 		return {
 			...operationMeta,
 			id,
 			type,
 			blockId,
 			offset: readNonNegativeInteger(value, "offset", path),
-			...separator !== void 0 && { separator }
+			...separator !== void 0 && { separator },
+			...firstParagraphProperties !== void 0 && { firstParagraphProperties },
+			...secondParagraphProperties !== void 0 && { secondParagraphProperties }
 		};
 	}
 	if (type === "replaceInBlock") return {

package/dist/internal/headlessRevisionResolution.d.ts

@@ -3,12 +3,12 @@ import { Transaction } from "prosemirror-state";
 import { MarkType } from "prosemirror-model";
 //#region src/internal/headlessRevisionResolution.d.ts
 type HeadlessRevisionResolutionMode = "accept" | "reject";
-type HeadlessDeleteRange = {
+type HeadlessRange = {
   from: number;
   to: number;
 };
 type HeadlessInlineChangeTracking = {
-  ranges: readonly HeadlessDeleteRange[];
+  ranges: readonly HeadlessRange[];
   mappingFrom: number;
 };
 type AppendHeadlessInlineResolutionOptions = {

package/dist/internal/headlessRevisionResolution.js

@@ -76,6 +76,7 @@ const resolveInlineNode = ({ node, context, paragraphScope }) => {
 };
 const resolveInlineContent = ({ node, position, context, inheritedParagraphScope }) => {
 	const paragraphScope = node.type.name === "paragraph" && context.mode === "reject" ? { paragraph: node } : inheritedParagraphScope;
+	const replacementRangeStart = context.replacementRanges.length;
 	let resolvedNode = node;
 	if (node.isInline) {
 		const resolved = resolveInlineNode({
@@ -84,9 +85,10 @@ const resolveInlineContent = ({ node, position, context, inheritedParagraphScope
 			paragraphScope
 		});
 		if (resolved === null) {
-			context.deleteRanges.push({
+			context.replacementRanges.push({
 				from: position,
-				to: position + node.nodeSize
+				to: position + node.nodeSize,
+				newSize: 0
 			});
 			return null;
 		}
@@ -109,17 +111,36 @@ const resolveInlineContent = ({ node, position, context, inheritedParagraphScope
 		} else contentChanged = true;
 	});
 	if (!contentChanged) return resolvedNode;
+	let resolvedContent = Fragment.fromArray(children);
+	if (!resolvedNode.type.validContent(resolvedContent)) {
+		const fitted = resolvedNode.type.createAndFill(resolvedNode.attrs, resolvedContent, resolvedNode.marks);
+		if (!fitted || !resolvedNode.type.validContent(fitted.content)) {
+			if (!resolvedNode.isInline) return panic(`Headless inline resolution invalidated ${resolvedNode.type.name} content`);
+			context.replacementRanges.splice(replacementRangeStart, context.replacementRanges.length - replacementRangeStart, {
+				from: position,
+				to: position + node.nodeSize,
+				newSize: 0
+			});
+			return null;
+		}
+		context.replacementRanges.splice(replacementRangeStart, context.replacementRanges.length - replacementRangeStart, {
+			from: contentStart,
+			to: contentStart + node.content.size,
+			newSize: fitted.content.size
+		});
+		resolvedContent = fitted.content;
+	}
 	if (resolvedNode.type.name === "paragraph") context.changedParagraphRanges.push({
 		from: position,
 		to: position + resolvedNode.nodeSize
 	});
-	return rebuildNode(node, resolvedNode.attrs, Fragment.fromArray(children), resolvedNode.marks);
+	return rebuildNode(node, resolvedNode.attrs, resolvedContent, resolvedNode.marks);
 };
-const coalesceDeleteRanges = (deleteRanges) => {
+const coalesceReplacementRanges = (replacementRanges) => {
 	const coalesced = [];
-	for (const range of deleteRanges) {
+	for (const range of replacementRanges) {
 		const previous = coalesced.at(-1);
-		if (previous && range.from <= previous.to) previous.to = Math.max(previous.to, range.to);
+		if (previous && previous.newSize === 0 && range.newSize === 0 && range.from <= previous.to) previous.to = Math.max(previous.to, range.to);
 		else coalesced.push({ ...range });
 	}
 	return coalesced;
@@ -129,7 +150,7 @@ const appendHeadlessInlineResolution = ({ tr, mode, keepType, removeType, styleR
 		mode,
 		keepType,
 		removeType,
-		deleteRanges: [],
+		replacementRanges: [],
 		changedParagraphRanges: [],
 		styleResolver
 	};
@@ -139,10 +160,10 @@ const appendHeadlessInlineResolution = ({ tr, mode, keepType, removeType, styleR
 		context
 	});
 	if (!resolved || resolved.eq(tr.doc)) return null;
-	const positionMap = new StepMap(coalesceDeleteRanges(context.deleteRanges).flatMap(({ from, to }) => [
+	const positionMap = new StepMap(coalesceReplacementRanges(context.replacementRanges).flatMap(({ from, to, newSize }) => [
 		from,
 		to - from,
-		0
+		newSize
 	]));
 	const mappingFrom = tr.steps.length;
 	tr.step(new HeadlessInlineResolutionStep(0, tr.doc.content.size, new Slice(resolved.content, 0, 0), positionMap));

package/dist/prosemirror/commands/comments.js

@@ -50,7 +50,6 @@ function removeCommentMark(commentId) {
 		return true;
 	};
 }
-const BULK_INLINE_RESOLUTION_THRESHOLD = 256;
 /**
 * Resolve a tracked change: accept or reject.
 * - Accept: keep insertions (remove mark), delete deletions (remove text)
@@ -80,8 +79,6 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 			const pPrMarkOps = [];
 			const tableRowStructuralOps = [];
 			const tableCellStructuralOps = [];
-			const deferredRunPropertyChanges = [];
-			let bulkInlineCarrierCount = 0;
 			let removedSectionEndpointCount = 0;
 			const removedSectionReferences = [];
 			state.doc.nodesBetween(from, to, (node, pos) => {
@@ -156,31 +153,12 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 					return true;
 				}
 				if (!node.isInline) return true;
+				if (canBulkInlineResolution) return true;
 				const nodeEnd = pos + node.nodeSize;
 				const rangeFrom = Math.max(from, pos);
 				const rangeTo = Math.min(to, nodeEnd);
 				const runPropertyChangeMark = node.marks.find((mark) => mark.type.name === "runPropertyChange");
-				const resolvesRunPropertyChange = runPropertyChangeMark !== void 0 && expectRunPropertyChangeMarkAttrs(runPropertyChangeMark).changes.length > 0;
 				const removesNode = removeType !== void 0 && node.marks.some((mark) => mark.type === removeType && matchesRevision(mark));
-				const removesKeptMark = keepType !== void 0 && node.marks.some((mark) => mark.type === keepType && matchesRevision(mark));
-				if (canBulkInlineResolution) {
-					if (resolvesRunPropertyChange) deferredRunPropertyChanges.push({
-						tr,
-						node,
-						from: rangeFrom,
-						to: rangeTo,
-						mark: runPropertyChangeMark,
-						mode,
-						revisionSet,
-						styleResolver
-					});
-					if (removesNode) deleteRanges.push({
-						from: rangeFrom,
-						to: rangeTo
-					});
-					if (resolvesRunPropertyChange || removesNode || removesKeptMark) bulkInlineCarrierCount++;
-					return true;
-				}
 				if (runPropertyChangeMark) resolveRunPropertyChange({
 					tr,
 					node,
@@ -201,7 +179,7 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 				return true;
 			});
 			let bulkInlineChangeTracking = null;
-			if (canBulkInlineResolution && bulkInlineCarrierCount >= BULK_INLINE_RESOLUTION_THRESHOLD) bulkInlineChangeTracking = appendHeadlessInlineResolution({
+			if (canBulkInlineResolution) bulkInlineChangeTracking = appendHeadlessInlineResolution({
 				tr,
 				mode,
 				keepType,
@@ -209,7 +187,6 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 				styleResolver
 			});
 			else {
-				for (const deferred of deferredRunPropertyChanges) resolveRunPropertyChange(deferred);
 				if (removeKeptMarksInBulk) tr.removeMark(from, to, keepType);
 				let rangesToDelete = deleteRanges;
 				if (revisionSet === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",