Make the introspection query compile

Author: tomhoule

graphql_query_derive/Cargo.toml

@@ -8,7 +8,6 @@ proc-macro = true
 
 [dependencies]
 failure = "*"
-log = "*"
 quote = "^0.6"
 syn = "*"
 proc-macro2 = { version = "*", features = ["nightly"] }

graphql_query_derive/src/codegen.rs

@@ -1,5 +1,4 @@
 use field_type::FieldType;
-use quote::ToTokens;
 use std::collections::BTreeMap;
 
 #[derive(Debug)]

graphql_query_derive/src/enums.rs

@@ -1,5 +1,7 @@
 use proc_macro2::{Ident, Span, TokenStream};
 
+pub const ENUMS_PREFIX: &'static str = "RustEnum_";
+
 #[derive(Debug, PartialEq)]
 pub struct GqlEnum {
     pub name: String,
@@ -14,14 +16,15 @@ impl GqlEnum {
             .map(|v| Ident::new(v, Span::call_site()))
             .collect();
         let variants = &variants;
-        let name_ident = Ident::new(&self.name, Span::call_site());
+        let name_ident = Ident::new(&format!("{}{}", ENUMS_PREFIX, self.name), Span::call_site());
         let constructors: Vec<_> = variants.iter().map(|v| quote!(#name_ident::#v)).collect();
         let constructors = &constructors;
         let variant_str = &self.variants;
 
-        let name = Ident::new(&self.name, Span::call_site());
+        let name = name_ident.clone();
 
         quote! {
+            #[derive(Debug)]
             pub enum #name {
                 #(#variants,)*
                 Other(String),

graphql_query_derive/src/field_type.rs

@@ -1,8 +1,8 @@
 use graphql_parser::schema;
 use proc_macro2::{Ident, Span, TokenStream};
 use query::QueryContext;
-use heck::CamelCase;
 use schema::DEFAULT_SCALARS;
+use enums::ENUMS_PREFIX;
 
 #[derive(Debug, PartialEq)]
 pub enum FieldType {
@@ -14,16 +14,17 @@ pub enum FieldType {
 impl FieldType {
     /// Takes a field type with its name
     pub fn to_rust(&self, context: &QueryContext, prefix: &str) -> TokenStream {
-        println!("converting that to rust: {:?}", self);
         match &self {
             FieldType::Named(name) => {
                 let just_the_prefix = Ident::new(prefix, Span::call_site());
                 let name_string = name.to_string();
 
                 let name = if context.schema.scalars.contains(&name_string) || DEFAULT_SCALARS.iter().find(|elem| elem == &&name_string).is_some()  {
-                    name
+                    name.clone()
+                } else if context.schema.enums.contains_key(&name_string) {
+                    Ident::new(&format!("{}{}", ENUMS_PREFIX, &name_string), Span::call_site())
                 } else {
-                    &just_the_prefix
+                    just_the_prefix
                 };
 
                 quote!(#name)

graphql_query_derive/src/fragments.rs

@@ -0,0 +1,21 @@
+use proc_macro2::{Ident, Span, TokenStream};
+use query::QueryContext;
+use graphql_parser::query::SelectionSet;
+
+#[derive(Debug, PartialEq)]
+pub struct GqlFragment {
+    pub name: String,
+    pub on: String,
+    pub selection: SelectionSet,
+}
+
+impl GqlFragment {
+    pub fn to_rust(&self, context: &QueryContext) -> TokenStream {
+        let name_ident = Ident::new(&self.name, Span::call_site());
+
+        quote!{
+            #[derive(Debug, Deserialize)]
+            pub struct #name_ident;
+        }
+    }
+}

graphql_query_derive/src/interfaces.rs

@@ -1,4 +1,3 @@
-use field_type::FieldType;
 use graphql_parser::query;
 use objects::GqlObjectField;
 use proc_macro2::{Ident, Span, TokenStream};
@@ -14,7 +13,7 @@ pub struct GqlInterface {
 impl GqlInterface {
     pub fn response_for_selection(
         &self,
-        query_context: &QueryContext,
+        _query_context: &QueryContext,
         selection: &query::SelectionSet,
         prefix: &str,
     ) -> TokenStream {