@stll/folio-core 0.61.0 → 0.62.0

package/dist/utils/replaceText.js

@@ -1,38 +1,33 @@
 import { cloneDocumentWithParagraphPropertySources } from "../docx/paragraphPropertySource.js";
-import { textFormattingToMarks } from "../prosemirror/commands/formatting.js";
-import { fromProseDoc } from "../prosemirror/conversion/fromProseDoc.js";
-import { toProseDoc } from "../prosemirror/conversion/toProseDoc.js";
-import { resolveFindMatchRange } from "../prosemirror/findReplaceSelection.js";
-import { schema } from "../prosemirror/schema/index.js";
-import { EditorState } from "prosemirror-state";
+import { getFindParagraphText } from "./findReplace.js";
+import { panic } from "better-result";
 //#region src/utils/replaceText.ts
-/**
-* Lightweight text replacement on the document model.
-* Used by find & replace. Operates immutably.
-*/
 /** Replace text within a range in the document. Returns a new document. */
 function replaceTextInDocument(doc, range, text, formatting) {
 	const newDoc = cloneDocumentWithParagraphPropertySources(doc);
 	const body = newDoc.package.document;
 	const { start, end } = range;
 	if (start.paragraphIndex === end.paragraphIndex) {
-		const proseDoc = toProseDoc(newDoc);
-		const proseRange = resolveFindMatchRange(proseDoc, {
-			paragraphIndex: start.paragraphIndex,
+		const paragraph = getParagraphByIndex(body, start.paragraphIndex);
+		if (!paragraph) return newDoc;
+		replaceTextInParagraph({
+			paragraph,
 			startOffset: start.offset,
-			endOffset: end.offset
+			endOffset: end.offset,
+			text,
+			...formatting && { formatting }
 		});
-		if (proseRange === null) return newDoc;
-		const transaction = EditorState.create({ doc: proseDoc }).tr;
-		if (text.length > 0 && formatting !== void 0) transaction.replaceWith(proseRange.from, proseRange.to, schema.text(text, textFormattingToMarks(formatting)));
-		else transaction.insertText(text, proseRange.from, proseRange.to);
-		return fromProseDoc(transaction.doc, newDoc, { stylesheetSource: { type: "package" } });
 	} else {
 		const startParagraph = getParagraphByIndex(body, start.paragraphIndex);
 		if (!startParagraph) return newDoc;
-		const startText = getParagraphText(startParagraph);
-		startParagraph.content = deleteTextInParagraph(startParagraph, start.offset, startText.length);
-		startParagraph.content = insertTextAtOffset(startParagraph, start.offset, text, formatting);
+		const startText = getFindParagraphText(startParagraph);
+		replaceTextInParagraph({
+			paragraph: startParagraph,
+			startOffset: start.offset,
+			endOffset: startText.length,
+			text,
+			...formatting && { formatting }
+		});
 		const paragraphsToRemove = [];
 		for (let i = start.paragraphIndex + 1; i <= end.paragraphIndex; i++) paragraphsToRemove.push(getTopLevelParagraphBlockIndex(body, i));
 		for (let i = paragraphsToRemove.length - 1; i >= 0; i--) {
@@ -74,107 +69,139 @@ function getParagraphByIndex(body, paragraphIndex) {
 	};
 	return walkBlocks(body.content);
 }
-function getParagraphText(paragraph) {
-	let text = "";
-	for (const item of paragraph.content) if (item.type === "run") {
-		for (const c of item.content) if (c.type === "text") text += c.text;
-	} else if (item.type === "hyperlink") for (const child of item.children) {
-		if (child.type !== "run") continue;
-		for (const c of child.content) if (c.type === "text") text += c.text;
-	}
-	return text;
-}
-function deleteTextInParagraph(paragraph, startOffset, endOffset) {
-	const result = [];
-	let currentOffset = 0;
-	for (const item of paragraph.content) if (item.type === "run") {
-		const newContent = [];
-		for (const content of item.content) if (content.type === "text") {
-			const textStart = currentOffset;
-			const textEnd = currentOffset + content.text.length;
-			if (textEnd <= startOffset || textStart >= endOffset) newContent.push(content);
-			else {
-				let newText = "";
-				if (textStart < startOffset) newText += content.text.slice(0, startOffset - textStart);
-				if (textEnd > endOffset) newText += content.text.slice(endOffset - textStart);
-				if (newText) newContent.push({
-					...content,
-					text: newText
-				});
-			}
-			currentOffset = textEnd;
-		} else newContent.push(content);
-		if (newContent.length > 0) result.push({
-			...item,
-			content: newContent
-		});
-	} else result.push(item);
-	return result;
-}
-function insertTextAtOffset(paragraph, offset, text, formatting) {
-	if (!text) return paragraph.content;
+const itemTextLength = (item) => getFindParagraphText({
+	type: "paragraph",
+	content: [item]
+}).length;
+/** Walk authored offsets once, preserving wrappers and opaque source units. */
+const replaceTextInParagraph = ({ paragraph, startOffset, endOffset, text, formatting }) => {
 	let currentOffset = 0;
-	for (const item of paragraph.content) if (item.type === "run") for (let ci = 0; ci < item.content.length; ci++) {
-		const content = item.content[ci];
-		if (content.type === "text") {
-			const textStart = currentOffset;
-			const textEnd = currentOffset + content.text.length;
-			if (offset >= textStart && offset <= textEnd) {
-				const relOffset = offset - textStart;
-				if (formatting) {
-					const before = content.text.slice(0, relOffset);
-					const after = content.text.slice(relOffset);
-					const newContent = [];
-					if (before) newContent.push({
-						type: "text",
-						text: before
+	let inserted = false;
+	const visit = (items) => {
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			const item = items.at(itemIndex);
+			if (!item) continue;
+			switch (item.type) {
+				case "run": {
+					const before = [];
+					const after = [];
+					let splitAtInsertion = false;
+					for (const unit of item.content) {
+						const unitStart = currentOffset;
+						const unitText = getFindParagraphText({
+							type: "paragraph",
+							content: [{
+								type: "run",
+								content: [unit]
+							}]
+						});
+						const unitLength = unitText.length;
+						const unitEnd = unitStart + unitLength;
+						currentOffset = unitEnd;
+						const output = splitAtInsertion ? after : before;
+						if (unit.type === "preservedXml" || unitLength === 0) {
+							output.push(unit);
+							continue;
+						}
+						const overlaps = unitEnd > startOffset && unitStart < endOffset;
+						if (!overlaps && !(!inserted && startOffset === endOffset && startOffset >= unitStart && startOffset <= unitEnd)) {
+							output.push(unit);
+							continue;
+						}
+						if (unit.type !== "text" && !overlaps) {
+							if (startOffset === unitEnd) output.push(unit);
+							inserted = true;
+							if (formatting) splitAtInsertion = true;
+							else if (text) output.push({
+								type: "text",
+								text
+							});
+							if (startOffset === unitStart) (splitAtInsertion ? after : before).push(unit);
+							continue;
+						}
+						const prefix = unitText.slice(0, Math.max(0, startOffset - unitStart));
+						const suffix = unitText.slice(Math.max(0, endOffset - unitStart));
+						if (prefix) output.push({
+							type: "text",
+							text: prefix
+						});
+						if (!inserted) {
+							inserted = true;
+							if (formatting) splitAtInsertion = true;
+							else if (text) output.push({
+								type: "text",
+								text
+							});
+						}
+						if (suffix) (splitAtInsertion ? after : before).push({
+							type: "text",
+							text: suffix
+						});
+					}
+					if (!splitAtInsertion) {
+						item.content = before;
+						break;
+					}
+					const replacement = [];
+					if (before.length > 0) replacement.push({
+						...item,
+						content: before
 					});
-					const newRun = {
-						type: "text",
-						text
-					};
-					item.content.splice(ci, 1, ...newContent);
-					const insertRun = {
+					if (text) replacement.push({
 						type: "run",
-						content: [newRun],
-						formatting
-					};
-					const afterItems = [];
-					if (after) afterItems.push({
-						type: "text",
-						text: after
+						content: [{
+							type: "text",
+							text
+						}],
+						...formatting && { formatting }
 					});
-					const remaining = item.content.splice(ci + newContent.length);
-					const afterRun = {
-						type: "run",
-						content: [...remaining, ...afterItems],
-						...item.formatting !== void 0 ? { formatting: item.formatting } : {}
-					};
-					const idx = paragraph.content.indexOf(item);
-					paragraph.content.splice(idx + 1, 0, insertRun);
-					if (afterItems.length > 0 || remaining.length > 0) paragraph.content.splice(idx + 2, 0, afterRun);
-					return paragraph.content;
+					if (after.length > 0) replacement.push({
+						...item,
+						content: after
+					});
+					items.splice(itemIndex, 1, ...replacement);
+					itemIndex += replacement.length - 1;
+					break;
 				}
-				content.text = content.text.slice(0, relOffset) + text + content.text.slice(relOffset);
-				return paragraph.content;
+				case "hyperlink":
+					visit(item.children);
+					break;
+				case "inlineWrapper":
+				case "inlineSdt":
+				case "insertion":
+				case "deletion":
+				case "moveFrom":
+				case "moveTo":
+					visit(item.content);
+					break;
+				case "simpleField":
+				case "complexField":
+				case "preservedInline":
+				case "mathEquation":
+				case "bookmarkStart":
+				case "bookmarkEnd":
+				case "commentRangeStart":
+				case "commentRangeEnd":
+				case "commentReference":
+				case "moveFromRangeStart":
+				case "moveFromRangeEnd":
+				case "moveToRangeStart":
+				case "moveToRangeEnd":
+					currentOffset += itemTextLength(item);
+					break;
+				default: panic("Unsupported replacement paragraph content", { content: item });
 			}
-			currentOffset = textEnd;
 		}
-	}
-	const lastRun = paragraph.content.findLast((item) => item.type === "run");
-	if (lastRun) lastRun.content.push({
-		type: "text",
-		text
-	});
-	else paragraph.content.push({
+	};
+	visit(paragraph.content);
+	if (!inserted && startOffset === endOffset && startOffset === currentOffset && text) paragraph.content.push({
 		type: "run",
 		content: [{
 			type: "text",
 			text
 		}],
-		formatting: formatting ?? {}
+		...formatting ? { formatting } : {}
 	});
-	return paragraph.content;
-}
+};
 //#endregion
 export { replaceTextInDocument };

package/package.json

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