ud, fixed errors

src/lib.rs

@@ -147,53 +147,58 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
 #[proc_macro_attribute]
 pub fn alpaca_cli(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input_enum = parse_macro_input!(item as ItemEnum);
-    let top_enum_ident = &input_enum.ident; // e.g., "Cmd"
+    let top_enum_ident = &input_enum.ident;
     let top_variants = &input_enum.variants;
 
-    // For each variant like Alpaca(AlpacaCmd)
+    // Build outer match arms
-    let outer_match_arms = top_variants.iter().map(|v| {
+    let match_arms: Vec<_> = top_variants.iter().map(|variant| {
-        let variant_ident = &v.ident; // e.g., "Alpaca"
+        let variant_ident = &variant.ident;
 
-        // Extract the inner sub-enum type like AlpacaCmd
+        // Expecting tuple variants like Alpaca(AlpacaCmd)
-        if let syn::Fields::Unnamed(fields) = &v.fields {
+        let inner_type = match &variant.fields {
-            if let Some(field) = fields.unnamed.first() {
+            Fields::Unnamed(fields) if fields.unnamed.len() == 1 => {
-                if let syn::Type::Path(inner_type) = &field.ty {
+                match &fields.unnamed.first().unwrap().ty {
-                    let inner_type_ident = &inner_type.path.segments.last().unwrap().ident;
+                    syn::Type::Path(p) => p.path.segments.last().unwrap().ident.clone(),
+                    _ => panic!("Expected tuple variant with a type path"),
+                }
+            }
+            _ => panic!("Each variant must be a tuple variant like `Alpaca(AlpacaCmd)`"),
+        };
 
-                    // Match arms inside the nested enum (AlpacaCmd)
+        quote! {
-                    let inner_match_arm = quote! {
+            #top_enum_ident::#variant_ident(inner) => {
-                        match #inner_type_ident::parse() {
+                match inner {
-                            #inner_type_ident::Bulk { input } => {
+                    #inner_type::Bulk { input } => {
-                                // Bulk: read and parse Vec<inner_type_ident>
                         let mut reader: Box<dyn std::io::Read> = match input {
                             Some(path) => Box::new(std::fs::File::open(path)?),
                             None => Box::new(std::io::stdin()),
                         };
+
                         let mut buf = String::new();
                         reader.read_to_string(&mut buf)?;
-                                let queries: Vec<#inner_type_ident> = serde_json::from_str(&buf)?;
+                        let queries: Vec<#inner_type> = serde_json::from_str(&buf)?;
 
                         use std::sync::Arc;
                         let client = Arc::new(awc::Client::default());
-                                let api_keys = Arc::new(crate::load_api_keys()?);
+                        let keys = Arc::new(crate::load_api_keys()?);
 
                         const THREADS: usize = 4;
                         let total = queries.len();
-                                let per_thread = total / THREADS;
+                        let per_thread = std::cmp::max(1, total / THREADS);
                         let shared_queries = Arc::new(queries);
 
                         let mut handles = Vec::new();
                         for i in 0..THREADS {
                             let queries = Arc::clone(&shared_queries);
                             let client = Arc::clone(&client);
-                                    let keys = Arc::clone(&api_keys);
+                            let keys = Arc::clone(&keys);
                             let start = i * per_thread;
                             let end = if i == THREADS - 1 { total } else { start + per_thread };
 
                             let handle = std::thread::spawn(move || {
                                 let rt = tokio::runtime::Runtime::new().unwrap();
                                 for q in &queries[start..end] {
-                                            rt.block_on(q.send_all(&client, &keys));
+                                    rt.block_on(q.send_all(&client, &keys)).unwrap();
                                 }
                             });
 
@@ -210,22 +215,11 @@ pub fn alpaca_cli(_attr: TokenStream, item: TokenStream) -> TokenStream {
                         other.send_all(&client, &keys).await?;
                     }
                 }
-                    };
+            }
+        }
+    }).collect();
 
-                    // Wrap the outer enum match (Cmd::Alpaca(inner))
+    // Generate the final code
-                    return quote! {
-                        #top_enum_ident::#variant_ident(inner) => {
-                            #inner_match_arm
-                        }
-                    };
-                }
-            }
-        }
-
-        panic!("Each outer enum variant must be a tuple variant like `Alpaca(AlpacaCmd)`");
-    });
-
-    // Generate the final program
     let expanded = quote! {
         use clap::Parser;
         use std::io::Read;
@@ -237,35 +231,19 @@ pub fn alpaca_cli(_attr: TokenStream, item: TokenStream) -> TokenStream {
         async fn main() -> Result<(), Box<dyn std::error::Error>> {
             let cmd = #top_enum_ident::parse();
             match cmd {
-                #(#outer_match_arms),*
+                #(#match_arms),*
             }
             Ok(())
         }
 
-        // Helper trait to unify async calls on sub-commands
+        // Trait for dispatching API calls
-        trait ApiDispatch {
+        pub trait ApiDispatch {
             fn send_all(
                 &self,
                 client: &awc::Client,
                 keys: &std::collections::HashMap<String, crate::Keys>,
             ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<(), Box<dyn std::error::Error>>> + Send>>;
         }
-
-        // Implement ApiDispatch for every subcommand variant
-        #(impl ApiDispatch for #top_enum_ident {
-            fn send_all(
-                &self,
-                client: &awc::Client,
-                keys: &std::collections::HashMap<String, crate::Keys>,
-            ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<(), Box<dyn std::error::Error>>> + Send>> {
-                Box::pin(async move {
-                    match self {
-                        #(#outer_match_arms),*
-                    }
-                    Ok(())
-                })
-            }
-        })*
     };
 
     TokenStream::from(expanded)