heroku 10.13.2 → 11.0.0-alpha.10

package/lib/lib/accounts/accounts.js

@@ -1,70 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.set = exports.remove = exports.add = exports.current = exports.list = void 0;
-const yaml_1 = require("yaml");
-const fs = require("fs");
-const os = require("node:os");
-const path = require("node:path");
-const netrc_parser_1 = require("netrc-parser");
-function configDir() {
-    const legacyDir = path.join(os.homedir(), '.heroku');
-    if (fs.existsSync(legacyDir)) {
-        return legacyDir;
+import { parse, stringify } from 'yaml';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+export class AccountsWrapper {
+    netrc;
+    async initNetrc() {
+        if (!this.netrc) {
+            const NetrcModule = await import('netrc-parser');
+            const NetrcClass = NetrcModule.Netrc || NetrcModule.default.constructor;
+            this.netrc = new NetrcClass();
+            await this.netrc.load();
+        }
+        return this.netrc;
     }
-    return path.join(os.homedir(), '.config', 'heroku');
-}
-function account(name) {
-    const basedir = path.join(configDir(), 'accounts');
-    const file = fs.readFileSync(path.join(basedir, name), 'utf8');
-    const account = (0, yaml_1.parse)(file);
-    if (account[':username']) {
-        // convert from ruby symbols
-        account.username = account[':username'];
-        account.password = account[':password'];
-        delete account[':username'];
-        delete account[':password'];
+    configDir() {
+        const legacyDir = path.join(os.homedir(), '.heroku');
+        if (fs.existsSync(legacyDir)) {
+            return legacyDir;
+        }
+        return path.join(os.homedir(), '.config', 'heroku');
     }
-    return account;
-}
-function list() {
-    const basedir = path.join(configDir(), 'accounts');
-    try {
-        return fs.readdirSync(basedir)
-            .map(name => Object.assign(account(name), { name }));
+    account(name) {
+        const basedir = path.join(this.configDir(), 'accounts');
+        const file = fs.readFileSync(path.join(basedir, name), 'utf8');
+        const account = parse(file);
+        if (account[':username']) {
+            // convert from ruby symbols
+            account.username = account[':username'];
+            account.password = account[':password'];
+            delete account[':username'];
+            delete account[':password'];
+        }
+        return account;
     }
-    catch (_a) {
-        return [];
+    list() {
+        const basedir = path.join(this.configDir(), 'accounts');
+        try {
+            return fs.readdirSync(basedir)
+                .map(name => Object.assign(this.account(name), { name }));
+        }
+        catch {
+            return [];
+        }
     }
-}
-exports.list = list;
-function current() {
-    if (netrc_parser_1.default.machines['api.heroku.com']) {
-        const current = list().find(a => a.username === netrc_parser_1.default.machines['api.heroku.com'].login);
-        return current && current.name ? current.name : null;
+    async current() {
+        const netrcInstance = await this.initNetrc();
+        if (netrcInstance.machines['api.heroku.com']) {
+            const current = this.list().find(a => a.username === netrcInstance.machines['api.heroku.com'].login);
+            return current && current.name ? current.name : null;
+        }
+        return null;
+    }
+    add(name, username, password) {
+        const basedir = path.join(this.configDir(), 'accounts');
+        fs.mkdirSync(basedir, { recursive: true });
+        fs.writeFileSync(path.join(basedir, name), stringify({ username, password }), 'utf8');
+        fs.chmodSync(path.join(basedir, name), 0o600);
+    }
+    remove(name) {
+        const basedir = path.join(this.configDir(), 'accounts');
+        fs.unlinkSync(path.join(basedir, name));
+    }
+    async set(name) {
+        const netrcInstance = await this.initNetrc();
+        const current = this.account(name);
+        netrcInstance.machines['git.heroku.com'] = { login: current.username, password: current.password };
+        netrcInstance.machines['api.heroku.com'] = { login: current.username, password: current.password };
+        await netrcInstance.save();
     }
-    return null;
-}
-exports.current = current;
-function add(name, username, password) {
-    const basedir = path.join(configDir(), 'accounts');
-    fs.mkdirSync(basedir, { recursive: true });
-    fs.writeFileSync(path.join(basedir, name), (0, yaml_1.stringify)({ username, password }), 'utf8');
-    fs.chmodSync(path.join(basedir, name), 0o600);
-}
-exports.add = add;
-function remove(name) {
-    const basedir = path.join(configDir(), 'accounts');
-    fs.unlinkSync(path.join(basedir, name));
-}
-exports.remove = remove;
-function set(name) {
-    const current = account(name);
-    netrc_parser_1.default.machines['git.heroku.com'] = {};
-    netrc_parser_1.default.machines['api.heroku.com'] = {};
-    netrc_parser_1.default.machines['git.heroku.com'].login = current.username;
-    netrc_parser_1.default.machines['api.heroku.com'].login = current.username;
-    netrc_parser_1.default.machines['git.heroku.com'].password = current.password;
-    netrc_parser_1.default.machines['api.heroku.com'].password = current.password;
-    netrc_parser_1.default.saveSync();
 }
-exports.set = set;
+// Default export for convenience
+export default new AccountsWrapper();

package/lib/lib/addons/addons_wait.js

@@ -1,35 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForAddonDeprovisioning = exports.waitForAddonProvisioning = void 0;
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const waitForAddonProvisioning = async function (api, addon, interval) {
-    var _a;
-    const app = ((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) || '';
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+export const waitForAddonProvisioning = async function (api, addon, interval) {
+    const app = addon.app?.name || '';
     const addonName = addon.name;
-    let addonBody = Object.assign({}, addon);
-    core_1.ux.action.start(`Creating ${color_1.default.addon(addonName || '')}`);
+    let addonBody = { ...addon };
+    ux.action.start(`Creating ${color.addon(addonName || '')}`);
     while (addonBody.state === 'provisioning') {
         // eslint-disable-next-line no-promise-executor-return
         await new Promise(resolve => setTimeout(resolve, interval * 1000));
         const addonResponse = await api.get(`/apps/${app}/addons/${addonName}`, {
             headers: { 'Accept-Expansion': 'addon_service,plan' },
         });
-        addonBody = addonResponse === null || addonResponse === void 0 ? void 0 : addonResponse.body;
+        addonBody = addonResponse?.body;
     }
     if (addonBody.state === 'deprovisioned') {
         throw new Error(`The add-on was unable to be created, with status ${addonBody.state}`);
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
     return addonBody;
 };
-exports.waitForAddonProvisioning = waitForAddonProvisioning;
-const waitForAddonDeprovisioning = async function (api, addon, interval) {
-    var _a;
-    const app = ((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) || '';
+export const waitForAddonDeprovisioning = async function (api, addon, interval) {
+    const app = addon.app?.name || '';
     const addonName = addon.name || '';
-    let addonResponse = Object.assign({}, addon);
-    core_1.ux.action.start(`Destroying ${color_1.default.addon(addonName)}`);
+    let addonResponse = { ...addon };
+    ux.action.start(`Destroying ${color.addon(addonName)}`);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     while (addonResponse.state === 'deprovisioning') {
@@ -38,11 +32,10 @@ const waitForAddonDeprovisioning = async function (api, addon, interval) {
         await api.get(`/apps/${app}/addons/${addonName}`, {
             headers: { 'Accept-Expansion': 'addon_service,plan' },
         }).then(response => {
-            addonResponse = response === null || response === void 0 ? void 0 : response.body;
+            addonResponse = response?.body;
         }).catch(function (error) {
-            var _a;
             // Not ideal, but API deletes the record returning a 404 when deprovisioned.
-            if (error.statusCode === 404 || ((_a = error.http) === null || _a === void 0 ? void 0 : _a.statusCode) === 404) {
+            if (error.statusCode === 404 || error.http?.statusCode === 404) {
                 addonResponse.state = 'deprovisioned';
             }
             else {
@@ -50,7 +43,6 @@ const waitForAddonDeprovisioning = async function (api, addon, interval) {
             }
         });
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
     return addonResponse;
 };
-exports.waitForAddonDeprovisioning = waitForAddonDeprovisioning;

package/lib/lib/addons/create_addon.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const util = require("./util");
-const addons_wait_1 = require("./addons_wait");
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+import * as util from './util.js';
+import { waitForAddonProvisioning } from './addons_wait.js';
 function formatConfigVarsMessage(addon) {
     const configVars = addon.config_vars || [];
     if (configVars.length > 0) {
-        return `Created ${color_1.default.addon(addon.name || '')} as ${configVars.map((c) => color_1.default.configVar(c)).join(', ')}`;
+        return `Created ${color.addon(addon.name || '')} as ${configVars.map((c) => color.configVar(c)).join(', ')}`;
     }
-    return `Created ${color_1.default.addon(addon.name || '')}`;
+    return `Created ${color.addon(addon.name || '')}`;
 }
 // eslint-disable-next-line max-params
-async function default_1(heroku, app, plan, confirm, wait, options) {
+export default async function (heroku, app, plan, confirm, wait, options) {
     async function createAddonRequest(confirmed) {
-        var _a;
         const body = {
             confirm: confirmed,
             name: options.name,
@@ -22,7 +19,7 @@ async function default_1(heroku, app, plan, confirm, wait, options) {
             plan: { name: plan },
             attachment: { name: options.as },
         };
-        core_1.ux.action.start(`Creating ${plan} on ${color_1.default.app(app)}`);
+        ux.action.start(`Creating ${plan} on ${color.app(app)}`);
         const { body: addon } = await heroku.post(`/apps/${app}/addons`, {
             body,
             headers: {
@@ -30,30 +27,29 @@ async function default_1(heroku, app, plan, confirm, wait, options) {
                 'x-heroku-legacy-provider-messages': 'true',
             },
         });
-        core_1.ux.action.stop(color_1.default.green(util.formatPriceText(((_a = addon.plan) === null || _a === void 0 ? void 0 : _a.price) || '')));
+        ux.action.stop(color.green(util.formatPriceText(addon.plan?.price || '')));
         return addon;
     }
     let addon = await util.trapConfirmationRequired(app, confirm, confirm => (createAddonRequest(confirm)));
     if (addon.provision_message) {
-        core_1.ux.log(addon.provision_message);
+        ux.stdout(addon.provision_message);
     }
     if (addon.state === 'provisioning') {
         if (wait) {
-            core_1.ux.log(`Waiting for ${color_1.default.addon(addon.name || '')}...`);
-            addon = await (0, addons_wait_1.waitForAddonProvisioning)(heroku, addon, 5);
-            core_1.ux.log(formatConfigVarsMessage(addon));
+            ux.stdout(`Waiting for ${color.addon(addon.name || '')}...`);
+            addon = await waitForAddonProvisioning(heroku, addon, 5);
+            ux.stdout(formatConfigVarsMessage(addon));
         }
         else {
-            core_1.ux.log(`${color_1.default.addon(addon.name || '')} is being created in the background. The app will restart when complete...`);
-            core_1.ux.log(`Use ${color_1.default.cmd('heroku addons:info ' + addon.name)} to check creation progress`);
+            ux.stdout(`${color.addon(addon.name || '')} is being created in the background. The app will restart when complete...`);
+            ux.stdout(`Use ${color.cmd('heroku addons:info ' + addon.name)} to check creation progress`);
         }
     }
     else if (addon.state === 'deprovisioned') {
         throw new Error(`The add-on was unable to be created, with status ${addon.state}`);
     }
     else {
-        core_1.ux.log(formatConfigVarsMessage(addon));
+        ux.stdout(formatConfigVarsMessage(addon));
     }
     return addon;
 }
-exports.default = default_1;

package/lib/lib/addons/destroy_addon.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const addons_wait_1 = require("./addons_wait");
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
-async function default_1(heroku, addon, force = false, wait = false) {
+import { waitForAddonDeprovisioning } from './addons_wait.js';
+import { color } from '@heroku-cli/color';
+import { ux } from '@oclif/core';
+export default async function (heroku, addon, force = false, wait = false) {
     const addonName = addon.name || '';
     async function destroyAddonRequest() {
-        var _a, _b;
-        core_1.ux.action.start(`Destroying ${color_1.default.addon(addonName)} on ${color_1.default.app(((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) || '')}`);
-        const { body: addonDelete } = await heroku.delete(`/apps/${(_b = addon.app) === null || _b === void 0 ? void 0 : _b.id}/addons/${addon.id}`, {
+        ux.action.start(`Destroying ${color.addon(addonName)} on ${color.app(addon.app?.name || '')}`);
+        const { body: addonDelete } = await heroku.delete(`/apps/${addon.app?.id}/addons/${addon.id}`, {
             headers: { 'Accept-Expansion': 'plan' },
             body: { force },
         }).catch(error => {
@@ -22,9 +19,9 @@ async function default_1(heroku, addon, force = false, wait = false) {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         if (addonDelete.state === 'deprovisioning') {
-            core_1.ux.action.stop(color_1.default.yellow('pending'));
+            ux.action.stop(color.yellow('pending'));
         }
-        core_1.ux.action.stop();
+        ux.action.stop();
         return addonDelete;
     }
     let addonResponse = await destroyAddonRequest();
@@ -32,12 +29,12 @@ async function default_1(heroku, addon, force = false, wait = false) {
     // @ts-ignore
     if (addonResponse.state === 'deprovisioning') {
         if (wait) {
-            core_1.ux.log(`Waiting for ${color_1.default.addon(addonName)}...`);
-            addonResponse = await (0, addons_wait_1.waitForAddonDeprovisioning)(heroku, addonResponse, 5);
+            ux.stdout(`Waiting for ${color.addon(addonName)}...`);
+            addonResponse = await waitForAddonDeprovisioning(heroku, addonResponse, 5);
         }
         else {
-            core_1.ux.log(`${color_1.default.addon(addonName)} is being destroyed in the background. The app will restart when complete...`);
-            core_1.ux.log(`Use ${color_1.default.cmd('heroku addons:info ' + addonName)} to check destruction progress`);
+            ux.stdout(`${color.addon(addonName)} is being destroyed in the background. The app will restart when complete...`);
+            ux.stdout(`Use ${color.cmd('heroku addons:info ' + addonName)} to check destruction progress`);
         }
     }
     else if (addonResponse.state !== 'deprovisioned') {
@@ -45,4 +42,3 @@ async function default_1(heroku, addon, force = false, wait = false) {
     }
     return addonResponse;
 }
-exports.default = default_1;

package/lib/lib/addons/resolve.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
 import type { AddOnAttachment } from '@heroku-cli/schema';
-import type { AddOnAttachmentWithConfigVarsAndPlan } from '../pg/types';
+import type { AddOnAttachmentWithConfigVarsAndPlan } from '../pg/types.js';
 export declare const appAddon: (heroku: APIClient, app: string, id: string, options?: AddOnAttachment) => Promise<AddOnAttachmentWithConfigVarsAndPlan>;
 export declare const addonResolver: (heroku: APIClient, app: string | undefined, id: string, options?: AddOnAttachment) => Promise<AddOnAttachmentWithConfigVarsAndPlan>;
 export declare const appAttachment: (heroku: APIClient, app: string | undefined, id: string, options?: {

package/lib/lib/addons/resolve.js

@@ -1,48 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmbiguousError = exports.NotFound = exports.resolveAddon = exports.attachmentResolver = exports.appAttachment = exports.addonResolver = exports.appAddon = void 0;
-const http_call_1 = require("@heroku/http-call");
-const api_client_1 = require("@heroku-cli/command/lib/api-client");
+import { HTTPError } from '@heroku/http-call';
+import { HerokuAPIError } from '@heroku-cli/command/lib/api-client.js';
 const addonHeaders = {
     Accept: 'application/vnd.heroku+json; version=3.sdk',
     'Accept-Expansion': 'addon_service,plan',
 };
-const appAddon = async function (heroku, app, id, options = {}) {
+export const appAddon = async function (heroku, app, id, options = {}) {
     const response = await heroku.post('/actions/addons/resolve', {
         headers: addonHeaders,
         body: { app: app, addon: id, addon_service: options.addon_service },
     });
-    return singularize('addon', options.namespace)(response === null || response === void 0 ? void 0 : response.body);
+    return singularize('addon', options.namespace)(response?.body);
 };
-exports.appAddon = appAddon;
 const handleNotFound = function (err, resource) {
     if (err.statusCode === 404 && err.body && err.body.resource === resource) {
         return true;
     }
     throw err;
 };
-const addonResolver = async (heroku, app, id, options) => {
+export const addonResolver = async (heroku, app, id, options) => {
     const getAddon = async (addonId) => {
         const response = await heroku.post('/actions/addons/resolve', {
             headers: addonHeaders,
-            body: { app: null, addon: addonId, addon_service: options === null || options === void 0 ? void 0 : options.addon_service },
+            body: { app: null, addon: addonId, addon_service: options?.addon_service },
         });
-        return singularize('addon', (options === null || options === void 0 ? void 0 : options.namespace) || '')(response === null || response === void 0 ? void 0 : response.body);
+        return singularize('addon', options?.namespace || '')(response?.body);
     };
     if (!app || id.includes('::')) {
         return getAddon(id);
     }
     try {
-        return await (0, exports.appAddon)(heroku, app, id, options);
+        return await appAddon(heroku, app, id, options);
     }
     catch (error) {
-        if (error instanceof http_call_1.HTTPError && handleNotFound(error, 'add_on')) {
+        if (error instanceof HTTPError && handleNotFound(error, 'add_on')) {
             return getAddon(id);
         }
         throw error;
     }
 };
-exports.addonResolver = addonResolver;
 // -----------------------------------------------------
 // Attachment resolver functions
 // originating from `packages/addons-v5/lib/resolve.js`
@@ -50,11 +45,10 @@ exports.addonResolver = addonResolver;
 const filter = function (app, addonService) {
     return (attachments) => {
         return attachments.filter(attachment => {
-            var _a, _b;
-            if (((_a = attachment === null || attachment === void 0 ? void 0 : attachment.app) === null || _a === void 0 ? void 0 : _a.name) !== app) {
+            if (attachment?.app?.name !== app) {
                 return false;
             }
-            return !(addonService && ((_b = attachment === null || attachment === void 0 ? void 0 : attachment.addon_service) === null || _b === void 0 ? void 0 : _b.name) !== addonService);
+            return !(addonService && attachment?.addon_service?.name !== addonService);
         });
     };
 };
@@ -62,14 +56,13 @@ const attachmentHeaders = {
     Accept: 'application/vnd.heroku+json; version=3.sdk',
     'Accept-Inclusion': 'addon:plan,config_vars',
 };
-const appAttachment = async (heroku, app, id, options = {}) => {
+export const appAttachment = async (heroku, app, id, options = {}) => {
     const result = await heroku.post('/actions/addon-attachments/resolve', {
         headers: attachmentHeaders, body: { app, addon_attachment: id, addon_service: options.addon_service },
     });
     return singularize('addon_attachment', options.namespace)(result.body);
 };
-exports.appAttachment = appAttachment;
-const attachmentResolver = async (heroku, app, id, options = {}) => {
+export const attachmentResolver = async (heroku, app, id, options = {}) => {
     async function getAttachment(id) {
         try {
             const result = await heroku.post('/actions/addon-attachments/resolve', {
@@ -78,31 +71,30 @@ const attachmentResolver = async (heroku, app, id, options = {}) => {
             return singularize('addon_attachment', options.namespace || '')(result.body);
         }
         catch (error) {
-            if (error instanceof api_client_1.HerokuAPIError) {
+            if (error instanceof HerokuAPIError) {
                 handleNotFound(error.http, 'add_on attachment');
             }
         }
     }
     async function getAppAddonAttachment(addon, app) {
-        var _a;
         try {
-            const result = await heroku.get(`/addons/${encodeURIComponent((_a = addon.id) !== null && _a !== void 0 ? _a : '')}/addon-attachments`, { headers: attachmentHeaders });
+            const result = await heroku.get(`/addons/${encodeURIComponent(addon.id ?? '')}/addon-attachments`, { headers: attachmentHeaders });
             const matches = filter(app, options.addon_service)(result.body);
             return singularize('addon_attachment', options.namespace)(matches);
         }
         catch (error) {
-            const err = error instanceof api_client_1.HerokuAPIError ? error.http : error;
+            const err = error instanceof HerokuAPIError ? error.http : error;
             handleNotFound(err, 'add_on attachment');
         }
     }
     // first check to see if there is an attachment matching this app/id combo
     try {
-        const attachment = await (!app || id.includes('::') ? getAttachment(id) : (0, exports.appAttachment)(heroku, app, id, options));
+        const attachment = await (!app || id.includes('::') ? getAttachment(id) : appAttachment(heroku, app, id, options));
         if (attachment) {
             return attachment;
         }
     }
-    catch (_a) { }
+    catch { }
     // if no attachment, look up an add-on that matches the id
     // If we were passed an add-on slug, there still could be an attachment
     // to the context app. Try to find and use it so `context_app` is set
@@ -113,52 +105,48 @@ const attachmentResolver = async (heroku, app, id, options = {}) => {
             return await getAppAddonAttachment(addon, app);
         }
         catch (error) {
-            const err = error instanceof api_client_1.HerokuAPIError ? error.http : error;
+            const err = error instanceof HerokuAPIError ? error.http : error;
             handleNotFound(err, 'add_on attachment');
         }
     }
 };
-exports.attachmentResolver = attachmentResolver;
 // -----------------------------------------------------
 // END
 // -----------------------------------------------------
 const addonResolverMap = new Map();
-async function resolveAddon(...args) {
-    var _a;
+export async function resolveAddon(...args) {
     const [, app, id, options] = args;
-    const key = `${app}|${id}|${(_a = options === null || options === void 0 ? void 0 : options.addon_service) !== null && _a !== void 0 ? _a : ''}`;
-    const promise = addonResolverMap.get(key) || (0, exports.addonResolver)(...args);
+    const key = `${app}|${id}|${options?.addon_service ?? ''}`;
+    const promise = addonResolverMap.get(key) || addonResolver(...args);
     try {
         await promise;
         addonResolverMap.has(key) || addonResolverMap.set(key, promise);
     }
-    catch (_b) {
+    catch {
         addonResolverMap.delete(key);
     }
     return promise;
 }
-exports.resolveAddon = resolveAddon;
 resolveAddon.cache = addonResolverMap;
-class NotFound extends Error {
-    constructor() {
-        super(...arguments);
-        this.statusCode = 404;
-        this.id = 'not_found';
-        this.message = 'Couldn\'t find that addon.';
-    }
+export class NotFound extends Error {
+    statusCode = 404;
+    id = 'not_found';
+    message = 'Couldn\'t find that addon.';
 }
-exports.NotFound = NotFound;
-class AmbiguousError extends Error {
+export class AmbiguousError extends Error {
+    matches;
+    type;
+    statusCode = 422;
+    message;
+    body;
     constructor(matches, type) {
         super();
         this.matches = matches;
         this.type = type;
-        this.statusCode = 422;
-        this.body = { id: 'multiple_matches', message: this.message };
         this.message = `Ambiguous identifier; multiple matching add-ons found: ${matches.map(match => match.name).join(', ')}.`;
+        this.body = { id: 'multiple_matches', message: this.message };
     }
 }
-exports.AmbiguousError = AmbiguousError;
 function singularize(type, namespace) {
     return (matches) => {
         if (namespace) {
@@ -174,7 +162,7 @@ function singularize(type, namespace) {
             case 1:
                 return matches[0];
             default:
-                throw new AmbiguousError(matches, type !== null && type !== void 0 ? type : '');
+                throw new AmbiguousError(matches, type ?? '');
         }
     };
 }

package/lib/lib/addons/util.js

@@ -1,30 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatState = exports.grandfatheredPrice = exports.formatPriceText = exports.formatPrice = exports.trapConfirmationRequired = void 0;
-const confirmCommand_1 = require("../confirmCommand");
-const color_1 = require("@heroku-cli/color");
-const printf = require("printf");
-const trapConfirmationRequired = async (app, confirm, fn) => {
-    var _a;
+import ConfirmCommand from '../confirmCommand.js';
+import { color } from '@heroku-cli/color';
+import printf from 'printf';
+const confirmCommand = new ConfirmCommand();
+export const trapConfirmationRequired = async (app, confirm, fn) => {
     try {
         return await fn(confirm);
     }
     catch (error) {
-        if (!isHttpError(error) || ((_a = error.body) === null || _a === void 0 ? void 0 : _a.id) !== 'confirmation_required') {
+        if (!isHttpError(error) || error.body?.id !== 'confirmation_required') {
             throw error;
         }
-        await (0, confirmCommand_1.default)(app, confirm, error.body.message);
+        await confirmCommand.confirm(app, confirm, error.body.message);
         return fn(app);
     }
 };
-exports.trapConfirmationRequired = trapConfirmationRequired;
 function isHttpError(error) {
     return Boolean(error) && error instanceof Error && Reflect.has(error, 'body');
 }
 // This function assumes that price.cents will reflect price per month.
 // If the API returns any unit other than month
 // this function will need to be updated.
-const formatPrice = function ({ price, hourly }) {
+export const formatPrice = function ({ price, hourly }) {
     if (!price)
         return;
     if (price.contract)
@@ -39,27 +35,23 @@ const formatPrice = function ({ price, hourly }) {
     const fmt = price.cents % 100 === 0 ? '$%.0f/%s' : '$%.02f/%s';
     return printf(fmt, price.cents / 100, price.unit);
 };
-exports.formatPrice = formatPrice;
-const formatPriceText = function (price) {
-    const priceHourly = (0, exports.formatPrice)({ price, hourly: true });
-    const priceMonthly = (0, exports.formatPrice)({ price, hourly: false });
+export const formatPriceText = function (price) {
+    const priceHourly = formatPrice({ price, hourly: true });
+    const priceMonthly = formatPrice({ price, hourly: false });
     if (!priceHourly)
         return '';
     if (priceHourly === 'free' || priceHourly === 'contract' || priceHourly === 'metered')
-        return `${color_1.default.green(priceHourly)}`;
-    return `${color_1.default.green(priceHourly)} (max ${priceMonthly})`;
+        return `${color.green(priceHourly)}`;
+    return `${color.green(priceHourly)} (max ${priceMonthly})`;
 };
-exports.formatPriceText = formatPriceText;
-const grandfatheredPrice = function (addon) {
-    var _a, _b, _c;
-    const price = (_a = addon.plan) === null || _a === void 0 ? void 0 : _a.price;
+export const grandfatheredPrice = function (addon) {
+    const price = addon.plan?.price;
     return Object.assign({}, price, {
-        cents: (_b = addon.billed_price) === null || _b === void 0 ? void 0 : _b.cents,
-        contract: (_c = addon.billed_price) === null || _c === void 0 ? void 0 : _c.contract,
+        cents: addon.billed_price?.cents,
+        contract: addon.billed_price?.contract,
     });
 };
-exports.grandfatheredPrice = grandfatheredPrice;
-const formatState = function (state) {
+export const formatState = function (state) {
     switch (state) {
         case 'provisioned':
             state = 'created';
@@ -78,4 +70,3 @@ const formatState = function (state) {
     }
     return state;
 };
-exports.formatState = formatState;

package/lib/lib/api.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
-import { App, Pipeline, PipelineCoupling } from './types/fir';
+import { App, Pipeline, PipelineCoupling } from './types/fir.js';
 export declare const V3_HEADER = "application/vnd.heroku+json; version=3";
 export declare const SDK_HEADER = "application/vnd.heroku+json; version=3.sdk";
 export declare const FILTERS_HEADER: string;