From e19e9b3830bc1d9ab937e8b462184484ece10cfc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 6 Jan 2026 12:01:18 +0200 Subject: [PATCH] chore(core): fix references to blob-service --- apps/server/src/routes/api/attachments.ts | 3 +-- apps/server/src/routes/api/notes.ts | 3 +-- apps/server/src/routes/api/revisions.ts | 3 +-- apps/server/src/services/entity_changes.ts | 3 +-- packages/trilium-core/src/index.ts | 1 + 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/server/src/routes/api/attachments.ts b/apps/server/src/routes/api/attachments.ts index a466847a1..9e409e6f9 100644 --- a/apps/server/src/routes/api/attachments.ts +++ b/apps/server/src/routes/api/attachments.ts @@ -1,9 +1,8 @@ import { ConvertAttachmentToNoteResponse } from "@triliumnext/commons"; -import { ValidationError } from "@triliumnext/core"; +import { blob as blobService, ValidationError } from "@triliumnext/core"; import type { Request } from "express"; import becca from "../../becca/becca.js"; -import blobService from "../../services/blob.js"; import imageService from "../../services/image.js"; function getAttachmentBlob(req: Request) { diff --git a/apps/server/src/routes/api/notes.ts b/apps/server/src/routes/api/notes.ts index c3f1746a6..9ca191c8e 100644 --- a/apps/server/src/routes/api/notes.ts +++ b/apps/server/src/routes/api/notes.ts @@ -1,10 +1,9 @@ import type { AttributeRow, CreateChildrenResponse, DeleteNotesPreview, MetadataResponse } from "@triliumnext/commons"; -import { ValidationError } from "@triliumnext/core"; +import { blob as blobService, ValidationError } from "@triliumnext/core"; import type { Request } from "express"; import becca from "../../becca/becca.js"; import type BBranch from "../../becca/entities/bbranch.js"; -import blobService from "../../services/blob.js"; import eraseService from "../../services/erase.js"; import log from "../../services/log.js"; import noteService from "../../services/notes.js"; diff --git a/apps/server/src/routes/api/revisions.ts b/apps/server/src/routes/api/revisions.ts index 1eb691645..ee4041ece 100644 --- a/apps/server/src/routes/api/revisions.ts +++ b/apps/server/src/routes/api/revisions.ts @@ -1,14 +1,13 @@ import { EditedNotesResponse, RevisionItem, RevisionPojo } from "@triliumnext/commons"; -import { becca_service, NotePojo } from "@triliumnext/core"; +import { becca_service, blob as blobService, NotePojo } from "@triliumnext/core"; import type { Request, Response } from "express"; import path from "path"; import becca from "../../becca/becca.js"; import type BNote from "../../becca/entities/bnote.js"; import type BRevision from "../../becca/entities/brevision.js"; -import blobService from "../../services/blob.js"; import cls from "../../services/cls.js"; import eraseService from "../../services/erase.js"; import sql from "../../services/sql.js"; diff --git a/apps/server/src/services/entity_changes.ts b/apps/server/src/services/entity_changes.ts index d6e86ef0e..7d0b53e57 100644 --- a/apps/server/src/services/entity_changes.ts +++ b/apps/server/src/services/entity_changes.ts @@ -1,8 +1,7 @@ import type { EntityChange } from "@triliumnext/commons"; -import { events as eventService } from "@triliumnext/core"; +import { blob as blobService, events as eventService } from "@triliumnext/core"; import becca from "../becca/becca.js"; -import blobService from "../services/blob.js"; import type { Blob } from "./blob-interface.js"; import cls from "./cls.js"; import dateUtils from "./date_utils.js"; diff --git a/packages/trilium-core/src/index.ts b/packages/trilium-core/src/index.ts index dcc228c4a..4a4ed3111 100644 --- a/packages/trilium-core/src/index.ts +++ b/packages/trilium-core/src/index.ts @@ -11,6 +11,7 @@ export { default as data_encryption } from "./services/encryption/data_encryptio export * as binary_utils from "./services/utils/binary"; export { default as date_utils } from "./services/utils/date"; export { default as events } from "./services/events"; +export { default as blob } from "./services/blob"; export { getContext, type ExecutionContext } from "./services/context"; export * from "./errors"; export type { CryptoProvider } from "./services/encryption/crypto";