@heroku/heroku-cli-util 10.7.0-beta.0 → 10.8.0-beta.0

package/dist/utils/pg/bastion.js

@@ -1,6 +1,5 @@
 import debug from 'debug';
 import { EventEmitter } from 'node:events';
-import * as tunnelSsh from 'tunnel-ssh';
 import host from './host.js';
 const pgDebug = debug('pg');
 /**
@@ -211,6 +210,7 @@ class Timeout {
  * @returns Promise that resolves to the created local TCP Server
  */
 async function createSSHTunnelAdapter(config) {
+    const tunnelSsh = await import('tunnel-ssh');
     const tunnelOptions = {
         autoClose: true,
         reconnectOnError: false,

package/dist/utils/pg/psql.js

@@ -1,4 +1,4 @@
-import { ux } from '@oclif/core';
+import { ux } from '@oclif/core/ux';
 import debug from 'debug';
 import { spawn, } from 'node:child_process';
 import { EventEmitter, once } from 'node:events';

package/dist/ux/any-key.js

@@ -1,4 +1,4 @@
-import { Errors } from '@oclif/core';
+import { error } from '@oclif/core/errors';
 import * as color from './colors.js';
 function readChar() {
     return new Promise(resolve => {
@@ -15,8 +15,8 @@ export async function anykey(message) {
     const { isRaw, isTTY } = process.stdin;
     if (!message) {
         message = isTTY
-            ? `Press any key to continue or ${color.yellow('q')} to exit`
-            : `Press enter to continue or ${color.yellow('q')} to exit`;
+            ? `Press any key to continue or ${color.warning('q')} to exit`
+            : `Press enter to continue or ${color.warning('q')} to exit`;
     }
     if (isTTY)
         process.stdin.setRawMode(true);
@@ -27,8 +27,8 @@ export async function anykey(message) {
         process.stderr.write('\n');
     }
     if (char === 'q')
-        Errors.error('quit');
+        error('quit');
     if (char === '\u0003')
-        Errors.error('ctrl-c');
+        error('ctrl-c');
     return char;
 }

package/dist/ux/colors.d.ts

@@ -1,3 +1,5 @@
+import { Ansis } from 'ansis';
+declare const ansis: Ansis;
 /**
  * Color constants for Heroku CLI output
  * Most colors use ANSI256 codes for better compatibility with terminals that don't support TrueColor.
@@ -48,6 +50,19 @@ export declare const disabled: (text: string) => string;
 export declare const command: (text: string) => string;
 export declare const code: (text: string) => string;
 export declare const snippet: (text: string) => string;
+export declare const blue: (text: string) => string;
+export declare const bold: (text: string) => string;
+export declare const cyan: (text: string) => string;
+export declare const gold: (text: string) => string;
+export declare const gray: (text: string) => string;
+export declare const green: (text: string) => string;
+export declare const magenta: (text: string) => string;
+export declare const orange: (text: string) => string;
+export declare const pink: (text: string) => string;
+export declare const purple: (text: string) => string;
+export declare const red: (text: string) => string;
+export declare const teal: (text: string) => string;
+export declare const yellow: (text: string) => string;
 /**
  * Color palette for reference
  * Shows ANSI256 codes for most colors, hex values for magenta, red, and cyan
@@ -154,8 +169,8 @@ export declare const colorPalette: {
  */
 export { COLORS };
 /**
- * Re-export everything from ansis as a passthrough
- * This gives access to all ansis functionality while adding our custom colors
+ * Re-export the configured ansis instance with custom TTY detection
+ * Use color.ansis.bold(), color.ansis.red(), etc. for direct ansis styling
+ * These methods respect the custom shouldEnableColors() logic
  */
-export * from 'ansis';
-export { default as ansi } from 'ansis';
+export { ansis };

package/dist/ux/colors.js

@@ -1,4 +1,30 @@
-import ansis from 'ansis';
+import defaultAnsis, { Ansis } from 'ansis';
+/**
+ * Check if colors should be enabled based on TTY and environment variables.
+ * Colors are disabled by default when output is redirected (not a TTY),
+ * unless FORCE_COLOR is explicitly set.
+ * @returns true if colors should be enabled
+ */
+function shouldEnableColors() {
+    // If FORCE_COLOR is set, let ansis handle it completely
+    if (process.env.FORCE_COLOR !== undefined) {
+        return true; // use default ansis instance with its auto-detection
+    }
+    // If NO_COLOR is set, disable colors
+    if (process.env.NO_COLOR !== undefined && process.env.NO_COLOR !== '0') {
+        return false;
+    }
+    // When output is redirected (not a TTY), disable colors by default
+    if (!process.stdout.isTTY) {
+        return false;
+    }
+    return defaultAnsis.level > 0;
+}
+// Determine if colors are enabled, and create ansis instance with appropriate level
+const colorsEnabled = shouldEnableColors();
+// Create an ansis instance with level 0 (no colors) when colors are disabled
+// This ensures all ansis methods return plain strings without ANSI codes
+const ansis = colorsEnabled ? defaultAnsis : new Ansis(0);
 /**
  * Color constants for Heroku CLI output
  * Most colors use ANSI256 codes for better compatibility with terminals that don't support TrueColor.
@@ -63,40 +89,66 @@ const herokuTheme = {
     addon: (text) => colorize(COLORS.YELLOW)(text),
     app: (text) => purpleColorize()(`${supportsAnsi256 ? '⬢ ' : ''}${text}`),
     attachment: (text) => colorize(COLORS.GOLD)(text),
+    blue: (text) => colorize(COLORS.BLUE)(text),
+    bold: (text) => ansis.bold(text),
     code: (text) => bgColorize(COLORS.CODE_BG).fg(COLORS.CODE_FG).bold(`${text}`),
     command: (text) => bgColorize(COLORS.CODE_BG).fg(COLORS.CODE_FG).bold(` $ ${text} `),
+    cyan: (text) => colorize(COLORS.CYAN)(text),
     datastore: (text) => colorize(COLORS.YELLOW)(`${supportsAnsi256 ? '⛁ ' : ''}${text}`),
     failure: (text) => colorize(COLORS.RED)(text),
+    gold: (text) => colorize(COLORS.GOLD)(text),
+    gray: (text) => colorize(COLORS.GRAY)(text),
+    green: (text) => colorize(COLORS.GREEN)(text),
     inactive: (text) => colorize(COLORS.GRAY)(text),
     info: (text) => colorize(COLORS.TEAL)(text),
     label: (text) => ansis.bold(text),
+    magenta: (text) => colorize(COLORS.MAGENTA)(text),
     name: (text) => colorize(COLORS.PINK)(text),
+    orange: (text) => colorize(COLORS.ORANGE)(text),
+    pink: (text) => colorize(COLORS.PINK)(text),
     pipeline: (text) => colorize(COLORS.MAGENTA)(text),
+    purple: (text) => purpleColorize()(text),
+    red: (text) => colorize(COLORS.RED)(text),
     space: (text) => colorize(COLORS.BLUE)(`${supportsAnsi256 ? '⬡ ' : ''}${text}`),
     success: (text) => colorize(COLORS.GREEN)(text),
+    teal: (text) => colorize(COLORS.TEAL)(text),
     team: (text) => colorize(COLORS.CYAN_LIGHT)(text),
     user: (text) => colorize(COLORS.CYAN)(text),
     warning: (text) => colorize(COLORS.ORANGE)(text),
+    yellow: (text) => colorize(COLORS.YELLOW)(text),
 };
 /** Simple theme: ANSI 8 colors only, no symbols. */
 const simpleTheme = {
     addon: (text) => ansis.yellow(text),
     app: (text) => ansis.magenta(text),
     attachment: (text) => ansis.yellow(text),
+    blue: (text) => ansis.blue(text),
+    bold: (text) => ansis.bold(text),
     code: (text) => ansis.bold(text),
     command: (text) => ansis.bold(` $ ${text} `),
+    cyan: (text) => ansis.cyan(text),
     datastore: (text) => ansis.yellow(text),
     failure: (text) => ansis.red(text),
+    gold: (text) => ansis.yellow(text),
+    gray: (text) => ansis.gray(text),
+    green: (text) => ansis.green(text),
     inactive: (text) => ansis.gray(text),
     info: (text) => ansis.cyan(text),
     label: (text) => ansis.bold(text),
+    magenta: (text) => ansis.magenta(text),
     name: (text) => ansis.magenta(text),
+    orange: (text) => ansis.yellow(text),
+    pink: (text) => ansis.magenta(text),
     pipeline: (text) => ansis.magenta(text),
+    purple: (text) => ansis.magenta(text),
+    red: (text) => ansis.red(text),
     space: (text) => ansis.cyan(text),
     success: (text) => ansis.green(text),
+    teal: (text) => ansis.cyan(text),
     team: (text) => ansis.cyan(text),
     user: (text) => ansis.cyan(text),
     warning: (text) => ansis.yellow(text),
+    yellow: (text) => ansis.yellow(text),
 };
 const activeTheme = () => (getTheme() === 'simple' ? simpleTheme : herokuTheme);
 // Colors for entities on the Heroku platform
@@ -124,6 +176,20 @@ export const disabled = inactive;
 export const command = (text) => activeTheme().command(text);
 export const code = (text) => activeTheme().code(text);
 export const snippet = code;
+// Basic color functions
+export const blue = (text) => activeTheme().blue(text);
+export const bold = (text) => activeTheme().bold(text);
+export const cyan = (text) => activeTheme().cyan(text);
+export const gold = (text) => activeTheme().gold(text);
+export const gray = (text) => activeTheme().gray(text);
+export const green = (text) => activeTheme().green(text);
+export const magenta = (text) => activeTheme().magenta(text);
+export const orange = (text) => activeTheme().orange(text);
+export const pink = (text) => activeTheme().pink(text);
+export const purple = (text) => activeTheme().purple(text);
+export const red = (text) => activeTheme().red(text);
+export const teal = (text) => activeTheme().teal(text);
+export const yellow = (text) => activeTheme().yellow(text);
 /**
  * Color palette for reference
  * Shows ANSI256 codes for most colors, hex values for magenta, red, and cyan
@@ -154,8 +220,8 @@ export const colorPalette = {
  */
 export { COLORS };
 /**
- * Re-export everything from ansis as a passthrough
- * This gives access to all ansis functionality while adding our custom colors
+ * Re-export the configured ansis instance with custom TTY detection
+ * Use color.ansis.bold(), color.ansis.red(), etc. for direct ansis styling
+ * These methods respect the custom shouldEnableColors() logic
  */
-export * from 'ansis';
-export { default as ansi } from 'ansis';
+export { ansis };

package/dist/ux/confirm-command.js

@@ -1,4 +1,4 @@
-import { ux } from '@oclif/core';
+import { ux } from '@oclif/core/ux';
 import tsheredoc from 'tsheredoc';
 import * as color from './colors.js';
 import { prompt } from './prompt.js';

package/dist/ux/confirm.js

@@ -1,7 +1,7 @@
-import { ux } from '@oclif/core';
-import { createPromptModule } from 'inquirer';
-const prompt = createPromptModule();
+import { ux } from '@oclif/core/ux';
 export const confirm = async (message, { defaultAnswer = false, ms = 10_000, } = {}) => {
+    const { createPromptModule } = await import('inquirer');
+    const prompt = createPromptModule();
     let timeoutId;
     const promptPromise = prompt([{
             default: defaultAnswer,

package/dist/ux/open-url.d.ts

@@ -1,8 +1,8 @@
-import open from 'open';
+import type open from 'open';
 import { anykey } from './any-key.js';
-declare const defaultDependencies: {
+type Dependencies = {
     anykey: typeof anykey;
     urlOpener: typeof open;
 };
-export declare function openUrl(url: string, browser?: string, action?: string, dependencies?: typeof defaultDependencies): Promise<void>;
+export declare function openUrl(url: string, browser?: string, action?: string, dependencies?: Dependencies): Promise<void>;
 export {};

package/dist/ux/open-url.js

@@ -1,23 +1,25 @@
-import { ux } from '@oclif/core';
-import open from 'open';
+import { ux } from '@oclif/core/ux';
 import { anykey } from './any-key.js';
 import * as color from './colors.js';
-const defaultDependencies = {
-    anykey,
-    urlOpener: open,
-};
-export async function openUrl(url, browser, action, dependencies = defaultDependencies) {
+export async function openUrl(url, browser, action, dependencies) {
+    if (!dependencies) {
+        const openModule = await import('open');
+        dependencies = {
+            anykey,
+            urlOpener: openModule.default,
+        };
+    }
     let browserErrorShown = false;
     const showBrowserError = (browser) => {
         if (browserErrorShown)
             return;
         ux.warn(`We can't open ${browser ?? 'your default'} browser.`
-            + ` Use a different browser or visit ${color.cyan(url)}${action ? ` to ${action}` : ''}.`);
+            + ` Use a different browser or visit ${color.info(url)}${action ? ` to ${action}` : ''}.`);
         browserErrorShown = true;
     };
-    ux.stdout(`Opening ${color.cyan(url)} in ${browser ?? 'your default'} browser…`);
+    ux.stdout(`Opening ${color.info(url)} in ${browser ?? 'your default'} browser…`);
     try {
-        await dependencies.anykey(`Press any key to open up the browser${action ? ` to ${action}` : ''}, or ${color.yellow('q')} to exit`);
+        await dependencies.anykey(`Press any key to open up the browser${action ? ` to ${action}` : ''}, or ${color.warning('q')} to exit`);
     }
     catch (error) {
         const { message, oclif } = error;

package/dist/ux/prompt.js

@@ -1,6 +1,6 @@
-import inquirer from 'inquirer';
 export async function prompt(name, options) {
-    const { answer } = await inquirer.prompt([{
+    const inquirer = await import('inquirer');
+    const { answer } = await inquirer.default.prompt([{
             default: options?.default,
             message: name,
             name: 'answer',

package/dist/ux/styled-header.js

@@ -1,4 +1,4 @@
-import { ux } from '@oclif/core';
+import { ux } from '@oclif/core/ux';
 import * as color from './colors.js';
 export function styledHeader(header) {
     return ux.stdout(color.label('=== ') + color.label(header) + '\n');

package/dist/ux/styled-json.js

@@ -1,4 +1,4 @@
-import { ux } from '@oclif/core';
+import { ux } from '@oclif/core/ux';
 export function styledJSON(obj) {
     ux.stdout(ux.colorizeJson(obj));
 }

package/dist/ux/styled-object.js

@@ -1,4 +1,4 @@
-import { ux } from '@oclif/core';
+import { ux } from '@oclif/core/ux';
 import { inspect } from 'node:util';
 import * as color from './colors.js';
 function prettyPrint(obj) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@heroku/heroku-cli-util",
-  "version": "10.7.0-beta.0",
+  "version": "10.8.0-beta.0",
   "description": "Set of helpful CLI utilities",
   "author": "Heroku",
   "license": "ISC",
@@ -71,7 +71,6 @@
     "mocha": "^11",
     "mock-stdin": "^1.0.0",
     "nock": "^14.0.11",
-    "open": "^11",
     "sinon": "^20.0.0",
     "sinon-chai": "^4.0.1",
     "tmp": "^0.2.5",
@@ -86,6 +85,7 @@
     "ansis": "^4.1.0",
     "debug": "^4.4.0",
     "inquirer": "^12.6.1",
+    "open": "^11",
     "printf": "^0.6.1",
     "tsheredoc": "^1.0.1",
     "tunnel-ssh": "5.2.0"