heroku 10.13.2 → 11.0.0-alpha.2

package/lib/commands/apps/errors.js

@@ -1,27 +1,29 @@
-"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 heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const lodash_1 = require("lodash");
-const error_info_1 = require("../../lib/apps/error_info");
+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 _ from 'lodash';
+import errorInfo from '../../lib/apps/error_info.js';
 const colorize = (level, s) => {
     switch (level) {
-        case 'critical':
-            return color_1.default.red(s);
-        case 'warning':
-            return color_1.default.yellow(s);
-        case 'info':
-            return color_1.default.cyan(s);
-        default:
+        case 'critical': {
+            return color.red(s);
+        }
+        case 'warning': {
+            return color.yellow(s);
+        }
+        case 'info': {
+            return color.cyan(s);
+        }
+        default: {
             return s;
+        }
     }
 };
 function buildErrorTable(errors, source) {
     return Object.keys(errors).map(name => {
         const count = errors[name];
-        const info = error_info_1.default.find(e => e.name === name);
+        const info = errorInfo.find(e => e.name === name);
         if (info) {
             return { name, count, source, level: info.level, title: info.title };
         }
@@ -31,11 +33,20 @@ function buildErrorTable(errors, source) {
 const sumErrors = (errors) => {
     const summed = {};
     Object.keys(errors.data).forEach(key => {
-        summed[key] = (0, lodash_1.sum)(errors.data[key]);
+        summed[key] = _.sum(errors.data[key]);
     });
     return summed;
 };
-class Errors extends command_1.Command {
+export default class Errors extends Command {
+    static description = 'view app errors';
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+        json: flags.boolean({ description: 'output in json format' }),
+        hours: flags.string({ description: 'number of hours to look back (default 24)', default: '24' }),
+        router: flags.boolean({ description: 'show only router errors' }),
+        dyno: flags.boolean({ description: 'show only dyno errors' }),
+    };
     async run() {
         const { flags } = await this.parse(Errors);
         const hours = Number.parseInt(flags.hours, 10);
@@ -50,27 +61,23 @@ class Errors extends command_1.Command {
             });
             return memo;
         }
-        const routerErrors = () => {
-            return this.heroku.get(`/apps/${flags.app}/router-metrics/errors?${DATE_QUERY}&process_type=web`, {
-                hostname: 'api.metrics.herokai.com',
-            }).then(({ body }) => sumErrors(body));
-        };
-        const dynoErrors = (type) => {
-            return this.heroku.get(`/apps/${flags.app}/formation/${type}/metrics/errors?${DATE_QUERY}`, {
-                hostname: 'api.metrics.herokai.com',
-            }).catch(error => {
-                const { http } = error;
-                // eslint-disable-next-line prefer-regex-literals
-                const match = new RegExp('^invalid process_type provided', 'i');
-                if (http && http.statusCode === 400 && http.body && http.body.message && match.test(http.body.message)) {
-                    return { body: { data: {} } };
-                }
-                throw error;
-            }).then(rsp => {
-                const { body } = rsp;
-                return sumErrors(body);
-            });
-        };
+        const routerErrors = () => this.heroku.get(`/apps/${flags.app}/router-metrics/errors?${DATE_QUERY}&process_type=web`, {
+            hostname: 'api.metrics.herokai.com',
+        }).then(({ body }) => sumErrors(body));
+        const dynoErrors = (type) => this.heroku.get(`/apps/${flags.app}/formation/${type}/metrics/errors?${DATE_QUERY}`, {
+            hostname: 'api.metrics.herokai.com',
+        }).catch(error => {
+            const { http } = error;
+            // eslint-disable-next-line prefer-regex-literals
+            const match = new RegExp('^invalid process_type provided', 'i');
+            if (http && http.statusCode === 400 && http.body && http.body.message && match.test(http.body.message)) {
+                return { body: { data: {} } };
+            }
+            throw error;
+        }).then(rsp => {
+            const { body } = rsp;
+            return sumErrors(body);
+        });
         const { body: formation } = await this.heroku.get(`/apps/${flags.app}/formation`);
         const types = formation.map((p) => p.type);
         const showDyno = flags.dyno || !flags.router;
@@ -86,7 +93,7 @@ class Errors extends command_1.Command {
             router,
         };
         if (flags.json) {
-            heroku_cli_util_1.hux.styledJSON(errors);
+            hux.styledJSON(errors);
         }
         else {
             let t = buildErrorTable(errors.router, 'router');
@@ -94,28 +101,17 @@ class Errors extends command_1.Command {
                 t = t.concat(buildErrorTable(dyno[type], type));
             }
             if (t.length === 0) {
-                core_1.ux.log(`No errors on ${color_1.default.app(flags.app)} in the last ${hours} hours`);
+                ux.stdout(`No errors on ${color.app(flags.app)} in the last ${hours} hours`);
             }
             else {
-                heroku_cli_util_1.hux.styledHeader(`Errors on ${color_1.default.app(flags.app)} in the last ${hours} hours`);
-                heroku_cli_util_1.hux.table(t, {
-                    source: {},
-                    name: { get: ({ name, level }) => colorize(level, name) },
-                    level: { get: ({ level }) => colorize(level, level) },
+                hux.table(t, {
+                    Source: { get: ({ source }) => source },
+                    Name: { get: ({ name, level }) => colorize(level, name) },
+                    Level: { get: ({ level }) => colorize(level, level) },
                     title: { header: 'Desc' },
-                    count: {},
-                });
+                    Count: { get: ({ count }) => count },
+                }, { title: `Errors on ${color.app(flags.app)} in the last ${hours} hours\n`, titleOptions: { bold: true } });
             }
         }
     }
 }
-exports.default = Errors;
-Errors.description = 'view app errors';
-Errors.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-    json: command_1.flags.boolean({ description: 'output in json format' }),
-    hours: command_1.flags.string({ description: 'number of hours to look back (default 24)', default: '24' }),
-    router: command_1.flags.boolean({ description: 'show only router errors' }),
-    dyno: command_1.flags.boolean({ description: 'show only dyno errors' }),
-};

package/lib/commands/apps/favorites/add.d.ts

@@ -3,8 +3,8 @@ export default class Add extends Command {
     static description: string;
     static topic: 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>;
     };
     run(): Promise<void>;
 }

package/lib/commands/apps/favorites/add.js

@@ -1,16 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
-const command_1 = require("@heroku-cli/command");
-class Add extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { ux } from '@oclif/core';
+import { Command, flags } from '@heroku-cli/command';
+export default class Add extends Command {
+    static description = 'favorites an app';
+    static topic = 'apps';
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+    };
     async run() {
         const { flags } = await this.parse(Add);
         const { app } = flags;
-        core_1.ux.action.start(`Adding ${color_1.default.app(app)} to favorites`);
+        ux.action.start(`Adding ${color.app(app)} to favorites`);
         const { body: favorites } = await this.heroku.get('/favorites?type=app', { hostname: 'particleboard.heroku.com' });
         if (favorites.some(f => f.resource_name === app)) {
-            throw new Error(`${color_1.default.app(app)} is already a favorite app.`);
+            throw new Error(`${color.app(app)} is already a favorite app.`);
         }
         try {
             await this.heroku.post('/favorites', {
@@ -20,19 +24,12 @@ class Add extends command_1.Command {
         }
         catch (error) {
             if (error.statusCode === 404) {
-                core_1.ux.error('App not found');
+                ux.error('App not found');
             }
             else {
-                core_1.ux.error(error.cause);
+                ux.error(error.cause);
             }
         }
-        core_1.ux.action.stop();
+        ux.action.stop();
     }
 }
-exports.default = Add;
-Add.description = 'favorites an app';
-Add.topic = 'apps';
-Add.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-};

package/lib/commands/apps/favorites/index.d.ts

@@ -3,7 +3,7 @@ export default class Index extends Command {
     static description: string;
     static topic: string;
     static flags: {
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/apps/favorites/index.js

@@ -1,26 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const command_1 = require("@heroku-cli/command");
-class Index extends command_1.Command {
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { Command, flags } from '@heroku-cli/command';
+export default class Index extends Command {
+    static description = 'list favorited apps';
+    static topic = 'apps';
+    static flags = {
+        json: flags.boolean({ char: 'j', description: 'output in json format' }),
+    };
     async run() {
         const { flags } = await this.parse(Index);
         const { body: favorites } = await this.heroku.get('/favorites?type=app', { hostname: 'particleboard.heroku.com' });
         if (flags.json) {
-            heroku_cli_util_1.hux.styledJSON(favorites);
+            hux.styledJSON(favorites);
         }
         else {
-            heroku_cli_util_1.hux.styledHeader('Favorited Apps');
+            hux.styledHeader('Favorited Apps');
             for (const f of favorites) {
-                core_1.ux.log(f.resource_name);
+                ux.stdout(f.resource_name);
             }
         }
     }
 }
-exports.default = Index;
-Index.description = 'list favorited apps';
-Index.topic = 'apps';
-Index.flags = {
-    json: command_1.flags.boolean({ char: 'j', description: 'output in json format' }),
-};

package/lib/commands/apps/favorites/remove.d.ts

@@ -3,8 +3,8 @@ export default class Remove extends Command {
     static description: string;
     static topic: 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>;
     };
     run(): Promise<void>;
 }

package/lib/commands/apps/favorites/remove.js

@@ -1,28 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
-const command_1 = require("@heroku-cli/command");
-class Remove extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { ux } from '@oclif/core';
+import { Command, flags } from '@heroku-cli/command';
+export default class Remove extends Command {
+    static description = 'unfavorites an app';
+    static topic = 'apps';
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+    };
     async run() {
         const { flags } = await this.parse(Remove);
         const { app } = flags;
-        core_1.ux.action.start(`Removing ${color_1.default.app(app)} from favorites`);
+        ux.action.start(`Removing ${color.app(app)} from favorites`);
         const { body: favorites } = await this.heroku.get('/favorites?type=app', { hostname: 'particleboard.heroku.com' });
         const favorite = favorites.find(f => f.resource_name === app);
         if (!favorite) {
-            throw new Error(`${color_1.default.app(app)} is not already a favorite app.`);
+            throw new Error(`${color.app(app)} is not already a favorite app.`);
         }
         await this.heroku.delete(`/favorites/${favorite.id}`, {
             hostname: 'particleboard.heroku.com',
         });
-        core_1.ux.action.stop();
+        ux.action.stop();
     }
 }
-exports.default = Remove;
-Remove.description = 'unfavorites an app';
-Remove.topic = 'apps';
-Remove.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-};

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

@@ -5,12 +5,12 @@ export default class AppsIndex extends Command {
     static hiddenAliases: string[];
     static examples: string[];
     static flags: {
-        all: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        personal: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'internal-routing': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        team: 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>;
+        space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        personal: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'internal-routing': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        team: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/apps/index.js

@@ -1,11 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const command_1 = require("@heroku-cli/command");
-const _ = require("lodash");
-const color_1 = require("@heroku-cli/color");
-const completions_1 = require("@heroku-cli/command/lib/completions");
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { Command, flags } from '@heroku-cli/command';
+import _ from 'lodash';
+import { color } from '@heroku-cli/color';
+import { SpaceCompletion } from '@heroku-cli/command/lib/completions.js';
 function annotateAppName(app) {
     let name = `${app.name}`;
     if (app.locked && app.internal_routing) {
@@ -22,52 +20,70 @@ function annotateAppName(app) {
 function regionizeAppName(app) {
     const name = annotateAppName(app);
     if (app.region && app.region.name !== 'us') {
-        return `${name} (${color_1.default.green(app.region.name)})`;
+        return `${name} (${color.green(app.region.name)})`;
     }
     return name;
 }
 function listApps(apps) {
-    apps.forEach((app) => core_1.ux.log(regionizeAppName(app)));
+    apps.forEach((app) => ux.stdout(regionizeAppName(app)));
 }
 function print(apps, user, space, team) {
     if (apps.length === 0) {
         if (space)
-            core_1.ux.log(`There are no apps in space ${color_1.default.green(space)}.`);
+            ux.stdout(`There are no apps in space ${color.green(space)}.`);
         else if (team)
-            core_1.ux.log(`There are no apps in team ${color_1.default.magenta(team)}.`);
+            ux.stdout(`There are no apps in team ${color.magenta(team)}.`);
         else
-            core_1.ux.log('You have no apps.');
+            ux.stdout('You have no apps.');
     }
     else if (space) {
-        heroku_cli_util_1.hux.styledHeader(`Apps in space ${color_1.default.green(space)}`);
+        hux.styledHeader(`Apps in space ${color.green(space)}`);
         listApps(apps);
     }
     else if (team) {
-        heroku_cli_util_1.hux.styledHeader(`Apps in team ${color_1.default.magenta(team)}`);
+        hux.styledHeader(`Apps in team ${color.magenta(team)}`);
         listApps(apps);
     }
     else {
         apps = _.partition(apps, (app) => app.owner.email === user.email);
         if (apps[0].length > 0) {
-            heroku_cli_util_1.hux.styledHeader(`${color_1.default.cyan(user.email)} Apps`);
+            hux.styledHeader(`${color.cyan(user.email)} Apps`);
             listApps(apps[0]);
         }
         const columns = {
-            name: { get: regionizeAppName },
-            email: { get: ({ owner }) => owner.email },
+            Name: { get: regionizeAppName },
+            Email: { get: ({ owner }) => owner.email },
         };
         if (apps[1].length > 0) {
-            heroku_cli_util_1.hux.styledHeader('Collaborated Apps');
-            heroku_cli_util_1.hux.table(apps[1], columns, { 'no-header': true });
+            ux.stdout();
+            hux.table(apps[1], columns, { title: 'Collaborated Apps\n', titleOptions: { bold: true } });
         }
     }
 }
-class AppsIndex extends command_1.Command {
+export default class AppsIndex extends Command {
+    static description = 'list your apps';
+    static topic = 'apps';
+    static hiddenAliases = ['list', 'apps:list'];
+    static examples = [
+        '$ heroku apps',
+    ];
+    static flags = {
+        all: flags.boolean({ char: 'A', description: 'include apps in all teams' }),
+        json: flags.boolean({ char: 'j', description: 'output in json format' }),
+        space: flags.string({
+            char: 's',
+            description: 'filter by space',
+            completion: SpaceCompletion,
+        }),
+        personal: flags.boolean({ char: 'p', description: 'list apps in personal account when a default team is set' }),
+        'internal-routing': flags.boolean({ char: 'i', description: 'filter to Internal Web Apps', hidden: true }),
+        team: flags.team(),
+    };
     async run() {
         const { flags } = await this.parse(AppsIndex);
         const teamIdentifier = flags.team;
         let team = (!flags.personal && teamIdentifier) ? teamIdentifier : null;
-        const space = flags.space;
+        const { all, json, space } = flags;
         const internalRouting = flags['internal-routing'];
         if (space) {
             const teamResponse = await this.heroku.get(`/spaces/${space}`);
@@ -76,7 +92,7 @@ class AppsIndex extends command_1.Command {
         let path = '/users/~/apps';
         if (team)
             path = `/teams/${team}/apps`;
-        else if (flags.all)
+        else if (all)
             path = '/apps';
         const [appsResponse, userResponse] = await Promise.all([
             this.heroku.get(path),
@@ -91,30 +107,11 @@ class AppsIndex extends command_1.Command {
         if (internalRouting) {
             apps = apps.filter((a) => a.internal_routing);
         }
-        if (flags.json) {
-            heroku_cli_util_1.hux.styledJSON(apps);
+        if (json) {
+            hux.styledJSON(apps);
         }
         else {
             print(apps, user, space, team);
         }
     }
 }
-exports.default = AppsIndex;
-AppsIndex.description = 'list your apps';
-AppsIndex.topic = 'apps';
-AppsIndex.hiddenAliases = ['list', 'apps:list'];
-AppsIndex.examples = [
-    '$ heroku apps',
-];
-AppsIndex.flags = {
-    all: command_1.flags.boolean({ char: 'A', description: 'include apps in all teams' }),
-    json: command_1.flags.boolean({ char: 'j', description: 'output in json format' }),
-    space: command_1.flags.string({
-        char: 's',
-        description: 'filter by space',
-        completion: completions_1.SpaceCompletion,
-    }),
-    personal: command_1.flags.boolean({ char: 'p', description: 'list apps in personal account when a default team is set' }),
-    'internal-routing': command_1.flags.boolean({ char: 'i', description: 'filter to Internal Web Apps', hidden: true }),
-    team: command_1.flags.team(),
-};

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

@@ -6,14 +6,14 @@ export default class AppsInfo extends Command {
     static examples: string[];
     static help: 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>;
-        shell: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        extended: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        json: import("@oclif/core/lib/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>;
+        shell: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        extended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        app: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        app: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }