PR feedback

Author: joe-yeager

commands/project/migrate.ts

@@ -23,15 +23,16 @@ export type ProjectMigrateArgs = CommonArgs &
   AccountArgs &
   EnvironmentArgs &
   ConfigArgs & {
-    dest?: string;
     platformVersion: string;
   };
 
 export const command = 'migrate';
 
 export const describe = undefined; // i18n('commands.project.subcommands.migrate.noProjectConfig')
 
-export async function handler(options: ArgumentsCamelCase<ProjectMigrateArgs>) {
+export async function handler(
+  options: ArgumentsCamelCase<ProjectMigrateArgs>
+): Promise<void> {
   const projectConfig = await getProjectConfig();
 
   if (!projectConfig.projectConfig) {
@@ -59,7 +60,7 @@ export async function handler(options: ArgumentsCamelCase<ProjectMigrateArgs>) {
   return process.exit(EXIT_CODES.SUCCESS);
 }
 
-export function builder(yargs: Argv) {
+export function builder(yargs: Argv): Argv<ProjectMigrateArgs> {
   addConfigOptions(yargs);
   addAccountOptions(yargs);
   addGlobalOptions(yargs);

lang/en.lyaml

@@ -715,11 +715,11 @@ en:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
         migrate:
-            describe: "Migrate a project to the projects framework."
+            describe: "Migrate an existing project to the new version of the projects framework."
             errors:
                 noProjectConfig: "No project detected. Please run this command again from a project directory."
             examples:
-                default: "Migrate a project to the projects framework"
+                default: "Migrate an existing project to the new version of the projects framework."
         deploy:
           describe: "Deploy a project build."
           deployBuildIdPrompt: "[--build] Deploy which build?"

lib/app/migrate.ts

@@ -55,7 +55,9 @@ function getUnmigratableReason(reasonCode: string): string {
   }
 }
 
-function filterAppsByProjectName(projectConfig?: LoadedProjectConfig) {
+function filterAppsByProjectName(
+  projectConfig?: LoadedProjectConfig
+): (app: MigrationApp) => boolean {
   return (app: MigrationApp) => {
     if (projectConfig) {
       return app.projectName === projectConfig?.projectConfig?.name;
@@ -64,16 +66,11 @@ function filterAppsByProjectName(projectConfig?: LoadedProjectConfig) {
   };
 }
 
-async function handleMigrationSetup(
+async function fetchMigrationApps(
+  appId: MigrateAppArgs['appId'],
   derivedAccountId: number,
-  options: ArgumentsCamelCase<MigrateAppArgs>,
   projectConfig?: LoadedProjectConfig
-): Promise<{
-  appIdToMigrate?: number | undefined;
-  projectName?: string;
-  projectDest?: string;
-}> {
-  const { name, dest, appId } = options;
+): Promise<MigrationApp[]> {
   const {
     data: { migratableApps, unmigratableApps },
   } = await listAppsForMigration(derivedAccountId);
@@ -118,6 +115,22 @@ async function handleMigrationSetup(
     throw new Error(lib.migrate.errors.appWithAppIdNotFound(appId));
   }
 
+  return allApps;
+}
+
+async function selectAppToMigrate(
+  allApps: MigrationApp[],
+  appId?: number
+): Promise<{ proceed: boolean; appIdToMigrate?: number }> {
+  if (
+    appId &&
+    !allApps.some(app => {
+      return app.appId === appId;
+    })
+  ) {
+    throw new Error(lib.migrate.errors.appWithAppIdNotFound(appId));
+  }
+
   const appChoices = allApps.map(app => ({
     name: app.isMigratable
       ? app.appName
@@ -170,6 +183,30 @@ async function handleMigrationSetup(
 
   logger.log();
   const proceed = await confirmPrompt(lib.migrate.prompt.proceed);
+  return {
+    proceed,
+    appIdToMigrate,
+  };
+}
+
+async function handleMigrationSetup(
+  derivedAccountId: number,
+  options: ArgumentsCamelCase<MigrateAppArgs>,
+  projectConfig?: LoadedProjectConfig
+): Promise<{
+  appIdToMigrate?: number | undefined;
+  projectName?: string;
+  projectDest?: string;
+}> {
+  const { name, dest, appId } = options;
+
+  const allApps = await fetchMigrationApps(
+    appId,
+    derivedAccountId,
+    projectConfig
+  );
+
+  const { proceed, appIdToMigrate } = await selectAppToMigrate(allApps, appId);
 
   if (!proceed) {
     return {};
@@ -453,7 +490,7 @@ export function logInvalidAccountError(): void {
   logger.error(lib.migrate.errors.invalidAccountTypeTitle);
   logger.log(
     lib.migrate.errors.invalidAccountTypeDescription(
-      uiCommandReference('hs accounts use'),
+      uiCommandReference('hs account use'),
       uiCommandReference('hs auth')
     )
   );