Merge pull request #43 from Demonthos/hot_reload

Add Hot reload rsx to dioxus serve

Cargo.toml

@@ -50,6 +50,11 @@ tar = "0.4.38"
 zip = "0.6.2"
 tower = "0.4.12"
 
+syn = { version = "1.0" }
+dioxus = { git = "https://github.com/dioxuslabs/dioxus/", features = ["hot_reload"] }
+proc-macro2 = { version = "1.0", features = ["span-locations"] }
+
+
 [[bin]]
 path = "src/main.rs"
 name = "dioxus"

src/cli/cfg.rs

@@ -62,6 +62,11 @@ pub struct ConfigOptsServe {
     #[clap(long)]
     pub platform: Option<String>,
 
+    /// Build with hot reloading rsx [default: false]
+    #[clap(long)]
+    #[serde(default)]
+    pub hot_reload: bool,
+
     /// Space separated list of features to activate
     #[clap(long)]
     pub features: Option<Vec<String>>,

src/cli/serve/mod.rs

@@ -18,6 +18,7 @@ impl Serve {
         let mut crate_config = crate::CrateConfig::new()?;
 
         // change the relase state.
+        crate_config.with_hot_reload(self.serve.hot_reload);
         crate_config.with_release(self.serve.release);
         crate_config.with_verbose(self.serve.verbose);
 

src/config.rs

@@ -114,6 +114,7 @@ pub struct CrateConfig {
     pub executable: ExecutableType,
     pub dioxus_config: DioxusConfig,
     pub release: bool,
+    pub hot_reload: bool,
     pub verbose: bool,
     pub custom_profile: Option<String>,
     pub features: Option<Vec<String>>,
@@ -165,6 +166,7 @@ impl CrateConfig {
         let executable = ExecutableType::Binary(output_filename);
 
         let release = false;
+        let hot_reload = false;
         let verbose = false;
         let custom_profile = None;
         let features = None;
@@ -179,6 +181,7 @@ impl CrateConfig {
             executable,
             release,
             dioxus_config,
+            hot_reload,
             custom_profile,
             features,
             verbose,
@@ -195,6 +198,11 @@ impl CrateConfig {
         self
     }
 
+    pub fn with_hot_reload(&mut self, hot_reload: bool) -> &mut Self {
+        self.hot_reload = hot_reload;
+        self
+    }
+
     pub fn with_verbose(&mut self, verbose: bool) -> &mut Self {
         self.verbose = verbose;
         self

src/hot_reload/mod.rs

@@ -0,0 +1,613 @@
+use proc_macro2::TokenStream;
+use syn::{File, Macro};
+
+pub enum DiffResult {
+    CodeChanged,
+    RsxChanged(Vec<(Macro, TokenStream)>),
+}
+
+pub fn find_rsx(new: &File, old: &File) -> DiffResult {
+    let mut rsx_calls = Vec::new();
+    if new.items.len() != old.items.len() {
+        return DiffResult::CodeChanged;
+    }
+    for (new, old) in new.items.iter().zip(old.items.iter()) {
+        if find_rsx_item(new, old, &mut rsx_calls) {
+            return DiffResult::CodeChanged;
+        }
+    }
+    DiffResult::RsxChanged(rsx_calls)
+}
+
+fn find_rsx_item(
+    new: &syn::Item,
+    old: &syn::Item,
+    rsx_calls: &mut Vec<(Macro, TokenStream)>,
+) -> bool {
+    match (new, old) {
+        (syn::Item::Const(new_item), syn::Item::Const(old_item)) => {
+            find_rsx_expr(&new_item.expr, &old_item.expr, rsx_calls)
+                || new_item.attrs != old_item.attrs
+                || new_item.vis != old_item.vis
+                || new_item.const_token != old_item.const_token
+                || new_item.ident != old_item.ident
+                || new_item.colon_token != old_item.colon_token
+                || new_item.ty != old_item.ty
+                || new_item.eq_token != old_item.eq_token
+                || new_item.semi_token != old_item.semi_token
+        }
+        (syn::Item::Enum(new_item), syn::Item::Enum(old_item)) => {
+            if new_item.variants.len() != old_item.variants.len() {
+                return true;
+            }
+            for (new_varient, old_varient) in new_item.variants.iter().zip(old_item.variants.iter())
+            {
+                match (&new_varient.discriminant, &old_varient.discriminant) {
+                    (Some((new_eq, new_expr)), Some((old_eq, old_expr))) => {
+                        if find_rsx_expr(new_expr, old_expr, rsx_calls) || new_eq != old_eq {
+                            return true;
+                        }
+                    }
+                    (None, None) => (),
+                    _ => return true,
+                }
+                if new_varient.attrs != old_varient.attrs
+                    || new_varient.ident != old_varient.ident
+                    || new_varient.fields != old_varient.fields
+                {
+                    return true;
+                }
+            }
+            new_item.attrs != old_item.attrs
+                || new_item.vis != old_item.vis
+                || new_item.enum_token != old_item.enum_token
+                || new_item.ident != old_item.ident
+                || new_item.generics != old_item.generics
+                || new_item.brace_token != old_item.brace_token
+        }
+        (syn::Item::ExternCrate(new_item), syn::Item::ExternCrate(old_item)) => {
+            old_item != new_item
+        }
+        (syn::Item::Fn(new_item), syn::Item::Fn(old_item)) => {
+            find_rsx_block(&new_item.block, &old_item.block, rsx_calls)
+                || new_item.attrs != old_item.attrs
+                || new_item.vis != old_item.vis
+                || new_item.sig != old_item.sig
+        }
+        (syn::Item::ForeignMod(new_item), syn::Item::ForeignMod(old_item)) => old_item != new_item,
+        (syn::Item::Impl(new_item), syn::Item::Impl(old_item)) => {
+            if new_item.items.len() != old_item.items.len() {
+                return true;
+            }
+            for (new_item, old_item) in new_item.items.iter().zip(old_item.items.iter()) {
+                if match (new_item, old_item) {
+                    (syn::ImplItem::Const(new_item), syn::ImplItem::Const(old_item)) => {
+                        find_rsx_expr(&new_item.expr, &old_item.expr, rsx_calls)
+                    }
+                    (syn::ImplItem::Method(new_item), syn::ImplItem::Method(old_item)) => {
+                        find_rsx_block(&new_item.block, &old_item.block, rsx_calls)
+                    }
+                    (syn::ImplItem::Type(new_item), syn::ImplItem::Type(old_item)) => {
+                        old_item != new_item
+                    }
+                    (syn::ImplItem::Macro(new_item), syn::ImplItem::Macro(old_item)) => {
+                        old_item != new_item
+                    }
+                    _ => true,
+                } {
+                    return true;
+                }
+            }
+            new_item.attrs != old_item.attrs
+                || new_item.defaultness != old_item.defaultness
+                || new_item.unsafety != old_item.unsafety
+                || new_item.impl_token != old_item.impl_token
+                || new_item.generics != old_item.generics
+                || new_item.trait_ != old_item.trait_
+                || new_item.self_ty != old_item.self_ty
+                || new_item.brace_token != old_item.brace_token
+        }
+        (syn::Item::Macro(new_item), syn::Item::Macro(old_item)) => old_item != new_item,
+        (syn::Item::Macro2(new_item), syn::Item::Macro2(old_item)) => old_item != new_item,
+        (syn::Item::Mod(new_item), syn::Item::Mod(old_item)) => {
+            match (&new_item.content, &old_item.content) {
+                (Some((_, new_items)), Some((_, old_items))) => {
+                    if new_items.len() != old_items.len() {
+                        return true;
+                    }
+                    for (new_item, old_item) in new_items.iter().zip(old_items.iter()) {
+                        if find_rsx_item(new_item, old_item, rsx_calls) {
+                            return true;
+                        }
+                    }
+                    new_item.attrs != old_item.attrs
+                        || new_item.vis != old_item.vis
+                        || new_item.mod_token != old_item.mod_token
+                        || new_item.ident != old_item.ident
+                        || new_item.semi != old_item.semi
+                }
+                (None, None) => {
+                    new_item.attrs != old_item.attrs
+                        || new_item.vis != old_item.vis
+                        || new_item.mod_token != old_item.mod_token
+                        || new_item.ident != old_item.ident
+                        || new_item.semi != old_item.semi
+                }
+                _ => true,
+            }
+        }
+        (syn::Item::Static(new_item), syn::Item::Static(old_item)) => {
+            find_rsx_expr(&new_item.expr, &old_item.expr, rsx_calls)
+                || new_item.attrs != old_item.attrs
+                || new_item.vis != old_item.vis
+                || new_item.static_token != old_item.static_token
+                || new_item.mutability != old_item.mutability
+                || new_item.ident != old_item.ident
+                || new_item.colon_token != old_item.colon_token
+                || new_item.ty != old_item.ty
+                || new_item.eq_token != old_item.eq_token
+                || new_item.semi_token != old_item.semi_token
+        }
+        (syn::Item::Struct(new_item), syn::Item::Struct(old_item)) => old_item != new_item,
+        (syn::Item::Trait(new_item), syn::Item::Trait(old_item)) => {
+            find_rsx_trait(new_item, old_item, rsx_calls)
+        }
+        (syn::Item::TraitAlias(new_item), syn::Item::TraitAlias(old_item)) => old_item != new_item,
+        (syn::Item::Type(new_item), syn::Item::Type(old_item)) => old_item != new_item,
+        (syn::Item::Union(new_item), syn::Item::Union(old_item)) => old_item != new_item,
+        (syn::Item::Use(new_item), syn::Item::Use(old_item)) => old_item != new_item,
+        (syn::Item::Verbatim(_), syn::Item::Verbatim(_)) => false,
+        _ => return true,
+    }
+}
+
+fn find_rsx_trait(
+    new_item: &syn::ItemTrait,
+    old_item: &syn::ItemTrait,
+    rsx_calls: &mut Vec<(Macro, TokenStream)>,
+) -> bool {
+    if new_item.items.len() != old_item.items.len() {
+        return true;
+    }
+    for (new_item, old_item) in new_item.items.iter().zip(old_item.items.iter()) {
+        if match (new_item, old_item) {
+            (syn::TraitItem::Const(new_item), syn::TraitItem::Const(old_item)) => {
+                if let (Some((_, new_expr)), Some((_, old_expr))) =
+                    (&new_item.default, &old_item.default)
+                {
+                    find_rsx_expr(new_expr, old_expr, rsx_calls)
+                } else {
+                    true
+                }
+            }
+            (syn::TraitItem::Method(new_item), syn::TraitItem::Method(old_item)) => {
+                if let (Some(new_block), Some(old_block)) = (&new_item.default, &old_item.default) {
+                    find_rsx_block(new_block, old_block, rsx_calls)
+                } else {
+                    true
+                }
+            }
+            (syn::TraitItem::Type(new_item), syn::TraitItem::Type(old_item)) => {
+                old_item != new_item
+            }
+            (syn::TraitItem::Macro(new_item), syn::TraitItem::Macro(old_item)) => {
+                old_item != new_item
+            }
+            _ => true,
+        } {
+            return true;
+        }
+    }
+    new_item.attrs != old_item.attrs
+        || new_item.vis != old_item.vis
+        || new_item.unsafety != old_item.unsafety
+        || new_item.auto_token != old_item.auto_token
+        || new_item.ident != old_item.ident
+        || new_item.generics != old_item.generics
+        || new_item.colon_token != old_item.colon_token
+        || new_item.supertraits != old_item.supertraits
+        || new_item.brace_token != old_item.brace_token
+}
+
+fn find_rsx_block(
+    new_block: &syn::Block,
+    old_block: &syn::Block,
+    rsx_calls: &mut Vec<(Macro, TokenStream)>,
+) -> bool {
+    if new_block.stmts.len() != old_block.stmts.len() {
+        return true;
+    }
+    for (new_stmt, old_stmt) in new_block.stmts.iter().zip(old_block.stmts.iter()) {
+        if find_rsx_stmt(new_stmt, old_stmt, rsx_calls) {
+            return true;
+        }
+    }
+    new_block.brace_token != old_block.brace_token
+}
+
+fn find_rsx_stmt(
+    new_stmt: &syn::Stmt,
+    old_stmt: &syn::Stmt,
+    rsx_calls: &mut Vec<(Macro, TokenStream)>,
+) -> bool {
+    match (new_stmt, old_stmt) {
+        (syn::Stmt::Local(new_local), syn::Stmt::Local(old_local)) => {
+            (match (&new_local.init, &old_local.init) {
+                (Some((new_eq, new_expr)), Some((old_eq, old_expr))) => {
+                    find_rsx_expr(new_expr, old_expr, rsx_calls) || new_eq != old_eq
+                }
+                (None, None) => false,
+                _ => true,
+            } || new_local.attrs != old_local.attrs
+                || new_local.let_token != old_local.let_token
+                || new_local.pat != old_local.pat
+                || new_local.semi_token != old_local.semi_token)
+        }
+        (syn::Stmt::Item(new_item), syn::Stmt::Item(old_item)) => {
+            find_rsx_item(new_item, old_item, rsx_calls)
+        }
+        (syn::Stmt::Expr(new_expr), syn::Stmt::Expr(old_expr)) => {
+            find_rsx_expr(new_expr, old_expr, rsx_calls)
+        }
+        (syn::Stmt::Semi(new_expr, new_semi), syn::Stmt::Semi(old_expr, old_semi)) => {
+            find_rsx_expr(new_expr, old_expr, rsx_calls) || new_semi != old_semi
+        }
+        _ => true,
+    }
+}
+
+fn find_rsx_expr(
+    new_expr: &syn::Expr,
+    old_expr: &syn::Expr,
+    rsx_calls: &mut Vec<(Macro, TokenStream)>,
+) -> bool {
+    match (new_expr, old_expr) {
+        (syn::Expr::Array(new_expr), syn::Expr::Array(old_expr)) => {
+            if new_expr.elems.len() != old_expr.elems.len() {
+                return true;
+            }
+            for (new_el, old_el) in new_expr.elems.iter().zip(old_expr.elems.iter()) {
+                if find_rsx_expr(new_el, old_el, rsx_calls) {
+                    return true;
+                }
+            }
+            new_expr.attrs != old_expr.attrs || new_expr.bracket_token != old_expr.bracket_token
+        }
+        (syn::Expr::Assign(new_expr), syn::Expr::Assign(old_expr)) => {
+            find_rsx_expr(&new_expr.left, &old_expr.left, rsx_calls)
+                || find_rsx_expr(&new_expr.right, &old_expr.right, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.eq_token != old_expr.eq_token
+        }
+        (syn::Expr::AssignOp(new_expr), syn::Expr::AssignOp(old_expr)) => {
+            find_rsx_expr(&new_expr.left, &old_expr.left, rsx_calls)
+                || find_rsx_expr(&new_expr.right, &old_expr.right, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.op != old_expr.op
+        }
+        (syn::Expr::Async(new_expr), syn::Expr::Async(old_expr)) => {
+            find_rsx_block(&new_expr.block, &old_expr.block, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.async_token != old_expr.async_token
+                || new_expr.capture != old_expr.capture
+        }
+        (syn::Expr::Await(new_expr), syn::Expr::Await(old_expr)) => {
+            find_rsx_expr(&new_expr.base, &old_expr.base, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.dot_token != old_expr.dot_token
+                || new_expr.await_token != old_expr.await_token
+        }
+        (syn::Expr::Binary(new_expr), syn::Expr::Binary(old_expr)) => {
+            find_rsx_expr(&new_expr.left, &old_expr.left, rsx_calls)
+                || find_rsx_expr(&new_expr.right, &old_expr.right, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.op != old_expr.op
+        }
+        (syn::Expr::Block(new_expr), syn::Expr::Block(old_expr)) => {
+            find_rsx_block(&new_expr.block, &old_expr.block, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.label != old_expr.label
+        }
+        (syn::Expr::Box(new_expr), syn::Expr::Box(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.box_token != old_expr.box_token
+        }
+        (syn::Expr::Break(new_expr), syn::Expr::Break(old_expr)) => {
+            match (&new_expr.expr, &old_expr.expr) {
+                (Some(new_inner), Some(old_inner)) => {
+                    find_rsx_expr(new_inner, old_inner, rsx_calls)
+                        || new_expr.attrs != old_expr.attrs
+                        || new_expr.break_token != old_expr.break_token
+                        || new_expr.label != old_expr.label
+                }
+                (None, None) => {
+                    new_expr.attrs != old_expr.attrs
+                        || new_expr.break_token != old_expr.break_token
+                        || new_expr.label != old_expr.label
+                }
+                _ => true,
+            }
+        }
+        (syn::Expr::Call(new_expr), syn::Expr::Call(old_expr)) => {
+            find_rsx_expr(&new_expr.func, &old_expr.func, rsx_calls);
+            if new_expr.args.len() != old_expr.args.len() {
+                return true;
+            }
+            for (new_arg, old_arg) in new_expr.args.iter().zip(old_expr.args.iter()) {
+                if find_rsx_expr(new_arg, old_arg, rsx_calls) {
+                    return true;
+                }
+            }
+            new_expr.attrs != old_expr.attrs || new_expr.paren_token != old_expr.paren_token
+        }
+        (syn::Expr::Cast(new_expr), syn::Expr::Cast(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.as_token != old_expr.as_token
+                || new_expr.ty != old_expr.ty
+        }
+        (syn::Expr::Closure(new_expr), syn::Expr::Closure(old_expr)) => {
+            find_rsx_expr(&new_expr.body, &old_expr.body, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.movability != old_expr.movability
+                || new_expr.asyncness != old_expr.asyncness
+                || new_expr.capture != old_expr.capture
+                || new_expr.or1_token != old_expr.or1_token
+                || new_expr.inputs != old_expr.inputs
+                || new_expr.or2_token != old_expr.or2_token
+                || new_expr.output != old_expr.output
+        }
+        (syn::Expr::Continue(new_expr), syn::Expr::Continue(old_expr)) => old_expr != new_expr,
+        (syn::Expr::Field(new_expr), syn::Expr::Field(old_expr)) => {
+            find_rsx_expr(&new_expr.base, &old_expr.base, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.dot_token != old_expr.dot_token
+                || new_expr.member != old_expr.member
+        }
+        (syn::Expr::ForLoop(new_expr), syn::Expr::ForLoop(old_expr)) => {
+            find_rsx_block(&new_expr.body, &old_expr.body, rsx_calls)
+                || find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.label != old_expr.label
+                || new_expr.for_token != old_expr.for_token
+                || new_expr.pat != old_expr.pat
+                || new_expr.in_token != old_expr.in_token
+        }
+        (syn::Expr::Group(new_expr), syn::Expr::Group(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+        }
+        (syn::Expr::If(new_expr), syn::Expr::If(old_expr)) => {
+            if find_rsx_expr(&new_expr.cond, &old_expr.cond, rsx_calls)
+                || find_rsx_block(&new_expr.then_branch, &old_expr.then_branch, rsx_calls)
+            {
+                return true;
+            }
+            match (&new_expr.else_branch, &old_expr.else_branch) {
+                (Some((new_tok, new_else)), Some((old_tok, old_else))) => {
+                    find_rsx_expr(new_else, old_else, rsx_calls)
+                        || new_expr.attrs != old_expr.attrs
+                        || new_expr.if_token != old_expr.if_token
+                        || new_expr.cond != old_expr.cond
+                        || new_tok != old_tok
+                }
+                (None, None) => {
+                    new_expr.attrs != old_expr.attrs
+                        || new_expr.if_token != old_expr.if_token
+                        || new_expr.cond != old_expr.cond
+                }
+                _ => true,
+            }
+        }
+        (syn::Expr::Index(new_expr), syn::Expr::Index(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || find_rsx_expr(&new_expr.index, &old_expr.index, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.bracket_token != old_expr.bracket_token
+        }
+        (syn::Expr::Let(new_expr), syn::Expr::Let(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.let_token != old_expr.let_token
+                || new_expr.pat != old_expr.pat
+                || new_expr.eq_token != old_expr.eq_token
+        }
+        (syn::Expr::Lit(new_expr), syn::Expr::Lit(old_expr)) => old_expr != new_expr,
+        (syn::Expr::Loop(new_expr), syn::Expr::Loop(old_expr)) => {
+            find_rsx_block(&new_expr.body, &old_expr.body, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.label != old_expr.label
+                || new_expr.loop_token != old_expr.loop_token
+        }
+        (syn::Expr::Macro(new_expr), syn::Expr::Macro(old_expr)) => {
+            let new_mac = &new_expr.mac;
+            let old_mac = &old_expr.mac;
+            if new_mac.path.get_ident().map(|ident| ident.to_string()) == Some("rsx".to_string())
+                && old_mac.path.get_ident().map(|ident| ident.to_string())
+                    == Some("rsx".to_string())
+            {
+                rsx_calls.push((old_mac.clone(), new_mac.tokens.clone()));
+                false
+            } else {
+                new_expr != old_expr
+            }
+        }
+        (syn::Expr::Match(new_expr), syn::Expr::Match(old_expr)) => {
+            if find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls) {
+                return true;
+            }
+            for (new_arm, old_arm) in new_expr.arms.iter().zip(old_expr.arms.iter()) {
+                match (&new_arm.guard, &old_arm.guard) {
+                    (Some((new_tok, new_expr)), Some((old_tok, old_expr))) => {
+                        if find_rsx_expr(new_expr, old_expr, rsx_calls) || new_tok != old_tok {
+                            return true;
+                        }
+                    }
+                    (None, None) => (),
+                    _ => return true,
+                }
+                if find_rsx_expr(&new_arm.body, &old_arm.body, rsx_calls)
+                    || new_arm.attrs != old_arm.attrs
+                    || new_arm.pat != old_arm.pat
+                    || new_arm.fat_arrow_token != old_arm.fat_arrow_token
+                    || new_arm.comma != old_arm.comma
+                {
+                    return true;
+                }
+            }
+            new_expr.attrs != old_expr.attrs
+                || new_expr.match_token != old_expr.match_token
+                || new_expr.brace_token != old_expr.brace_token
+        }
+        (syn::Expr::MethodCall(new_expr), syn::Expr::MethodCall(old_expr)) => {
+            if find_rsx_expr(&new_expr.receiver, &old_expr.receiver, rsx_calls) {
+                return true;
+            }
+            for (new_arg, old_arg) in new_expr.args.iter().zip(old_expr.args.iter()) {
+                if find_rsx_expr(new_arg, old_arg, rsx_calls) {
+                    return true;
+                }
+            }
+            new_expr.attrs != old_expr.attrs
+                || new_expr.dot_token != old_expr.dot_token
+                || new_expr.method != old_expr.method
+                || new_expr.turbofish != old_expr.turbofish
+                || new_expr.paren_token != old_expr.paren_token
+        }
+        (syn::Expr::Paren(new_expr), syn::Expr::Paren(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.paren_token != old_expr.paren_token
+        }
+        (syn::Expr::Path(new_expr), syn::Expr::Path(old_expr)) => old_expr != new_expr,
+        (syn::Expr::Range(new_expr), syn::Expr::Range(old_expr)) => {
+            match (&new_expr.from, &old_expr.from) {
+                (Some(new_expr), Some(old_expr)) => {
+                    if find_rsx_expr(new_expr, old_expr, rsx_calls) {
+                        return true;
+                    }
+                }
+                (None, None) => (),
+                _ => return true,
+            }
+            match (&new_expr.to, &old_expr.to) {
+                (Some(new_inner), Some(old_inner)) => {
+                    find_rsx_expr(new_inner, old_inner, rsx_calls)
+                        || new_expr.attrs != old_expr.attrs
+                        || new_expr.limits != old_expr.limits
+                }
+                (None, None) => {
+                    new_expr.attrs != old_expr.attrs || new_expr.limits != old_expr.limits
+                }
+                _ => true,
+            }
+        }
+        (syn::Expr::Reference(new_expr), syn::Expr::Reference(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.and_token != old_expr.and_token
+                || new_expr.mutability != old_expr.mutability
+        }
+        (syn::Expr::Repeat(new_expr), syn::Expr::Repeat(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || find_rsx_expr(&new_expr.len, &old_expr.len, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.bracket_token != old_expr.bracket_token
+                || new_expr.semi_token != old_expr.semi_token
+        }
+        (syn::Expr::Return(new_expr), syn::Expr::Return(old_expr)) => {
+            match (&new_expr.expr, &old_expr.expr) {
+                (Some(new_inner), Some(old_inner)) => {
+                    find_rsx_expr(new_inner, old_inner, rsx_calls)
+                        || new_expr.attrs != old_expr.attrs
+                        || new_expr.return_token != old_expr.return_token
+                }
+                (None, None) => {
+                    new_expr.attrs != old_expr.attrs
+                        || new_expr.return_token != old_expr.return_token
+                }
+                _ => true,
+            }
+        }
+        (syn::Expr::Struct(new_expr), syn::Expr::Struct(old_expr)) => {
+            match (&new_expr.rest, &old_expr.rest) {
+                (Some(new_expr), Some(old_expr)) => {
+                    if find_rsx_expr(new_expr, old_expr, rsx_calls) {
+                        return true;
+                    }
+                }
+                (None, None) => (),
+                _ => return true,
+            }
+            for (new_field, old_field) in new_expr.fields.iter().zip(old_expr.fields.iter()) {
+                if find_rsx_expr(&new_field.expr, &old_field.expr, rsx_calls)
+                    || new_field.attrs != old_field.attrs
+                    || new_field.member != old_field.member
+                    || new_field.colon_token != old_field.colon_token
+                {
+                    return true;
+                }
+            }
+            new_expr.attrs != old_expr.attrs
+                || new_expr.path != old_expr.path
+                || new_expr.brace_token != old_expr.brace_token
+                || new_expr.dot2_token != old_expr.dot2_token
+        }
+        (syn::Expr::Try(new_expr), syn::Expr::Try(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.question_token != old_expr.question_token
+        }
+        (syn::Expr::TryBlock(new_expr), syn::Expr::TryBlock(old_expr)) => {
+            find_rsx_block(&new_expr.block, &old_expr.block, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.try_token != old_expr.try_token
+        }
+        (syn::Expr::Tuple(new_expr), syn::Expr::Tuple(old_expr)) => {
+            for (new_el, old_el) in new_expr.elems.iter().zip(old_expr.elems.iter()) {
+                if find_rsx_expr(new_el, old_el, rsx_calls) {
+                    return true;
+                }
+            }
+            new_expr.attrs != old_expr.attrs || new_expr.paren_token != old_expr.paren_token
+        }
+        (syn::Expr::Type(new_expr), syn::Expr::Type(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.colon_token != old_expr.colon_token
+                || new_expr.ty != old_expr.ty
+        }
+        (syn::Expr::Unary(new_expr), syn::Expr::Unary(old_expr)) => {
+            find_rsx_expr(&new_expr.expr, &old_expr.expr, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.op != old_expr.op
+        }
+        (syn::Expr::Unsafe(new_expr), syn::Expr::Unsafe(old_expr)) => {
+            find_rsx_block(&new_expr.block, &old_expr.block, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.unsafe_token != old_expr.unsafe_token
+        }
+        (syn::Expr::While(new_expr), syn::Expr::While(old_expr)) => {
+            find_rsx_expr(&new_expr.cond, &old_expr.cond, rsx_calls)
+                || find_rsx_block(&new_expr.body, &old_expr.body, rsx_calls)
+                || new_expr.attrs != old_expr.attrs
+                || new_expr.label != old_expr.label
+                || new_expr.while_token != old_expr.while_token
+        }
+        (syn::Expr::Yield(new_expr), syn::Expr::Yield(old_expr)) => {
+            match (&new_expr.expr, &old_expr.expr) {
+                (Some(new_inner), Some(old_inner)) => {
+                    find_rsx_expr(new_inner, old_inner, rsx_calls)
+                        || new_expr.attrs != old_expr.attrs
+                        || new_expr.yield_token != old_expr.yield_token
+                }
+                (None, None) => {
+                    new_expr.attrs != old_expr.attrs || new_expr.yield_token != old_expr.yield_token
+                }
+                _ => true,
+            }
+        }
+        (syn::Expr::Verbatim(_), syn::Expr::Verbatim(_)) => false,
+        _ => true,
+    }
+}

src/lib.rs

@@ -18,3 +18,5 @@ pub use error::*;
 
 pub mod logging;
 pub use logging::*;
+
+pub mod hot_reload;

src/server/hot_reload.rs

@@ -0,0 +1,192 @@
+use axum::{
+    extract::{ws::Message, Extension, TypedHeader, WebSocketUpgrade},
+    response::IntoResponse,
+};
+use dioxus::rsx_interpreter::SetRsxMessage;
+
+use std::{path::PathBuf, sync::Arc};
+
+use super::BuildManager;
+pub use crate::hot_reload::{find_rsx, DiffResult};
+use crate::CrateConfig;
+pub use dioxus::rsx_interpreter::{error::Error, CodeLocation, SetManyRsxMessage};
+pub use proc_macro2::TokenStream;
+pub use std::collections::HashMap;
+pub use std::sync::Mutex;
+pub use std::time::SystemTime;
+pub use std::{fs, io, path::Path};
+pub use std::{fs::File, io::Read};
+pub use syn::__private::ToTokens;
+use syn::spanned::Spanned;
+use tokio::sync::broadcast;
+
+pub struct HotReloadState {
+    pub messages: broadcast::Sender<SetManyRsxMessage>,
+    pub build_manager: Arc<BuildManager>,
+    pub last_file_rebuild: Arc<Mutex<FileMap>>,
+    pub watcher_config: CrateConfig,
+}
+
+pub struct FileMap {
+    pub map: HashMap<PathBuf, String>,
+    pub last_updated_time: std::time::SystemTime,
+}
+
+impl FileMap {
+    pub fn new(path: PathBuf) -> Self {
+        log::info!("Searching files for changes since last compile...");
+        fn find_rs_files(root: PathBuf) -> io::Result<HashMap<PathBuf, String>> {
+            let mut files = HashMap::new();
+            if root.is_dir() {
+                for entry in fs::read_dir(root)? {
+                    if let Ok(entry) = entry {
+                        let path = entry.path();
+                        files.extend(find_rs_files(path)?);
+                    }
+                }
+            } else {
+                if root.extension().map(|s| s.to_str()).flatten() == Some("rs") {
+                    if let Ok(mut file) = File::open(root.clone()) {
+                        let mut src = String::new();
+                        file.read_to_string(&mut src).expect("Unable to read file");
+                        files.insert(root, src);
+                    }
+                }
+            }
+            Ok(files)
+        }
+
+        let last_updated_time = SystemTime::now();
+        let result = Self {
+            last_updated_time,
+            map: find_rs_files(path).unwrap(),
+        };
+        log::info!("Files updated");
+        result
+    }
+}
+
+pub async fn hot_reload_handler(
+    ws: WebSocketUpgrade,
+    _: Option<TypedHeader<headers::UserAgent>>,
+    Extension(state): Extension<Arc<HotReloadState>>,
+) -> impl IntoResponse {
+    ws.on_upgrade(|mut socket| async move {
+        log::info!("🔥 Hot Reload WebSocket connected");
+        {
+            // update any rsx calls that changed before the websocket connected.
+            let mut messages = Vec::new();
+
+            {
+                log::info!("Finding updates since last compile...");
+                let handle = state.last_file_rebuild.lock().unwrap();
+                let update_time = handle.last_updated_time.clone();
+                for (k, v) in handle.map.iter() {
+                    let mut file = File::open(k).unwrap();
+                    if let Ok(md) = file.metadata() {
+                        if let Ok(time) = md.modified() {
+                            if time < update_time {
+                                continue;
+                            }
+                        }
+                    }
+                    let mut new_str = String::new();
+                    file.read_to_string(&mut new_str).expect("Unable to read file");
+                    if let Ok(new_file) = syn::parse_file(&new_str) {
+                        if let Ok(old_file) = syn::parse_file(&v) {
+                            if let DiffResult::RsxChanged(changed) = find_rsx(&new_file, &old_file) {
+                                for (old, new) in changed.into_iter() {
+                                    let hr = get_location(
+                                        k,
+                                        old.to_token_stream(),
+                                    );
+                                    // get the original source code to preserve whitespace
+                                    let span = new.span();
+                                    let start = span.start();
+                                    let end = span.end();
+                                    let mut lines: Vec<_> = new_str
+                                        .lines()
+                                        .skip(start.line - 1)
+                                        .take(end.line - start.line + 1)
+                                        .collect();
+                                    if let Some(first) = lines.first_mut() {
+                                        *first = first.split_at(start.column).1;
+                                    }
+                                    if let Some(last) = lines.last_mut() {
+                                        *last = last.split_at(end.column).0;
+                                    }
+                                    let rsx = lines.join("\n");
+                                    messages.push(SetRsxMessage {
+                                        location: hr,
+                                        new_text: rsx,
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+                log::info!("finished");
+            }
+
+            let msg = SetManyRsxMessage(messages);
+            if socket
+                .send(Message::Text(serde_json::to_string(&msg).unwrap()))
+                .await
+                .is_err()
+            {
+                return;
+            }
+        }
+
+        let mut rx = state.messages.subscribe();
+        let hot_reload_handle = tokio::spawn(async move {
+            loop {
+                let read_set_rsx = rx.recv();
+                let read_err = socket.recv();
+                tokio::select! {
+                    err = read_err => {
+                        if let Some(Ok(err)) = err {
+                            if let Message::Text(err) = err {
+                                let error: Error = serde_json::from_str(&err).unwrap();
+                                match error{
+                                    Error::ParseError(parse_error) => {
+                                        log::error!("parse error:\n--> at {}:{}:{}\n\t{:?}", parse_error.location.file, parse_error.location.line, parse_error.location.column, parse_error.message);
+                                    },
+                                    Error::RecompileRequiredError(_) => {
+                                        if let Err(err) = state.build_manager.build(){
+                                            log::error!("{}", err);
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            break;
+                        }
+                    },
+                    set_rsx = read_set_rsx => {
+                        if let Ok(rsx) = set_rsx {
+                            if socket
+                                .send(Message::Text(serde_json::to_string(&rsx).unwrap()))
+                                .await
+                                .is_err()
+                            {
+                                break;
+                            };
+                        }
+                    }
+                };
+            }
+        });
+
+        hot_reload_handle.await.unwrap();
+    })
+}
+
+pub fn get_location(path: &Path, ts: TokenStream) -> CodeLocation {
+    let span = ts.span().start();
+    CodeLocation {
+        file: path.display().to_string(),
+        line: span.line as u32,
+        column: span.column as u32 + 1,
+    }
+}

src/server/mod.rs

@@ -6,7 +6,9 @@ use axum::{
     routing::{get, get_service},
     Router,
 };
+use dioxus::rsx_interpreter::SetRsxMessage;
 use notify::{RecommendedWatcher, Watcher};
+use syn::spanned::Spanned;
 
 use std::{path::PathBuf, sync::Arc};
 use tower::ServiceBuilder;
@@ -15,46 +17,250 @@ use tower_http::services::fs::{ServeDir, ServeFileSystemResponseBody};
 use crate::{builder, serve::Serve, CrateConfig, Result};
 use tokio::sync::broadcast;
 
-struct WsRelodState {
-    update: broadcast::Sender<String>,
+mod hot_reload;
+use hot_reload::*;
+
+pub struct BuildManager {
+    config: CrateConfig,
+    reload_tx: broadcast::Sender<()>,
+}
+
+impl BuildManager {
+    fn build(&self) -> Result<()> {
+        log::info!("Start to rebuild project...");
+        builder::build(&self.config)?;
+        // change the websocket reload state to true;
+        // the page will auto-reload.
+        if self
+            .config
+            .dioxus_config
+            .web
+            .watcher
+            .reload_html
+            .unwrap_or(false)
+        {
+            let _ = Serve::regen_dev_page(&self.config);
+        }
+        let _ = self.reload_tx.send(());
+        Ok(())
+    }
+}
+
+struct WsReloadState {
+    update: broadcast::Sender<()>,
 }
 
 pub async fn startup(config: CrateConfig) -> Result<()> {
+    if config.hot_reload {
+        startup_hot_reload(config).await?
+    } else {
+        startup_default(config).await?
+    }
+    Ok(())
+}
+
+pub async fn startup_hot_reload(config: CrateConfig) -> Result<()> {
     log::info!("🚀 Starting development server...");
 
     let dist_path = config.out_dir.clone();
-
     let (reload_tx, _) = broadcast::channel(100);
+    let last_file_rebuild = Arc::new(Mutex::new(FileMap::new(config.crate_dir.clone())));
+    let build_manager = Arc::new(BuildManager {
+        config: config.clone(),
+        reload_tx: reload_tx.clone(),
+    });
+    let hot_reload_tx = broadcast::channel(100).0;
+    let hot_reload_state = Arc::new(HotReloadState {
+        messages: hot_reload_tx.clone(),
+        build_manager: build_manager.clone(),
+        last_file_rebuild: last_file_rebuild.clone(),
+        watcher_config: config.clone(),
+    });
 
-    let ws_reload_state = Arc::new(WsRelodState {
+    let crate_dir = config.crate_dir.clone();
+    let ws_reload_state = Arc::new(WsReloadState {
         update: reload_tx.clone(),
     });
 
     let mut last_update_time = chrono::Local::now().timestamp();
 
     // file watcher: check file change
-    let watcher_conf = config.clone();
-    let mut watcher = RecommendedWatcher::new(move |_: notify::Result<notify::Event>| {
+    let allow_watch_path = config
+        .dioxus_config
+        .web
+        .watcher
+        .watch_path
+        .clone()
+        .unwrap_or_else(|| vec![PathBuf::from("src")]);
+
+    let mut watcher = RecommendedWatcher::new(move |evt: notify::Result<notify::Event>| {
         if chrono::Local::now().timestamp() > last_update_time {
-            log::info!("Start to rebuild project...");
-            if builder::build(&watcher_conf).is_ok() {
-                // change the websocket reload state to true;
-                // the page will auto-reload.
-                if watcher_conf
-                    .dioxus_config
-                    .web
-                    .watcher
-                    .reload_html
-                    .unwrap_or(false)
-                {
-                    let _ = Serve::regen_dev_page(&watcher_conf);
+            // Give time for the change to take effect before reading the file
+            std::thread::sleep(std::time::Duration::from_millis(100));
+            if let Ok(evt) = evt {
+                let mut messages = Vec::new();
+                let mut needs_rebuild = false;
+                for path in evt.paths {
+                    let mut file = File::open(path.clone()).unwrap();
+                    if path.extension().map(|p| p.to_str()).flatten() != Some("rs") {
+                        continue;
+                    }
+                    let mut src = String::new();
+                    file.read_to_string(&mut src).expect("Unable to read file");
+                    // find changes to the rsx in the file
+                    if let Ok(syntax) = syn::parse_file(&src) {
+                        let mut last_file_rebuild = last_file_rebuild.lock().unwrap();
+                        if let Some(old_str) = last_file_rebuild.map.get(&path) {
+                            if let Ok(old) = syn::parse_file(&old_str) {
+                                match find_rsx(&syntax, &old) {
+                                    DiffResult::CodeChanged => {
+                                        needs_rebuild = true;
+                                        last_file_rebuild.map.insert(path, src);
+                                    }
+                                    DiffResult::RsxChanged(changed) => {
+                                        log::info!("reloading rsx");
+                                        for (old, new) in changed.into_iter() {
+                                            let hr = get_location(
+                                                &path.to_path_buf(),
+                                                old.to_token_stream(),
+                                            );
+                                            // get the original source code to preserve whitespace
+                                            let span = new.span();
+                                            let start = span.start();
+                                            let end = span.end();
+                                            let mut lines: Vec<_> = src
+                                                .lines()
+                                                .skip(start.line - 1)
+                                                .take(end.line - start.line + 1)
+                                                .collect();
+                                            if let Some(first) = lines.first_mut() {
+                                                *first = first.split_at(start.column).1;
+                                            }
+                                            if let Some(last) = lines.last_mut() {
+                                                *last = last.split_at(end.column).0;
+                                            }
+                                            let rsx = lines.join("\n");
+                                            messages.push(SetRsxMessage {
+                                                location: hr,
+                                                new_text: rsx,
+                                            });
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            // if this is a new file, rebuild the project
+                            *last_file_rebuild = FileMap::new(crate_dir.clone());
+                        }
+                    }
+                }
+                if needs_rebuild {
+                    log::info!("reload required");
+                    if let Err(err) = build_manager.build() {
+                        log::error!("{}", err);
+                    }
+                }
+                if !messages.is_empty() {
+                    let _ = hot_reload_tx.send(SetManyRsxMessage(messages));
                 }
-                let _ = reload_tx.send("reload".into());
-                last_update_time = chrono::Local::now().timestamp();
             }
+            last_update_time = chrono::Local::now().timestamp();
         }
     })
     .unwrap();
+
+    for sub_path in allow_watch_path {
+        watcher
+            .watch(
+                &config.crate_dir.join(sub_path),
+                notify::RecursiveMode::Recursive,
+            )
+            .unwrap();
+    }
+
+    // start serve dev-server at 0.0.0.0:8080
+    let port = "8080";
+    log::info!("📡 Dev-Server is started at: http://127.0.0.1:{}/", port);
+
+    let file_service_config = config.clone();
+    let file_service = ServiceBuilder::new()
+        .and_then(
+            move |response: Response<ServeFileSystemResponseBody>| async move {
+                let response = if file_service_config
+                    .dioxus_config
+                    .web
+                    .watcher
+                    .index_on_404
+                    .unwrap_or(false)
+                    && response.status() == StatusCode::NOT_FOUND
+                {
+                    let body = Full::from(
+                        // TODO: Cache/memoize this.
+                        std::fs::read_to_string(
+                            file_service_config
+                                .crate_dir
+                                .join(file_service_config.out_dir)
+                                .join("index.html"),
+                        )
+                        .ok()
+                        .unwrap(),
+                    )
+                    .map_err(|err| match err {})
+                    .boxed();
+                    Response::builder()
+                        .status(StatusCode::OK)
+                        .body(body)
+                        .unwrap()
+                } else {
+                    response.map(|body| body.boxed())
+                };
+                Ok(response)
+            },
+        )
+        .service(ServeDir::new((&config.crate_dir).join(&dist_path)));
+
+    let router = Router::new()
+        .route("/_dioxus/ws", get(ws_handler))
+        .fallback(
+            get_service(file_service).handle_error(|error: std::io::Error| async move {
+                (
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Unhandled internal error: {}", error),
+                )
+            }),
+        );
+
+    let router = router
+        .route("/_dioxus/hot_reload", get(hot_reload_handler))
+        .layer(Extension(ws_reload_state))
+        .layer(Extension(hot_reload_state));
+
+    axum::Server::bind(&format!("0.0.0.0:{}", port).parse().unwrap())
+        .serve(router.into_make_service())
+        .await?;
+
+    Ok(())
+}
+
+pub async fn startup_default(config: CrateConfig) -> Result<()> {
+    log::info!("🚀 Starting development server...");
+
+    let dist_path = config.out_dir.clone();
+
+    let (reload_tx, _) = broadcast::channel(100);
+
+    let build_manager = BuildManager {
+        config: config.clone(),
+        reload_tx: reload_tx.clone(),
+    };
+
+    let ws_reload_state = Arc::new(WsReloadState {
+        update: reload_tx.clone(),
+    });
+
+    let mut last_update_time = chrono::Local::now().timestamp();
+
+    // file watcher: check file change
     let allow_watch_path = config
         .dioxus_config
         .web
@@ -63,6 +269,17 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
         .clone()
         .unwrap_or_else(|| vec![PathBuf::from("src")]);
 
+    let mut watcher = RecommendedWatcher::new(move |_: notify::Result<notify::Event>| {
+        log::info!("reload required");
+        if chrono::Local::now().timestamp() > last_update_time {
+            match build_manager.build() {
+                Ok(_) => last_update_time = chrono::Local::now().timestamp(),
+                Err(e) => log::error!("{}", e),
+            }
+        }
+    })
+    .unwrap();
+
     for sub_path in allow_watch_path {
         watcher
             .watch(
@@ -122,10 +339,11 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
                     format!("Unhandled internal error: {}", error),
                 )
             }),
-        );
+        )
+        .layer(Extension(ws_reload_state));
 
     axum::Server::bind(&format!("0.0.0.0:{}", port).parse().unwrap())
-        .serve(router.layer(Extension(ws_reload_state)).into_make_service())
+        .serve(router.into_make_service())
         .await?;
 
     Ok(())
@@ -134,23 +352,24 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
 async fn ws_handler(
     ws: WebSocketUpgrade,
     _: Option<TypedHeader<headers::UserAgent>>,
-    Extension(state): Extension<Arc<WsRelodState>>,
+    Extension(state): Extension<Arc<WsReloadState>>,
 ) -> impl IntoResponse {
     ws.on_upgrade(|mut socket| async move {
         let mut rx = state.update.subscribe();
         let reload_watcher = tokio::spawn(async move {
             loop {
-                let v = rx.recv().await.unwrap();
-                if v == "reload" {
-                    // ignore the error
-                    if socket
-                        .send(Message::Text(String::from("reload")))
-                        .await
-                        .is_err()
-                    {
-                        break;
-                    }
+                rx.recv().await.unwrap();
+                // ignore the error
+                if socket
+                    .send(Message::Text(String::from("reload")))
+                    .await
+                    .is_err()
+                {
+                    break;
                 }
+
+                // flush the errors after recompling
+                rx = rx.resubscribe();
             }
         });