heroku 11.0.0-alpha.12 → 11.0.0-alpha.13

package/lib/lib/addons/util.js

@@ -1,7 +1,6 @@
 import { color } from '@heroku/heroku-cli-util';
 import printf from 'printf';
 import ConfirmCommand from '../confirmCommand.js';
-const confirmCommand = new ConfirmCommand();
 export const trapConfirmationRequired = async (app, confirm, fn) => {
     try {
         return await fn(confirm);
@@ -10,7 +9,7 @@ export const trapConfirmationRequired = async (app, confirm, fn) => {
         if (!isHttpError(error) || error.body?.id !== 'confirmation_required') {
             throw error;
         }
-        await confirmCommand.confirm(app, confirm, error.body.message);
+        await new ConfirmCommand().confirm(app, confirm, error.body.message);
         return fn(app);
     }
 };

package/lib/lib/data/credentialUtils.js

@@ -1,5 +1,5 @@
 // NEW This is new. something similar exists in core: packages/cli/src/commands/pg/credentials.ts:61
-// protected sortByDefaultAndName(credentials: CredentialsInfo) {
+// protected sortByDefaultAndName(credentials: CredentialInfo[]) {
 //  return credentials.sort((a, b) => {
 //    const isDefaultA = this.isDefaultCredential(a)
 //    const isDefaultB = this.isDefaultCredential(b)

package/lib/lib/data/types.d.ts

@@ -158,17 +158,21 @@ export declare type PricingInfo = {
 };
 export declare type TierPricingInfo = Record<string, PricingInfo>;
 export declare type PricingInfoResponse = Record<string, TierPricingInfo>;
+declare type NonAdvancedCredentialState = 'active' | 'archived' | 'enabling' | 'revoked' | 'revoking';
+declare type NonAdvancedCredential = {
+    connections?: null | number;
+    password: string;
+    state: NonAdvancedCredentialState;
+    user: string;
+};
+declare type NonAdvancedCredentialStoreState = 'active' | 'archived' | 'provisioning' | 'revoking' | 'rotating' | 'rotation_completed' | 'wait_for_provisioning';
 export interface NonAdvancedCredentialInfo extends Record<string, unknown> {
-    credentials: Array<{
-        password: string;
-        state: string;
-        user: string;
-    }>;
+    credentials: Array<NonAdvancedCredential>;
     database: string;
     host: string;
     name: string;
     port: string;
-    state: string;
+    state: NonAdvancedCredentialStoreState;
     uuid: string;
 }
 export declare type ExtendedPostgresLevelInfo = {

package/lib/lib/pg/types.d.ts

@@ -138,24 +138,6 @@ export declare type Link = {
         attachment_name: string;
     };
 };
-declare type CredentialState = 'enabling' | 'active' | 'revoking' | 'revoked' | 'archived';
-export declare type Credential = {
-    user: string;
-    password: string;
-    state: CredentialState;
-    connections?: number | null;
-};
-declare type CredentialStoreState = 'provisioning' | 'wait_for_provisioning' | 'active' | 'rotating' | 'rotation_completed' | 'revoking' | 'archived';
-export declare type CredentialInfo = {
-    uuid: string;
-    name: string;
-    state: CredentialStoreState;
-    database: string;
-    host: string;
-    port: number;
-    credentials: Array<Credential>;
-};
-export declare type CredentialsInfo = Array<CredentialInfo>;
 export declare type MaintenanceApiResponse = {
     message: string;
 };

package/lib/lib/pg/util.d.ts

@@ -1,8 +1,8 @@
 import type { AddOnAttachment } from '@heroku-cli/schema';
 import { pg } from '@heroku/heroku-cli-util';
-import type { CredentialsInfo } from './types.js';
+import { type CredentialInfo } from '../../lib/data/types.js';
 export declare function essentialPlan(addon: pg.ExtendedAddon | pg.ExtendedAddonAttachment['addon']): boolean;
 export declare function formatResponseWithCommands(response: string): string;
-export declare function presentCredentialAttachments(app: string, credAttachments: Required<AddOnAttachment>[], credentials: CredentialsInfo, cred: string): string;
+export declare function presentCredentialAttachments(app: string, credAttachments: Required<AddOnAttachment>[], credentials: CredentialInfo[], cred: string): string;
 export declare const configVarNamesFromValue: (config: Record<string, string>, value: string) => string[];
 export declare const databaseNameFromUrl: (uri: string, config: Record<string, string>) => string;

package/lib/lib/pg/util.js

@@ -1,5 +1,6 @@
 import { color, hux, utils, } from '@heroku/heroku-cli-util';
 import { renderAttachment } from '../../commands/addons/index.js';
+import { isAdvancedCredentialInfo } from '../../lib/data/types.js';
 import { multiSortCompareFn } from '../utils/multisort.js';
 export function essentialPlan(addon) {
     return utils.pg.isEssentialDatabase(addon) || utils.pg.isLegacyEssentialDatabase(addon);
@@ -24,6 +25,10 @@ export function presentCredentialAttachments(app, credAttachments, credentials,
         const isLast = (idx === credAttachments.length - 1);
         return renderAttachment(attachment, app, isLast);
     });
+    // We would use utils.pg.isAdvancedDatabase from @heroku/heroku-cli-util, but we're not passing the add-on as a parameter.
+    if (credentials.length > 0 && isAdvancedCredentialInfo(credentials[0])) {
+        return [cred, ...attLines].join('\n');
+    }
     const rotationLines = [];
     const credentialStore = credentials.find(a => a.name === cred);
     if (credentialStore?.state === 'rotating') {

package/lib/lib/run/dyno.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import { HTTP } from '@heroku/http-call';
-import { APIClient } from '@heroku-cli/command';
+import { APIClient, type IOptions } from '@heroku-cli/command';
 import { Dyno as APIDyno } from '@heroku-cli/schema';
 import * as net from 'net';
 import { Duplex } from 'stream';
@@ -14,7 +14,7 @@ interface HerokuApiClientRun extends APIClient {
         rejectUnauthorized?: boolean;
     } & IOptions;
 }
-interface DynoOpts {
+export interface DynoOpts {
     app: string;
     attach?: boolean;
     command: string;
@@ -24,17 +24,12 @@ interface DynoOpts {
     heroku: APIClient;
     listen?: boolean;
     'no-tty'?: boolean;
+    notificationSubtitle?: string;
     notify?: boolean;
     showStatus?: boolean;
     size?: string;
     type?: string;
 }
-interface IOptions {
-    debug?: boolean;
-    debugHeaders?: boolean;
-    preauth?: boolean;
-    required?: boolean;
-}
 export default class Dyno extends Duplex {
     opts: DynoOpts;
     dyno?: APIDyno;
@@ -53,9 +48,6 @@ export default class Dyno extends Duplex {
     private _startedAt?;
     constructor(opts: DynoOpts);
     attach(): any;
-    /**
-     * Starts the dyno
-     */
     start(): Promise<void>;
     _connect(): Promise<unknown>;
     _doStart(retries?: number): Promise<HTTP<unknown> | undefined>;

package/lib/lib/run/dyno.js

@@ -1,18 +1,21 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { color } from '@heroku/heroku-cli-util';
 import { notify } from '@heroku-cli/notifications';
 import { ux } from '@oclif/core';
-import { spawn } from 'child_process';
 import debugFactory from 'debug';
 import * as https from 'https';
 import * as net from 'net';
+import { spawn } from 'node:child_process';
 import { Duplex, Transform } from 'stream';
 import * as tls from 'tls';
 import * as tty from 'tty';
-import { URL, parse } from 'url';
+import { URL } from 'url';
 import { buildEnvFromFlag } from './helpers.js';
 const debug = debugFactory('heroku:run');
-const wait = (ms) => new Promise(resolve => setTimeout(() => resolve(), ms));
+const wait = (ms) => new Promise(resolve => {
+    setTimeout(() => resolve(), ms);
+});
 export default class Dyno extends Duplex {
     opts;
     dyno;
@@ -42,7 +45,7 @@ export default class Dyno extends Duplex {
         this.pipe(process.stdout);
         if (this.dyno && this.dyno.attach_url) {
             this.uri = new URL(this.dyno.attach_url);
-            this.legacyUri = parse(this.dyno.attach_url);
+            this.legacyUri = new URL(this.dyno.attach_url);
         }
         if (this._useSSH) {
             this.p = this._ssh();
@@ -54,9 +57,7 @@ export default class Dyno extends Duplex {
             this.end();
         });
     }
-    /**
-     * Starts the dyno
-     */
+    // Starts the dyno
     async start() {
         this._startedAt = Date.now();
         if (this.opts.showStatus) {
@@ -168,7 +169,7 @@ export default class Dyno extends Duplex {
         // does not actually uncork but allows error to be displayed when attempting to read
         this.uncork();
         if (this.opts.listen) {
-            ux.stderr(`listening on port ${host}:${port} for ssh client`);
+            ux.stdout(`listening on port ${host}:${port} for ssh client`);
         }
         else {
             const params = [host, '-p', port.toString(), '-oStrictHostKeyChecking=no', '-oUserKnownHostsFile=/dev/null', '-oServerAliveInterval=20'];
@@ -247,11 +248,9 @@ export default class Dyno extends Duplex {
             if (Date.now() - this._startedAt < 1000 * 20)
                 return;
             const notification = {
-                // @ts-ignore
                 message: 'dyno is up',
-                subtitle: `heroku run ${this.opts.command}`,
+                subtitle: this.opts.notificationSubtitle || `heroku run ${this.opts.command}`,
                 title: this.opts.app,
-                // sound: true
             };
             notify(notification);
         }
@@ -280,8 +279,7 @@ export default class Dyno extends Duplex {
             this._notify();
             // carriage returns break json parsing of output
             if (!process.stdout.isTTY) {
-                // eslint-disable-next-line no-control-regex, prefer-regex-literals
-                data = data.replace(new RegExp('\r\n', 'g'), '\n');
+                data = data.replaceAll('\r\n', '\n');
             }
             const exitCode = data.match(/\uFFFF heroku-command-exit-status: (\d+)/m);
             if (exitCode) {
@@ -329,8 +327,7 @@ export default class Dyno extends Duplex {
         }
         else {
             stdin.pipe(new Transform({
-                // eslint-disable-next-line unicorn/no-hex-escape
-                flush: done => c.write('\x04', done),
+                flush: done => c.write('\u0004', done),
                 objectMode: true,
                 transform: (chunk, _, next) => c.write(chunk, next),
             }));
@@ -351,7 +348,7 @@ export default class Dyno extends Duplex {
             c.setTimeout(1000 * 60 * 60);
             c.setEncoding('utf8');
             c.on('connect', () => {
-                debug('connect');
+                debug('dyno connect');
                 // @ts-ignore eslint-disable-next-line no-unsafe-optional-chaining
                 const pathnameWithSearchParams = this.uri.pathname + this.uri.search;
                 c.write(pathnameWithSearchParams.slice(1) + '\r\n', () => {
@@ -362,7 +359,7 @@ export default class Dyno extends Duplex {
             });
             c.on('data', this._readData(c));
             c.on('close', () => {
-                debug('close');
+                debug('dyno connection close');
                 // @ts-ignore
                 this.opts['exit-code'] ? this.reject('No exit code returned') : this.resolve();
                 if (this.unpipeStdin) {
@@ -371,7 +368,7 @@ export default class Dyno extends Duplex {
             });
             c.on('error', this.reject);
             c.on('timeout', () => {
-                debug('timeout');
+                debug('dyno timeout');
                 c.end();
                 // @ts-ignore
                 this.reject(new Error('timed out'));

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/npm-shrinkwrap.json

@@ -20856,7 +20856,7 @@
     },
     "packages/cli": {
       "name": "heroku",
-      "version": "11.0.0-alpha.12",
+      "version": "11.0.0-alpha.13",
       "license": "ISC",
       "dependencies": {
         "@heroku-cli/command": "^12.1.1",