@stll/folio-core 0.60.0 → 0.62.0

package/dist/utils/replaceText.js

@@ -1,4 +1,6 @@
 import { cloneDocumentWithParagraphPropertySources } from "../docx/paragraphPropertySource.js";
+import { getFindParagraphText } from "./findReplace.js";
+import { panic } from "better-result";
 //#region src/utils/replaceText.ts
 /** Replace text within a range in the document. Returns a new document. */
 function replaceTextInDocument(doc, range, text, formatting) {
@@ -8,14 +10,24 @@ function replaceTextInDocument(doc, range, text, formatting) {
 	if (start.paragraphIndex === end.paragraphIndex) {
 		const paragraph = getParagraphByIndex(body, start.paragraphIndex);
 		if (!paragraph) return newDoc;
-		paragraph.content = deleteTextInParagraph(paragraph, start.offset, end.offset);
-		paragraph.content = insertTextAtOffset(paragraph, start.offset, text, formatting);
+		replaceTextInParagraph({
+			paragraph,
+			startOffset: start.offset,
+			endOffset: end.offset,
+			text,
+			...formatting && { formatting }
+		});
 	} 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--) {
@@ -57,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/dist/utils/sliceText.d.ts

@@ -0,0 +1,2 @@
+import { sliceText } from "@stll/utf8-boundaries";
+export { sliceText };

package/dist/utils/sliceText.js

@@ -0,0 +1,2 @@
+import { sliceText } from "@stll/utf8-boundaries";
+export { sliceText };

package/dist/utils/textEncoding.d.ts

@@ -0,0 +1,2 @@
+import { base64ToBytes, bytesToBase64, bytesToBase64Url, bytesToHex, createTextReader, decodeText, encodeBinaryString, encodeUtf16BE, encodeUtf16LE, encodeUtf8, readBlobText } from "@stll/utf8-boundaries";
+export { base64ToBytes, bytesToBase64, bytesToBase64Url, bytesToHex, createTextReader, decodeText, encodeBinaryString, encodeUtf16BE, encodeUtf16LE, encodeUtf8, readBlobText };

package/dist/utils/textEncoding.js

@@ -0,0 +1,2 @@
+import { base64ToBytes, bytesToBase64, bytesToBase64Url, bytesToHex, createTextReader, decodeText, encodeBinaryString, encodeUtf16BE, encodeUtf16LE, encodeUtf8, readBlobText } from "@stll/utf8-boundaries";
+export { base64ToBytes, bytesToBase64, bytesToBase64Url, bytesToHex, createTextReader, decodeText, encodeBinaryString, encodeUtf16BE, encodeUtf16LE, encodeUtf8, readBlobText };

package/dist/utils/tiffConverter.d.ts

@@ -1,13 +1,4 @@
 //#region src/utils/tiffConverter.d.ts
-/**
- * TIFF to PNG Converter
- *
- * Browsers don't support TIFF in `<img>` tags, so DOCX-embedded TIFFs are
- * decoded with utif2 and re-encoded as PNG via the Canvas API. Returns
- * null in environments without Canvas (Node.js parsing); callers fall
- * back to the raw TIFF data URL, which won't render in browsers but is
- * fine for headless round-trips.
- */
 /**
  * Budget shared by every TIFF in one package. The per-image cap bounds a single
  * decode; without a running total a package of many large TIFFs still adds up.

package/dist/utils/tiffConverter.js

@@ -1,3 +1,4 @@
+import { base64ToBytes } from "./textEncoding.js";
 //#region src/utils/tiffConverter.ts
 /**
 * TIFF to PNG Converter
@@ -79,10 +80,7 @@ function dataUrlToArrayBuffer(dataUrl) {
 	const base64 = dataUrl.split(",", 2)[1];
 	if (!base64) return null;
 	try {
-		const binary = atob(base64);
-		const bytes = new Uint8Array(binary.length);
-		for (let i = 0; i < binary.length; i++) bytes[i] = binary.codePointAt(i) ?? 0;
-		return bytes.buffer;
+		return base64ToBytes(base64).buffer;
 	} catch {
 		return null;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.60.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",
@@ -36,98 +36,123 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     },
     "./i18n/messages/*": {
       "types": "./dist/i18n/messages/*.gen.d.ts",
-      "import": "./dist/i18n/messages/*.gen.js"
+      "import": "./dist/i18n/messages/*.gen.js",
+      "default": "./dist/i18n/messages/*.gen.js"
     },
     "./i18n/messages/*.gen": {
       "types": "./dist/i18n/messages/*.gen.d.ts",
-      "import": "./dist/i18n/messages/*.gen.js"
+      "import": "./dist/i18n/messages/*.gen.js",
+      "default": "./dist/i18n/messages/*.gen.js"
     },
     "./i18n/messages/locales": {
       "types": "./dist/i18n/messages/locales.d.ts",
-      "import": "./dist/i18n/messages/locales.js"
+      "import": "./dist/i18n/messages/locales.js",
+      "default": "./dist/i18n/messages/locales.js"
     },
     "./markdown": {
       "types": "./dist/markdown/index.d.ts",
-      "import": "./dist/markdown/index.js"
+      "import": "./dist/markdown/index.js",
+      "default": "./dist/markdown/index.js"
     },
     "./server": {
       "types": "./dist/server.d.ts",
-      "import": "./dist/server.js"
+      "import": "./dist/server.js",
+      "default": "./dist/server.js"
     },
     "./redline": {
       "types": "./dist/redline.d.ts",
-      "import": "./dist/redline.js"
+      "import": "./dist/redline.js",
+      "default": "./dist/redline.js"
     },
     "./ai-edits": {
       "types": "./dist/ai-edits/index.d.ts",
-      "import": "./dist/ai-edits/index.js"
+      "import": "./dist/ai-edits/index.js",
+      "default": "./dist/ai-edits/index.js"
     },
     "./content-controls": {
       "types": "./dist/content-controls/index.d.ts",
-      "import": "./dist/content-controls/index.js"
+      "import": "./dist/content-controls/index.js",
+      "default": "./dist/content-controls/index.js"
     },
     "./compat/eigenpal": {
       "types": "./dist/compat/eigenpal.d.ts",
-      "import": "./dist/compat/eigenpal.js"
+      "import": "./dist/compat/eigenpal.js",
+      "default": "./dist/compat/eigenpal.js"
     },
     "./watermark": {
       "types": "./dist/watermark/index.d.ts",
-      "import": "./dist/watermark/index.js"
+      "import": "./dist/watermark/index.js",
+      "default": "./dist/watermark/index.js"
     },
     "./layout-engine": {
       "types": "./dist/layout-engine/index.d.ts",
-      "import": "./dist/layout-engine/index.js"
+      "import": "./dist/layout-engine/index.js",
+      "default": "./dist/layout-engine/index.js"
     },
     "./layout-painter": {
       "types": "./dist/layout-painter/index.d.ts",
-      "import": "./dist/layout-painter/index.js"
+      "import": "./dist/layout-painter/index.js",
+      "default": "./dist/layout-painter/index.js"
     },
     "./layout-bridge/engine/measuring": {
       "types": "./dist/layout-bridge/engine/measuring/index.d.ts",
-      "import": "./dist/layout-bridge/engine/measuring/index.js"
+      "import": "./dist/layout-bridge/engine/measuring/index.js",
+      "default": "./dist/layout-bridge/engine/measuring/index.js"
     },
     "./prosemirror": {
       "types": "./dist/prosemirror/index.d.ts",
-      "import": "./dist/prosemirror/index.js"
+      "import": "./dist/prosemirror/index.js",
+      "default": "./dist/prosemirror/index.js"
     },
     "./prosemirror/attrs": {
       "types": "./dist/prosemirror/attrs/index.d.ts",
-      "import": "./dist/prosemirror/attrs/index.js"
+      "import": "./dist/prosemirror/attrs/index.js",
+      "default": "./dist/prosemirror/attrs/index.js"
     },
     "./prosemirror/conversion": {
       "types": "./dist/prosemirror/conversion/index.d.ts",
-      "import": "./dist/prosemirror/conversion/index.js"
+      "import": "./dist/prosemirror/conversion/index.js",
+      "default": "./dist/prosemirror/conversion/index.js"
     },
     "./prosemirror/extensions": {
       "types": "./dist/prosemirror/extensions/index.d.ts",
-      "import": "./dist/prosemirror/extensions/index.js"
+      "import": "./dist/prosemirror/extensions/index.js",
+      "default": "./dist/prosemirror/extensions/index.js"
     },
     "./prosemirror/schema": {
       "types": "./dist/prosemirror/schema/index.d.ts",
-      "import": "./dist/prosemirror/schema/index.js"
+      "import": "./dist/prosemirror/schema/index.js",
+      "default": "./dist/prosemirror/schema/index.js"
     },
     "./docx": {
       "types": "./dist/docx/index.d.ts",
-      "import": "./dist/docx/index.js"
+      "import": "./dist/docx/index.js",
+      "default": "./dist/docx/index.js"
     },
     "./docx/document-clone": {
       "types": "./dist/docx/documentClone.d.ts",
-      "import": "./dist/docx/documentClone.js"
+      "import": "./dist/docx/documentClone.js",
+      "default": "./dist/docx/documentClone.js"
     },
     "./text-shaping": {
       "types": "./dist/text-shaping.d.ts",
-      "import": "./dist/text-shaping.js"
+      "import": "./dist/text-shaping.js",
+      "default": "./dist/text-shaping.js"
     },
     "./text-shaping/wasm": "./dist/generated/text_shaper_bg.wasm",
     "./docx/paragraphPropertySource": null,
     "./internal/*": null,
+    "./_virtual/*": null,
+    "./generated/*": null,
     "./*": {
       "types": "./dist/*.d.ts",
-      "import": "./dist/*.js"
+      "import": "./dist/*.js",
+      "default": "./dist/*.js"
     }
   },
   "publishConfig": {
@@ -146,9 +171,10 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.37.0",
+    "@stll/docx-core": "^0.38.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.6.2",
+    "@stll/utf8-boundaries": "0.1.0",
     "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.16",