@heroku/heroku-cli-util 10.4.0 → 10.6.0

package/dist/ux/colors.d.ts

@@ -20,6 +20,13 @@ declare const COLORS: {
     readonly TEAL: 43;
     readonly YELLOW: 185;
 };
+/** Theme name: 'heroku' (default) or 'simple' (ANSI 8 only). Set via HEROKU_THEME env. */
+export type ThemeName = 'heroku' | 'simple';
+/**
+ * Resolves active theme from HEROKU_THEME; defaults to 'heroku'.
+ * @returns The active theme name.
+ */
+export declare function getTheme(): ThemeName;
 export declare const app: (text: string) => string;
 export declare const pipeline: (text: string) => string;
 export declare const space: (text: string) => string;

package/dist/ux/colors.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-named-as-default-member */
-import ansi from 'ansis';
+import ansis from 'ansis';
 /**
  * Color constants for Heroku CLI output
  * Most colors use ANSI256 codes for better compatibility with terminals that don't support TrueColor.
@@ -42,37 +42,88 @@ const COLORS = {
  * Colors use ANSI256 codes where possible, with hex values for magenta, red, and cyan
  */
 // Helper function to apply color based on type (number = ANSI256, string = hex)
-const colorize = (color) => typeof color === 'number' ? ansi.fg(color) : ansi.hex(color);
-const bgColorize = (color) => typeof color === 'number' ? ansi.bg(color) : ansi.bgHex(color);
+const colorize = (color) => typeof color === 'number' ? ansis.fg(color) : ansis.hex(color);
+const bgColorize = (color) => typeof color === 'number' ? ansis.bg(color) : ansis.bgHex(color);
 // Check if terminal supports at least ANSI256 (level >= 2)
 // Level values: 0=no color, 1=ANSI16, 2=ANSI256, 3=TrueColor
-const supportsAnsi256 = ansi.level >= 2;
+const supportsAnsi256 = ansis.level >= 2;
 // Helper function for purple color that falls back to ANSI16 magenta when only ANSI16 is supported
-const purpleColorize = () => supportsAnsi256 ? ansi.fg(COLORS.PURPLE) : ansi.magenta;
+const purpleColorize = () => supportsAnsi256 ? ansis.fg(COLORS.PURPLE) : ansis.magenta;
+const THEME_ENV = 'HEROKU_THEME';
+/**
+ * Resolves active theme from HEROKU_THEME; defaults to 'heroku'.
+ * @returns The active theme name.
+ */
+export function getTheme() {
+    const v = process.env[THEME_ENV]?.toLowerCase().trim();
+    if (v === 'simple')
+        return 'simple';
+    return 'heroku';
+}
+const herokuTheme = {
+    addon: (text) => colorize(COLORS.YELLOW)(text),
+    app: (text) => purpleColorize()(`${supportsAnsi256 ? '⬢ ' : ''}${text}`),
+    attachment: (text) => colorize(COLORS.GOLD)(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} `),
+    datastore: (text) => colorize(COLORS.YELLOW)(`${supportsAnsi256 ? '⛁ ' : ''}${text}`),
+    failure: (text) => colorize(COLORS.RED)(text),
+    inactive: (text) => colorize(COLORS.GRAY)(text),
+    info: (text) => colorize(COLORS.TEAL)(text),
+    label: (text) => ansis.bold(text),
+    name: (text) => colorize(COLORS.PINK)(text),
+    pipeline: (text) => colorize(COLORS.MAGENTA)(text),
+    space: (text) => colorize(COLORS.BLUE)(`${supportsAnsi256 ? '⬡ ' : ''}${text}`),
+    success: (text) => colorize(COLORS.GREEN)(text),
+    team: (text) => colorize(COLORS.CYAN_LIGHT)(text),
+    user: (text) => colorize(COLORS.CYAN)(text),
+    warning: (text) => colorize(COLORS.ORANGE)(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),
+    code: (text) => ansis.bold(text),
+    command: (text) => ansis.bold(` $ ${text} `),
+    datastore: (text) => ansis.yellow(text),
+    failure: (text) => ansis.red(text),
+    inactive: (text) => ansis.gray(text),
+    info: (text) => ansis.cyan(text),
+    label: (text) => ansis.bold(text),
+    name: (text) => ansis.magenta(text),
+    pipeline: (text) => ansis.magenta(text),
+    space: (text) => ansis.cyan(text),
+    success: (text) => ansis.green(text),
+    team: (text) => ansis.cyan(text),
+    user: (text) => ansis.cyan(text),
+    warning: (text) => ansis.yellow(text),
+};
+const activeTheme = () => (getTheme() === 'simple' ? simpleTheme : herokuTheme);
 // Colors for entities on the Heroku platform
-export const app = (text) => purpleColorize()(`${supportsAnsi256 ? '⬢ ' : ''}${text}`);
-export const pipeline = (text) => colorize(COLORS.MAGENTA)(text);
-export const space = (text) => colorize(COLORS.BLUE)(`${supportsAnsi256 ? '⬡ ' : ''}${text}`);
-export const datastore = (text) => colorize(COLORS.YELLOW)(`${supportsAnsi256 ? '⛁ ' : ''}${text}`);
-export const addon = (text) => colorize(COLORS.YELLOW)(text);
-export const attachment = (text) => colorize(COLORS.GOLD)(text);
-export const name = (text) => colorize(COLORS.PINK)(text);
+export const app = (text) => activeTheme().app(text);
+export const pipeline = (text) => activeTheme().pipeline(text);
+export const space = (text) => activeTheme().space(text);
+export const datastore = (text) => activeTheme().datastore(text);
+export const addon = (text) => activeTheme().addon(text);
+export const attachment = (text) => activeTheme().attachment(text);
+export const name = (text) => activeTheme().name(text);
 // Status colors
-export const success = (text) => colorize(COLORS.GREEN)(text);
+export const success = (text) => activeTheme().success(text);
 export const enabled = success;
-export const failure = (text) => colorize(COLORS.RED)(text);
+export const failure = (text) => activeTheme().failure(text);
 export const error = failure;
-export const warning = (text) => colorize(COLORS.ORANGE)(text);
+export const warning = (text) => activeTheme().warning(text);
 // User/Team colors
-export const team = (text) => colorize(COLORS.CYAN_LIGHT)(text);
-export const user = (text) => colorize(COLORS.CYAN)(text);
+export const team = (text) => activeTheme().team(text);
+export const user = (text) => activeTheme().user(text);
 // General purpose colors
-export const label = (text) => ansi.bold(text);
-export const info = (text) => colorize(COLORS.TEAL)(text);
-export const inactive = (text) => colorize(COLORS.GRAY)(text);
+export const label = (text) => activeTheme().label(text);
+export const info = (text) => activeTheme().info(text);
+export const inactive = (text) => activeTheme().inactive(text);
 export const disabled = inactive;
-export const command = (text) => bgColorize(COLORS.CODE_BG).fg(COLORS.CODE_FG).bold(` $ ${text} `);
-export const code = (text) => bgColorize(COLORS.CODE_BG).fg(COLORS.CODE_FG).bold(`${text}`);
+export const command = (text) => activeTheme().command(text);
+export const code = (text) => activeTheme().code(text);
 export const snippet = code;
 /**
  * Color palette for reference

package/dist/ux/styled-object.js

@@ -27,11 +27,18 @@ export function styledObject(obj, keys) {
     if (typeof obj === 'boolean')
         return obj.toString();
     const output = [];
-    const keyLengths = Object.keys(obj).map(key => key.toString().length);
-    const maxKeyLength = Math.max(...keyLengths) + 2;
+    const keysToIterate = keys || Object.keys(obj);
+    // Only calculate max key length for keys that will actually be displayed
+    const displayableKeys = keysToIterate.filter(key => {
+        const value = obj[key];
+        return value !== null && value !== undefined && (!Array.isArray(value) || value.length > 0);
+    });
+    const keyLengths = displayableKeys.map(key => key.toString().length);
+    const maxKeyLength = keyLengths.length > 0 ? Math.max(...keyLengths) + 2 : 0;
     const logKeyValue = (key, value) => `${color.label(key)}:` + ' '.repeat(maxKeyLength - key.length - 1) + prettyPrint(value);
-    for (const [key, value] of Object.entries(obj)) {
-        if (keys && !keys.includes(key))
+    for (const key of keysToIterate) {
+        const value = obj[key];
+        if (value === null || value === undefined)
             continue;
         if (Array.isArray(value)) {
             if (value.length > 0) {
@@ -41,7 +48,7 @@ export function styledObject(obj, keys) {
                 }
             }
         }
-        else if (value !== null && value !== undefined) {
+        else {
             output.push(logKeyValue(key, value));
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@heroku/heroku-cli-util",
-  "version": "10.4.0",
+  "version": "10.6.0",
   "description": "Set of helpful CLI utilities",
   "author": "Heroku",
   "license": "ISC",
@@ -49,7 +49,7 @@
     "@heroku-cli/command": "^12.0.0",
     "@heroku/http-call": "^5.5.0",
     "@oclif/core": "^4.3.0",
-    "@oclif/table": "0.4.14",
+    "@oclif/table": "0.5.2",
     "ansis": "^4.1.0",
     "debug": "^4.4.0",
     "inquirer": "^12.6.1",