@stll/folio-core 0.37.0 → 0.37.2

package/dist/compare/scenario.d.ts

@@ -1,7 +1,15 @@
-import { FolioAIInlineFormattingPatch } from "../ai-edits/types.js";
+import { FolioAIEditOperation, FolioAIInlineFormattingPatch } from "../ai-edits/types.js";
 import { CompareDocxParseError, CompareDocxSerializeError } from "./types.js";
 import { Result } from "better-result";
 //#region src/compare/scenario.d.ts
+type InsertTableRowOperation = Extract<FolioAIEditOperation, {
+  type: "insertTableRow";
+}>;
+type TableRowPosition = NonNullable<InsertTableRowOperation["position"]>;
+declare const EDIT_SCRIPT_TABLE_ROW_POSITION: {
+  readonly after: "after";
+  readonly before: "before";
+};
 type EditScriptStep = {
   type: "insertParagraphAfter";
   blockIndex: number;
@@ -46,6 +54,7 @@ type EditScriptStep = {
 } | {
   type: "insertTableRow";
   blockIndex: number;
+  position?: TableRowPosition;
   cellTexts: readonly string[];
 } | {
   type: "deleteTableRow";
@@ -74,4 +83,4 @@ type EditScriptResult = {
  */
 declare const applyEditScript: (base: ArrayBuffer, script: EditScript) => Promise<Result<EditScriptResult, CompareDocxParseError | CompareDocxSerializeError>>;
 //#endregion
-export { EDIT_SCRIPT_UNRESOLVED_REASONS, EditScript, EditScriptResult, EditScriptStep, EditScriptUnresolvedReason, EditScriptUnresolvedStep, applyEditScript };
+export { EDIT_SCRIPT_TABLE_ROW_POSITION, EDIT_SCRIPT_UNRESOLVED_REASONS, EditScript, EditScriptResult, EditScriptStep, EditScriptUnresolvedReason, EditScriptUnresolvedStep, applyEditScript };

package/dist/compare/scenario.js

@@ -24,6 +24,10 @@ import { Result, panic } from "better-result";
 * dropped: a script silently doing less than it says would weaken every
 * property built on it.
 */
+const EDIT_SCRIPT_TABLE_ROW_POSITION = {
+	after: "after",
+	before: "before"
+};
 const EDIT_SCRIPT_UNRESOLVED_REASONS = Object.freeze([
 	"block-out-of-range",
 	"block-not-in-table",
@@ -160,7 +164,7 @@ const planStep = ({ step, blocks, nextOperationId }) => {
 				id: nextOperationId(),
 				type: "insertTableRow",
 				blockId: block.id,
-				position: "after",
+				position: step.position ?? EDIT_SCRIPT_TABLE_ROW_POSITION.after,
 				cellTexts: [...step.cellTexts]
 			}]
 		} : {
@@ -260,4 +264,4 @@ const applyEditScript = async (base, script) => {
 	});
 };
 //#endregion
-export { EDIT_SCRIPT_UNRESOLVED_REASONS, applyEditScript };
+export { EDIT_SCRIPT_TABLE_ROW_POSITION, EDIT_SCRIPT_UNRESOLVED_REASONS, applyEditScript };

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: ("glyphRun" | "rect" | "line" | "image" | "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.2",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",