chore: getting closer

Author: mdonnalley

src/commands/org/create/scratch.tsx src/commands/org/create/scratch.tssrc/commands/org/create/scratch.tsx renamed to src/commands/org/create/scratch.ts

@@ -171,42 +171,38 @@ export default class OrgCreateScratch extends SfCommand<ScratchCreateResponse> {
       flags['client-id'] ? await this.secretPrompt({ message: messages.getMessage('prompt.secret') }) : undefined
     );
 
-    const ms = new MultiStageRenderer<ScratchOrgLifecycleEvent & { alias: string; edition: string }>({
+    const ms = new MultiStageRenderer<ScratchOrgLifecycleEvent & { alias: string }>({
       stages: flags.async ? ['prepare request', 'send request', 'done'] : scratchOrgLifecycleStages,
       title: flags.async ? 'Creating Scratch Org (async)' : 'Creating Scratch Org',
-      timeout: flags.wait,
       info: [
         {
           label: 'Request Id',
           get: (data) =>
             data.scratchOrgInfo?.Id && terminalLink(data.scratchOrgInfo.Id, `${baseUrl}/${data.scratchOrgInfo.Id}`),
-          bold: true,
+          isBold: true,
         },
         {
           label: 'OrgId',
           get: (data) => data.scratchOrgInfo?.ScratchOrg,
-          bold: true,
+          isBold: true,
           color: 'cyan',
         },
         {
           label: 'Username',
           get: (data) => data.scratchOrgInfo?.SignupUsername,
-          bold: true,
+          isBold: true,
           color: 'cyan',
         },
         {
           label: 'Alias',
           get: (data) => data.alias,
-        },
-        {
-          label: 'Edition',
-          get: (data) => data.edition,
+          isStatic: true,
         },
       ],
     });
 
     if (!this.jsonEnabled()) {
-      ms.start({ alias: flags.alias, edition: flags.edition });
+      ms.start({ alias: flags.alias });
     }
 
     lifecycle.on<ScratchOrgLifecycleEvent>(scratchOrgLifecycleEventName, async (data): Promise<void> => {

src/commands/org/resume/scratch.tsx src/commands/org/resume/scratch.tssrc/commands/org/resume/scratch.tsx renamed to src/commands/org/resume/scratch.ts

@@ -14,12 +14,12 @@ import {
   ScratchOrgCache,
   ScratchOrgLifecycleEvent,
   scratchOrgLifecycleEventName,
+  scratchOrgLifecycleStages,
   scratchOrgResume,
   SfError,
 } from '@salesforce/core';
-import { render } from 'ink';
-import React from 'react';
-import { Status } from '../../../components/stages.js';
+import terminalLink from 'terminal-link';
+import { MultiStageRenderer } from '../../../components/stages.js';
 import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -57,16 +57,46 @@ export default class OrgResumeScratch extends SfCommand<ScratchCreateResponse> {
 
     // oclif doesn't know that the exactlyOne flag will ensure that one of these is set, and there we definitely have a jobID.
     assert(jobId);
-    const hubBaseUrl = cache.get(jobId)?.hubBaseUrl;
+    const cached = cache.get(jobId);
+    const hubBaseUrl = cached?.hubBaseUrl;
 
-    let scratchOrgLifecycleData: ScratchOrgLifecycleEvent | undefined;
+    const ms = new MultiStageRenderer<ScratchOrgLifecycleEvent & { alias: string }>({
+      stages: scratchOrgLifecycleStages,
+      title: 'Resuming Scratch Org',
+      info: [
+        {
+          label: 'Request Id',
+          get: (data) =>
+            data.scratchOrgInfo?.Id && terminalLink(data.scratchOrgInfo.Id, `${hubBaseUrl}/${data.scratchOrgInfo.Id}`),
+          isBold: true,
+        },
+        {
+          label: 'OrgId',
+          get: (data) => data.scratchOrgInfo?.ScratchOrg,
+          isBold: true,
+          color: 'cyan',
+        },
+        {
+          label: 'Username',
+          get: (data) => data.scratchOrgInfo?.SignupUsername,
+          isBold: true,
+          color: 'cyan',
+        },
+        {
+          label: 'Alias',
+          get: (data) => data.alias,
+          isStatic: true,
+        },
+      ],
+    });
 
-    const instance = !this.jsonEnabled() ? render(<Status baseUrl={hubBaseUrl} />) : undefined;
+    if (!this.jsonEnabled()) {
+      ms.start({ alias: cached?.alias });
+    }
     lifecycle.on<ScratchOrgLifecycleEvent>(scratchOrgLifecycleEventName, async (data): Promise<void> => {
-      scratchOrgLifecycleData = data;
-      instance?.rerender(<Status data={data} baseUrl={hubBaseUrl} />);
+      ms.goto(data.stage, data);
       if (data.stage === 'done') {
-        instance?.unmount();
+        ms.stop();
       }
       return Promise.resolve();
     });
@@ -77,10 +107,7 @@ export default class OrgResumeScratch extends SfCommand<ScratchCreateResponse> {
       this.logSuccess(messages.getMessage('success'));
       return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
     } catch (e) {
-      if (instance) {
-        instance.rerender(<Status data={scratchOrgLifecycleData} error={e as Error} baseUrl={hubBaseUrl} />);
-        instance.unmount();
-      }
+      ms.stop(e as Error);
 
       if (cache.keys() && e instanceof Error && e.name === 'CacheMissError') {
         // we have something in the cache, but it didn't match what the user passed in

src/components/spinner.tsx

@@ -95,11 +95,6 @@ export function SpinnerOrErrorOrChildren({
   ...props
 }: SpinnerProps & {
   readonly children?: React.ReactNode;
-  readonly textStyle?: {
-    readonly color?: string;
-    readonly bold?: boolean;
-  };
-  readonly text?: string;
   readonly error?: Error;
 }): React.ReactElement {
   if (children) {