refactor(cli/migrate): convenience function for resolving general all…

… migration inputs

packages/remix-dev/cli/migrate/resolveInput.ts

@@ -1,12 +1,14 @@
 import inquirer from "inquirer";
 
+import { checkGitStatus } from "../checkGitStatus";
+import type { Flags } from "./flags";
 import { migrations } from "./migrations";
 
-export const resolveProjectDir = (input?: string): string => {
+const resolveProjectDir = (input?: string): string => {
   return input || process.env.REMIX_ROOT || process.cwd();
 };
 
-export const resolveMigrationId = async (input?: string): Promise<string> => {
+const resolveMigrationId = async (input?: string): Promise<string> => {
   if (input !== undefined) return input;
   let { migrationId } = await inquirer.prompt<{ migrationId?: string }>([
     {
@@ -33,3 +35,21 @@ export const resolveMigrationId = async (input?: string): Promise<string> => {
   }
   return migrationId;
 };
+
+export const resolveInput = async (
+  input: {
+    projectId: string;
+    migrationId?: string;
+  },
+  flags: Flags
+) => {
+  let projectDir = resolveProjectDir(input.projectId);
+  if (!flags.dry) {
+    checkGitStatus(projectDir, { force: flags.force });
+  }
+  let migrationId = await resolveMigrationId(input.migrationId);
+  return {
+    projectDir,
+    migrationId,
+  };
+};

packages/remix-dev/cli/run.ts

@@ -7,7 +7,6 @@ import inquirer from "inquirer";
 import * as colors from "../colors";
 import * as commands from "./commands";
 import { validateNewProjectPath, validateTemplate } from "./create";
-import { checkGitStatus } from "./checkGitStatus";
 
 const helpText = `
 ${colors.logoBlue("R")} ${colors.logoGreen("E")} ${colors.logoYellow(
@@ -346,12 +345,12 @@ export async function run(argv: string[] = process.argv.slice(2)) {
       await commands.setup(input[1]);
       break;
     case "migrate": {
-      let projectDir = commands.migrate.resolveProjectDir(input[1]);
-      if (!flags.dry) {
-        checkGitStatus(projectDir, { force: flags.force });
-      }
-      let migrationId = await commands.migrate.resolveMigrationId(
-        flags.migration
+      let { projectDir, migrationId } = await commands.migrate.resolveInput(
+        {
+          projectId: input[1],
+          migrationId: flags.migration,
+        },
+        flags
       );
       await commands.migrate.run({ migrationId, projectDir, flags });
       break;