feat: @services/raindrop is a module, hide impl.

src/commands/addToRaindrop.ts

@@ -1,7 +1,7 @@
 import Mustache from "mustache";
 import { isOk, type Ok } from "true-myth/result";
 
-import { createRaindrop } from "@services/raindrop/raindrop.js";
+import { createRaindrop } from "@services/raindrop";
 import { extractUrlFromText } from "@util/url.js";
 
 import type { AddedToRaindropView } from "./views.js";

src/components/organisms/ImportRaindrops.svelte

@@ -6,11 +6,14 @@
   import Raindrop from "@atoms/Raindrop.svelte";
   import LoadingSpinner from "@atoms/LoadingSpinner.svelte";
   import { upsertRaindropPage } from "src/upsertRaindropPage.js";
-  import { normalizeApiRaindrop } from "@services/raindrop/normalize.js";
   import { match } from "true-myth/result";
   import type { LogseqServiceClient } from "@services/logseq";
   import { logseqClientCtxKey } from "src/services/logseq/client.js";
-  import { getRaindrop, searchTerm } from "@services/raindrop/index.js";
+  import {
+    getRaindrop,
+    normalizeApiRaindrop,
+    searchTerm,
+  } from "@services/raindrop";
 
   const remoteData = writable<TRaindrop[]>([]);
   const requestsInFlight = writable(0);

src/importHighlights.ts

@@ -2,7 +2,7 @@ import type { IBatchBlock } from "@logseq/libs/dist/LSPlugin.user.js";
 import { getOrCreateBlockInPage } from "@queries/getOrCreateBlockInPage.js";
 import { getOrCreatePageByName } from "@queries/getOrCreatePage.js";
 import type { LSBlockEntity, LogseqServiceClient } from "@services/logseq";
-import { createCollectionUpdatedSinceGenerator } from "@services/raindrop/collection.js";
+import { createCollectionUpdatedSinceGenerator } from "@services/raindrop";
 import type { Raindrop } from "@types";
 import {
   SETTING_ENUM,

src/main.ts

@@ -5,7 +5,7 @@ import App from "./App.svelte";
 
 import { registerCommands } from "@commands/commands.js";
 import { generateLogseqClient, registerSettings } from "@services/logseq";
-import { setupRaindropHttpClient } from "@services/raindrop/index.js";
+import { setupRaindropHttpClient } from "@services/raindrop";
 
 const main = async () => {
   const addColorStyle = import.meta.env.PROD ? "" : "color: orange!important;";

src/services/raindrop/collection.spec.ts

@@ -8,7 +8,7 @@ vi.mock("./http.js", () => {
   const get = vi.fn();
   const post = vi.fn();
 
-  return { httpClient: { get, post } };
+  return { httpClient: { get, post }, setupHttpClient: () => {} };
 });
 
 /**

src/services/raindrop/collection.ts

@@ -2,7 +2,7 @@ import { httpClient } from "./http.js";
 import {
   normalizeApiRaindrop,
   type RaindropResponse,
-} from "@services/raindrop/normalize.js";
+} from "@services/raindrop";
 
 type CollectionResponse = {
   result: boolean;

src/services/raindrop/index.ts

@@ -1,5 +1,7 @@
 import { setupHttpClient } from "./http.js";
 
+export { normalizeApiRaindrop, type RaindropResponse } from "./normalize.js";
+
 export * from "./raindrop.js";
 export * from "./collection.js";
 

src/testing/raindropFactory.ts

@@ -1,5 +1,5 @@
 import type { Annotation, Raindrop } from "@types";
-import type { RaindropResponse } from "@services/raindrop/normalize.js";
+import type { RaindropResponse } from "@services/raindrop";
 import { randomUUID } from "crypto";
 
 const generateAnnotation = (opts?: Partial<Annotation>): Annotation => ({

tsconfig.json

@@ -24,7 +24,7 @@
       "@organisms/*": ["src/components/organisms/*"],
       "@queries/*": ["src/queries/*"],
       "@services/logseq": ["src/services/logseq/index.ts"],
-      "@services/raindrop/*": ["src/services/raindrop/*"],
+      "@services/raindrop": ["src/services/raindrop/index.ts"],
       "@util/*": ["src/util/*"]
     },
     // The Svelte config uses some deprecated features.

vite.config.ts

@@ -19,7 +19,7 @@ export default defineConfig({
       "@organisms": resolve("src/components/organisms"),
       "@queries": resolve("src/queries"),
       "@services/logseq": resolve("src/services/logseq"),
-      "@services": resolve("src/services"),
+      "@services/raindrop": resolve("src/services/raindrop"),
       "@util": resolve("src/util"),
     },
   },