pgpm 0.1.2 → 0.2.1

package/README.md

@@ -25,14 +25,17 @@ npm install -g pgpm
 ### Create Your First Project
 
 ```bash
-# Initialize a new workspace
+# 1. Create workspace
 pgpm init --workspace
-cd my-project
+cd my-app
 
-# Create your first module
+# 2. Create your first module
 pgpm init
 
-# Deploy to your database
+# 3. Add some SQL migrations to sql/ directory
+pgpm add some_change
+
+# 4. Deploy to database
 pgpm deploy --createdb
 ```
 
@@ -111,6 +114,19 @@ pgpm install
 pgpm deploy --createdb
 ```
 
+### Testing a pgpm module in a workspace
+
+```bash
+# 1. Install dependencies
+pgpm install
+
+# 2. Enter the packages/<yourmodule>
+cd packages/yourmodule
+
+# 3. Test the module in watch mode
+pnpm test:watch
+```
+
 ### Database Operations
 
 #### `pgpm deploy`

package/commands/clear.js

@@ -38,7 +38,7 @@ exports.default = async (argv, prompter, _options) => {
     if (!modulePath) {
         throw new Error('Could not resolve module path');
     }
-    const planPath = path_1.default.join(modulePath, 'launchql.plan');
+    const planPath = path_1.default.join(modulePath, 'pgpm.plan');
     const result = (0, core_2.parsePlanFile)(planPath);
     if (result.errors.length > 0) {
         throw types_1.errors.PLAN_PARSE_ERROR({ planPath, errors: result.errors.map(e => e.message).join(', ') });

package/commands/env.d.ts

@@ -0,0 +1,4 @@
+import { Inquirerer } from 'inquirerer';
+import { ParsedArgs } from 'minimist';
+declare const _default: (argv: Partial<ParsedArgs>, _prompter: Inquirerer) => Promise<void>;
+export default _default;

package/commands/env.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const pg_env_1 = require("pg-env");
+const envUsageText = `
+Environment Command:
+
+  pgpm env [OPTIONS] [COMMAND...]
+
+  Manage PostgreSQL environment variables with profile support.
+
+Profiles:
+  (default)          Use local Postgres development profile
+  --supabase         Use Supabase local development profile
+
+Modes:
+  No command         Print export statements for shell evaluation
+  With command       Execute command with environment variables applied
+
+Options:
+  --help, -h         Show this help message
+  --supabase         Use Supabase profile instead of default Postgres
+
+Examples:
+  pgpm env                                    Print default Postgres env exports
+  pgpm env --supabase                         Print Supabase env exports
+  eval "$(pgpm env)"                          Load default Postgres env into shell
+  eval "$(pgpm env --supabase)"               Load Supabase env into shell
+  pgpm env lql deploy --database db1          Run command with default Postgres env
+  pgpm env createdb mydb                      Run command with default Postgres env
+  pgpm env --supabase lql deploy --database db1  Run command with Supabase env
+  pgpm env --supabase createdb mydb           Run command with Supabase env
+`;
+const SUPABASE_PROFILE = {
+    host: 'localhost',
+    port: 54322,
+    user: 'supabase_admin',
+    password: 'postgres',
+    database: 'postgres'
+};
+const DEFAULT_PROFILE = {
+    ...pg_env_1.defaultPgConfig
+};
+function configToEnvVars(config) {
+    return {
+        PGHOST: config.host,
+        PGPORT: String(config.port),
+        PGUSER: config.user,
+        PGPASSWORD: config.password,
+        PGDATABASE: config.database
+    };
+}
+function printExports(config) {
+    const envVars = configToEnvVars(config);
+    for (const [key, value] of Object.entries(envVars)) {
+        const escapedValue = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        console.log(`export ${key}="${escapedValue}"`);
+    }
+}
+function executeCommand(config, command, args) {
+    return new Promise((resolve, reject) => {
+        const envVars = configToEnvVars(config);
+        const env = {
+            ...process.env,
+            ...envVars
+        };
+        const child = (0, child_process_1.spawn)(command, args, {
+            env,
+            stdio: 'inherit',
+            shell: false
+        });
+        child.on('error', (error) => {
+            reject(error);
+        });
+        child.on('close', (code) => {
+            resolve(code ?? 0);
+        });
+    });
+}
+exports.default = async (argv, _prompter) => {
+    if (argv.help || argv.h) {
+        console.log(envUsageText);
+        process.exit(0);
+    }
+    const useSupabase = argv.supabase === true || typeof argv.supabase === 'string';
+    const profile = useSupabase ? SUPABASE_PROFILE : DEFAULT_PROFILE;
+    const rawArgs = process.argv.slice(2);
+    let envIndex = rawArgs.findIndex(arg => arg === 'env');
+    if (envIndex === -1) {
+        envIndex = 0;
+    }
+    const argsAfterEnv = rawArgs.slice(envIndex + 1);
+    const supabaseIndex = argsAfterEnv.findIndex(arg => arg === '--supabase');
+    let commandArgs;
+    if (supabaseIndex !== -1) {
+        commandArgs = argsAfterEnv.slice(supabaseIndex + 1);
+    }
+    else {
+        commandArgs = argsAfterEnv;
+    }
+    commandArgs = commandArgs.filter(arg => arg !== '--cwd' && !arg.startsWith('--cwd='));
+    const cwdIndex = commandArgs.findIndex(arg => arg === '--cwd');
+    if (cwdIndex !== -1 && cwdIndex + 1 < commandArgs.length) {
+        commandArgs.splice(cwdIndex, 2);
+    }
+    if (commandArgs.length === 0) {
+        printExports(profile);
+        return;
+    }
+    const [command, ...args] = commandArgs;
+    try {
+        const exitCode = await executeCommand(profile, command, args);
+        process.exit(exitCode);
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            console.error(`Error executing command: ${error.message}`);
+        }
+        else {
+            console.error(`Error executing command: ${String(error)}`);
+        }
+        process.exit(1);
+    }
+};

package/commands/migrate/deps.js

@@ -10,9 +10,9 @@ const database_1 = require("../../utils/database");
 const log = new logger_1.Logger('migrate-deps');
 exports.default = async (argv, prompter, options) => {
     const cwd = argv.cwd || process.cwd();
-    const planPath = (0, path_1.join)(cwd, 'launchql.plan');
+    const planPath = (0, path_1.join)(cwd, 'pgpm.plan');
     if (!(0, fs_1.existsSync)(planPath)) {
-        log.error(`No launchql.plan found in ${cwd}`);
+        log.error(`No pgpm.plan found in ${cwd}`);
         process.exit(1);
     }
     // Get specific change to analyze

package/commands/migrate/list.js

@@ -10,9 +10,9 @@ const database_1 = require("../../utils/database");
 const log = new logger_1.Logger('migrate-list');
 exports.default = async (argv, prompter, options) => {
     const cwd = argv.cwd || process.cwd();
-    const planPath = (0, path_1.join)(cwd, 'launchql.plan');
+    const planPath = (0, path_1.join)(cwd, 'pgpm.plan');
     if (!(0, fs_1.existsSync)(planPath)) {
-        log.error(`No launchql.plan found in ${cwd}`);
+        log.error(`No pgpm.plan found in ${cwd}`);
         process.exit(1);
     }
     // Get database configuration

package/commands/migrate/status.js

@@ -10,9 +10,9 @@ const database_1 = require("../../utils/database");
 const log = new logger_1.Logger('migrate-status');
 exports.default = async (argv, prompter, options) => {
     const cwd = argv.cwd || process.cwd();
-    const planPath = (0, path_1.join)(cwd, 'launchql.plan');
+    const planPath = (0, path_1.join)(cwd, 'pgpm.plan');
     if (!(0, fs_1.existsSync)(planPath)) {
-        log.error(`No launchql.plan found in ${cwd}`);
+        log.error(`No pgpm.plan found in ${cwd}`);
         process.exit(1);
     }
     // Get database configuration

package/commands.js

@@ -10,6 +10,7 @@ const admin_users_1 = __importDefault(require("./commands/admin-users"));
 const analyze_1 = __importDefault(require("./commands/analyze"));
 const clear_1 = __importDefault(require("./commands/clear"));
 const deploy_1 = __importDefault(require("./commands/deploy"));
+const env_1 = __importDefault(require("./commands/env"));
 const export_1 = __importDefault(require("./commands/export"));
 const extension_1 = __importDefault(require("./commands/extension"));
 const init_1 = __importDefault(require("./commands/init"));
@@ -43,6 +44,7 @@ const createPgpmCommandMap = (skipPgTeardown = false) => {
         'admin-users': pgt(admin_users_1.default),
         clear: pgt(clear_1.default),
         deploy: pgt(deploy_1.default),
+        env: env_1.default,
         verify: pgt(verify_1.default),
         revert: pgt(revert_1.default),
         remove: pgt(remove_1.default),

package/esm/commands/clear.js

@@ -33,7 +33,7 @@ export default async (argv, prompter, _options) => {
     if (!modulePath) {
         throw new Error('Could not resolve module path');
     }
-    const planPath = path.join(modulePath, 'launchql.plan');
+    const planPath = path.join(modulePath, 'pgpm.plan');
     const result = parsePlanFile(planPath);
     if (result.errors.length > 0) {
         throw errors.PLAN_PARSE_ERROR({ planPath, errors: result.errors.map(e => e.message).join(', ') });

package/esm/commands/env.js

@@ -0,0 +1,122 @@
+import { spawn } from 'child_process';
+import { defaultPgConfig } from 'pg-env';
+const envUsageText = `
+Environment Command:
+
+  pgpm env [OPTIONS] [COMMAND...]
+
+  Manage PostgreSQL environment variables with profile support.
+
+Profiles:
+  (default)          Use local Postgres development profile
+  --supabase         Use Supabase local development profile
+
+Modes:
+  No command         Print export statements for shell evaluation
+  With command       Execute command with environment variables applied
+
+Options:
+  --help, -h         Show this help message
+  --supabase         Use Supabase profile instead of default Postgres
+
+Examples:
+  pgpm env                                    Print default Postgres env exports
+  pgpm env --supabase                         Print Supabase env exports
+  eval "$(pgpm env)"                          Load default Postgres env into shell
+  eval "$(pgpm env --supabase)"               Load Supabase env into shell
+  pgpm env lql deploy --database db1          Run command with default Postgres env
+  pgpm env createdb mydb                      Run command with default Postgres env
+  pgpm env --supabase lql deploy --database db1  Run command with Supabase env
+  pgpm env --supabase createdb mydb           Run command with Supabase env
+`;
+const SUPABASE_PROFILE = {
+    host: 'localhost',
+    port: 54322,
+    user: 'supabase_admin',
+    password: 'postgres',
+    database: 'postgres'
+};
+const DEFAULT_PROFILE = {
+    ...defaultPgConfig
+};
+function configToEnvVars(config) {
+    return {
+        PGHOST: config.host,
+        PGPORT: String(config.port),
+        PGUSER: config.user,
+        PGPASSWORD: config.password,
+        PGDATABASE: config.database
+    };
+}
+function printExports(config) {
+    const envVars = configToEnvVars(config);
+    for (const [key, value] of Object.entries(envVars)) {
+        const escapedValue = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        console.log(`export ${key}="${escapedValue}"`);
+    }
+}
+function executeCommand(config, command, args) {
+    return new Promise((resolve, reject) => {
+        const envVars = configToEnvVars(config);
+        const env = {
+            ...process.env,
+            ...envVars
+        };
+        const child = spawn(command, args, {
+            env,
+            stdio: 'inherit',
+            shell: false
+        });
+        child.on('error', (error) => {
+            reject(error);
+        });
+        child.on('close', (code) => {
+            resolve(code ?? 0);
+        });
+    });
+}
+export default async (argv, _prompter) => {
+    if (argv.help || argv.h) {
+        console.log(envUsageText);
+        process.exit(0);
+    }
+    const useSupabase = argv.supabase === true || typeof argv.supabase === 'string';
+    const profile = useSupabase ? SUPABASE_PROFILE : DEFAULT_PROFILE;
+    const rawArgs = process.argv.slice(2);
+    let envIndex = rawArgs.findIndex(arg => arg === 'env');
+    if (envIndex === -1) {
+        envIndex = 0;
+    }
+    const argsAfterEnv = rawArgs.slice(envIndex + 1);
+    const supabaseIndex = argsAfterEnv.findIndex(arg => arg === '--supabase');
+    let commandArgs;
+    if (supabaseIndex !== -1) {
+        commandArgs = argsAfterEnv.slice(supabaseIndex + 1);
+    }
+    else {
+        commandArgs = argsAfterEnv;
+    }
+    commandArgs = commandArgs.filter(arg => arg !== '--cwd' && !arg.startsWith('--cwd='));
+    const cwdIndex = commandArgs.findIndex(arg => arg === '--cwd');
+    if (cwdIndex !== -1 && cwdIndex + 1 < commandArgs.length) {
+        commandArgs.splice(cwdIndex, 2);
+    }
+    if (commandArgs.length === 0) {
+        printExports(profile);
+        return;
+    }
+    const [command, ...args] = commandArgs;
+    try {
+        const exitCode = await executeCommand(profile, command, args);
+        process.exit(exitCode);
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            console.error(`Error executing command: ${error.message}`);
+        }
+        else {
+            console.error(`Error executing command: ${String(error)}`);
+        }
+        process.exit(1);
+    }
+};

package/esm/commands/migrate/deps.js

@@ -8,9 +8,9 @@ import { getTargetDatabase } from '../../utils/database';
 const log = new Logger('migrate-deps');
 export default async (argv, prompter, options) => {
     const cwd = argv.cwd || process.cwd();
-    const planPath = join(cwd, 'launchql.plan');
+    const planPath = join(cwd, 'pgpm.plan');
     if (!existsSync(planPath)) {
-        log.error(`No launchql.plan found in ${cwd}`);
+        log.error(`No pgpm.plan found in ${cwd}`);
         process.exit(1);
     }
     // Get specific change to analyze

package/esm/commands/migrate/list.js

@@ -8,9 +8,9 @@ import { getTargetDatabase } from '../../utils/database';
 const log = new Logger('migrate-list');
 export default async (argv, prompter, options) => {
     const cwd = argv.cwd || process.cwd();
-    const planPath = join(cwd, 'launchql.plan');
+    const planPath = join(cwd, 'pgpm.plan');
     if (!existsSync(planPath)) {
-        log.error(`No launchql.plan found in ${cwd}`);
+        log.error(`No pgpm.plan found in ${cwd}`);
         process.exit(1);
     }
     // Get database configuration

package/esm/commands/migrate/status.js

@@ -8,9 +8,9 @@ import { getTargetDatabase } from '../../utils/database';
 const log = new Logger('migrate-status');
 export default async (argv, prompter, options) => {
     const cwd = argv.cwd || process.cwd();
-    const planPath = join(cwd, 'launchql.plan');
+    const planPath = join(cwd, 'pgpm.plan');
     if (!existsSync(planPath)) {
-        log.error(`No launchql.plan found in ${cwd}`);
+        log.error(`No pgpm.plan found in ${cwd}`);
         process.exit(1);
     }
     // Get database configuration

package/esm/commands.js

@@ -4,6 +4,7 @@ import adminUsers from './commands/admin-users';
 import analyze from './commands/analyze';
 import clear from './commands/clear';
 import deploy from './commands/deploy';
+import env from './commands/env';
 import _export from './commands/export';
 import extension from './commands/extension';
 import init from './commands/init';
@@ -37,6 +38,7 @@ export const createPgpmCommandMap = (skipPgTeardown = false) => {
         'admin-users': pgt(adminUsers),
         clear: pgt(clear),
         deploy: pgt(deploy),
+        env,
         verify: pgt(verify),
         revert: pgt(revert),
         remove: pgt(remove),

package/esm/index.js

@@ -9,6 +9,7 @@ export { default as adminUsers } from './commands/admin-users';
 export { default as analyze } from './commands/analyze';
 export { default as clear } from './commands/clear';
 export { default as deploy } from './commands/deploy';
+export { default as env } from './commands/env';
 export { default as _export } from './commands/export';
 export { default as extension } from './commands/extension';
 export { default as install } from './commands/install';

package/index.d.ts

@@ -7,6 +7,7 @@ export { default as adminUsers } from './commands/admin-users';
 export { default as analyze } from './commands/analyze';
 export { default as clear } from './commands/clear';
 export { default as deploy } from './commands/deploy';
+export { default as env } from './commands/env';
 export { default as _export } from './commands/export';
 export { default as extension } from './commands/extension';
 export { default as install } from './commands/install';

package/index.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = exports.verify = exports.tag = exports.revert = exports.renameCmd = exports.remove = exports.plan = exports._package = exports.migrate = exports.kill = exports.install = exports.extension = exports._export = exports.deploy = exports.clear = exports.analyze = exports.adminUsers = exports.add = exports.createPgpmCommandMap = void 0;
+exports.options = exports.verify = exports.tag = exports.revert = exports.renameCmd = exports.remove = exports.plan = exports._package = exports.migrate = exports.kill = exports.install = exports.extension = exports._export = exports.env = exports.deploy = exports.clear = exports.analyze = exports.adminUsers = exports.add = exports.createPgpmCommandMap = void 0;
 const fs_1 = require("fs");
 const inquirerer_1 = require("inquirerer");
 const path_1 = require("path");
@@ -34,6 +34,8 @@ var clear_1 = require("./commands/clear");
 Object.defineProperty(exports, "clear", { enumerable: true, get: function () { return __importDefault(clear_1).default; } });
 var deploy_1 = require("./commands/deploy");
 Object.defineProperty(exports, "deploy", { enumerable: true, get: function () { return __importDefault(deploy_1).default; } });
+var env_1 = require("./commands/env");
+Object.defineProperty(exports, "env", { enumerable: true, get: function () { return __importDefault(env_1).default; } });
 var export_1 = require("./commands/export");
 Object.defineProperty(exports, "_export", { enumerable: true, get: function () { return __importDefault(export_1).default; } });
 var extension_1 = require("./commands/extension");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -45,16 +45,16 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@launchql/core": "^2.14.5",
-    "@launchql/env": "^2.4.7",
-    "@launchql/logger": "^1.1.4",
-    "@launchql/templatizer": "^2.4.7",
-    "@launchql/types": "^2.7.2",
+    "@launchql/core": "^2.15.1",
+    "@launchql/env": "^2.5.0",
+    "@launchql/logger": "^1.1.5",
+    "@launchql/templatizer": "^2.5.0",
+    "@launchql/types": "^2.8.0",
     "chalk": "^4.1.0",
     "inquirerer": "^2.0.8",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
-    "pg-cache": "^1.3.10",
+    "pg-cache": "^1.4.1",
     "pg-env": "^1.1.2",
     "shelljs": "^0.9.2"
   },
@@ -70,5 +70,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "a32146b0033c550907a03faa374e7101f8f15b02"
+  "gitHead": "2bc45c48444fc9c2cce9f082cf33d533915bb048"
 }