heroku 11.0.0-alpha.11 → 11.0.0-alpha.13

package/lib/lib/telemetry/util.js

@@ -1,5 +1,5 @@
+import { color, hux } from '@heroku/heroku-cli-util';
 import { ux } from '@oclif/core';
-import { hux } from '@heroku/heroku-cli-util';
 export function validateAndFormatSignals(signalInput) {
     const signalOptions = ['traces', 'metrics', 'logs'];
     if (!signalInput || signalInput === 'all')
@@ -23,7 +23,7 @@ export async function displayTelemetryDrain(telemetryDrain, heroku) {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        displayObject.Space = space.name;
+        displayObject.Space = color.space(space.name || '');
     }
     else {
         const { body: app } = await heroku.get(`/apps/${telemetryDrain.owner.id}`, {
@@ -31,7 +31,7 @@ export async function displayTelemetryDrain(telemetryDrain, heroku) {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        displayObject.App = app.name;
+        displayObject.App = color.app(app.name || '');
     }
     // Add the other properties after App/Space
     displayObject.Signals = telemetryDrain.signals.join(', ');

package/lib/lib/types/completion.d.ts

@@ -0,0 +1,15 @@
+import type { Config } from '@oclif/core';
+import type { Interfaces } from '@oclif/core';
+export interface CompletionContext {
+    config: Config;
+    flags?: Record<string, any>;
+    args?: Record<string, any>;
+    argv?: string[];
+}
+export interface Completion {
+    cacheDuration?: number;
+    cacheKey?: (ctx: CompletionContext) => Promise<string> | string;
+    options: (ctx: CompletionContext) => Promise<string[]> | string[];
+    skipCache?: boolean;
+}
+export declare type FlagInput = Interfaces.FlagInput;

package/lib/lib/utils/multisort.d.ts

@@ -1,11 +1,8 @@
-export declare type Comparator = Parameters<typeof Array.prototype.sort>[0];
+export declare type Comparator = (a: any, b: any) => number;
 /**
- * The multiSortCompareFn function is used to
- * build a single comparator function for use
- * in Array.sort when multiple sort criteria
- * is needed on an object type. The indices of
- * specified array of SortCriteria indicate the
- * precedence of each comparator.
+ * The multiSortCompareFn function is used to build a single comparator function for use
+ * in Array.sort when multiple sort criteria is needed on an object type. The indices of
+ * specified array of SortCriteria indicates the precedence of each comparator.
  *
  * @example
  * ```ts

package/lib/lib/utils/multisort.js

@@ -1,10 +1,7 @@
 /**
- * The multiSortCompareFn function is used to
- * build a single comparator function for use
- * in Array.sort when multiple sort criteria
- * is needed on an object type. The indices of
- * specified array of SortCriteria indicate the
- * precedence of each comparator.
+ * The multiSortCompareFn function is used to build a single comparator function for use
+ * in Array.sort when multiple sort criteria is needed on an object type. The indices of
+ * specified array of SortCriteria indicates the precedence of each comparator.
  *
  * @example
  * ```ts
@@ -29,34 +26,13 @@
  * @returns Comparator
  */
 export function multiSortCompareFn(comparators) {
-    // Typical bitmask strategy whereas the most
-    // significant bit represents the comparator
-    // result in the zero index and thus has the
-    // highest precedence. The bit length
-    // is determined by the number of comparators
-    // and the positional notation mirrors the
-    // comparator indices.
-    // There is a 32 bit limit in total. 2 bits
-    // are used for 1. the bitLength and 2. the two's
-    // compliment signed bit. This means we have a
-    // limit of 30 comparators max.
     return (a, b) => {
-        const bitLen = comparators.length - 1;
-        let bitA = 0;
-        let bitB = 0;
-        for (const [i, comparator] of comparators.entries()) {
-            const priority = 1 << (bitLen - i);
-            const score = comparator?.(a, b);
-            if (score === -1) {
-                bitA |= priority;
-            }
-            if (score === 1) {
-                bitB |= priority;
-            }
-            if (bitA !== bitB) {
-                break;
+        for (const comparator of comparators) {
+            const comparison = comparator(a, b);
+            if (comparison !== 0) {
+                return comparison;
             }
         }
-        return bitA > bitB ? -1 : (bitA < bitB ? 1 : 0);
+        return 0;
     };
 }

package/lib/lib/utils/packageParser.js

@@ -1,10 +1,10 @@
-import path from 'node:path';
 import * as fs from 'node:fs';
+import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const packageJsonPath = path.resolve(__dirname, '../../../package.json');
-const pjson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+const pjson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 const { oclif } = pjson;
 export function getAllVersionFlags() {
     return [...oclif.additionalVersionFlags, '--version'];

package/lib/lib/utils/uuid-validate.js

@@ -1,3 +1 @@
-export const uuidValidate = (uuid) => {
-    return /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/.test(uuid);
-};
+export const uuidValidate = (uuid) => /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/.test(uuid);

package/lib/lib/webhooks/base.d.ts

@@ -4,10 +4,10 @@ export default abstract class extends Command {
     webhooksClient: APIClient;
     protected constructor(argv: string[], config: Config);
     webhookType(context: {
-        pipeline?: string;
         app?: string;
+        pipeline?: string;
     }): {
-        path: string;
         display: string;
+        path: string;
     };
 }

package/lib/lib/webhooks/base.js

@@ -1,4 +1,4 @@
-import { color } from '@heroku-cli/color';
+import { color } from '@heroku/heroku-cli-util';
 import { APIClient, Command } from '@heroku-cli/command';
 export default class extends Command {
     webhooksClient;
@@ -15,14 +15,14 @@ export default class extends Command {
     webhookType(context) {
         if (context.pipeline) {
             return {
-                path: `/pipelines/${context.pipeline}`,
                 display: context.pipeline,
+                path: `/pipelines/${context.pipeline}`,
             };
         }
         if (context.app) {
             return {
-                path: `/apps/${context.app}`,
                 display: color.app(context.app),
+                path: `/apps/${context.app}`,
             };
         }
         return this.error('No app specified');

package/lib/nls-data.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Non-localized strings data.
+ * Add new keys here as needed.
+ */
+export declare const nlsValues: {
+    readonly 'pg:database:arg:description': "config var containing the connection string, unique name, ID, or alias of the database. To access another app's database, prepend the app name to the config var or alias with `APP_NAME::`";
+    readonly 'pg:database:arg:description:default:suffix': ". If omitted, we use DATABASE_URL.";
+    readonly 'pg:database:arg:description:arbitrary:suffix': ". If omitted, we use a random database attached to the app.";
+    readonly 'pg:database:arg:description:all-dbs:suffix': ". If omitted, we use all databases.";
+};

package/lib/nls-data.js

@@ -0,0 +1,10 @@
+/**
+ * Non-localized strings data.
+ * Add new keys here as needed.
+ */
+export const nlsValues = {
+    'pg:database:arg:description': 'config var containing the connection string, unique name, ID, or alias of the database. To access another app\'s database, prepend the app name to the config var or alias with `APP_NAME::`',
+    'pg:database:arg:description:default:suffix': '. If omitted, we use DATABASE_URL.',
+    'pg:database:arg:description:arbitrary:suffix': '. If omitted, we use a random database attached to the app.',
+    'pg:database:arg:description:all-dbs:suffix': '. If omitted, we use all databases.',
+};

package/lib/nls.d.ts

@@ -1,4 +1,4 @@
-import * as nlsValues from './package.nls.json';
+import { nlsValues } from './nls-data.js';
 /**
  * Non-localized strings util.
  *

package/lib/nls.js

@@ -1,4 +1,4 @@
-import * as nlsValues from './package.nls.json';
+import { nlsValues } from './nls-data.js';
 /**
  * Non-localized strings util.
  *