Base object prefixes on path instead of type_

This would have been a problem if two fields in the same object had the
same return type.

Author: tomhoule

graphql_query_derive/src/field_type.rs

@@ -13,7 +13,7 @@ impl FieldType {
     pub fn to_rust(&self, context: &QueryContext, prefix: &str) -> TokenStream {
         match &self {
             FieldType::Named(name) => {
-                let name = Ident::new(&format!("{}{}", prefix, name), Span::call_site());
+                let name = Ident::new(prefix, Span::call_site());
                 quote!(#name)
             }
             FieldType::Optional(inner) => {

graphql_query_derive/src/interfaces.rs

@@ -18,7 +18,7 @@ impl GqlInterface {
         selection: &query::SelectionSet,
         prefix: &str,
     ) -> TokenStream {
-        let name = Ident::new(&format!("{}{}", prefix, self.name), Span::call_site());
+        let name = Ident::new(&prefix, Span::call_site());
         quote! {
             #[derive(Debug, Deserialize)]
             pub struct #name;

graphql_query_derive/src/lib.rs

@@ -27,13 +27,6 @@ use heck::*;
 use proc_macro2::{Ident, Span};
 use schema::Schema;
 
-struct DeriveContext {
-    schema: Schema,
-    structs: BTreeMap<String, TokenStream>,
-    enums: BTreeMap<String, TokenStream>,
-    inputs: BTreeMap<String, TokenStream>,
-}
-
 #[proc_macro_derive(GraphQLQuery, attributes(GraphQLQuery))]
 pub fn graphql_query_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input = TokenStream::from(input);

graphql_query_derive/src/objects.rs

@@ -23,9 +23,8 @@ impl GqlObject {
         selection: &query::SelectionSet,
         prefix: &str,
     ) -> TokenStream {
-        let name = Ident::new(&format!("{}{}", prefix, self.name), Span::call_site());
+        let name = Ident::new(prefix, Span::call_site());
         let fields = self.response_fields_for_selection(query_context, selection, prefix);
-        let prefix = format!("{}{}", prefix, self.name);
         let field_impls = self.field_impls_for_selection(query_context, selection, &prefix);
         quote! {
             #(#field_impls)*
@@ -55,6 +54,7 @@ impl GqlObject {
                         .expect("field found")
                         .type_
                         .inner_name_string();
+                    let prefix = format!("{}{}", prefix, selected.name);
                     query_context.maybe_expand_field(&selected, &ty, &prefix)
                 } else {
                     quote!()
@@ -82,7 +82,7 @@ impl GqlObject {
                         .unwrap()
                         .type_;
                     let name = Ident::new(name, Span::call_site());
-                    let ty = ty.to_rust(query_context, prefix);
+                    let ty = ty.to_rust(query_context, &format!("{}{}", prefix, name));
                     fields.push(quote!(#name: #ty));
                 }
                 query::Selection::FragmentSpread(fragment) => {