tools: fix experimental embed command output, and expose JS function for retrieving the correct OCaml binary to call for the platform you are on

Author: zth

tools/npm/RescriptTools.res

@@ -1 +1,14 @@
 module Docgen = Tools_Docgen
+
+/** Returns the full file system path to the `rescript-tools` binary for the current platform, side stepping the JS that wraps the CLI.
+ 
+ You can use this when you're already running a JS process and want to avoid the overhead of starting another one.
+
+ ## Examples
+ ```rescript
+ // Prints the current ReScript Tools version.
+ let stringifiedJson = ChildProcess.execFileSync(RescriptTools.getBinaryPath(), ["-v"])
+ ```
+ */
+@module("./getBinaryPath.js")
+external getBinaryPath: unit => string = "getBinaryPath"

tools/npm/cli.js

@@ -3,17 +3,14 @@
 "use strict";
 
 const child_process = require("child_process");
-const path = require("path");
-
-const platformArch =
-  process.arch === "x64" ? process.platform : process.platform + process.arch;
-
-const binPath = path.join(__dirname, "..", "binaries", platformArch, "rescript-tools.exe");
+const { getBinaryPath } = require("./getBinaryPath");
 
 const args = process.argv.slice(2);
 
-const spawn = child_process.spawnSync(binPath, args, { stdio: "inherit" });
+const spawn = child_process.spawnSync(getBinaryPath(), args, {
+  stdio: "inherit",
+});
 
 if (spawn.status != null) {
-  process.exit(spawn.status)
+  process.exit(spawn.status);
 }

tools/npm/getBinaryPath.js

@@ -0,0 +1,19 @@
+const path = require("path");
+
+function getBinaryPath() {
+  const platformArch =
+    process.arch === "x64" ? process.platform : process.platform + process.arch;
+
+  const binPath = path.join(
+    __dirname,
+    "..",
+    "binaries",
+    platformArch,
+    "rescript-tools.exe"
+  );
+  return binPath;
+}
+
+module.exports = {
+  getBinaryPath,
+};

tools/package.json

@@ -14,6 +14,7 @@
 	],
 	"files": [
 		"npm/cli.js",
+		"npm/getBinaryPath.js",
 		"npm/*.res",
 		"npm/*.resi",
 		"binaries",

tools/src/tools.ml

@@ -477,8 +477,8 @@ let extractEmbedded ~extensionPoints ~filename =
   |> List.map (fun (loc, extensionName, contents) ->
          stringifyObject
            [
-             ("extensionName", Some extensionName);
-             ("contents", Some contents);
+             ("extensionName", Some (wrapInQuotes extensionName));
+             ("contents", Some (wrapInQuotes contents));
              ("loc", Some (Analysis.Utils.cmtLocToRange loc |> stringifyRange));
            ])
   |> array