wip debugging contracttype and type-reference incompats

Author: leighmcculloch

soroban-sdk-macros/src/derive_event.rs

@@ -39,7 +39,10 @@ impl ContractEventArgs {
 
 pub fn derive_event(metadata: TokenStream2, input: TokenStream2) -> TokenStream2 {
     match derive_event_or_err(metadata, input) {
-        Ok(tokens) => tokens,
+        Ok(tokens) => {
+            println!("{tokens}");
+            tokens
+        }
         Err(err) => err.write_errors(),
     }
 }
@@ -249,7 +252,7 @@ fn derive_event_inner<'a>(
         ScSpecEventDataFormat::Vec => (
             quote! {
                 // TODO: Implement optional fields on contracttype.
-                // TODO: #[#path::contracttype]
+                #[#path::contracttype(export = false)]
                 pub struct #data_type_ident<'a>(
                     #(&'a #data_type_params_types,)*
                 );
@@ -267,7 +270,7 @@ fn derive_event_inner<'a>(
         ),
         ScSpecEventDataFormat::Map => (
             quote! {
-                // TODO: #[#path::contracttype]
+                #[#path::contracttype(export = false)]
                 pub struct #data_type_ident<'a>{
                     #(#data_type_params_idents: &'a #data_type_params_types,)*
                 }

soroban-sdk-macros/src/map_type.rs

@@ -5,7 +5,7 @@ use stellar_xdr::{
 };
 use syn::{
     spanned::Spanned, Error, Expr, ExprLit, GenericArgument, Lit, Path, PathArguments, PathSegment,
-    Type, TypePath, TypeTuple,
+    Type, TypePath, TypeReference, TypeTuple,
 };
 
 // These constants' values must match the definitions of the constants with the
@@ -174,7 +174,7 @@ pub fn map_type(t: &Type, allow_hash: bool) -> Result<ScSpecTypeDef, Error> {
                         ))?,
                     }
                 }
-                _ => Err(Error::new(t.span(), "unsupported type"))?,
+                _ => Err(Error::new(t.span(), "unsupported type: {t:#?}"))?,
             }
         }
         Type::Tuple(TypeTuple { elems, .. }) => {
@@ -194,6 +194,7 @@ pub fn map_type(t: &Type, allow_hash: bool) -> Result<ScSpecTypeDef, Error> {
                     })?,
             })))
         }
-        _ => Err(Error::new(t.span(), "unsupported type"))?,
+        Type::Reference(TypeReference { elem: t, .. }) => map_type(t, allow_hash),
+        _ => Err(Error::new(t.span(), format!("unsupported type: {t:#?}")))?,
     }
 }