pgpm 4.11.1 → 4.12.0

package/commands/docker.js

@@ -7,29 +7,55 @@ Docker Command:
 
   pgpm docker <subcommand> [OPTIONS]
 
-  Manage PostgreSQL Docker containers for local development.
+  Manage Docker containers for local development.
+  PostgreSQL is always started by default. Additional services can be
+  included with the --include flag.
 
 Subcommands:
-  start              Start PostgreSQL container
-  stop               Stop PostgreSQL container
+  start              Start containers
+  stop               Stop containers
+  ls                 List available services and their status
 
-Options:
-  --help, -h         Show this help message
+PostgreSQL Options:
   --name <name>      Container name (default: postgres)
   --image <image>    Docker image (default: constructiveio/postgres-plus:18)
   --port <port>      Host port mapping (default: 5432)
   --user <user>      PostgreSQL user (default: postgres)
   --password <pass>  PostgreSQL password (default: password)
   --shm-size <size>  Shared memory size for container (default: 2g)
-  --recreate         Remove and recreate container on start
+
+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 default PostgreSQL container
+  pgpm docker start                           Start PostgreSQL only
+  pgpm docker start --include 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 container
-  pgpm docker stop                            Stop PostgreSQL container
+  pgpm docker start --recreate                Remove and recreate containers
+  pgpm docker start --recreate --include minio Recreate PostgreSQL + MinIO
+  pgpm docker stop                            Stop PostgreSQL
+  pgpm docker stop --include minio            Stop PostgreSQL + MinIO
+  pgpm docker ls                              List services and status
 `;
+const ADDITIONAL_SERVICES = {
+    minio: {
+        name: 'minio',
+        image: 'minio/minio',
+        ports: [{ host: 9000, container: 9000 }],
+        env: {
+            MINIO_ACCESS_KEY: 'minioadmin',
+            MINIO_SECRET_KEY: 'minioadmin',
+        },
+        command: ['server', '/data'],
+        volumes: [{ name: 'minio-data', containerPath: '/data' }],
+    },
+};
 function run(command, args, options = {}) {
     return new Promise((resolve, reject) => {
         const stdio = options.stdio || 'pipe';
@@ -165,6 +191,118 @@ async function stopContainer(name) {
         await (0, inquirerer_1.cliExitWithError)(`Failed to stop container "${name}"`);
     }
 }
+async function startService(service, recreate) {
+    const { name, image, ports, env: serviceEnv, command } = service;
+    const exists = await containerExists(name);
+    const running = await isContainerRunning(name);
+    if (running === true) {
+        console.log(`✅ Container "${name}" is already running`);
+        return;
+    }
+    if (recreate && exists) {
+        console.log(`🗑️  Removing existing container "${name}"...`);
+        const removeResult = await run('docker', ['rm', '-f', name], { stdio: 'inherit' });
+        if (removeResult.code !== 0) {
+            await (0, inquirerer_1.cliExitWithError)(`Failed to remove container "${name}"`);
+            return;
+        }
+    }
+    if (exists && running === false) {
+        console.log(`🔄 Starting existing container "${name}"...`);
+        const startResult = await run('docker', ['start', name], { stdio: 'inherit' });
+        if (startResult.code === 0) {
+            console.log(`✅ Container "${name}" started successfully`);
+        }
+        else {
+            await (0, inquirerer_1.cliExitWithError)(`Failed to start container "${name}"`);
+        }
+        return;
+    }
+    console.log(`🚀 Creating and starting new container "${name}"...`);
+    const runArgs = [
+        'run',
+        '-d',
+        '--name', name,
+    ];
+    for (const [key, value] of Object.entries(serviceEnv)) {
+        runArgs.push('-e', `${key}=${value}`);
+    }
+    for (const portMapping of ports) {
+        runArgs.push('-p', `${portMapping.host}:${portMapping.container}`);
+    }
+    if (service.volumes) {
+        for (const vol of service.volumes) {
+            runArgs.push('-v', `${vol.name}:${vol.containerPath}`);
+        }
+    }
+    runArgs.push(image);
+    if (command) {
+        runArgs.push(...command);
+    }
+    const runResult = await run('docker', runArgs, { stdio: 'inherit' });
+    if (runResult.code === 0) {
+        console.log(`✅ Container "${name}" created and started successfully`);
+        const portInfo = ports.map(p => `localhost:${p.host}`).join(', ');
+        console.log(`📌 ${name} is available at ${portInfo}`);
+    }
+    else {
+        const portInfo = ports.map(p => String(p.host)).join(', ');
+        await (0, inquirerer_1.cliExitWithError)(`Failed to create container "${name}". Check if port ${portInfo} is already in use.`);
+    }
+}
+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) {
+    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 {
+            services.push(service);
+        }
+    }
+    return services;
+}
+async function listServices() {
+    const dockerAvailable = await checkDockerAvailable();
+    console.log('\nAvailable services:\n');
+    console.log('  Primary:');
+    if (dockerAvailable) {
+        const pgRunning = await isContainerRunning('postgres');
+        const pgStatus = pgRunning === true ? '\x1b[32mrunning\x1b[0m' : pgRunning === false ? '\x1b[33mstopped\x1b[0m' : '\x1b[90mnot created\x1b[0m';
+        console.log(`    postgres    constructiveio/postgres-plus:18    ${pgStatus}`);
+    }
+    else {
+        console.log('    postgres    constructiveio/postgres-plus:18    \x1b[90m(docker not available)\x1b[0m');
+    }
+    console.log('\n  Additional (use --include <name>):');
+    for (const [key, service] of Object.entries(ADDITIONAL_SERVICES)) {
+        if (dockerAvailable) {
+            const running = await isContainerRunning(service.name);
+            const status = running === true ? '\x1b[32mrunning\x1b[0m' : running === false ? '\x1b[33mstopped\x1b[0m' : '\x1b[90mnot created\x1b[0m';
+            const portInfo = service.ports.map(p => String(p.host)).join(', ');
+            console.log(`    ${key.padEnd(12)}${service.image.padEnd(36)}${status}    port ${portInfo}`);
+        }
+        else {
+            const portInfo = service.ports.map(p => String(p.host)).join(', ');
+            console.log(`    ${key.padEnd(12)}${service.image.padEnd(36)}\x1b[90m(docker not available)\x1b[0m    port ${portInfo}`);
+        }
+    }
+    console.log('');
+}
 exports.default = async (argv, _prompter, _options) => {
     if (argv.help || argv.h) {
         console.log(dockerUsageText);
@@ -174,7 +312,7 @@ exports.default = async (argv, _prompter, _options) => {
     const args = newArgv;
     if (!subcommand) {
         console.log(dockerUsageText);
-        await (0, inquirerer_1.cliExitWithError)('No subcommand provided. Use "start" or "stop".');
+        await (0, inquirerer_1.cliExitWithError)('No subcommand provided. Use "start", "stop", or "ls".');
         return;
     }
     const name = args.name || 'postgres';
@@ -184,15 +322,26 @@ 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);
     switch (subcommand) {
         case 'start':
             await startContainer({ name, image, port, user, password, shmSize, recreate });
+            for (const service of includedServices) {
+                await startService(service, recreate);
+            }
             break;
         case 'stop':
             await stopContainer(name);
+            for (const service of includedServices) {
+                await stopService(service);
+            }
+            break;
+        case 'ls':
+            await listServices();
             break;
         default:
             console.log(dockerUsageText);
-            await (0, inquirerer_1.cliExitWithError)(`Unknown subcommand: ${subcommand}. Use "start" or "stop".`);
+            await (0, inquirerer_1.cliExitWithError)(`Unknown subcommand: ${subcommand}. Use "start", "stop", or "ls".`);
     }
 };

package/esm/commands/docker.js

@@ -5,29 +5,55 @@ Docker Command:
 
   pgpm docker <subcommand> [OPTIONS]
 
-  Manage PostgreSQL Docker containers for local development.
+  Manage Docker containers for local development.
+  PostgreSQL is always started by default. Additional services can be
+  included with the --include flag.
 
 Subcommands:
-  start              Start PostgreSQL container
-  stop               Stop PostgreSQL container
+  start              Start containers
+  stop               Stop containers
+  ls                 List available services and their status
 
-Options:
-  --help, -h         Show this help message
+PostgreSQL Options:
   --name <name>      Container name (default: postgres)
   --image <image>    Docker image (default: constructiveio/postgres-plus:18)
   --port <port>      Host port mapping (default: 5432)
   --user <user>      PostgreSQL user (default: postgres)
   --password <pass>  PostgreSQL password (default: password)
   --shm-size <size>  Shared memory size for container (default: 2g)
-  --recreate         Remove and recreate container on start
+
+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 default PostgreSQL container
+  pgpm docker start                           Start PostgreSQL only
+  pgpm docker start --include 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 container
-  pgpm docker stop                            Stop PostgreSQL container
+  pgpm docker start --recreate                Remove and recreate containers
+  pgpm docker start --recreate --include minio Recreate PostgreSQL + MinIO
+  pgpm docker stop                            Stop PostgreSQL
+  pgpm docker stop --include minio            Stop PostgreSQL + MinIO
+  pgpm docker ls                              List services and status
 `;
+const ADDITIONAL_SERVICES = {
+    minio: {
+        name: 'minio',
+        image: 'minio/minio',
+        ports: [{ host: 9000, container: 9000 }],
+        env: {
+            MINIO_ACCESS_KEY: 'minioadmin',
+            MINIO_SECRET_KEY: 'minioadmin',
+        },
+        command: ['server', '/data'],
+        volumes: [{ name: 'minio-data', containerPath: '/data' }],
+    },
+};
 function run(command, args, options = {}) {
     return new Promise((resolve, reject) => {
         const stdio = options.stdio || 'pipe';
@@ -163,6 +189,118 @@ async function stopContainer(name) {
         await cliExitWithError(`Failed to stop container "${name}"`);
     }
 }
+async function startService(service, recreate) {
+    const { name, image, ports, env: serviceEnv, command } = service;
+    const exists = await containerExists(name);
+    const running = await isContainerRunning(name);
+    if (running === true) {
+        console.log(`✅ Container "${name}" is already running`);
+        return;
+    }
+    if (recreate && exists) {
+        console.log(`🗑️  Removing existing container "${name}"...`);
+        const removeResult = await run('docker', ['rm', '-f', name], { stdio: 'inherit' });
+        if (removeResult.code !== 0) {
+            await cliExitWithError(`Failed to remove container "${name}"`);
+            return;
+        }
+    }
+    if (exists && running === false) {
+        console.log(`🔄 Starting existing container "${name}"...`);
+        const startResult = await run('docker', ['start', name], { stdio: 'inherit' });
+        if (startResult.code === 0) {
+            console.log(`✅ Container "${name}" started successfully`);
+        }
+        else {
+            await cliExitWithError(`Failed to start container "${name}"`);
+        }
+        return;
+    }
+    console.log(`🚀 Creating and starting new container "${name}"...`);
+    const runArgs = [
+        'run',
+        '-d',
+        '--name', name,
+    ];
+    for (const [key, value] of Object.entries(serviceEnv)) {
+        runArgs.push('-e', `${key}=${value}`);
+    }
+    for (const portMapping of ports) {
+        runArgs.push('-p', `${portMapping.host}:${portMapping.container}`);
+    }
+    if (service.volumes) {
+        for (const vol of service.volumes) {
+            runArgs.push('-v', `${vol.name}:${vol.containerPath}`);
+        }
+    }
+    runArgs.push(image);
+    if (command) {
+        runArgs.push(...command);
+    }
+    const runResult = await run('docker', runArgs, { stdio: 'inherit' });
+    if (runResult.code === 0) {
+        console.log(`✅ Container "${name}" created and started successfully`);
+        const portInfo = ports.map(p => `localhost:${p.host}`).join(', ');
+        console.log(`📌 ${name} is available at ${portInfo}`);
+    }
+    else {
+        const portInfo = ports.map(p => String(p.host)).join(', ');
+        await cliExitWithError(`Failed to create container "${name}". Check if port ${portInfo} is already in use.`);
+    }
+}
+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) {
+    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 {
+            services.push(service);
+        }
+    }
+    return services;
+}
+async function listServices() {
+    const dockerAvailable = await checkDockerAvailable();
+    console.log('\nAvailable services:\n');
+    console.log('  Primary:');
+    if (dockerAvailable) {
+        const pgRunning = await isContainerRunning('postgres');
+        const pgStatus = pgRunning === true ? '\x1b[32mrunning\x1b[0m' : pgRunning === false ? '\x1b[33mstopped\x1b[0m' : '\x1b[90mnot created\x1b[0m';
+        console.log(`    postgres    constructiveio/postgres-plus:18    ${pgStatus}`);
+    }
+    else {
+        console.log('    postgres    constructiveio/postgres-plus:18    \x1b[90m(docker not available)\x1b[0m');
+    }
+    console.log('\n  Additional (use --include <name>):');
+    for (const [key, service] of Object.entries(ADDITIONAL_SERVICES)) {
+        if (dockerAvailable) {
+            const running = await isContainerRunning(service.name);
+            const status = running === true ? '\x1b[32mrunning\x1b[0m' : running === false ? '\x1b[33mstopped\x1b[0m' : '\x1b[90mnot created\x1b[0m';
+            const portInfo = service.ports.map(p => String(p.host)).join(', ');
+            console.log(`    ${key.padEnd(12)}${service.image.padEnd(36)}${status}    port ${portInfo}`);
+        }
+        else {
+            const portInfo = service.ports.map(p => String(p.host)).join(', ');
+            console.log(`    ${key.padEnd(12)}${service.image.padEnd(36)}\x1b[90m(docker not available)\x1b[0m    port ${portInfo}`);
+        }
+    }
+    console.log('');
+}
 export default async (argv, _prompter, _options) => {
     if (argv.help || argv.h) {
         console.log(dockerUsageText);
@@ -172,7 +310,7 @@ export default async (argv, _prompter, _options) => {
     const args = newArgv;
     if (!subcommand) {
         console.log(dockerUsageText);
-        await cliExitWithError('No subcommand provided. Use "start" or "stop".');
+        await cliExitWithError('No subcommand provided. Use "start", "stop", or "ls".');
         return;
     }
     const name = args.name || 'postgres';
@@ -182,15 +320,26 @@ 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);
     switch (subcommand) {
         case 'start':
             await startContainer({ name, image, port, user, password, shmSize, recreate });
+            for (const service of includedServices) {
+                await startService(service, recreate);
+            }
             break;
         case 'stop':
             await stopContainer(name);
+            for (const service of includedServices) {
+                await stopService(service);
+            }
+            break;
+        case 'ls':
+            await listServices();
             break;
         default:
             console.log(dockerUsageText);
-            await cliExitWithError(`Unknown subcommand: ${subcommand}. Use "start" or "stop".`);
+            await cliExitWithError(`Unknown subcommand: ${subcommand}. Use "start", "stop", or "ls".`);
     }
 };

package/esm/utils/display.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "4.11.1",
+  "version": "4.12.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": "79cd3e66871804a22c672c7ca2fa5e2105d4b368"
+  "gitHead": "2bedc6e29e8d2bfd1edd97d151696deb6b278a7a"
 }

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 PostgreSQL Docker containers (start/stop)\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, --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  ";

package/utils/display.js

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