@constructive-io/cli 5.2.2 → 5.3.0

package/commands.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commands = void 0;
 const find_and_require_package_json_1 = require("find-and-require-package-json");
+const utils_1 = require("@inquirerer/utils");
 const codegen_1 = __importDefault(require("./commands/codegen"));
 const explorer_1 = __importDefault(require("./commands/explorer"));
 const get_graphql_schema_1 = __importDefault(require("./commands/get-graphql-schema"));
 const server_1 = __importDefault(require("./commands/server"));
-const utils_1 = require("./utils");
-const update_check_1 = require("./utils/update-check");
+const utils_2 = require("./utils");
 const createCommandMap = () => {
     return {
         server: server_1.default,
@@ -22,16 +22,18 @@ const createCommandMap = () => {
 const commands = async (argv, prompter, options) => {
     let { first: command, newArgv } = (0, utils_1.extractFirst)(argv);
     // Run update check early so it shows on help/version paths too
+    // (checkForUpdates auto-skips in CI or when INQUIRERER_SKIP_UPDATE_CHECK / CONSTRUCTIVE_SKIP_UPDATE_CHECK is set)
     try {
         const pkg = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname);
-        await (0, update_check_1.checkForUpdates)({
-            command: command || 'help',
+        const updateResult = await (0, utils_1.checkForUpdates)({
             pkgName: pkg.name,
             pkgVersion: pkg.version,
             toolName: 'constructive',
-            key: pkg.name,
-            updateCommand: `Run npm i -g ${pkg.name}@latest to upgrade.`
         });
+        if (updateResult.hasUpdate && updateResult.message) {
+            console.warn(updateResult.message);
+            console.warn(`Run npm i -g ${pkg.name}@latest to upgrade.`);
+        }
     }
     catch {
         // ignore update check failures
@@ -43,12 +45,12 @@ const commands = async (argv, prompter, options) => {
     }
     // Show usage if explicitly requested but no command specified
     if ((argv.help || argv.h || command === 'help') && !command) {
-        console.log(utils_1.usageText);
+        console.log(utils_2.usageText);
         process.exit(0);
     }
     // Show usage for help command specifically
     if (command === 'help') {
-        console.log(utils_1.usageText);
+        console.log(utils_2.usageText);
         process.exit(0);
     }
     const commandMap = createCommandMap();
@@ -77,7 +79,7 @@ const commands = async (argv, prompter, options) => {
     ]);
     const commandFn = commandMap[command];
     if (!commandFn) {
-        console.log(utils_1.usageText);
+        console.log(utils_2.usageText);
         await (0, utils_1.cliExitWithError)(`Unknown command: ${command}`);
     }
     await commandFn(newArgv, prompter, options);

package/esm/commands.js

@@ -1,10 +1,10 @@
 import { findAndRequirePackageJson } from 'find-and-require-package-json';
+import { cliExitWithError, checkForUpdates, extractFirst } from '@inquirerer/utils';
 import codegen from './commands/codegen';
 import explorer from './commands/explorer';
 import getGraphqlSchema from './commands/get-graphql-schema';
 import server from './commands/server';
-import { cliExitWithError, extractFirst, usageText } from './utils';
-import { checkForUpdates } from './utils/update-check';
+import { usageText } from './utils';
 const createCommandMap = () => {
     return {
         server,
@@ -16,16 +16,18 @@ const createCommandMap = () => {
 export const commands = async (argv, prompter, options) => {
     let { first: command, newArgv } = extractFirst(argv);
     // Run update check early so it shows on help/version paths too
+    // (checkForUpdates auto-skips in CI or when INQUIRERER_SKIP_UPDATE_CHECK / CONSTRUCTIVE_SKIP_UPDATE_CHECK is set)
     try {
         const pkg = findAndRequirePackageJson(__dirname);
-        await checkForUpdates({
-            command: command || 'help',
+        const updateResult = await checkForUpdates({
             pkgName: pkg.name,
             pkgVersion: pkg.version,
             toolName: 'constructive',
-            key: pkg.name,
-            updateCommand: `Run npm i -g ${pkg.name}@latest to upgrade.`
         });
+        if (updateResult.hasUpdate && updateResult.message) {
+            console.warn(updateResult.message);
+            console.warn(`Run npm i -g ${pkg.name}@latest to upgrade.`);
+        }
     }
     catch {
         // ignore update check failures

package/esm/utils/index.js

@@ -1,3 +1 @@
-export { extractFirst } from './argv';
-export { cliExitWithError } from './cli-error';
 export { usageText } from './display';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/cli",
-  "version": "5.2.2",
+  "version": "5.3.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive CLI",
   "main": "index.js",
@@ -46,21 +46,22 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@constructive-io/graphql-codegen": "^2.17.35",
+    "@constructive-io/graphql-codegen": "^2.17.36",
     "@constructive-io/graphql-env": "^2.8.11",
-    "@constructive-io/graphql-explorer": "^2.10.28",
-    "@constructive-io/graphql-server": "^2.10.28",
-    "@pgpmjs/core": "^4.2.1",
+    "@constructive-io/graphql-explorer": "^2.10.29",
+    "@constructive-io/graphql-server": "^2.10.29",
+    "@inquirerer/utils": "^3.1.1",
+    "@pgpmjs/core": "^4.3.0",
     "@pgpmjs/logger": "^1.3.5",
     "@pgpmjs/server-utils": "^2.8.11",
     "@pgpmjs/types": "^2.12.8",
     "find-and-require-package-json": "^0.8.2",
-    "inquirerer": "^2.4.0",
+    "inquirerer": "^4.1.1",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
     "pg-cache": "^1.6.11",
     "pg-env": "^1.2.4",
-    "pgpm": "^2.4.1",
+    "pgpm": "^2.5.0",
     "shelljs": "^0.10.0",
     "yanse": "^0.1.8"
   },
@@ -75,5 +76,5 @@
     "postgres",
     "graphile"
   ],
-  "gitHead": "5b93211b63e72bedcfabc7c4aa41c69ed33d0f6c"
+  "gitHead": "7ac931c063d48e281349b748ba2eb9c9f47ffb06"
 }

package/utils/index.d.ts

@@ -1,3 +1 @@
-export { extractFirst } from './argv';
-export { cliExitWithError } from './cli-error';
 export { usageText } from './display';

package/utils/index.js

@@ -1,9 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.usageText = exports.cliExitWithError = exports.extractFirst = void 0;
-var argv_1 = require("./argv");
-Object.defineProperty(exports, "extractFirst", { enumerable: true, get: function () { return argv_1.extractFirst; } });
-var cli_error_1 = require("./cli-error");
-Object.defineProperty(exports, "cliExitWithError", { enumerable: true, get: function () { return cli_error_1.cliExitWithError; } });
+exports.usageText = void 0;
 var display_1 = require("./display");
 Object.defineProperty(exports, "usageText", { enumerable: true, get: function () { return display_1.usageText; } });

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,31 +0,0 @@
-import { Logger } from '@pgpmjs/logger';
-import { PgpmError } from '@pgpmjs/types';
-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.
- */
-export const cliExitWithError = async (error, context) => {
-    if (error instanceof PgpmError) {
-        log.error(`Error: ${error.message}`);
-        if (error.context && Object.keys(error.context).length > 0) {
-            log.debug('Error context:', error.context);
-        }
-        if (context) {
-            log.debug('Additional context:', context);
-        }
-    }
-    else if (error instanceof Error) {
-        log.error(`Error: ${error.message}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    else if (typeof error === 'string') {
-        log.error(`Error: ${error}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    process.exit(1);
-};

package/esm/utils/update-check.js

@@ -1,107 +0,0 @@
-import { findAndRequirePackageJson } from 'find-and-require-package-json';
-import { Logger } from '@pgpmjs/logger';
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-const log = new Logger('update-check');
-const UPDATE_CHECK_TTL_MS = 7 * 24 * 60 * 60 * 1000; // 1 week
-const shouldSkip = (command) => {
-    if (process.env.PGPM_SKIP_UPDATE_CHECK)
-        return true;
-    if (process.env.CI === 'true')
-        return true;
-    return false;
-};
-function getConfigPath(toolName, key) {
-    const configDir = path.join(os.homedir(), `.${toolName}`);
-    return path.join(configDir, `${key}.json`);
-}
-function readConfig(toolName, key) {
-    try {
-        const configPath = getConfigPath(toolName, key);
-        if (!fs.existsSync(configPath))
-            return null;
-        const content = fs.readFileSync(configPath, 'utf8');
-        return JSON.parse(content);
-    }
-    catch {
-        return null;
-    }
-}
-function writeConfig(toolName, key, config) {
-    try {
-        const configPath = getConfigPath(toolName, key);
-        const configDir = path.dirname(configPath);
-        if (!fs.existsSync(configDir)) {
-            fs.mkdirSync(configDir, { recursive: true });
-        }
-        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-    }
-    catch {
-        // Ignore write errors
-    }
-}
-async function fetchLatestVersion(pkgName) {
-    try {
-        const response = await fetch(`https://registry.npmjs.org/${pkgName}/latest`);
-        if (!response.ok)
-            return null;
-        const data = await response.json();
-        return data.version || null;
-    }
-    catch {
-        return null;
-    }
-}
-function compareVersions(current, latest) {
-    const currentParts = current.replace(/^v/, '').split('.').map(Number);
-    const latestParts = latest.replace(/^v/, '').split('.').map(Number);
-    for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
-        const c = currentParts[i] || 0;
-        const l = latestParts[i] || 0;
-        if (c < l)
-            return -1;
-        if (c > l)
-            return 1;
-    }
-    return 0;
-}
-export async function checkForUpdates(options = {}) {
-    const { pkgName = '@constructive-io/cli', pkgVersion = findAndRequirePackageJson(__dirname).version, command, now = Date.now(), key = 'update-check', toolName = 'constructive' } = options;
-    if (shouldSkip(command)) {
-        return null;
-    }
-    try {
-        const existing = readConfig(toolName, key);
-        let latestKnownVersion = existing?.latestKnownVersion ?? pkgVersion;
-        const needsCheck = !existing?.lastCheckedAt || (now - existing.lastCheckedAt) > UPDATE_CHECK_TTL_MS;
-        if (needsCheck) {
-            const fetched = await fetchLatestVersion(pkgName);
-            if (fetched) {
-                latestKnownVersion = fetched;
-            }
-            writeConfig(toolName, key, {
-                lastCheckedAt: now,
-                latestKnownVersion
-            });
-        }
-        const comparison = compareVersions(pkgVersion, latestKnownVersion);
-        const isOutdated = comparison < 0;
-        if (isOutdated) {
-            const updateInstruction = options.updateCommand ?? `Run npm i -g ${pkgName}@latest to upgrade.`;
-            log.warn(`A new version of ${pkgName} is available (current ${pkgVersion}, latest ${latestKnownVersion}). ${updateInstruction}`);
-            writeConfig(toolName, key, {
-                lastCheckedAt: now,
-                latestKnownVersion
-            });
-        }
-        return {
-            lastCheckedAt: now,
-            latestKnownVersion
-        };
-    }
-    catch (error) {
-        log.debug('Update check skipped due to error:', error);
-        return null;
-    }
-}

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,6 +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.
- */
-export declare const cliExitWithError: (error: PgpmError | Error | string, context?: Record<string, any>) => Promise<never>;

package/utils/cli-error.js

@@ -1,35 +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 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.
- */
-const cliExitWithError = async (error, context) => {
-    if (error instanceof types_1.PgpmError) {
-        log.error(`Error: ${error.message}`);
-        if (error.context && Object.keys(error.context).length > 0) {
-            log.debug('Error context:', error.context);
-        }
-        if (context) {
-            log.debug('Additional context:', context);
-        }
-    }
-    else if (error instanceof Error) {
-        log.error(`Error: ${error.message}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    else if (typeof error === 'string') {
-        log.error(`Error: ${error}`);
-        if (context) {
-            log.debug('Context:', context);
-        }
-    }
-    process.exit(1);
-};
-exports.cliExitWithError = cliExitWithError;

package/utils/update-check.d.ts

@@ -1,15 +0,0 @@
-export interface CheckForUpdatesOptions {
-    pkgName?: string;
-    pkgVersion?: string;
-    command?: string;
-    now?: number;
-    updateCommand?: string;
-    toolName?: string;
-    key?: string;
-}
-interface UpdateCheckConfig {
-    lastCheckedAt: number;
-    latestKnownVersion: string;
-}
-export declare function checkForUpdates(options?: CheckForUpdatesOptions): Promise<UpdateCheckConfig | null>;
-export {};

package/utils/update-check.js

@@ -1,113 +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.checkForUpdates = checkForUpdates;
-const find_and_require_package_json_1 = require("find-and-require-package-json");
-const logger_1 = require("@pgpmjs/logger");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const log = new logger_1.Logger('update-check');
-const UPDATE_CHECK_TTL_MS = 7 * 24 * 60 * 60 * 1000; // 1 week
-const shouldSkip = (command) => {
-    if (process.env.PGPM_SKIP_UPDATE_CHECK)
-        return true;
-    if (process.env.CI === 'true')
-        return true;
-    return false;
-};
-function getConfigPath(toolName, key) {
-    const configDir = path_1.default.join(os_1.default.homedir(), `.${toolName}`);
-    return path_1.default.join(configDir, `${key}.json`);
-}
-function readConfig(toolName, key) {
-    try {
-        const configPath = getConfigPath(toolName, key);
-        if (!fs_1.default.existsSync(configPath))
-            return null;
-        const content = fs_1.default.readFileSync(configPath, 'utf8');
-        return JSON.parse(content);
-    }
-    catch {
-        return null;
-    }
-}
-function writeConfig(toolName, key, config) {
-    try {
-        const configPath = getConfigPath(toolName, key);
-        const configDir = path_1.default.dirname(configPath);
-        if (!fs_1.default.existsSync(configDir)) {
-            fs_1.default.mkdirSync(configDir, { recursive: true });
-        }
-        fs_1.default.writeFileSync(configPath, JSON.stringify(config, null, 2));
-    }
-    catch {
-        // Ignore write errors
-    }
-}
-async function fetchLatestVersion(pkgName) {
-    try {
-        const response = await fetch(`https://registry.npmjs.org/${pkgName}/latest`);
-        if (!response.ok)
-            return null;
-        const data = await response.json();
-        return data.version || null;
-    }
-    catch {
-        return null;
-    }
-}
-function compareVersions(current, latest) {
-    const currentParts = current.replace(/^v/, '').split('.').map(Number);
-    const latestParts = latest.replace(/^v/, '').split('.').map(Number);
-    for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
-        const c = currentParts[i] || 0;
-        const l = latestParts[i] || 0;
-        if (c < l)
-            return -1;
-        if (c > l)
-            return 1;
-    }
-    return 0;
-}
-async function checkForUpdates(options = {}) {
-    const { pkgName = '@constructive-io/cli', pkgVersion = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname).version, command, now = Date.now(), key = 'update-check', toolName = 'constructive' } = options;
-    if (shouldSkip(command)) {
-        return null;
-    }
-    try {
-        const existing = readConfig(toolName, key);
-        let latestKnownVersion = existing?.latestKnownVersion ?? pkgVersion;
-        const needsCheck = !existing?.lastCheckedAt || (now - existing.lastCheckedAt) > UPDATE_CHECK_TTL_MS;
-        if (needsCheck) {
-            const fetched = await fetchLatestVersion(pkgName);
-            if (fetched) {
-                latestKnownVersion = fetched;
-            }
-            writeConfig(toolName, key, {
-                lastCheckedAt: now,
-                latestKnownVersion
-            });
-        }
-        const comparison = compareVersions(pkgVersion, latestKnownVersion);
-        const isOutdated = comparison < 0;
-        if (isOutdated) {
-            const updateInstruction = options.updateCommand ?? `Run npm i -g ${pkgName}@latest to upgrade.`;
-            log.warn(`A new version of ${pkgName} is available (current ${pkgVersion}, latest ${latestKnownVersion}). ${updateInstruction}`);
-            writeConfig(toolName, key, {
-                lastCheckedAt: now,
-                latestKnownVersion
-            });
-        }
-        return {
-            lastCheckedAt: now,
-            latestKnownVersion
-        };
-    }
-    catch (error) {
-        log.debug('Update check skipped due to error:', error);
-        return null;
-    }
-}