Merge pull request #39 from tomhoule/wasm

Fix generated module imports

Author: tomhoule

graphql_query_derive/src/introspection_response.rs

@@ -223,74 +223,74 @@ pub struct TypeRef {
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfTypeOfTypeOfTypeOfTypeOfTypeOfTypeOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfTypeOfTypeOfTypeOfTypeOfTypeOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
-    of_type: Option<TypeRefOfTypeOfTypeOfTypeOfTypeOfTypeOfTypeOfType>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
+    pub of_type: Option<TypeRefOfTypeOfTypeOfTypeOfTypeOfTypeOfTypeOfType>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfTypeOfTypeOfTypeOfTypeOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
-    of_type: Option<TypeRefOfTypeOfTypeOfTypeOfTypeOfTypeOfType>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
+    pub of_type: Option<TypeRefOfTypeOfTypeOfTypeOfTypeOfTypeOfType>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfTypeOfTypeOfTypeOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
-    of_type: Option<TypeRefOfTypeOfTypeOfTypeOfTypeOfType>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
+    pub of_type: Option<TypeRefOfTypeOfTypeOfTypeOfTypeOfType>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfTypeOfTypeOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
-    of_type: Option<TypeRefOfTypeOfTypeOfTypeOfType>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
+    pub of_type: Option<TypeRefOfTypeOfTypeOfTypeOfType>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfTypeOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
-    of_type: Option<TypeRefOfTypeOfTypeOfType>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
+    pub of_type: Option<TypeRefOfTypeOfTypeOfType>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeRefOfType {
-    kind: Option<__TypeKind>,
-    name: Option<String>,
-    of_type: Option<TypeRefOfTypeOfType>,
+    pub kind: Option<__TypeKind>,
+    pub name: Option<String>,
+    pub of_type: Option<TypeRefOfTypeOfType>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RustIntrospectionQuerySchemaQueryType {
-    name: Option<String>,
+    pub name: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RustIntrospectionQuerySchemaMutationType {
-    name: Option<String>,
+    pub name: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RustIntrospectionQuerySchemaSubscriptionType {
-    name: Option<String>,
+    pub name: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize)]

graphql_query_derive/src/lib.rs

@@ -103,11 +103,13 @@ fn impl_gql_query(input: &syn::DeriveInput) -> Result<TokenStream, failure::Erro
     let schema_output = schema.response_for_query(query)?;
 
     let result = quote!(
-        mod #module_name {
+        pub mod #module_name {
             #![allow(non_camel_case_types)]
             #![allow(non_snake_case)]
             #![allow(dead_code)]
 
+            use serde;
+
             pub const QUERY: &'static str = #query_string;
 
             #schema_output

graphql_query_derive/src/schema.rs

@@ -280,7 +280,11 @@ impl ::std::convert::From<::introspection_response::IntrospectionResponse> for S
         use introspection_response::__TypeKind;
 
         let mut schema = Schema::new();
-        let root = src.schema.expect("__Schema is not null");
+        let root = src.schema.expect("__schema is not null");
+
+        schema.query_type = root.query_type.and_then(|ty| ty.name);
+        schema.mutation_type = root.mutation_type.and_then(|ty| ty.name);
+        schema.subscription_type = root.subscription_type.and_then(|ty| ty.name);
 
         // Holds which objects implement which interfaces so we can populate GqlInterface#implemented_by later.
         // It maps interface names to a vec of implementation names.

graphql_query_derive/src/tests/github_schema.graphql

@@ -1,3 +1,8 @@
+schema {
+  query: Query
+  mutation: Mutation
+}
+
 # Autogenerated input type of AcceptTopicSuggestion
 input AcceptTopicSuggestionInput {
   # A unique identifier for the client performing the mutation.