From aee005b624b9e6b85f5022ef4bcd2f0523ef4ee4 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 27 Mar 2026 23:23:26 +0200
Subject: [PATCH] refactor(core): move zip provider out of import

---
 apps/client-standalone/src/lightweight/zip_provider.ts        | 2 +-
 apps/server/src/zip_provider.ts                               | 2 +-
 packages/trilium-core/src/index.ts                            | 4 ++--
 packages/trilium-core/src/services/export/zip.ts              | 2 +-
 .../trilium-core/src/services/export/zip/abstract_provider.ts | 2 +-
 packages/trilium-core/src/services/import/zip.ts              | 2 +-
 .../trilium-core/src/services/{import => }/zip_provider.ts    | 0
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/trilium-core/src/services/{import => }/zip_provider.ts (100%)

diff --git a/apps/client-standalone/src/lightweight/zip_provider.ts b/apps/client-standalone/src/lightweight/zip_provider.ts
index f956431877..5827ebcdae 100644
--- a/apps/client-standalone/src/lightweight/zip_provider.ts
+++ b/apps/client-standalone/src/lightweight/zip_provider.ts
@@ -1,4 +1,4 @@
-import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/import/zip_provider.js";
+import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/zip_provider.js";
 import { strToU8, unzip, zipSync } from "fflate";
 
 type ZipOutput = {
diff --git a/apps/server/src/zip_provider.ts b/apps/server/src/zip_provider.ts
index 9d8188a7f5..c046baceda 100644
--- a/apps/server/src/zip_provider.ts
+++ b/apps/server/src/zip_provider.ts
@@ -1,4 +1,4 @@
-import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/import/zip_provider.js";
+import type { FileStream, ZipArchive, ZipEntry, ZipProvider } from "@triliumnext/core/src/services/zip_provider.js";
 import archiver, { type Archiver } from "archiver";
 import fs from "fs";
 import type { Stream } from "stream";
diff --git a/packages/trilium-core/src/index.ts b/packages/trilium-core/src/index.ts
index ba5093d6c3..efe94b2bff 100644
--- a/packages/trilium-core/src/index.ts
+++ b/packages/trilium-core/src/index.ts
@@ -9,7 +9,7 @@ import { initTranslations, TranslationProvider } from "./services/i18n";
 import { initSchema, initDemoArchive } from "./services/sql_init";
 import appInfo from "./services/app_info";
 import { type PlatformProvider, initPlatform } from "./services/platform";
-import { type ZipProvider, initZipProvider } from "./services/import/zip_provider";
+import { type ZipProvider, initZipProvider } from "./services/zip_provider";
 import markdown from "./services/import/markdown";
 
 export { getLog } from "./services/log";
@@ -101,7 +101,7 @@ export type { RequestProvider, ExecOpts, CookieJar } from "./services/request";
 export type * from "./meta";
 export * as routeHelpers from "./routes/helpers";
 
-export { getZipProvider, type ZipArchive, type ZipProvider } from "./services/import/zip_provider";
+export { getZipProvider, type ZipArchive, type ZipProvider } from "./services/zip_provider";
 export { default as zipImportService } from "./services/import/zip";
 export { default as zipExportService } from "./services/export/zip";
 export { type AdvancedExportOptions } from "./services/export/zip/abstract_provider";
diff --git a/packages/trilium-core/src/services/export/zip.ts b/packages/trilium-core/src/services/export/zip.ts
index 6d8d49e4a3..75f87c15c7 100644
--- a/packages/trilium-core/src/services/export/zip.ts
+++ b/packages/trilium-core/src/services/export/zip.ts
@@ -9,7 +9,7 @@ import dateUtils from "../utils/date.js";
 import { getLog } from "../log.js";
 import protectedSessionService from "../protected_session.js";
 import TaskContext from "../task_context.js";
-import { getZipProvider, type ZipArchive } from "../import/zip_provider.js";
+import { getZipProvider } from "../zip_provider.js";
 import { getContentDisposition } from "../utils/index"
 import { AdvancedExportOptions, ZipExportProvider, ZipExportProviderData } from "./zip/abstract_provider.js";
 import HtmlExportProvider from "./zip/html.js";
diff --git a/packages/trilium-core/src/services/export/zip/abstract_provider.ts b/packages/trilium-core/src/services/export/zip/abstract_provider.ts
index da2c814e01..42a388281b 100644
--- a/packages/trilium-core/src/services/export/zip/abstract_provider.ts
+++ b/packages/trilium-core/src/services/export/zip/abstract_provider.ts
@@ -4,7 +4,7 @@ import mimeTypes from "mime-types";
 import type BBranch from "../../../becca/entities/bbranch.js";
 import type BNote from "../../../becca/entities/bnote.js";
 import { ExportFormat, NoteMeta, NoteMetaFile } from "../../../meta.js";
-import type { ZipArchive } from "../../import/zip_provider.js";
+import type { ZipArchive } from "../../zip_provider.js";
 
 type RewriteLinksFn = (content: string, noteMeta: NoteMeta) => string;
 
diff --git a/packages/trilium-core/src/services/import/zip.ts b/packages/trilium-core/src/services/import/zip.ts
index 94df44ce32..c51a561196 100644
--- a/packages/trilium-core/src/services/import/zip.ts
+++ b/packages/trilium-core/src/services/import/zip.ts
@@ -1,6 +1,6 @@
 import { ALLOWED_NOTE_TYPES, type NoteType } from "@triliumnext/commons";
 import { basename, dirname } from "../utils/path.js";
-import { getZipProvider } from "./zip_provider.js";
+import { getZipProvider } from "../zip_provider.js";
 
 import becca from "../../becca/becca.js";
 import BAttachment from "../../becca/entities/battachment.js";
diff --git a/packages/trilium-core/src/services/import/zip_provider.ts b/packages/trilium-core/src/services/zip_provider.ts
similarity index 100%
rename from packages/trilium-core/src/services/import/zip_provider.ts
rename to packages/trilium-core/src/services/zip_provider.ts