1 files changed, 61 insertions, 29 deletions

diff --git a/src/derives/parser.rs b/src/derives/parser.rs
index 621430f..617857c 100644
--- a/src/derives/parser.rs
+++ b/src/derives/parser.rs
@@ -12,21 +12,24 @@
 // commit#ea76fa1b1b273e65e3b0b1046643715b49bec51f which is licensed under the
 // MIT/Apache 2.0 license.
 
-use crate::{
-    derives::{args, into_app, subcommand},
-    dummies,
-};
-
 use proc_macro2::TokenStream;
 use proc_macro_error::abort_call_site;
 use quote::quote;
+use syn::Ident;
+use syn::Variant;
 use syn::{
-    self, punctuated::Punctuated, token::Comma, Attribute, Data, DataEnum, DataStruct, DeriveInput,
-    Field, Fields, Generics, Ident,
+    self, punctuated::Punctuated, token::Comma, Data, DataStruct, DeriveInput, Field, Fields,
+    Generics,
 };
 
+use crate::derives::{args, into_app, subcommand};
+use crate::dummies;
+use crate::item::Item;
+use crate::item::Name;
+
 pub fn derive_parser(input: &DeriveInput) -> TokenStream {
     let ident = &input.ident;
+    let pkg_name = std::env::var("CARGO_PKG_NAME").ok().unwrap_or_default();
 
     match input.data {
         Data::Struct(DataStruct {
@@ -34,41 +37,70 @@ pub fn derive_parser(input: &DeriveInput) -> TokenStream {
             ..
         }) => {
             dummies::parser_struct(ident);
-            gen_for_struct(ident, &input.generics, &fields.named, &input.attrs)
+
+            let name = Name::Assigned(quote!(#pkg_name));
+            let item = Item::from_args_struct(input, name);
+            let fields = fields
+                .named
+                .iter()
+                .map(|field| {
+                    let item = Item::from_args_field(field, item.casing(), item.env_casing());
+                    (field, item)
+                })
+                .collect::<Vec<_>>();
+            gen_for_struct(&item, ident, &input.generics, &fields)
         }
         Data::Struct(DataStruct {
             fields: Fields::Unit,
             ..
         }) => {
             dummies::parser_struct(ident);
-            gen_for_struct(
-                ident,
-                &input.generics,
-                &Punctuated::<Field, Comma>::new(),
-                &input.attrs,
-            )
+
+            let name = Name::Assigned(quote!(#pkg_name));
+            let item = Item::from_args_struct(input, name);
+            let fields = Punctuated::<Field, Comma>::new();
+            let fields = fields
+                .iter()
+                .map(|field| {
+                    let item = Item::from_args_field(field, item.casing(), item.env_casing());
+                    (field, item)
+                })
+                .collect::<Vec<_>>();
+            gen_for_struct(&item, ident, &input.generics, &fields)
         }
         Data::Enum(ref e) => {
             dummies::parser_enum(ident);
-            gen_for_enum(ident, &input.generics, &input.attrs, e)
+
+            let name = Name::Assigned(quote!(#pkg_name));
+            let item = Item::from_subcommand_enum(input, name);
+            let variants = e
+                .variants
+                .iter()
+                .map(|variant| {
+                    let item =
+                        Item::from_subcommand_variant(variant, item.casing(), item.env_casing());
+                    (variant, item)
+                })
+                .collect::<Vec<_>>();
+            gen_for_enum(&item, ident, &input.generics, &variants)
         }
         _ => abort_call_site!("`#[derive(Parser)]` only supports non-tuple structs and enums"),
     }
 }
 
 fn gen_for_struct(
-    name: &Ident,
+    item: &Item,
+    item_name: &Ident,
     generics: &Generics,
-    fields: &Punctuated<Field, Comma>,
-    attrs: &[Attribute],
+    fields: &[(&Field, Item)],
 ) -> TokenStream {
-    let into_app = into_app::gen_for_struct(name, generics, attrs);
-    let args = args::gen_for_struct(name, generics, fields, attrs);
-
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
+    let into_app = into_app::gen_for_struct(item, item_name, generics);
+    let args = args::gen_for_struct(item, item_name, generics, fields);
+
     quote! {
-        impl #impl_generics clap::Parser for #name #ty_generics #where_clause {}
+        impl #impl_generics clap::Parser for #item_name #ty_generics #where_clause {}
 
         #into_app
         #args
@@ -76,18 +108,18 @@ fn gen_for_struct(
 }
 
 fn gen_for_enum(
-    name: &Ident,
+    item: &Item,
+    item_name: &Ident,
     generics: &Generics,
-    attrs: &[Attribute],
-    e: &DataEnum,
+    variants: &[(&Variant, Item)],
 ) -> TokenStream {
-    let into_app = into_app::gen_for_enum(name, generics, attrs);
-    let subcommand = subcommand::gen_for_enum(name, generics, attrs, e);
-
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
+    let into_app = into_app::gen_for_enum(item, item_name, generics);
+    let subcommand = subcommand::gen_for_enum(item, item_name, generics, variants);
+
     quote! {
-        impl #impl_generics clap::Parser for #name #ty_generics #where_clause {}
+        impl #impl_generics clap::Parser for #item_name #ty_generics #where_clause {}
 
         #into_app
         #subcommand