From 9a42536205362e1c1e331a02400a1244f8e33152 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 26 Mar 2026 19:58:11 +0200
Subject: [PATCH] chore(core): fix various type errors

---
 apps/server/src/etapi/notes.ts                       |  3 +--
 packages/trilium-core/src/index.ts                   |  1 +
 packages/trilium-core/src/services/migration.spec.ts | 12 +++++-------
 packages/trilium-core/src/services/sql/index.ts      |  4 ++++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/server/src/etapi/notes.ts b/apps/server/src/etapi/notes.ts
index 3999995f26..a0d3cf49e1 100644
--- a/apps/server/src/etapi/notes.ts
+++ b/apps/server/src/etapi/notes.ts
@@ -1,4 +1,4 @@
-import { NoteParams } from "@triliumnext/core";
+import { NoteParams, SearchParams } from "@triliumnext/core";
 import type { Request, Router } from "express";
 import type { ParsedQs } from "qs";
 
@@ -9,7 +9,6 @@ import zipImportService from "../services/import/zip.js";
 import noteService from "../services/notes.js";
 import SearchContext from "../services/search/search_context.js";
 import searchService from "../services/search/services/search.js";
-import type { SearchParams } from "../services/search/services/types.js";
 import TaskContext from "../services/task_context.js";
 import utils from "../services/utils.js";
 import eu from "./etapi_utils.js";
diff --git a/packages/trilium-core/src/index.ts b/packages/trilium-core/src/index.ts
index 4cba977755..42bc8fb02d 100644
--- a/packages/trilium-core/src/index.ts
+++ b/packages/trilium-core/src/index.ts
@@ -78,6 +78,7 @@ export type { NotePojo } from "./becca/becca-interface";
 export { default as NoteSet } from "./services/search/note_set";
 export { default as SearchContext } from "./services/search/search_context";
 export { default as search } from "./services/search/services/search";
+export { type SearchParams } from "./services/search/services/types";
 export { default as note_service } from "./services/notes";
 export type { NoteParams } from "./services/notes";
 export * as sanitize from "./services/sanitizer";
diff --git a/packages/trilium-core/src/services/migration.spec.ts b/packages/trilium-core/src/services/migration.spec.ts
index f47803ac4f..c88bbfb824 100644
--- a/packages/trilium-core/src/services/migration.spec.ts
+++ b/packages/trilium-core/src/services/migration.spec.ts
@@ -1,18 +1,16 @@
 import { describe, expect, it } from "vitest";
-import cls from "./cls.js";
+import { getContext } from "./context.js";
 
 describe("Migration", () => {
     it("migrates from v214", async () => {
         await new Promise<void>((resolve) => {
-            cls.init(async () => {
-                await import("../app.js");
-
-                const sql = (await (import("./sql.js"))).default;
-                sql.rebuildIntegrationTestDatabase("spec/db/document_v214.db");
+            getContext().init(async () => {
+                const { getSql, rebuildIntegrationTestDatabase } = (await (import("./sql/index.js")));
+                rebuildIntegrationTestDatabase("spec/db/document_v214.db");
 
                 const migration = (await import("./migration.js")).default;
                 await migration.migrateIfNecessary();
-                expect(sql.getValue("SELECT count(*) FROM blobs")).toBe(118);
+                expect(getSql().getValue("SELECT count(*) FROM blobs")).toBe(118);
                 resolve();
             });
         });
diff --git a/packages/trilium-core/src/services/sql/index.ts b/packages/trilium-core/src/services/sql/index.ts
index 09d06265f5..c4dacd32c1 100644
--- a/packages/trilium-core/src/services/sql/index.ts
+++ b/packages/trilium-core/src/services/sql/index.ts
@@ -13,3 +13,7 @@ export function getSql(): SqlService {
     if (!sql) throw new Error("SQL not initialized");
     return sql;
 }
+
+export function rebuildIntegrationTestDatabase(path: string) {
+    throw new Error("Not implemented");
+}