feat!: now Dom::render_element and mount_to_dom_element accepts element instead of get_element

Author: EqualMa

crates/frender-dom/src/context.rs

@@ -93,10 +93,10 @@ impl Dom {
 
     pub async fn render_element<E: UpdateRenderState<Dom>>(
         &mut self,
-        mut get_element: impl FnMut() -> E,
+        element: E,
         stop: impl IntoFuture<Output = ()>,
     ) {
-        let state = get_element().initialize_render_state(self);
+        let state = element.initialize_render_state(self);
 
         futures_lite::pin!(state);
 

crates/frender-dom/src/mount.rs

@@ -24,8 +24,8 @@ where
     }
 }
 
-pub fn mount_to_dom_element<'e, E: UpdateRenderState<Dom>>(
-    get_element: impl FnMut() -> E + 'e,
+pub fn mount_to_dom_element<'e, E: UpdateRenderState<Dom> + 'e>(
+    element: E,
     get_dom_element: impl GetDomElement,
 ) -> impl std::future::Future<Output = ()> + 'e {
     let window = web_sys::window().unwrap();
@@ -35,14 +35,14 @@ pub fn mount_to_dom_element<'e, E: UpdateRenderState<Dom>>(
 
     async move {
         Dom::new(document, current_parent)
-            .render_element(get_element, std::future::pending())
+            .render_element(element, std::future::pending())
             .await
     }
 }
 
 #[cfg(feature = "spawn")]
 pub fn spawn_mount_to_dom_element<E: UpdateRenderState<Dom> + 'static>(
-    get_element: impl FnMut() -> E + 'static,
+    get_element: E,
     get_dom_element: impl GetDomElement,
 ) {
     wasm_bindgen_futures::spawn_local(mount_to_dom_element(get_element, get_dom_element))

crates/frender-hook-element/src/lib.rs

@@ -59,7 +59,7 @@ macro_rules! __impl_main_fn {
     ) => {
         $vis fn $main () {
             $crate::__private::main::spawn_mount_to_dom_element(
-                ||  $name(),
+                $name(),
                 $crate::__private::expand_or!(
                     [
                         $($($get_dom_element)*)?

crates/frender-macros/src/component_macro/main_item.rs

@@ -1,4 +1,3 @@
-use darling::ToTokens;
 use proc_macro2::{Span, TokenStream};
 use quote::quote_spanned;
 use syn::spanned::Spanned;
@@ -11,7 +10,7 @@ pub struct MainItem<'a> {
     pub hook_element_path: &'a syn::Path,
     pub options: &'a ComponentMainOptions,
     pub vis: &'a syn::Visibility,
-    pub expr_get_element: &'a dyn ToTokens,
+    pub expr_element: TokenStream,
 }
 
 impl<'a> MainItem<'a> {
@@ -26,7 +25,7 @@ impl<'a> MainItem<'a> {
                     get_dom_element,
                 },
             vis,
-            expr_get_element,
+            expr_element,
         } = self;
 
         let ident = proc_macro2::Ident::new("main", span_fn_ident);
@@ -39,7 +38,7 @@ impl<'a> MainItem<'a> {
         quote_spanned! {span_default=>
             #vis fn #ident() {
                 #hook_element_path #path_dom(
-                    #expr_get_element,
+                    #expr_element,
                     #get_dom_element
                 )
             }

crates/frender-macros/src/component_to_tokens.rs

@@ -1,5 +1,5 @@
-use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
+use proc_macro2::{Span, TokenStream};
+use quote::{quote, quote_spanned, ToTokens};
 use syn::spanned::Spanned;
 
 use crate::{
@@ -31,17 +31,23 @@ impl ComponentDefinition {
 
         let main_block = main.map(|main| {
             let span = main.original.path().span();
+            let expr_element;
+
+            if bg.is_some() {
+                todo!("bg")
+            } else {
+                let name = &item_fn.sig.ident;
+                let span = Span::call_site().located_at(name.span());
+                expr_element = quote_spanned!(span => #name() )
+            }
+
             MainItem {
                 span_default: span,
                 span_fn_ident: span,
                 hook_element_path: &hook_element_path,
                 options: &main.parsed,
                 vis: &item_fn.vis,
-                expr_get_element: if bg.is_some() {
-                    todo!("bg")
-                } else {
-                    &item_fn.sig.ident
-                },
+                expr_element,
             }
             .into_ts()
         });