Temp

core/src/event.rs

@@ -2,7 +2,9 @@
 use crate::edit::prelude::*;
 use crate::util::PartyError;
 #[cfg(feature = "sycamore")]
-use lan_party_macros::WebEdit;
+use crate::view::prelude::*;
+#[cfg(feature = "sycamore")]
+use lan_party_macros::{WebEdit, WebView};
 use paste::paste;
 #[cfg(feature = "openapi")]
 use schemars::JsonSchema;
@@ -23,6 +25,7 @@ pub struct EventOutcome {
 #[derive(Clone, Debug)]
 #[cfg_attr(feature = "openapi", derive(JsonSchema))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "sycamore", derive(WebView))]
 pub struct Event {
     /// Has this event concluded?
     #[cfg_attr(feature = "serde", serde(default))]
@@ -55,7 +58,7 @@ impl Event {
 #[derive(Clone, Debug, Default, PartialEq)]
 #[cfg_attr(feature = "openapi", derive(JsonSchema))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "sycamore", derive(WebEdit))]
+#[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
 pub struct EventSpec {
     pub name: String,
     pub description: String,
@@ -71,7 +74,7 @@ macro_rules! events {
             #[derive(Clone, Debug, PartialEq)]
             #[cfg_attr(feature = "openapi", derive(JsonSchema))]
             #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-            #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+            #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
             pub enum EventTypeSpec {
                 $($name($module::[<$name Spec>]),)*
             }
@@ -82,7 +85,7 @@ macro_rules! events {
             #[derive(Clone, Debug)]
             #[cfg_attr(feature = "openapi", derive(JsonSchema))]
             #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-            #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+            #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
             pub enum EventUpdate {
                 $($name($module::[<$name Update>]),)*
             }
@@ -93,7 +96,7 @@ macro_rules! events {
             #[derive(Clone, Debug)]
             #[cfg_attr(feature = "openapi", derive(JsonSchema))]
             #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-            #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+            #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
             pub enum EventType {
                 $($name($module::$name),)*
             }
@@ -160,7 +163,7 @@ pub mod test {
     #[derive(Clone, Debug, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct Test {
         pub num_players: i64,
     }
@@ -168,7 +171,7 @@ pub mod test {
     #[derive(Clone, Debug, Default, PartialEq)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct TestSpec {
         pub num_players: i64,
     }
@@ -176,7 +179,7 @@ pub mod test {
     #[derive(Clone, Debug, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct TestUpdate {
         pub win_game: bool,
     }
@@ -219,7 +222,7 @@ pub mod team_game {
     #[derive(Clone, Debug, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct TeamGame {
         /// Map of teams with a name as key and an array of players as value
         pub teams: HashMap<String, Vec<String>>,
@@ -231,7 +234,7 @@ pub mod team_game {
     #[derive(Clone, Debug, PartialEq, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct TeamGameSpec {
         /// Map of teams with a name as key and an array of players as value
         pub teams: HashMap<String, Vec<String>>,
@@ -255,7 +258,7 @@ pub mod team_game {
     #[derive(Clone, Debug, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct TeamGameUpdateSetTeam {
         pub team: String,
         pub members: Vec<String>,
@@ -264,7 +267,7 @@ pub mod team_game {
     #[derive(Clone, Debug)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum TeamGameUpdateInner {
         /// Add or replace a team with the given name and array of members
         SetTeam(TeamGameUpdateSetTeam),
@@ -283,7 +286,7 @@ pub mod team_game {
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     #[cfg_attr(feature = "serde", serde(untagged))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum TeamGameFfaInheritedUpdate {
         /// Change the ranking and scores
         Ranking(FreeForAllGameUpdateRanking),
@@ -301,10 +304,14 @@ pub mod team_game {
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     #[cfg_attr(feature = "serde", serde(untagged))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum TeamGameUpdate {
+        /// # Team
+        ///
         /// Team specific updates
         Team(TeamGameUpdateInner),
+        /// # Other
+        ///
         /// Inherited from FreeForAllGame
         Ffa(TeamGameFfaInheritedUpdate),
     }
@@ -390,7 +397,7 @@ pub mod free_for_all_game {
     #[derive(Clone, Debug, PartialEq)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum FreeForAllGameRanking {
         /// Ranking of participants by user name or team name (first element is first place, second element is second
         /// place, etc.)
@@ -417,7 +424,7 @@ pub mod free_for_all_game {
     #[derive(Clone, Debug, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct FreeForAllGame {
         /// Ranking of participants by user name or team name (first element is first place, second element is second
         /// place, etc.)
@@ -439,7 +446,7 @@ pub mod free_for_all_game {
     #[derive(Clone, Debug, PartialEq, Default)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub struct FreeForAllGameSpec {
         /// Array of user ids that participate in the game
         pub participants: HashSet<String>,
@@ -457,7 +464,7 @@ pub mod free_for_all_game {
     #[derive(Clone, Debug)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum FreeForAllGameUpdateRanking {
         /// Replace the current ranking with the given ranking
         SetRanking(FreeForAllGameRanking),
@@ -475,7 +482,7 @@ pub mod free_for_all_game {
     #[derive(Clone, Debug)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum FreeForAllGameUpdateRewards {
         /// Set rewards for winning the game
         SetWinRewards(Vec<i64>),
@@ -493,7 +500,7 @@ pub mod free_for_all_game {
     #[derive(Clone, Debug)]
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum FreeForAllGameUpdateParticipants {
         /// Set list of participants participating in the game
         SetParticipants(HashSet<String>),
@@ -515,7 +522,7 @@ pub mod free_for_all_game {
     #[cfg_attr(feature = "openapi", derive(JsonSchema))]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     #[cfg_attr(feature = "serde", serde(untagged))]
-    #[cfg_attr(feature = "sycamore", derive(WebEdit))]
+    #[cfg_attr(feature = "sycamore", derive(WebEdit, WebView))]
     pub enum FreeForAllGameUpdate {
         /// Change the ranking and scores
         Ranking(FreeForAllGameUpdateRanking),

core/src/lib.rs

@@ -5,6 +5,9 @@ pub mod util;
 #[cfg(feature = "sycamore")]
 pub mod edit;
 
+#[cfg(feature = "sycamore")]
+pub mod view;
+
 #[cfg(feature = "sycamore")]
 pub mod components;
 

core/src/view.rs

@@ -0,0 +1,209 @@
+use std::{
+    collections::{HashMap, HashSet},
+    hash::Hash,
+    marker::PhantomData,
+};
+use sycamore::view::IntoView as _;
+
+use sycamore::{builder::prelude::*, prelude::*};
+
+pub mod prelude {
+    pub use super::{IntoView, ViewProps, Viewable, Viewer, WebView};
+    pub use crate::components::Block;
+    pub use paste::paste;
+    pub use sycamore::prelude::*;
+}
+
+use crate::components::{Block, BlockProps};
+
+#[macro_export]
+macro_rules! viewable {
+    ($type:ty => $viewer:ty) => {
+        impl<'a, G: Html> Viewable<'a, G> for $type {
+            type Viewer = $viewer;
+        }
+    };
+}
+
+#[derive(Prop)]
+pub struct ViewProps<'a, T> {
+    pub state: &'a Signal<T>,
+}
+
+impl<'a, T> From<&'a Signal<T>> for ViewProps<'a, T> {
+    fn from(state: &'a Signal<T>) -> Self {
+        ViewProps { state }
+    }
+}
+
+pub trait IntoView<'a, G: Html> {
+    fn view(self, cx: Scope<'a>) -> View<G>;
+}
+
+impl<'a, G: Html, T: Viewable<'a, G>> IntoView<'a, G> for &'a Signal<T>
+where
+    ViewProps<'a, T>: From<&'a Signal<T>>,
+{
+    fn view(self, cx: Scope<'a>) -> View<G> {
+        T::view(cx, self.into())
+    }
+}
+
+pub trait WebView<'a, G: Html>: Sized {
+    fn view(cx: Scope<'a>, props: ViewProps<'a, Self>) -> View<G>;
+}
+
+impl<'a, G, E, Type> WebView<'a, G> for Type
+where
+    G: Html,
+    E: Viewer<'a, G, Type>,
+    Type: Viewable<'a, G, Viewer = E>,
+{
+    fn view(cx: Scope<'a>, props: ViewProps<'a, Self>) -> View<G> {
+        E::view(cx, props)
+    }
+}
+
+pub trait Viewer<'a, G: Html, Type>: Sized {
+    fn view(cx: Scope<'a>, props: ViewProps<'a, Type>) -> View<G>;
+}
+
+pub trait Viewable<'a, G: Html>: Sized {
+    type Viewer: Viewer<'a, G, Self>;
+}
+
+pub struct StringView;
+
+impl<'a, G: Html, T: 'a> Viewer<'a, G, T> for StringView
+where
+    T: sycamore::view::IntoView<G>,
+{
+    fn view(cx: Scope<'a>, props: ViewProps<'a, T>) -> View<G> {
+        view! { cx,
+            (props.state.get().clone().create())
+        }
+    }
+}
+
+viewable!(String => StringView);
+
+viewable!(i64 => StringView);
+viewable!(i32 => StringView);
+viewable!(isize => StringView);
+
+viewable!(u64 => StringView);
+viewable!(u32 => StringView);
+viewable!(usize => StringView);
+
+viewable!(f64 => StringView);
+viewable!(f32 => StringView);
+
+pub struct BoolView;
+
+impl<'a, G: Html> Viewer<'a, G, bool> for BoolView {
+    fn view(cx: Scope<'a>, props: ViewProps<'a, bool>) -> View<G> {
+        let signal = create_signal(cx, props.state.get());
+        view! { cx,
+            input(type="checkbox", checked=*signal.get().as_ref().clone(), disabled=true)
+        }
+    }
+}
+
+viewable!(bool => BoolView);
+
+pub struct VecView;
+
+impl<'a, G, T, I> Viewer<'a, G, I> for VecView
+where
+    G: Html,
+    T: for<'b> Viewable<'b, G> + Clone + PartialEq + 'a,
+    I: IntoIterator<Item = T> + FromIterator<T> + Clone,
+{
+    fn view(cx: Scope<'a>, props: ViewProps<'a, I>) -> View<G> {
+        Block(
+            cx,
+            BlockProps {
+                title: "List".into(),
+                children: Children::new(cx, move |_| {
+                    view! { cx,
+                        //Block(title="List".into()) {
+                        div {
+                            (View::new_fragment(props.state.get().as_ref().clone().into_iter().map(|x| {
+                                let x = create_signal(cx, x);
+                                div().c(x.view(cx)).c(br()).view(cx)
+                            }).collect()))
+                        }
+                        //}
+                    }
+                }),
+            },
+        )
+    }
+}
+
+impl<'a, G, T> Viewable<'a, G> for Vec<T>
+where
+    G: Html,
+    T: for<'b> Viewable<'b, G> + Clone + PartialEq + 'a,
+{
+    type Viewer = VecView;
+}
+
+impl<'a, G, T> Viewable<'a, G> for HashSet<T>
+where
+    G: Html,
+    T: for<'b> Viewable<'b, G> + Clone + PartialEq + Hash + Eq + 'a,
+{
+    type Viewer = VecView;
+}
+
+impl<'a, G, K, V> Viewable<'a, G> for HashMap<K, V>
+where
+    G: Html,
+    K: Clone + Hash + Eq,
+    V: Clone,
+    (K, V): for<'b> Viewable<'b, G> + Clone + PartialEq + Hash + Eq + 'a,
+{
+    type Viewer = VecView;
+}
+
+pub struct TupleView;
+
+impl<'a, G: Html, A: for<'b> Viewable<'b, G> + Clone, B: for<'b> Viewable<'b, G> + Clone>
+    Viewer<'a, G, (A, B)> for TupleView
+{
+    fn view(cx: Scope<'a>, props: ViewProps<'a, (A, B)>) -> View<G> {
+        let a = create_signal(cx, props.state.get().as_ref().clone().0);
+        let b = create_signal(cx, props.state.get().as_ref().clone().1);
+        view! { cx,
+            Block(title="Tuple".into()) {
+                (a.view(cx))
+                (b.view(cx))
+            }
+        }
+    }
+}
+
+impl<'a, G, A, B> Viewable<'a, G> for (A, B)
+where
+    G: Html,
+    A: for<'b> Viewable<'b, G> + Clone,
+    B: for<'b> Viewable<'b, G> + Clone,
+{
+    type Viewer = TupleView;
+}
+
+pub struct OptionView;
+
+impl<'a, G: Html, T: for<'b> Viewable<'b, G> + Clone> Viewer<'a, G, Option<T>> for OptionView {
+    fn view(cx: Scope<'a>, props: ViewProps<'a, Option<T>>) -> View<G> {
+        match props.state.get().as_ref().clone() {
+            Some(x) => view! { cx, (create_signal(cx, x.clone()).view(cx)) },
+            None => view! { cx, "None" },
+        }
+    }
+}
+
+impl<'a, G: Html, T: for<'b> Viewable<'b, G> + Clone> Viewable<'a, G> for Option<T> {
+    type Viewer = OptionView;
+}

macros/src/lib.rs

@@ -2,26 +2,86 @@ mod edit;
 
 use convert_case::{Case, Casing};
 use proc_macro::TokenStream;
-use quote::{format_ident, quote};
+use quote::{__private::TokenStream as TokenStream2, format_ident, quote};
-use syn::Fields;
+use syn::{token::Do, Attribute, DataEnum, DataStruct, Fields, Ident, Path, Type};
 
-#[proc_macro_derive(WebEdit)]
+#[derive(Debug)]
-pub fn web_edit(tokens: TokenStream) -> TokenStream {
+enum Documentation {
-    let input: syn::DeriveInput = syn::parse(tokens).unwrap();
+    Title(String),
+    Description(String),
+    None,
+}
 
-    let name = input.ident;
+impl Documentation {
-    let edit_ident = format_ident!("{}Edit", name);
+    fn parse(attr: &Attribute) -> Documentation {
-
+        if !attr.path.is_ident("doc") {
-    let editable = quote! {
+            return Documentation::None;
-        pub struct #edit_ident;
-
-        impl<'a, G: Html> Editable<'a, G> for #name {
-            type Editor = #edit_ident;
         }
-    };
 
-    let derived = match input.data {
+        let text = attr.tokens.to_string();
-        syn::Data::Struct(s) => {
+
+        let text = text.trim_matches(|c: char| c == '\"' || c == '=' || c.is_whitespace());
+
+        match text.get(0..1) {
+            Some("#") => Documentation::Title(text.trim_matches('#').trim().into()),
+            Some(&_) => Documentation::Description(text.trim().into()),
+            None => Documentation::None,
+        }
+    }
+}
+
+fn get_title_description(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
+    let docs: Vec<_> = attrs.iter().map(Documentation::parse).collect();
+
+    let mut title = None;
+    let mut description: Option<String> = None;
+
+    for doc in docs {
+        match doc {
+            Documentation::Title(t) => title = Some(t),
+            Documentation::Description(d) => {
+                if description.is_some() {
+                    description.as_mut().unwrap().push(' ');
+                } else {
+                    let _ = description.insert(String::new());
+                }
+                description.as_mut().unwrap().push_str(&d);
+            }
+            _ => {}
+        }
+    }
+
+    (title, description)
+}
+
+struct ItemProps {
+    name: Ident,
+    title: String,
+    description: Option<String>,
+}
+
+struct StructField {
+    name: Ident,
+    name_str: String,
+    title: Option<String>,
+    description: Option<String>,
+}
+
+struct EnumVariant {
+    variant: Ident,
+    variant_lower: Ident,
+    inner: Type,
+    title: Option<String>,
+    description: Option<String>,
+}
+
+fn struct_edit(props: &ItemProps, s: DataStruct) -> TokenStream2 {
+    let ItemProps {
+        name,
+        title,
+        description,
+    } = props;
+
     let fields = s.fields.iter().map(|f| {
         let name = f
             .ident
@@ -29,34 +89,51 @@ pub fn web_edit(tokens: TokenStream) -> TokenStream {
             .expect("each struct field must be named")
             .clone();
         let name_str = name.to_string();
-                (name_str, name)
+        let (title, description) = get_title_description(&f.attrs);
+
+        StructField {
+            name_str,
+            name,
+            title,
+            description,
+        }
     });
 
-            let fields_view = fields.clone().map(|(name_str, name)| {
+    let fields_view = fields.clone().map(|f| {
-                let title = name_str.to_case(Case::Title);
+        let title = f.title.unwrap_or(f.name_str.to_case(Case::Title));
+        let description = if let Some(d) = f.description {
+            quote! {
+                span(class="description") {
+                    " " #d
+                }
+            }
+        } else {
+            quote! {}
+        };
+        let name = f.name;
         quote! {
             p {
-                        label { (#title) }
+                label { (#title) br() #description }
                 (#name.edit(cx))
             }
         }
     });
 
-            let signals = fields.clone().map(|(_name_str, name)| {
+    let signals = fields.clone().map(|f| {
+        let name = f.name;
         quote! {
             let #name = create_signal(cx, state.get_untracked().#name.clone());
         }
     });
 
-            let effect_fields = fields.clone().map(|(_name_str, name)| {
+    let effect_fields = fields.clone().map(|f| {
+        let name = f.name;
         quote! {
             #name: #name.get().as_ref().clone()
         }
     });
 
     quote! {
-                impl<'a, G: Html> Editor<'a, G, #name> for #edit_ident {
-                    fn edit(cx: Scope<'a>, props: EditProps<'a, #name>) -> View<G> {
         let state = props.state;
 
         #(#signals)*
@@ -69,39 +146,56 @@ pub fn web_edit(tokens: TokenStream) -> TokenStream {
         });
 
         view! { cx,
-                            Block(title=stringify!(#name).to_string()) {
+            Block(title=#title.to_string()) {
+                p {
+                    #description
+                }
                 #(#fields_view)*
             }
         }
     }
-                }
+}
-            }
+
-        }
+fn enum_edit(props: &ItemProps, e: DataEnum) -> TokenStream2 {
-        syn::Data::Enum(e) => {
+    let ItemProps {
-            //dbg!(&e);
+        name,
+        title,
+        description,
+    } = props;
 
     let variants = e.variants.iter().map(|v| {
         let variant = v.ident.clone();
 
         let inner = match &v.fields {
-                    Fields::Unnamed(u) => {
+            Fields::Unnamed(u) => u.unnamed.first().expect("the should be a field").ty.clone(),
-                        u.unnamed.first().expect("the should be a field").ty.clone()
-                    }
             _ => unimplemented!(),
         };
 
+        let (title, description) = get_title_description(&v.attrs);
         let variant_lower = format_ident!("{}", variant.to_string().to_case(Case::Snake));
-                (variant_lower, variant, inner)
+        EnumVariant {
+            variant_lower,
+            variant,
+            inner,
+            title,
+            description,
+        }
     });
 
-            let first = variants.clone().next().unwrap().0;
+    let first = variants.clone().next().unwrap().variant_lower;
+    let first_str = first.to_string();
 
-            let options = variants.clone().map(|(lower, variant, _inner)| {
+    let options = variants.clone().map(|v| {
+        let lower = v.variant_lower;
+        let title = v
+            .title
+            .unwrap_or(v.variant.to_string().to_case(Case::Title));
         let selected = first == lower;
-                quote! { option(value={stringify!(#lower)}, selected=#selected) { (stringify!(#variant)) } }
+        quote! { option(value={stringify!(#lower)}, selected=#selected) { (#title) } }
     });
 
-            let view_match = variants.clone().map(|(lower, _variant, _inner)| {
+    let view_match = variants.clone().map(|v| {
+        let lower = v.variant_lower;
         let lower_str = format!("{}", lower);
 
         quote! {
@@ -109,17 +203,44 @@ pub fn web_edit(tokens: TokenStream) -> TokenStream {
         }
     });
 
-            let signals = variants.clone().map(|(lower, variant, inner)| {
+    let view_description = variants.clone().map(|v| {
+        let lower = v.variant_lower;
+        let lower_str = format!("{}", lower);
+        let description = if let Some(d) = v.description {
             quote! {
-                    let #lower = if let #name::#variant(v) = state.get_untracked().as_ref().clone() {
+                span(class="description") {
+                    " " #d
+                }
+            }
+        } else {
+            quote! {}
+        };
+
+        quote! {
+            #lower_str => view! { cx, #description }
+        }
+    });
+
+    let signals = variants.clone().map(
+        |EnumVariant {
+             variant,
+             variant_lower,
+             inner,
+             ..
+         }| {
+            quote! {
+                let #variant_lower = if let #name::#variant(v) = state.get_untracked().as_ref().clone() {
                     create_signal(cx, v.clone())
                 } else {
                     create_signal(cx, <#inner>::default())
                 };
             }
-            });
+        },
+    );
 
-            let effect_match = variants.clone().map(|(lower, variant, _inner)| {
+    let effect_match = variants.clone().map(|v| {
+        let lower = v.variant_lower;
+        let variant = v.variant;
         let lower_str = format!("{}", lower);
 
         quote! {
@@ -128,11 +249,9 @@ pub fn web_edit(tokens: TokenStream) -> TokenStream {
     });
 
     quote! {
-                impl<'a, G: Html> Editor<'a, G, #name> for #edit_ident {
-                    fn edit(cx: Scope<'a>, props: EditProps<'a, #name>) -> View<G> {
         let state = props.state;
 
-                        let selected = create_signal(cx, String::from("0"));
+        let selected = create_signal(cx, String::from(#first_str));
 
         #(#signals)*
 
@@ -140,33 +259,247 @@ pub fn web_edit(tokens: TokenStream) -> TokenStream {
             match selected.get().as_str() {
                 #(#effect_match,)*
                 _ => {}
-                                //_ => unreachable!()
             }
         });
 
         view! { cx,
-                            Block(title=stringify!(#name).to_string()) {
+            Block(title=#title.to_string()) {
+                p {
+                    #description
+                }
                 select(bind:value=selected) {
                     #(#options)*
                 }
+                (match selected.get().as_str() {
+                    #(#view_description,)*
+                    _ => view! { cx, }
+                })
                 (match selected.get().as_str() {
                     #(#view_match,)*
                     _ => view! { cx, }
-                                    //_ => unreachable!()
                 })
             }
         }
     }
+}
+
+fn struct_view(props: &ItemProps, s: DataStruct) -> TokenStream2 {
+    let ItemProps {
+        name,
+        title,
+        description,
+    } = props;
+
+    let fields = s.fields.iter().map(|f| {
+        let name = f
+            .ident
+            .as_ref()
+            .expect("each struct field must be named")
+            .clone();
+        let name_str = name.to_string();
+        let (title, description) = get_title_description(&f.attrs);
+
+        StructField {
+            name_str,
+            name,
+            title,
+            description,
+        }
+    });
+
+    let signals = fields.clone().map(|f| {
+        let name = f.name;
+        quote! {
+            let #name = create_signal(cx, state.get().#name.clone());
+        }
+    });
+
+    let fields_view = fields.clone().map(|f| {
+        let title = f.title.unwrap_or(f.name_str.to_case(Case::Title));
+        let description = if let Some(d) = f.description {
+            quote! {
+                span(class="description") {
+                    " " #d
+                }
+            }
+        } else {
+            quote! {}
+        };
+        let name = f.name;
+        quote! {
+            p {
+                label { (#title) br() #description }
+                (#name.view(cx))
+            }
+        }
+    });
+
+    quote! {
+        let state = props.state;
+
+        #(#signals)*
+
+        view! { cx,
+            Block(title=#title.to_string()) {
+                p {
+                    #description
+                }
+                #(#fields_view)*
             }
         }
     }
+}
+
+fn enum_view(props: &ItemProps, e: DataEnum) -> TokenStream2 {
+    let ItemProps {
+        name,
+        title,
+        description,
+    } = props;
+
+    let variants = e.variants.iter().map(|v| {
+        let variant = v.ident.clone();
+
+        let inner = match &v.fields {
+            Fields::Unnamed(u) => u.unnamed.first().expect("the should be a field").ty.clone(),
             _ => unimplemented!(),
         };
 
-    println!("{}", &derived.to_string());
+        let (title, description) = get_title_description(&v.attrs);
-    TokenStream::from(quote! {
+        let variant_lower = format_ident!("{}", variant.to_string().to_case(Case::Snake));
-        #derived
+        EnumVariant {
+            variant_lower,
+            variant,
+            inner,
+            title,
+            description,
+        }
+    });
 
-        #editable
+    let view_match = variants.clone().map(|v| {
+        let variant = v.variant;
+
+        quote! {
+            #name::#variant(x) => create_signal(cx, x).view(cx)
+        }
+    });
+
+    let view_description = variants.clone().map(|v| {
+        let variant = v.variant;
+        let description = if let Some(d) = v.description {
+            quote! {
+                span(class="description") {
+                    " " #d
+                }
+            }
+        } else {
+            quote! {}
+        };
+
+        quote! {
+            #name::#variant(_) => view! { cx, #description }
+        }
+    });
+
+    quote! {
+        let state = props.state;
+
+        view! { cx,
+            Block(title=#title.to_string()) {
+                p {
+                    #description
+                }
+                (match state.get().as_ref().clone() {
+                    #(#view_description,)*
+                    _ => view! { cx, }
                 })
+                (match state.get().as_ref().clone() {
+                    #(#view_match,)*
+                    _ => view! { cx, }
+                })
+            }
+        }
+    }
+}
+
+#[proc_macro_derive(WebEdit)]
+pub fn web_edit(tokens: TokenStream) -> TokenStream {
+    let input: syn::DeriveInput = syn::parse(tokens).unwrap();
+
+    let name = input.ident;
+    let edit_ident = format_ident!("{}Edit", name);
+
+    let (t, d) = get_title_description(&input.attrs);
+
+    let title = t.unwrap_or(name.to_string());
+    let description = d;
+
+    let props = ItemProps {
+        name: name.clone(),
+        title: title.clone(),
+        description: description.clone(),
+    };
+
+    let inner = match input.data {
+        syn::Data::Struct(s) => struct_edit(&props, s),
+        syn::Data::Enum(e) => enum_edit(&props, e),
+        _ => unimplemented!(),
+    };
+
+    let res = quote! {
+        pub struct #edit_ident;
+
+        impl<'a, G: Html> Editor<'a, G, #name> for #edit_ident {
+            fn edit(cx: Scope<'a>, props: EditProps<'a, #name>) -> View<G> {
+                #inner
+            }
+        }
+
+        impl<'a, G: Html> Editable<'a, G> for #name {
+            type Editor = #edit_ident;
+        }
+    };
+
+    TokenStream::from(res)
+}
+
+#[proc_macro_derive(WebView)]
+pub fn web_view(tokens: TokenStream) -> TokenStream {
+    let input: syn::DeriveInput = syn::parse(tokens).unwrap();
+
+    let name = input.ident;
+    let view_ident = format_ident!("{}View", name);
+
+    let (t, d) = get_title_description(&input.attrs);
+
+    let title = t.unwrap_or(name.to_string());
+    let description = d;
+
+    let props = ItemProps {
+        name: name.clone(),
+        title: title.clone(),
+        description: description.clone(),
+    };
+
+    let inner = match input.data {
+        syn::Data::Struct(s) => struct_view(&props, s),
+        syn::Data::Enum(e) => enum_view(&props, e),
+        _ => unimplemented!(),
+    };
+
+    let res = quote! {
+        pub struct #view_ident;
+
+        impl<'a, G: Html> Viewer<'a, G, #name> for #view_ident {
+            fn view(cx: Scope<'a>, props: ViewProps<'a, #name>) -> View<G> {
+                #inner
+            }
+        }
+
+        impl<'a, G: Html> Viewable<'a, G> for #name {
+            type Viewer = #view_ident;
+        }
+    };
+
+    TokenStream::from(res)
 }

web/dist/index.html

@@ -2,11 +2,11 @@
     <meta charset="utf-8">
     <!--<link data-trunk href="tailwind.css" rel="css">-->
     <link rel="stylesheet" href="/simple.min-d15f5ff500b4c62a.css">
-    <link rel="stylesheet" href="/style-13bbcf1f99e2f75c.css">
+    <link rel="stylesheet" href="/style-6e929d2286e0d817.css">
     <link href="https://cdn.jsdelivr.net/npm/@mdi/font@6.9.96/css/materialdesignicons.min.css" rel="stylesheet">
     <title>LAN Party</title>
   
-<link rel="preload" href="/index-7e6e148776e9cebb_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
+<link rel="preload" href="/index-16cdb8c780ec2870_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
-<link rel="modulepreload" href="/index-7e6e148776e9cebb.js"></head>
+<link rel="modulepreload" href="/index-16cdb8c780ec2870.js"></head>
 <body>
-<script type="module">import init from '/index-7e6e148776e9cebb.js';init('/index-7e6e148776e9cebb_bg.wasm');</script></body></html>
+<script type="module">import init from '/index-16cdb8c780ec2870.js';init('/index-16cdb8c780ec2870_bg.wasm');</script></body></html>

web/src/pages/events.rs

@@ -1,22 +1,65 @@
 use lan_party_core::{
     edit::IntoEdit,
-    event::{EventSpec, EventUpdate},
+    event::{Event, EventSpec, EventUpdate},
+    view::IntoView,
 };
 use log::debug;
-use sycamore::prelude::*;
+use reqwasm::http::Method;
+use sycamore::{futures::spawn_local_scoped, prelude::*};
 
-use crate::components::{Block, Button};
+use crate::{
+    components::{Block, Button},
+    util::api_request,
+};
 
 #[component]
 pub fn EventsPage<'a, G: Html>(cx: Scope<'a>) -> View<G> {
     let event_spec = create_signal(cx, EventSpec::default());
     let event_update = create_signal(cx, EventUpdate::default());
 
+    let events = create_signal(cx, None);
+    let test_event = create_signal(cx, None);
+
+    spawn_local_scoped(cx, async move {
+        events.set(Some(
+            api_request::<_, Vec<Event>>(Method::GET, "/event", Option::<()>::None)
+                .await
+                .map(|inner| inner.unwrap())
+                .unwrap(),
+        ));
+        test_event.set(Some(events.get().unwrap().get(0).unwrap().clone()));
+        debug!("{:#?}", test_event);
+    });
+
+    let onadd = move |_| {
+        spawn_local_scoped(cx, async move {
+            let new_event = api_request::<EventSpec, Event>(
+                Method::POST,
+                "/event",
+                Some((*event_spec).get().as_ref().clone()),
+            )
+            .await
+            .unwrap();
+            debug!("{:#?}", new_event);
+            let mut cloned = (*events).get().as_ref().clone();
+            cloned.unwrap().push(new_event.unwrap());
+            events.set(cloned);
+        });
+    };
+
     view! { cx,
+        Block(title="Events".into()) {
+            (test_event.view(cx))
+            (events.view(cx))
+        }
         Block(title="Create new event".into()) {
             (event_spec.edit(cx))
+            Button(icon="mdi-check".into(), onclick=onadd)
+        }
+        br()
+        Block(title="Update an event".into()) {
             (event_update.edit(cx))
-            Button(icon="mdi-check".into(), onclick=move |_| debug!("{:#?}", event_spec.get()))
+            Button(icon="mdi-check".into(), onclick=move |_| debug!("{:#?}", event_update.get()))
         }
     }
 }

web/style.css

@@ -58,3 +58,7 @@ textarea:focus, input:focus{
     outline: none;
 }
 
+.description {
+    font-size: 0.9rem;
+    font-style: italic;
+}