rescript.js: refactor

Author: cknitt

cli/rescript.js

@@ -7,43 +7,44 @@ import { bsc_exe, rescript_exe } from "./common/bins.js";
 
 const args = process.argv.slice(2);
 
-const firstPositionalArgIndex = args.findIndex(arg => !arg.startsWith("-"));
-
-try {
-  if (firstPositionalArgIndex !== -1) {
-    const subcommand = args[firstPositionalArgIndex];
-    const subcommandWithArgs = args.slice(firstPositionalArgIndex);
-
-    switch (subcommand) {
-      case "build":
-      case "watch":
-      case "clean":
-      case "compiler-args":
-      case "format":
-        child_process.execFileSync(
-          rescript_exe,
-          [...subcommandWithArgs, "--bsc-path", bsc_exe],
-          {
-            stdio: "inherit",
-          },
-        );
-        break;
-      default:
-        child_process.execFileSync(rescript_exe, [...args], {
-          stdio: "inherit",
-        });
-        break;
-    }
-  } else {
-    // no subcommand means build subcommand
-    child_process.execFileSync(rescript_exe, [...args, "--bsc-path", bsc_exe], {
+/**
+ * @param {string[]} cmdArgs
+ */
+function execRescript(cmdArgs) {
+  console.log(cmdArgs)
+  try {
+    child_process.execFileSync(rescript_exe, cmdArgs, {
       stdio: "inherit",
     });
+  } catch (err) {
+    if (err.status !== undefined) {
+      process.exit(err.status); // Pass through the exit code
+    } else {
+      process.exit(1); // Generic error
+    }
   }
-} catch (err) {
-  if (err.status !== undefined) {
-    process.exit(err.status); // Pass through the exit code
-  } else {
-    process.exit(1); // Generic error
+}
+
+const firstPositionalArgIndex = args.findIndex(arg => !arg.startsWith("-"));
+
+if (firstPositionalArgIndex !== -1) {
+  const subcommand = args[firstPositionalArgIndex];
+  const subcommandWithArgs = args.slice(firstPositionalArgIndex);
+
+
+  switch (subcommand) {
+    case "build":
+    case "watch":
+    case "clean":
+    case "compiler-args":
+    case "format":
+      execRescript([...subcommandWithArgs, "--bsc-path", bsc_exe]);
+      break;
+    default:
+      execRescript(args);
+      break;
   }
+} else {
+  // no subcommand means build subcommand
+  execRescript([...args, "--bsc-path", bsc_exe]);
 }