pgpm 5.29.5 → 5.30.0

package/commands/docker.js

@@ -26,6 +26,7 @@ PostgreSQL Options:
 
 Additional Services:
   --minio            Include MinIO S3-compatible object storage (API: 9000, Console: 9001)
+  --rustfs           Include RustFS S3-compatible object storage (API: 9000, Console: 9001)
   --ollama           Include Ollama LLM inference server (API: 11434)
   --gpu              Enable NVIDIA GPU passthrough for Ollama (requires NVIDIA Container Toolkit)
 
@@ -36,6 +37,7 @@ General Options:
 Examples:
   pgpm docker start                           Start PostgreSQL only
   pgpm docker start --minio                   Start PostgreSQL + MinIO
+  pgpm docker start --rustfs                  Start PostgreSQL + RustFS
   pgpm docker start --ollama                  Start PostgreSQL + Ollama (CPU)
   pgpm docker start --ollama --gpu            Start PostgreSQL + Ollama (NVIDIA GPU)
   pgpm docker start --port 5433               Start on custom port
@@ -44,6 +46,7 @@ Examples:
   pgpm docker start --recreate --minio        Recreate PostgreSQL + MinIO
   pgpm docker stop                            Stop PostgreSQL
   pgpm docker stop --minio                    Stop PostgreSQL + MinIO
+  pgpm docker stop --rustfs                   Stop PostgreSQL + RustFS
   pgpm docker stop --ollama                   Stop PostgreSQL + Ollama
   pgpm docker ls                              List services and status
 `;
@@ -62,6 +65,23 @@ const ADDITIONAL_SERVICES = {
         command: ['server', '/data', '--console-address', ':9001'],
         volumes: [{ name: 'minio-data', containerPath: '/data' }]
     },
+    rustfs: {
+        name: 'rustfs',
+        image: 'rustfs/rustfs',
+        ports: [
+            { host: 9000, container: 9000 },
+            { host: 9001, container: 9001 }
+        ],
+        env: {
+            RUSTFS_ACCESS_KEY: 'minioadmin',
+            RUSTFS_SECRET_KEY: 'minioadmin',
+            RUSTFS_ADDRESS: ':9000',
+            RUSTFS_CONSOLE_ADDRESS: ':9001',
+            RUSTFS_CONSOLE_ENABLE: 'true'
+        },
+        command: ['/data'],
+        volumes: [{ name: 'rustfs-data', containerPath: '/data' }]
+    },
     ollama: {
         name: 'ollama',
         image: 'ollama/ollama',
@@ -283,6 +303,19 @@ function resolveServiceFlags(args) {
     }
     return services;
 }
+function findPortConflict(services) {
+    const owners = new Map();
+    for (const service of services) {
+        for (const { host } of service.ports) {
+            const owner = owners.get(host);
+            if (owner) {
+                return `Services "${owner}" and "${service.name}" both bind host port ${host}. Start only one of them.`;
+            }
+            owners.set(host, service.name);
+        }
+    }
+    return null;
+}
 async function listServices() {
     const dockerStatus = await (0, doctor_1.getDockerStatus)();
     const dockerAvailable = dockerStatus.binary && dockerStatus.daemon;
@@ -333,12 +366,18 @@ exports.default = async (argv, _prompter, _options) => {
     const gpu = args.gpu === true;
     const includedServices = resolveServiceFlags(args);
     switch (subcommand) {
-        case 'start':
+        case 'start': {
+            const conflict = findPortConflict(includedServices);
+            if (conflict) {
+                await (0, inquirerer_1.cliExitWithError)(conflict);
+                return;
+            }
             await startContainer({ name, image, port, user, password, shmSize, recreate });
             for (const service of includedServices) {
                 await startService(service, recreate, gpu);
             }
             break;
+        }
         case 'stop':
             await stopContainer(name);
             for (const service of includedServices) {

package/commands/env.js

@@ -15,6 +15,7 @@ Database Profiles:
 
 Additional Services:
   --minio            Include MinIO/S3 environment variables
+  --rustfs           Include RustFS/S3 environment variables (same vars as --minio)
 
 Modes:
   No command         Print export statements for shell evaluation
@@ -24,11 +25,13 @@ 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
+  --rustfs           Alias for --minio (RustFS serves the same S3 API on :9000)
 
 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 --rustfs                           Print Postgres + RustFS env exports
   pgpm env --supabase --minio                 Print Supabase + MinIO env exports
   eval "$(pgpm env)"                          Load default Postgres env into shell
   eval "$(pgpm env --minio)"                  Load Postgres + MinIO env into shell
@@ -46,13 +49,13 @@ const SUPABASE_PROFILE = {
 const DEFAULT_PROFILE = {
     ...pg_env_1.defaultPgConfig
 };
-const MINIO_PROFILE = {
+const OBJECT_STORE_PROFILE = {
     endpoint: 'http://localhost:9000',
     accessKey: 'minioadmin',
     secretKey: 'minioadmin',
     region: 'us-east-1',
 };
-function configToEnvVars(config, minio) {
+function configToEnvVars(config, objectStore) {
     const vars = {
         PGHOST: config.host,
         PGPORT: String(config.port),
@@ -60,23 +63,23 @@ function configToEnvVars(config, minio) {
         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;
+    if (objectStore) {
+        vars.CDN_ENDPOINT = objectStore.endpoint;
+        vars.AWS_ACCESS_KEY = objectStore.accessKey;
+        vars.AWS_SECRET_KEY = objectStore.secretKey;
+        vars.AWS_REGION = objectStore.region;
     }
     return vars;
 }
-function printExports(config, minio) {
-    const envVars = configToEnvVars(config, minio);
+function printExports(config, objectStore) {
+    const envVars = configToEnvVars(config, objectStore);
     for (const [key, value] of Object.entries(envVars)) {
         console.log(`export ${key}=${value}`);
     }
 }
-function executeCommand(config, command, args, minio) {
+function executeCommand(config, command, args, objectStore) {
     return new Promise((resolve, reject) => {
-        const envVars = configToEnvVars(config, minio);
+        const envVars = configToEnvVars(config, objectStore);
         const env = {
             ...process.env,
             ...envVars
@@ -100,10 +103,11 @@ 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 useObjectStore = argv.minio === true || typeof argv.minio === 'string' ||
+        argv.rustfs === true || typeof argv.rustfs === 'string';
     const profile = useSupabase ? SUPABASE_PROFILE : DEFAULT_PROFILE;
-    const minioProfile = useMinio ? MINIO_PROFILE : undefined;
-    const knownFlags = ['--supabase', '--minio'];
+    const objectStoreProfile = useObjectStore ? OBJECT_STORE_PROFILE : undefined;
+    const knownFlags = ['--supabase', '--minio', '--rustfs'];
     const rawArgs = process.argv.slice(2);
     let envIndex = rawArgs.findIndex(arg => arg === 'env');
     if (envIndex === -1) {
@@ -117,12 +121,12 @@ exports.default = async (argv, _prompter) => {
         commandArgs.splice(cwdIndex, 2);
     }
     if (commandArgs.length === 0) {
-        printExports(profile, minioProfile);
+        printExports(profile, objectStoreProfile);
         return;
     }
     const [command, ...args] = commandArgs;
     try {
-        const exitCode = await executeCommand(profile, command, args, minioProfile);
+        const exitCode = await executeCommand(profile, command, args, objectStoreProfile);
         process.exit(exitCode);
     }
     catch (error) {

package/commands/init/index.js

@@ -7,7 +7,6 @@ exports.createInitUsageText = void 0;
 const core_1 = require("@pgpmjs/core");
 const env_1 = require("@pgpmjs/env");
 const types_1 = require("@pgpmjs/types");
-const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const inquirerer_1 = require("inquirerer");
 const path_1 = __importDefault(require("path"));
@@ -273,9 +272,8 @@ function installSkillsViaNpx(skills, cwd) {
             ? entry.source
             : `https://github.com/${entry.source}`;
         for (const skill of entry.skills) {
-            const cmd = `npx --yes skills add ${source} --skill ${skill} --yes`;
             try {
-                (0, child_process_1.execSync)(cmd, {
+                (0, core_1.spawnSyncChecked)('npx', ['--yes', 'skills', 'add', source, '--skill', skill, '--yes'], {
                     cwd,
                     stdio: ['pipe', 'inherit', 'inherit'],
                     timeout: 120_000,

package/esm/commands/docker.js

@@ -24,6 +24,7 @@ PostgreSQL Options:
 
 Additional Services:
   --minio            Include MinIO S3-compatible object storage (API: 9000, Console: 9001)
+  --rustfs           Include RustFS S3-compatible object storage (API: 9000, Console: 9001)
   --ollama           Include Ollama LLM inference server (API: 11434)
   --gpu              Enable NVIDIA GPU passthrough for Ollama (requires NVIDIA Container Toolkit)
 
@@ -34,6 +35,7 @@ General Options:
 Examples:
   pgpm docker start                           Start PostgreSQL only
   pgpm docker start --minio                   Start PostgreSQL + MinIO
+  pgpm docker start --rustfs                  Start PostgreSQL + RustFS
   pgpm docker start --ollama                  Start PostgreSQL + Ollama (CPU)
   pgpm docker start --ollama --gpu            Start PostgreSQL + Ollama (NVIDIA GPU)
   pgpm docker start --port 5433               Start on custom port
@@ -42,6 +44,7 @@ Examples:
   pgpm docker start --recreate --minio        Recreate PostgreSQL + MinIO
   pgpm docker stop                            Stop PostgreSQL
   pgpm docker stop --minio                    Stop PostgreSQL + MinIO
+  pgpm docker stop --rustfs                   Stop PostgreSQL + RustFS
   pgpm docker stop --ollama                   Stop PostgreSQL + Ollama
   pgpm docker ls                              List services and status
 `;
@@ -60,6 +63,23 @@ const ADDITIONAL_SERVICES = {
         command: ['server', '/data', '--console-address', ':9001'],
         volumes: [{ name: 'minio-data', containerPath: '/data' }]
     },
+    rustfs: {
+        name: 'rustfs',
+        image: 'rustfs/rustfs',
+        ports: [
+            { host: 9000, container: 9000 },
+            { host: 9001, container: 9001 }
+        ],
+        env: {
+            RUSTFS_ACCESS_KEY: 'minioadmin',
+            RUSTFS_SECRET_KEY: 'minioadmin',
+            RUSTFS_ADDRESS: ':9000',
+            RUSTFS_CONSOLE_ADDRESS: ':9001',
+            RUSTFS_CONSOLE_ENABLE: 'true'
+        },
+        command: ['/data'],
+        volumes: [{ name: 'rustfs-data', containerPath: '/data' }]
+    },
     ollama: {
         name: 'ollama',
         image: 'ollama/ollama',
@@ -281,6 +301,19 @@ function resolveServiceFlags(args) {
     }
     return services;
 }
+function findPortConflict(services) {
+    const owners = new Map();
+    for (const service of services) {
+        for (const { host } of service.ports) {
+            const owner = owners.get(host);
+            if (owner) {
+                return `Services "${owner}" and "${service.name}" both bind host port ${host}. Start only one of them.`;
+            }
+            owners.set(host, service.name);
+        }
+    }
+    return null;
+}
 async function listServices() {
     const dockerStatus = await getDockerStatus();
     const dockerAvailable = dockerStatus.binary && dockerStatus.daemon;
@@ -331,12 +364,18 @@ export default async (argv, _prompter, _options) => {
     const gpu = args.gpu === true;
     const includedServices = resolveServiceFlags(args);
     switch (subcommand) {
-        case 'start':
+        case 'start': {
+            const conflict = findPortConflict(includedServices);
+            if (conflict) {
+                await cliExitWithError(conflict);
+                return;
+            }
             await startContainer({ name, image, port, user, password, shmSize, recreate });
             for (const service of includedServices) {
                 await startService(service, recreate, gpu);
             }
             break;
+        }
         case 'stop':
             await stopContainer(name);
             for (const service of includedServices) {

package/esm/commands/env.js

@@ -13,6 +13,7 @@ Database Profiles:
 
 Additional Services:
   --minio            Include MinIO/S3 environment variables
+  --rustfs           Include RustFS/S3 environment variables (same vars as --minio)
 
 Modes:
   No command         Print export statements for shell evaluation
@@ -22,11 +23,13 @@ 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
+  --rustfs           Alias for --minio (RustFS serves the same S3 API on :9000)
 
 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 --rustfs                           Print Postgres + RustFS env exports
   pgpm env --supabase --minio                 Print Supabase + MinIO env exports
   eval "$(pgpm env)"                          Load default Postgres env into shell
   eval "$(pgpm env --minio)"                  Load Postgres + MinIO env into shell
@@ -44,13 +47,13 @@ const SUPABASE_PROFILE = {
 const DEFAULT_PROFILE = {
     ...defaultPgConfig
 };
-const MINIO_PROFILE = {
+const OBJECT_STORE_PROFILE = {
     endpoint: 'http://localhost:9000',
     accessKey: 'minioadmin',
     secretKey: 'minioadmin',
     region: 'us-east-1',
 };
-function configToEnvVars(config, minio) {
+function configToEnvVars(config, objectStore) {
     const vars = {
         PGHOST: config.host,
         PGPORT: String(config.port),
@@ -58,23 +61,23 @@ function configToEnvVars(config, minio) {
         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;
+    if (objectStore) {
+        vars.CDN_ENDPOINT = objectStore.endpoint;
+        vars.AWS_ACCESS_KEY = objectStore.accessKey;
+        vars.AWS_SECRET_KEY = objectStore.secretKey;
+        vars.AWS_REGION = objectStore.region;
     }
     return vars;
 }
-function printExports(config, minio) {
-    const envVars = configToEnvVars(config, minio);
+function printExports(config, objectStore) {
+    const envVars = configToEnvVars(config, objectStore);
     for (const [key, value] of Object.entries(envVars)) {
         console.log(`export ${key}=${value}`);
     }
 }
-function executeCommand(config, command, args, minio) {
+function executeCommand(config, command, args, objectStore) {
     return new Promise((resolve, reject) => {
-        const envVars = configToEnvVars(config, minio);
+        const envVars = configToEnvVars(config, objectStore);
         const env = {
             ...process.env,
             ...envVars
@@ -98,10 +101,11 @@ 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 useObjectStore = argv.minio === true || typeof argv.minio === 'string' ||
+        argv.rustfs === true || typeof argv.rustfs === 'string';
     const profile = useSupabase ? SUPABASE_PROFILE : DEFAULT_PROFILE;
-    const minioProfile = useMinio ? MINIO_PROFILE : undefined;
-    const knownFlags = ['--supabase', '--minio'];
+    const objectStoreProfile = useObjectStore ? OBJECT_STORE_PROFILE : undefined;
+    const knownFlags = ['--supabase', '--minio', '--rustfs'];
     const rawArgs = process.argv.slice(2);
     let envIndex = rawArgs.findIndex(arg => arg === 'env');
     if (envIndex === -1) {
@@ -115,12 +119,12 @@ export default async (argv, _prompter) => {
         commandArgs.splice(cwdIndex, 2);
     }
     if (commandArgs.length === 0) {
-        printExports(profile, minioProfile);
+        printExports(profile, objectStoreProfile);
         return;
     }
     const [command, ...args] = commandArgs;
     try {
-        const exitCode = await executeCommand(profile, command, args, minioProfile);
+        const exitCode = await executeCommand(profile, command, args, objectStoreProfile);
         process.exit(exitCode);
     }
     catch (error) {

package/esm/commands/init/index.js

@@ -1,7 +1,6 @@
-import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, inspectTemplate, PgpmPackage, resolveBoilerplateBaseDir, scaffoldTemplate, scanBoilerplates, SkillInstaller, sluggify, } from '@pgpmjs/core';
+import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, inspectTemplate, PgpmPackage, resolveBoilerplateBaseDir, scaffoldTemplate, scanBoilerplates, SkillInstaller, sluggify, spawnSyncChecked, } from '@pgpmjs/core';
 import { resolveWorkspaceByType } from '@pgpmjs/env';
 import { errors } from '@pgpmjs/types';
-import { execSync } from 'child_process';
 import fs from 'fs';
 import { registerDefaultResolver } from 'inquirerer';
 import path from 'path';
@@ -266,9 +265,8 @@ function installSkillsViaNpx(skills, cwd) {
             ? entry.source
             : `https://github.com/${entry.source}`;
         for (const skill of entry.skills) {
-            const cmd = `npx --yes skills add ${source} --skill ${skill} --yes`;
             try {
-                execSync(cmd, {
+                spawnSyncChecked('npx', ['--yes', 'skills', 'add', source, '--skill', skill, '--yes'], {
                     cwd,
                     stdio: ['pipe', 'inherit', 'inherit'],
                     timeout: 120_000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "5.29.5",
+  "version": "5.30.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -33,36 +33,38 @@
     "test:watch": "jest --watch"
   },
   "devDependencies": {
-    "@inquirerer/test": "^1.4.5",
+    "@inquirerer/test": "^1.4.6",
+    "@types/cross-spawn": "^6.0.6",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.19.11",
     "@types/pg": "^8.20.4",
     "@types/semver": "^7.8.0",
     "@types/shelljs": "^0.10.0",
     "glob": "^13.0.6",
-    "makage": "^0.3.0",
+    "makage": "^0.8.0",
     "pg": "^8.21.0",
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@inquirerer/utils": "^3.3.12",
-    "@pgpmjs/core": "^7.27.1",
-    "@pgpmjs/diff": "^0.5.1",
-    "@pgpmjs/env": "^2.43.1",
-    "@pgpmjs/export": "^1.20.5",
-    "@pgpmjs/import": "^0.5.1",
-    "@pgpmjs/logger": "^2.25.0",
-    "@pgpmjs/slice": "^0.16.1",
-    "@pgpmjs/transform": "^0.25.1",
-    "@pgpmjs/types": "^2.52.1",
+    "@inquirerer/utils": "^3.3.13",
+    "@pgpmjs/core": "^7.27.3",
+    "@pgpmjs/diff": "^0.5.2",
+    "@pgpmjs/env": "^2.43.2",
+    "@pgpmjs/export": "^1.20.7",
+    "@pgpmjs/import": "^0.5.2",
+    "@pgpmjs/logger": "^2.25.1",
+    "@pgpmjs/slice": "^0.16.2",
+    "@pgpmjs/transform": "^0.25.2",
+    "@pgpmjs/types": "^2.53.0",
     "@pgsql/quotes": "^18.2.4",
     "appstash": "^0.8.0",
+    "cross-spawn": "^7.0.6",
     "find-and-require-package-json": "^0.9.1",
-    "genomic": "^5.6.5",
-    "inquirerer": "^4.9.3",
+    "genomic": "^5.6.6",
+    "inquirerer": "^4.9.4",
     "js-yaml": "^4.1.0",
-    "pg-cache": "^3.27.1",
-    "pg-env": "^1.31.0",
+    "pg-cache": "^3.27.2",
+    "pg-env": "^1.31.1",
     "pgsql-deparser": "^18.3.6",
     "semver": "^7.8.5",
     "shelljs": "^0.10.0",
@@ -80,5 +82,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "9a919ff3f7ec90eab2d510bb6682ce5209e53198"
+  "gitHead": "5e0bfead2856d1a062b495d343a43e543343f9b8"
 }