pgsql-test 2.6.2 → 2.6.3

package/connect.js

@@ -46,7 +46,6 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
         admin.installExtensions(connOpts.extensions);
     }
     await admin.grantConnect(connOpts.connection.user, config.database);
-    // Main admin client (optional unless needed elsewhere)
     manager = manager_1.PgTestConnector.getInstance();
     const pg = manager.getClient(config);
     if (seedAdapters.length) {
@@ -57,7 +56,6 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
             pg: manager.getClient(config)
         });
     }
-    // App user connection
     const db = manager.getClient({
         ...config,
         user: connOpts.connection.user,
@@ -65,6 +63,7 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
     });
     db.setContext({ role: 'anonymous' });
     const teardown = async () => {
+        manager.beginTeardown();
         await (0, pg_cache_1.teardownPgPools)();
         await manager.closeAll();
     };

package/esm/connect.js

@@ -42,7 +42,6 @@ export const getConnections = async (cn = {}, seedAdapters = [seed.launchql()])
         admin.installExtensions(connOpts.extensions);
     }
     await admin.grantConnect(connOpts.connection.user, config.database);
-    // Main admin client (optional unless needed elsewhere)
     manager = PgTestConnector.getInstance();
     const pg = manager.getClient(config);
     if (seedAdapters.length) {
@@ -53,7 +52,6 @@ export const getConnections = async (cn = {}, seedAdapters = [seed.launchql()])
             pg: manager.getClient(config)
         });
     }
-    // App user connection
     const db = manager.getClient({
         ...config,
         user: connOpts.connection.user,
@@ -61,6 +59,7 @@ export const getConnections = async (cn = {}, seedAdapters = [seed.launchql()])
     });
     db.setContext({ role: 'anonymous' });
     const teardown = async () => {
+        manager.beginTeardown();
         await teardownPgPools();
         await manager.closeAll();
     };

package/esm/manager.js

@@ -22,7 +22,9 @@ export class PgTestConnector {
     clients = new Set();
     pgPools = new Map();
     seenDbConfigs = new Map();
+    pendingConnects = new Set();
     verbose = false;
+    shuttingDown = false;
     constructor(verbose = false) {
         this.verbose = verbose;
         SYS_EVENTS.forEach((event) => {
@@ -44,6 +46,19 @@ export class PgTestConnector {
     dbKey(config) {
         return `${config.host}:${config.port}/${config.database}`;
     }
+    beginTeardown() {
+        this.shuttingDown = true;
+    }
+    registerConnect(p) {
+        this.pendingConnects.add(p);
+        p.finally(() => this.pendingConnects.delete(p));
+    }
+    async awaitPendingConnects() {
+        const arr = Array.from(this.pendingConnects);
+        if (arr.length) {
+            await Promise.allSettled(arr);
+        }
+    }
     getPool(config) {
         const key = this.poolKey(config);
         if (!this.pgPools.has(key)) {
@@ -54,7 +69,10 @@ export class PgTestConnector {
         return this.pgPools.get(key);
     }
     getClient(config) {
-        const client = new PgTestClient(config);
+        if (this.shuttingDown) {
+            throw new Error('PgTestConnector is shutting down; no new clients allowed');
+        }
+        const client = new PgTestClient(config, { trackConnect: (p) => this.registerConnect(p) });
         this.clients.add(client);
         const key = this.dbKey(config);
         this.seenDbConfigs.set(key, config);
@@ -62,6 +80,8 @@ export class PgTestConnector {
         return client;
     }
     async closeAll() {
+        this.beginTeardown();
+        await this.awaitPendingConnects();
         log.info('🧹 Closing all PgTestClients...');
         await Promise.all(Array.from(this.clients).map(async (client) => {
             try {
@@ -93,6 +113,8 @@ export class PgTestConnector {
         }));
         this.seenDbConfigs.clear();
         log.success('✅ All PgTestClients closed, pools disposed, databases dropped.');
+        this.pendingConnects.clear();
+        this.shuttingDown = false;
     }
     close() {
         this.closeAll();
@@ -104,8 +126,8 @@ export class PgTestConnector {
         log.warn(`🧨 Dropped database: ${config.database}`);
         this.seenDbConfigs.delete(key);
     }
-    kill(client) {
-        client.close();
+    async kill(client) {
+        await client.close();
         this.drop(client.config);
     }
 }

package/esm/test-client.js

@@ -4,7 +4,8 @@ export class PgTestClient {
     client;
     ctxStmts = '';
     _ended = false;
-    constructor(config) {
+    connectPromise = null;
+    constructor(config, opts = {}) {
         this.config = config;
         this.client = new Client({
             host: this.config.host,
@@ -13,11 +14,24 @@ export class PgTestClient {
             user: this.config.user,
             password: this.config.password
         });
-        this.client.connect();
+        if (!opts.deferConnect) {
+            this.connectPromise = this.client.connect();
+            if (opts.trackConnect)
+                opts.trackConnect(this.connectPromise);
+        }
+    }
+    async ensureConnected() {
+        if (this.connectPromise) {
+            try {
+                await this.connectPromise;
+            }
+            catch { }
+        }
     }
-    close() {
+    async close() {
         if (!this._ended) {
             this._ended = true;
+            await this.ensureConnected();
             this.client.end();
         }
     }
@@ -83,7 +97,6 @@ export class PgTestClient {
         const result = await this.client.query(query, values);
         return result;
     }
-    // exposing so we can use for graphile-test
     async ctxQuery() {
         if (this.ctxStmts) {
             await this.client.query(this.ctxStmts);

package/manager.d.ts

@@ -6,15 +6,20 @@ export declare class PgTestConnector {
     private readonly clients;
     private readonly pgPools;
     private readonly seenDbConfigs;
+    private readonly pendingConnects;
     private verbose;
+    private shuttingDown;
     private constructor();
     static getInstance(verbose?: boolean): PgTestConnector;
     private poolKey;
     private dbKey;
+    beginTeardown(): void;
+    private registerConnect;
+    private awaitPendingConnects;
     getPool(config: PgConfig): Pool;
     getClient(config: PgConfig): PgTestClient;
     closeAll(): Promise<void>;
     close(): void;
     drop(config: PgConfig): void;
-    kill(client: PgTestClient): void;
+    kill(client: PgTestClient): Promise<void>;
 }

package/manager.js

@@ -25,7 +25,9 @@ class PgTestConnector {
     clients = new Set();
     pgPools = new Map();
     seenDbConfigs = new Map();
+    pendingConnects = new Set();
     verbose = false;
+    shuttingDown = false;
     constructor(verbose = false) {
         this.verbose = verbose;
         SYS_EVENTS.forEach((event) => {
@@ -47,6 +49,19 @@ class PgTestConnector {
     dbKey(config) {
         return `${config.host}:${config.port}/${config.database}`;
     }
+    beginTeardown() {
+        this.shuttingDown = true;
+    }
+    registerConnect(p) {
+        this.pendingConnects.add(p);
+        p.finally(() => this.pendingConnects.delete(p));
+    }
+    async awaitPendingConnects() {
+        const arr = Array.from(this.pendingConnects);
+        if (arr.length) {
+            await Promise.allSettled(arr);
+        }
+    }
     getPool(config) {
         const key = this.poolKey(config);
         if (!this.pgPools.has(key)) {
@@ -57,7 +72,10 @@ class PgTestConnector {
         return this.pgPools.get(key);
     }
     getClient(config) {
-        const client = new test_client_1.PgTestClient(config);
+        if (this.shuttingDown) {
+            throw new Error('PgTestConnector is shutting down; no new clients allowed');
+        }
+        const client = new test_client_1.PgTestClient(config, { trackConnect: (p) => this.registerConnect(p) });
         this.clients.add(client);
         const key = this.dbKey(config);
         this.seenDbConfigs.set(key, config);
@@ -65,6 +83,8 @@ class PgTestConnector {
         return client;
     }
     async closeAll() {
+        this.beginTeardown();
+        await this.awaitPendingConnects();
         log.info('🧹 Closing all PgTestClients...');
         await Promise.all(Array.from(this.clients).map(async (client) => {
             try {
@@ -96,6 +116,8 @@ class PgTestConnector {
         }));
         this.seenDbConfigs.clear();
         log.success('✅ All PgTestClients closed, pools disposed, databases dropped.');
+        this.pendingConnects.clear();
+        this.shuttingDown = false;
     }
     close() {
         this.closeAll();
@@ -107,8 +129,8 @@ class PgTestConnector {
         log.warn(`🧨 Dropped database: ${config.database}`);
         this.seenDbConfigs.delete(key);
     }
-    kill(client) {
-        client.close();
+    async kill(client) {
+        await client.close();
         this.drop(client.config);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "pgsql-test offers isolated, role-aware, and rollback-friendly PostgreSQL environments for integration tests — giving developers realistic test coverage without external state pollution",
   "main": "index.js",
@@ -69,5 +69,5 @@
     "pg-copy-streams": "^6.0.6",
     "pg-env": "^1.1.0"
   },
-  "gitHead": "ecff19e150916322377a8916be58fc5874fc1dd2"
+  "gitHead": "db2ca1845fa1a62604f0f85367120ba10e4915a6"
 }

package/test-client.d.ts

@@ -1,12 +1,18 @@
 import { Client, QueryResult } from 'pg';
 import { PgConfig } from 'pg-env';
+type PgTestClientOpts = {
+    deferConnect?: boolean;
+    trackConnect?: (p: Promise<any>) => void;
+};
 export declare class PgTestClient {
     config: PgConfig;
     client: Client;
     private ctxStmts;
     private _ended;
-    constructor(config: PgConfig);
-    close(): void;
+    private connectPromise;
+    constructor(config: PgConfig, opts?: PgTestClientOpts);
+    private ensureConnected;
+    close(): Promise<void>;
     begin(): Promise<void>;
     savepoint(name?: string): Promise<void>;
     rollback(name?: string): Promise<void>;
@@ -24,3 +30,4 @@ export declare class PgTestClient {
     query<T = any>(query: string, values?: any[]): Promise<QueryResult<T>>;
     ctxQuery(): Promise<void>;
 }
+export {};

package/test-client.js

@@ -7,7 +7,8 @@ class PgTestClient {
     client;
     ctxStmts = '';
     _ended = false;
-    constructor(config) {
+    connectPromise = null;
+    constructor(config, opts = {}) {
         this.config = config;
         this.client = new pg_1.Client({
             host: this.config.host,
@@ -16,11 +17,24 @@ class PgTestClient {
             user: this.config.user,
             password: this.config.password
         });
-        this.client.connect();
+        if (!opts.deferConnect) {
+            this.connectPromise = this.client.connect();
+            if (opts.trackConnect)
+                opts.trackConnect(this.connectPromise);
+        }
+    }
+    async ensureConnected() {
+        if (this.connectPromise) {
+            try {
+                await this.connectPromise;
+            }
+            catch { }
+        }
     }
-    close() {
+    async close() {
         if (!this._ended) {
             this._ended = true;
+            await this.ensureConnected();
             this.client.end();
         }
     }
@@ -86,7 +100,6 @@ class PgTestClient {
         const result = await this.client.query(query, values);
         return result;
     }
-    // exposing so we can use for graphile-test
     async ctxQuery() {
         if (this.ctxStmts) {
             await this.client.query(this.ctxStmts);