Format

.vscode/settings.json

@@ -5,6 +5,6 @@
         "**/dist": true,
         "**/node_modules": true,
         "**/.sqlx": true,
-        "**/target": true,
+        "**/target": true
-    },
+    }
 }

docs/.cspell.json

@@ -2,12 +2,7 @@
     "version": "0.2",
     "language": "en-GB",
     "dictionaries": ["en-gb"],
-    "ignorePaths": [
+    "ignorePaths": ["node_modules", ".vitepress/dist", ".vitepress/cache", "package-lock.json"],
-        "node_modules",
-        ".vitepress/dist",
-        ".vitepress/cache",
-        "package-lock.json"
-    ],
     "words": [
         "VaultLink",
         "Obsidian",

frontend/obsidian-plugin/tsconfig.json

@@ -6,12 +6,7 @@
         "strict": true,
         "moduleResolution": "bundler",
         "allowSyntheticDefaultImports": true,
-        "lib": [
+        "lib": ["DOM", "ES2024"]
-            "DOM",
-            "ES2024"
-        ]
     },
-    "exclude": [
+    "exclude": ["./dist"]
-        "./dist"
-    ]
 }

frontend/obsidian-plugin/webpack.config.js

@@ -46,7 +46,7 @@ module.exports = (env, argv) => ({
                     const source = path.resolve(__dirname, "dist");
                     const destinations = [
                         "/volumes/syncthing/Desktop/test/test/.obsidian/plugins/vault-link",
-                        "/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link",
+                        "/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link"
                         // "/home/andras/obsidian-test/.obsidian/plugins/vault-link"
                     ];
                     destinations.forEach((destination) => {

frontend/sync-client/src/services/types/ClientCursors.ts

@@ -1,8 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DocumentWithCursors } from "./DocumentWithCursors";
 
-export interface ClientCursors {
+export interface ClientCursors { userName: string, deviceId: string, documentsWithCursors: DocumentWithCursors[], }
-    userName: string;
-    deviceId: string;
-    documentsWithCursors: DocumentWithCursors[];
-}

frontend/sync-client/src/services/types/CursorPositionFromClient.ts

@@ -1,6 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DocumentWithCursors } from "./DocumentWithCursors";
 
-export interface CursorPositionFromClient {
+export interface CursorPositionFromClient { documentsWithCursors: DocumentWithCursors[], }
-    documentsWithCursors: DocumentWithCursors[];
-}

frontend/sync-client/src/services/types/CursorPositionFromServer.ts

@@ -1,6 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ClientCursors } from "./ClientCursors";
 
-export interface CursorPositionFromServer {
+export interface CursorPositionFromServer { clients: ClientCursors[], }
-    clients: ClientCursors[];
-}

frontend/sync-client/src/services/types/CursorSpan.ts

@@ -1,6 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface CursorSpan {
+export interface CursorSpan { start: number, end: number, }
-    start: number;
-    end: number;
-}

frontend/sync-client/src/services/types/DocumentUpdateResponse.ts

@@ -5,6 +5,4 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
 /**
  * Response to an update document request.
  */
-export type DocumentUpdateResponse =
+export type DocumentUpdateResponse = { "type": "FastForwardUpdate" } & DocumentVersionWithoutContent | { "type": "MergingUpdate" } & DocumentVersion;
-    | ({ type: "FastForwardUpdate" } & DocumentVersionWithoutContent)
-    | ({ type: "MergingUpdate" } & DocumentVersion);

frontend/sync-client/src/services/types/DocumentVersion.ts

@@ -1,12 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface DocumentVersion {
+export interface DocumentVersion { vaultUpdateId: number, documentId: string, relativePath: string, updatedDate: string, contentBase64: string, isDeleted: boolean, userId: string, deviceId: string, }
-    vaultUpdateId: number;
-    documentId: string;
-    relativePath: string;
-    updatedDate: string;
-    contentBase64: string;
-    isDeleted: boolean;
-    userId: string;
-    deviceId: string;
-}

frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts

@@ -1,12 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface DocumentVersionWithoutContent {
+export interface DocumentVersionWithoutContent { vaultUpdateId: number, documentId: string, relativePath: string, updatedDate: string, isDeleted: boolean, userId: string, deviceId: string, contentSize: number, }
-    vaultUpdateId: number;
-    documentId: string;
-    relativePath: string;
-    updatedDate: string;
-    isDeleted: boolean;
-    userId: string;
-    deviceId: string;
-    contentSize: number;
-}

frontend/sync-client/src/services/types/DocumentWithCursors.ts

@@ -1,9 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { CursorSpan } from "./CursorSpan";
 
-export interface DocumentWithCursors {
+export interface DocumentWithCursors { vault_update_id: number | null, document_id: string, relative_path: string, cursors: CursorSpan[], }
-    vault_update_id: number | null;
-    document_id: string;
-    relative_path: string;
-    cursors: CursorSpan[];
-}

frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts

@@ -4,10 +4,8 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
 /**
  * Response to a fetch latest documents request.
  */
-export interface FetchLatestDocumentsResponse {
+export interface FetchLatestDocumentsResponse { latestDocuments: DocumentVersionWithoutContent[], 
-    latestDocuments: DocumentVersionWithoutContent[];
+/**
-    /**
  * The update ID of the latest document in the response.
  */
-    lastUpdateId: bigint;
+lastUpdateId: bigint, }
-}

frontend/sync-client/src/services/types/PingResponse.ts

@@ -4,22 +4,21 @@
  * Response to a ping request.
  */
 export interface PingResponse { 
-    /**
+/**
  * Semantic version of the server.
  */
-    serverVersion: string;
+serverVersion: string, 
-    /**
+/**
  * Whether the client is authenticated based on the sent Authorization
  * header.
  */
-    isAuthenticated: boolean;
+isAuthenticated: boolean, 
-    /**
+/**
  * List of file extensions that are allowed to be merged.
  */
-    mergeableFileExtensions: string[];
+mergeableFileExtensions: string[], 
-    /**
+/**
  * API version ensuring backwards & forwards compatibility between the client
  * and server.
  */
-    supportedApiVersion: number;
+supportedApiVersion: number, }
-}

frontend/sync-client/src/services/types/SerializedError.ts

@@ -1,7 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface SerializedError {
+export interface SerializedError { errorType: string, message: string, causes: string[], }
-    errorType: string;
-    message: string;
-    causes: string[];
-}

frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts

@@ -1,7 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface UpdateTextDocumentVersion {
+export interface UpdateTextDocumentVersion { parentVersionId: number, relativePath: string, content: (number | string)[], }
-    parentVersionId: number;
-    relativePath: string;
-    content: (number | string)[];
-}

frontend/sync-client/src/services/types/WebSocketHandshake.ts

@@ -1,7 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface WebSocketHandshake {
+export interface WebSocketHandshake { token: string, deviceId: string, lastSeenVaultUpdateId: number | null, }
-    token: string;
-    deviceId: string;
-    lastSeenVaultUpdateId: number | null;
-}

frontend/sync-client/src/services/types/WebSocketServerMessage.ts

@@ -2,6 +2,4 @@
 import type { CursorPositionFromServer } from "./CursorPositionFromServer";
 import type { WebSocketVaultUpdate } from "./WebSocketVaultUpdate";
 
-export type WebSocketServerMessage =
+export type WebSocketServerMessage = { "type": "vaultUpdate" } & WebSocketVaultUpdate | { "type": "cursorPositions" } & CursorPositionFromServer;
-    | ({ type: "vaultUpdate" } & WebSocketVaultUpdate)
-    | ({ type: "cursorPositions" } & CursorPositionFromServer);

frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts

@@ -1,7 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
 
-export interface WebSocketVaultUpdate {
+export interface WebSocketVaultUpdate { documents: DocumentVersionWithoutContent[], isInitialSync: boolean, }
-    documents: DocumentVersionWithoutContent[];
-    isInitialSync: boolean;
-}

frontend/sync-client/tsconfig.json

@@ -12,7 +12,5 @@
         "declaration": true,
         "declarationDir": "./dist/types"
     },
-    "exclude": [
+    "exclude": ["./dist"]
-        "./dist"
-    ]
 }

frontend/test-client/tsconfig.json

@@ -5,13 +5,8 @@
         "target": "ES2022",
         "module": "CommonJS",
         "esModuleInterop": true,
-        "lib": [
+        "lib": ["DOM", "ES2024"],
-            "DOM",
-            "ES2024",
-        ],
         "moduleResolution": "node"
     },
-    "exclude": [
+    "exclude": ["./dist"]
-        "./dist"
-    ]
 }