pgpm 2.4.1 → 2.5.1

package/commands/add.js

@@ -33,9 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const core_1 = require("@pgpmjs/core");
 const path = __importStar(require("path"));
-const argv_1 = require("../utils/argv");
 const addUsageText = `
 Add Command:
 
@@ -65,7 +65,7 @@ exports.default = async (argv, prompter, _options) => {
         process.exit(0);
     }
     const cwd = argv.cwd || process.cwd();
-    const { first: change, newArgv } = (0, argv_1.extractFirst)(argv);
+    const { first: change, newArgv } = (0, utils_1.extractFirst)(argv);
     let finalChange = change;
     if (!change) {
         const answers = await prompter.prompt(newArgv, [{

package/commands/admin-users.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../utils");
+const utils_1 = require("@inquirerer/utils");
 const add_1 = __importDefault(require("./admin-users/add"));
 const bootstrap_1 = __importDefault(require("./admin-users/bootstrap"));
 const remove_1 = __importDefault(require("./admin-users/remove"));

package/commands/cache.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const create_gen_app_1 = require("create-gen-app");
-const cli_error_1 = require("../utils/cli-error");
+const utils_1 = require("@inquirerer/utils");
+const genomic_1 = require("genomic");
 const cacheUsageText = `
 Cache Command:
 
@@ -19,10 +19,10 @@ exports.default = async (argv, _prompter, _options) => {
     const action = argv._?.[0] || 'clean';
     if (action !== 'clean') {
         console.log(cacheUsageText);
-        await (0, cli_error_1.cliExitWithError)(`Unknown cache action: ${action}`);
+        await (0, utils_1.cliExitWithError)(`Unknown cache action: ${action}`);
     }
     const toolName = argv.tool || 'pgpm';
-    const cacheManager = new create_gen_app_1.CacheManager({ toolName });
+    const cacheManager = new genomic_1.CacheManager({ toolName });
     cacheManager.clearAll();
     process.stdout.write(`Cleared template cache for "${toolName}".\n`);
     return argv;

package/commands/docker.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
-const utils_1 = require("../utils");
+const utils_1 = require("@inquirerer/utils");
 const dockerUsageText = `
 Docker Command:
 

package/commands/init/index.js

@@ -245,14 +245,15 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
         // Offer to create a workspace instead
         const recoveryQuestion = [
             {
-                name: 'createWorkspace',
+                name: 'workspace',
+                alias: 'w',
                 message: 'You are not inside a PGPM workspace. Would you like to create a new workspace instead?',
                 type: 'confirm',
                 required: true,
             },
         ];
-        const { createWorkspace } = await prompter.prompt(argv, recoveryQuestion);
-        if (createWorkspace) {
+        const { workspace } = await prompter.prompt(argv, recoveryQuestion);
+        if (workspace) {
             return handleWorkspaceInit(argv, prompter, {
                 fromPath: 'workspace',
                 templateRepo: ctx.templateRepo,

package/commands/migrate.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../utils");
+const utils_1 = require("@inquirerer/utils");
 const deps_1 = __importDefault(require("./migrate/deps"));
 // Migrate subcommands
 const init_1 = __importDefault(require("./migrate/init"));

package/commands/remove.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const core_1 = require("@pgpmjs/core");
 const env_1 = require("@pgpmjs/env");
 const logger_1 = require("@pgpmjs/logger");
 const pg_env_1 = require("pg-env");
-const utils_1 = require("../utils");
-const cli_error_1 = require("../utils/cli-error");
+const utils_2 = require("../utils");
 const log = new logger_1.Logger('remove');
 exports.default = async (argv, prompter, _options) => {
     if (!argv.to) {
-        await (0, cli_error_1.cliExitWithError)('No change specified. Usage: pgpm remove --to <change>');
+        await (0, utils_1.cliExitWithError)('No change specified. Usage: pgpm remove --to <change>');
     }
-    const database = await (0, utils_1.getTargetDatabase)(argv, prompter, {
+    const database = await (0, utils_2.getTargetDatabase)(argv, prompter, {
         message: 'Select database'
     });
     const questions = [

package/commands/rename.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const core_1 = require("@pgpmjs/core");
 const path_1 = __importDefault(require("path"));
-const cli_error_1 = require("../utils/cli-error");
 exports.default = async (argv, _prompter) => {
     const cwd = argv.cwd || process.cwd();
     const to = argv.to || (argv._ && argv._[0]);
     if (!to) {
-        await (0, cli_error_1.cliExitWithError)('Missing new name. Use --to <name> or provide as positional argument.');
+        await (0, utils_1.cliExitWithError)('Missing new name. Use --to <name> or provide as positional argument.');
     }
     const dryRun = !!argv['dry-run'] || !!argv.dryRun;
     const syncPkg = !!argv['sync-pkg-name'] || !!argv.syncPkgName;

package/commands/revert.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const core_1 = require("@pgpmjs/core");
 const env_1 = require("@pgpmjs/env");
 const logger_1 = require("@pgpmjs/logger");
 const pg_env_1 = require("pg-env");
-const utils_1 = require("../utils");
-const cli_error_1 = require("../utils/cli-error");
+const utils_2 = require("../utils");
 const deployed_changes_1 = require("../utils/deployed-changes");
 const log = new logger_1.Logger('revert');
 const revertUsageText = `
@@ -35,7 +35,7 @@ exports.default = async (argv, prompter, _options) => {
         console.log(revertUsageText);
         process.exit(0);
     }
-    const database = await (0, utils_1.getTargetDatabase)(argv, prompter, {
+    const database = await (0, utils_2.getTargetDatabase)(argv, prompter, {
         message: 'Select database'
     });
     const questions = [
@@ -72,7 +72,7 @@ exports.default = async (argv, prompter, _options) => {
     if (recursive && argv.to !== true) {
         packageName = await (0, deployed_changes_1.selectDeployedPackage)(database, argv, prompter, log, 'revert', cwd);
         if (!packageName) {
-            await (0, cli_error_1.cliExitWithError)('No package found to revert');
+            await (0, utils_1.cliExitWithError)('No package found to revert');
         }
     }
     const pkg = new core_1.PgpmPackage(cwd);
@@ -86,7 +86,7 @@ exports.default = async (argv, prompter, _options) => {
     if (argv.to === true) {
         target = await (0, deployed_changes_1.selectDeployedChange)(database, argv, prompter, log, 'revert', cwd);
         if (!target) {
-            await (0, cli_error_1.cliExitWithError)('No target selected, operation cancelled');
+            await (0, utils_1.cliExitWithError)('No target selected, operation cancelled');
         }
     }
     else if (packageName && argv.to) {
@@ -96,11 +96,11 @@ exports.default = async (argv, prompter, _options) => {
         target = packageName;
     }
     else if (argv.package && argv.to) {
-        const resolvedPackage = (0, utils_1.resolvePackageAlias)(argv.package, cwd);
+        const resolvedPackage = (0, utils_2.resolvePackageAlias)(argv.package, cwd);
         target = `${resolvedPackage}:${argv.to}`;
     }
     else if (argv.package) {
-        target = (0, utils_1.resolvePackageAlias)(argv.package, cwd);
+        target = (0, utils_2.resolvePackageAlias)(argv.package, cwd);
     }
     await pkg.revert(opts, target, recursive);
     log.success('Revert complete.');

package/commands/tag.js

@@ -33,11 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const core_1 = require("@pgpmjs/core");
 const logger_1 = require("@pgpmjs/logger");
 const types_1 = require("@pgpmjs/types");
 const path = __importStar(require("path"));
-const argv_1 = require("../utils/argv");
 const module_utils_1 = require("../utils/module-utils");
 const package_alias_1 = require("../utils/package-alias");
 const log = new logger_1.Logger('tag');
@@ -69,7 +69,7 @@ exports.default = async (argv, prompter, _options) => {
         console.log(tagUsageText);
         process.exit(0);
     }
-    const { first: tagName, newArgv } = (0, argv_1.extractFirst)(argv);
+    const { first: tagName, newArgv } = (0, utils_1.extractFirst)(argv);
     const cwdResult = await prompter.prompt(newArgv, [
         {
             type: 'text',

package/commands/update.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const find_and_require_package_json_1 = require("find-and-require-package-json");
 const logger_1 = require("@pgpmjs/logger");
 const child_process_1 = require("child_process");
 const npm_version_1 = require("../utils/npm-version");
-const cli_error_1 = require("../utils/cli-error");
 const log = new logger_1.Logger('update');
 const updateUsageText = `
 Update Command:
@@ -63,7 +63,7 @@ exports.default = async (argv, _prompter, _options) => {
         }
     }
     catch (error) {
-        await (0, cli_error_1.cliExitWithError)(error instanceof Error ? error.message : String(error), { package: pkgName, registry });
+        await (0, utils_1.cliExitWithError)(error instanceof Error ? error.message : String(error), { context: { package: pkgName, registry } });
     }
     return argv;
 };

package/commands/verify.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@inquirerer/utils");
 const core_1 = require("@pgpmjs/core");
 const env_1 = require("@pgpmjs/env");
 const logger_1 = require("@pgpmjs/logger");
 const pg_env_1 = require("pg-env");
-const utils_1 = require("../utils");
-const cli_error_1 = require("../utils/cli-error");
+const utils_2 = require("../utils");
 const deployed_changes_1 = require("../utils/deployed-changes");
 const log = new logger_1.Logger('verify');
 const verifyUsageText = `
@@ -34,7 +34,7 @@ exports.default = async (argv, prompter, _options) => {
         console.log(verifyUsageText);
         process.exit(0);
     }
-    const database = await (0, utils_1.getTargetDatabase)(argv, prompter, {
+    const database = await (0, utils_2.getTargetDatabase)(argv, prompter, {
         message: 'Select database'
     });
     const questions = [
@@ -53,7 +53,7 @@ exports.default = async (argv, prompter, _options) => {
     if (recursive && argv.to !== true) {
         packageName = await (0, deployed_changes_1.selectDeployedPackage)(database, argv, prompter, log, 'verify', cwd);
         if (!packageName) {
-            await (0, cli_error_1.cliExitWithError)('No package found to verify');
+            await (0, utils_1.cliExitWithError)('No package found to verify');
         }
     }
     const project = new core_1.PgpmPackage(cwd);
@@ -64,7 +64,7 @@ exports.default = async (argv, prompter, _options) => {
     if (argv.to === true) {
         target = await (0, deployed_changes_1.selectDeployedChange)(database, argv, prompter, log, 'verify', cwd);
         if (!target) {
-            await (0, cli_error_1.cliExitWithError)('No target selected, operation cancelled');
+            await (0, utils_1.cliExitWithError)('No target selected, operation cancelled');
         }
     }
     else if (packageName && argv.to) {
@@ -74,11 +74,11 @@ exports.default = async (argv, prompter, _options) => {
         target = packageName;
     }
     else if (argv.package && argv.to) {
-        const resolvedPackage = (0, utils_1.resolvePackageAlias)(argv.package, cwd);
+        const resolvedPackage = (0, utils_2.resolvePackageAlias)(argv.package, cwd);
         target = `${resolvedPackage}:${argv.to}`;
     }
     else if (argv.package) {
-        target = (0, utils_1.resolvePackageAlias)(argv.package, cwd);
+        target = (0, utils_2.resolvePackageAlias)(argv.package, cwd);
     }
     await project.verify(opts, target, recursive);
     log.success('Verify complete.');

package/commands.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commands = exports.createPgpmCommandMap = void 0;
 const find_and_require_package_json_1 = require("find-and-require-package-json");
+const utils_1 = require("@inquirerer/utils");
 const pg_cache_1 = require("pg-cache");
 const add_1 = __importDefault(require("./commands/add"));
 const admin_users_1 = __importDefault(require("./commands/admin-users"));
@@ -30,9 +31,7 @@ const revert_1 = __importDefault(require("./commands/revert"));
 const tag_1 = __importDefault(require("./commands/tag"));
 const test_packages_1 = __importDefault(require("./commands/test-packages"));
 const verify_1 = __importDefault(require("./commands/verify"));
-const utils_1 = require("./utils");
-const cli_error_1 = require("./utils/cli-error");
-const update_check_1 = require("./utils/update-check");
+const utils_2 = require("./utils");
 const withPgTeardown = (fn, skipTeardown = false) => async (...args) => {
     try {
         await fn(...args);
@@ -81,11 +80,11 @@ const commands = async (argv, prompter, options) => {
     }
     let { first: command, newArgv } = (0, utils_1.extractFirst)(argv);
     if ((argv.help || argv.h || command === 'help') && !command) {
-        console.log(utils_1.usageText);
+        console.log(utils_2.usageText);
         process.exit(0);
     }
     if (command === 'help') {
-        console.log(utils_1.usageText);
+        console.log(utils_2.usageText);
         process.exit(0);
     }
     const commandMap = (0, exports.createPgpmCommandMap)(options?.skipPgTeardown);
@@ -100,14 +99,24 @@ const commands = async (argv, prompter, options) => {
         ]);
         command = answer.command;
     }
-    try {
-        await (0, update_check_1.checkForUpdates)({
-            command,
-            pkgVersion: (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname).version
-        });
-    }
-    catch {
-        // ignore update check failures
+    // Run update check (skip on 'update' command to avoid redundant check)
+    // (checkForUpdates auto-skips in CI or when INQUIRERER_SKIP_UPDATE_CHECK / PGPM_SKIP_UPDATE_CHECK is set)
+    if (command !== 'update') {
+        try {
+            const pkg = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname);
+            const updateResult = await (0, utils_1.checkForUpdates)({
+                pkgName: pkg.name,
+                pkgVersion: pkg.version,
+                toolName: 'pgpm',
+            });
+            if (updateResult.hasUpdate && updateResult.message) {
+                console.warn(updateResult.message);
+                console.warn('Run pgpm update to upgrade.');
+            }
+        }
+        catch {
+            // ignore update check failures
+        }
     }
     newArgv = await prompter.prompt(newArgv, [
         {
@@ -121,8 +130,8 @@ const commands = async (argv, prompter, options) => {
     ]);
     const commandFn = commandMap[command];
     if (!commandFn) {
-        console.log(utils_1.usageText);
-        await (0, cli_error_1.cliExitWithError)(`Unknown command: ${command}`);
+        console.log(utils_2.usageText);
+        await (0, utils_1.cliExitWithError)(`Unknown command: ${command}`, { beforeExit: pg_cache_1.teardownPgPools });
     }
     await commandFn(newArgv, prompter, options);
     prompter.close();

package/esm/commands/add.js

@@ -1,6 +1,6 @@
+import { extractFirst } from '@inquirerer/utils';
 import { PgpmPackage } from '@pgpmjs/core';
 import * as path from 'path';
-import { extractFirst } from '../utils/argv';
 const addUsageText = `
 Add Command:
 

package/esm/commands/admin-users.js

@@ -1,4 +1,4 @@
-import { extractFirst } from '../utils';
+import { extractFirst } from '@inquirerer/utils';
 import add from './admin-users/add';
 import bootstrap from './admin-users/bootstrap';
 import remove from './admin-users/remove';

package/esm/commands/cache.js

@@ -1,5 +1,5 @@
-import { CacheManager } from 'create-gen-app';
-import { cliExitWithError } from '../utils/cli-error';
+import { cliExitWithError } from '@inquirerer/utils';
+import { CacheManager } from 'genomic';
 const cacheUsageText = `
 Cache Command:
 

package/esm/commands/docker.js

@@ -1,5 +1,5 @@
 import { spawn } from 'child_process';
-import { cliExitWithError, extractFirst } from '../utils';
+import { cliExitWithError, extractFirst } from '@inquirerer/utils';
 const dockerUsageText = `
 Docker Command:
 

package/esm/commands/init/index.js

@@ -238,14 +238,15 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
         // Offer to create a workspace instead
         const recoveryQuestion = [
             {
-                name: 'createWorkspace',
+                name: 'workspace',
+                alias: 'w',
                 message: 'You are not inside a PGPM workspace. Would you like to create a new workspace instead?',
                 type: 'confirm',
                 required: true,
             },
         ];
-        const { createWorkspace } = await prompter.prompt(argv, recoveryQuestion);
-        if (createWorkspace) {
+        const { workspace } = await prompter.prompt(argv, recoveryQuestion);
+        if (workspace) {
             return handleWorkspaceInit(argv, prompter, {
                 fromPath: 'workspace',
                 templateRepo: ctx.templateRepo,

package/esm/commands/migrate.js

@@ -1,4 +1,4 @@
-import { extractFirst } from '../utils';
+import { extractFirst } from '@inquirerer/utils';
 import deps from './migrate/deps';
 // Migrate subcommands
 import init from './migrate/init';

package/esm/commands/remove.js

@@ -1,9 +1,9 @@
+import { cliExitWithError } from '@inquirerer/utils';
 import { PgpmPackage } from '@pgpmjs/core';
 import { getEnvOptions } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { getPgEnvOptions } from 'pg-env';
 import { getTargetDatabase } from '../utils';
-import { cliExitWithError } from '../utils/cli-error';
 const log = new Logger('remove');
 export default async (argv, prompter, _options) => {
     if (!argv.to) {

package/esm/commands/rename.js

@@ -1,6 +1,6 @@
+import { cliExitWithError } from '@inquirerer/utils';
 import { PgpmPackage } from '@pgpmjs/core';
 import path from 'path';
-import { cliExitWithError } from '../utils/cli-error';
 export default async (argv, _prompter) => {
     const cwd = argv.cwd || process.cwd();
     const to = argv.to || (argv._ && argv._[0]);

package/esm/commands/revert.js

@@ -1,9 +1,9 @@
+import { cliExitWithError } from '@inquirerer/utils';
 import { PgpmPackage } from '@pgpmjs/core';
 import { getEnvOptions } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { getPgEnvOptions } from 'pg-env';
 import { getTargetDatabase, resolvePackageAlias } from '../utils';
-import { cliExitWithError } from '../utils/cli-error';
 import { selectDeployedChange, selectDeployedPackage } from '../utils/deployed-changes';
 const log = new Logger('revert');
 const revertUsageText = `

package/esm/commands/tag.js

@@ -1,8 +1,8 @@
+import { extractFirst } from '@inquirerer/utils';
 import { PgpmPackage } from '@pgpmjs/core';
 import { Logger } from '@pgpmjs/logger';
 import { errors } from '@pgpmjs/types';
 import * as path from 'path';
-import { extractFirst } from '../utils/argv';
 import { selectPackage } from '../utils/module-utils';
 import { resolvePackageAlias } from '../utils/package-alias';
 const log = new Logger('tag');

package/esm/commands/update.js

@@ -1,8 +1,8 @@
+import { cliExitWithError } from '@inquirerer/utils';
 import { findAndRequirePackageJson } from 'find-and-require-package-json';
 import { Logger } from '@pgpmjs/logger';
 import { spawn } from 'child_process';
 import { fetchLatestVersion } from '../utils/npm-version';
-import { cliExitWithError } from '../utils/cli-error';
 const log = new Logger('update');
 const updateUsageText = `
 Update Command:
@@ -61,7 +61,7 @@ export default async (argv, _prompter, _options) => {
         }
     }
     catch (error) {
-        await cliExitWithError(error instanceof Error ? error.message : String(error), { package: pkgName, registry });
+        await cliExitWithError(error instanceof Error ? error.message : String(error), { context: { package: pkgName, registry } });
     }
     return argv;
 };

package/esm/commands/verify.js

@@ -1,9 +1,9 @@
+import { cliExitWithError } from '@inquirerer/utils';
 import { PgpmPackage } from '@pgpmjs/core';
 import { getEnvOptions } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { getPgEnvOptions } from 'pg-env';
 import { getTargetDatabase, resolvePackageAlias } from '../utils';
-import { cliExitWithError } from '../utils/cli-error';
 import { selectDeployedChange, selectDeployedPackage } from '../utils/deployed-changes';
 const log = new Logger('verify');
 const verifyUsageText = `

package/esm/commands.js

@@ -1,4 +1,5 @@
 import { findAndRequirePackageJson } from 'find-and-require-package-json';
+import { cliExitWithError, checkForUpdates, extractFirst } from '@inquirerer/utils';
 import { teardownPgPools } from 'pg-cache';
 import add from './commands/add';
 import adminUsers from './commands/admin-users';
@@ -24,9 +25,7 @@ import revert from './commands/revert';
 import tag from './commands/tag';
 import testPackages from './commands/test-packages';
 import verify from './commands/verify';
-import { extractFirst, usageText } from './utils';
-import { cliExitWithError } from './utils/cli-error';
-import { checkForUpdates } from './utils/update-check';
+import { usageText } from './utils';
 const withPgTeardown = (fn, skipTeardown = false) => async (...args) => {
     try {
         await fn(...args);
@@ -93,14 +92,24 @@ export const commands = async (argv, prompter, options) => {
         ]);
         command = answer.command;
     }
-    try {
-        await checkForUpdates({
-            command,
-            pkgVersion: findAndRequirePackageJson(__dirname).version
-        });
-    }
-    catch {
-        // ignore update check failures
+    // Run update check (skip on 'update' command to avoid redundant check)
+    // (checkForUpdates auto-skips in CI or when INQUIRERER_SKIP_UPDATE_CHECK / PGPM_SKIP_UPDATE_CHECK is set)
+    if (command !== 'update') {
+        try {
+            const pkg = findAndRequirePackageJson(__dirname);
+            const updateResult = await checkForUpdates({
+                pkgName: pkg.name,
+                pkgVersion: pkg.version,
+                toolName: 'pgpm',
+            });
+            if (updateResult.hasUpdate && updateResult.message) {
+                console.warn(updateResult.message);
+                console.warn('Run pgpm update to upgrade.');
+            }
+        }
+        catch {
+            // ignore update check failures
+        }
     }
     newArgv = await prompter.prompt(newArgv, [
         {
@@ -115,7 +124,7 @@ export const commands = async (argv, prompter, options) => {
     const commandFn = commandMap[command];
     if (!commandFn) {
         console.log(usageText);
-        await cliExitWithError(`Unknown command: ${command}`);
+        await cliExitWithError(`Unknown command: ${command}`, { beforeExit: teardownPgPools });
     }
     await commandFn(newArgv, prompter, options);
     prompter.close();

package/esm/utils/index.js

@@ -1,10 +1,6 @@
-export * from './argv';
 export * from './database';
 export * from './display';
-export * from './cli-error';
 export * from './deployed-changes';
 export * from './module-utils';
 export * from './npm-version';
 export * from './package-alias';
-export * from './update-check';
-export * from './update-config';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "2.4.1",
+  "version": "2.5.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -46,14 +46,15 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@pgpmjs/core": "^4.2.1",
+    "@inquirerer/utils": "^3.1.1",
+    "@pgpmjs/core": "^4.4.0",
     "@pgpmjs/env": "^2.8.11",
     "@pgpmjs/logger": "^1.3.5",
     "@pgpmjs/types": "^2.12.8",
     "appstash": "^0.2.6",
-    "create-gen-app": "^0.10.0",
     "find-and-require-package-json": "^0.8.2",
-    "inquirerer": "^2.4.0",
+    "genomic": "^5.0.3",
+    "inquirerer": "^4.1.2",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
     "pg-cache": "^1.6.11",
@@ -74,5 +75,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "5b93211b63e72bedcfabc7c4aa41c69ed33d0f6c"
+  "gitHead": "bda56442f70c77c98276bc7bab0450308c975df8"
 }

package/utils/index.d.ts

@@ -1,10 +1,6 @@
-export * from './argv';
 export * from './database';
 export * from './display';
-export * from './cli-error';
 export * from './deployed-changes';
 export * from './module-utils';
 export * from './npm-version';
 export * from './package-alias';
-export * from './update-check';
-export * from './update-config';

package/utils/index.js

@@ -14,13 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./argv"), exports);
 __exportStar(require("./database"), exports);
 __exportStar(require("./display"), exports);
-__exportStar(require("./cli-error"), exports);
 __exportStar(require("./deployed-changes"), exports);
 __exportStar(require("./module-utils"), exports);
 __exportStar(require("./npm-version"), exports);
 __exportStar(require("./package-alias"), exports);
-__exportStar(require("./update-check"), exports);
-__exportStar(require("./update-config"), exports);

package/esm/utils/argv.js

@@ -1,8 +0,0 @@
-export const extractFirst = (argv) => {
-    const first = argv._?.[0];
-    const newArgv = {
-        ...argv,
-        _: argv._?.slice(1) ?? []
-    };
-    return { first, newArgv };
-};

package/esm/utils/cli-error.js

@@ -1,48 +0,0 @@
-import { Logger } from '@pgpmjs/logger';
-import { PgpmError } from '@pgpmjs/types';
-import { teardownPgPools } from 'pg-cache';
-const log = new Logger('cli');
-/**
- * CLI error utility that logs error information and exits with code 1.
- * Provides consistent error handling and user experience across all CLI commands.
- *
- * IMPORTANT: This function properly cleans up PostgreSQL connections before exiting.
- */
-export const cliExitWithError = async (error, context) => {
-    if (error instanceof PgpmError) {
-        // For PgpmError instances, use structured logging
-        log.error(`Error: ${error.message}`);
-        // Log additional context if available
-        if (error.context && Object.keys(error.context).length > 0) {
-            log.debug('Error context:', error.context);
-        }
-        // Log any additional context provided
-        if (context) {
-            log.debug('Additional context:', context);
-        }
-    }
-    else if (error instanceof Error) {
-        // For generic Error instances
-        log.error(`Error: ${error.message}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    else if (typeof error === 'string') {
-        // For simple string messages
-        log.error(`Error: ${error}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    // Perform cleanup before exiting
-    try {
-        await teardownPgPools();
-        log.debug('Database connections cleaned up');
-    }
-    catch (cleanupError) {
-        log.warn('Failed to cleanup database connections:', cleanupError);
-        // Don't let cleanup errors prevent the exit
-    }
-    process.exit(1);
-};

package/esm/utils/update-check.js

@@ -1,57 +0,0 @@
-import { findAndRequirePackageJson } from 'find-and-require-package-json';
-import { Logger } from '@pgpmjs/logger';
-import { UPDATE_CHECK_APPSTASH_KEY, UPDATE_CHECK_TTL_MS, UPDATE_PACKAGE_NAME } from '@pgpmjs/types';
-import { compareVersions, fetchLatestVersion } from './npm-version';
-import { readUpdateConfig, shouldCheck, writeUpdateConfig } from './update-config';
-const log = new Logger('update-check');
-const shouldSkip = (command) => {
-    if (process.env.PGPM_SKIP_UPDATE_CHECK)
-        return true;
-    if (process.env.CI === 'true')
-        return true;
-    if (command === 'update')
-        return true;
-    return false;
-};
-export async function checkForUpdates(options = {}) {
-    const { pkgName = UPDATE_PACKAGE_NAME, pkgVersion = findAndRequirePackageJson(__dirname).version, command, now = Date.now(), key = UPDATE_CHECK_APPSTASH_KEY, toolName, baseDir } = options;
-    if (shouldSkip(command)) {
-        return null;
-    }
-    try {
-        const existing = await readUpdateConfig({ toolName, baseDir, key });
-        let latestKnownVersion = existing?.latestKnownVersion ?? pkgVersion;
-        const needsCheck = shouldCheck(now, existing?.lastCheckedAt, UPDATE_CHECK_TTL_MS);
-        if (needsCheck) {
-            const fetched = await fetchLatestVersion(pkgName);
-            if (fetched) {
-                latestKnownVersion = fetched;
-            }
-            await writeUpdateConfig({
-                lastCheckedAt: now,
-                latestKnownVersion
-            }, { toolName, baseDir, key });
-        }
-        const comparison = compareVersions(pkgVersion, latestKnownVersion);
-        const isOutdated = comparison < 0;
-        if (isOutdated) {
-            const defaultUpdateCommand = pkgName === UPDATE_PACKAGE_NAME
-                ? 'Run pgpm update to upgrade.'
-                : `Run npm i -g ${pkgName}@latest to upgrade.`;
-            const updateInstruction = options.updateCommand ?? defaultUpdateCommand;
-            log.warn(`A new version of ${pkgName} is available (current ${pkgVersion}, latest ${latestKnownVersion}). ${updateInstruction}`);
-            await writeUpdateConfig({
-                lastCheckedAt: now,
-                latestKnownVersion
-            }, { toolName, baseDir, key });
-        }
-        return {
-            lastCheckedAt: now,
-            latestKnownVersion
-        };
-    }
-    catch (error) {
-        log.debug('Update check skipped due to error:', error);
-        return null;
-    }
-}

package/esm/utils/update-config.js

@@ -1,50 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { appstash, resolve as resolveAppstash } from 'appstash';
-import { UPDATE_CHECK_APPSTASH_KEY } from '@pgpmjs/types';
-const defaultToolName = 'pgpm';
-const getConfigPath = (options = {}) => {
-    const toolName = options.toolName ?? defaultToolName;
-    const dirs = appstash(toolName, {
-        ensure: true,
-        baseDir: options.baseDir
-    });
-    const configDir = resolveAppstash(dirs, 'config');
-    if (!fs.existsSync(configDir)) {
-        fs.mkdirSync(configDir, { recursive: true });
-    }
-    const fileName = `${(options.key ?? UPDATE_CHECK_APPSTASH_KEY).replace(/[^a-z0-9-_]/gi, '_')}.json`;
-    return path.join(configDir, fileName);
-};
-export const shouldCheck = (now, lastCheckedAt, ttlMs) => {
-    if (!lastCheckedAt)
-        return true;
-    return now - lastCheckedAt > ttlMs;
-};
-export async function readUpdateConfig(options = {}) {
-    const configPath = getConfigPath(options);
-    if (!fs.existsSync(configPath)) {
-        return null;
-    }
-    try {
-        const contents = await fs.promises.readFile(configPath, 'utf8');
-        const parsed = JSON.parse(contents);
-        return parsed;
-    }
-    catch {
-        // Corrupted config – clear it
-        try {
-            await fs.promises.rm(configPath, { force: true });
-        }
-        catch {
-            // ignore
-        }
-        return null;
-    }
-}
-export async function writeUpdateConfig(config, options = {}) {
-    const configPath = getConfigPath(options);
-    await fs.promises.writeFile(configPath, JSON.stringify(config, null, 2), 'utf8');
-}
-// Exposed for testing to locate the config path for a given namespace/baseDir
-export const resolveUpdateConfigPath = (options = {}) => getConfigPath(options);

package/utils/argv.d.ts

@@ -1,8 +0,0 @@
-import { ParsedArgs } from 'minimist';
-export declare const extractFirst: (argv: Partial<ParsedArgs>) => {
-    first: string;
-    newArgv: {
-        _: string[];
-        "--"?: string[] | undefined;
-    };
-};

package/utils/argv.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFirst = void 0;
-const extractFirst = (argv) => {
-    const first = argv._?.[0];
-    const newArgv = {
-        ...argv,
-        _: argv._?.slice(1) ?? []
-    };
-    return { first, newArgv };
-};
-exports.extractFirst = extractFirst;

package/utils/cli-error.d.ts

@@ -1,8 +0,0 @@
-import { PgpmError } from '@pgpmjs/types';
-/**
- * CLI error utility that logs error information and exits with code 1.
- * Provides consistent error handling and user experience across all CLI commands.
- *
- * IMPORTANT: This function properly cleans up PostgreSQL connections before exiting.
- */
-export declare const cliExitWithError: (error: PgpmError | Error | string, context?: Record<string, any>) => Promise<never>;

package/utils/cli-error.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cliExitWithError = void 0;
-const logger_1 = require("@pgpmjs/logger");
-const types_1 = require("@pgpmjs/types");
-const pg_cache_1 = require("pg-cache");
-const log = new logger_1.Logger('cli');
-/**
- * CLI error utility that logs error information and exits with code 1.
- * Provides consistent error handling and user experience across all CLI commands.
- *
- * IMPORTANT: This function properly cleans up PostgreSQL connections before exiting.
- */
-const cliExitWithError = async (error, context) => {
-    if (error instanceof types_1.PgpmError) {
-        // For PgpmError instances, use structured logging
-        log.error(`Error: ${error.message}`);
-        // Log additional context if available
-        if (error.context && Object.keys(error.context).length > 0) {
-            log.debug('Error context:', error.context);
-        }
-        // Log any additional context provided
-        if (context) {
-            log.debug('Additional context:', context);
-        }
-    }
-    else if (error instanceof Error) {
-        // For generic Error instances
-        log.error(`Error: ${error.message}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    else if (typeof error === 'string') {
-        // For simple string messages
-        log.error(`Error: ${error}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    // Perform cleanup before exiting
-    try {
-        await (0, pg_cache_1.teardownPgPools)();
-        log.debug('Database connections cleaned up');
-    }
-    catch (cleanupError) {
-        log.warn('Failed to cleanup database connections:', cleanupError);
-        // Don't let cleanup errors prevent the exit
-    }
-    process.exit(1);
-};
-exports.cliExitWithError = cliExitWithError;

package/utils/update-check.d.ts

@@ -1,10 +0,0 @@
-import { UpdateCheckConfig } from '@pgpmjs/types';
-import { UpdateConfigOptions } from './update-config';
-export interface CheckForUpdatesOptions extends UpdateConfigOptions {
-    pkgName?: string;
-    pkgVersion?: string;
-    command?: string;
-    now?: number;
-    updateCommand?: string;
-}
-export declare function checkForUpdates(options?: CheckForUpdatesOptions): Promise<UpdateCheckConfig | null>;

package/utils/update-check.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkForUpdates = checkForUpdates;
-const find_and_require_package_json_1 = require("find-and-require-package-json");
-const logger_1 = require("@pgpmjs/logger");
-const types_1 = require("@pgpmjs/types");
-const npm_version_1 = require("./npm-version");
-const update_config_1 = require("./update-config");
-const log = new logger_1.Logger('update-check');
-const shouldSkip = (command) => {
-    if (process.env.PGPM_SKIP_UPDATE_CHECK)
-        return true;
-    if (process.env.CI === 'true')
-        return true;
-    if (command === 'update')
-        return true;
-    return false;
-};
-async function checkForUpdates(options = {}) {
-    const { pkgName = types_1.UPDATE_PACKAGE_NAME, pkgVersion = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname).version, command, now = Date.now(), key = types_1.UPDATE_CHECK_APPSTASH_KEY, toolName, baseDir } = options;
-    if (shouldSkip(command)) {
-        return null;
-    }
-    try {
-        const existing = await (0, update_config_1.readUpdateConfig)({ toolName, baseDir, key });
-        let latestKnownVersion = existing?.latestKnownVersion ?? pkgVersion;
-        const needsCheck = (0, update_config_1.shouldCheck)(now, existing?.lastCheckedAt, types_1.UPDATE_CHECK_TTL_MS);
-        if (needsCheck) {
-            const fetched = await (0, npm_version_1.fetchLatestVersion)(pkgName);
-            if (fetched) {
-                latestKnownVersion = fetched;
-            }
-            await (0, update_config_1.writeUpdateConfig)({
-                lastCheckedAt: now,
-                latestKnownVersion
-            }, { toolName, baseDir, key });
-        }
-        const comparison = (0, npm_version_1.compareVersions)(pkgVersion, latestKnownVersion);
-        const isOutdated = comparison < 0;
-        if (isOutdated) {
-            const defaultUpdateCommand = pkgName === types_1.UPDATE_PACKAGE_NAME
-                ? 'Run pgpm update to upgrade.'
-                : `Run npm i -g ${pkgName}@latest to upgrade.`;
-            const updateInstruction = options.updateCommand ?? defaultUpdateCommand;
-            log.warn(`A new version of ${pkgName} is available (current ${pkgVersion}, latest ${latestKnownVersion}). ${updateInstruction}`);
-            await (0, update_config_1.writeUpdateConfig)({
-                lastCheckedAt: now,
-                latestKnownVersion
-            }, { toolName, baseDir, key });
-        }
-        return {
-            lastCheckedAt: now,
-            latestKnownVersion
-        };
-    }
-    catch (error) {
-        log.debug('Update check skipped due to error:', error);
-        return null;
-    }
-}

package/utils/update-config.d.ts

@@ -1,10 +0,0 @@
-import { UpdateCheckConfig } from '@pgpmjs/types';
-export interface UpdateConfigOptions {
-    toolName?: string;
-    baseDir?: string;
-    key?: string;
-}
-export declare const shouldCheck: (now: number, lastCheckedAt: number | undefined, ttlMs: number) => boolean;
-export declare function readUpdateConfig(options?: UpdateConfigOptions): Promise<UpdateCheckConfig | null>;
-export declare function writeUpdateConfig(config: UpdateCheckConfig, options?: UpdateConfigOptions): Promise<void>;
-export declare const resolveUpdateConfigPath: (options?: UpdateConfigOptions) => string;

package/utils/update-config.js

@@ -1,60 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUpdateConfigPath = exports.shouldCheck = void 0;
-exports.readUpdateConfig = readUpdateConfig;
-exports.writeUpdateConfig = writeUpdateConfig;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const appstash_1 = require("appstash");
-const types_1 = require("@pgpmjs/types");
-const defaultToolName = 'pgpm';
-const getConfigPath = (options = {}) => {
-    const toolName = options.toolName ?? defaultToolName;
-    const dirs = (0, appstash_1.appstash)(toolName, {
-        ensure: true,
-        baseDir: options.baseDir
-    });
-    const configDir = (0, appstash_1.resolve)(dirs, 'config');
-    if (!fs_1.default.existsSync(configDir)) {
-        fs_1.default.mkdirSync(configDir, { recursive: true });
-    }
-    const fileName = `${(options.key ?? types_1.UPDATE_CHECK_APPSTASH_KEY).replace(/[^a-z0-9-_]/gi, '_')}.json`;
-    return path_1.default.join(configDir, fileName);
-};
-const shouldCheck = (now, lastCheckedAt, ttlMs) => {
-    if (!lastCheckedAt)
-        return true;
-    return now - lastCheckedAt > ttlMs;
-};
-exports.shouldCheck = shouldCheck;
-async function readUpdateConfig(options = {}) {
-    const configPath = getConfigPath(options);
-    if (!fs_1.default.existsSync(configPath)) {
-        return null;
-    }
-    try {
-        const contents = await fs_1.default.promises.readFile(configPath, 'utf8');
-        const parsed = JSON.parse(contents);
-        return parsed;
-    }
-    catch {
-        // Corrupted config – clear it
-        try {
-            await fs_1.default.promises.rm(configPath, { force: true });
-        }
-        catch {
-            // ignore
-        }
-        return null;
-    }
-}
-async function writeUpdateConfig(config, options = {}) {
-    const configPath = getConfigPath(options);
-    await fs_1.default.promises.writeFile(configPath, JSON.stringify(config, null, 2), 'utf8');
-}
-// Exposed for testing to locate the config path for a given namespace/baseDir
-const resolveUpdateConfigPath = (options = {}) => getConfigPath(options);
-exports.resolveUpdateConfigPath = resolveUpdateConfigPath;