@effect/sql-pg 4.0.0-beta.98 → 4.0.0-rc.108

package/dist/PgMigrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"PgMigrator.js","names":["Effect","FileSystem","Layer","Path","Redacted","ChildProcess","ChildProcessSpawner","Migrator","PgClient","run","make","dumpSchema","path","table","pgDump","args","gen","sql","spawner","dump","env","PATH","globalThis","process","PGHOST","config","host","PGPORT","port","toString","PGUSER","username","PGPASSWORD","password","value","undefined","PGDATABASE","database","PGSSLMODE","ssl","pipe","string","replace","trim","mapError","error","MigrationError","kind","message","pgDumpSchema","pgDumpMigrations","pgDumpAll","map","all","concurrency","schema","migrations","pgDumpFile","fs","path_","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../src/PgMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"PgMigrator.js","names":[],"sources":["../src/PgMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["PgClient","PgMigrator"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;AAEA;;;AAGA,OAAO,KAAKA,QAAQ,MAAM,eAAe;AAEzC;;;AAGA,OAAO,KAAKC,UAAU,MAAM,iBAAiB","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;AAEA;;;AAGA,OAAO,KAAK,QAAQ,MAAM,eAAe;AAEzC;;;AAGA,OAAO,KAAK,UAAU,MAAM,iBAAiB","ignoreList":[]}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@effect/sql-pg",
-  "version": "4.0.0-beta.98",
+  "version": "4.0.0-rc.108",
   "type": "module",
   "license": "MIT",
   "description": "A PostgreSQL toolkit for Effect",
   "homepage": "https://effect.website",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Effect-TS/effect-smol.git",
+    "url": "https://github.com/Effect-TS/effect.git",
     "directory": "packages/sql/pg"
   },
   "bugs": {
-    "url": "https://github.com/Effect-TS/effect-smol/issues"
+    "url": "https://github.com/Effect-TS/effect/issues"
   },
   "tags": [
     "typescript",
@@ -29,6 +29,7 @@
     ".": "./dist/index.js",
     "./*": "./dist/*.js",
     "./internal/*": null,
+    "./index": null,
     "./*/index": null
   },
   "files": [
@@ -36,24 +37,27 @@
     "dist/**/*.js",
     "dist/**/*.js.map",
     "dist/**/*.d.ts",
-    "dist/**/*.d.ts.map"
+    "dist/**/*.d.ts.map",
+    "AGENTS.md",
+    "CLAUDE.md",
+    "ai-docs/**/*"
   ],
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
   "devDependencies": {
-    "@testcontainers/postgresql": "^11.14.0",
+    "@testcontainers/postgresql": "^12.0.4",
     "@types/pg": "^8.20.0",
     "@types/pg-cursor": "^2.7.2",
-    "effect": "^4.0.0-beta.98"
+    "effect": "^4.0.0-rc.108"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.98"
+    "effect": "^4.0.0-rc.108"
   },
   "dependencies": {
     "pg": "^8.22.0",
-    "pg-connection-string": "2.14.0",
+    "pg-connection-string": "^2.14.0",
     "pg-cursor": "^2.21.0",
     "pg-pool": "^3.14.0",
     "pg-types": "^4.1.0"
@@ -62,8 +66,6 @@
     "codegen": "effect-utils codegen",
     "build": "tsc -b tsconfig.json && pnpm babel",
     "babel": "babel dist --plugins annotate-pure-calls --out-dir dist --source-maps",
-    "check": "tsc -b tsconfig.json",
-    "test": "vitest",
-    "coverage": "vitest --coverage"
+    "check": "tsc -b tsconfig.json"
   }
 }

package/src/PgClient.ts

@@ -73,7 +73,7 @@ export type TypeId = "~@effect/sql-pg/PgClient"
 /**
  * PostgreSQL client service, extending `SqlClient` with JSON parameter fragments and LISTEN/NOTIFY helpers.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export interface PgClient extends Client.SqlClient {
@@ -99,7 +99,7 @@ export const PgClient = Context.Service<PgClient>("@effect/sql-pg/PgClient")
 /**
  * Configuration for a PostgreSQL client, including connection, TLS, custom stream, application name, type parser, JSON transform, and query/result name transform options.
  *
- * @category constructors
+ * @category models
  * @since 4.0.0
  */
 export interface PgClientConfig {
@@ -129,7 +129,7 @@ export interface PgClientConfig {
 /**
  * PostgreSQL pool configuration, extending `PgClientConfig` with idle timeout, pool size, and connection lifetime settings.
  *
- * @category constructors
+ * @category models
  * @since 4.0.0
  */
 export interface PgPoolConfig extends PgClientConfig {
@@ -219,52 +219,57 @@ export const makeClient = (
      */
     readonly acquireForStream?: boolean | undefined
   }
-): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
-  fromClient({
+): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> => {
+  function onError() {}
+  return fromClient({
     ...options,
-    acquire: Effect.gen(function*() {
-      const client = new Pg.Client({
-        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 } : {}),
-        application_name: options.applicationName ?? "@effect/sql-pg",
-        types: options.types
-      })
-      yield* Effect.acquireRelease(
-        Effect.tryPromise({
-          try: () => client.query("SELECT 1"),
-          catch: (cause) => new SqlError({ reason: classifyError(cause, "PgClient: Failed to connect", "connect") })
-        }),
-        () =>
-          Effect.promise(() => client.end()).pipe(
-            Effect.timeoutOption(1000)
-          ),
-        { interruptible: true }
-      ).pipe(
-        Effect.timeoutOrElse({
-          duration: options.connectTimeout ?? Duration.seconds(5),
-          orElse: () =>
-            Effect.fail(
-              new SqlError({
-                reason: new ConnectionError({
-                  cause: new Error("Connection timed out"),
-                  message: "PgClient: Connection timed out",
-                  operation: "connect"
-                })
+    acquire: Effect.acquireRelease(
+      Effect.tryPromise({
+        try: async () => {
+          const client = new Pg.Client({
+            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 } : {}),
+            application_name: options.applicationName ?? "@effect/sql-pg",
+            types: options.types
+          })
+          client.on("error", onError)
+          await client.connect()
+          return client
+        },
+        catch: (cause) => new SqlError({ reason: classifyError(cause, "PgClient: Failed to connect", "connect") })
+      }),
+      (client) =>
+        Effect.promise(() => {
+          client.off("error", onError)
+          return client.end()
+        }).pipe(
+          Effect.timeoutOption(1000)
+        ),
+      { interruptible: true }
+    ).pipe(
+      Effect.timeoutOrElse({
+        duration: options.connectTimeout ?? Duration.seconds(5),
+        orElse: () =>
+          Effect.fail(
+            new SqlError({
+              reason: new ConnectionError({
+                cause: new Error("Connection timed out"),
+                message: "PgClient: Connection timed out",
+                operation: "connect"
               })
-            )
-        })
-      )
-
-      return client
-    }),
+            })
+          )
+      })
+    ),
     acquireForStream: options.acquireForStream ?? false
   })
+}
 
 /**
  * Builds a PostgreSQL client from a scoped `pg` pool acquisition effect, deriving transaction, streaming, and LISTEN/NOTIFY support from that pool.
@@ -523,6 +528,17 @@ export const fromClient = Effect.fnUntraced(function*(
     )
   const connection = makeConection(client)
   const acquirer = semaphore.withPermit(Effect.succeed(connection))
+  const transactionAcquirer = Effect.uninterruptibleMask((restore) => {
+    const fiber = Fiber.getCurrent()!
+    const scope = Context.getUnsafe(fiber.context, Scope.Scope)
+    return Effect.as(
+      Effect.tap(
+        restore(semaphore.take(1)),
+        () => Scope.addFinalizer(scope, semaphore.release(1))
+      ),
+      connection
+    )
+  })
 
   const config: PgClientConfig = {
     ...options,
@@ -536,7 +552,7 @@ export const fromClient = Effect.fnUntraced(function*(
 
   return yield* makeWith({
     acquirer,
-    transactionAcquirer: acquirer,
+    transactionAcquirer,
     listenAcquirer: streamClient,
     config,
     spanAttributes: options.spanAttributes,
@@ -866,18 +882,18 @@ const escape = Statement.defaultEscape("\"")
 /**
  * PostgreSQL-specific custom statement fragments supported by the compiler, currently JSON parameter fragments.
  *
- * @category custom types
+ * @category models
  * @since 4.0.0
  */
 export type PgCustom = PgJson
 
 /**
- * @category custom types
+ * @category models
  * @since 4.0.0
  */
 interface PgJson extends Custom<"PgJson", unknown> {}
 /**
- * @category custom types
+ * @category constructors
  * @since 4.0.0
  */
 const PgJson = Statement.custom<PgJson>("PgJson")

package/src/PgMigrator.ts

@@ -29,7 +29,7 @@ export * from "effect/unstable/sql/Migrator"
 /**
  * Runs PostgreSQL SQL migrations using the configured clients. Schema dumps use `pg_dump` and require child process, filesystem, and path services.
  *
- * @category constructors
+ * @category running
  * @since 4.0.0
  */
 export const run: <R2 = never>(