Extract reconcile (#85)

frontend/sync-client/src/file-operations/file-operations.ts

@@ -1,18 +1,10 @@
 import type { Logger } from "../tracing/logger";
-import type {
-	FileSystemOperations,
-	TextWithCursors
-} from "./filesystem-operations";
+import type { FileSystemOperations } from "./filesystem-operations";
 import type { Database, RelativePath } from "../persistence/database";
-import {
-	CursorPosition,
-	isBinary,
-	isFileTypeMergable,
-	mergeTextWithCursors,
-	TextWithCursors as RustTextWithCursors
-} from "sync_lib";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
-
+import type { TextWithCursors } from "reconcile-text";
+import { isBinary, reconcile } from "reconcile-text";
+import { isFileTypeMergable } from "../utils/is-file-type-mergable";
 export class FileOperations {
 	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
 	private readonly fs: SafeFileSystemOperations;
@@ -102,39 +94,25 @@ export class FileOperations {
 		await this.fs.atomicUpdateText(
 			path,
 			({ text, cursors }: TextWithCursors): TextWithCursors => {
-				text = text.replace(this.nativeLineEndings, "\n");
-
 				this.logger.debug(
 					`Performing a 3-way merge for ${path} with the expected content`
 				);
 
-				const left = new RustTextWithCursors(
-					text,
-					cursors.map(
-						(cursor) =>
-							new CursorPosition(
-								cursor.id,
-								cursor.characterPosition
-							)
-					)
+				text = text.replace(this.nativeLineEndings, "\n");
+				const merged = reconcile(
+					expectedText,
+					{ text, cursors },
+					newText
 				);
-				const right = new RustTextWithCursors(newText, []);
-				const merged = mergeTextWithCursors(expectedText, left, right);
 
-				const resultText = merged
-					.text()
-					.replace("\n", this.nativeLineEndings);
-
-				const resultCursors = merged.cursors().map((cursor) => ({
-					id: cursor.id(),
-					characterPosition: cursor.characterPosition()
-				}));
-
-				merged.free();
+				const resultText = merged.text.replace(
+					"\n",
+					this.nativeLineEndings
+				);
 
 				return {
 					text: resultText,
-					cursors: resultCursors
+					cursors: merged.cursors
 				};
 			}
 		);