Merge pull request #3 from thomaseizinger/main

Auto-generate props if there are more than 1 arguments or the one provided does not end in `Props`
Pitasi · Sep 20, 2023 · caaf55b · caaf55b
2 parents 867d6aa + 175763d
commit caaf55b
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 3 deletions.
diff --git a/rscx-macros/src/lib.rs b/rscx-macros/src/lib.rs
@@ -8,7 +8,8 @@ use rstml::{
     node::{KeyedAttribute, Node, NodeAttribute, NodeElement, NodeName},
     Parser, ParserConfig,
 };
-use syn::{parse::Parse, spanned::Spanned, Expr, ExprLit, ItemStruct};
+use syn::punctuated::Punctuated;
+use syn::{parse::Parse, parse_quote, spanned::Spanned, Expr, ExprLit, FnArg, ItemStruct, Token};
 
 #[proc_macro]
 pub fn html(tokens: TokenStream) -> TokenStream {
@@ -445,9 +446,48 @@ impl ToTokens for ComponentFn {
                 let props = item.sig.inputs.first().unwrap();
                 (quote! {}, props.to_token_stream())
             }
-            // TODO: generate #nameProps here
             _ => {
-                panic!("wrong props")
+                let field_defs = &item
+                    .sig
+                    .inputs
+                    .clone()
+                    .into_iter()
+                    .map(|i| match i {
+                        FnArg::Receiver(_) => {
+                            panic!("receiver arguments unsupported");
+                        }
+                        FnArg::Typed(mut t) => {
+                            if t.attrs.is_empty() {
+                                t.attrs.push(parse_quote! { #[builder(setter(into))] });
+                            }
+
+                            t
+                        }
+                    })
+                    .collect::<Punctuated<_, Token![,]>>();
+                let field_names = item
+                    .sig
+                    .inputs
+                    .iter()
+                    .map(|i| match i {
+                        FnArg::Receiver(_) => {
+                            panic!("receiver arguments unsupported");
+                        }
+                        FnArg::Typed(t) => &t.pat,
+                    })
+                    .collect::<Punctuated<_, Token![,]>>();
+                let props_name =
+                    syn::Ident::new(&format!("{}Props", name), proc_macro2::Span::call_site());
+
+                (
+                    quote! {
+                        #[rscx::props]
+                        pub struct #props_name {
+                            #field_defs
+                        }
+                    },
+                    quote! { #props_name { #field_names }: #props_name },
+                )
             }
         };
 

diff --git a/rscx/examples/autogenerated_props.rs b/rscx/examples/autogenerated_props.rs
@@ -0,0 +1,38 @@
+use rscx::{component, html};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let app = app().await;
+    println!("{}", app);
+    Ok(())
+}
+
+// simple function returning a String
+async fn app() -> String {
+    let s = "ul { color: red; }";
+    html! {
+        <!DOCTYPE html>
+        <html>
+            <head>
+                <style>{s}</style>
+            </head>
+            <body>
+                // call a component with props and children
+                <Section title="Hello">
+                    <p>"I am a paragraph"</p>
+                </Section>
+            </body>
+        </html>
+    }
+}
+
+#[component]
+/// mark functions with #[component] to use them as components inside html! macro
+fn Section(title: String, children: String) -> String {
+    html! {
+        <div>
+            <h1>{ title }</h1>
+            { children }
+        </div>
+    }
+}