Merge pull request #390 from dingxiangfei2009/annotate-variable-fields

Annotate variable struct fields too

Author: tomhoule

graphql_client/tests/input_object_variables.rs

@@ -117,3 +117,32 @@ fn indirectly_recursive_input_objects_can_be_constructed() {
         })),
     };
 }
+
+#[derive(GraphQLQuery)]
+#[graphql(
+    query_path = "tests/input_object_variables/input_object_variables_query.graphql",
+    schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
+    variables_derives = "Default",
+    response_derives = "Debug, PartialEq"
+)]
+pub struct RustNameQuery;
+
+#[test]
+fn rust_name_correctly_mapped() {
+    use rust_name_query::*;
+    let value = serde_json::to_value(&Variables {
+        extern_: Some("hello".to_owned()),
+        msg: <_>::default(),
+    })
+    .unwrap();
+    assert_eq!(
+        value
+            .as_object()
+            .unwrap()
+            .get("extern")
+            .unwrap()
+            .as_str()
+            .unwrap(),
+        "hello"
+    );
+}

graphql_client/tests/input_object_variables/input_object_variables_query.graphql

@@ -15,3 +15,9 @@ query IndirectlyRecursiveInputQuery($input: IndirectlyRecursiveInput!) {
 query InputCaseTestsQuery($input: CaseTestInput!) {
   testQueryCase(caseTestInput: $input)
 }
+
+query RustNameQuery($msg: Message, $extern: String) {
+  echo(message: $msg, extern: $extern) {
+    result
+  }
+}

graphql_client/tests/input_object_variables/input_object_variables_schema.graphql

@@ -49,7 +49,7 @@ type CaseTestResult {
 }
 
 type InputObjectVariablesQuery {
-  echo(message: Message!, options: Options = { pgpSignature: true }): EchoResult
+  echo(message: Message!, options: Options = { pgpSignature: true }, extern: String = ""): EchoResult
   testQueryCase(caseTestInput: CaseTestInput!): CaseTestResult
   saveRecursiveInput(recursiveInput: RecursiveInput!): Category
 }

graphql_client_codegen/src/codegen.rs

@@ -133,11 +133,9 @@ fn generate_variable_struct_field(
     query: &BoundQuery<'_>,
 ) -> TokenStream {
     let snake_case_name = variable.name.to_snake_case();
-    let ident = Ident::new(
-        &shared::keyword_replace(&snake_case_name),
-        Span::call_site(),
-    );
-    let annotation = shared::field_rename_annotation(&variable.name, &snake_case_name);
+    let safe_name = shared::keyword_replace(&snake_case_name);
+    let ident = Ident::new(&safe_name, Span::call_site());
+    let annotation = shared::field_rename_annotation(&variable.name, &safe_name);
     let r#type = render_variable_field_type(variable, options, query);
 
     quote::quote!(#annotation pub #ident : #r#type)