@stll/folio-core 0.31.1 → 0.31.2

package/dist/ai-edits/word-diff.js

@@ -1,5 +1,21 @@
 //#region src/ai-edits/word-diff.ts
-const tokenize = (s) => s.match(/\s+|\S+/gu) ?? [];
+const WHITESPACE = /\s/u;
+const tokenize = (s) => {
+	const tokens = [];
+	let tokenStart = 0;
+	let cursor = 0;
+	while (cursor < s.length) {
+		while (cursor < s.length && WHITESPACE.test(s.charAt(cursor))) cursor++;
+		if (cursor === s.length) break;
+		while (cursor < s.length && !WHITESPACE.test(s.charAt(cursor))) cursor++;
+		tokens.push(s.slice(tokenStart, cursor));
+		tokenStart = cursor;
+	}
+	const last = tokens.at(-1);
+	if (last === void 0) return s.length === 0 ? [] : [s];
+	if (tokenStart < s.length) tokens[tokens.length - 1] = last + s.slice(tokenStart);
+	return tokens;
+};
 /**
 * Cell budget for the O(n*m) word-diff DP table below, mirroring
 * `MAX_LCS_CELLS` in `version-comparison.ts`. `before`/`after` come from

package/dist/docx/server/createBilingualDocument.js

@@ -86,6 +86,7 @@ function createBilingualDocument(source, options) {
 		cloner
 	});
 	const paraIds = createParaIdMinter(collectPackageParaIds(source.package));
+	const bookmarkIds = createBookmarkIdMinter(source.package);
 	const rows = [];
 	const content = [];
 	let sectionRows = [];
@@ -97,7 +98,7 @@ function createBilingualDocument(source, options) {
 	const copyParagraph = (paragraph) => {
 		const targetParaId = paraIds.mint(paragraph.paraId);
 		return {
-			copy: cloneParagraphForTarget(paragraph, targetParaId, styleCloner, cloner),
+			copy: cloneParagraphForTarget(paragraph, targetParaId, styleCloner, cloner, bookmarkIds),
 			ref: {
 				sourceParaId: paragraph.paraId,
 				targetParaId,
@@ -152,7 +153,8 @@ function createBilingualDocument(source, options) {
 				editableParagraphIds: options.editableParagraphIds,
 				paraIds,
 				styleCloner,
-				cloner
+				cloner,
+				bookmarkIds
 			});
 			rows.push({
 				kind: "table",
@@ -362,7 +364,7 @@ const createStyleCloner = ({ styleById, suffix, cloner }) => {
 		})
 	};
 };
-const cloneParagraphForTarget = (paragraph, targetParaId, styleCloner, cloner) => {
+const cloneParagraphForTarget = (paragraph, targetParaId, styleCloner, cloner, bookmarkIds) => {
 	const { textId: _textId, sectionProperties: _sectionProperties, ...rest } = paragraph;
 	const formatting = paragraph.formatting;
 	const nextFormatting = formatting && {
@@ -379,12 +381,56 @@ const cloneParagraphForTarget = (paragraph, targetParaId, styleCloner, cloner) =
 	};
 	return {
 		...rest,
-		content: structuredClone(paragraph.content),
+		content: remapClonedBookmarkIds(structuredClone(paragraph.content), bookmarkIds),
 		paraId: targetParaId,
 		...nextFormatting && { formatting: nextFormatting },
 		...paragraph.listRendering && { listRendering: remapListRendering(paragraph.listRendering, cloner) }
 	};
 };
+const createBookmarkIdMinter = (source) => {
+	let nextId = 0;
+	const remapped = /* @__PURE__ */ new Map();
+	const visit = (value, seen) => {
+		if (typeof value !== "object" || value === null || seen.has(value)) return;
+		seen.add(value);
+		if (Array.isArray(value)) {
+			value.forEach((item) => visit(item, seen));
+			return;
+		}
+		const record = value;
+		if (record["type"] === "bookmarkStart" || record["type"] === "bookmarkEnd") {
+			const id = record["id"];
+			if (typeof id === "number") nextId = Math.max(nextId, id + 1);
+		}
+		Object.values(record).forEach((item) => visit(item, seen));
+	};
+	visit(source, /* @__PURE__ */ new Set());
+	return { mint: (sourceId) => {
+		const existing = remapped.get(sourceId);
+		if (existing !== void 0) return existing;
+		const id = nextId++;
+		remapped.set(sourceId, id);
+		return id;
+	} };
+};
+const remapClonedBookmarkIds = (value, bookmarkIds) => {
+	const visit = (item, seen) => {
+		if (typeof item !== "object" || item === null || seen.has(item)) return;
+		seen.add(item);
+		if (Array.isArray(item)) {
+			item.forEach((child) => visit(child, seen));
+			return;
+		}
+		const record = item;
+		if (record["type"] === "bookmarkStart" || record["type"] === "bookmarkEnd") {
+			const id = record["id"];
+			if (typeof id === "number") record["id"] = bookmarkIds.mint(id);
+		}
+		Object.values(record).forEach((child) => visit(child, seen));
+	};
+	visit(value, /* @__PURE__ */ new Set());
+	return value;
+};
 const remapListRendering = (rendering, cloner) => {
 	const clonedAbstract = rendering.abstractNumId === void 0 ? void 0 : cloner.clonedAbstractNumId(rendering.abstractNumId);
 	return {
@@ -399,7 +445,7 @@ const collectTableParagraphs = (table) => {
 	else out.push(...collectTableParagraphs(item));
 	return out;
 };
-const cloneTableForTarget = ({ table, editableParagraphIds, paraIds, styleCloner, cloner }) => {
+const cloneTableForTarget = ({ table, editableParagraphIds, paraIds, styleCloner, cloner, bookmarkIds }) => {
 	const paragraphs = [];
 	const cloneTable = (source) => ({
 		...structuredClone(source),
@@ -410,7 +456,7 @@ const cloneTableForTarget = ({ table, editableParagraphIds, paraIds, styleCloner
 				content: cell.content.map((item) => {
 					if (item.type === "table") return cloneTable(item);
 					const targetParaId = paraIds.mint(item.paraId);
-					const copy = cloneParagraphForTarget(item, targetParaId, styleCloner, cloner);
+					const copy = cloneParagraphForTarget(item, targetParaId, styleCloner, cloner, bookmarkIds);
 					if (item.paraId !== void 0 && editableParagraphIds.has(item.paraId)) paragraphs.push({
 						sourceParaId: item.paraId,
 						targetParaId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.31.1",
+  "version": "0.31.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",