Extract reconcile (#85)

frontend/obsidian-plugin/jest.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-	preset: "ts-jest/presets/js-with-babel-esm"
+	preset: "ts-jest"
 };

frontend/obsidian-plugin/src/obsidian-file-system.ts

@@ -1,13 +1,9 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
-import type {
-	FileSystemOperations,
-	RelativePath,
-	TextWithCursors
-} from "sync-client";
-import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
+import type { FileSystemOperations, RelativePath } from "sync-client";
 import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
-import { getCursorsFromEditor } from "./views/cursors/get-cursors-from-editor";
+import { getSelectionsFromEditor } from "./views/cursors/get-selections-from-editor";
+import type { TextWithCursors, CursorPosition } from "reconcile-text";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public constructor(
@@ -80,18 +76,18 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 		if (view?.file?.path === path) {
 			const text = view.editor.getValue();
 
-			const cursors = getCursorsFromEditor(view.editor).flatMap(
-				({ id, start: anchor, end: head }) => [
-					{
-						id: 2 * id,
-						characterPosition: anchor
-					},
-					{
-						id: 2 * id + 1,
-						characterPosition: head
-					}
-				]
-			);
+			const cursors: CursorPosition[] = getSelectionsFromEditor(
+				view.editor
+			).flatMap(({ id, start: anchor, end: head }) => [
+				{
+					id: 2 * id,
+					position: anchor
+				},
+				{
+					id: 2 * id + 1,
+					position: head
+				}
+			]);
 
 			const result = updater({
 				text,
@@ -109,13 +105,10 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 				const from = result.cursors[2 * i];
 				const to = result.cursors[2 * i + 1];
 				const { line: fromLine, column: fromColumn } =
-					positionToLineAndColumn(
-						result.text,
-						from.characterPosition
-					);
+					positionToLineAndColumn(result.text, from.position);
 
 				const { line: toLine, column: toColumn } =
-					positionToLineAndColumn(result.text, to.characterPosition);
+					positionToLineAndColumn(result.text, to.position);
 
 				selections.push({
 					anchor: { line: fromLine, ch: fromColumn },

frontend/obsidian-plugin/src/vault-link-plugin.ts

@@ -1,9 +1,7 @@
 import type {
 	Editor,
-	EventRef,
 	MarkdownFileInfo,
 	TAbstractFile,
-	Workspace,
 	WorkspaceLeaf
 } from "obsidian";
 import type { MarkdownView } from "obsidian";
@@ -13,7 +11,6 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import type { CursorSpan, RelativePath } from "sync-client";
 import { SyncClient, rateLimit, DEFAULT_SETTINGS } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
@@ -24,7 +21,6 @@ import {
 	remoteCursorsPlugin,
 	setCursors
 } from "./views/cursors/remote-cursors-plugin";
-import { getCursorsFromEditor } from "./views/cursors/get-cursors-from-editor";
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;

frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts

@@ -1,13 +1,13 @@
 import type { Editor } from "obsidian";
 import { lineAndColumnToPosition } from "../../utils/line-and-column-to-position";
 
-export interface Cursor {
+export interface Selection {
 	id: number;
 	start: number;
 	end: number;
 }
 
-export function getCursorsFromEditor(editor: Editor): Cursor[] {
+export function getSelectionsFromEditor(editor: Editor): Selection[] {
 	const text = editor.getValue();
 	return editor.listSelections().map(({ anchor, head }, i) => ({
 		id: i,

frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts

@@ -1,20 +1,20 @@
 import type { Workspace } from "obsidian";
-import { EventRef, Editor, MarkdownView, MarkdownFileInfo } from "obsidian";
-import type { Logger, SyncClient } from "sync-client";
-import type { Cursor } from "./get-cursors-from-editor";
-import { getCursorsFromEditor } from "./get-cursors-from-editor";
+import { MarkdownView } from "obsidian";
+import type { SyncClient } from "sync-client";
+import type { Selection } from "./get-selections-from-editor";
+import { getSelectionsFromEditor } from "./get-selections-from-editor";
 
 export class LocalCursorUpdateListener {
 	private static readonly UPDATE_INTERVAL_MS = 50;
 	private readonly eventHandle: NodeJS.Timeout;
-	private lastCursorState: Record<string, Cursor[]> = {};
+	private lastCursorState: Record<string, Selection[]> = {};
 
 	public constructor(
 		private readonly client: SyncClient,
 		private readonly workspace: Workspace
 	) {
 		this.eventHandle = setInterval(() => {
-			this.updateAllCursors();
+			this.updateAllSelections();
 		}, LocalCursorUpdateListener.UPDATE_INTERVAL_MS);
 	}
 
@@ -22,8 +22,8 @@ export class LocalCursorUpdateListener {
 		clearInterval(this.eventHandle);
 	}
 
-	private updateAllCursors(): void {
-		const currentCursors = this.getAllCursors();
+	private updateAllSelections(): void {
+		const currentCursors = this.getAllSelections();
 		if (
 			JSON.stringify(this.lastCursorState) ===
 			JSON.stringify(currentCursors)
@@ -40,8 +40,8 @@ export class LocalCursorUpdateListener {
 			});
 	}
 
-	private getAllCursors(): Record<string, Cursor[]> {
-		const cursors: Record<string, Cursor[]> = {};
+	private getAllSelections(): Record<string, Selection[]> {
+		const cursors: Record<string, Selection[]> = {};
 		this.workspace
 			.getLeavesOfType("markdown")
 			.map((leaf) => leaf.view)
@@ -51,7 +51,7 @@ export class LocalCursorUpdateListener {
 				if (!file) {
 					return;
 				}
-				cursors[file.path] = getCursorsFromEditor(view.editor);
+				cursors[file.path] = getSelectionsFromEditor(view.editor);
 			});
 		return cursors;
 	}