fix: wrong path to rescript executable

refactor `cli.rs` to remove duplication of docstrings

Author: Bushuo

rewatch/src/build.rs

@@ -59,7 +59,7 @@ pub struct CompilerArgs {
 pub fn get_compiler_args(
     path: &Path,
     rescript_version: Option<String>,
-    bsc_path: &Option<PathBuf>,
+    bsc_path: Option<PathBuf>,
     build_dev_deps: bool,
 ) -> Result<String> {
     let filename = &helpers::get_abs_path(path);
@@ -501,7 +501,7 @@ pub fn build(
     show_progress: bool,
     no_timing: bool,
     create_sourcedirs: bool,
-    bsc_path: &Option<PathBuf>,
+    bsc_path: Option<PathBuf>,
     build_dev_deps: bool,
     snapshot_output: bool,
 ) -> Result<BuildState> {
@@ -516,7 +516,7 @@ pub fn build(
         filter,
         show_progress,
         path,
-        bsc_path,
+        &bsc_path,
         build_dev_deps,
         snapshot_output,
     )
@@ -558,9 +558,9 @@ pub fn pass_through_legacy(args: Vec<OsString>) -> i32 {
     let project_root = helpers::get_abs_path(Path::new("."));
     let workspace_root = helpers::get_workspace_root(&project_root);
 
-    let bsb_path = helpers::get_rescript_legacy(&project_root, workspace_root);
+    let rescript_legacy_path = helpers::get_rescript_legacy(&project_root, workspace_root);
 
-    let status = std::process::Command::new(bsb_path)
+    let status = std::process::Command::new(rescript_legacy_path)
         .args(args)
         .stdout(Stdio::inherit())
         .stderr(Stdio::inherit())

rewatch/src/build/clean.rs

@@ -334,7 +334,7 @@ pub fn cleanup_after_build(build_state: &BuildState) {
 pub fn clean(
     path: &Path,
     show_progress: bool,
-    bsc_path: &Option<PathBuf>,
+    bsc_path: Option<PathBuf>,
     snapshot_output: bool,
 ) -> Result<()> {
     let project_root = helpers::get_abs_path(path);

rewatch/src/cli.rs

@@ -1,4 +1,4 @@
-use std::ffi::OsString;
+use std::{ffi::OsString, ops::Deref};
 
 use clap::{Args, Parser, Subcommand};
 use clap_verbosity_flag::InfoLevel;
@@ -24,23 +24,29 @@ pub struct Cli {
     #[command(subcommand)]
     pub command: Option<Command>,
 
+    #[command(flatten)]
+    pub build_args: BuildArgs,
+}
+
+#[derive(Args, Debug, Clone)]
+pub struct FolderArg {
     /// The relative path to where the main rescript.json resides. IE - the root of your project.
     #[arg(default_value = ".")]
     pub folder: String,
-
-    #[command(flatten)]
-    pub build_args: BuildArgs,
 }
 
 #[derive(Args, Debug, Clone)]
-pub struct BuildArgs {
+pub struct FilterArg {
     /// Filter files by regex
     ///
     /// Filter allows for a regex to be supplied which will filter the files to be compiled. For
     /// instance, to filter out test files for compilation while doing feature work.
     #[arg(short, long)]
     pub filter: Option<String>,
+}
 
+#[derive(Args, Debug, Clone)]
+pub struct AfterBuildArg {
     /// Action after build
     ///
     /// This allows one to pass an additional command to the watcher, which allows it to run when
@@ -49,14 +55,20 @@ pub struct BuildArgs {
     /// color as well
     #[arg(short, long)]
     pub after_build: Option<String>,
+}
 
+#[derive(Args, Debug, Clone, Copy)]
+pub struct CreateSourceDirsArg {
     /// Create source_dirs.json
     ///
     /// This creates a source_dirs.json file at the root of the monorepo, which is needed when you
     /// want to use Reanalyze
     #[arg(short, long, default_value_t = false, num_args = 0..=1)]
     pub create_sourcedirs: bool,
+}
 
+#[derive(Args, Debug, Clone, Copy)]
+pub struct DevArg {
     /// Build development dependencies
     ///
     /// This is the flag to also compile development dependencies
@@ -65,61 +77,72 @@ pub struct BuildArgs {
     /// _all_ packages
     #[arg(long, default_value_t = false, num_args = 0..=1)]
     pub dev: bool,
+}
 
-    /// Disable timing on the output
-    #[arg(short, long, default_value_t = false, num_args = 0..=1)]
-    pub no_timing: bool,
+#[derive(Args, Debug, Clone)]
+pub struct BscPathArg {
+    /// Custom path to bsc
+    #[arg(long)]
+    pub bsc_path: Option<String>,
+}
 
+#[derive(Args, Debug, Clone, Copy)]
+pub struct SnapshotOutputArg {
     /// simple output for snapshot testing
     #[arg(short, long, default_value = "false", num_args = 0..=1)]
     pub snapshot_output: bool,
+}
 
-    /// Path to bsc
-    #[arg(long)]
-    pub bsc_path: Option<String>,
+#[derive(Args, Debug, Clone)]
+pub struct BuildArgs {
+    #[command(flatten)]
+    pub folder: FolderArg,
+
+    #[command(flatten)]
+    pub filter: FilterArg,
+
+    #[command(flatten)]
+    pub after_build: AfterBuildArg,
+
+    #[command(flatten)]
+    pub create_sourcedirs: CreateSourceDirsArg,
+
+    #[command(flatten)]
+    pub dev: DevArg,
+
+    /// Disable timing on the output
+    #[arg(short, long, default_value_t = false, num_args = 0..=1)]
+    pub no_timing: bool,
+
+    #[command(flatten)]
+    pub snapshot_output: SnapshotOutputArg,
+
+    #[command(flatten)]
+    pub bsc_path: BscPathArg,
 }
 
 #[derive(Args, Clone, Debug)]
 pub struct WatchArgs {
-    /// Filter files by regex
-    ///
-    /// Filter allows for a regex to be supplied which will filter the files to be compiled. For
-    /// instance, to filter out test files for compilation while doing feature work.
-    #[arg(short, long)]
-    pub filter: Option<String>,
+    #[command(flatten)]
+    pub folder: FolderArg,
 
-    /// Action after build
-    ///
-    /// This allows one to pass an additional command to the watcher, which allows it to run when
-    /// finished. For instance, to play a sound when done compiling, or to run a test suite.
-    /// NOTE - You may need to add '--color=always' to your subcommand in case you want to output
-    /// color as well
-    #[arg(short, long)]
-    pub after_build: Option<String>,
+    #[command(flatten)]
+    pub filter: FilterArg,
 
-    /// Create source_dirs.json
-    ///
-    /// This creates a source_dirs.json file at the root of the monorepo, which is needed when you
-    /// want to use Reanalyze
-    #[arg(short, long, default_value_t = false, num_args = 0..=1)]
-    pub create_sourcedirs: bool,
+    #[command(flatten)]
+    pub after_build: AfterBuildArg,
 
-    /// Build development dependencies
-    ///
-    /// This is the flag to also compile development dependencies
-    /// It's important to know that we currently do not discern between project src, and
-    /// dependencies. So enabling this flag will enable building _all_ development dependencies of
-    /// _all_ packages
-    #[arg(long, default_value_t = false, num_args = 0..=1)]
-    pub dev: bool,
+    #[command(flatten)]
+    pub create_sourcedirs: CreateSourceDirsArg,
 
-    /// simple output for snapshot testing
-    #[arg(short, long, default_value = "false", num_args = 0..=1)]
-    pub snapshot_output: bool,
+    #[command(flatten)]
+    pub dev: DevArg,
 
-    /// Path to bsc
-    #[arg(long)]
-    pub bsc_path: Option<String>,
+    #[command(flatten)]
+    pub snapshot_output: SnapshotOutputArg,
+
+    #[command(flatten)]
+    pub bsc_path: BscPathArg,
 }
 
 #[derive(Subcommand, Clone, Debug)]
@@ -130,13 +153,14 @@ pub enum Command {
     Watch(WatchArgs),
     /// Clean the build artifacts
     Clean {
-        /// Path to bsc
-        #[arg(long)]
-        bsc_path: Option<String>,
+        #[command(flatten)]
+        folder: FolderArg,
+
+        #[command(flatten)]
+        bsc_path: BscPathArg,
 
-        /// simple output for snapshot testing
-        #[arg(short, long, default_value = "false", num_args = 0..=1)]
-        snapshot_output: bool,
+        #[command(flatten)]
+        snapshot_output: SnapshotOutputArg,
     },
     /// Alias to `legacy format`.
     #[command(disable_help_flag = true)]
@@ -156,23 +180,78 @@ pub enum Command {
         #[command()]
         path: String,
 
-        #[arg(long, default_value_t = false, num_args = 0..=1)]
-        dev: bool,
+        #[command(flatten)]
+        dev: DevArg,
 
         /// To be used in conjunction with compiler_args
         #[arg(long)]
         rescript_version: Option<String>,
 
-        /// A custom path to bsc
-        #[arg(long)]
-        bsc_path: Option<String>,
+        #[command(flatten)]
+        bsc_path: BscPathArg,
     },
     /// Use the legacy build system.
     ///
     /// After this command is encountered, the rest of the arguments are passed to the legacy build system.
-    #[command(disable_help_flag = true)]
+    #[command(disable_help_flag = true, external_subcommand = true)]
     Legacy {
         #[arg(allow_hyphen_values = true, num_args = 0..)]
         legacy_args: Vec<OsString>,
     },
 }
+
+impl Deref for FolderArg {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        &self.folder
+    }
+}
+
+impl Deref for FilterArg {
+    type Target = Option<String>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.filter
+    }
+}
+
+impl Deref for AfterBuildArg {
+    type Target = Option<String>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.after_build
+    }
+}
+
+impl Deref for CreateSourceDirsArg {
+    type Target = bool;
+
+    fn deref(&self) -> &Self::Target {
+        &self.create_sourcedirs
+    }
+}
+
+impl Deref for DevArg {
+    type Target = bool;
+
+    fn deref(&self) -> &Self::Target {
+        &self.dev
+    }
+}
+
+impl Deref for BscPathArg {
+    type Target = Option<String>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.bsc_path
+    }
+}
+
+impl Deref for SnapshotOutputArg {
+    type Target = bool;
+
+    fn deref(&self) -> &Self::Target {
+        &self.snapshot_output
+    }
+}

rewatch/src/helpers.rs

@@ -222,18 +222,18 @@ pub fn get_bsc(root_path: &Path, workspace_root: &Option<PathBuf>) -> PathBuf {
 }
 
 pub fn get_rescript_legacy(root_path: &Path, workspace_root: Option<PathBuf>) -> PathBuf {
-    let bin_dir = get_bin_dir();
+    let bin_dir = Path::new("node_modules").join("rescript").join("cli");
 
     match (
         root_path
             .join(&bin_dir)
-            .join("rescript.exe")
+            .join("rescript.js")
             .canonicalize()
             .map(StrippedVerbatimPath::to_stripped_verbatim_path),
         workspace_root.map(|workspace_root| {
             workspace_root
                 .join(&bin_dir)
-                .join("rescript.exe")
+                .join("rescript.js")
                 .canonicalize()
                 .map(StrippedVerbatimPath::to_stripped_verbatim_path)
         }),