support --no-watch

Author: shakyShane

crates/bsnext_input/src/lib.rs

@@ -129,6 +129,7 @@ pub struct InputConfig {
 }
 
 #[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+#[serde(untagged)]
 pub enum WatchGlobalConfig {
     Enabled { infer: InferWatchers },
     Disabled,
@@ -384,3 +385,32 @@ impl Display for PathDefinition {
 pub fn rand_word() -> String {
     random_word::gen(random_word::Lang::En).to_string()
 }
+
+#[cfg(test)]
+mod watch_global_config_test {
+    use super::*;
+    #[test]
+    fn test_deserialize_watch_global_config_disabled() {
+        let yaml_routes = r#"
+watchers: null
+"#;
+
+        let config: InputConfig = serde_yaml::from_str(yaml_routes).unwrap();
+        assert!(matches!(config.watchers, WatchGlobalConfig::Disabled));
+    }
+    #[test]
+    fn test_deserialize_watch_global_config_infer_variants() {
+        let yaml_routes = r#"
+watchers:
+  infer: Routes
+"#;
+
+        let config: InputConfig = serde_yaml::from_str(yaml_routes).unwrap();
+        assert!(matches!(
+            config.watchers,
+            WatchGlobalConfig::Enabled {
+                infer: InferWatchers::Routes
+            }
+        ));
+    }
+}

crates/bsnext_system/src/args.rs

@@ -33,6 +33,7 @@ pub struct Args {
     #[clap(flatten)]
     pub watch_opts: WatchSubOpts,
 
+    /// pass '--no-watch' to prevent auto watchers. can't be used with 'input'
     #[clap(long)]
     pub no_watch: bool,
 

crates/bsnext_system/src/start/start_kind.rs

@@ -76,6 +76,7 @@ impl StartKind {
             StartKind::FromInputPaths(StartFromInputPaths {
                 input_paths: input_opts.input.clone(),
                 port: cmd.port,
+                no_watch: cmd.no_watch,
             })
         }
     }

crates/bsnext_system/src/start/start_kind/snapshots/bsnext_system__start__start_kind__start_from_paths__test__test-2.snap

@@ -24,8 +24,7 @@ watchers: []
 run: {}
 config:
   watchers:
-    Enabled:
-      infer: RoutesAndServers
+    infer: RoutesAndServers
   global_fs_ignore: ~
   global_fs_only: ~
   global_fs_debounce: ~

crates/bsnext_system/src/start/start_kind/start_from_inputs.rs

@@ -1,19 +1,20 @@
 use bsnext_input::startup::{StartupContext, SystemStart, SystemStartArgs};
 
 use crate::input_fs::from_input_path;
-use bsnext_input::{Input, InputArgs, InputCtx, InputError};
+use bsnext_input::{Input, InputArgs, InputCtx, InputError, WatchGlobalConfig};
 use std::path::{Path, PathBuf};
 
 #[derive(Debug)]
 // todo: must ensure StartFromInputPaths
 pub struct StartFromInputPaths {
     pub input_paths: Vec<String>,
     pub port: Option<u16>,
+    pub no_watch: bool,
 }
 
 impl SystemStart for StartFromInputPaths {
     fn resolve_input(&self, ctx: &StartupContext) -> Result<SystemStartArgs, Box<InputError>> {
-        from_input_paths(ctx, &self.input_paths, &self.port)
+        from_input_paths(ctx, &self.input_paths, &self.port, self.no_watch)
     }
 }
 
@@ -34,6 +35,7 @@ fn from_input_paths<T: AsRef<str>>(
     ctx: &StartupContext,
     inputs: &[T],
     port: &Option<u16>,
+    no_watch: bool,
 ) -> Result<SystemStartArgs, Box<InputError>> {
     let cwd = &ctx.cwd;
     let input_candidates = inputs
@@ -86,10 +88,15 @@ fn from_input_paths<T: AsRef<str>>(
     let initial_ctx = InputCtx::new(&[], Some(input_args), ctx, Some(input_path));
     let result = from_input_path(input_path, &initial_ctx);
     match result {
-        Ok(input) => Ok(SystemStartArgs::PathWithInput {
-            path: input_path.to_path_buf(),
-            input,
-        }),
+        Ok(mut input) => {
+            if no_watch {
+                input.config.watchers = WatchGlobalConfig::Disabled;
+            }
+            Ok(SystemStartArgs::PathWithInput {
+                path: input_path.to_path_buf(),
+                input,
+            })
+        }
         Err(e) => match *e {
             InputError::YamlError(yaml_error) => Ok(SystemStartArgs::PathWithInvalidInput {
                 path: input_path.to_path_buf(),