gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 23:29:02 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

fix(server/test): yet another cyclic import issue due to becca_loader

Browse Source
This commit is contained in:
Elian Doran 2025-07-30 09:19:02 +03:00
parent 37a79aeeab
commit aefa2315b7
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/server/src/becca/becca_loader.ts
View File

@ -14,13 +14,13 @@ import entityConstructor from "../becca/entity_constructor.js";
import type { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "@triliumnext/commons"; import type { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "@triliumnext/commons";
import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js"; import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
import ws from "../services/ws.js"; import ws from "../services/ws.js";
import sql_init from "../services/sql_init.js"; import { dbReady } from "../services/sql_init.js";
export const beccaLoaded = new Promise<void>(async (res, rej) => { export const beccaLoaded = new Promise<void>(async (res, rej) => {
// We have to import async since options init requires keyboard actions which require translations. // We have to import async since options init requires keyboard actions which require translations.
const options_init = (await import("../services/options_init.js")).default; const options_init = (await import("../services/options_init.js")).default;
sql_init.dbReady.then(() => { dbReady.then(() => {
cls.init(() => { cls.init(() => {
load(); load();

2
apps/server/src/services/sql_init.ts
View File

@ -14,7 +14,6 @@ import type { OptionRow } from "@triliumnext/commons";
import BNote from "../becca/entities/bnote.js"; import BNote from "../becca/entities/bnote.js";
import BBranch from "../becca/entities/bbranch.js"; import BBranch from "../becca/entities/bbranch.js";
import zipImportService from "./import/zip.js"; import zipImportService from "./import/zip.js";
import becca_loader from "../becca/becca_loader.js";
import password from "./encryption/password.js"; import password from "./encryption/password.js";
import backup from "./backup.js"; import backup from "./backup.js";
import eventService from "./events.js"; import eventService from "./events.js";
@ -83,6 +82,7 @@ async function createInitialDatabase(skipDemoDb?: boolean) {
// We have to import async since options init requires keyboard actions which require translations. // We have to import async since options init requires keyboard actions which require translations.
const optionsInitService = (await import("./options_init.js")).default; const optionsInitService = (await import("./options_init.js")).default;
const becca_loader = (await import("../becca/becca_loader.js")).default;
sql.transactional(() => { sql.transactional(() => {
log.info("Creating database schema ..."); log.info("Creating database schema ...");