Skip to content

Commit 96217ad

Browse files
authored
Merge pull request #365 from flisky/master
fix: missing keyword rename annotation for input object
2 parents e5c632d + 3d4dc2c commit 96217ad

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

graphql_client_codegen/src/codegen.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ fn render_variable_field_type(
178178
let normalized_name = options
179179
.normalization()
180180
.input_name(variable.type_name(query.schema));
181-
let full_name = Ident::new(normalized_name.as_ref(), Span::call_site());
181+
let safe_name = shared::keyword_replace(normalized_name.clone());
182+
let full_name = Ident::new(safe_name.as_ref(), Span::call_site());
182183

183184
decorate_type(&full_name, &variable.r#type.qualifiers)
184185
}

graphql_client_codegen/src/codegen/inputs.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use super::shared::keyword_replace;
1+
use super::shared::{field_rename_annotation, keyword_replace};
22
use crate::{
33
codegen_options::GraphQLClientCodegenOptions,
44
query::{BoundQuery, UsedTypes},
@@ -22,6 +22,7 @@ pub(super) fn generate_input_object_definitions(
2222

2323
let fields = input.fields.iter().map(|(field_name, field_type)| {
2424
let safe_field_name = keyword_replace(field_name);
25+
let annotation = field_rename_annotation(field_name, safe_field_name.as_ref());
2526
let name_ident = Ident::new(safe_field_name.as_ref(), Span::call_site());
2627
let normalized_field_type_name = options
2728
.normalization()
@@ -38,7 +39,7 @@ pub(super) fn generate_input_object_definitions(
3839
} else {
3940
field_type_tokens
4041
};
41-
quote!(pub #name_ident: #field_type)
42+
quote!(#annotation pub #name_ident: #field_type)
4243
});
4344

4445
quote! {

0 commit comments

Comments
 (0)