refactor(macros): cleanup macros, add better error handling, dedup code, DX

blueprints/examples/src/periodic_web_poller.rs

@@ -29,14 +29,14 @@ pub async fn web_poller(value: bool, client: reqwest::Client) -> Result<u8, Infa
 }
 
 // Maps a JSON response to a boolean value
-async fn pre_process(event: serde_json::Value) -> Result<bool, gadget_sdk::Error> {
+pub async fn pre_process(event: serde_json::Value) -> Result<bool, gadget_sdk::Error> {
     gadget_sdk::info!("Running web_poller pre-processor on value: {event}");
     let completed = event["completed"].as_bool().unwrap_or(false);
     Ok(completed)
 }
 
 // Received the u8 value output from the job and performs any last post-processing
-async fn post_process(job_output: u8) -> Result<(), gadget_sdk::Error> {
+pub async fn post_process(job_output: u8) -> Result<(), gadget_sdk::Error> {
     gadget_sdk::info!("Running web_poller post-processor on value: {job_output}");
     if job_output == 1 {
         Ok(())

macros/blueprint-proc-macro-core/src/lib.rs

@@ -45,6 +45,8 @@ pub enum FieldType {
     List(Box<FieldType>),
     /// A Struct of items of type [`FieldType`].
     Struct(String, Vec<(String, Box<FieldType>)>),
+    /// Tuple
+    Tuple(Vec<FieldType>),
     // NOTE: Special types starts from 100
     /// A special type for AccountId
     AccountId,

macros/blueprint-proc-macro/Cargo.toml

@@ -22,7 +22,7 @@ indexmap = { workspace = true }
 
 [dev-dependencies]
 trybuild = { workspace = true }
-gadget-sdk = { path = "../../sdk", features = ["std"] }
+gadget-sdk = { path = "../../sdk", features = ["std", "testing"] }
 tracing = { workspace = true }
 async-trait = { workspace = true }
 

macros/blueprint-proc-macro/src/hooks.rs

@@ -1,42 +1,9 @@
-use std::collections::BTreeMap;
-
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::ForeignItemFn;
 
 pub(crate) fn registration_hook_impl(input: &ForeignItemFn) -> syn::Result<TokenStream> {
-    let syn::ReturnType::Default = &input.sig.output else {
-        return Err(syn::Error::new_spanned(
-            &input.sig.output,
-            "hooks does not return any value",
-        ));
-    };
-
-    let mut param_types = BTreeMap::new();
-    for input in &input.sig.inputs {
-        if let syn::FnArg::Typed(arg) = input {
-            if let syn::Pat::Ident(pat_ident) = &*arg.pat {
-                let ident = &pat_ident.ident;
-                let ty = &*arg.ty;
-                let added = param_types.insert(ident.clone(), ty.clone());
-                if added.is_some() {
-                    return Err(syn::Error::new_spanned(
-                        ident,
-                        "tried to add the same field twice",
-                    ));
-                }
-            }
-        }
-    }
-
-    let params = param_types
-        .values()
-        .map(crate::shared::type_to_field_type)
-        .collect::<syn::Result<Vec<_>>>()?;
-
-    let hook_params = serde_json::to_string(&params).map_err(|err| {
-        syn::Error::new_spanned(input, format!("failed to serialize hook: {err}"))
-    })?;
+    let hook_params = generate_hook_params(input)?;
 
     let gen = quote! {
         #[doc(hidden)]
@@ -48,30 +15,15 @@ pub(crate) fn registration_hook_impl(input: &ForeignItemFn) -> syn::Result<Token
     Ok(gen.into())
 }
 
-pub(crate) fn request_hook_impl(input: &ForeignItemFn) -> syn::Result<TokenStream> {
+fn generate_hook_params(input: &ForeignItemFn) -> syn::Result<String> {
     let syn::ReturnType::Default = &input.sig.output else {
         return Err(syn::Error::new_spanned(
             &input.sig.output,
             "hooks does not return any value",
         ));
     };
 
-    let mut param_types = BTreeMap::new();
-    for input in &input.sig.inputs {
-        if let syn::FnArg::Typed(arg) = input {
-            if let syn::Pat::Ident(pat_ident) = &*arg.pat {
-                let ident = &pat_ident.ident;
-                let ty = &*arg.ty;
-                let added = param_types.insert(ident.clone(), ty.clone());
-                if added.is_some() {
-                    return Err(syn::Error::new_spanned(
-                        ident,
-                        "tried to add the same field twice",
-                    ));
-                }
-            }
-        }
-    }
+    let param_types = crate::shared::param_types(&input.sig)?;
 
     let params = param_types
         .values()
@@ -82,6 +34,12 @@ pub(crate) fn request_hook_impl(input: &ForeignItemFn) -> syn::Result<TokenStrea
         syn::Error::new_spanned(input, format!("failed to serialize hook: {err}"))
     })?;
 
+    Ok(hook_params)
+}
+
+pub(crate) fn request_hook_impl(input: &ForeignItemFn) -> syn::Result<TokenStream> {
+    let hook_params = generate_hook_params(input)?;
+
     let gen = quote! {
         #[doc(hidden)]
         #[doc = "The request hook parameters for the service"]