From 24af2e55dce68a60aa32c05910894b66b1334997 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 24 Jul 2024 20:33:35 +0300 Subject: [PATCH] server: Fix the remainder of import issues --- src/anonymize.ts | 2 +- src/app.ts | 12 ++++++------ src/etapi/notes.ts | 3 +-- src/routes/setup.ts | 2 +- src/services/erase.ts | 3 +-- src/services/events.ts | 2 +- src/services/handlers.ts | 2 +- src/services/import/mime.ts | 2 +- src/services/import/single.ts | 2 +- src/services/keyboard_actions.ts | 2 +- src/services/options_init.ts | 2 +- src/services/promoted_attribute_definition_parser.ts | 2 +- src/services/script.ts | 2 +- src/services/script_context.ts | 2 +- src/services/setup.ts | 2 +- src/services/task_context.ts | 2 +- src/www.ts | 2 +- 17 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/anonymize.ts b/src/anonymize.ts index 15fb4dde0..8ad803c63 100644 --- a/src/anonymize.ts +++ b/src/anonymize.ts @@ -1,6 +1,6 @@ import anonymizationService from "./services/anonymization.js"; import sqlInit from "./services/sql_init.js"; -await import("./becca/entity_constructor"); +await import("./becca/entity_constructor.js"); sqlInit.dbReady.then(async () => { try { diff --git a/src/app.ts b/src/app.ts index 0260d30e5..93ddbe889 100644 --- a/src/app.ts +++ b/src/app.ts @@ -15,8 +15,8 @@ import error_handlers from "./routes/error_handlers.js"; import { startScheduledCleanup } from "./services/erase.js"; import sql_init from "./services/sql_init.js"; -await import('./services/handlers'); -await import('./becca/becca_loader'); +await import('./services/handlers.js'); +await import('./becca/becca_loader.js'); const app = express(); @@ -56,15 +56,15 @@ custom.register(app); error_handlers.register(app); // triggers sync timer -await import("./services/sync"); +await import("./services/sync.js"); // triggers backup timer -await import('./services/backup'); +await import('./services/backup.js'); // trigger consistency checks timer -await import('./services/consistency_checks'); +await import('./services/consistency_checks.js'); -await import('./services/scheduler'); +await import('./services/scheduler.js'); startScheduledCleanup(); diff --git a/src/etapi/notes.ts b/src/etapi/notes.ts index 99bf3be6f..846e77dc2 100644 --- a/src/etapi/notes.ts +++ b/src/etapi/notes.ts @@ -13,8 +13,7 @@ import { Router } from 'express'; import { AppRequest } from '../routes/route-interface.js'; import { ParsedQs } from 'qs'; import { NoteParams } from '../services/note-interface.js'; -import BNote from "../becca/entities/bnote.js"; -import { SearchParams } from '../services/search/services/types'; +import { SearchParams } from '../services/search/services/types.js'; import { ValidatorMap } from './etapi-interface.js'; function register(router: Router) { diff --git a/src/routes/setup.ts b/src/routes/setup.ts index f9fab6b34..34d886aec 100644 --- a/src/routes/setup.ts +++ b/src/routes/setup.ts @@ -35,7 +35,7 @@ function setupPage(req: Request, res: Response) { } async function handleElectronRedirect() { - const windowService = (await import("../services/window")).default; + const windowService = (await import("../services/window.js")).default; const { app } = await import("electron"); windowService.createMainWindow(app); windowService.closeSetupWindow(); diff --git a/src/services/erase.ts b/src/services/erase.ts index 1d7dcd738..f02595de8 100644 --- a/src/services/erase.ts +++ b/src/services/erase.ts @@ -1,12 +1,11 @@ import sql from "./sql.js"; -import revisionService from "./revisions.js"; import log from "./log.js"; import entityChangesService from "./entity_changes.js"; import optionService from "./options.js"; import dateUtils from "./date_utils.js"; import sqlInit from "./sql_init.js"; import cls from "./cls.js"; -import { EntityChange } from "./entity_changes_interface"; +import { EntityChange } from "./entity_changes_interface.js"; function eraseNotes(noteIdsToErase: string[]) { if (noteIdsToErase.length === 0) { diff --git a/src/services/events.ts b/src/services/events.ts index 8b64d5af0..1a7ed9eb8 100644 --- a/src/services/events.ts +++ b/src/services/events.ts @@ -1,4 +1,4 @@ -import log from "./log"; +import log from "./log.js"; const NOTE_TITLE_CHANGED = "NOTE_TITLE_CHANGED"; const ENTER_PROTECTED_SESSION = "ENTER_PROTECTED_SESSION"; diff --git a/src/services/handlers.ts b/src/services/handlers.ts index dca0fba8e..579924923 100644 --- a/src/services/handlers.ts +++ b/src/services/handlers.ts @@ -8,7 +8,7 @@ import hiddenSubtreeService from "./hidden_subtree.js"; import oneTimeTimer from "./one_time_timer.js"; import BNote from "../becca/entities/bnote.js"; import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; -import { DefinitionObject } from './promoted_attribute_definition_interface'; +import { DefinitionObject } from './promoted_attribute_definition_interface.js'; type Handler = (definition: DefinitionObject, note: BNote, targetNote: BNote) => void; diff --git a/src/services/import/mime.ts b/src/services/import/mime.ts index 0dd1ecc84..8b8316a59 100644 --- a/src/services/import/mime.ts +++ b/src/services/import/mime.ts @@ -2,7 +2,7 @@ import mimeTypes from "mime-types"; import path from "path"; -import { TaskData } from '../task_context_interface'; +import { TaskData } from '../task_context_interface.js'; const CODE_MIME_TYPES: Record = { 'text/plain': true, diff --git a/src/services/import/single.ts b/src/services/import/single.ts index be6c4adcc..465d3b7a8 100644 --- a/src/services/import/single.ts +++ b/src/services/import/single.ts @@ -11,7 +11,7 @@ import mimeService from "./mime.js"; import utils from "../../services/utils.js"; import importUtils from "./utils.js"; import htmlSanitizer from "../html_sanitizer.js"; -import { File } from "./common"; +import { File } from "./common.js"; function importSingleFile(taskContext: TaskContext, file: File, parentNote: BNote) { const mime = mimeService.getMime(file.originalname) || file.mimetype; diff --git a/src/services/keyboard_actions.ts b/src/services/keyboard_actions.ts index 6753388ac..e2e1e024a 100644 --- a/src/services/keyboard_actions.ts +++ b/src/services/keyboard_actions.ts @@ -3,7 +3,7 @@ import optionService from "./options.js"; import log from "./log.js"; import utils from "./utils.js"; -import { KeyboardShortcut } from './keyboard_actions_interface'; +import { KeyboardShortcut } from './keyboard_actions_interface.js'; const isMac = process.platform === "darwin"; const isElectron = utils.isElectron(); diff --git a/src/services/options_init.ts b/src/services/options_init.ts index b06bf0afd..a50d57296 100644 --- a/src/services/options_init.ts +++ b/src/services/options_init.ts @@ -4,7 +4,7 @@ import utils from "./utils.js"; import log from "./log.js"; import dateUtils from "./date_utils.js"; import keyboardActions from "./keyboard_actions.js"; -import { KeyboardShortcutWithRequiredActionName } from './keyboard_actions_interface'; +import { KeyboardShortcutWithRequiredActionName } from './keyboard_actions_interface.js'; function initDocumentOptions() { optionService.createOption('documentId', utils.randomSecureToken(16), false); diff --git a/src/services/promoted_attribute_definition_parser.ts b/src/services/promoted_attribute_definition_parser.ts index 6e9ca3d13..ac066c788 100644 --- a/src/services/promoted_attribute_definition_parser.ts +++ b/src/services/promoted_attribute_definition_parser.ts @@ -1,4 +1,4 @@ -import { DefinitionObject } from "./promoted_attribute_definition_interface"; +import { DefinitionObject } from "./promoted_attribute_definition_interface.js"; function parse(value: string): DefinitionObject { const tokens = value.split(',').map(t => t.trim()); diff --git a/src/services/script.ts b/src/services/script.ts index 035f13299..5b4004bb5 100644 --- a/src/services/script.ts +++ b/src/services/script.ts @@ -3,7 +3,7 @@ import cls from "./cls.js"; import log from "./log.js"; import becca from "../becca/becca.js"; import BNote from "../becca/entities/bnote.js"; -import { ApiParams } from './backend_script_api_interface'; +import { ApiParams } from './backend_script_api_interface.js'; interface Bundle { note?: BNote; diff --git a/src/services/script_context.ts b/src/services/script_context.ts index 695eb5a24..d36c0d492 100644 --- a/src/services/script_context.ts +++ b/src/services/script_context.ts @@ -1,7 +1,7 @@ import utils from "./utils.js"; import BackendScriptApi from "./backend_script_api.js"; import BNote from "../becca/entities/bnote.js"; -import { ApiParams } from './backend_script_api_interface'; +import { ApiParams } from './backend_script_api_interface.js'; type Module = { exports: any[]; diff --git a/src/services/setup.ts b/src/services/setup.ts index 34246483f..0f3d26f58 100644 --- a/src/services/setup.ts +++ b/src/services/setup.ts @@ -7,7 +7,7 @@ import request from "./request.js"; import appInfo from "./app_info.js"; import utils from "./utils.js"; import becca from "../becca/becca.js"; -import { SetupStatusResponse, SetupSyncSeedResponse } from './api-interface'; +import { SetupStatusResponse, SetupSyncSeedResponse } from './api-interface.js'; async function hasSyncServerSchemaAndSeed() { const response = await requestToSyncServer('GET', '/api/setup/status'); diff --git a/src/services/task_context.ts b/src/services/task_context.ts index 5974313e8..0f3557674 100644 --- a/src/services/task_context.ts +++ b/src/services/task_context.ts @@ -1,6 +1,6 @@ "use strict"; -import { TaskData } from './task_context_interface'; +import { TaskData } from './task_context_interface.js'; import ws from "./ws.js"; // taskId => TaskContext diff --git a/src/www.ts b/src/www.ts index 609551a0a..3fc54e817 100644 --- a/src/www.ts +++ b/src/www.ts @@ -69,7 +69,7 @@ async function startTrilium() { ws.init(httpServer, sessionParser as any); // TODO: Not sure why session parser is incompatible. if (utils.isElectron()) { - const electronRouting = await import('./routes/electron'); + const electronRouting = await import('./routes/electron.js'); electronRouting.default(app); } }