Merge branch 'master' into rewatch-bs-dev-dependencies

Author: nojaf

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Clean up `config.ml`. https://github.com/rescript-lang/rescript/pull/7636
 - Rewatch: simplify getting bsc path. https://github.com/rescript-lang/rescript/pull/7634
 - Rewatch: only get `"type": "dev"` source files for local packages. https://github.com/rescript-lang/rescript/pull/7646
+- Rewatch: add support for `rescript -w` for compatibility. https://github.com/rescript-lang/rescript/pull/7649
 
 #### :rocket: New Feature
 
@@ -33,7 +34,8 @@
 #### :bug: Bug fix
 
 - Fix `typeof` parens on functions. https://github.com/rescript-lang/rescript/pull/7643
-- Add --dev flag to clean command. https://github.com/rescript-lang/rescript/pull/7622
+- Rewatch: Add --dev flag to clean command. https://github.com/rescript-lang/rescript/pull/7622
+- Rewatch: Use root package suffix in clean log messages. https://github.com/rescript-lang/rescript/pull/7648
 
 # 12.0.0-beta.1
 

rewatch/src/build/clean.rs

@@ -58,19 +58,14 @@ pub fn remove_compile_assets(package: &packages::Package, source_file: &Path) {
     }
 }
 
-pub fn clean_mjs_files(build_state: &BuildState) {
+fn clean_source_files(build_state: &BuildState, root_package: &packages::Package) {
     // get all rescript file locations
     let rescript_file_locations = build_state
         .modules
         .values()
         .filter_map(|module| match &module.source_type {
             SourceType::SourceFile(source_file) => {
                 let package = build_state.packages.get(&module.package_name).unwrap();
-                let root_package = build_state
-                    .packages
-                    .get(&build_state.root_config_name)
-                    .expect("Could not find root package");
-
                 Some(
                     root_package
                         .config
@@ -391,10 +386,6 @@ pub fn clean(path: &Path, show_progress: bool, snapshot_output: bool, build_dev_
     }
 
     let timing_clean_mjs = Instant::now();
-    if !snapshot_output && show_progress {
-        println!("{} {}Cleaning mjs files...", style("[2/2]").bold().dim(), SWEEP);
-        let _ = std::io::stdout().flush();
-    }
     let mut build_state = BuildState::new(
         project_root.to_owned(),
         root_config_name,
@@ -403,15 +394,33 @@ pub fn clean(path: &Path, show_progress: bool, snapshot_output: bool, build_dev_
         bsc_path,
     );
     packages::parse_packages(&mut build_state);
-    clean_mjs_files(&build_state);
+    let root_package = build_state
+        .packages
+        .get(&build_state.root_config_name)
+        .expect("Could not find root package");
+
+    let suffix = root_package.config.suffix.as_deref().unwrap_or(".res.mjs");
+
+    if !snapshot_output && show_progress {
+        println!(
+            "{} {}Cleaning {} files...",
+            style("[2/2]").bold().dim(),
+            SWEEP,
+            suffix
+        );
+        let _ = std::io::stdout().flush();
+    }
+
+    clean_source_files(&build_state, root_package);
     let timing_clean_mjs_elapsed = timing_clean_mjs.elapsed();
 
     if !snapshot_output && show_progress {
         println!(
-            "{}{} {}Cleaned mjs files in {:.2}s",
+            "{}{} {}Cleaned {} files in {:.2}s",
             LINE_CLEAR,
             style("[2/2]").bold().dim(),
             SWEEP,
+            suffix,
             timing_clean_mjs_elapsed.as_secs_f64()
         );
         let _ = std::io::stdout().flush();

rewatch/src/cli.rs

@@ -2,6 +2,11 @@ use std::{ffi::OsString, ops::Deref};
 
 use clap::{Args, Parser, Subcommand};
 use clap_verbosity_flag::InfoLevel;
+use regex::Regex;
+
+fn parse_regex(s: &str) -> Result<Regex, regex::Error> {
+    Regex::new(s)
+}
 
 /// ReScript - Fast, Simple, Fully Typed JavaScript from the Future
 #[derive(Parser, Debug)]
@@ -39,8 +44,8 @@ pub struct FilterArg {
     ///
     /// 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>,
+    #[arg(short, long, value_parser = parse_regex)]
+    pub filter: Option<Regex>,
 }
 
 #[derive(Args, Debug, Clone)]
@@ -107,6 +112,10 @@ pub struct BuildArgs {
 
     #[command(flatten)]
     pub snapshot_output: SnapshotOutputArg,
+
+    /// Watch mode (deprecated, use `rescript watch` instead)
+    #[arg(short, default_value_t = false, num_args = 0..=1)]
+    pub watch: bool,
 }
 
 #[derive(Args, Clone, Debug)]
@@ -130,6 +139,19 @@ pub struct WatchArgs {
     pub snapshot_output: SnapshotOutputArg,
 }
 
+impl From<BuildArgs> for WatchArgs {
+    fn from(build_args: BuildArgs) -> Self {
+        Self {
+            folder: build_args.folder,
+            filter: build_args.filter,
+            after_build: build_args.after_build,
+            create_sourcedirs: build_args.create_sourcedirs,
+            dev: build_args.dev,
+            snapshot_output: build_args.snapshot_output,
+        }
+    }
+}
+
 #[derive(Subcommand, Clone, Debug)]
 pub enum Command {
     /// Build the project
@@ -187,7 +209,7 @@ impl Deref for FolderArg {
 }
 
 impl Deref for FilterArg {
-    type Target = Option<String>;
+    type Target = Option<Regex>;
 
     fn deref(&self) -> &Self::Target {
         &self.filter

rewatch/src/helpers.rs

@@ -196,7 +196,7 @@ pub fn get_bsc() -> PathBuf {
 
     bsc_path
         .canonicalize()
-        .expect("Could not get bsc path")
+        .expect("Could not get bsc path, did you set environment variable RESCRIPT_BSC_EXE ?")
         .to_stripped_verbatim_path()
 }
 

rewatch/src/main.rs

@@ -1,7 +1,6 @@
 use anyhow::Result;
 use clap::Parser;
 use log::LevelFilter;
-use regex::Regex;
 use std::{io::Write, path::Path};
 
 use rewatch::{build, cli, cmd, lock, watcher};
@@ -17,27 +16,29 @@ fn main() -> Result<()> {
         .target(env_logger::fmt::Target::Stdout)
         .init();
 
-    let command = args.command.unwrap_or(cli::Command::Build(args.build_args));
+    let mut command = args.command.unwrap_or(cli::Command::Build(args.build_args));
+
+    if let cli::Command::Build(build_args) = &command {
+        if build_args.watch {
+            log::warn!("`rescript build -w` is deprecated. Please use `rescript watch` instead.");
+            command = cli::Command::Watch(build_args.clone().into());
+        }
+    }
 
     // The 'normal run' mode will show the 'pretty' formatted progress. But if we turn off the log
     // level, we should never show that.
     let show_progress = log_level_filter == LevelFilter::Info;
 
-    match command.clone() {
+    match command {
         cli::Command::CompilerArgs { path, dev } => {
             println!("{}", build::get_compiler_args(Path::new(&path), *dev)?);
             std::process::exit(0);
         }
         cli::Command::Build(build_args) => {
             let _lock = get_lock(&build_args.folder);
 
-            let filter = build_args
-                .filter
-                .as_ref()
-                .map(|filter| Regex::new(&filter).expect("Could not parse regex"));
-
             match build::build(
-                &filter,
+                &build_args.filter,
                 Path::new(&build_args.folder as &str),
                 show_progress,
                 build_args.no_timing,
@@ -60,12 +61,8 @@ fn main() -> Result<()> {
         cli::Command::Watch(watch_args) => {
             let _lock = get_lock(&watch_args.folder);
 
-            let filter = watch_args
-                .filter
-                .as_ref()
-                .map(|filter| Regex::new(&filter).expect("Could not parse regex"));
             watcher::start(
-                &filter,
+                &watch_args.filter,
                 show_progress,
                 &watch_args.folder,
                 (*watch_args.after_build).clone(),