change binary package exports

Author: cometkim

cli/common/bins.js

@@ -2,7 +2,11 @@
 
 /**
  * @typedef {{
- *   platformDir: string,
+ *   binDir: string,
+ *   binPaths: BinaryPaths,
+ * }} BinaryModuleExports
+ *
+ * @typedef {{
  *   bsb_helper_exe: string,
  *   bsc_exe: string,
  *   ninja_exe: string,
@@ -15,22 +19,23 @@
 
 const target = `${process.platform}-${process.arch}`;
 
-/** @type {BinaryPaths} */
-let binPaths;
+/** @type {BinaryModuleExports} */
+let mod;
 try {
-  binPaths = await import(`@rescript/${target}/paths`);
-} catch (err) {
-  console.error(`Platform ${target} is not supported!`);
-  throw err;
+  mod = await import(`@rescript/${target}`);
+} catch {
+  throw new Error(`Platform ${target} is not supported!`);
 }
 
 export const {
-  platformDir,
-  bsb_helper_exe,
-  bsc_exe,
-  ninja_exe,
-  rescript_editor_analysis_exe,
-  rescript_tools_exe,
-  rescript_exe,
-  rewatch_exe,
-} = binPaths;
+  binDir: platformDir,
+  binPaths: {
+    bsb_helper_exe,
+    bsc_exe,
+    ninja_exe,
+    rescript_editor_analysis_exe,
+    rescript_tools_exe,
+    rescript_exe,
+    rewatch_exe,
+  },
+} = mod;

package.json

@@ -59,7 +59,8 @@
     "CREDITS.md",
     "ninja.COPYING",
     "docs/docson/build-schema.json",
-    "lib",
+    "lib/js/*.js",
+    "lib/es6/*.js",
     "cli"
   ],
   "exports": {

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

@@ -0,0 +1,17 @@
+// @ts-check
+
+import * as path from "node:path";
+
+export const binDir = path.join(import.meta.dirname, "bin");
+
+export const binPaths = {
+  bsc_exe: path.join(binDir, "bsc.exe"),
+  ninja_exe: path.join(binDir, "ninja.exe"),
+  rescript_exe: path.join(binDir, "rescript.exe"),
+  rescript_tools_exe: path.join(binDir, "rescript-tools.exe"),
+  rescript_editor_analysis_exe: path.join(
+    binDir,
+    "rescript-editor-analysis.exe",
+  ),
+  rewatch_exe: path.join(binDir, "rewatch.exe"),
+};

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

@@ -20,7 +20,8 @@
     "arm64"
   ],
   "files": [
-    "bin"
+    "bin.js",
+    "bin/"
   ],
   "bin": {
     "bsb_helper.exe": "./bin/bsb_helper.exe",
@@ -31,8 +32,6 @@
     "rescript.exe": "./bin/rescript.exe",
     "rewatch.exe": "./bin/rewatch.exe"
   },
-  "exports": {
-    "./paths": "./bin/paths.js"
-  },
+  "exports": "./bin.js",
   "preferUnplugged": true
 }

packages/@rescript/darwin-arm64/package.json

@@ -0,0 +1,17 @@
+// @ts-check
+
+import * as path from "node:path";
+
+export const binDir = path.join(import.meta.dirname, "bin");
+
+export const binPaths = {
+  bsc_exe: path.join(binDir, "bsc.exe"),
+  ninja_exe: path.join(binDir, "ninja.exe"),
+  rescript_exe: path.join(binDir, "rescript.exe"),
+  rescript_tools_exe: path.join(binDir, "rescript-tools.exe"),
+  rescript_editor_analysis_exe: path.join(
+    binDir,
+    "rescript-editor-analysis.exe",
+  ),
+  rewatch_exe: path.join(binDir, "rewatch.exe"),
+};

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

@@ -20,7 +20,8 @@
     "x64"
   ],
   "files": [
-    "bin"
+    "bin.js",
+    "bin/"
   ],
   "bin": {
     "bsb_helper.exe": "./bin/bsb_helper.exe",
@@ -31,8 +32,6 @@
     "rescript.exe": "./bin/rescript.exe",
     "rewatch.exe": "./bin/rewatch.exe"
   },
-  "exports": {
-    "./paths": "./bin/paths.js"
-  },
+  "exports": "./bin.js",
   "preferUnplugged": true
 }

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

@@ -0,0 +1,17 @@
+// @ts-check
+
+import * as path from "node:path";
+
+export const binDir = path.join(import.meta.dirname, "bin");
+
+export const binPaths = {
+  bsc_exe: path.join(binDir, "bsc.exe"),
+  ninja_exe: path.join(binDir, "ninja.exe"),
+  rescript_exe: path.join(binDir, "rescript.exe"),
+  rescript_tools_exe: path.join(binDir, "rescript-tools.exe"),
+  rescript_editor_analysis_exe: path.join(
+    binDir,
+    "rescript-editor-analysis.exe",
+  ),
+  rewatch_exe: path.join(binDir, "rewatch.exe"),
+};