diff --git a/plugin/src/database/database.ts b/plugin/src/database/database.ts index f0d99f6..d95f1fb 100644 --- a/plugin/src/database/database.ts +++ b/plugin/src/database/database.ts @@ -1,27 +1,11 @@ import { Logger } from "src/logger"; - -export type DocumentId = string; -export type DocumentVersionId = number; -export type RelativePath = string; - -export interface SyncSettings { - remoteUri: string; - token: string; - fullScanIntervalInSeconds: number; - fullScanEnabled: boolean; -} - -export const DEFAULT_SETTINGS: SyncSettings = { - remoteUri: "", - token: "", - fullScanIntervalInSeconds: 60, - fullScanEnabled: true, -}; - -export interface DocumentMetadata { - documentId: DocumentId; - parentVersionId: DocumentVersionId; -} +import { DEFAULT_SETTINGS, SyncSettings } from "./sync-settings"; +import { + RelativePath, + DocumentMetadata, + DocumentId, + DocumentVersionId, +} from "./document-metadata"; interface StoredDatabase { documents: Map; @@ -69,6 +53,10 @@ export class Database { ); } + public getDocuments(): Map { + return this._documents; + } + public getSettings(): SyncSettings { return this._settings; } diff --git a/plugin/src/database/document-metadata.ts b/plugin/src/database/document-metadata.ts new file mode 100644 index 0000000..1166797 --- /dev/null +++ b/plugin/src/database/document-metadata.ts @@ -0,0 +1,8 @@ +export type DocumentId = string; +export type DocumentVersionId = number; +export type RelativePath = string; + +export interface DocumentMetadata { + documentId: DocumentId; + parentVersionId: DocumentVersionId; +} diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts new file mode 100644 index 0000000..eb4729b --- /dev/null +++ b/plugin/src/database/sync-settings.ts @@ -0,0 +1,13 @@ +export interface SyncSettings { + remoteUri: string; + token: string; + fullScanIntervalInSeconds: number; + fullScanEnabled: boolean; +} + +export const DEFAULT_SETTINGS: SyncSettings = { + remoteUri: "", + token: "", + fullScanIntervalInSeconds: 60, + fullScanEnabled: true, +}; diff --git a/plugin/src/services/sync_service.ts b/plugin/src/services/sync_service.ts index 90f0a90..1fffa36 100644 --- a/plugin/src/services/sync_service.ts +++ b/plugin/src/services/sync_service.ts @@ -1,14 +1,14 @@ import * as plugin from "../../../backend/sync_lib/pkg/sync_lib.js"; import createClient, { Client } from "openapi-fetch"; -import type { components, paths } from "./types.js"; // generated by openapi-typescript -import { Logger } from "src/logger.js"; +import type { components, paths } from "./types"; // generated by openapi-typescript +import { Logger } from "src/logger"; +import { Database } from "src/database/database"; +import { SyncSettings } from "src/database/sync-settings"; import { - Database, DocumentId, DocumentVersionId, - SyncSettings, -} from "src/database/database.js"; +} from "src/database/document-metadata.js"; export class SyncServer { private static VAULT_ID = "default"; @@ -47,7 +47,7 @@ export class SyncServer { content: ArrayBuffer; relativePath: string; createdDate: Date; - }): Promise { + }): Promise { let contentBytes = new Uint8Array(content); let response = await this.client.POST("/vaults/{vault_id}/documents", { params: { @@ -88,7 +88,7 @@ export class SyncServer { relativePath: string; content: ArrayBuffer; createdDate: Date; - }): Promise { + }): Promise { let contentBytes = new Uint8Array(content); let response = await this.client.PUT( diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts index 982793f..91f9417 100644 --- a/plugin/src/services/types.ts +++ b/plugin/src/services/types.ts @@ -91,7 +91,7 @@ export interface paths { [name: string]: unknown; }; content: { - "application/json": components["schemas"]["DocumentVersionWithoutContent"]; + "application/json": components["schemas"]["DocumentVersion"]; }; }; }; @@ -156,7 +156,7 @@ export interface paths { [name: string]: unknown; }; content: { - "application/json": components["schemas"]["DocumentVersionWithoutContent"]; + "application/json": components["schemas"]["DocumentVersion"]; }; }; }; diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts index f03b4a8..9f8f806 100644 --- a/plugin/src/views/settings-tab.ts +++ b/plugin/src/views/settings-tab.ts @@ -9,7 +9,7 @@ import { Setting, } from "obsidian"; -import SyncPlugin from "src/plugin.js"; +import SyncPlugin from "src/plugin"; import { Database } from "src/database/database"; import { SyncServer } from "src/services/sync_service";