feat: extend gbuilder by aliases and constructor (#92)

* feat: implement aliases for fields of gbuilder for custom layout * feat: implement constructor call for some TypeValues in custom layout * test(macros): add homogeneous struct to test constructor
noti-rs · Dec 25, 2024 · 63a1740 · 63a1740
1 parent 2a75528
commit 63a1740
Show file tree

Hide file tree

Showing 10 changed files with 311 additions and 77 deletions.
diff --git a/crates/config/src/spacing.rs b/crates/config/src/spacing.rs
@@ -9,18 +9,18 @@ use serde::{de::Visitor, Deserialize};
 use shared::value::TryFromValue;
 
 #[derive(GenericBuilder, Debug, Default, Clone)]
-#[gbuilder(name(GBuilderSpacing), derive(Clone))]
+#[gbuilder(name(GBuilderSpacing), derive(Clone), constructor)]
 pub struct Spacing {
-    #[gbuilder(default(0))]
+    #[gbuilder(default(0), aliases(vertical, all))]
     top: u8,
 
-    #[gbuilder(default(0))]
+    #[gbuilder(default(0), aliases(horizontal, all))]
     right: u8,
 
-    #[gbuilder(default(0))]
+    #[gbuilder(default(0), aliases(vertical, all))]
     bottom: u8,
 
-    #[gbuilder(default(0))]
+    #[gbuilder(default(0), aliases(horizontal, all))]
     left: u8,
 }
 

diff --git a/crates/filetype/src/converter.rs b/crates/filetype/src/converter.rs
@@ -228,10 +228,18 @@ fn convert_type_value<'a>(
     let type_name = type_value_pairs.next().unwrap().as_str();
     let mut type_gbuilder: GBuilder = (type_name, alias_storage).try_into()?;
 
-    type_gbuilder.set_properties(
-        type_name,
-        convert_properties(&mut type_value_pairs, alias_storage),
-    );
+    let maybe_value = type_value_pairs.clone().nth(1).unwrap();
+    if maybe_value.as_rule() == Rule::Properties {
+        type_gbuilder.set_properties(
+            type_name,
+            convert_properties(&mut type_value_pairs, alias_storage),
+        );
+    } else {
+        type_gbuilder.constructor(
+            type_name,
+            convert_property_value(maybe_value, alias_storage)?,
+        );
+    }
 
     Ok(type_gbuilder)
 }
@@ -258,6 +266,26 @@ impl GBuilder {
         }
     }
 
+    fn constructor(&mut self, self_name: &str, value: Value) {
+        macro_rules! implement_variants {
+            ($($variant:ident),*) => {
+                match self {
+                    $(
+                        Self::$variant(val) => {
+                            val.constructor(value).err()
+                        }
+                    )*
+                }
+            };
+        }
+
+        if let Some(err) =
+            implement_variants!(FlexContainer, WImage, WText, Spacing, Alignment, Border)
+        {
+            warn!("Failed to call constructor of {self_name}, trying to defaulting. Error: {err}");
+        }
+    }
+
     fn set_value(&mut self, field_name: &str, value: Value) -> Result<&mut Self, ConversionError> {
         macro_rules! implement_variants {
             ($($variant:ident),*) => {

diff --git a/crates/filetype/src/layout.pest b/crates/filetype/src/layout.pest
@@ -49,7 +49,7 @@ PropertyValue = { TypeValue | UInt | Literal }
 
 TypeValue = {
   Identifier ~ OpeningParenthesis
-    ~ Properties?
+    ~ (Properties | PropertyValue)?
   ~ ClosingParenthesis }
 
 Literal = ${ Hashtag? ~ ASCII_ALPHANUMERIC ~ (ASCII_ALPHANUMERIC | "_"  | "-")* }

diff --git a/crates/macros/src/config_property.rs b/crates/macros/src/config_property.rs
@@ -7,7 +7,8 @@ use syn::{
 
 use crate::{
     general::{
-        field_name, wrap_by_option, AttributeInfo, DefaultAssignment, DeriveInfo, Structure,
+        field_name, wrap_by_option, AttributeInfo, DefaultAssignment, DeriveInfo, ExpectIdent,
+        Structure,
     },
     propagate_err,
 };
@@ -190,17 +191,14 @@ impl Structure {
         &self,
         attribute_info: &AttributeInfo<StructInfo, FieldInfo>,
     ) -> proc_macro2::TokenStream {
-        let field_idents: Punctuated<&syn::Ident, Token![,]> = self
-            .fields
-            .iter()
-            .map(|field| field.ident.as_ref().expect("Must be a name field!"))
-            .collect();
+        let field_idents: Punctuated<&syn::Ident, Token![,]> =
+            self.fields.iter().map(ExpectIdent::expect_ident).collect();
 
         let init_members: Punctuated<proc_macro2::TokenStream, Token![,]> = self
             .fields
             .iter()
             .map(|field| {
-                let ident = field.ident.as_ref().expect("Must be a named field");
+                let ident = field.expect_ident();
                 let mut line = quote! { #ident: #ident };
 
                 if attribute_info.is_mergeable_field(field)
@@ -237,7 +235,7 @@ impl Structure {
             .fields
             .iter()
             .flat_map(|field| {
-                let field_ident = field.ident.as_ref().expect("Fields should be named");
+                let field_ident = field.expect_ident();
                 attribute_info
                     .fields_info
                     .get(&field_name(field))
@@ -266,18 +264,15 @@ impl Structure {
         target_type: &syn::Ident,
         attribute_info: &AttributeInfo<StructInfo, FieldInfo>,
     ) -> proc_macro2::TokenStream {
-        let field_idents: Punctuated<&syn::Ident, Token![,]> = self
-            .fields
-            .iter()
-            .map(|field| field.ident.as_ref().expect("Must be a name field!"))
-            .collect();
+        let field_idents: Punctuated<&syn::Ident, Token![,]> =
+            self.fields.iter().map(ExpectIdent::expect_ident).collect();
 
         let init_members: Punctuated<proc_macro2::TokenStream, Token![,]> = self
             .fields
             .iter()
             .filter(|field| !attribute_info.is_temporary_field(field))
             .map(|field| {
-                let ident = field.ident.as_ref().expect("Must be a named field");
+                let ident = field.expect_ident();
                 let mut line = quote! { #ident: #ident };
 
                 if let Some(field_info) = attribute_info.fields_info.get(&field_name(field)) {

diff --git a/crates/macros/src/general.rs b/crates/macros/src/general.rs
@@ -121,11 +121,7 @@ fn matches(attribute: &syn::Attribute, attribute_name: &str) -> bool {
     false
 }
 pub(crate) fn field_name(field: &syn::Field) -> String {
-    field
-        .ident
-        .as_ref()
-        .expect("Must be a named field")
-        .to_string()
+    field.expect_ident().to_string()
 }
 
 pub(crate) enum DefaultAssignment {
@@ -184,6 +180,16 @@ impl ToTokens for DeriveInfo {
     }
 }
 
+pub(crate) trait ExpectIdent {
+    fn expect_ident(&self) -> &syn::Ident;
+}
+
+impl ExpectIdent for syn::Field {
+    fn expect_ident(&self) -> &syn::Ident {
+        self.ident.as_ref().expect("Fields should be named!")
+    }
+}
+
 pub(crate) fn wrap_by_option(ty: syn::Type) -> syn::Type {
     use proc_macro2::Span;
     use syn::PathSegment;