watching can be disabled

Author: shakyShane

crates/bsnext_input/src/lib.rs

@@ -122,12 +122,26 @@ impl FromStr for Input {
 
 #[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
 pub struct InputConfig {
-    pub infer_watchers: InferWatchers,
+    pub watchers: WatchGlobalConfig,
     pub global_fs_ignore: Option<PathPattern>,
     pub global_fs_only: Option<PathPattern>,
     pub global_fs_debounce: Option<DebounceDuration>,
 }
 
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+pub enum WatchGlobalConfig {
+    Enabled { infer: InferWatchers },
+    Disabled,
+}
+
+impl Default for WatchGlobalConfig {
+    fn default() -> Self {
+        Self::Enabled {
+            infer: InferWatchers::default(),
+        }
+    }
+}
+
 #[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
 pub enum InferWatchers {
     None,

crates/bsnext_system/examples/without_stdout.rs

@@ -24,6 +24,7 @@ pub async fn main() -> Result<(), anyhow::Error> {
         logging: Default::default(),
         format: Default::default(),
         watch_sub_opts: Default::default(),
+        no_watch: false,
     };
 
     let (events_sender, mut events_receiver) = mpsc::channel::<AnyEvent>(1);

crates/bsnext_system/src/args.rs

@@ -33,6 +33,9 @@ pub struct Args {
     #[clap(flatten)]
     pub watch_opts: WatchSubOpts,
 
+    #[clap(long)]
+    pub no_watch: bool,
+
     /// Paths to serve + possibly watch, incompatible with `-i` option
     pub trailing: Vec<String>,
 }

crates/bsnext_system/src/cli.rs

@@ -1,5 +1,4 @@
 use crate::args::{Args, SubCommands};
-
 use crate::export::export_cmd;
 use crate::start;
 use crate::start::start_command::StartCommand;
@@ -81,6 +80,7 @@ where
             watch_sub_opts: args.watch_opts,
             logging,
             format,
+            no_watch: args.no_watch,
         })
     });
 
@@ -110,6 +110,7 @@ async fn async_init(
                 watch_sub_opts: Default::default(),
                 logging,
                 format,
+                no_watch: true,
             };
             let cwd = PathBuf::from(current_dir().unwrap().to_string_lossy().to_string());
             let result = export_cmd(&cwd, &args.fs_opts, &args.input_opts, &cmd, &start_cmd).await;

crates/bsnext_system/src/start/start_command.rs

@@ -26,6 +26,10 @@ pub struct StartCommand {
     /// Paths to serve + possibly watch, incompatible with `-i` option
     pub trailing: Vec<String>,
 
+    /// disable all auto-watching
+    #[clap(long)]
+    pub no_watch: bool,
+
     /// additional watchers
     #[clap(flatten)]
     pub watch_sub_opts: WatchSubOpts,

crates/bsnext_system/src/start/start_kind.rs

@@ -51,6 +51,7 @@ impl StartKind {
                     cors: cmd.cors.then_some(CorsOpts::Cors(true)),
                     ..Default::default()
                 },
+                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

@@ -23,7 +23,9 @@ servers:
 watchers: []
 run: {}
 config:
-  infer_watchers: RoutesAndServers
+  watchers:
+    Enabled:
+      infer: RoutesAndServers
   global_fs_ignore: ~
   global_fs_only: ~
   global_fs_debounce: ~

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

@@ -47,7 +47,9 @@ Input {
     watchers: [],
     run: {},
     config: InputConfig {
-        infer_watchers: RoutesAndServers,
+        watchers: Enabled {
+            infer: RoutesAndServers,
+        },
         global_fs_ignore: None,
         global_fs_only: None,
         global_fs_debounce: None,

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

@@ -3,7 +3,9 @@ use bsnext_input::path_def::PathDef;
 use bsnext_input::route::{DirRoute, MultiWatch, Opts, Route, RouteKind};
 use bsnext_input::server_config::{ServerConfig, ServerIdentity};
 use bsnext_input::startup::{Lazy, StartupContext, SystemStart, SystemStartArgs};
-use bsnext_input::{InferWatchers, Input, InputError, PathDefinition, PathDefs, PathError};
+use bsnext_input::{
+    InferWatchers, Input, InputError, PathDefinition, PathDefs, PathError, WatchGlobalConfig,
+};
 use std::path::{Path, PathBuf};
 
 #[derive(Debug)]
@@ -14,6 +16,7 @@ pub struct StartFromPaths {
     pub force: bool,
     pub route_opts: Opts,
     pub watch_sub_opts: WatchSubOpts,
+    pub no_watch: bool,
 }
 
 impl SystemStart for StartFromPaths {
@@ -40,13 +43,18 @@ impl SystemStart for StartFromPaths {
             Ok(input)
         };
 
-        let explicit_watch_count =
-            self.watch_sub_opts.paths.len() + self.watch_sub_opts.before.len();
-
-        let input = if explicit_watch_count > 0 {
-            with_explicit_paths(&self.watch_sub_opts)
+        let input = if self.no_watch {
+            let mut input = Input::default();
+            input.config.watchers = WatchGlobalConfig::Disabled;
+            input
         } else {
-            with_inferred_watchers(&self.watch_sub_opts)
+            let explicit_watch_count =
+                self.watch_sub_opts.paths.len() + self.watch_sub_opts.before.len();
+            if explicit_watch_count > 0 {
+                with_explicit_paths(&self.watch_sub_opts)
+            } else {
+                with_inferred_watchers(&self.watch_sub_opts)
+            }
         };
 
         Ok(SystemStartArgs::InputOnlyDeferred {
@@ -70,7 +78,9 @@ fn with_explicit_paths(opts: &WatchSubOpts) -> Input {
     tracing::debug!("{} sh_commands to run", opts.run.len());
     let multi = MultiWatch::from(opts.clone());
     input.watchers = vec![multi];
-    input.config.infer_watchers = InferWatchers::None;
+    input.config.watchers = WatchGlobalConfig::Enabled {
+        infer: InferWatchers::None,
+    };
     input
 }
 
@@ -171,6 +181,7 @@ mod test {
             force: false,
             route_opts: Default::default(),
             watch_sub_opts: Default::default(),
+            no_watch: false,
         };
         let ctx = StartupContext {
             cwd: tmp_dir.path().to_path_buf(),

crates/bsnext_system/src/watch/watch_sub_opts.rs

@@ -25,6 +25,12 @@ pub struct WatchSubOpts {
     pub initial: bool,
 }
 
+impl WatchSubOpts {
+    pub fn empty() -> Self {
+        Self::default()
+    }
+}
+
 impl From<WatchSubOpts> for MultiWatch {
     fn from(value: WatchSubOpts) -> Self {
         let span = tracing::debug_span!("creating MultiWatch");