heroku 10.13.2-beta.0 → 11.0.0-alpha.1

package/lib/lib/git/git.js

@@ -1,15 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const cp = require("child_process");
-const core_1 = require("@oclif/core");
-const fs = require("fs");
-const util_1 = require("util");
-const execFile = (0, util_1.promisify)(cp.execFile);
-const debug = require('debug')('git');
-class Git {
+import { vars } from '@heroku-cli/command';
+import cp from 'node:child_process';
+import { ux } from '@oclif/core';
+import fs from 'fs';
+import { promisify } from 'node:util';
+const execFile = promisify(cp.execFile);
+import debug from 'debug';
+const gitDebug = debug('git');
+export default class Git {
     async exec(args) {
-        debug('exec: git %o', args);
+        gitDebug('exec: git %o', args);
         try {
             const { stdout, stderr } = await execFile('git', args);
             if (stderr)
@@ -18,18 +17,18 @@ class Git {
         }
         catch (error) {
             if (error.code === 'ENOENT') {
-                core_1.ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
+                ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
             }
             throw error;
         }
     }
     spawn(args) {
         return new Promise((resolve, reject) => {
-            debug('spawn: git %o', args);
+            gitDebug('spawn: git %o', args);
             const s = cp.spawn('git', args, { stdio: [0, 1, 2] });
             s.on('error', (err) => {
                 if (err.code === 'ENOENT') {
-                    core_1.ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
+                    ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
                 }
                 else
                     reject(err);
@@ -41,14 +40,14 @@ class Git {
         return this.exec(['config', 'heroku.remote']).catch(() => { });
     }
     httpGitUrl(app) {
-        return `https://${command_1.vars.httpGitHost}/${app}.git`;
+        return `https://${vars.httpGitHost}/${app}.git`;
     }
     async remoteUrl(name) {
-        var _a, _b, _c;
         const remotes = await this.exec(['remote', '-v']);
-        return (_c = (_b = (_a = remotes.split('\n')
+        return remotes.split('\n')
             .map(r => r.split('\t'))
-            .find(r => r[0] === name)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.split(' ')[0]) !== null && _c !== void 0 ? _c : '';
+            .find(r => r[0] === name)?.[1]
+            ?.split(' ')[0] ?? '';
     }
     url(app) {
         return this.httpGitUrl(app);
@@ -66,11 +65,11 @@ class Git {
         const branch = await this.getBranch('HEAD');
         const ref = await this.getRef(commit);
         const message = await this.getCommitTitle(ref);
-        return Promise.resolve({
-            branch: branch,
-            ref: ref,
-            message: message,
-        });
+        return {
+            branch,
+            message,
+            ref,
+        };
     }
     inGitRepo() {
         try {
@@ -84,11 +83,11 @@ class Git {
     }
     hasGitRemote(remote) {
         return this.remoteUrl(remote)
+            // eslint-disable-next-line unicorn/prefer-native-coercion-functions
             .then((remote) => Boolean(remote));
     }
     createRemote(remote, url) {
         return this.hasGitRemote(remote)
-            .then(exists => !exists ? this.exec(['remote', 'add', remote, url]) : null);
+            .then(exists => exists ? null : this.exec(['remote', 'add', remote, url]));
     }
 }
-exports.default = Git;

package/lib/lib/git/push.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function push(remote) {
+export default function push(remote) {
     return `git push ${remote || 'heroku'} main`;
 }
-exports.default = push;

package/lib/lib/local/fork-foreman.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fork = void 0;
-const child_process_1 = require("child_process");
-const fs = require("fs");
-const path = require("path");
+import { fork as forkChildProcess } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
 // depending if this is being ran before or after compilation
 // we need to check for `.ts` and `.js` extensions and use
 // the appropriate one.
@@ -19,9 +16,9 @@ function getForemanScriptPath() {
     }
     throw new Error(`Path to ${file} not found`);
 }
-function fork(argv) {
+export function fork(argv) {
     const script = getForemanScriptPath();
-    const nf = (0, child_process_1.fork)(script, argv, { stdio: 'inherit' });
+    const nf = forkChildProcess(script, argv, { stdio: 'inherit' });
     return new Promise(resolve => {
         nf.on('exit', function (code) {
             if (code !== 0)
@@ -30,4 +27,3 @@ function fork(argv) {
         });
     });
 }
-exports.fork = fork;

package/lib/lib/local/load-foreman-procfile.d.ts

@@ -0,0 +1,2 @@
+import parseProcfile from 'parse-procfile';
+export default parseProcfile;

package/lib/lib/local/load-foreman-procfile.js

@@ -1,2 +1,3 @@
-"use strict";
-module.exports = require('foreman/lib/procfile');
+// @ts-expect-error - parse-procfile lacks TypeScript definitions
+import parseProcfile from 'parse-procfile';
+export default parseProcfile;

package/lib/lib/local/run-foreman.js

@@ -1,4 +1,3 @@
-"use strict";
 // Copyright IBM Corp. 2012,2015. All Rights Reserved.
 // Node module: foreman
 // This file is licensed under the MIT License.
@@ -197,7 +196,12 @@ program
             // eslint-disable-next-line unicorn/no-array-push-push
             envl.push({ key: 'FOREMAN_WORKER_NAME', value: conf.process + '.' + conf.number });
             conf.envs = envl;
-            const conf = Object.assign(Object.assign({}, c), { number: i, port, envs: envl });
+            const conf = {
+                ...c,
+                number: i,
+                port,
+                envs: envl,
+            };
             // Write the APP-PROCESS-N.conf File
             writeout.foreman_app_n(conf, this.out);
             baseport_i++;
@@ -228,3 +232,4 @@ if (process.argv.slice(2).length === 0) {
     program.outputHelp();
     process.exit(1);
 }
+export {};

package/lib/lib/members/util.js

@@ -1,25 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMemberToTeam = exports.inviteMemberToTeam = void 0;
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const inviteMemberToTeam = async function (email, role, team, heroku) {
-    core_1.ux.action.start(`Inviting ${color_1.default.cyan(email)} to ${color_1.default.magenta(team)} as ${color_1.default.green(role)}`);
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+export const inviteMemberToTeam = async function (email, role, team, heroku) {
+    ux.action.start(`Inviting ${color.cyan(email)} to ${color.magenta(team)} as ${color.green(role)}`);
     await heroku.request(`/teams/${team}/invitations`, {
         headers: {
             Accept: 'application/vnd.heroku+json; version=3.team-invitations',
         }, method: 'PUT',
         body: { email, role },
     });
-    core_1.ux.action.stop();
+    ux.action.stop();
 };
-exports.inviteMemberToTeam = inviteMemberToTeam;
-const addMemberToTeam = async function (email, role, groupName, heroku, method = 'PUT') {
-    core_1.ux.action.start(`Adding ${color_1.default.cyan(email)} to ${color_1.default.magenta(groupName)} as ${color_1.default.green(role)}`);
+export const addMemberToTeam = async function (email, role, groupName, heroku, method = 'PUT') {
+    ux.action.start(`Adding ${color.cyan(email)} to ${color.magenta(groupName)} as ${color.green(role)}`);
     await heroku.request(`/teams/${groupName}/members`, {
         method: method,
         body: { email, role },
     });
-    core_1.ux.action.stop();
+    ux.action.stop();
 };
-exports.addMemberToTeam = addMemberToTeam;

package/lib/lib/members/utils.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMemberToTeam = void 0;
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const addMemberToTeam = async function (email, role, groupName, heroku, method = 'PUT') {
-    core_1.ux.action.start(`Adding ${color_1.default.cyan(email)} to ${color_1.default.magenta(groupName)} as ${color_1.default.green(role)}`);
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+export const addMemberToTeam = async function (email, role, groupName, heroku, method = 'PUT') {
+    ux.action.start(`Adding ${color.cyan(email)} to ${color.magenta(groupName)} as ${color.green(role)}`);
     await heroku.request(`/teams/${groupName}/members`, {
         method: method,
         body: { email, role },
     });
-    core_1.ux.action.stop();
+    ux.action.stop();
 };
-exports.addMemberToTeam = addMemberToTeam;

package/lib/lib/notify.js

@@ -1,12 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const notifications_1 = require("@heroku-cli/notifications");
-const core_1 = require("@oclif/core");
-function default_1(subtitle, message, success = true) {
+import * as path from 'path';
+import { notify } from '@heroku-cli/notifications';
+import { ux } from '@oclif/core';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+export default function (subtitle, message, success = true) {
     const contentImage = path.join(__dirname, `../assets/${success ? 'success' : 'error'}.png`);
     try {
-        (0, notifications_1.notify)({
+        notify({
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             title: 'heroku cli',
@@ -17,7 +18,6 @@ function default_1(subtitle, message, success = true) {
         });
     }
     catch (error) {
-        core_1.ux.warn(error);
+        ux.warn(error);
     }
 }
-exports.default = default_1;

package/lib/lib/orgs/utils.js

@@ -1,25 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.printGroupsJSON = exports.printGroups = void 0;
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const _ = require("lodash");
-const color_1 = require("@heroku-cli/color");
-const printGroups = function (teams, type) {
-    const typeLabel = type.label ? type.label : 'Team';
-    teams = _.sortBy(teams, 'name');
-    heroku_cli_util_1.hux.table(teams, {
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { color } from '@heroku-cli/color';
+export const printGroups = function (teams, type) {
+    const typeLabel = type.label ?? 'Team';
+    teams = teams.sort((a, b) => (a.name || '').localeCompare(b.name || ''));
+    hux.table(teams, {
         name: {
+            get: ({ name }) => color.green(name),
             header: typeLabel,
-            get: ({ name }) => color_1.default.green(name),
         },
         role: {
             get: ({ role }) => role,
+            header: 'Role',
         },
     });
 };
-exports.printGroups = printGroups;
-const printGroupsJSON = function (teams) {
-    core_1.ux.log(JSON.stringify(teams, null, 2));
+export const printGroupsJSON = function (teams) {
+    ux.stdout(JSON.stringify(teams, null, 2));
 };
-exports.printGroupsJSON = printGroupsJSON;

package/lib/lib/pg/backups.d.ts

@@ -1,17 +1 @@
-import { APIClient } from '@heroku-cli/command';
-import type { BackupTransfer } from './types';
-declare class Backups {
-    protected app: string;
-    protected heroku: APIClient;
-    protected logsAlreadyShown: Set<string>;
-    constructor(app: string, heroku: APIClient);
-    filesize(size: number, opts?: {}): string;
-    status: (transfer: BackupTransfer) => string;
-    num: (name: string) => Promise<number | undefined>;
-    name: (transfer: BackupTransfer) => string;
-    wait: (action: string, transferID: string, interval: number, verbose: boolean, app: string) => Promise<void>;
-    protected displayLogs(logs: BackupTransfer['logs']): void;
-    protected poll(transferID: string, interval: number, verbose: boolean, appId: string): AsyncGenerator<unknown, void, unknown>;
-}
-declare function factory(app: string, heroku: APIClient): Backups;
-export default factory;
+export {};

package/lib/lib/pg/backups.js

@@ -1,164 +1,175 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
-const tsheredoc_1 = require("tsheredoc");
-const host_1 = require("./host");
-const bytes = require("bytes");
-function prefix(transfer) {
-    if (transfer.from_type === 'pg_dump') {
-        if (transfer.to_type === 'pg_restore') {
-            return 'c';
-        }
-        return transfer.schedule ? 'a' : 'b';
-        // eslint-disable-next-line no-else-return
+export {};
+/*
+import color from '@heroku-cli/color'
+import {APIClient} from '@heroku-cli/command'
+import {ux} from '@oclif/core'
+import heredoc from 'tsheredoc'
+import host from './host'
+import type {BackupTransfer} from './types'
+import bytes = require('bytes')
+
+function prefix(transfer: BackupTransfer) {
+  if (transfer.from_type === 'pg_dump') {
+    if (transfer.to_type === 'pg_restore') {
+      return 'c'
     }
-    else {
-        if (transfer.to_type === 'pg_restore') {
-            return 'r';
-        }
-        return 'b';
+
+    return transfer.schedule ? 'a' : 'b'
+
+    // eslint-disable-next-line no-else-return
+  } else {
+    if (transfer.to_type === 'pg_restore') {
+      return 'r'
     }
+
+    return 'b'
+  }
 }
+
 class Backups {
-    constructor(app, heroku) {
-        this.logsAlreadyShown = new Set();
-        this.status = (transfer) => {
-            if (transfer.finished_at && transfer.succeeded) {
-                const warnings = transfer.warnings;
-                if (warnings > 0) {
-                    return `Finished with ${warnings} warnings`;
-                }
-                return `Completed ${transfer.finished_at}`;
-            }
-            if (transfer.finished_at) {
-                return `Failed ${transfer.finished_at}`;
-            }
-            if (transfer.started_at) {
-                return `Running (processed ${this.filesize(transfer.processed_bytes)})`;
-            }
-            return 'Pending';
-        };
-        this.num = async (name) => {
-            let m = name.match(/^[abcr](\d+)$/);
-            if (m)
-                return Number.parseInt(m[1], 10);
-            m = name.match(/^o[ab]\d+$/);
-            if (m) {
-                const { body: transfers } = await this.heroku.get(`/client/v11/apps/${this.app}/transfers`, { hostname: (0, host_1.default)() });
-                const transfer = transfers.find(t => this.name(t) === name);
-                if (transfer)
-                    return transfer.num;
-            }
-        };
-        this.name = (transfer) => {
-            const oldPGBName = transfer.options && transfer.options.pgbackups_name;
-            if (oldPGBName)
-                return `o${oldPGBName}`;
-            return `${prefix(transfer)}${(transfer.num || '').toString().padStart(3, '0')}`;
-        };
-        this.wait = async (action, transferID, interval, verbose, app) => {
-            var e_1, _a;
-            if (verbose) {
-                core_1.ux.log(`${action}...`);
-            }
-            core_1.ux.action.start(action);
-            try {
-                try {
-                    for (var _b = tslib_1.__asyncValues(this.poll(transferID, interval, verbose, app || this.app)), _c; _c = await _b.next(), !_c.done;) {
-                        const backupSucceeded = _c.value;
-                        if (backupSucceeded) {
-                            core_1.ux.action.stop();
-                            break;
-                        }
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-            }
-            catch (error) {
-                core_1.ux.action.stop('!');
-                core_1.ux.error(error);
-            }
-        };
-        this.app = app;
-        this.heroku = heroku;
+  protected app: string
+  protected heroku: APIClient
+  protected logsAlreadyShown = new Set<string>()
+
+  constructor(app: string, heroku: APIClient) {
+    this.app = app
+    this.heroku = heroku
+  }
+
+  public filesize(size: number, opts = {}): string {
+    Object.assign(opts, {
+      decimalPlaces: 2,
+      fixedDecimals: true,
+    })
+    return bytes(size, opts)
+  }
+
+  public status = (transfer: BackupTransfer): string => {
+    if (transfer.finished_at && transfer.succeeded) {
+      const warnings = transfer.warnings
+      if (warnings > 0) {
+        return `Finished with ${warnings} warnings`
+      }
+
+      return `Completed ${transfer.finished_at}`
+    }
+
+    if (transfer.finished_at) {
+      return `Failed ${transfer.finished_at}`
+    }
+
+    if (transfer.started_at) {
+      return `Running (processed ${this.filesize(transfer.processed_bytes)})`
     }
-    filesize(size, opts = {}) {
-        Object.assign(opts, {
-            decimalPlaces: 2,
-            fixedDecimals: true,
-        });
-        return bytes(size, opts);
+
+    return 'Pending'
+  }
+
+  public num = async (name: string) => {
+    let m = name.match(/^[abcr](\d+)$/)
+    if (m) return Number.parseInt(m[1], 10)
+    m = name.match(/^o[ab]\d+$/)
+    if (m) {
+      const {body: transfers} = await this.heroku.get<BackupTransfer[]>(`/client/v11/apps/${this.app}/transfers`, {hostname: host()})
+      const transfer = transfers.find(t => this.name(t) === name)
+      if (transfer) return transfer.num
+    }
+  }
+
+  public name = (transfer: BackupTransfer) => {
+    const oldPGBName = transfer.options && transfer.options.pgbackups_name
+    if (oldPGBName) return `o${oldPGBName}`
+    return `${prefix(transfer)}${(transfer.num || '').toString().padStart(3, '0')}`
+  }
+
+  public wait = async (action: string, transferID: string, interval: number, verbose: boolean, app: string) => {
+    if (verbose) {
+      ux.log(`${action}...`)
     }
-    displayLogs(logs) {
-        for (const log of logs) {
-            if (this.logsAlreadyShown.has(log.created_at + log.message)) {
-                continue;
-            }
-            this.logsAlreadyShown.add(log.created_at + log.message);
-            core_1.ux.log(`${log.created_at} ${log.message}`);
+
+    ux.action.start(action)
+    try {
+      for await (const backupSucceeded of this.poll(transferID, interval, verbose, app || this.app)) {
+        if (backupSucceeded) {
+          ux.action.stop()
+          break
         }
+      }
+    } catch (error) {
+      ux.action.stop('!')
+      ux.error(error as Error)
+    }
+  }
+
+  protected displayLogs(logs: BackupTransfer['logs']) {
+    for (const log of logs) {
+      if (this.logsAlreadyShown.has(log.created_at + log.message)) {
+        continue
+      }
+
+      this.logsAlreadyShown.add(log.created_at + log.message)
+      ux.log(`${log.created_at} ${log.message}`)
     }
-    poll(transferID, interval, verbose, appId) {
-        var _a;
-        return tslib_1.__asyncGenerator(this, arguments, function* poll_1() {
-            const tty = process.env.TERM !== 'dumb' && process.stderr.isTTY;
-            let backup = {};
-            let failures = 0;
-            const quietUrl = `/client/v11/apps/${appId !== null && appId !== void 0 ? appId : this.app}/transfers/${transferID}`;
-            const verboseUrl = quietUrl + '?verbose=true';
-            const url = verbose ? verboseUrl : quietUrl;
-            while (failures < 21) {
-                try {
-                    ({ body: backup } = yield tslib_1.__await(this.heroku.get(url, { hostname: (0, host_1.default)() })));
-                }
-                catch (error) {
-                    if (failures++ > 20) {
-                        throw error;
-                    }
-                }
-                if (verbose) {
-                    this.displayLogs(backup.logs);
-                }
-                else if (tty) {
-                    const msg = backup.started_at ? this.filesize(backup.processed_bytes) : 'pending';
-                    const log = (_a = backup.logs) === null || _a === void 0 ? void 0 : _a.pop();
-                    if (log) {
-                        core_1.ux.action.status = `${msg}\n${log.created_at + ' ' + log.message}`;
-                    }
-                    else {
-                        core_1.ux.action.status = msg;
-                    }
-                }
-                if (backup === null || backup === void 0 ? void 0 : backup.finished_at) {
-                    if (backup.succeeded) {
-                        yield yield tslib_1.__await(true);
-                        break;
-                    }
-                    // logs is undefined unless verbose=true is passed
-                    ({ body: backup } = yield tslib_1.__await(this.heroku.get(verboseUrl, { hostname: (0, host_1.default)() })));
-                    throw new Error((0, tsheredoc_1.default)(`
+  }
+
+  protected async * poll(transferID: string, interval: number, verbose: boolean, appId: string) {
+    const tty = process.env.TERM !== 'dumb' && process.stderr.isTTY
+    let backup: BackupTransfer = {} as BackupTransfer
+    let failures = 0
+
+    const quietUrl = `/client/v11/apps/${appId ?? this.app}/transfers/${transferID}`
+    const verboseUrl = quietUrl + '?verbose=true'
+
+    const url = verbose ? verboseUrl : quietUrl
+
+    while (failures < 21) {
+      try {
+        ({body: backup} = await this.heroku.get<BackupTransfer>(url, {hostname: host()}))
+      } catch (error) {
+        if (failures++ > 20) {
+          throw error
+        }
+      }
+
+      if (verbose) {
+        this.displayLogs(backup.logs)
+      } else if (tty) {
+        const msg = backup.started_at ? this.filesize(backup.processed_bytes) : 'pending'
+        const log = backup.logs?.pop()
+        if (log) {
+          ux.action.status = `${msg}\n${log.created_at + ' ' + log.message}`
+        } else {
+          ux.action.status = msg
+        }
+      }
+
+      if (backup?.finished_at) {
+        if (backup.succeeded) {
+          yield true
+          break
+        }
+
+        // logs is undefined unless verbose=true is passed
+        ({body: backup} = await this.heroku.get<BackupTransfer>(verboseUrl, {hostname: host()}))
+
+        throw new Error(heredoc(`
           An error occurred and the backup did not finish.
 
           ${backup.logs.slice(-5).map(l => l.message).join('\n')}
 
-          Run ${color_1.default.cmd('heroku pg:backups:info ' + this.name(backup))} for more details.`));
-                }
-                yield yield tslib_1.__await(new Promise(resolve => {
-                    setTimeout(resolve, interval * 1000);
-                }));
-            }
-        });
+          Run ${color.cmd('heroku pg:backups:info ' + this.name(backup))} for more details.`))
+      }
+
+      yield new Promise(resolve => {
+        setTimeout(resolve, interval * 1000)
+      })
     }
+  }
 }
-function factory(app, heroku) {
-    return new Backups(app, heroku);
+
+function factory(app: string, heroku: APIClient) {
+  return new Backups(app, heroku)
 }
-exports.default = factory;
+
+export default factory
+*/