@effect/sql-pg 0.50.3 → 4.0.0-beta.0

package/src/PgClient.ts

@@ -1,27 +1,27 @@
 /**
  * @since 1.0.0
  */
-import * as Reactivity from "@effect/experimental/Reactivity"
-import * as Client from "@effect/sql/SqlClient"
-import type { Connection } from "@effect/sql/SqlConnection"
-import { SqlError } from "@effect/sql/SqlError"
-import type { Custom, Fragment } from "@effect/sql/Statement"
-import * as Statement from "@effect/sql/Statement"
 import * as Arr from "effect/Array"
-import * as Chunk from "effect/Chunk"
+import * as Cause from "effect/Cause"
+import * as Channel from "effect/Channel"
 import * as Config from "effect/Config"
-import type * as ConfigError from "effect/ConfigError"
-import * as Context from "effect/Context"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as Layer from "effect/Layer"
 import * as Number from "effect/Number"
-import * as Option from "effect/Option"
+import * as Queue from "effect/Queue"
 import * as RcRef from "effect/RcRef"
 import * as Redacted from "effect/Redacted"
 import * as Scope from "effect/Scope"
+import * as ServiceMap from "effect/ServiceMap"
 import * as Stream from "effect/Stream"
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
+import * as Client from "effect/unstable/sql/SqlClient"
+import type { Connection } from "effect/unstable/sql/SqlConnection"
+import { SqlError } from "effect/unstable/sql/SqlError"
+import type { Custom, Fragment } from "effect/unstable/sql/Statement"
+import * as Statement from "effect/unstable/sql/Statement"
 import type { Duplex } from "node:stream"
 import type { ConnectionOptions } from "node:tls"
 import * as Pg from "pg"
@@ -61,7 +61,7 @@ export interface PgClient extends Client.SqlClient {
  * @category tags
  * @since 1.0.0
  */
-export const PgClient = Context.GenericTag<PgClient>("@effect/sql-pg/PgClient")
+export const PgClient = ServiceMap.Service<PgClient>("@effect/sql-pg/PgClient")
 
 /**
  * @category constructors
@@ -96,381 +96,277 @@ export interface PgClientConfig {
   readonly types?: Pg.CustomTypesConfig | undefined
 }
 
-type ClientOptions = {
-  readonly spanAttributes?: Record<string, unknown> | undefined
-  readonly transformResultNames?: ((str: string) => string) | undefined
-  readonly transformQueryNames?: ((str: string) => string) | undefined
-  readonly transformJson?: boolean | undefined
-}
-
-const makeClient = (
-  pool: Pg.Pool,
-  config: PgClientConfig,
-  options: ClientOptions
+/**
+ * @category constructors
+ * @since 1.0.0
+ */
+export const make = (
+  options: PgClientConfig
 ): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
-  Effect.gen(function*() {
-    const compiler = makeCompiler(
-      options.transformQueryNames,
+  fromPool({
+    ...options,
+    acquire: Effect.gen(function*() {
+      const pool = new Pg.Pool({
+        connectionString: options.url ? Redacted.value(options.url) : undefined,
+        user: options.username,
+        host: options.host,
+        database: options.database,
+        password: options.password ? Redacted.value(options.password) : undefined,
+        ssl: options.ssl,
+        port: options.port,
+        ...(options.stream ? { stream: options.stream } : {}),
+        connectionTimeoutMillis: options.connectTimeout
+          ? Duration.toMillis(Duration.fromDurationInputUnsafe(options.connectTimeout))
+          : undefined,
+        idleTimeoutMillis: options.idleTimeout
+          ? Duration.toMillis(Duration.fromDurationInputUnsafe(options.idleTimeout))
+          : undefined,
+        max: options.maxConnections,
+        min: options.minConnections,
+        maxLifetimeSeconds: options.connectionTTL
+          ? Duration.toSeconds(Duration.fromDurationInputUnsafe(options.connectionTTL))
+          : undefined,
+        application_name: options.applicationName ?? "@effect/sql-pg",
+        types: options.types
+      })
+
+      pool.on("error", (_err) => {})
+
+      yield* Effect.acquireRelease(
+        Effect.tryPromise({
+          try: () => pool.query("SELECT 1"),
+          catch: (cause) => new SqlError({ cause, message: "PgClient: Failed to connect" })
+        }),
+        () =>
+          Effect.promise(() => pool.end()).pipe(
+            Effect.timeoutOption(1000)
+          )
+      ).pipe(
+        Effect.timeoutOrElse({
+          duration: options.connectTimeout ?? Duration.seconds(5),
+          onTimeout: () =>
+            Effect.fail(
+              new SqlError({
+                cause: new Error("Connection timed out"),
+                message: "PgClient: Connection timed out"
+              })
+            )
+        })
+      )
+
+      return pool
+    })
+  })
+
+/**
+ * @category constructors
+ * @since 1.0.0
+ */
+export const fromPool = Effect.fnUntraced(function*(
+  options: {
+    readonly acquire: Effect.Effect<Pg.Pool, SqlError, Scope.Scope>
+
+    readonly applicationName?: string | undefined
+    readonly spanAttributes?: Record<string, unknown> | undefined
+
+    readonly transformResultNames?: ((str: string) => string) | undefined
+    readonly transformQueryNames?: ((str: string) => string) | undefined
+    readonly transformJson?: boolean | undefined
+    readonly types?: Pg.CustomTypesConfig | undefined
+  }
+): Effect.fn.Return<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> {
+  const compiler = makeCompiler(
+    options.transformQueryNames,
+    options.transformJson
+  )
+  const transformRows = options.transformResultNames ?
+    Statement.defaultTransforms(
+      options.transformResultNames,
       options.transformJson
-    )
-    const transformRows = options.transformResultNames ?
-      Statement.defaultTransforms(
-        options.transformResultNames,
-        options.transformJson
-      ).array :
-      undefined
-
-    class ConnectionImpl implements Connection {
-      readonly pg: Pg.PoolClient | undefined
-      constructor(pg?: Pg.PoolClient) {
-        this.pg = pg
-      }
+    ).array :
+    undefined
 
-      private runWithClient<A>(f: (client: Pg.PoolClient, resume: (_: Effect.Effect<A, SqlError>) => void) => void) {
-        if (this.pg !== undefined) {
-          return Effect.async<A, SqlError>((resume) => {
-            f(this.pg!, resume)
-            return makeCancel(pool, this.pg!)
-          })
+  const pool = yield* options.acquire
+
+  class ConnectionImpl implements Connection {
+    readonly pg: Pg.PoolClient | undefined
+    constructor(pg?: Pg.PoolClient) {
+      this.pg = pg
+    }
+
+    private runWithClient<A>(f: (client: Pg.PoolClient, resume: (_: Effect.Effect<A, SqlError>) => void) => void) {
+      if (this.pg !== undefined) {
+        return Effect.callback<A, SqlError>((resume) => {
+          f(this.pg!, resume)
+          return makeCancel(pool, this.pg!)
+        })
+      }
+      return Effect.callback<A, SqlError>((resume) => {
+        let done = false
+        let cancel: Effect.Effect<void> | undefined = undefined
+        let client: Pg.PoolClient | undefined = undefined
+        function onError(cause: Error) {
+          cleanup(cause)
+          resume(Effect.fail(new SqlError({ cause, message: "Connection error" })))
         }
-        return Effect.async<A, SqlError>((resume) => {
-          let done = false
-          let cancel: Effect.Effect<void> | undefined = undefined
-          let client: Pg.PoolClient | undefined = undefined
-          function onError(cause: Error) {
-            cleanup(cause)
-            resume(Effect.fail(new SqlError({ cause, message: "Connection error" })))
-          }
-          function cleanup(cause?: Error) {
-            if (!done) client?.release(cause)
-            done = true
-            client?.off("error", onError)
-          }
-          pool.connect((cause, client_) => {
-            if (cause) {
-              return resume(Effect.fail(new SqlError({ cause, message: "Failed to acquire connection" })))
-            } else if (!client_) {
-              return resume(
-                Effect.fail(
-                  new SqlError({ message: "Failed to acquire connection", cause: new Error("No client returned") })
-                )
+        function cleanup(cause?: Error) {
+          if (!done) client?.release(cause)
+          done = true
+          client?.off("error", onError)
+        }
+        pool.connect((cause, client_) => {
+          if (cause) {
+            return resume(Effect.fail(new SqlError({ cause, message: "Failed to acquire connection" })))
+          } else if (!client_) {
+            return resume(
+              Effect.fail(
+                new SqlError({ message: "Failed to acquire connection", cause: new Error("No client returned") })
               )
-            } else if (done) {
-              client_.release()
-              return
-            }
-            client = client_
-            client.once("error", onError)
-            cancel = makeCancel(pool, client)
-            f(client, (eff) => {
-              cleanup()
-              resume(eff)
-            })
-          })
-          return Effect.suspend(() => {
-            if (!cancel) {
-              cleanup()
-              return Effect.void
-            }
-            return Effect.ensuring(cancel, Effect.sync(cleanup))
+            )
+          } else if (done) {
+            client_.release()
+            return
+          }
+          client = client_
+          client.once("error", onError)
+          cancel = makeCancel(pool, client)
+          f(client, (eff) => {
+            cleanup()
+            resume(eff)
           })
         })
-      }
+        return Effect.suspend(() => {
+          if (!cancel) {
+            cleanup()
+            return Effect.void
+          }
+          return Effect.ensuring(cancel, Effect.sync(cleanup))
+        })
+      })
+    }
 
-      private run(query: string, params: ReadonlyArray<unknown>) {
-        return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
-          client.query(query, params as any, (err, result) => {
+    private run(query: string, params: ReadonlyArray<unknown>) {
+      return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
+        client.query(query, params as any, (err, result) => {
+          if (err) {
+            resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
+          } else {
+            // Multi-statement queries return an array of results
+            resume(Effect.succeed(
+              Array.isArray(result)
+                ? result.map((r) => r.rows ?? [])
+                : result.rows ?? []
+            ))
+          }
+        })
+      })
+    }
+
+    execute(
+      sql: string,
+      params: ReadonlyArray<unknown>,
+      transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
+    ) {
+      return transformRows
+        ? Effect.map(this.run(sql, params), transformRows)
+        : this.run(sql, params)
+    }
+    executeRaw(sql: string, params: ReadonlyArray<unknown>) {
+      return this.runWithClient<Pg.Result>((client, resume) => {
+        client.query(sql, params as any, (err, result) => {
+          if (err) {
+            resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
+          } else {
+            resume(Effect.succeed(result))
+          }
+        })
+      })
+    }
+    executeWithoutTransform(sql: string, params: ReadonlyArray<unknown>) {
+      return this.run(sql, params)
+    }
+    executeValues(sql: string, params: ReadonlyArray<unknown>) {
+      return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
+        client.query(
+          {
+            text: sql,
+            rowMode: "array",
+            values: params as Array<string>
+          },
+          (err, result) => {
             if (err) {
               resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
             } else {
-              // Multi-statement queries return an array of results
-              resume(Effect.succeed(
-                Array.isArray(result)
-                  ? result.map((r) => r.rows ?? [])
-                  : result.rows ?? []
-              ))
+              resume(Effect.succeed(result.rows))
             }
-          })
-        })
-      }
-
-      execute(
-        sql: string,
-        params: ReadonlyArray<unknown>,
-        transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
-      ) {
-        return transformRows
-          ? Effect.map(this.run(sql, params), transformRows)
-          : this.run(sql, params)
-      }
-      executeRaw(sql: string, params: ReadonlyArray<unknown>) {
-        return this.runWithClient<Pg.Result>((client, resume) => {
-          client.query(sql, params as any, (err, result) => {
+          }
+        )
+      })
+    }
+    executeUnprepared(
+      sql: string,
+      params: ReadonlyArray<unknown>,
+      transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
+    ) {
+      return this.execute(sql, params, transformRows)
+    }
+    executeStream(
+      sql: string,
+      params: ReadonlyArray<unknown>,
+      transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
+    ) {
+      // oxlint-disable-next-line @typescript-eslint/no-this-alias
+      const self = this
+      return Stream.fromChannel(Channel.fromTransform(Effect.fnUntraced(function*(_, scope) {
+        const client = self.pg ?? (yield* Scope.provide(reserveRaw, scope))
+        yield* Scope.addFinalizer(scope, Effect.promise(() => cursor.close()))
+        const cursor = client.query(new Cursor(sql, params as any))
+        // @effect-diagnostics-next-line returnEffectInGen:off
+        return Effect.callback<Arr.NonEmptyReadonlyArray<any>, SqlError | Cause.Done>((resume) => {
+          cursor.read(128, (err, rows) => {
             if (err) {
               resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
+            } else if (Arr.isArrayNonEmpty(rows)) {
+              resume(Effect.succeed(transformRows ? transformRows(rows) as any : rows))
             } else {
-              resume(Effect.succeed(result))
+              resume(Cause.done())
             }
           })
         })
-      }
-      executeWithoutTransform(sql: string, params: ReadonlyArray<unknown>) {
-        return this.run(sql, params)
-      }
-      executeValues(sql: string, params: ReadonlyArray<unknown>) {
-        return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
-          client.query(
-            {
-              text: sql,
-              rowMode: "array",
-              values: params as Array<string>
-            },
-            (err, result) => {
-              if (err) {
-                resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
-              } else {
-                resume(Effect.succeed(result.rows))
-              }
-            }
-          )
-        })
-      }
-      executeUnprepared(
-        sql: string,
-        params: ReadonlyArray<unknown>,
-        transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
-      ) {
-        return this.execute(sql, params, transformRows)
-      }
-      executeStream(
-        sql: string,
-        params: ReadonlyArray<unknown>,
-        transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
-      ) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const self = this
-        return Effect.gen(function*() {
-          const scope = yield* Effect.scope
-          const client = self.pg ?? (yield* reserveRaw)
-          yield* Scope.addFinalizer(scope, Effect.promise(() => cursor.close()))
-          const cursor = client.query(new Cursor(sql, params as any))
-          const pull = Effect.async<Chunk.Chunk<any>, Option.Option<SqlError>>((resume) => {
-            cursor.read(128, (err, rows) => {
-              if (err) {
-                resume(Effect.fail(Option.some(new SqlError({ cause: err, message: "Failed to execute statement" }))))
-              } else if (Arr.isNonEmptyArray(rows)) {
-                resume(Effect.succeed(Chunk.unsafeFromArray(transformRows ? transformRows(rows) as any : rows)))
-              } else {
-                resume(Effect.fail(Option.none()))
-              }
-            })
-          })
-          return Stream.repeatEffectChunkOption(pull)
-        }).pipe(
-          Stream.unwrapScoped
-        )
-      }
+      })))
     }
+  }
 
-    const reserveRaw = Effect.async<Pg.PoolClient, SqlError, Scope.Scope>((resume) => {
-      const fiber = Option.getOrThrow(Fiber.getCurrentFiber())
-      const scope = Context.unsafeGet(fiber.currentContext, Scope.Scope)
-      let cause: Error | undefined = undefined
-      function onError(cause_: Error) {
-        cause = cause_
-      }
-      pool.connect((err, client, release) => {
-        if (err) {
-          resume(Effect.fail(new SqlError({ cause: err, message: "Failed to acquire connection for transaction" })))
-          return
-        } else if (!client) {
-          resume(
-            Effect.fail(
-              new SqlError({
-                message: "Failed to acquire connection for transaction",
-                cause: new Error("No client returned")
-              })
-            )
-          )
-          return
-        }
-
-        // Else we know we have client defined, so we can proceed with the connection
-        client.on("error", onError)
+  const reserveRaw = Effect.callback<Pg.PoolClient, SqlError, Scope.Scope>((resume) => {
+    const fiber = Fiber.getCurrent()!
+    const scope = ServiceMap.getUnsafe(fiber.services, Scope.Scope)
+    let cause: Error | undefined = undefined
+    pool.connect((err, client, release) => {
+      if (err) {
+        resume(Effect.fail(new SqlError({ cause: err, message: "Failed to acquire connection for transaction" })))
+      } else {
         resume(Effect.as(
           Scope.addFinalizer(
             scope,
             Effect.sync(() => {
-              client.off("error", onError)
+              client!.off("error", onError)
               release(cause)
             })
           ),
-          client
+          client!
         ))
-      })
-    })
-    const reserve = Effect.map(reserveRaw, (client) => new ConnectionImpl(client))
-
-    const listenClient = yield* RcRef.make({
-      acquire: reserveRaw
-    })
-
-    return Object.assign(
-      yield* Client.make({
-        acquirer: Effect.succeed(new ConnectionImpl()),
-        transactionAcquirer: reserve,
-        compiler,
-        spanAttributes: [
-          ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
-          [ATTR_DB_SYSTEM_NAME, "postgresql"],
-          [ATTR_DB_NAMESPACE, config.database ?? config.username ?? "postgres"],
-          [ATTR_SERVER_ADDRESS, config.host ?? "localhost"],
-          [ATTR_SERVER_PORT, config.port ?? 5432]
-        ],
-        transformRows
-      }),
-      {
-        [TypeId]: TypeId as TypeId,
-        config,
-        json: (_: unknown) => PgJson(_),
-        listen: (channel: string) =>
-          Stream.asyncPush<string, SqlError>(Effect.fnUntraced(function*(emit) {
-            const client = yield* RcRef.get(listenClient)
-            function onNotification(msg: Pg.Notification) {
-              if (msg.channel === channel && msg.payload) {
-                emit.single(msg.payload)
-              }
-            }
-            yield* Effect.addFinalizer(() =>
-              Effect.promise(() => {
-                client.off("notification", onNotification)
-                return client.query(`UNLISTEN ${Pg.escapeIdentifier(channel)}`)
-              })
-            )
-            yield* Effect.tryPromise({
-              try: () => client.query(`LISTEN ${Pg.escapeIdentifier(channel)}`),
-              catch: (cause) => new SqlError({ cause, message: "Failed to listen" })
-            })
-            client.on("notification", onNotification)
-          })),
-        notify: (channel: string, payload: string) =>
-          Effect.async<void, SqlError>((resume) => {
-            pool.query(`NOTIFY ${Pg.escapeIdentifier(channel)}, $1`, [payload], (err) => {
-              if (err) {
-                resume(Effect.fail(new SqlError({ cause: err, message: "Failed to notify" })))
-              } else {
-                resume(Effect.void)
-              }
-            })
-          })
       }
-    )
-  })
-
-/**
- * @category constructors
- * @since 1.0.0
- */
-export const make = (
-  options: PgClientConfig
-): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
-  Effect.gen(function*() {
-    const pool = new Pg.Pool({
-      connectionString: options.url ? Redacted.value(options.url) : undefined,
-      user: options.username,
-      host: options.host,
-      database: options.database,
-      password: options.password ? Redacted.value(options.password) : undefined,
-      ssl: options.ssl,
-      port: options.port,
-      ...(options.stream ? { stream: options.stream } : {}),
-      connectionTimeoutMillis: options.connectTimeout
-        ? Duration.toMillis(options.connectTimeout)
-        : undefined,
-      idleTimeoutMillis: options.idleTimeout
-        ? Duration.toMillis(options.idleTimeout)
-        : undefined,
-      max: options.maxConnections,
-      min: options.minConnections,
-      maxLifetimeSeconds: options.connectionTTL
-        ? Duration.toSeconds(options.connectionTTL)
-        : undefined,
-      application_name: options.applicationName ?? "@effect/sql-pg",
-      types: options.types
-    })
-
-    pool.on("error", (_err) => {
-    })
-
-    yield* Effect.acquireRelease(
-      Effect.tryPromise({
-        try: () => pool.query("SELECT 1"),
-        catch: (cause) => new SqlError({ cause, message: "PgClient: Failed to connect" })
-      }),
-      () =>
-        Effect.promise(() => pool.end()).pipe(
-          Effect.interruptible,
-          Effect.timeoutOption(1000)
-        )
-    ).pipe(
-      Effect.timeoutFail({
-        duration: options.connectTimeout ?? Duration.seconds(5),
-        onTimeout: () =>
-          new SqlError({
-            cause: new Error("Connection timed out"),
-            message: "PgClient: Connection timed out"
-          })
-      })
-    )
-
-    let config = options
-    if (pool.options.connectionString) {
-      try {
-        const parsed = PgConnString.parse(pool.options.connectionString)
-        config = {
-          ...config,
-          host: config.host ?? parsed.host ?? undefined,
-          port: config.port ?? (parsed.port ? Option.getOrUndefined(Number.parse(parsed.port)) : undefined),
-          username: config.username ?? parsed.user ?? undefined,
-          password: config.password ?? (parsed.password ? Redacted.make(parsed.password) : undefined),
-          database: config.database ?? parsed.database ?? undefined
-        }
-      } catch {
-        //
+      function onError(cause_: Error) {
+        cause = cause_
       }
-    }
-
-    return yield* makeClient(pool, config, options)
+      client!.on("error", onError)
+    })
   })
+  const reserve = Effect.map(reserveRaw, (client) => new ConnectionImpl(client))
 
-/**
- * @category constructors
- * @since 1.0.0
- */
-export interface PgClientFromPoolOptions {
-  readonly acquire: Effect.Effect<Pg.Pool, SqlError, Scope.Scope>
-
-  readonly applicationName?: string | undefined
-  readonly spanAttributes?: Record<string, unknown> | undefined
-
-  readonly transformResultNames?: ((str: string) => string) | undefined
-  readonly transformQueryNames?: ((str: string) => string) | undefined
-  readonly transformJson?: boolean | undefined
-  readonly types?: Pg.CustomTypesConfig | undefined
-}
-
-/**
- * Create a `PgClient` from an existing `pg` pool.
- *
- * You control the pool lifecycle via `acquire` (typically `Effect.acquireRelease`).
- *
- * @category constructors
- * @since 1.0.0
- */
-export const fromPool = Effect.fnUntraced(function*(
-  options: PgClientFromPoolOptions
-): Effect.fn.Return<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> {
-  const pool = yield* options.acquire
+  const listenClient = yield* RcRef.make({
+    acquire: reserveRaw
+  })
 
   let config: PgClientConfig = {
     url: pool.options.connectionString ? Redacted.make(pool.options.connectionString) : undefined,
@@ -480,17 +376,17 @@ export const fromPool = Effect.fnUntraced(function*(
     username: pool.options.user,
     password: typeof pool.options.password === "string" ? Redacted.make(pool.options.password) : undefined,
     ssl: pool.options.ssl,
-    applicationName: (pool.options as any).application_name,
+    applicationName: pool.options.application_name,
     types: pool.options.types
   }
-
   if (pool.options.connectionString) {
+    // @effect-diagnostics-next-line tryCatchInEffectGen:off
     try {
       const parsed = PgConnString.parse(pool.options.connectionString)
       config = {
         ...config,
         host: config.host ?? parsed.host ?? undefined,
-        port: config.port ?? (parsed.port ? Option.getOrUndefined(Number.parse(parsed.port)) : undefined),
+        port: config.port ?? (parsed.port ? Number.parse(parsed.port) : undefined),
         username: config.username ?? parsed.user ?? undefined,
         password: config.password ?? (parsed.password ? Redacted.make(parsed.password) : undefined),
         database: config.database ?? parsed.database ?? undefined
@@ -500,7 +396,56 @@ export const fromPool = Effect.fnUntraced(function*(
     }
   }
 
-  return yield* makeClient(pool, config, options)
+  return Object.assign(
+    yield* Client.make({
+      acquirer: Effect.succeed(new ConnectionImpl()),
+      transactionAcquirer: reserve,
+      compiler,
+      spanAttributes: [
+        ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
+        [ATTR_DB_SYSTEM_NAME, "postgresql"],
+        [ATTR_DB_NAMESPACE, config.database ?? config.username ?? "postgres"],
+        [ATTR_SERVER_ADDRESS, config.host ?? "localhost"],
+        [ATTR_SERVER_PORT, config.port ?? 5432]
+      ],
+      transformRows
+    }),
+    {
+      [TypeId]: TypeId as TypeId,
+      config,
+      json: (_: unknown) => Statement.fragment([PgJson(_)]),
+      listen: (channel: string) =>
+        Stream.callback<string, SqlError>(Effect.fnUntraced(function*(queue) {
+          const client = yield* RcRef.get(listenClient)
+          function onNotification(msg: Pg.Notification) {
+            if (msg.channel === channel && msg.payload) {
+              Queue.offerUnsafe(queue, msg.payload)
+            }
+          }
+          yield* Effect.addFinalizer(() =>
+            Effect.promise(() => {
+              client.off("notification", onNotification)
+              return client.query(`UNLISTEN ${Pg.escapeIdentifier(channel)}`)
+            })
+          )
+          yield* Effect.tryPromise({
+            try: () => client.query(`LISTEN ${Pg.escapeIdentifier(channel)}`),
+            catch: (cause) => new SqlError({ cause, message: "Failed to listen" })
+          })
+          client.on("notification", onNotification)
+        })),
+      notify: (channel: string, payload: string) =>
+        Effect.callback<void, SqlError>((resume) => {
+          pool.query(`NOTIFY ${Pg.escapeIdentifier(channel)}, $1`, [payload], (err) => {
+            if (err) {
+              resume(Effect.fail(new SqlError({ cause: err, message: "Failed to notify" })))
+            } else {
+              resume(Effect.void)
+            }
+          })
+        })
+    }
+  )
 })
 
 const cancelEffects = new WeakMap<Pg.PoolClient, Effect.Effect<void> | undefined>()
@@ -511,7 +456,7 @@ const makeCancel = (pool: Pg.Pool, client: Pg.PoolClient) => {
   const processId = (client as any).processID
   const eff = processId !== undefined
     // query cancelation is best-effort, so we don't fail if it doesn't work
-    ? Effect.async<void>((resume) => {
+    ? Effect.callback<void>((resume) => {
       if (pool.ending) return resume(Effect.void)
       pool.query(`SELECT pg_cancel_backend(${processId})`, () => {
         resume(Effect.void)
@@ -529,15 +474,17 @@ const makeCancel = (pool: Pg.Pool, client: Pg.PoolClient) => {
  * @category layers
  * @since 1.0.0
  */
-export const layerConfig = (
-  config: Config.Config.Wrap<PgClientConfig>
-): Layer.Layer<PgClient | Client.SqlClient, ConfigError.ConfigError | SqlError> =>
-  Layer.scopedContext(
-    Config.unwrap(config).pipe(
+export const layerConfig: (
+  config: Config.Wrap<PgClientConfig>
+) => Layer.Layer<PgClient | Client.SqlClient, Config.ConfigError | SqlError> = (
+  config: Config.Wrap<PgClientConfig>
+): Layer.Layer<PgClient | Client.SqlClient, Config.ConfigError | SqlError> =>
+  Layer.effectServices(
+    Config.unwrap(config).asEffect().pipe(
       Effect.flatMap(make),
       Effect.map((client) =>
-        Context.make(PgClient, client).pipe(
-          Context.add(Client.SqlClient, client)
+        ServiceMap.make(PgClient, client).pipe(
+          ServiceMap.add(Client.SqlClient, client)
         )
       )
     )
@@ -550,10 +497,10 @@ export const layerConfig = (
 export const layer = (
   config: PgClientConfig
 ): Layer.Layer<PgClient | Client.SqlClient, SqlError> =>
-  Layer.scopedContext(
+  Layer.effectServices(
     Effect.map(make(config), (client) =>
-      Context.make(PgClient, client).pipe(
-        Context.add(Client.SqlClient, client)
+      ServiceMap.make(PgClient, client).pipe(
+        ServiceMap.add(Client.SqlClient, client)
       ))
   ).pipe(Layer.provide(Reactivity.layer))
 
@@ -561,13 +508,21 @@ export const layer = (
  * @category layers
  * @since 1.0.0
  */
-export const layerFromPool = (
-  options: PgClientFromPoolOptions
-): Layer.Layer<PgClient | Client.SqlClient, SqlError> =>
-  Layer.scopedContext(
+export const layerFromPool = (options: {
+  readonly acquire: Effect.Effect<Pg.Pool, SqlError, Scope.Scope>
+
+  readonly applicationName?: string | undefined
+  readonly spanAttributes?: Record<string, unknown> | undefined
+
+  readonly transformResultNames?: ((str: string) => string) | undefined
+  readonly transformQueryNames?: ((str: string) => string) | undefined
+  readonly transformJson?: boolean | undefined
+  readonly types?: Pg.CustomTypesConfig | undefined
+}): Layer.Layer<PgClient | Client.SqlClient, SqlError> =>
+  Layer.effectServices(
     Effect.map(fromPool(options), (client) =>
-      Context.make(PgClient, client).pipe(
-        Context.add(Client.SqlClient, client)
+      ServiceMap.make(PgClient, client).pipe(
+        ServiceMap.add(Client.SqlClient, client)
       ))
   ).pipe(Layer.provide(Reactivity.layer))
 
@@ -608,8 +563,8 @@ export const makeCompiler = (
             placeholder(undefined),
             [
               withoutTransform || transformValue === undefined
-                ? type.i0
-                : transformValue(type.i0)
+                ? type.paramA
+                : transformValue(type.paramA)
             ]
           ]
         }