packages: move effect-mongodb services-related code to new services package

Author: devmatteini

.changeset/famous-windows-scream.md

@@ -0,0 +1,5 @@
+---
+"effect-mongodb": patch
+---
+
+Remove services related types from Db and MongoClient that are moved to the new package `@effect-mongodb/services`

packages/effect-mongodb/src/Db.ts

@@ -1,18 +1,14 @@
 /**
  * @since 0.0.1
  */
-import type * as Brand from "effect/Brand"
-import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as F from "effect/Function"
-import * as Layer from "effect/Layer"
 import type * as Schema from "effect/Schema"
 import type { Document, DropCollectionOptions, ListCollectionsOptions } from "mongodb"
 import { Db } from "mongodb"
 import type * as Collection from "./Collection.js"
 import * as DocumentCollection from "./DocumentCollection.js"
 import * as ListCollectionsCursor from "./ListCollectionsCursor.js"
-import * as MongoClient from "./MongoClient.js"
 import * as MongoError from "./MongoError.js"
 
 export const documentCollection: {
@@ -89,35 +85,3 @@ export const dropCollection: {
 )
 
 const isDb = (x: unknown) => x instanceof Db
-
-export type DbService<K extends string> = {
-  db: Effect.Effect<Db, MongoError.MongoError>
-} & Brand.Brand<K>
-
-export const Tag = <K extends string>(key: K) => Context.GenericTag<DbService<K>>(key)
-export type TagType<K extends string> = ReturnType<typeof Tag<K>>
-
-export const fromEffect = <DbK extends string, MongoClientK extends string, E = never, R = never>(
-  dbTag: TagType<DbK>,
-  clientTag: MongoClient.TagType<MongoClientK>,
-  dbName: Effect.Effect<string, E, R>
-) =>
-  Layer.effect(
-    dbTag,
-    Effect.gen(function*(_) {
-      const { client } = yield* _(clientTag)
-      const dbName_ = yield* _(dbName)
-      const db = yield* _(
-        client,
-        Effect.map((client) => MongoClient.db(client, dbName_)),
-        Effect.cached
-      )
-      return dbTag.of({ db } as DbService<DbK>) // TODO fix cast using branded ctor
-    })
-  )
-
-export const fromConst = <DbK extends string, MongoClientK extends string>(
-  dbTag: TagType<DbK>,
-  clientTag: MongoClient.TagType<MongoClientK>,
-  dbName: string
-) => fromEffect(dbTag, clientTag, Effect.succeed(dbName))

packages/effect-mongodb/src/MongoClient.ts

@@ -1,15 +1,12 @@
 /**
  * @since 0.0.1
  */
-import type * as Brand from "effect/Brand"
 import * as Effect from "effect/Effect"
 import * as F from "effect/Function"
 import type { Db, DbOptions, MongoClientOptions } from "mongodb"
 import { MongoClient as MongoClient_ } from "mongodb"
 import * as MongoError from "./MongoError.js"
 
-import * as Context from "effect/Context"
-
 export type MongoClient = MongoClient_
 
 export const connect = (
@@ -29,10 +26,3 @@ export const db: {
 )
 
 const isMongoClient = (x: unknown) => x instanceof MongoClient_
-
-export type MongoClientService<K extends string> = {
-  client: Effect.Effect<MongoClient, MongoError.MongoError>
-} & Brand.Brand<K>
-
-export const Tag = <K extends string>(key: K) => Context.GenericTag<MongoClientService<K>>(key)
-export type TagType<K extends string> = ReturnType<typeof Tag<K>>

packages/services/src/Db.ts

@@ -0,0 +1,43 @@
+/**
+ * @since 0.0.1
+ */
+import * as MongoClient from "effect-mongodb/MongoClient"
+import type * as MongoError from "effect-mongodb/MongoError"
+import type * as Brand from "effect/Brand"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import type { Db } from "mongodb"
+import type * as MongoClientService from "./MongoClient.js"
+
+export type DbService<K extends string> = {
+  db: Effect.Effect<Db, MongoError.MongoError>
+} & Brand.Brand<K>
+
+export const Tag = <K extends string>(key: K) => Context.GenericTag<DbService<K>>(key)
+export type TagType<K extends string> = ReturnType<typeof Tag<K>>
+
+export const fromEffect = <DbK extends string, MongoClientK extends string, E = never, R = never>(
+  dbTag: TagType<DbK>,
+  clientTag: MongoClientService.TagType<MongoClientK>,
+  dbName: Effect.Effect<string, E, R>
+) =>
+  Layer.effect(
+    dbTag,
+    Effect.gen(function*(_) {
+      const { client } = yield* _(clientTag)
+      const dbName_ = yield* _(dbName)
+      const db = yield* _(
+        client,
+        Effect.map((client) => MongoClient.db(client, dbName_)),
+        Effect.cached
+      )
+      return dbTag.of({ db } as DbService<DbK>) // TODO fix cast using branded ctor
+    })
+  )
+
+export const fromConst = <DbK extends string, MongoClientK extends string>(
+  dbTag: TagType<DbK>,
+  clientTag: MongoClientService.TagType<MongoClientK>,
+  dbName: string
+) => fromEffect(dbTag, clientTag, Effect.succeed(dbName))

packages/services/src/MongoClient.ts

@@ -0,0 +1,15 @@
+/**
+ * @since 0.0.1
+ */
+import type * as MongoClient from "effect-mongodb/MongoClient"
+import type * as MongoError from "effect-mongodb/MongoError"
+import type * as Brand from "effect/Brand"
+import * as Context from "effect/Context"
+import type * as Effect from "effect/Effect"
+
+export type MongoClientService<K extends string> = {
+  client: Effect.Effect<MongoClient.MongoClient, MongoError.MongoError>
+} & Brand.Brand<K>
+
+export const Tag = <K extends string>(key: K) => Context.GenericTag<MongoClientService<K>>(key)
+export type TagType<K extends string> = ReturnType<typeof Tag<K>>

packages/services/src/index.ts

@@ -0,0 +1,9 @@
+/**
+ * @since 0.0.1
+ */
+export * as Db from "./Db.js"
+
+/**
+ * @since 0.0.1
+ */
+export * as MongoClient from "./MongoClient.js"