effect-mongodb - MongoClient: wrap mongodb driver MongoClient type into a TaggedClass

Author: VenomAV

.changeset/late-penguins-invent.md

@@ -0,0 +1,5 @@
+---
+"effect-mongodb": minor
+---
+
+Wrap mongodb driver MongoClient type into a TaggedClass

packages/effect-mongodb/src/MongoClient.ts

@@ -1,6 +1,7 @@
 /**
  * @since 0.0.1
  */
+import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as F from "effect/Function"
 import type * as Scope from "effect/Scope"
@@ -10,13 +11,14 @@ import * as Db from "./Db.js"
 import { mongoErrorOrDie } from "./internal/mongo-error.js"
 import * as MongoError from "./MongoError.js"
 
-export type MongoClient = MongoClient_
+export class MongoClient extends Data.TaggedClass("MongoClient")<{ client: MongoClient_ }> {}
 
 export const connect = (
   url: string,
   options?: MongoClientOptions
 ): Effect.Effect<MongoClient, MongoError.MongoError> =>
   Effect.promise(() => MongoClient_.connect(url, options)).pipe(
+    Effect.map((client) => new MongoClient({ client })),
     Effect.catchAllDefect(mongoErrorOrDie(errorSource([new URL(url).host], "connect")))
   )
 
@@ -25,7 +27,7 @@ export const close: {
   (client: MongoClient, force?: boolean): Effect.Effect<void, MongoError.MongoError>
 } = F.dual(
   (args) => isMongoClient(args[0]),
-  (client: MongoClient, force?: boolean): Effect.Effect<void, MongoError.MongoError> =>
+  ({ client }: MongoClient, force?: boolean): Effect.Effect<void, MongoError.MongoError> =>
     Effect.promise(() => client.close(force)).pipe(
       Effect.catchAllDefect(mongoErrorOrDie(errorSource(client.options.hosts.map((x) => x.host ?? "NO_HOST"), "close")))
     )
@@ -47,7 +49,8 @@ export const db: {
   (client: MongoClient, dbName?: string, options?: DbOptions): Db.Db
 } = F.dual(
   (args) => isMongoClient(args[0]),
-  (client: MongoClient, dbName?: string, options?: DbOptions): Db.Db => new Db.Db({ db: client.db(dbName, options) })
+  ({ client }: MongoClient, dbName?: string, options?: DbOptions): Db.Db =>
+    new Db.Db({ db: client.db(dbName, options) })
 )
 
 const isMongoClient = (x: unknown) => x instanceof MongoClient_

packages/services/src/DbInstance.ts

@@ -5,7 +5,7 @@ import * as MongoClient from "effect-mongodb/MongoClient"
 import * as Effect from "effect/Effect"
 import * as F from "effect/Function"
 import * as Layer from "effect/Layer"
-import type { DbOptions } from "mongodb"
+import type { DbOptions, MongoClient as MongoClient_ } from "mongodb"
 import * as DbService from "./DbService.js"
 import * as MongoClientService from "./MongoClientService.js"
 
@@ -36,7 +36,7 @@ export const layer = <DbK extends string>(
   return dbLayer.pipe(Layer.provide(defaultClientLayer))
 }
 
-type DbInstanceOptionsWithClient = Pick<DbInstanceOptions, "database"> & { client: MongoClient.MongoClient }
+type DbInstanceOptionsWithClient = Pick<DbInstanceOptions, "database"> & { client: MongoClient_ }
 
 export const fromMongoClient = <DbK extends string, E = never, R = never>(
   dbTag: DbService.TagType<DbK>,
@@ -45,7 +45,8 @@ export const fromMongoClient = <DbK extends string, E = never, R = never>(
   Layer.effect(
     dbTag,
     Effect.gen(function*() {
-      const { client, database: { name, ...dbOptions } } = yield* options
+      const { client: client_, database: { name, ...dbOptions } } = yield* options
+      const client = new MongoClient.MongoClient({ client: client_ })
       const db = MongoClient.db(client, name, dbOptions)
       return dbTag.of(db as DbService.DbService<DbK>)
     })