vertigo-cli: Added add-watch-path to watch command

Author: sfisol

CHANGES.md

@@ -9,6 +9,7 @@
 * `#[js_json(default = "None")]` attribute to `AutoJsJson`
 * All http methods in `FetchMethod`
 * `history_replace` method in `Driver`
+* vertigo-cli: `add-watch-path` to `watch` command
 
 ### Fixed
 

crates/vertigo-cli/src/watch/mod.rs

@@ -3,6 +3,7 @@ use notify::RecursiveMode;
 use poem::http::Method;
 use poem::middleware::Cors;
 use poem::{get, listener::TcpListener, EndpointExt, Route, Server};
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::watch::Sender;
@@ -43,6 +44,10 @@ pub struct WatchOpts {
     /// Setting the parameters `--env api=http://domain.com/api --env api2=http://domain.com/api2`
     #[arg(long, value_parser = parse_key_val::<String, String>)]
     pub env: Vec<(String, String)>,
+
+    /// Add more directories to be watched for code changes
+    #[arg(long)]
+    pub add_watch_path: Vec<String>,
 }
 
 impl WatchOpts {
@@ -171,6 +176,13 @@ pub async fn run(mut opts: WatchOpts) -> Result<(), i32> {
 
     use notify::Watcher;
     watcher.watch(&path, RecursiveMode::Recursive).unwrap();
+
+    for watch_path in &opts.add_watch_path {
+        log::info!("Adding `{watch_path}` to watched directories");
+        watcher
+            .watch(Path::new(watch_path), RecursiveMode::Recursive)
+            .expect("Error adding watch dir");
+    }
     let mut version = 0;
 
     loop {

crates/vertigo/src/render/dom_value.rs

@@ -15,13 +15,12 @@ pub fn render_value_option<T: Clone + PartialEq + 'static>(
             let render = render.clone();
 
             move |value| {
-                let new_element = render(value).map(|new_element| {
+                let new_element = render(value).inspect(|new_element| {
                     get_driver().inner.dom.insert_before(
                         parent_id,
                         new_element.id_dom(),
                         Some(comment_id),
                     );
-                    new_element
                 });
 
                 current_node.change(|current| {