From bf4decb4fbb3b190c4c5d4fc2c16461c5924a93a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 4 Jan 2025 11:52:40 +0200 Subject: [PATCH] fix(server): compile errors after refactoring --- src/routes/api/options.ts | 3 ++- src/services/backup.ts | 3 ++- src/services/options_init.ts | 2 +- src/services/sync_options.ts | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/routes/api/options.ts b/src/routes/api/options.ts index 495f10fce..cf3038561 100644 --- a/src/routes/api/options.ts +++ b/src/routes/api/options.ts @@ -1,12 +1,13 @@ "use strict"; -import optionService, { OptionNames } from "../../services/options.js"; +import optionService from "../../services/options.js"; import log from "../../services/log.js"; import searchService from "../../services/search/services/search.js"; import ValidationError from "../../errors/validation_error.js"; import { Request } from 'express'; import { changeLanguage } from "../../services/i18n.js"; import { listSyntaxHighlightingThemes } from "../../services/code_block_theme.js"; +import type { OptionNames } from "../../services/options_interface.js"; // options allowed to be updated directly in the Options dialog const ALLOWED_OPTIONS = new Set([ diff --git a/src/services/backup.ts b/src/services/backup.ts index 8973c7136..b5e273714 100644 --- a/src/services/backup.ts +++ b/src/services/backup.ts @@ -1,7 +1,7 @@ "use strict"; import dateUtils from "./date_utils.js"; -import optionService, { OptionNames } from "./options.js"; +import optionService from "./options.js"; import fs from "fs-extra"; import dataDir from "./data_dir.js"; import log from "./log.js"; @@ -9,6 +9,7 @@ import syncMutexService from "./sync_mutex.js"; import cls from "./cls.js"; import sql from "./sql.js"; import path from "path"; +import type { OptionNames } from "./options_interface.js"; type BackupType = ("daily" | "weekly" | "monthly"); diff --git a/src/services/options_init.ts b/src/services/options_init.ts index cff8493ff..a87c2cb59 100644 --- a/src/services/options_init.ts +++ b/src/services/options_init.ts @@ -1,5 +1,5 @@ import optionService from "./options.js"; -import type { OptionMap, OptionNames } from "./options.js"; +import type { OptionMap, OptionNames } from "./options_interface.js"; import appInfo from "./app_info.js"; import { randomSecureToken, isWindows } from "./utils.js"; import log from "./log.js"; diff --git a/src/services/sync_options.ts b/src/services/sync_options.ts index 9b1abfbb2..6ba61fc82 100644 --- a/src/services/sync_options.ts +++ b/src/services/sync_options.ts @@ -1,6 +1,7 @@ "use strict"; -import optionService, { OptionNames } from "./options.js"; +import optionService from "./options.js"; +import type { OptionNames } from "./options_interface.js"; import config from "./config.js"; /*