@effect/sql-pg 4.0.0-beta.99 → 4.0.0-rc.109

package/ai-docs/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "../tsconfig.base.json",
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "compilerOptions": {
+    "rootDir": ".",
+    "noEmit": true,
+    "declaration": false,
+    "declarationMap": false,
+    "composite": false,
+    "incremental": false,
+    "types": ["node"],
+    "plugins": [
+      {
+        "name": "@effect/language-service",
+        "namespaceImportPackages": [],
+        "diagnosticSeverity": {
+          "floatingEffect": "off",
+          "preferSchemaOverJson": "off"
+        }
+      }
+    ]
+  }
+}

package/dist/PgClient.d.ts

@@ -32,7 +32,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 {
@@ -56,7 +56,7 @@ export declare const PgClient: Context.Service<PgClient, 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 {
@@ -80,7 +80,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 {
@@ -194,18 +194,18 @@ export declare const makeCompiler: (transform?: (_: string) => string, transform
 /**
  * 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
  */
 declare const PgJson: (paramA: unknown, paramB: void, paramC: void) => PgJson;

package/dist/PgClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PgClient.d.ts","sourceRoot":"","sources":["../src/PgClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PgClient.d.ts","sourceRoot":"","sources":["../src/PgClient.ts"],"names":[],"mappings":"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"}

package/dist/PgClient.js

@@ -108,44 +108,51 @@ export const make = options => fromPool({
  * @category constructors
  * @since 4.0.0
  */
-export const makeClient = options => fromClient({
-  ...options,
-  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
-      });
-      await client.connect();
-      return client;
-    },
-    catch: cause => new SqlError({
-      reason: classifyError(cause, "PgClient: Failed to connect", "connect")
-    })
-  }), client => 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"
+export const makeClient = options => {
+  function onError() {}
+  return fromClient({
+    ...options,
+    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")
       })
-    }))
-  })),
-  acquireForStream: options.acquireForStream ?? false
-});
+    }), 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"
+        })
+      }))
+    })),
+    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.
  *
@@ -321,6 +328,11 @@ export const fromClient = /*#__PURE__*/Effect.fnUntraced(function* (options) {
   }, streamClient);
   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 = {
     ...options,
     host: client.host,
@@ -332,7 +344,7 @@ export const fromClient = /*#__PURE__*/Effect.fnUntraced(function* (options) {
   };
   return yield* makeWith({
     acquirer,
-    transactionAcquirer: acquirer,
+    transactionAcquirer,
     listenAcquirer: streamClient,
     config,
     spanAttributes: options.spanAttributes,
@@ -544,7 +556,7 @@ export const makeCompiler = (transform, transformJson = true) => {
 };
 const escape = /*#__PURE__*/Statement.defaultEscape("\"");
 /**
- * @category custom types
+ * @category constructors
  * @since 4.0.0
  */
 const PgJson = /*#__PURE__*/Statement.custom("PgJson");

package/dist/PgClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"PgClient.js","names":["Arr","Cause","Channel","Config","Context","Duration","Effect","Fiber","Layer","Number","Option","Queue","RcRef","Redacted","Scope","Semaphore","Stream","Reactivity","Client","AuthenticationError","AuthorizationError","ConnectionError","ConstraintError","DeadlockError","LockTimeoutError","SerializationError","SqlError","SqlSyntaxError","StatementTimeoutError","UniqueViolation","UnknownError","Statement","Pg","PgConnString","Cursor","TypeId","PgClient","Service","make","options","fromPool","acquire","gen","pool","Pool","connectionString","url","value","undefined","user","username","host","database","password","ssl","port","stream","connectionTimeoutMillis","connectTimeout","toMillis","fromInputUnsafe","idleTimeoutMillis","idleTimeout","max","maxConnections","min","minConnections","maxLifetimeSeconds","connectionTTL","toSeconds","application_name","applicationName","types","on","_err","acquireRelease","tryPromise","try","query","catch","cause","reason","classifyError","promise","end","pipe","timeoutOption","interruptible","timeoutOrElse","duration","seconds","orElse","fail","Error","message","operation","makeClient","fromClient","client","connect","acquireForStream","fnUntraced","makeConection","ConnectionImpl","runWithClient","f","callback","resume","makeCancel","done","cancel","onError","cleanup","release","off","client_","once","eff","suspend","void","ensuring","sync","succeed","reserveRaw","fiber","getCurrent","scope","getUnsafe","context","cause_","err","as","addFinalizer","reserve","map","onListenClientError","_","listenAcquirer","config","parsed","parse","getOrUndefined","makeWith","acquirer","transactionAcquirer","get","spanAttributes","transformResultNames","transformQueryNames","transformJson","acquireWithErrorHandler","tap","semaphore","makeUnsafe","streamClient","take","connection","withPermit","compiler","makeCompiler","transformRows","defaultTransforms","array","Object","assign","entries","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","json","fragment","PgJson","listen","channel","queue","onNotification","msg","payload","offerUnsafe","escapeIdentifier","notify","asVoid","scoped","flatMap","conn","executeRaw","constructor","run","params","result","Array","isArray","r","rows","execute","sql","executeWithoutTransform","executeValues","text","rowMode","values","executeValuesUnprepared","executeUnprepared","executeStream","self","fromChannel","fromTransform","provide","cursor","close","read","isArrayNonEmpty","cancelEffects","WeakMap","has","processId","processID","ending","set","layerFrom","effectContext","add","SqlClient","layer","layerConfig","unwrap","transform","transformValue","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","placeholders","valueAlias","valueColumns","returning","flat","concat","onCustom","type","kind","paramA","defaultEscape","custom","pgCodeFromCause","code","pgConstraintFromCause","constraint","normalized","trim","length","props","startsWith"],"sources":["../src/PgClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"PgClient.js","names":[],"sources":["../src/PgClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/PgMigrator.d.ts

@@ -25,7 +25,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 declare const run: <R2 = never>(options: Migrator.MigratorOptions<R2>) => Effect.Effect<ReadonlyArray<readonly [id: number, name: string]>, Migrator.MigrationError | SqlError, SqlClient | PgClient | ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path | R2>;

package/dist/PgMigrator.js

@@ -25,7 +25,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 = /*#__PURE__*/Migrator.make({

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,6 +1,6 @@
 {
   "name": "@effect/sql-pg",
-  "version": "4.0.0-beta.99",
+  "version": "4.0.0-rc.109",
   "type": "module",
   "license": "MIT",
   "description": "A PostgreSQL toolkit for Effect",
@@ -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.99"
+    "effect": "^4.0.0-rc.109"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.99"
+    "effect": "^4.0.0-rc.109"
   },
   "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,8 +219,9 @@ 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.acquireRelease(
       Effect.tryPromise({
@@ -237,13 +238,17 @@ export const makeClient = (
             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.end()).pipe(
+        Effect.promise(() => {
+          client.off("error", onError)
+          return client.end()
+        }).pipe(
           Effect.timeoutOption(1000)
         ),
       { interruptible: true }
@@ -264,6 +269,7 @@ export const makeClient = (
     ),
     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.
@@ -522,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,
@@ -535,7 +552,7 @@ export const fromClient = Effect.fnUntraced(function*(
 
   return yield* makeWith({
     acquirer,
-    transactionAcquirer: acquirer,
+    transactionAcquirer,
     listenAcquirer: streamClient,
     config,
     spanAttributes: options.spanAttributes,
@@ -865,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>(