pgsql-test 2.1.8 → 2.1.10

package/admin.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbAdmin = void 0;
 const child_process_1 = require("child_process");
-const types_1 = require("@launchql/types");
 const fs_1 = require("fs");
+const types_1 = require("@launchql/types");
 const stream_1 = require("./stream");
+const server_utils_1 = require("@launchql/server-utils");
+const log = new server_utils_1.Logger('db-admin');
 class DbAdmin {
     config;
     verbose;
@@ -18,26 +20,35 @@ class DbAdmin {
             PGHOST: this.config.host,
             PGPORT: String(this.config.port),
             PGUSER: this.config.user,
-            PGPASSWORD: this.config.password,
+            PGPASSWORD: this.config.password
         };
     }
     run(command) {
-        (0, child_process_1.execSync)(command, {
-            stdio: this.verbose ? 'inherit' : 'pipe',
-            env: {
-                ...process.env,
-                ...this.getEnv(),
-            },
-        });
+        try {
+            (0, child_process_1.execSync)(command, {
+                stdio: this.verbose ? 'inherit' : 'pipe',
+                env: {
+                    ...process.env,
+                    ...this.getEnv()
+                }
+            });
+            if (this.verbose)
+                log.success(`Executed: ${command}`);
+        }
+        catch (err) {
+            log.error(`Command failed: ${command}`);
+            if (this.verbose)
+                log.error(err.message);
+            throw err;
+        }
     }
     safeDropDb(name) {
         try {
             this.run(`dropdb "${name}"`);
         }
         catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            if (!message.includes('does not exist')) {
-                console.warn(`⚠️  Could not drop database ${name}: ${message}`);
+            if (!err.message.includes('does not exist')) {
+                log.warn(`Could not drop database ${name}: ${err.message}`);
             }
         }
     }
@@ -76,7 +87,9 @@ class DbAdmin {
         try {
             this.run(`psql -c "UPDATE pg_database SET datistemplate = false WHERE datname = '${template}'"`);
         }
-        catch { }
+        catch {
+            log.warn(`Skipping failed UPDATE of datistemplate for ${template}`);
+        }
         this.safeDropDb(template);
     }
     async grantRole(role, user, dbName) {
@@ -91,16 +104,16 @@ class DbAdmin {
     }
     async createUserRole(user, password, dbName) {
         const sql = `
-  DO $$
-  BEGIN
-    IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
-      CREATE ROLE ${user} LOGIN PASSWORD '${password}';
-      GRANT anonymous TO ${user};
-      GRANT authenticated TO ${user};
-    END IF;
-  END $$;
+      DO $$
+      BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
+          CREATE ROLE ${user} LOGIN PASSWORD '${password}';
+          GRANT anonymous TO ${user};
+          GRANT authenticated TO ${user};
+        END IF;
+      END $$;
     `.trim();
-        this.streamSql(sql, dbName);
+        await this.streamSql(sql, dbName);
     }
     loadSql(file, dbName) {
         if (!(0, fs_1.existsSync)(file)) {
@@ -120,8 +133,8 @@ class DbAdmin {
         await adapter.seed({
             admin: this,
             config: this.config,
-            pg: null, // sorry!
-            connect: null, // sorry!
+            pg: null, // placeholder for PgTestClient
+            connect: null // placeholder for connection factory
         });
         this.cleanupTemplate(templateName);
         this.createTemplateFromBase(seedDb, templateName);

package/esm/admin.js

@@ -1,7 +1,9 @@
 import { execSync } from 'child_process';
-import { getPgEnvOptions } from '@launchql/types';
 import { existsSync } from 'fs';
+import { getPgEnvOptions } from '@launchql/types';
 import { streamSql as stream } from './stream';
+import { Logger } from '@launchql/server-utils';
+const log = new Logger('db-admin');
 export class DbAdmin {
     config;
     verbose;
@@ -15,26 +17,35 @@ export class DbAdmin {
             PGHOST: this.config.host,
             PGPORT: String(this.config.port),
             PGUSER: this.config.user,
-            PGPASSWORD: this.config.password,
+            PGPASSWORD: this.config.password
         };
     }
     run(command) {
-        execSync(command, {
-            stdio: this.verbose ? 'inherit' : 'pipe',
-            env: {
-                ...process.env,
-                ...this.getEnv(),
-            },
-        });
+        try {
+            execSync(command, {
+                stdio: this.verbose ? 'inherit' : 'pipe',
+                env: {
+                    ...process.env,
+                    ...this.getEnv()
+                }
+            });
+            if (this.verbose)
+                log.success(`Executed: ${command}`);
+        }
+        catch (err) {
+            log.error(`Command failed: ${command}`);
+            if (this.verbose)
+                log.error(err.message);
+            throw err;
+        }
     }
     safeDropDb(name) {
         try {
             this.run(`dropdb "${name}"`);
         }
         catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            if (!message.includes('does not exist')) {
-                console.warn(`⚠️  Could not drop database ${name}: ${message}`);
+            if (!err.message.includes('does not exist')) {
+                log.warn(`Could not drop database ${name}: ${err.message}`);
             }
         }
     }
@@ -73,7 +84,9 @@ export class DbAdmin {
         try {
             this.run(`psql -c "UPDATE pg_database SET datistemplate = false WHERE datname = '${template}'"`);
         }
-        catch { }
+        catch {
+            log.warn(`Skipping failed UPDATE of datistemplate for ${template}`);
+        }
         this.safeDropDb(template);
     }
     async grantRole(role, user, dbName) {
@@ -88,16 +101,16 @@ export class DbAdmin {
     }
     async createUserRole(user, password, dbName) {
         const sql = `
-  DO $$
-  BEGIN
-    IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
-      CREATE ROLE ${user} LOGIN PASSWORD '${password}';
-      GRANT anonymous TO ${user};
-      GRANT authenticated TO ${user};
-    END IF;
-  END $$;
+      DO $$
+      BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
+          CREATE ROLE ${user} LOGIN PASSWORD '${password}';
+          GRANT anonymous TO ${user};
+          GRANT authenticated TO ${user};
+        END IF;
+      END $$;
     `.trim();
-        this.streamSql(sql, dbName);
+        await this.streamSql(sql, dbName);
     }
     loadSql(file, dbName) {
         if (!existsSync(file)) {
@@ -117,8 +130,8 @@ export class DbAdmin {
         await adapter.seed({
             admin: this,
             config: this.config,
-            pg: null, // sorry!
-            connect: null, // sorry!
+            pg: null, // placeholder for PgTestClient
+            connect: null // placeholder for connection factory
         });
         this.cleanupTemplate(templateName);
         this.createTemplateFromBase(seedDb, templateName);

package/esm/manager.js

@@ -1,19 +1,20 @@
 import { Pool } from 'pg';
-import chalk from 'chalk';
 import { DbAdmin } from './admin';
 import { getPgEnvOptions } from '@launchql/types';
 import { PgTestClient } from './test-client';
+import { Logger } from '@launchql/server-utils';
+const log = new Logger('test-connector');
 const SYS_EVENTS = ['SIGTERM'];
 const end = (pool) => {
     try {
         if (pool.ended || pool.ending) {
-            console.warn(chalk.yellow('⚠️ pg pool already ended or ending'));
+            log.warn('⚠️ pg pool already ended or ending');
             return;
         }
         pool.end();
     }
     catch (err) {
-        console.error(chalk.red('❌ pg pool termination error:'), err);
+        log.error('❌ pg pool termination error:', err);
     }
 };
 export class PgTestConnector {
@@ -26,7 +27,7 @@ export class PgTestConnector {
         this.verbose = verbose;
         SYS_EVENTS.forEach((event) => {
             process.on(event, () => {
-                this.log(chalk.magenta(`⏹ Received ${event}, closing all connections...`));
+                log.info(`⏹ Received ${event}, closing all connections...`);
                 this.closeAll();
             });
         });
@@ -37,10 +38,6 @@ export class PgTestConnector {
         }
         return PgTestConnector.instance;
     }
-    log(...args) {
-        if (this.verbose)
-            console.log(...args);
-    }
     poolKey(config) {
         return `${config.user}@${config.host}:${config.port}/${config.database}`;
     }
@@ -52,7 +49,7 @@ export class PgTestConnector {
         if (!this.pgPools.has(key)) {
             const pool = new Pool(config);
             this.pgPools.set(key, pool);
-            this.log(chalk.blue(`📘 Created new pg pool: ${chalk.white(key)}`));
+            log.info(`📘 Created new pg pool: ${key}`);
         }
         return this.pgPools.get(key);
     }
@@ -61,53 +58,50 @@ export class PgTestConnector {
         this.clients.add(client);
         const key = this.dbKey(config);
         this.seenDbConfigs.set(key, config);
-        this.log(chalk.green(`🔌 New PgTestClient connected to ${config.database}`));
+        log.info(`🔌 New PgTestClient connected to ${config.database}`);
         return client;
     }
     async closeAll() {
-        this.log(chalk.cyan('\n🧹 Closing all PgTestClients...'));
+        log.info('\n🧹 Closing all PgTestClients...');
         await Promise.all(Array.from(this.clients).map(async (client) => {
             try {
                 await client.close();
-                this.log(chalk.green(`✅ Closed client for ${client.config.database}`));
+                log.success(`✅ Closed client for ${client.config.database}`);
             }
             catch (err) {
-                console.warn(chalk.red(`❌ Error closing PgTestClient for ${client.config.database}:`), err);
+                log.error(`❌ Error closing PgTestClient for ${client.config.database}:`, err);
             }
         }));
         this.clients.clear();
-        this.log(chalk.cyan('\n🧯 Disposing pg pools...'));
+        log.info('\n🧯 Disposing pg pools...');
         for (const [key, pool] of this.pgPools.entries()) {
-            this.log(chalk.gray(`🧯 Disposing pg pool [${key}]`));
+            log.debug(`🧯 Disposing pg pool [${key}]`);
             end(pool);
         }
         this.pgPools.clear();
-        this.log(chalk.cyan('\n🗑️ Dropping seen databases...'));
+        log.info('\n🗑️ Dropping seen databases...');
         await Promise.all(Array.from(this.seenDbConfigs.values()).map(async (config) => {
             try {
-                // somehow an "admin" db had app_user creds?
                 const rootPg = getPgEnvOptions();
                 const admin = new DbAdmin({ ...config, user: rootPg.user, password: rootPg.password }, this.verbose);
-                // console.log(config);
                 admin.drop();
-                this.log(chalk.yellow(`🧨 Dropped database: ${chalk.white(config.database)}`));
+                log.warn(`🧨 Dropped database: ${config.database}`);
             }
             catch (err) {
-                console.warn(chalk.red(`❌ Failed to drop database ${config.database}:`), err);
+                log.error(`❌ Failed to drop database ${config.database}:`, err);
             }
         }));
         this.seenDbConfigs.clear();
-        this.log(chalk.green('\n✅ All PgTestClients closed, pools disposed, databases dropped.'));
+        log.success('\n✅ All PgTestClients closed, pools disposed, databases dropped.');
     }
     close() {
         this.closeAll();
     }
     drop(config) {
         const key = this.dbKey(config);
-        // for drop, no need for conn opts
         const admin = new DbAdmin(config, this.verbose);
         admin.drop();
-        this.log(chalk.red(`🧨 Dropped database: ${chalk.white(config.database)}`));
+        log.warn(`🧨 Dropped database: ${config.database}`);
         this.seenDbConfigs.delete(key);
     }
     kill(client) {

package/esm/seed/csv.js

@@ -1,15 +1,16 @@
-import { createReadStream, existsSync } from 'fs';
+import { createReadStream, existsSync, createWriteStream } from 'fs';
 import { pipeline } from 'node:stream/promises';
 import { from as copyFrom, to as copyTo } from 'pg-copy-streams';
-import { createWriteStream } from 'node:fs';
+import { Logger } from '@launchql/server-utils';
+const log = new Logger('csv');
 export function csv(tables) {
     return {
         async seed(ctx) {
             for (const [table, filePath] of Object.entries(tables)) {
                 if (!existsSync(filePath)) {
-                    throw new Error(`❌ CSV file not found: ${filePath}`);
+                    throw new Error(`CSV file not found: ${filePath}`);
                 }
-                console.log(`📥 Seeding "${table}" from ${filePath}`);
+                log.info(`📥 Seeding "${table}" from ${filePath}`);
                 await copyCsvIntoTable(ctx.pg, table, filePath);
             }
         }
@@ -21,10 +22,10 @@ export async function copyCsvIntoTable(pg, table, filePath) {
     const source = createReadStream(filePath);
     try {
         await pipeline(source, stream);
-        console.log(`✅ Successfully seeded "${table}"`);
+        log.success(`✅ Successfully seeded "${table}"`);
     }
     catch (err) {
-        console.error(`❌ COPY failed for "${table}":`, err);
+        log.error(`❌ COPY failed for "${table}": ${err.message}`);
         throw err;
     }
 }
@@ -34,10 +35,10 @@ export async function exportTableToCsv(pg, table, filePath) {
     const target = createWriteStream(filePath);
     try {
         await pipeline(stream, target);
-        console.log(`✅ Exported "${table}" to ${filePath}`);
+        log.success(`✅ Exported "${table}" to ${filePath}`);
     }
     catch (err) {
-        console.error(`❌ Failed to export "${table}":`, err);
+        log.error(`❌ Failed to export "${table}": ${err.message}`);
         throw err;
     }
 }

package/manager.d.ts

@@ -9,7 +9,6 @@ export declare class PgTestConnector {
     private verbose;
     private constructor();
     static getInstance(verbose?: boolean): PgTestConnector;
-    private log;
     private poolKey;
     private dbKey;
     getPool(config: PgConfig): Pool;

package/manager.js

@@ -1,25 +1,23 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgTestConnector = void 0;
 const pg_1 = require("pg");
-const chalk_1 = __importDefault(require("chalk"));
 const admin_1 = require("./admin");
 const types_1 = require("@launchql/types");
 const test_client_1 = require("./test-client");
+const server_utils_1 = require("@launchql/server-utils");
+const log = new server_utils_1.Logger('test-connector');
 const SYS_EVENTS = ['SIGTERM'];
 const end = (pool) => {
     try {
         if (pool.ended || pool.ending) {
-            console.warn(chalk_1.default.yellow('⚠️ pg pool already ended or ending'));
+            log.warn('⚠️ pg pool already ended or ending');
             return;
         }
         pool.end();
     }
     catch (err) {
-        console.error(chalk_1.default.red('❌ pg pool termination error:'), err);
+        log.error('❌ pg pool termination error:', err);
     }
 };
 class PgTestConnector {
@@ -32,7 +30,7 @@ class PgTestConnector {
         this.verbose = verbose;
         SYS_EVENTS.forEach((event) => {
             process.on(event, () => {
-                this.log(chalk_1.default.magenta(`⏹ Received ${event}, closing all connections...`));
+                log.info(`⏹ Received ${event}, closing all connections...`);
                 this.closeAll();
             });
         });
@@ -43,10 +41,6 @@ class PgTestConnector {
         }
         return PgTestConnector.instance;
     }
-    log(...args) {
-        if (this.verbose)
-            console.log(...args);
-    }
     poolKey(config) {
         return `${config.user}@${config.host}:${config.port}/${config.database}`;
     }
@@ -58,7 +52,7 @@ class PgTestConnector {
         if (!this.pgPools.has(key)) {
             const pool = new pg_1.Pool(config);
             this.pgPools.set(key, pool);
-            this.log(chalk_1.default.blue(`📘 Created new pg pool: ${chalk_1.default.white(key)}`));
+            log.info(`📘 Created new pg pool: ${key}`);
         }
         return this.pgPools.get(key);
     }
@@ -67,53 +61,50 @@ class PgTestConnector {
         this.clients.add(client);
         const key = this.dbKey(config);
         this.seenDbConfigs.set(key, config);
-        this.log(chalk_1.default.green(`🔌 New PgTestClient connected to ${config.database}`));
+        log.info(`🔌 New PgTestClient connected to ${config.database}`);
         return client;
     }
     async closeAll() {
-        this.log(chalk_1.default.cyan('\n🧹 Closing all PgTestClients...'));
+        log.info('\n🧹 Closing all PgTestClients...');
         await Promise.all(Array.from(this.clients).map(async (client) => {
             try {
                 await client.close();
-                this.log(chalk_1.default.green(`✅ Closed client for ${client.config.database}`));
+                log.success(`✅ Closed client for ${client.config.database}`);
             }
             catch (err) {
-                console.warn(chalk_1.default.red(`❌ Error closing PgTestClient for ${client.config.database}:`), err);
+                log.error(`❌ Error closing PgTestClient for ${client.config.database}:`, err);
             }
         }));
         this.clients.clear();
-        this.log(chalk_1.default.cyan('\n🧯 Disposing pg pools...'));
+        log.info('\n🧯 Disposing pg pools...');
         for (const [key, pool] of this.pgPools.entries()) {
-            this.log(chalk_1.default.gray(`🧯 Disposing pg pool [${key}]`));
+            log.debug(`🧯 Disposing pg pool [${key}]`);
             end(pool);
         }
         this.pgPools.clear();
-        this.log(chalk_1.default.cyan('\n🗑️ Dropping seen databases...'));
+        log.info('\n🗑️ Dropping seen databases...');
         await Promise.all(Array.from(this.seenDbConfigs.values()).map(async (config) => {
             try {
-                // somehow an "admin" db had app_user creds?
                 const rootPg = (0, types_1.getPgEnvOptions)();
                 const admin = new admin_1.DbAdmin({ ...config, user: rootPg.user, password: rootPg.password }, this.verbose);
-                // console.log(config);
                 admin.drop();
-                this.log(chalk_1.default.yellow(`🧨 Dropped database: ${chalk_1.default.white(config.database)}`));
+                log.warn(`🧨 Dropped database: ${config.database}`);
             }
             catch (err) {
-                console.warn(chalk_1.default.red(`❌ Failed to drop database ${config.database}:`), err);
+                log.error(`❌ Failed to drop database ${config.database}:`, err);
             }
         }));
         this.seenDbConfigs.clear();
-        this.log(chalk_1.default.green('\n✅ All PgTestClients closed, pools disposed, databases dropped.'));
+        log.success('\n✅ All PgTestClients closed, pools disposed, databases dropped.');
     }
     close() {
         this.closeAll();
     }
     drop(config) {
         const key = this.dbKey(config);
-        // for drop, no need for conn opts
         const admin = new admin_1.DbAdmin(config, this.verbose);
         admin.drop();
-        this.log(chalk_1.default.red(`🧨 Dropped database: ${chalk_1.default.white(config.database)}`));
+        log.warn(`🧨 Dropped database: ${config.database}`);
         this.seenDbConfigs.delete(key);
     }
     kill(client) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "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",
@@ -59,13 +59,13 @@
     "@types/pg-copy-streams": "^1.2.5"
   },
   "dependencies": {
-    "@launchql/migrate": "^2.1.8",
-    "@launchql/server-utils": "^2.1.5",
+    "@launchql/migrate": "^2.1.10",
+    "@launchql/server-utils": "^2.1.6",
     "@launchql/types": "^2.1.5",
     "chalk": "^4.1.0",
     "deepmerge": "^4.3.1",
     "pg": "^8.16.0",
     "pg-copy-streams": "^6.0.6"
   },
-  "gitHead": "4f0b0637695c6f54c5de85d31776961057c51a08"
+  "gitHead": "a925fe2ca332f6384b9ae52c89906868b5c9a703"
 }

package/seed/csv.js

@@ -6,15 +6,16 @@ exports.exportTableToCsv = exportTableToCsv;
 const fs_1 = require("fs");
 const promises_1 = require("node:stream/promises");
 const pg_copy_streams_1 = require("pg-copy-streams");
-const node_fs_1 = require("node:fs");
+const server_utils_1 = require("@launchql/server-utils");
+const log = new server_utils_1.Logger('csv');
 function csv(tables) {
     return {
         async seed(ctx) {
             for (const [table, filePath] of Object.entries(tables)) {
                 if (!(0, fs_1.existsSync)(filePath)) {
-                    throw new Error(`❌ CSV file not found: ${filePath}`);
+                    throw new Error(`CSV file not found: ${filePath}`);
                 }
-                console.log(`📥 Seeding "${table}" from ${filePath}`);
+                log.info(`📥 Seeding "${table}" from ${filePath}`);
                 await copyCsvIntoTable(ctx.pg, table, filePath);
             }
         }
@@ -26,23 +27,23 @@ async function copyCsvIntoTable(pg, table, filePath) {
     const source = (0, fs_1.createReadStream)(filePath);
     try {
         await (0, promises_1.pipeline)(source, stream);
-        console.log(`✅ Successfully seeded "${table}"`);
+        log.success(`✅ Successfully seeded "${table}"`);
     }
     catch (err) {
-        console.error(`❌ COPY failed for "${table}":`, err);
+        log.error(`❌ COPY failed for "${table}": ${err.message}`);
         throw err;
     }
 }
 async function exportTableToCsv(pg, table, filePath) {
     const client = pg.client;
     const stream = client.query((0, pg_copy_streams_1.to)(`COPY ${table} TO STDOUT WITH CSV HEADER`));
-    const target = (0, node_fs_1.createWriteStream)(filePath);
+    const target = (0, fs_1.createWriteStream)(filePath);
     try {
         await (0, promises_1.pipeline)(stream, target);
-        console.log(`✅ Exported "${table}" to ${filePath}`);
+        log.success(`✅ Exported "${table}" to ${filePath}`);
     }
     catch (err) {
-        console.error(`❌ Failed to export "${table}":`, err);
+        log.error(`❌ Failed to export "${table}": ${err.message}`);
         throw err;
     }
 }