Drop-OSS/archived-interactive-clap
1
0
Fork 0
mirror of https://github.com/Drop-OSS/interactive-clap.git synced 2026-01-30 20:55:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed from_cli_arg

Browse Source
This commit is contained in:
FroVolod
2023-02-19 21:22:23 +02:00
parent 0151a59442
commit 9cc2279697
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
interactive-clap-derive/src/derives/interactive_clap/methods/from_cli_for_struct.rs
View File

@@ -106,21 +106,13 @@ fn fields_value(field: &syn::Field) -> proc_macro2::TokenStream {
},
_ => String::new(),
};
if let "Option" = type_string.as_str() {
quote! {
let #ident_field = optional_clap_variant
.as_ref()
.and_then(|clap_variant| clap_variant.#ident_field.clone());
}
} else {
quote! {
let #ident_field = Self::#fn_from_cli_arg(
optional_clap_variant
.clone()
.and_then(|clap_variant| clap_variant.#ident_field),
&context,
)?;
}
quote! {
let #ident_field = Self::#fn_from_cli_arg(
optional_clap_variant
.clone()
.and_then(|clap_variant| clap_variant.#ident_field),
&context,
)?;
}
} else {
quote!()

38
interactive-clap-derive/src/derives/interactive_clap/methods/get_arg_from_cli_for_struct.rs
View File

@@ -60,14 +60,36 @@ pub fn from_cli_arg(ast: &syn::DeriveInput, fields: &syn::Fields) -> Vec<proc_ma
let cli_field_type = super::cli_field_type::cli_field_type(ty);
let fn_input_arg =
syn::Ident::new(&format!("input_{}", &ident_field), Span::call_site());
quote! {
fn #fn_from_cli_arg(
#optional_cli_field_name: #cli_field_type,
context: &#input_context_dir,
) -> color_eyre::eyre::Result<#ty> {
match #optional_cli_field_name {
Some(#ident_field) => Ok(#ident_field),
None => Self::#fn_input_arg(&context),
let type_string = match &ty {
syn::Type::Path(type_path) => match type_path.path.segments.last() {
Some(path_segment) => path_segment.ident.to_string(),
_ => String::new(),
},
_ => String::new(),
};
if let "Option" = type_string.as_str() {
quote! {
fn #fn_from_cli_arg(
#optional_cli_field_name: #cli_field_type,
context: &#input_context_dir,
) -> color_eyre::eyre::Result<#ty> {
match #optional_cli_field_name {
Some(#ident_field) => Ok(Some(#ident_field)),
None => Self::#fn_input_arg(&context),
}
}
}
} else {
quote! {
fn #fn_from_cli_arg(
#optional_cli_field_name: #cli_field_type,
context: &#input_context_dir,
) -> color_eyre::eyre::Result<#ty> {
match #optional_cli_field_name {
Some(#ident_field) => Ok(#ident_field),
None => Self::#fn_input_arg(&context),
}
}
}
}