fix bin path

Author: cometkim

cli/bsc.js

@@ -4,7 +4,7 @@
 
 import { execFileSync } from "node:child_process";
 
-import { bsc_exe } from "#cli/paths";
+import { bsc_exe } from "./common/bins.js";
 
 const delegate_args = process.argv.slice(2);
 

cli/common/paths.js renamed to cli/common/bins.js

@@ -2,8 +2,6 @@
 
 import * as path from "node:path";
 
-export const cliPath = path.join(import.meta.dirname, "../rescript.js");
-
 /**
  * For compatibility reasons, if the architecture is x64, omit it from the bin directory name.
  * So we'll have "darwin", "linux" and "win32" for x64 arch,
@@ -19,6 +17,7 @@ export const platformName =
 export const platformDir = path.resolve(
   import.meta.dirname,
   "..",
+  "..",
   platformName,
 );
 

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 "./paths.js";
+import { rescript_exe } from "./bins.js";
 
 const cwd = process.cwd();
 const lockFileName = path.join(cwd, ".bsb.lock");

cli/rescript-tools.js

@@ -4,7 +4,7 @@
 
 import * as child_process from "node:child_process";
 
-import { rescript_tools_exe } from "#cli/paths";
+import { rescript_tools_exe } from "./common/bins.js";
 
 const args = process.argv.slice(2);
 

cli/rescript.js

@@ -9,8 +9,8 @@
 import * as tty from "node:tty";
 import packageJson from "rescript/package.json" with { type: "json" };
 
-import * as bsb from "#cli/bsb";
-import { bsc_exe, rescript_exe } from "#cli/paths";
+import { bsc_exe, rescript_exe } from "./common/bins.js";
+import * as bsb from "./common/bsb.js";
 
 const cwd = process.cwd();
 process.env.BSB_PROJECT_ROOT = cwd;

cli/rewatch.js

@@ -3,7 +3,7 @@
 // @ts-check
 
 import * as child_process from "node:child_process";
-import { rewatch_exe } from "#cli/paths";
+import { rewatch_exe } from "./common/bins.js";
 
 const args = process.argv.slice(2);
 

lib_dev/process.js

@@ -1,5 +1,6 @@
 import * as child_process from "node:child_process";
-import { bsc_exe, cliPath, rescript_exe } from "#cli/paths";
+import * as path from "node:path";
+import { bsc_exe, rescript_exe } from "#cli/bins";
 
 /**
  * @typedef {{
@@ -135,6 +136,7 @@ export function setup(cwd = process.cwd()) {
      * @return {Promise<ExecResult>}
      */
     rescript(command, args = [], options = {}) {
+      const cliPath = path.join(import.meta.dirname, "../cli/rescript.js");
       return exec("node", [cliPath, command, ...args].filter(Boolean), options);
     },
 

package.json

@@ -73,7 +73,7 @@
     "./package.json": "./package.json"
   },
   "imports": {
-    "#cli/*": "./cli/common/*.js",
+    "#cli/bins": "./cli/common/bins.js",
     "#dev/*": "./lib_dev/*.js",
     "#lib/minisocket": "./lib/minisocket.js"
   },

runtime/RescriptTools.res

@@ -11,5 +11,5 @@ You can use this when you're already running a JS process and want to avoid the
 let stringifiedJson = ChildProcess.execFileSync(RescriptTools.binaryPath, ["-v"])
 ```
 */
-@module("#cli/paths")
+@module("#cli/bins")
 external binaryPath: string = "rescript_tools_exe"

scripts/copyExes.js

@@ -7,7 +7,7 @@
 import * as child_process from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { platformDir } from "#cli/paths";
+import { platformDir } from "#cli/bins";
 import { compilerBinDir, ninjaDir, rewatchDir } from "#dev/paths";
 
 fs.mkdirSync(platformDir, { recursive: true });