heroku 10.13.2 → 11.0.0-alpha.1

package/lib/commands/addons/destroy.js

@@ -1,41 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const notify_1 = require("../../lib/notify");
-const confirmCommand_1 = require("../../lib/confirmCommand");
-const destroy_addon_1 = require("../../lib/addons/destroy_addon");
-const resolve_1 = require("../../lib/addons/resolve");
-const lodash_1 = require("lodash");
-class Destroy extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { Command, flags } from '@heroku-cli/command';
+import { Args } from '@oclif/core';
+import notify from '../../lib/notify.js';
+import ConfirmCommand from '../../lib/confirmCommand.js';
+import destroyAddon from '../../lib/addons/destroy_addon.js';
+import { resolveAddon } from '../../lib/addons/resolve.js';
+import _ from 'lodash';
+export default class Destroy extends Command {
+    static topic = 'addons';
+    static description = 'permanently destroy an add-on resource';
+    static strict = false;
+    static examples = ['addons:destroy [ADDON]... [flags]'];
+    static hiddenAliases = ['addons:remove'];
+    static flags = {
+        force: flags.boolean({ char: 'f', description: 'allow destruction even if connected to other apps' }),
+        confirm: flags.string({ char: 'c' }),
+        wait: flags.boolean({ description: 'watch add-on destruction status and exit when complete' }),
+        app: flags.app(),
+        remote: flags.remote(),
+    };
+    static args = {
+        addonName: Args.string({ required: true, description: 'unique identifier or globally unique name of the add-on' }),
+    };
+    static notifier = notify;
     async run() {
-        var _a, _b;
         const { flags, argv } = await this.parse(Destroy);
         const { app, wait, confirm } = flags;
         const force = flags.force || process.env.HEROKU_FORCE === '1';
-        const addons = await Promise.all(argv.map(name => (0, resolve_1.resolveAddon)(this.heroku, app, name)));
+        const addons = await Promise.all(argv.map((name) => resolveAddon(this.heroku, app, name)));
         for (const addon of addons) {
             // prevent deletion of add-on when context.app is set but the addon is attached to a different app
-            const addonApp = (_a = addon.app) === null || _a === void 0 ? void 0 : _a.name;
+            const addonApp = addon.app?.name;
             if (app && addonApp !== app) {
-                throw new Error(`${color_1.default.yellow((_b = addon.name) !== null && _b !== void 0 ? _b : '')} is on ${color_1.default.magenta(addonApp !== null && addonApp !== void 0 ? addonApp : '')} not ${color_1.default.magenta(app)}`);
+                throw new Error(`${color.yellow(addon.name ?? '')} is on ${color.magenta(addonApp ?? '')} not ${color.magenta(app)}`);
             }
         }
-        for (const addonApps of Object.entries((0, lodash_1.groupBy)(addons, 'app.name'))) {
+        for (const addonApps of Object.entries(_.groupBy(addons, 'app.name'))) {
             const currentAddons = addonApps[1];
             const appName = addonApps[0];
-            await (0, confirmCommand_1.default)(appName, confirm);
+            await new ConfirmCommand().confirm(appName, confirm);
             for (const addon of currentAddons) {
                 try {
-                    await (0, destroy_addon_1.default)(this.heroku, addon, force, wait);
+                    await destroyAddon(this.heroku, addon, force, wait);
                     if (wait) {
-                        (0, notify_1.default)(`heroku addons:destroy ${addon.name}`, 'Add-on successfully deprovisioned');
+                        Destroy.notifier(`heroku addons:destroy ${addon.name}`, 'Add-on successfully deprovisioned');
                     }
                 }
                 catch (error) {
                     if (wait) {
-                        (0, notify_1.default)(`heroku addons:destroy ${addon.name}`, 'Add-on failed to deprovision', false);
+                        Destroy.notifier(`heroku addons:destroy ${addon.name}`, 'Add-on failed to deprovision', false);
                     }
                     throw error;
                 }
@@ -43,19 +56,3 @@ class Destroy extends command_1.Command {
         }
     }
 }
-exports.default = Destroy;
-Destroy.topic = 'addons';
-Destroy.description = 'permanently destroy an add-on resource';
-Destroy.strict = false;
-Destroy.examples = ['addons:destroy [ADDON]... [flags]'];
-Destroy.hiddenAliases = ['addons:remove'];
-Destroy.flags = {
-    force: command_1.flags.boolean({ char: 'f', description: 'allow destruction even if connected to other apps' }),
-    confirm: command_1.flags.string({ char: 'c' }),
-    wait: command_1.flags.boolean({ description: 'watch add-on destruction status and exit when complete' }),
-    app: command_1.flags.app(),
-    remote: command_1.flags.remote(),
-};
-Destroy.args = {
-    addonName: core_1.Args.string({ required: true, description: 'unique identifier or globally unique name of the add-on' }),
-};

package/lib/commands/addons/detach.d.ts

@@ -3,11 +3,11 @@ export default class Detach extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
-        attachment_name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        attachment_name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }

package/lib/commands/addons/detach.js

@@ -1,31 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-class Detach extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { Command, flags } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+export default class Detach extends Command {
+    static topic = 'addons';
+    static description = 'detach an existing add-on resource from an app';
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+    };
+    static args = {
+        attachment_name: Args.string({ required: true, description: 'unique identifier of the add-on attachment' }),
+    };
     async run() {
-        var _a, _b;
         const { flags, args } = await this.parse(Detach);
-        const app = flags.app;
+        const { app } = flags;
         const { body: attachment } = await this.heroku.get(`/apps/${app}/addon-attachments/${args.attachment_name}`);
-        core_1.ux.action.start(`Detaching ${color_1.default.cyan(attachment.name || '')} to ${color_1.default.yellow(((_a = attachment.addon) === null || _a === void 0 ? void 0 : _a.name) || '')} from ${color_1.default.magenta(app)}`);
+        ux.action.start(`Detaching ${color.cyan(attachment.name || '')} to ${color.yellow(attachment.addon?.name || '')} from ${color.magenta(app)}`);
         await this.heroku.delete(`/addon-attachments/${attachment.id}`);
-        core_1.ux.action.stop();
-        core_1.ux.action.start(`Unsetting ${color_1.default.cyan(attachment.name || '')} config vars and restarting ${color_1.default.magenta(app)}`);
+        ux.action.stop();
+        ux.action.start(`Unsetting ${color.cyan(attachment.name || '')} config vars and restarting ${color.magenta(app)}`);
         const { body: releases } = await this.heroku.get(`/apps/${app}/releases`, {
             partial: true, headers: { Range: 'version ..; max=1, order=desc' },
         });
-        core_1.ux.action.stop(`done, v${((_b = releases[0]) === null || _b === void 0 ? void 0 : _b.version) || ''}`);
+        ux.action.stop(`done, v${releases[0]?.version || ''}`);
     }
 }
-exports.default = Detach;
-Detach.topic = 'addons';
-Detach.description = 'detach an existing add-on resource from an app';
-Detach.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-};
-Detach.args = {
-    attachment_name: core_1.Args.string({ required: true, description: 'unique identifier of the add-on attachment' }),
-};

package/lib/commands/addons/docs.d.ts

@@ -3,12 +3,13 @@ export default class Docs extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        'show-url': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'show-url': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
-        addon: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        addon: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
+    static urlOpener: (url: string) => Promise<unknown>;
     run(): Promise<void>;
 }

package/lib/commands/addons/docs.js

@@ -1,36 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const resolve_1 = require("../../lib/addons/resolve");
-const open = require("open");
-class Docs extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { Command, flags } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import { resolveAddon } from '../../lib/addons/resolve.js';
+import open from 'open';
+export default class Docs extends Command {
+    static topic = 'addons';
+    static description = "open an add-on's Dev Center documentation in your browser";
+    static flags = {
+        'show-url': flags.boolean({ description: 'show URL, do not open browser' }),
+        app: flags.app(),
+        remote: flags.remote(),
+    };
+    static args = {
+        addon: Args.string({ required: true, description: 'unique identifier or globally unique name of the add-on' }),
+    };
+    static urlOpener = open;
     async run() {
         const { flags, args } = await this.parse(Docs);
         const { app } = flags;
         const id = args.addon.split(':')[0];
         const addonResponse = await this.heroku.get(`/addon-services/${encodeURIComponent(id)}`)
             .catch(() => null);
-        const addon = (addonResponse === null || addonResponse === void 0 ? void 0 : addonResponse.body) ? addonResponse.body : (await (0, resolve_1.resolveAddon)(this.heroku, app, id)).addon_service;
+        const addon = addonResponse?.body ?? (await resolveAddon(this.heroku, app, id)).addon_service;
         const url = `https://devcenter.heroku.com/articles/${addon.name}`;
         if (flags['show-url']) {
-            core_1.ux.log(url);
+            ux.stdout(url);
         }
         else {
-            core_1.ux.log(`Opening ${color_1.default.cyan(url)}...`);
-            await open(url);
+            ux.stdout(`Opening ${color.cyan(url)}...`);
+            await Docs.urlOpener(url);
         }
     }
 }
-exports.default = Docs;
-Docs.topic = 'addons';
-Docs.description = "open an add-on's Dev Center documentation in your browser";
-Docs.flags = {
-    'show-url': command_1.flags.boolean({ description: 'show URL, do not open browser' }),
-    app: command_1.flags.app(),
-    remote: command_1.flags.remote(),
-};
-Docs.args = {
-    addon: core_1.Args.string({ required: true, description: 'unique identifier or globally unique name of the add-on' }),
-};

package/lib/commands/addons/index.d.ts

@@ -6,10 +6,10 @@ export default class Addons extends Command {
     static usage: string;
     static description: string;
     static flags: {
-        all: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static examples: string[];
     run(): Promise<void>;

package/lib/commands/addons/index.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderAttachment = void 0;
-const color_1 = require("@heroku-cli/color");
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const util_1 = require("../../lib/addons/util");
-const lodash_1 = require("lodash");
-const printf = require('printf');
+import { color } from '@heroku-cli/color';
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { formatPrice, grandfatheredPrice, formatState } from '../../lib/addons/util.js';
+import _ from 'lodash';
+import printf from 'printf';
 const topic = 'addons';
 async function addonGetter(api, app) {
     let attachmentsResponse = null;
@@ -43,27 +40,26 @@ async function addonGetter(api, app) {
     // Get addons and attachments in parallel
     const [{ body: addonsRaw }, potentialAttachments] = await Promise.all([addonsResponse, attachmentsResponse]);
     function isRelevantToApp(addon) {
-        var _a;
-        return !app || ((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) === app || (0, lodash_1.some)(addon.attachments, att => att.app.name === app);
+        return !app || addon.app?.name === app || _.some(addon.attachments, att => att.app.name === app);
     }
-    const groupedAttachments = (0, lodash_1.groupBy)(potentialAttachments === null || potentialAttachments === void 0 ? void 0 : potentialAttachments.body, 'addon.id');
+    const groupedAttachments = _.groupBy(potentialAttachments?.body, 'addon.id');
     const addons = [];
-    addonsRaw.forEach(function (addon) {
+    addonsRaw.forEach((addon) => {
         addon.attachments = groupedAttachments[addon.id] || [];
         delete groupedAttachments[addon.id];
         if (isRelevantToApp(addon)) {
             addons.push(addon);
         }
         if (addon.plan) {
-            addon.plan.price = (0, util_1.grandfatheredPrice)(addon);
+            addon.plan.price = grandfatheredPrice(addon);
         }
     });
     // Any attachments left didn't have a corresponding add-on record in API.
     // This is probably normal (because we are asking API for all attachments)
     // but it could also be due to certain types of permissions issues, so check
     // if the attachment looks relevant to the app, and then render whatever
-    (0, lodash_1.values)(groupedAttachments)
-        .forEach(function (atts) {
+    _.values(groupedAttachments)
+        .forEach(atts => {
         const inaccessibleAddon = {
             app: atts[0].addon.app, name: atts[0].addon.name, addon_service: {}, plan: {}, attachments: atts,
         };
@@ -74,140 +70,154 @@ async function addonGetter(api, app) {
     return addons;
 }
 function displayAll(addons) {
-    addons = (0, lodash_1.sortBy)(addons, 'app.name', 'plan.name', 'addon.name');
+    addons = _.sortBy(addons, 'app.name', 'plan.name', 'addon.name');
     if (addons.length === 0) {
-        core_1.ux.log('No add-ons.');
+        ux.stdout('No add-ons.');
         return;
     }
-    heroku_cli_util_1.hux.table(addons, {
+    hux.table(addons, {
         'Owning App': {
-            get: ({ app }) => color_1.default.cyan((app === null || app === void 0 ? void 0 : app.name) || ''),
+            get: ({ app }) => color.cyan(app?.name || ''),
         },
         'Add-on': {
-            get: ({ name }) => color_1.default.magenta(name || ''),
+            get: ({ name }) => color.magenta(name || ''),
         },
         Plan: {
-            get: function ({ plan }) {
-                if (typeof plan === 'undefined')
-                    return color_1.default.dim('?');
+            get({ plan }) {
+                if (plan === undefined)
+                    return color.dim('?');
                 return plan.name;
             },
         },
         Price: {
-            get: function ({ plan }) {
-                if (typeof (plan === null || plan === void 0 ? void 0 : plan.price) === 'undefined')
-                    return color_1.default.dim('?');
-                return (0, util_1.formatPrice)({ price: plan === null || plan === void 0 ? void 0 : plan.price, hourly: true });
+            get({ plan }) {
+                if (plan?.price === undefined)
+                    return color.dim('?');
+                return formatPrice({ price: plan?.price, hourly: true });
             },
         },
         'Max Price': {
-            get: function ({ plan }) {
-                if (typeof (plan === null || plan === void 0 ? void 0 : plan.price) === 'undefined')
-                    return color_1.default.dim('?');
-                return (0, util_1.formatPrice)({ price: plan === null || plan === void 0 ? void 0 : plan.price, hourly: false });
+            get({ plan }) {
+                if (plan?.price === undefined)
+                    return color.dim('?');
+                return formatPrice({ price: plan?.price, hourly: false });
             },
         },
         State: {
-            get: function ({ state }) {
+            get({ state }) {
                 let result = state || '';
                 switch (state) {
-                    case 'provisioned':
+                    case 'provisioned': {
                         result = 'created';
                         break;
-                    case 'provisioning':
+                    }
+                    case 'provisioning': {
                         result = 'creating';
                         break;
-                    case 'deprovisioned':
+                    }
+                    case 'deprovisioned': {
                         result = 'errored';
+                    }
                 }
                 return result;
             },
         },
+    }, {
+        overflow: 'wrap',
     });
 }
 function formatAttachment(attachment, showApp = true) {
-    var _a;
-    const attName = color_1.default.green(attachment.name || '');
-    const output = [color_1.default.dim('as'), attName];
+    const attName = color.green(attachment.name || '');
+    const output = [color.dim('as'), attName];
     if (showApp) {
-        const appInfo = `on ${color_1.default.cyan(((_a = attachment.app) === null || _a === void 0 ? void 0 : _a.name) || '')} app`;
-        output.push(color_1.default.dim(appInfo));
+        const appInfo = `on ${color.cyan(attachment.app?.name || '')} app`;
+        output.push(color.dim(appInfo));
     }
     return output.join(' ');
 }
-function renderAttachment(attachment, app, isFirst = false) {
-    var _a;
+export function renderAttachment(attachment, app, isFirst = false) {
     const line = isFirst ? '\u2514\u2500' : '\u251C\u2500';
-    const attName = formatAttachment(attachment, ((_a = attachment.app) === null || _a === void 0 ? void 0 : _a.name) !== app);
-    return printf(' %s %s', color_1.default.dim(line), attName);
+    const attName = formatAttachment(attachment, attachment.app?.name !== app);
+    return printf(' %s %s', color.dim(line), attName);
 }
-exports.renderAttachment = renderAttachment;
 function displayForApp(app, addons) {
     if (addons.length === 0) {
-        core_1.ux.log(`No add-ons for app ${app}.`);
+        ux.stdout(`No add-ons for app ${app}.`);
         return;
     }
-    const isForeignApp = (attOrAddon) => { var _a; return ((_a = attOrAddon.app) === null || _a === void 0 ? void 0 : _a.name) !== app; };
+    const isForeignApp = (attOrAddon) => attOrAddon.app?.name !== app;
     function presentAddon(addon) {
-        var _a;
-        const name = color_1.default.magenta(addon.name || '');
-        let service = (_a = addon.addon_service) === null || _a === void 0 ? void 0 : _a.name;
+        const name = color.magenta(addon.name || '');
+        let service = addon.addon_service?.name;
         if (service === undefined) {
-            service = color_1.default.dim('?');
+            service = color.dim('?');
         }
         const addonLine = `${service} (${name})`;
-        const atts = (0, lodash_1.sortBy)(addon.attachments, isForeignApp, 'app.name', 'name');
+        const atts = _.sortBy(addon.attachments, isForeignApp, 'app.name', 'name');
         // render each attachment under the add-on
-        const attLines = atts.map(function (attachment, idx) {
+        const attLines = atts.map((attachment, idx) => {
             const isFirst = (idx === addon.attachments.length - 1);
             return renderAttachment(attachment, app, isFirst);
         });
         return [addonLine].concat(attLines)
             .join('\n') + '\n'; // Separate each add-on row by a blank line
     }
-    addons = (0, lodash_1.sortBy)(addons, isForeignApp, 'plan.name', 'name');
-    core_1.ux.log();
-    heroku_cli_util_1.hux.table(addons, {
+    addons = _.sortBy(addons, isForeignApp, 'plan.name', 'name');
+    ux.stdout();
+    hux.table(addons, {
         'Add-on': { get: presentAddon },
         Plan: {
-            get: ({ plan }) => plan && plan.name !== undefined ?
-                plan.name.replace(/^[^:]+:/, '') :
-                color_1.default.dim('?'),
+            get: ({ plan }) => plan && plan.name !== undefined
+                ? plan.name.replace(/^[^:]+:/, '')
+                : color.dim('?'),
         },
         Price: {
-            get: function (addon) {
-                var _a, _b, _c;
-                if (((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) === app) {
-                    return (0, util_1.formatPrice)({ price: (_b = addon.plan) === null || _b === void 0 ? void 0 : _b.price, hourly: true });
+            get(addon) {
+                if (addon.app?.name === app) {
+                    return formatPrice({ price: addon.plan?.price, hourly: true });
                 }
-                return color_1.default.dim(printf('(billed to %s app)', color_1.default.cyan(((_c = addon.app) === null || _c === void 0 ? void 0 : _c.name) || '')));
+                return color.dim(printf('(billed to %s app)', color.cyan(addon.app?.name || '')));
             },
         },
         'Max Price': {
-            get: function (addon) {
-                var _a, _b, _c;
-                if (((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) === app) {
-                    return (0, util_1.formatPrice)({ price: (_b = addon.plan) === null || _b === void 0 ? void 0 : _b.price, hourly: false });
+            get(addon) {
+                if (addon.app?.name === app) {
+                    return formatPrice({ price: addon.plan?.price, hourly: false });
                 }
-                return color_1.default.dim(printf('(billed to %s app)', color_1.default.cyan(((_c = addon.app) === null || _c === void 0 ? void 0 : _c.name) || '')));
+                return color.dim(printf('(billed to %s app)', color.cyan(addon.app?.name || '')));
             },
         },
         State: {
-            get: ({ state }) => (0, util_1.formatState)(state || ''),
+            get: ({ state }) => formatState(state || ''),
         },
     }, {
-    // Separate each add-on row by a blank line
-    // printLine: (s: string) => {
-    //   ux.log(s)
-    //   ux.log('\n')
-    // },
+        overflow: 'wrap',
     });
-    core_1.ux.log(`The table above shows ${color_1.default.magenta('add-ons')} and the ${color_1.default.green('attachments')} to the current app (${app}) or other ${color_1.default.cyan('apps')}.\n  `);
+    ux.stdout(`The table above shows ${color.magenta('add-ons')} and the ${color.green('attachments')} to the current app (${app}) or other ${color.cyan('apps')}.\n  `);
 }
 function displayJSON(addons) {
-    core_1.ux.log(JSON.stringify(addons, null, 2));
+    ux.stdout(JSON.stringify(addons, null, 2));
 }
-class Addons extends command_1.Command {
+export default class Addons extends Command {
+    static topic = topic;
+    static usage = 'addons [--all|--app APP]';
+    static description = `Lists your add-ons and attachments.
+
+  The default filter applied depends on whether you are in a Heroku app
+  directory. If so, the --app flag is implied. If not, the default of --all
+  is implied. Explicitly providing either flag overrides the default
+  behavior.
+  `;
+    static flags = {
+        all: flags.boolean({ char: 'A', description: 'show add-ons and attachments for all accessible apps' }),
+        json: flags.boolean({ description: 'return add-ons in json format' }),
+        app: flags.app(),
+        remote: flags.remote(),
+    };
+    static examples = [
+        `$ heroku ${topic} --all`,
+        `$ heroku ${topic} --app acme-inc-www`,
+    ];
     async run() {
         const { flags } = await this.parse(Addons);
         const { app, all, json } = flags;
@@ -227,23 +237,3 @@ class Addons extends command_1.Command {
         }
     }
 }
-exports.default = Addons;
-Addons.topic = topic;
-Addons.usage = 'addons [--all|--app APP]';
-Addons.description = `Lists your add-ons and attachments.
-
-  The default filter applied depends on whether you are in a Heroku app
-  directory. If so, the --app flag is implied. If not, the default of --all
-  is implied. Explicitly providing either flag overrides the default
-  behavior.
-  `;
-Addons.flags = {
-    all: command_1.flags.boolean({ char: 'A', description: 'show add-ons and attachments for all accessible apps' }),
-    json: command_1.flags.boolean({ description: 'return add-ons in json format' }),
-    app: command_1.flags.app(),
-    remote: command_1.flags.remote(),
-};
-Addons.examples = [
-    `$ heroku ${topic} --all`,
-    `$ heroku ${topic} --app acme-inc-www`,
-];

package/lib/commands/addons/info.d.ts

@@ -3,12 +3,12 @@ export default class Info extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static usage: string;
     static args: {
-        addon: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        addon: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }