add script update version

Author: aspeddro

CONTRIBUTING.md

@@ -223,4 +223,4 @@ For beta releases, ask folks to use the pre-release version installable from the
 
 ## Releasing the `@rescript/tools` package
 
-The tools package is released by bumping the version in `tools/package.json` and `tools/bin/main/ml`, running `npm i` in the `tools/` folder, and then pushing those changes with the commit message `publish tools`.
+The tools package is released by bumping the version in `tools/package.json` and run `node scripts/updateVersion.js`, running `npm i` in the `tools/` folder, and then pushing those changes with the commit message `publish tools`.

analysis/bin/main.ml

@@ -145,13 +145,7 @@ let main () =
       ~pos:(int_of_string line_start, int_of_string line_end)
       ~maxLength ~debug
   | [_; "codeLens"; path] -> Commands.codeLens ~path ~debug
-  | [_; "extractDocs"; path] ->
-
-    let () = match Sys.getenv_opt "FROM_COMPILER" with
-    | Some("true") -> Cfg.isDocGenFromCompiler := true
-    | _ -> () in
-
-    DocExtraction.extractDocs ~path ~debug
+  | [_; "extractDocs"; path] -> DocExtraction.extractDocs ~path ~debug
   | [_; "codeAction"; path; startLine; startCol; endLine; endCol; currentFile]
     ->
     Commands.codeAction ~path

scripts/updateVersion.js

@@ -0,0 +1,24 @@
+//@ts-check
+// This file is used only in dev time
+// Bump version in package.json and this script will update version in ml file
+// and rescript.json
+
+const fs = require("fs");
+const path = require("path");
+
+const toolsPkgDir = path.join(__dirname, "..", "tools");
+
+const { version } = JSON.parse(
+  fs.readFileSync(path.join(toolsPkgDir, "package.json"), "utf8"),
+);
+
+const rescriptJsonPath = path.join(toolsPkgDir, "rescript.json");
+
+const rescriptJson = JSON.parse(fs.readFileSync(rescriptJsonPath, "utf8"));
+rescriptJson.version = version;
+fs.writeFileSync(rescriptJsonPath, JSON.stringify(rescriptJson, null, 2));
+
+fs.writeFileSync(
+  path.join(toolsPkgDir, "bin", "version.ml"),
+  `let version = "${version}"`,
+);

tools/bin/main.ml

@@ -1,6 +1,4 @@
 (* Update here and package.json *)
-let version = "0.1.1"
-
 let docHelp =
   {|ReScript Tools
 
@@ -33,12 +31,20 @@ let logAndExit ~log ~code =
   in
   exit code
 
+let version = Version.version
+
 let main () =
   match Sys.argv |> Array.to_list |> List.tl with
   | "doc" :: rest -> (
     match rest with
     | ["-h"] | ["--help"] -> logAndExit ~log:docHelp ~code:`Ok
-    | [path] -> Analysis.DocExtraction.extractDocs ~path ~debug:false
+    | [path] -> (
+      (* NOTE: Internal use to generate docs from compiler *)
+      let () = match Sys.getenv_opt "FROM_COMPILER" with
+      | Some("true") -> Analysis.Cfg.isDocGenFromCompiler := true
+      | _ -> () in
+      Analysis.DocExtraction.extractDocs ~path ~debug:false
+    )
     | _ -> logAndExit ~log:docHelp ~code:`Error)
   | "reanalyze" :: _ ->
     let len = Array.length Sys.argv in

tools/bin/version.ml

@@ -0,0 +1 @@
+let version = "0.3.0"

tools/rescript.json

@@ -1,6 +1,6 @@
 {
   "name": "@rescript/tools",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "sources": [
     {
       "dir": "src"
@@ -11,4 +11,4 @@
     "module": "commonjs",
     "in-source": true
   }
-}
+}

tools/src/cli.js

@@ -12,12 +12,8 @@ const binPath = path.join(__dirname, "..", "binaries", platformArch, "rescript-t
 
 const args = process.argv.slice(2);
 
-const spawn = child_process.spawnSync(binPath, args);
+const spawn = child_process.spawnSync(binPath, args, { stdio: "inherit" });
 
-if (spawn.status !== 0) {
-  console.log(spawn.stderr.toString().trim());
-  process.exit(spawn.status || 1);
-} else {
-  console.log(spawn.stdout.toString().trim());
-  process.exit(0)
+if (spawn.status != null) {
+  process.exit(spawn.status)
 }