Fixed rsx! for loops and if statements

macros/src/emit.rs

@@ -3,7 +3,7 @@ use proc_macro2::TokenStream;
 use quote::quote;
 
 pub fn emit_rsx(root: RsxRoot) -> TokenStream {
-    let nodes = root.nodes.iter().map(emit_node);
+    let nodes = root.nodes.iter().map(emit_node_scope);
 
     quote! {{
         let mut r = osui::frontend::Rsx::new();
@@ -25,19 +25,42 @@ fn emit_deps(deps: &[Dep]) -> TokenStream {
         .collect()
 }
 
-fn emit_node(node: &RsxNode) -> TokenStream {
-    match node {
-        RsxNode::Text(text) => quote! {
-            r.static_scope(|scope| scope.view(Arc::new(move |ctx| {
-                ctx.draw_text(Point { x: 0, y: 0 }, &format!(#text))
-            })));
-        },
+fn emit_deps_vec(deps: &[Dep]) -> TokenStream {
+    let deps = deps.iter().map(|d| {
+        let ident = &d.ident;
 
-        RsxNode::Component(name) => quote! {
-            r.static_scope(|scope| scope.view(Arc::new(move |ctx| {
-                scope.child(#name, None)
-            })));
-        },
+        if let Some(pat) = &d.pat {
+            quote! {{
+                let #pat = #ident.clone();
+                Box::new(#pat) as Box<dyn HookDependency>
+            }}
+        } else {
+            quote! {
+                Box::new(#ident.clone()) as Box<dyn HookDependency>
+            }
+        }
+    });
+
+    quote! {
+        vec![ #(#deps),* ]
+    }
+}
+
+fn emit_node_scope(node: &RsxNode) -> TokenStream {
+    match node {
+        RsxNode::Text(_) => {
+            let emit = emit_node(node);
+            quote! {
+                r.static_scope(|scope| {#emit});
+            }
+        }
+
+        RsxNode::Component(_) => {
+            let emit = emit_node(node);
+            quote! {
+                r.static_scope(|scope| {#emit});
+            }
+        }
 
         RsxNode::Mount(m) => quote! {
             #m.mount();
@@ -49,6 +72,7 @@ fn emit_node(node: &RsxNode) -> TokenStream {
             children,
         } => {
             let deps_emit = emit_deps(deps);
+            let deps_vec_emit = emit_deps_vec(deps);
             let kids = children.iter().map(emit_node);
 
             quote! {
@@ -62,7 +86,7 @@ fn emit_node(node: &RsxNode) -> TokenStream {
                         } else {
                             scope.children.lock().unwrap().clear();
                         }
-                    });
+                    }, #deps_vec_emit);
                 }
             }
         }
@@ -74,6 +98,7 @@ fn emit_node(node: &RsxNode) -> TokenStream {
             children,
         } => {
             let deps_emit = emit_deps(deps);
+            let deps_vec_emit = emit_deps_vec(deps);
             let kids = children.iter().map(emit_node);
 
             quote! {
@@ -84,9 +109,31 @@ fn emit_node(node: &RsxNode) -> TokenStream {
                         for #pat in #expr {
                             #(#kids)*
                         }
-                    });
+                    }, #deps_vec_emit);
                 }
             }
         }
     }
 }
+
+fn emit_node(node: &RsxNode) -> TokenStream {
+    match node {
+        RsxNode::Text(text) => quote! {
+            scope.view(Arc::new(move |ctx| {
+                ctx.draw_text(Point { x: 0, y: 0 }, &format!(#text))
+            }));
+        },
+
+        RsxNode::Component(name) => quote! {
+            scope.child(#name, None);
+        },
+
+        RsxNode::Mount(m) => quote! {
+            #m.mount();
+        },
+
+        RsxNode::If { .. } => panic!("Invalid if statement"),
+
+        RsxNode::For { .. } => panic!("Invalid for loop"),
+    }
+}