heroku 10.13.2 → 11.0.0-alpha.1

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;

package/lib/lib/api.js

@@ -1,149 +1,129 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTestRun = exports.getTestNodes = exports.createTestRun = exports.setPipelineConfigVars = exports.getPipelineConfigVars = exports.getReleases = exports.updateCoupling = exports.removeCoupling = exports.patchCoupling = exports.listPipelineApps = exports.getAppSetup = exports.getAccountInfo = exports.getTeam = exports.updatePipeline = exports.getPipeline = exports.getCoupling = exports.findPipelineByName = exports.destroyPipeline = exports.createPipelineTransfer = exports.createPipeline = exports.createCoupling = exports.postCoupling = exports.createAppSetup = exports.PIPELINES_HEADER = exports.FILTERS_HEADER = exports.SDK_HEADER = exports.V3_HEADER = void 0;
-exports.V3_HEADER = 'application/vnd.heroku+json; version=3';
-exports.SDK_HEADER = 'application/vnd.heroku+json; version=3.sdk';
-exports.FILTERS_HEADER = `${exports.V3_HEADER}.filters`;
-exports.PIPELINES_HEADER = `${exports.V3_HEADER}.pipelines`;
-const CI_HEADER = `${exports.V3_HEADER}.ci`;
-function createAppSetup(heroku, body) {
+export const V3_HEADER = 'application/vnd.heroku+json; version=3';
+export const SDK_HEADER = 'application/vnd.heroku+json; version=3.sdk';
+export const FILTERS_HEADER = `${V3_HEADER}.filters`;
+export const PIPELINES_HEADER = `${V3_HEADER}.pipelines`;
+const CI_HEADER = `${V3_HEADER}.ci`;
+export function createAppSetup(heroku, body) {
     return heroku.post('/app-setups', { body });
 }
-exports.createAppSetup = createAppSetup;
-function postCoupling(heroku, pipeline, app, stage) {
+export function postCoupling(heroku, pipeline, app, stage) {
     return heroku.post('/pipeline-couplings', {
         body: { app, pipeline, stage },
     });
 }
-exports.postCoupling = postCoupling;
-function createCoupling(heroku, pipeline, app, stage) {
+export function createCoupling(heroku, pipeline, app, stage) {
     return postCoupling(heroku, pipeline.id, app, stage);
 }
-exports.createCoupling = createCoupling;
-function createPipeline(heroku, name, owner, generationName = 'cedar') {
+export function createPipeline(heroku, name, owner, generationName = 'cedar') {
     return heroku.request('/pipelines', {
         method: 'POST',
-        headers: { Accept: exports.PIPELINES_HEADER },
+        headers: { Accept: PIPELINES_HEADER },
         body: { name, owner, generation: { name: generationName } },
     });
 }
-exports.createPipeline = createPipeline;
-function createPipelineTransfer(heroku, pipeline) {
+export function createPipelineTransfer(heroku, pipeline) {
     return heroku.post('/pipeline-transfers', {
         body: pipeline,
     });
 }
-exports.createPipelineTransfer = createPipelineTransfer;
 function deleteCoupling(heroku, id) {
     return heroku.delete(`/pipeline-couplings/${id}`);
 }
-function destroyPipeline(heroku, name, pipelineId) {
+export function destroyPipeline(heroku, name, pipelineId) {
     return heroku.request(`/pipelines/${pipelineId}`, {
         method: 'DELETE',
-        headers: { Accept: exports.PIPELINES_HEADER },
+        headers: { Accept: PIPELINES_HEADER },
         body: { name },
     });
 }
-exports.destroyPipeline = destroyPipeline;
-function findPipelineByName(heroku, idOrName) {
+export function findPipelineByName(heroku, idOrName) {
     return heroku.request(`/pipelines?eq[name]=${idOrName}`, {
         method: 'GET',
-        headers: { Accept: exports.PIPELINES_HEADER },
+        headers: { Accept: PIPELINES_HEADER },
     });
 }
-exports.findPipelineByName = findPipelineByName;
-function getCoupling(heroku, app) {
+export function getCoupling(heroku, app) {
     return heroku.get(`/apps/${app}/pipeline-couplings`, {
-        headers: { Accept: exports.SDK_HEADER },
+        headers: { Accept: SDK_HEADER },
     });
 }
-exports.getCoupling = getCoupling;
-function getPipeline(heroku, id) {
+export function getPipeline(heroku, id) {
     return heroku.request(`/pipelines/${id}`, {
         method: 'GET',
-        headers: { Accept: exports.PIPELINES_HEADER },
+        headers: { Accept: PIPELINES_HEADER },
     });
 }
-exports.getPipeline = getPipeline;
-function updatePipeline(heroku, id, body) {
+export function updatePipeline(heroku, id, body) {
     return heroku.patch(`/pipelines/${id}`, {
         body,
     });
 }
-exports.updatePipeline = updatePipeline;
-function getTeam(heroku, teamId) {
+export function getTeam(heroku, teamId) {
     return heroku.get(`/teams/${teamId}`);
 }
-exports.getTeam = getTeam;
 function getAppFilter(heroku, appIds) {
     return heroku.request('/filters/apps', {
         method: 'POST',
-        headers: { Accept: exports.FILTERS_HEADER, Range: 'id ..; max=1000;' },
+        headers: { Accept: FILTERS_HEADER, Range: 'id ..; max=1000;' },
         body: { in: { id: appIds } },
     });
 }
-function getAccountInfo(heroku, id = '~') {
+export function getAccountInfo(heroku, id = '~') {
     return heroku.get(`/users/${id}`);
 }
-exports.getAccountInfo = getAccountInfo;
-function getAppSetup(heroku, buildId) {
+export function getAppSetup(heroku, buildId) {
     return heroku.get(`/app-setups/${buildId}`);
 }
-exports.getAppSetup = getAppSetup;
 function listCouplings(heroku, pipelineId) {
     return heroku.get(`/pipelines/${pipelineId}/pipeline-couplings`, {
-        headers: { Accept: exports.SDK_HEADER },
+        headers: { Accept: SDK_HEADER },
     });
 }
-async function listPipelineApps(heroku, pipelineId) {
+export async function listPipelineApps(heroku, pipelineId) {
     const { body: couplings } = await listCouplings(heroku, pipelineId);
     const appIds = couplings.map(coupling => coupling.app.id || '');
     const { body: apps } = await getAppFilter(heroku, appIds);
     return apps.map(app => {
-        return Object.assign(Object.assign({}, app), { pipelineCoupling: couplings.find(coupling => coupling.app.id === app.id) });
+        return {
+            ...app,
+            pipelineCoupling: couplings.find(coupling => coupling.app.id === app.id),
+        };
     });
 }
-exports.listPipelineApps = listPipelineApps;
-function patchCoupling(heroku, id, stage) {
+export function patchCoupling(heroku, id, stage) {
     return heroku.patch(`/pipeline-couplings/${id}`, { body: { stage } });
 }
-exports.patchCoupling = patchCoupling;
-function removeCoupling(heroku, app) {
+export function removeCoupling(heroku, app) {
     return getCoupling(heroku, app)
         .then(({ body }) => {
         return deleteCoupling(heroku, body.id);
     });
 }
-exports.removeCoupling = removeCoupling;
-function updateCoupling(heroku, app, stage) {
+export function updateCoupling(heroku, app, stage) {
     return getCoupling(heroku, app)
         .then(({ body: coupling }) => patchCoupling(heroku, coupling.id, stage));
 }
-exports.updateCoupling = updateCoupling;
-function getReleases(heroku, appId) {
+export function getReleases(heroku, appId) {
     return heroku.get(`/apps/${appId}/releases`, {
-        headers: { Accept: exports.SDK_HEADER, Range: 'version ..; order=desc' },
+        headers: { Accept: SDK_HEADER, Range: 'version ..; order=desc' },
         partial: true,
     });
 }
-exports.getReleases = getReleases;
-function getPipelineConfigVars(heroku, pipelineID) {
+export function getPipelineConfigVars(heroku, pipelineID) {
     return heroku.request(`/pipelines/${pipelineID}/stage/test/config-vars`, {
         method: 'GET',
-        headers: { Accept: exports.PIPELINES_HEADER },
+        headers: { Accept: PIPELINES_HEADER },
     });
 }
-exports.getPipelineConfigVars = getPipelineConfigVars;
-function setPipelineConfigVars(heroku, pipelineID, body) {
+export function setPipelineConfigVars(heroku, pipelineID, body) {
     return heroku.request(`/pipelines/${pipelineID}/stage/test/config-vars`, {
         method: 'PATCH',
-        headers: { Accept: exports.PIPELINES_HEADER },
+        headers: { Accept: PIPELINES_HEADER },
         path: `/pipelines/${pipelineID}/stage/test/config-vars`,
         body,
     });
 }
-exports.setPipelineConfigVars = setPipelineConfigVars;
-async function createTestRun(heroku, body) {
+export async function createTestRun(heroku, body) {
     const headers = {
         Accept: CI_HEADER,
     };
@@ -153,8 +133,7 @@ async function createTestRun(heroku, body) {
         body,
     });
 }
-exports.createTestRun = createTestRun;
-async function getTestNodes(heroku, testRunIdD) {
+export async function getTestNodes(heroku, testRunIdD) {
     return heroku.request(`/test-runs/${testRunIdD}/test-nodes`, {
         headers: {
             Authorization: `Bearer ${heroku.auth}`,
@@ -162,8 +141,7 @@ async function getTestNodes(heroku, testRunIdD) {
         },
     });
 }
-exports.getTestNodes = getTestNodes;
-function updateTestRun(heroku, id, body) {
+export function updateTestRun(heroku, id, body) {
     return heroku.request(`/test-runs/${id}`, {
         body,
         method: 'PATCH',
@@ -172,4 +150,3 @@ function updateTestRun(heroku, id, body) {
         },
     });
 }
-exports.updateTestRun = updateTestRun;

package/lib/lib/apps/app-transfer.js

@@ -1,35 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.appTransfer = void 0;
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
+import { color } from '@heroku-cli/color';
+import { ux } from '@oclif/core';
 const getRequestOpts = (options) => {
     const { appName, bulk, recipient, personalToPersonal } = options;
     const isPersonalToPersonal = personalToPersonal || personalToPersonal === undefined;
     const requestOpts = isPersonalToPersonal ?
         {
             body: { app: appName, recipient },
-            transferMsg: `Initiating transfer of ${color_1.color.app(appName)}`,
+            transferMsg: `Initiating transfer of ${color.app(appName)}`,
             path: '/account/app-transfers',
             method: 'POST',
         } : {
         body: { owner: recipient },
-        transferMsg: `Transferring ${color_1.color.app(appName)}`,
+        transferMsg: `Transferring ${color.app(appName)}`,
         path: `/teams/apps/${appName}`,
         method: 'PATCH',
     };
     if (!bulk)
-        requestOpts.transferMsg += ` to ${color_1.color.magenta(recipient)}`;
+        requestOpts.transferMsg += ` to ${color.magenta(recipient)}`;
     return requestOpts;
 };
-const appTransfer = async (options) => {
+export const appTransfer = async (options) => {
     const { body, transferMsg, path, method } = getRequestOpts(options);
-    core_1.ux.action.start(transferMsg);
+    ux.action.start(transferMsg);
     const { body: request } = await options.heroku.request(path, {
         method,
         body,
     });
     const message = request.state === 'pending' ? 'email sent' : undefined;
-    core_1.ux.action.stop(message);
+    ux.action.stop(message);
 };
-exports.appTransfer = appTransfer;

package/lib/lib/apps/error_info.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const ERROR_INFO = [
     {
         name: 'H10',
@@ -182,4 +180,4 @@ const ERROR_INFO = [
         level: 'critical',
     },
 ];
-exports.default = ERROR_INFO;
+export default ERROR_INFO;

package/lib/lib/apps/generation.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
-import { App, Space, DynoSize, TeamApp, Pipeline, Generation, AppGeneration, DynoSizeGeneration, PipelineGeneration } from '../types/fir';
-import Dyno from '../run/dyno';
+import { App, Space, DynoSize, TeamApp, Pipeline, Generation, AppGeneration, DynoSizeGeneration, PipelineGeneration } from '../types/fir.js';
+import Dyno from '../run/dyno.js';
 export declare type GenerationKind = 'fir' | 'cedar';
 export declare type GenerationLike = Generation | AppGeneration | DynoSizeGeneration | PipelineGeneration | Dyno;
 export declare type GenerationCapable = App | Space | DynoSize | TeamApp | Pipeline;

package/lib/lib/apps/generation.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGenerationByAppId = exports.getGeneration = void 0;
 function getGenerationFromGenerationLike(generation) {
-    var _a;
     let maybeGeneration = '';
     if (typeof generation === 'string') {
         maybeGeneration = generation;
     }
     else if (generation && 'name' in generation) {
-        maybeGeneration = (_a = generation.name) !== null && _a !== void 0 ? _a : '';
+        maybeGeneration = generation.name ?? '';
     }
     if (/(fir|cedar)/.test(maybeGeneration)) {
         return maybeGeneration;
@@ -29,13 +25,12 @@ function getGenerationFromGenerationLike(generation) {
  * @param source The object to get the generation from
  * @returns The generation of the object
  */
-function getGeneration(source) {
+export function getGeneration(source) {
     if (typeof source === 'object' && 'generation' in source) {
         return getGenerationFromGenerationLike(source.generation);
     }
     return getGenerationFromGenerationLike(source);
 }
-exports.getGeneration = getGeneration;
 /**
  * Get the generation of an app by id or name
  *
@@ -43,10 +38,9 @@ exports.getGeneration = getGeneration;
  * @param herokuApi The Heroku API client to use
  * @returns The generation of the app
  */
-async function getGenerationByAppId(appIdOrName, herokuApi) {
+export async function getGenerationByAppId(appIdOrName, herokuApi) {
     const { body: app } = await herokuApi.get(`/apps/${appIdOrName}`, {
         headers: { Accept: 'application/vnd.heroku+json; version=3.sdk' },
     });
     return getGeneration(app);
 }
-exports.getGenerationByAppId = getGenerationByAppId;