(CLI) Write the whole response into schema.json

Author: tomhoule

graphql_client_cli/src/main.rs

@@ -85,7 +85,7 @@ fn introspect_schema(location: String, output: Option<PathBuf>) -> Result<(), fa
     }
 
     let json: graphql_client::GraphQLResponse<introspection_query::ResponseData> = res.json()?;
-    let json = serde_json::to_string(&json.data.expect("data field"))?;
+    let json = serde_json::to_string(&json)?;
 
     write!(out, "{}", json)?;
 

graphql_query_derive/src/lib.rs

@@ -65,6 +65,11 @@ fn read_file(
     Ok(out)
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+pub(crate) struct FullResponse<T> {
+    data: T,
+}
+
 fn impl_gql_query(input: &syn::DeriveInput) -> Result<TokenStream, failure::Error> {
     let cargo_manifest_dir =
         ::std::env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR env variable is defined");
@@ -92,8 +97,8 @@ fn impl_gql_query(input: &syn::DeriveInput) -> Result<TokenStream, failure::Erro
             schema::Schema::from(s)
         }
         "json" => {
-            let parsed: introspection_response::IntrospectionResponse = ::serde_json::from_str(&schema_string)?;
-            schema::Schema::from(parsed)
+            let parsed: FullResponse<introspection_response::IntrospectionResponse> = ::serde_json::from_str(&schema_string)?;
+            schema::Schema::from(parsed.data)
         }
         extension => panic!("Unsupported extension for the GraphQL schema: {} (only .json and .graphql are supported)", extension)
     };