pgpm 4.12.0 → 4.14.0

package/commands/docker.js

@@ -8,8 +8,7 @@ Docker Command:
   pgpm docker <subcommand> [OPTIONS]
 
   Manage Docker containers for local development.
-  PostgreSQL is always started by default. Additional services can be
-  included with the --include flag.
+  PostgreSQL is always started by default.
 
 Subcommands:
   start              Start containers
@@ -24,23 +23,22 @@ PostgreSQL Options:
   --password <pass>  PostgreSQL password (default: password)
   --shm-size <size>  Shared memory size for container (default: 2g)
 
+Additional Services:
+  --minio            Include MinIO S3-compatible object storage (port 9000)
+
 General Options:
   --help, -h         Show this help message
   --recreate         Remove and recreate containers on start
-  --include <svc>    Include additional service (can be repeated)
-
-Available Additional Services:
-  minio              MinIO S3-compatible object storage (port 9000)
 
 Examples:
   pgpm docker start                           Start PostgreSQL only
-  pgpm docker start --include minio           Start PostgreSQL + MinIO
+  pgpm docker start --minio                   Start PostgreSQL + MinIO
   pgpm docker start --port 5433               Start on custom port
   pgpm docker start --shm-size 4g             Start with 4GB shared memory
   pgpm docker start --recreate                Remove and recreate containers
-  pgpm docker start --recreate --include minio Recreate PostgreSQL + MinIO
+  pgpm docker start --recreate --minio        Recreate PostgreSQL + MinIO
   pgpm docker stop                            Stop PostgreSQL
-  pgpm docker stop --include minio            Stop PostgreSQL + MinIO
+  pgpm docker stop --minio                    Stop PostgreSQL + MinIO
   pgpm docker ls                              List services and status
 `;
 const ADDITIONAL_SERVICES = {
@@ -253,24 +251,10 @@ async function startService(service, recreate) {
 async function stopService(service) {
     await stopContainer(service.name);
 }
-function parseInclude(args) {
-    const include = args.include;
-    if (!include)
-        return [];
-    if (Array.isArray(include))
-        return include;
-    if (typeof include === 'string')
-        return [include];
-    return [];
-}
-function resolveIncludedServices(includeNames) {
+function resolveServiceFlags(args) {
     const services = [];
-    for (const name of includeNames) {
-        const service = ADDITIONAL_SERVICES[name];
-        if (!service) {
-            console.warn(`⚠️  Unknown service: "${name}". Available: ${Object.keys(ADDITIONAL_SERVICES).join(', ')}`);
-        }
-        else {
+    for (const [key, service] of Object.entries(ADDITIONAL_SERVICES)) {
+        if (args[key] === true || typeof args[key] === 'string') {
             services.push(service);
         }
     }
@@ -288,7 +272,7 @@ async function listServices() {
     else {
         console.log('    postgres    constructiveio/postgres-plus:18    \x1b[90m(docker not available)\x1b[0m');
     }
-    console.log('\n  Additional (use --include <name>):');
+    console.log('\n  Additional (use --<name> flag):');
     for (const [key, service] of Object.entries(ADDITIONAL_SERVICES)) {
         if (dockerAvailable) {
             const running = await isContainerRunning(service.name);
@@ -322,8 +306,7 @@ exports.default = async (argv, _prompter, _options) => {
     const password = args.password || 'password';
     const shmSize = args['shm-size'] || args.shmSize || '2g';
     const recreate = args.recreate === true;
-    const includeNames = parseInclude(args);
-    const includedServices = resolveIncludedServices(includeNames);
+    const includedServices = resolveServiceFlags(args);
     switch (subcommand) {
         case 'start':
             await startContainer({ name, image, port, user, password, shmSize, recreate });

package/commands/env.js

@@ -7,12 +7,15 @@ Environment Command:
 
   pgpm env [OPTIONS] [COMMAND...]
 
-  Manage PostgreSQL environment variables with profile support.
+  Manage environment variables for local development with profile support.
 
-Profiles:
+Database Profiles:
   (default)          Use local Postgres development profile
   --supabase         Use Supabase local development profile
 
+Additional Services:
+  --minio            Include MinIO/S3 environment variables
+
 Modes:
   No command         Print export statements for shell evaluation
   With command       Execute command with environment variables applied
@@ -20,16 +23,18 @@ Modes:
 Options:
   --help, -h         Show this help message
   --supabase         Use Supabase profile instead of default Postgres
+  --minio            Include CDN_ENDPOINT, AWS_ACCESS_KEY, AWS_SECRET_KEY, AWS_REGION
 
 Examples:
   pgpm env                                    Print default Postgres env exports
   pgpm env --supabase                         Print Supabase env exports
+  pgpm env --minio                            Print Postgres + MinIO env exports
+  pgpm env --supabase --minio                 Print Supabase + MinIO env exports
   eval "$(pgpm env)"                          Load default Postgres env into shell
-  eval "$(pgpm env --supabase)"               Load Supabase env into shell
+  eval "$(pgpm env --minio)"                  Load Postgres + MinIO env into shell
+  eval "$(pgpm env --supabase --minio)"       Load Supabase + MinIO env into shell
   pgpm env pgpm deploy --database db1         Run command with default Postgres env
-  pgpm env createdb mydb                      Run command with default Postgres env
-  pgpm env --supabase pgpm deploy --database db1 Run command with Supabase env
-  pgpm env --supabase createdb mydb           Run command with Supabase env
+  pgpm env --minio pgpm deploy --database db1 Run command with Postgres + MinIO env
 `;
 const SUPABASE_PROFILE = {
     host: 'localhost',
@@ -41,24 +46,37 @@ const SUPABASE_PROFILE = {
 const DEFAULT_PROFILE = {
     ...pg_env_1.defaultPgConfig
 };
-function configToEnvVars(config) {
-    return {
+const MINIO_PROFILE = {
+    endpoint: 'http://localhost:9000',
+    accessKey: 'minioadmin',
+    secretKey: 'minioadmin',
+    region: 'us-east-1',
+};
+function configToEnvVars(config, minio) {
+    const vars = {
         PGHOST: config.host,
         PGPORT: String(config.port),
         PGUSER: config.user,
         PGPASSWORD: config.password,
         PGDATABASE: config.database
     };
+    if (minio) {
+        vars.CDN_ENDPOINT = minio.endpoint;
+        vars.AWS_ACCESS_KEY = minio.accessKey;
+        vars.AWS_SECRET_KEY = minio.secretKey;
+        vars.AWS_REGION = minio.region;
+    }
+    return vars;
 }
-function printExports(config) {
-    const envVars = configToEnvVars(config);
+function printExports(config, minio) {
+    const envVars = configToEnvVars(config, minio);
     for (const [key, value] of Object.entries(envVars)) {
         console.log(`export ${key}=${value}`);
     }
 }
-function executeCommand(config, command, args) {
+function executeCommand(config, command, args, minio) {
     return new Promise((resolve, reject) => {
-        const envVars = configToEnvVars(config);
+        const envVars = configToEnvVars(config, minio);
         const env = {
             ...process.env,
             ...envVars
@@ -82,33 +100,29 @@ exports.default = async (argv, _prompter) => {
         process.exit(0);
     }
     const useSupabase = argv.supabase === true || typeof argv.supabase === 'string';
+    const useMinio = argv.minio === true || typeof argv.minio === 'string';
     const profile = useSupabase ? SUPABASE_PROFILE : DEFAULT_PROFILE;
+    const minioProfile = useMinio ? MINIO_PROFILE : undefined;
+    const knownFlags = ['--supabase', '--minio'];
     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;
-    }
+    let commandArgs = argsAfterEnv.filter(arg => !knownFlags.includes(arg));
     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);
+        printExports(profile, minioProfile);
         return;
     }
     const [command, ...args] = commandArgs;
     try {
-        const exitCode = await executeCommand(profile, command, args);
+        const exitCode = await executeCommand(profile, command, args, minioProfile);
         process.exit(exitCode);
     }
     catch (error) {

package/esm/commands/docker.js

@@ -6,8 +6,7 @@ Docker Command:
   pgpm docker <subcommand> [OPTIONS]
 
   Manage Docker containers for local development.
-  PostgreSQL is always started by default. Additional services can be
-  included with the --include flag.
+  PostgreSQL is always started by default.
 
 Subcommands:
   start              Start containers
@@ -22,23 +21,22 @@ PostgreSQL Options:
   --password <pass>  PostgreSQL password (default: password)
   --shm-size <size>  Shared memory size for container (default: 2g)
 
+Additional Services:
+  --minio            Include MinIO S3-compatible object storage (port 9000)
+
 General Options:
   --help, -h         Show this help message
   --recreate         Remove and recreate containers on start
-  --include <svc>    Include additional service (can be repeated)
-
-Available Additional Services:
-  minio              MinIO S3-compatible object storage (port 9000)
 
 Examples:
   pgpm docker start                           Start PostgreSQL only
-  pgpm docker start --include minio           Start PostgreSQL + MinIO
+  pgpm docker start --minio                   Start PostgreSQL + MinIO
   pgpm docker start --port 5433               Start on custom port
   pgpm docker start --shm-size 4g             Start with 4GB shared memory
   pgpm docker start --recreate                Remove and recreate containers
-  pgpm docker start --recreate --include minio Recreate PostgreSQL + MinIO
+  pgpm docker start --recreate --minio        Recreate PostgreSQL + MinIO
   pgpm docker stop                            Stop PostgreSQL
-  pgpm docker stop --include minio            Stop PostgreSQL + MinIO
+  pgpm docker stop --minio                    Stop PostgreSQL + MinIO
   pgpm docker ls                              List services and status
 `;
 const ADDITIONAL_SERVICES = {
@@ -251,24 +249,10 @@ async function startService(service, recreate) {
 async function stopService(service) {
     await stopContainer(service.name);
 }
-function parseInclude(args) {
-    const include = args.include;
-    if (!include)
-        return [];
-    if (Array.isArray(include))
-        return include;
-    if (typeof include === 'string')
-        return [include];
-    return [];
-}
-function resolveIncludedServices(includeNames) {
+function resolveServiceFlags(args) {
     const services = [];
-    for (const name of includeNames) {
-        const service = ADDITIONAL_SERVICES[name];
-        if (!service) {
-            console.warn(`⚠️  Unknown service: "${name}". Available: ${Object.keys(ADDITIONAL_SERVICES).join(', ')}`);
-        }
-        else {
+    for (const [key, service] of Object.entries(ADDITIONAL_SERVICES)) {
+        if (args[key] === true || typeof args[key] === 'string') {
             services.push(service);
         }
     }
@@ -286,7 +270,7 @@ async function listServices() {
     else {
         console.log('    postgres    constructiveio/postgres-plus:18    \x1b[90m(docker not available)\x1b[0m');
     }
-    console.log('\n  Additional (use --include <name>):');
+    console.log('\n  Additional (use --<name> flag):');
     for (const [key, service] of Object.entries(ADDITIONAL_SERVICES)) {
         if (dockerAvailable) {
             const running = await isContainerRunning(service.name);
@@ -320,8 +304,7 @@ export default async (argv, _prompter, _options) => {
     const password = args.password || 'password';
     const shmSize = args['shm-size'] || args.shmSize || '2g';
     const recreate = args.recreate === true;
-    const includeNames = parseInclude(args);
-    const includedServices = resolveIncludedServices(includeNames);
+    const includedServices = resolveServiceFlags(args);
     switch (subcommand) {
         case 'start':
             await startContainer({ name, image, port, user, password, shmSize, recreate });

package/esm/commands/env.js

@@ -5,12 +5,15 @@ Environment Command:
 
   pgpm env [OPTIONS] [COMMAND...]
 
-  Manage PostgreSQL environment variables with profile support.
+  Manage environment variables for local development with profile support.
 
-Profiles:
+Database Profiles:
   (default)          Use local Postgres development profile
   --supabase         Use Supabase local development profile
 
+Additional Services:
+  --minio            Include MinIO/S3 environment variables
+
 Modes:
   No command         Print export statements for shell evaluation
   With command       Execute command with environment variables applied
@@ -18,16 +21,18 @@ Modes:
 Options:
   --help, -h         Show this help message
   --supabase         Use Supabase profile instead of default Postgres
+  --minio            Include CDN_ENDPOINT, AWS_ACCESS_KEY, AWS_SECRET_KEY, AWS_REGION
 
 Examples:
   pgpm env                                    Print default Postgres env exports
   pgpm env --supabase                         Print Supabase env exports
+  pgpm env --minio                            Print Postgres + MinIO env exports
+  pgpm env --supabase --minio                 Print Supabase + MinIO env exports
   eval "$(pgpm env)"                          Load default Postgres env into shell
-  eval "$(pgpm env --supabase)"               Load Supabase env into shell
+  eval "$(pgpm env --minio)"                  Load Postgres + MinIO env into shell
+  eval "$(pgpm env --supabase --minio)"       Load Supabase + MinIO env into shell
   pgpm env pgpm deploy --database db1         Run command with default Postgres env
-  pgpm env createdb mydb                      Run command with default Postgres env
-  pgpm env --supabase pgpm deploy --database db1 Run command with Supabase env
-  pgpm env --supabase createdb mydb           Run command with Supabase env
+  pgpm env --minio pgpm deploy --database db1 Run command with Postgres + MinIO env
 `;
 const SUPABASE_PROFILE = {
     host: 'localhost',
@@ -39,24 +44,37 @@ const SUPABASE_PROFILE = {
 const DEFAULT_PROFILE = {
     ...defaultPgConfig
 };
-function configToEnvVars(config) {
-    return {
+const MINIO_PROFILE = {
+    endpoint: 'http://localhost:9000',
+    accessKey: 'minioadmin',
+    secretKey: 'minioadmin',
+    region: 'us-east-1',
+};
+function configToEnvVars(config, minio) {
+    const vars = {
         PGHOST: config.host,
         PGPORT: String(config.port),
         PGUSER: config.user,
         PGPASSWORD: config.password,
         PGDATABASE: config.database
     };
+    if (minio) {
+        vars.CDN_ENDPOINT = minio.endpoint;
+        vars.AWS_ACCESS_KEY = minio.accessKey;
+        vars.AWS_SECRET_KEY = minio.secretKey;
+        vars.AWS_REGION = minio.region;
+    }
+    return vars;
 }
-function printExports(config) {
-    const envVars = configToEnvVars(config);
+function printExports(config, minio) {
+    const envVars = configToEnvVars(config, minio);
     for (const [key, value] of Object.entries(envVars)) {
         console.log(`export ${key}=${value}`);
     }
 }
-function executeCommand(config, command, args) {
+function executeCommand(config, command, args, minio) {
     return new Promise((resolve, reject) => {
-        const envVars = configToEnvVars(config);
+        const envVars = configToEnvVars(config, minio);
         const env = {
             ...process.env,
             ...envVars
@@ -80,33 +98,29 @@ export default async (argv, _prompter) => {
         process.exit(0);
     }
     const useSupabase = argv.supabase === true || typeof argv.supabase === 'string';
+    const useMinio = argv.minio === true || typeof argv.minio === 'string';
     const profile = useSupabase ? SUPABASE_PROFILE : DEFAULT_PROFILE;
+    const minioProfile = useMinio ? MINIO_PROFILE : undefined;
+    const knownFlags = ['--supabase', '--minio'];
     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;
-    }
+    let commandArgs = argsAfterEnv.filter(arg => !knownFlags.includes(arg));
     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);
+        printExports(profile, minioProfile);
         return;
     }
     const [command, ...args] = commandArgs;
     try {
-        const exitCode = await executeCommand(profile, command, args);
+        const exitCode = await executeCommand(profile, command, args, minioProfile);
         process.exit(exitCode);
     }
     catch (error) {

package/esm/utils/display.js

@@ -39,8 +39,8 @@ export const usageText = `
       deps             Show change dependencies
   
   Development Tools:
-    docker             Manage Docker containers (start/stop/ls, --include for additional services)
-    env                Manage PostgreSQL environment variables
+    docker             Manage Docker containers (start/stop/ls, --minio)
+    env                Manage environment variables (--supabase, --minio)
     test-packages      Run integration tests on workspace packages
   
   Global Options:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "4.12.0",
+  "version": "4.14.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -76,5 +76,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "2bedc6e29e8d2bfd1edd97d151696deb6b278a7a"
+  "gitHead": "2572aaf6c2a3298917362e80ed68276c88a88f82"
 }

package/utils/display.d.ts

@@ -1 +1 @@
-export declare const usageText = "\n  Usage: pgpm <command> [options]\n\n  Core Database Operations:\n    add                Add database changes to plans and create SQL files\n    deploy             Deploy database changes and migrations\n    verify             Verify database state and migrations\n    revert             Revert database changes and migrations\n\n  Project Management:\n    init               Initialize workspace or module\n    extension          Manage module dependencies\n    plan               Generate module deployment plans\n    package            Package module for distribution\n    export             Export database migrations from existing databases\n    update             Update pgpm to the latest version\n    cache              Manage cached templates (clean)\n    upgrade            Upgrade installed pgpm modules to latest versions (alias: up)\n\n  Database Administration:\n    dump               Dump a database to a sql file\n    kill               Terminate database connections and optionally drop databases\n    install            Install database modules\n    tag                Add tags to changes for versioning\n    clear              Clear database state\n    remove             Remove database changes\n    analyze            Analyze database structure\n    rename             Rename database changes\n    admin-users        Manage admin users\n\n  Testing:\n    test-packages      Run integration tests on all workspace packages\n\n  Migration Tools:\n    migrate            Migration management subcommands\n      init             Initialize migration tracking\n      status           Show migration status\n      list             List all changes\n      deps             Show change dependencies\n  \n  Development Tools:\n    docker             Manage Docker containers (start/stop/ls, --include for additional services)\n    env                Manage PostgreSQL environment variables\n    test-packages      Run integration tests on workspace packages\n  \n  Global Options:\n    -h, --help         Display this help information\n    -v, --version      Display version information\n    --cwd <directory>  Working directory (default: current directory)\n\n  Individual Command Help:\n    pgpm <command> --help    Display detailed help for specific command\n    pgpm <command> -h        Display detailed help for specific command\n\n  Examples:\n    pgpm deploy --help       Show deploy command options\n    pgpm init workspace      Initialize new workspace\n    pgpm install @pgpm/base32  Install a database module\n  ";
+export declare const usageText = "\n  Usage: pgpm <command> [options]\n\n  Core Database Operations:\n    add                Add database changes to plans and create SQL files\n    deploy             Deploy database changes and migrations\n    verify             Verify database state and migrations\n    revert             Revert database changes and migrations\n\n  Project Management:\n    init               Initialize workspace or module\n    extension          Manage module dependencies\n    plan               Generate module deployment plans\n    package            Package module for distribution\n    export             Export database migrations from existing databases\n    update             Update pgpm to the latest version\n    cache              Manage cached templates (clean)\n    upgrade            Upgrade installed pgpm modules to latest versions (alias: up)\n\n  Database Administration:\n    dump               Dump a database to a sql file\n    kill               Terminate database connections and optionally drop databases\n    install            Install database modules\n    tag                Add tags to changes for versioning\n    clear              Clear database state\n    remove             Remove database changes\n    analyze            Analyze database structure\n    rename             Rename database changes\n    admin-users        Manage admin users\n\n  Testing:\n    test-packages      Run integration tests on all workspace packages\n\n  Migration Tools:\n    migrate            Migration management subcommands\n      init             Initialize migration tracking\n      status           Show migration status\n      list             List all changes\n      deps             Show change dependencies\n  \n  Development Tools:\n    docker             Manage Docker containers (start/stop/ls, --minio)\n    env                Manage environment variables (--supabase, --minio)\n    test-packages      Run integration tests on workspace packages\n  \n  Global Options:\n    -h, --help         Display this help information\n    -v, --version      Display version information\n    --cwd <directory>  Working directory (default: current directory)\n\n  Individual Command Help:\n    pgpm <command> --help    Display detailed help for specific command\n    pgpm <command> -h        Display detailed help for specific command\n\n  Examples:\n    pgpm deploy --help       Show deploy command options\n    pgpm init workspace      Initialize new workspace\n    pgpm install @pgpm/base32  Install a database module\n  ";

package/utils/display.js

@@ -42,8 +42,8 @@ exports.usageText = `
       deps             Show change dependencies
   
   Development Tools:
-    docker             Manage Docker containers (start/stop/ls, --include for additional services)
-    env                Manage PostgreSQL environment variables
+    docker             Manage Docker containers (start/stop/ls, --minio)
+    env                Manage environment variables (--supabase, --minio)
     test-packages      Run integration tests on workspace packages
   
   Global Options: