rescript_exe -> rescript_legacy_exe

Author: cknitt

cli/common/bins.js

@@ -22,7 +22,7 @@ export const {
     ninja_exe,
     rescript_editor_analysis_exe,
     rescript_tools_exe,
-    rescript_exe,
+    rescript_legacy_exe,
     rewatch_exe,
   },
 } = mod;

cli/common/bsb.js

@@ -7,7 +7,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { WebSocket } from "#lib/minisocket";
 
-import { rescript_exe } from "./bins.js";
+import { rescript_legacy_exe } from "./bins.js";
 
 const cwd = process.cwd();
 const lockFileName = path.join(cwd, ".bsb.lock");
@@ -50,7 +50,7 @@ function acquireBuild(args, options) {
     return null;
   }
   try {
-    ownerProcess = child_process.spawn(rescript_exe, args, {
+    ownerProcess = child_process.spawn(rescript_legacy_exe, args, {
       stdio: "inherit",
       ...options,
     });

cli/rescript.js renamed to cli/rescript-legacy.js

@@ -6,10 +6,10 @@
 // It matters since we need read .sourcedirs(location)
 // and its content are file/directories with regard to project root
 
-import * as tty from "node:tty";
 import * as fs from "node:fs";
+import * as tty from "node:tty";
 
-import { bsc_exe, rescript_exe } from "./common/bins.js";
+import { bsc_exe, rescript_legacy_exe } from "./common/bins.js";
 import * as bsb from "./common/bsb.js";
 
 const cwd = process.cwd();
@@ -94,7 +94,7 @@ if (
   console.log(helpMessage);
 } else if (argPatterns.version.includes(args[0])) {
   const packageSpec = JSON.parse(
-    fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8")
+    fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
   );
 
   console.log(packageSpec.version);
@@ -116,13 +116,13 @@ if (
       break;
     }
     case "format": {
-      const mod = await import("./rescript/format.js");
-      await mod.main(subcmdArgs, rescript_exe, bsc_exe);
+      const mod = await import("./rescript-legacy/format.js");
+      await mod.main(subcmdArgs, rescript_legacy_exe, bsc_exe);
       break;
     }
     case "dump": {
-      const mod = await import("./rescript/dump.js");
-      mod.main(subcmdArgs, rescript_exe, bsc_exe);
+      const mod = await import("./rescript-legacy/dump.js");
+      mod.main(subcmdArgs, rescript_legacy_exe, bsc_exe);
       break;
     }
     default: {

cli/rescript/dump.js renamed to cli/rescript-legacy/dump.js

@@ -16,10 +16,10 @@ const specs = [];
 
 /**
  * @param {string[]} argv
- * @param {string} rescript_exe
+ * @param {string} rescript_legacy_exe
  * @param {string} bsc_exe
  */
-export function main(argv, rescript_exe, bsc_exe) {
+export function main(argv, rescript_legacy_exe, bsc_exe) {
   let target;
   arg.parse_exn(dump_usage, argv, specs, xs => {
     if (xs.length !== 1) {
@@ -34,9 +34,13 @@ export function main(argv, rescript_exe, bsc_exe) {
     process.exit(2);
   }
 
-  let output = child_process.spawnSync(rescript_exe, ["build", "--", target], {
-    encoding: "utf-8",
-  });
+  let output = child_process.spawnSync(
+    rescript_legacy_exe,
+    ["build", "--", target],
+    {
+      encoding: "utf-8",
+    },
+  );
   if (output.status !== 0) {
     console.log(output.stdout);
     console.error(output.stderr);

cli/rescript/format.js renamed to cli/rescript-legacy/format.js

@@ -143,10 +143,10 @@ async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
 
 /**
  * @param {string[]} argv
- * @param {string} rescript_exe
+ * @param {string} rescript_legacy_exe
  * @param {string} bsc_exe
  */
-export async function main(argv, rescript_exe, bsc_exe) {
+export async function main(argv, rescript_legacy_exe, bsc_exe) {
   const isSupportedFile = hasExtension(formattedFileExtensions);
   const isSupportedStd = hasExtension(formattedStdExtensions);
 
@@ -179,7 +179,7 @@ export async function main(argv, rescript_exe, bsc_exe) {
       // -all
       // TODO: check the rest arguments
       const output = child_process.spawnSync(
-        rescript_exe,
+        rescript_legacy_exe,
         ["info", "-list-files"],
         {
           encoding: "utf-8",

lib_dev/process.js

@@ -1,7 +1,7 @@
 import * as child_process from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { bsc_exe, rescript_exe } from "#cli/bins";
+import { bsc_exe, rescript_legacy_exe } from "#cli/bins";
 
 /**
  * @typedef {{
@@ -181,7 +181,7 @@ export function setup(cwd = process.cwd()) {
      * @return {Promise<ExecResult>}
      */
     execBuild(args = [], options = {}) {
-      return exec(rescript_exe, ["build", ...args], options);
+      return exec(rescript_legacy_exe, ["build", ...args], options);
     },
 
     /**
@@ -192,7 +192,7 @@ export function setup(cwd = process.cwd()) {
      * @return {Promise<ExecResult>}
      */
     execClean(args = [], options = {}) {
-      return exec(rescript_exe, ["clean", ...args], options);
+      return exec(rescript_legacy_exe, ["clean", ...args], options);
     },
 
     /**

packages/@rescript/darwin-arm64/bin.d.ts

@@ -3,11 +3,11 @@ export const binDir: string;
 export const binPaths: BinaryPaths;
 
 export type BinaryPaths = {
-  bsb_helper_exe: string,
-  bsc_exe: string,
-  ninja_exe: string,
-  rescript_exe: string,
-  rescript_tools_exe: string,
-  rescript_editor_analysis_exe: string,
-  rewatch_exe: string,
+  bsb_helper_exe: string;
+  bsc_exe: string;
+  ninja_exe: string;
+  rescript_legacy_exe: string;
+  rescript_tools_exe: string;
+  rescript_editor_analysis_exe: string;
+  rewatch_exe: string;
 };

packages/@rescript/darwin-arm64/bin.js

@@ -8,7 +8,7 @@ export const binPaths = {
   bsb_helper_exe: path.join(binDir, "bsb_helper.exe"),
   bsc_exe: path.join(binDir, "bsc.exe"),
   ninja_exe: path.join(binDir, "ninja.exe"),
-  rescript_exe: path.join(binDir, "rescript.exe"),
+  rescript_legacy_exe: path.join(binDir, "rescript.exe"),
   rescript_tools_exe: path.join(binDir, "rescript-tools.exe"),
   rescript_editor_analysis_exe: path.join(
     binDir,

packages/@rescript/darwin-x64/bin.d.ts

@@ -3,11 +3,11 @@ export const binDir: string;
 export const binPaths: BinaryPaths;
 
 export type BinaryPaths = {
-  bsb_helper_exe: string,
-  bsc_exe: string,
-  ninja_exe: string,
-  rescript_exe: string,
-  rescript_tools_exe: string,
-  rescript_editor_analysis_exe: string,
-  rewatch_exe: string,
+  bsb_helper_exe: string;
+  bsc_exe: string;
+  ninja_exe: string;
+  rescript_legacy_exe: string;
+  rescript_tools_exe: string;
+  rescript_editor_analysis_exe: string;
+  rewatch_exe: string;
 };

packages/@rescript/darwin-x64/bin.js

@@ -8,7 +8,7 @@ export const binPaths = {
   bsb_helper_exe: path.join(binDir, "bsb_helper.exe"),
   bsc_exe: path.join(binDir, "bsc.exe"),
   ninja_exe: path.join(binDir, "ninja.exe"),
-  rescript_exe: path.join(binDir, "rescript.exe"),
+  rescript_legacy_exe: path.join(binDir, "rescript.exe"),
   rescript_tools_exe: path.join(binDir, "rescript-tools.exe"),
   rescript_editor_analysis_exe: path.join(
     binDir,