feat: Add proper custom WithAbiType macro derivation

Author: MrWad3r

abi-proc/src/derive_from_abi.rs

@@ -1,5 +1,6 @@
+use crate::common;
+use crate::common::FieldAttributes;
 use quote::quote;
-use syn::{Fields, FieldsNamed};
 
 pub fn impl_derive(input: syn::DeriveInput) -> Result<proc_macro2::TokenStream, syn::Error> {
     let data = match &input.data {
@@ -18,38 +19,51 @@ pub fn impl_derive(input: syn::DeriveInput) -> Result<proc_macro2::TokenStream,
         }
     };
 
+    let mut struct_fields = Vec::new();
+
     let ident = &input.ident;
 
-    let fields = match &data.fields {
-        Fields::Named(FieldsNamed { named, .. }) => {
-            let mut fields = Vec::new();
-            for i in named {
-                let Some(name) = &i.ident else {
-                    return Err(syn::Error::new_spanned(
-                        &input,
-                        "FromAbi does not support unnamed fields ",
-                    ));
-                };
-                fields.push(quote!(#name));
-            }
-            fields
-        }
-        _ => {
-            return Err(syn::Error::new_spanned(
-                &input,
-                "FromAbi does not support unnamed fields ",
-            ))
-        }
-    };
+    for i in &data.fields {
+        let Some(name) = &i.ident else {
+            continue;
+        };
+
+        let attributes = common::extract_field_attributes(i.attrs.as_slice());
+        let token = construct_from_abi(name, &attributes);
+        struct_fields.push(token);
+    }
 
     let token_stream = quote! {
         impl ::everscale_types::abi::FromAbi for #ident {
             fn from_abi(value: ::everscale_types::abi::AbiValue) -> anyhow::Result<Self> {
-                let (#(#fields),*) = <_>::from_abi(value)?;
-                Ok(Self { #(#fields),* })
+                let ::everscale_types::abi::AbiValue::Tuple(inner) = value else {
+                    anyhow::bail!("AbiValue has incorrect type")
+                };
+                let mut iter = inner.iter();
+                Ok(Self { #(#struct_fields),* })
             }
         }
     };
 
     Ok(token_stream)
 }
+
+pub fn construct_from_abi(
+    field_name: &syn::Ident,
+    attrs: &FieldAttributes,
+) -> proc_macro2::TokenStream {
+    match &attrs.custom_handler {
+        Some(handler) => {
+            quote!(#field_name: #handler::from_abi(
+                iter.next()
+                .ok_or(anyhow::anyhow!("unable to get field from abi"))?.value.clone())?
+            )
+        }
+        None => {
+            quote!(#field_name: <_>::from_abi(
+                iter.next()
+                .ok_or(anyhow::anyhow!("unable to get field from abi"))?.value.clone())?
+            )
+        }
+    }
+}

abi-proc/src/derive_with_abi_type.rs

@@ -39,7 +39,7 @@ pub fn impl_derive(input: syn::DeriveInput) -> Result<proc_macro2::TokenStream,
     };
 
     let token_stream = quote! {
-        impl WithAbiType for #ident {
+        impl ::everscale_types::abi::WithAbiType for #ident {
             fn abi_type() -> ::everscale_types::abi::AbiType {
                 ::everscale_types::abi::AbiType::tuple(#abi_values_slice)
             }
@@ -61,7 +61,7 @@ pub fn construct_with_abi_type(
     let custom_name = to_change.to_string();
 
     match &attrs.custom_handler {
-        Some(handler) => quote!(#handler::abi_type(self.#field_name).named(#custom_name)),
+        Some(handler) => quote!(#handler::abi_type().named(#custom_name)),
         None => quote!(<#ty>::abi_type().named(#custom_name)),
     }
 }