Fix gql renaming

Author: uselessgoddess

codegen-for-async-graphql-renderer/src/document_wrapper/type_wrapper.rs

@@ -159,7 +159,7 @@ pub trait SupportType: RenderType {
     fn code_type_name(&self) -> String {
         let name = self.type_name();
         match name.as_str() {
-            "Bool" | "Boolean" => "bool".to_string(),
+            "Boolean" => "bool".to_string(),
             "Int" => "i32".to_string(),
             "Float" => "f64".to_string(),
             "ID" => "ID".to_string(),
@@ -179,7 +179,9 @@ pub trait SupportTypeName: SupportType + UseContext {
         let names = self.context().scalar_names();
         let name = &self.gql_type_name();
         match name.as_str() {
-            "String" | "Bool" | "Int" | "Float" | "ID" => Some(ScalarTypeOnScalar::DefaultScalar),
+            "String" | "Boolean" | "Int" | "Float" | "ID" => {
+                Some(ScalarTypeOnScalar::DefaultScalar)
+            }
             _ => {
                 if names.iter().any(|f| f == name) {
                     Some(ScalarTypeOnScalar::CustomScalar)

codegen-for-async-graphql-renderer/src/renderer/object_type/renderer.rs

@@ -41,8 +41,8 @@ impl<'a, 'b> Renderer<'a, 'b> {
     }
 
     fn token_stream(&self) -> TokenStream {
-        let name = self.gql_name_token();
-        let rust_name = self.name_token();
+        let gql_name = self.gql_name_token();
+        let name = self.name_token();
         let fields = self.custom_fields_token();
         let struct_properties = self.struct_properties_token();
         let scalar_fields_token = self.scalar_fields_token();
@@ -51,8 +51,8 @@ impl<'a, 'b> Renderer<'a, 'b> {
 
         Self::object_type_code(
             &dependencies,
+            &gql_name,
             &name,
-            &rust_name,
             &struct_properties,
             &fields,
             &scalar_fields_token,
@@ -72,8 +72,7 @@ impl<'a, 'b> Renderer<'a, 'b> {
     }
 
     fn gql_name_token(&self) -> TokenStream {
-        let name = Ident::new(&self.wrapper_object.gql_name(), Span::call_site());
-        quote!(#name)
+        self.wrapper_object.gql_name().to_token_stream()
     }
 
     fn name_token(&self) -> TokenStream {
@@ -113,18 +112,14 @@ impl<'a, 'b> Renderer<'a, 'b> {
         fields: &TokenStream,
         scalar_fields_token: &TokenStream,
     ) -> TokenStream {
-        let gql: TokenStream = format!(r#"#[graphql(name = "{}")]"#, gql_name.to_string())
-            .parse()
-            .unwrap();
         quote!(
             #dependencies
 
             // TODO: add comment
             #[derive(Debug)]
             pub struct #name;
 
-            #[Object]
-            #gql
+            #[Object(name = #gql_name)]
             impl #name {
                 #fields
                 #scalar_fields_token