pgsql-test 2.4.0 → 2.6.0

package/README.md

@@ -422,7 +422,7 @@ This works for any Sqitch-compatible module, now accelerated by LaunchQL's deplo
 
 ## 🚀 LaunchQL Seeding
 
-If your project uses LaunchQL modules with a precompiled `sqitch.plan`, you can use `pgsql-test` with **zero configuration**. Just call `getConnections()` — and it *just works*:
+If your project uses LaunchQL modules with a precompiled `launchql.plan`, you can use `pgsql-test` with **zero configuration**. Just call `getConnections()` — and it *just works*:
 
 ```ts
 import { getConnections } from 'pgsql-test';

package/admin.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbAdmin = void 0;
+const logger_1 = require("@launchql/logger");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const pg_env_1 = require("pg-env");
 const stream_1 = require("./stream");
-const logger_1 = require("@launchql/logger");
 const log = new logger_1.Logger('db-admin');
 class DbAdmin {
     config;

package/connect.d.ts

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

package/connect.js

@@ -1,12 +1,12 @@
 "use strict";
 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 pg_cache_1 = require("pg-cache");
+const pg_env_1 = require("pg-env");
+const admin_1 = require("./admin");
+const manager_1 = require("./manager");
 const seed_1 = require("./seed");
 let manager;
 const getPgRootAdmin = (connOpts = {}) => {

package/esm/admin.js

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

package/esm/connect.js

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

package/esm/manager.js

@@ -1,8 +1,8 @@
+import { Logger } from '@launchql/logger';
 import { Pool } from 'pg';
-import { DbAdmin } from './admin';
 import { getPgEnvOptions } from 'pg-env';
+import { DbAdmin } from './admin';
 import { PgTestClient } from './test-client';
-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/logger';
+import { createReadStream, createWriteStream, existsSync } from 'fs';
+import { from as copyFrom, to as copyTo } from 'pg-copy-streams';
 const log = new Logger('csv');
 export function csv(tables) {
     return {

package/esm/seed/index.js

@@ -1,10 +1,10 @@
-import { fn, sqlfile, compose } from './adapters';
+import { compose, fn, sqlfile } from './adapters';
 import { csv } from './csv';
 import { json } from './json';
-import { sqitch } from './sqitch';
 import { launchql } from './launchql';
-export * from './types';
+import { sqitch } from './sqitch';
 export * from './csv';
+export * from './types';
 export const seed = {
     launchql,
     sqitch,

package/esm/seed/launchql.js

@@ -1,20 +1,19 @@
-import { getEnvOptions } from '@launchql/types';
-import { LaunchQLProject, deployFast } from '@launchql/core';
+import { LaunchQLPackage } from '@launchql/core';
+import { getEnvOptions } from '@launchql/env';
 export function launchql(cwd, cache = false) {
     return {
         async seed(ctx) {
-            const proj = new LaunchQLProject(cwd ?? ctx.connect.cwd);
+            const proj = new LaunchQLPackage(cwd ?? ctx.connect.cwd);
             if (!proj.isInModule())
                 return;
-            const opts = getEnvOptions({ pg: ctx.config });
-            await deployFast({
-                opts,
-                name: proj.getModuleName(),
-                database: ctx.config.database,
-                dir: proj.modulePath,
-                usePlan: true,
-                cache
-            });
+            await proj.deploy(getEnvOptions({
+                pg: ctx.config,
+                deployment: {
+                    fast: true,
+                    usePlan: true,
+                    cache
+                }
+            }), proj.getModuleName());
         }
     };
 }

package/esm/seed/sqitch.js

@@ -1,13 +1,17 @@
-import { getEnvOptions } from '@launchql/types';
-import { LaunchQLProject, deploy } from '@launchql/core';
+import { LaunchQLPackage } from '@launchql/core';
+import { getEnvOptions } from '@launchql/env';
 export function sqitch(cwd) {
     return {
         async seed(ctx) {
-            const proj = new LaunchQLProject(cwd ?? ctx.connect.cwd);
+            const proj = new LaunchQLPackage(cwd ?? ctx.connect.cwd);
             if (!proj.isInModule())
                 return;
-            const opts = getEnvOptions({ pg: ctx.config });
-            await deploy(opts, proj.getModuleName(), ctx.config.database, proj.modulePath);
+            await proj.deploy(getEnvOptions({
+                pg: ctx.config,
+                deployment: {
+                    fast: false
+                }
+            }), proj.getModuleName(), true);
         }
     };
 }

package/esm/stream.js

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

package/manager.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgTestConnector = void 0;
+const logger_1 = require("@launchql/logger");
 const pg_1 = require("pg");
-const admin_1 = require("./admin");
 const pg_env_1 = require("pg-env");
+const admin_1 = require("./admin");
 const test_client_1 = require("./test-client");
-const logger_1 = require("@launchql/logger");
 const log = new logger_1.Logger('test-connector');
 const SYS_EVENTS = ['SIGTERM'];
 const end = (pool) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "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,15 +60,14 @@
     "@types/pg-copy-streams": "^1.2.5"
   },
   "dependencies": {
-    "@launchql/core": "^2.4.0",
-    "@launchql/server-utils": "^2.1.15",
-    "@launchql/types": "^2.1.13",
-    "chalk": "^4.1.0",
-    "deepmerge": "^4.3.1",
+    "@launchql/core": "^2.6.0",
+    "@launchql/env": "^2.2.0",
+    "@launchql/server-utils": "^2.2.0",
+    "@launchql/types": "^2.2.0",
     "pg": "^8.16.0",
-    "pg-cache": "^1.0.1",
+    "pg-cache": "^1.1.0",
     "pg-copy-streams": "^6.0.6",
-    "pg-env": "^1.0.1"
+    "pg-env": "^1.1.0"
   },
-  "gitHead": "8e5b6413167a14504566a36e9be103209ac09d37"
+  "gitHead": "cbf678ed3d22055b7d972468ca7f822b2662e7d0"
 }

package/seed/adapters.d.ts

@@ -1,4 +1,4 @@
-import { SeedAdapter, SeedContext } from "./types";
+import { SeedAdapter, SeedContext } from './types';
 export declare function sqlfile(files: string[]): SeedAdapter;
 export declare function fn(fn: (ctx: SeedContext) => Promise<void>): SeedAdapter;
 export declare function compose(adapters: SeedAdapter[]): SeedAdapter;

package/seed/csv.d.ts

@@ -1,5 +1,5 @@
-import { SeedAdapter } from './types';
 import { PgTestClient } from '../test-client';
+import { SeedAdapter } from './types';
 interface CsvSeedMap {
     [tableName: string]: string;
 }

package/seed/csv.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.csv = csv;
 exports.copyCsvIntoTable = copyCsvIntoTable;
 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 logger_1 = require("@launchql/logger");
+const fs_1 = require("fs");
+const pg_copy_streams_1 = require("pg-copy-streams");
 const log = new logger_1.Logger('csv');
 function csv(tables) {
     return {

package/seed/index.d.ts

@@ -1,10 +1,10 @@
-import { fn, sqlfile, compose } from './adapters';
+import { compose, fn, sqlfile } from './adapters';
 import { csv } from './csv';
 import { json } from './json';
-import { sqitch } from './sqitch';
 import { launchql } from './launchql';
-export * from './types';
+import { sqitch } from './sqitch';
 export * from './csv';
+export * from './types';
 export declare const seed: {
     launchql: typeof launchql;
     sqitch: typeof sqitch;

package/seed/index.js

@@ -18,10 +18,10 @@ exports.seed = void 0;
 const adapters_1 = require("./adapters");
 const csv_1 = require("./csv");
 const json_1 = require("./json");
-const sqitch_1 = require("./sqitch");
 const launchql_1 = require("./launchql");
-__exportStar(require("./types"), exports);
+const sqitch_1 = require("./sqitch");
 __exportStar(require("./csv"), exports);
+__exportStar(require("./types"), exports);
 exports.seed = {
     launchql: launchql_1.launchql,
     sqitch: sqitch_1.sqitch,

package/seed/json.d.ts

@@ -1,4 +1,4 @@
-import { SeedAdapter } from "./types";
+import { SeedAdapter } from './types';
 interface JsonSeedMap {
     [table: string]: Record<string, any>[];
 }

package/seed/launchql.js

@@ -1,23 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchql = launchql;
-const types_1 = require("@launchql/types");
 const core_1 = require("@launchql/core");
+const env_1 = require("@launchql/env");
 function launchql(cwd, cache = false) {
     return {
         async seed(ctx) {
-            const proj = new core_1.LaunchQLProject(cwd ?? ctx.connect.cwd);
+            const proj = new core_1.LaunchQLPackage(cwd ?? ctx.connect.cwd);
             if (!proj.isInModule())
                 return;
-            const opts = (0, types_1.getEnvOptions)({ pg: ctx.config });
-            await (0, core_1.deployFast)({
-                opts,
-                name: proj.getModuleName(),
-                database: ctx.config.database,
-                dir: proj.modulePath,
-                usePlan: true,
-                cache
-            });
+            await proj.deploy((0, env_1.getEnvOptions)({
+                pg: ctx.config,
+                deployment: {
+                    fast: true,
+                    usePlan: true,
+                    cache
+                }
+            }), proj.getModuleName());
         }
     };
 }

package/seed/sqitch.js

@@ -1,16 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sqitch = sqitch;
-const types_1 = require("@launchql/types");
 const core_1 = require("@launchql/core");
+const env_1 = require("@launchql/env");
 function sqitch(cwd) {
     return {
         async seed(ctx) {
-            const proj = new core_1.LaunchQLProject(cwd ?? ctx.connect.cwd);
+            const proj = new core_1.LaunchQLPackage(cwd ?? ctx.connect.cwd);
             if (!proj.isInModule())
                 return;
-            const opts = (0, types_1.getEnvOptions)({ pg: ctx.config });
-            await (0, core_1.deploy)(opts, proj.getModuleName(), ctx.config.database, proj.modulePath);
+            await proj.deploy((0, env_1.getEnvOptions)({
+                pg: ctx.config,
+                deployment: {
+                    fast: false
+                }
+            }), proj.getModuleName(), true);
         }
     };
 }

package/seed/types.d.ts

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

package/stream.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamSql = streamSql;
 const child_process_1 = require("child_process");
-const stream_1 = require("stream");
 const pg_env_1 = require("pg-env");
+const stream_1 = require("stream");
 function setArgs(config) {
     const args = [
         '-U', config.user,