Proc mac support map param

proc-macros/src/render_client.rs

@@ -28,7 +28,7 @@ use crate::helpers::generate_where_clause;
 use crate::rpc_macro::{RpcDescription, RpcMethod, RpcSubscription};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::TypeParam;
+use syn::{FnArg, Pat, PatIdent, PatType, TypeParam};
 
 impl RpcDescription {
 	pub(super) fn render_client(&self) -> Result<TokenStream2, syn::Error> {
@@ -100,8 +100,28 @@ impl RpcDescription {
 			let params = method.params.iter().map(|(param, _param_type)| {
 				quote! { #serde_json::to_value(&#param)? }
 			});
-			quote! {
-				Some(vec![ #(#params),* ].into())
+			if method.param_format == "map" {
+				// Extract parameter names.
+				let param_names = extract_param_names(&method.signature.sig);
+				// Combine parameter names and values into tuples.
+				let params = param_names.iter().zip(params).map(|pair| {
+					let key = pair.0;
+					let value = pair.1;
+					quote! { (#key, #value) }
+				});
+				let jsonrpsee = self.jsonrpsee_client_path.as_ref().unwrap();
+				quote! {
+					Some(#jsonrpsee::types::v2::ParamsSer::Map(
+							std::collections::BTreeMap::<&str, #jsonrpsee::types::JsonValue>::from(
+								[#(#params),*]
+								)
+							)
+						)
+				}
+			} else {
+				quote! {
+					Some(vec![ #(#params),* ].into())
+				}
 			}
 		} else {
 			quote! { None }
@@ -143,8 +163,28 @@ impl RpcDescription {
 			let params = sub.params.iter().map(|(param, _param_type)| {
 				quote! { #serde_json::to_value(&#param)? }
 			});
-			quote! {
-				Some(vec![ #(#params),* ].into())
+			if sub.param_format == "map" {
+				// Extract parameter names.
+				let param_names = extract_param_names(&sub.signature.sig);
+				// Combine parameter names and values into tuples.
+				let params = param_names.iter().zip(params).map(|pair| {
+					let key = pair.0;
+					let value = pair.1;
+					quote! { (#key, #value) }
+				});
+				let jsonrpsee = self.jsonrpsee_client_path.as_ref().unwrap();
+				quote! {
+					Some(#jsonrpsee::types::v2::ParamsSer::Map(
+							std::collections::BTreeMap::<&str, #jsonrpsee::types::JsonValue>::from(
+								[#(#params),*]
+								)
+							)
+						)
+				}
+			} else {
+				quote! {
+					Some(vec![ #(#params),* ].into())
+				}
 			}
 		} else {
 			quote! { None }
@@ -162,3 +202,13 @@ impl RpcDescription {
 		Ok(method)
 	}
 }
+
+fn extract_param_names(sig: &syn::Signature) -> Vec<String> {
+	sig.inputs.iter().filter_map(|param| match param {
+		FnArg::Typed(PatType { pat, .. }) => match &**pat {
+			Pat::Ident(PatIdent { ident, .. }) => Some(ident.to_string()),
+			_ => None,
+		},
+		_ => None,
+	}).collect()
+}

proc-macros/src/rpc_macro.rs

@@ -42,6 +42,7 @@ pub struct RpcMethod {
 	pub blocking: bool,
 	pub docs: TokenStream2,
 	pub params: Vec<(syn::PatIdent, syn::Type)>,
+	pub param_format: String,
 	pub returns: Option<syn::Type>,
 	pub signature: syn::TraitItemMethod,
 	pub aliases: Vec<String>,
@@ -50,12 +51,16 @@ pub struct RpcMethod {
 
 impl RpcMethod {
 	pub fn from_item(attr: Attribute, mut method: syn::TraitItemMethod) -> syn::Result<Self> {
-		let [aliases, blocking, name, resources] =
-			AttributeMeta::parse(attr)?.retain(["aliases", "blocking", "name", "resources"])?;
+		let [aliases, blocking, name, param_format, resources] =
+			AttributeMeta::parse(attr)?.retain(["aliases", "blocking", "name", "param_format", "resources"])?;
 
 		let aliases = parse_aliases(aliases)?;
 		let blocking = optional(blocking, Argument::flag)?.is_some();
 		let name = name?.string()?;
+		let param_format = match param_format {
+			Ok(param_format) => param_format.string()?,
+			Err(_) => String::from("array"),
+		};
 		let resources = optional(resources, Argument::group)?.unwrap_or_default();
 
 		let sig = method.sig.clone();
@@ -85,7 +90,7 @@ impl RpcMethod {
 		// We've analyzed attributes and don't need them anymore.
 		method.attrs.clear();
 
-		Ok(Self { aliases, blocking, name, params, returns, signature: method, docs, resources })
+		Ok(Self { aliases, blocking, name, params, param_format, returns, signature: method, docs, resources })
 	}
 }
 
@@ -95,6 +100,7 @@ pub struct RpcSubscription {
 	pub docs: TokenStream2,
 	pub unsubscribe: String,
 	pub params: Vec<(syn::PatIdent, syn::Type)>,
+	pub param_format: String,
 	pub item: syn::Type,
 	pub signature: syn::TraitItemMethod,
 	pub aliases: Vec<String>,
@@ -103,12 +109,16 @@ pub struct RpcSubscription {
 
 impl RpcSubscription {
 	pub fn from_item(attr: syn::Attribute, mut sub: syn::TraitItemMethod) -> syn::Result<Self> {
-		let [aliases, item, name, unsubscribe_aliases] =
-			AttributeMeta::parse(attr)?.retain(["aliases", "item", "name", "unsubscribe_aliases"])?;
+		let [aliases, item, name, param_format, unsubscribe_aliases] =
+			AttributeMeta::parse(attr)?.retain(["aliases", "item", "name", "param_format", "unsubscribe_aliases"])?;
 
 		let aliases = parse_aliases(aliases)?;
 		let name = name?.string()?;
 		let item = item?.value()?;
+		let param_format = match param_format {
+			Ok(param_format) => param_format.string()?,
+			Err(_) => String::from("array"),
+		};
 		let unsubscribe_aliases = parse_aliases(unsubscribe_aliases)?;
 
 		let sig = sub.sig.clone();
@@ -130,7 +140,7 @@ impl RpcSubscription {
 		// We've analyzed attributes and don't need them anymore.
 		sub.attrs.clear();
 
-		Ok(Self { name, unsubscribe, unsubscribe_aliases, params, item, signature: sub, aliases, docs })
+		Ok(Self { name, unsubscribe, unsubscribe_aliases, params, param_format, item, signature: sub, aliases, docs })
 	}
 }