pgsql-test 2.3.0 → 2.3.1

package/admin.d.ts

@@ -1,4 +1,4 @@
-import { PgConfig } from '@launchql/types';
+import { PgConfig } from 'pg-env';
 import { SeedAdapter } from './seed/types';
 export declare class DbAdmin {
     private config;

package/admin.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbAdmin = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const types_1 = require("@launchql/types");
+const pg_env_1 = require("pg-env");
 const stream_1 = require("./stream");
-const server_utils_1 = require("@launchql/server-utils");
-const log = new server_utils_1.Logger('db-admin');
+const logger_1 = require("@launchql/logger");
+const log = new logger_1.Logger('db-admin');
 class DbAdmin {
     config;
     verbose;
     constructor(config, verbose = false) {
         this.config = config;
         this.verbose = verbose;
-        this.config = (0, types_1.getPgEnvOptions)(config);
+        this.config = (0, pg_env_1.getPgEnvOptions)(config);
     }
     getEnv() {
         return {

package/connect.d.ts

@@ -1,5 +1,6 @@
 import { DbAdmin } from './admin';
-import { PgTestConnectionOptions, PgConfig } from '@launchql/types';
+import { PgTestConnectionOptions } from '@launchql/types';
+import { PgConfig } from 'pg-env';
 import { PgTestConnector } from './manager';
 import { SeedAdapter } from './seed/types';
 import { PgTestClient } from './test-client';

package/connect.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConnections = exports.getPgRootAdmin = void 0;
 const admin_1 = require("./admin");
 const types_1 = require("@launchql/types");
+const pg_env_1 = require("pg-env");
 const manager_1 = require("./manager");
 const crypto_1 = require("crypto");
-const server_utils_1 = require("@launchql/server-utils");
+const pg_cache_1 = require("pg-cache");
 const seed_1 = require("./seed");
 let manager;
 const getPgRootAdmin = (connOpts = {}) => {
-    const opts = (0, types_1.getPgEnvOptions)({
+    const opts = (0, pg_env_1.getPgEnvOptions)({
         database: connOpts.rootDb
     });
     const admin = new admin_1.DbAdmin(opts);
@@ -18,7 +19,7 @@ const getPgRootAdmin = (connOpts = {}) => {
 exports.getPgRootAdmin = getPgRootAdmin;
 const getConnOopts = (cn = {}) => {
     const connect = (0, types_1.getConnEnvOptions)(cn.db);
-    const config = (0, types_1.getPgEnvOptions)({
+    const config = (0, pg_env_1.getPgEnvOptions)({
         database: `${connect.prefix}${(0, crypto_1.randomUUID)()}`,
         ...cn.pg
     });
@@ -64,7 +65,7 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
     });
     db.setContext({ role: 'anonymous' });
     const teardown = async () => {
-        await (0, server_utils_1.teardownPgPools)();
+        await (0, pg_cache_1.teardownPgPools)();
         await manager.closeAll();
     };
     return { pg, db, teardown, manager, admin };

package/esm/admin.js

@@ -1,8 +1,8 @@
 import { execSync } from 'child_process';
 import { existsSync } from 'fs';
-import { getPgEnvOptions } from '@launchql/types';
+import { getPgEnvOptions } from 'pg-env';
 import { streamSql as stream } from './stream';
-import { Logger } from '@launchql/server-utils';
+import { Logger } from '@launchql/logger';
 const log = new Logger('db-admin');
 export class DbAdmin {
     config;

package/esm/connect.js

@@ -1,8 +1,9 @@
 import { DbAdmin } from './admin';
-import { getPgEnvOptions, getConnEnvOptions } from '@launchql/types';
+import { getConnEnvOptions } from '@launchql/types';
+import { getPgEnvOptions, } from 'pg-env';
 import { PgTestConnector } from './manager';
 import { randomUUID } from 'crypto';
-import { teardownPgPools } from '@launchql/server-utils';
+import { teardownPgPools } from 'pg-cache';
 import { seed } from './seed';
 let manager;
 export const getPgRootAdmin = (connOpts = {}) => {

package/esm/manager.js

@@ -1,8 +1,8 @@
 import { Pool } from 'pg';
 import { DbAdmin } from './admin';
-import { getPgEnvOptions } from '@launchql/types';
+import { getPgEnvOptions } from 'pg-env';
 import { PgTestClient } from './test-client';
-import { Logger } from '@launchql/server-utils';
+import { Logger } from '@launchql/logger';
 const log = new Logger('test-connector');
 const SYS_EVENTS = ['SIGTERM'];
 const end = (pool) => {

package/esm/seed/csv.js

@@ -1,7 +1,7 @@
 import { createReadStream, existsSync, createWriteStream } from 'fs';
 import { pipeline } from 'node:stream/promises';
 import { from as copyFrom, to as copyTo } from 'pg-copy-streams';
-import { Logger } from '@launchql/server-utils';
+import { Logger } from '@launchql/logger';
 const log = new Logger('csv');
 export function csv(tables) {
     return {

package/esm/stream.js

@@ -1,6 +1,6 @@
 import { spawn } from 'child_process';
 import { Readable } from 'stream';
-import { getSpawnEnvWithPg } from '@launchql/types';
+import { getSpawnEnvWithPg } from 'pg-env';
 function setArgs(config) {
     const args = [
         '-U', config.user,

package/manager.d.ts

@@ -1,5 +1,5 @@
 import { Pool } from 'pg';
-import { PgConfig } from '@launchql/types';
+import { PgConfig } from 'pg-env';
 import { PgTestClient } from './test-client';
 export declare class PgTestConnector {
     private static instance;

package/manager.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgTestConnector = void 0;
 const pg_1 = require("pg");
 const admin_1 = require("./admin");
-const types_1 = require("@launchql/types");
+const pg_env_1 = require("pg-env");
 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 logger_1 = require("@launchql/logger");
+const log = new logger_1.Logger('test-connector');
 const SYS_EVENTS = ['SIGTERM'];
 const end = (pool) => {
     try {
@@ -85,7 +85,7 @@ class PgTestConnector {
         log.info('🗑️ Dropping seen databases...');
         await Promise.all(Array.from(this.seenDbConfigs.values()).map(async (config) => {
             try {
-                const rootPg = (0, types_1.getPgEnvOptions)();
+                const rootPg = (0, pg_env_1.getPgEnvOptions)();
                 const admin = new admin_1.DbAdmin({ ...config, user: rootPg.user, password: rootPg.password }, this.verbose);
                 admin.drop();
                 log.warn(`🧨 Dropped database: ${config.database}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "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",
@@ -60,13 +60,15 @@
     "@types/pg-copy-streams": "^1.2.5"
   },
   "dependencies": {
-    "@launchql/core": "^2.3.0",
-    "@launchql/server-utils": "^2.1.14",
-    "@launchql/types": "^2.1.12",
+    "@launchql/core": "^2.3.1",
+    "@launchql/server-utils": "^2.1.15",
+    "@launchql/types": "^2.1.13",
     "chalk": "^4.1.0",
     "deepmerge": "^4.3.1",
     "pg": "^8.16.0",
-    "pg-copy-streams": "^6.0.6"
+    "pg-cache": "^1.0.1",
+    "pg-copy-streams": "^6.0.6",
+    "pg-env": "^1.0.1"
   },
-  "gitHead": "52bec94d87409fcbac5e52a4a262adb1f7a3099f"
+  "gitHead": "835a2e84ed84edab5bea8f5954d9dfeb657beb03"
 }

package/seed/csv.js

@@ -6,8 +6,8 @@ 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 server_utils_1 = require("@launchql/server-utils");
-const log = new server_utils_1.Logger('csv');
+const logger_1 = require("@launchql/logger");
+const log = new logger_1.Logger('csv');
 function csv(tables) {
     return {
         async seed(ctx) {

package/seed/types.d.ts

@@ -1,4 +1,5 @@
-import { PgConfig, PgTestConnectionOptions } from "@launchql/types";
+import { PgTestConnectionOptions } from "@launchql/types";
+import { PgConfig } from "pg-env";
 import { DbAdmin } from "../admin";
 import { PgTestClient } from "../test-client";
 export interface SeedContext {

package/stream.d.ts

@@ -1,2 +1,2 @@
-import { PgConfig } from '@launchql/types';
+import { PgConfig } from 'pg-env';
 export declare function streamSql(config: PgConfig, sql: string): Promise<void>;

package/stream.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamSql = streamSql;
 const child_process_1 = require("child_process");
 const stream_1 = require("stream");
-const types_1 = require("@launchql/types");
+const pg_env_1 = require("pg-env");
 function setArgs(config) {
     const args = [
         '-U', config.user,
@@ -30,7 +30,7 @@ async function streamSql(config, sql) {
     return new Promise((resolve, reject) => {
         const sqlStream = stringToStream(sql);
         const proc = (0, child_process_1.spawn)('psql', args, {
-            env: (0, types_1.getSpawnEnvWithPg)(config)
+            env: (0, pg_env_1.getSpawnEnvWithPg)(config)
         });
         sqlStream.pipe(proc.stdin);
         proc.on('close', (code) => {

package/test-client.d.ts

@@ -1,5 +1,5 @@
 import { Client, QueryResult } from 'pg';
-import { PgConfig } from '@launchql/types';
+import { PgConfig } from 'pg-env';
 export declare class PgTestClient {
     config: PgConfig;
     client: Client;