Fix persistence provider types
This commit is contained in:
parent
5ba898df7d
commit
9f46af4a65
4 changed files with 18 additions and 15 deletions
|
|
@ -11,7 +11,7 @@ export interface DocumentMetadata {
|
|||
import type { Logger } from "src/tracing/logger";
|
||||
|
||||
export interface StoredDatabase {
|
||||
documents: Map<RelativePath, DocumentMetadata>;
|
||||
documents: Record<RelativePath, DocumentMetadata>;
|
||||
lastSeenUpdateId: VaultUpdateId | undefined;
|
||||
}
|
||||
|
||||
|
|
@ -22,15 +22,14 @@ export class Database {
|
|||
public constructor(
|
||||
private readonly logger: Logger,
|
||||
initialState: Partial<StoredDatabase> | undefined,
|
||||
private readonly saveData: (data: unknown) => Promise<void>
|
||||
private readonly saveData: (data: StoredDatabase) => Promise<void>
|
||||
) {
|
||||
initialState ??= {};
|
||||
if (initialState.documents) {
|
||||
for (const [relativePath, metadata] of Object.entries(
|
||||
initialState.documents
|
||||
)) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
||||
this.documents.set(relativePath, metadata as DocumentMetadata);
|
||||
this.documents.set(relativePath, metadata);
|
||||
}
|
||||
}
|
||||
this.logger.debug(`Loaded ${this.documents.size} documents`);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
export interface PersistenceProvider {
|
||||
load: () => Promise<unknown>;
|
||||
save: (data: unknown) => Promise<void>;
|
||||
export interface PersistenceProvider<T extends object> {
|
||||
load: () => Promise<T | undefined>;
|
||||
save: (data: T | undefined) => Promise<void>;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export class Settings {
|
|||
public constructor(
|
||||
private readonly logger: Logger,
|
||||
initialState: Partial<SyncSettings> | undefined,
|
||||
private readonly saveData: (data: unknown) => Promise<void>
|
||||
private readonly saveData: (data: SyncSettings) => Promise<void>
|
||||
) {
|
||||
this.settings = {
|
||||
...DEFAULT_SETTINGS,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ import wasmBin from "sync_lib/sync_lib_bg.wasm";
|
|||
import type { PersistenceProvider } from "./persistence/persistence";
|
||||
import { SyncHistory } from "./tracing/sync-history";
|
||||
import { Logger } from "./tracing/logger";
|
||||
import type { StoredDatabase } from "./persistence/database";
|
||||
import { Database } from "./persistence/database";
|
||||
import type { SyncSettings } from "./persistence/settings";
|
||||
import { Settings } from "./persistence/settings";
|
||||
import type { CheckConnectionResult } from "./services/sync-service";
|
||||
import { SyncService } from "./services/sync-service";
|
||||
|
|
@ -45,7 +47,12 @@ export class SyncClient {
|
|||
|
||||
public static async create(
|
||||
fs: FileSystemOperations,
|
||||
persistence: PersistenceProvider
|
||||
persistence: PersistenceProvider<
|
||||
Partial<{
|
||||
settings: Partial<SyncSettings>;
|
||||
database: Partial<StoredDatabase>;
|
||||
}>
|
||||
>
|
||||
): Promise<SyncClient> {
|
||||
const logger = new Logger();
|
||||
const history = new SyncHistory(logger);
|
||||
|
|
@ -56,17 +63,14 @@ export class SyncClient {
|
|||
(wasmBin as any).default // it is loaded as a base64 string by webpack
|
||||
);
|
||||
|
||||
let state: Partial<{
|
||||
settings: any;
|
||||
database: any;
|
||||
}> = (await persistence.load()) ?? {
|
||||
let state = (await persistence.load()) ?? {
|
||||
settings: undefined,
|
||||
database: undefined
|
||||
};
|
||||
const database = new Database(
|
||||
logger,
|
||||
state.database,
|
||||
async (data: unknown): Promise<void> => {
|
||||
async (data): Promise<void> => {
|
||||
state = { ...state, database: data };
|
||||
return persistence.save(state);
|
||||
}
|
||||
|
|
@ -75,7 +79,7 @@ export class SyncClient {
|
|||
const settings = new Settings(
|
||||
logger,
|
||||
state.settings,
|
||||
async (data: unknown): Promise<void> => {
|
||||
async (data): Promise<void> => {
|
||||
state = { ...state, settings: data };
|
||||
return persistence.save(state);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue