Merge pull request #214 from upsuper/default-root-type

Use default root operation type names when not specified

Author: tomhoule

graphql_client_codegen/src/codegen.rs

@@ -69,20 +69,16 @@ pub(crate) fn response_for_query(
     }
 
     let response_data_fields = {
-        let opt_root_name = operation.root_name(&context.schema);
-        let root_name: &str = if let Some(root_name) = opt_root_name {
-            root_name
+        let root_name = operation.root_name(&context.schema);
+        let opt_definition = context.schema.objects.get(&root_name);
+        let definition = if let Some(definition) = opt_definition {
+            definition
         } else {
             panic!(
                 "operation type '{:?}' not in schema",
                 operation.operation_type
             );
         };
-        let definition = context
-            .schema
-            .objects
-            .get(&root_name)
-            .expect("schema declaration is invalid");
         let prefix = &operation.name;
         let selection = &operation.selection;
 

graphql_client_codegen/src/operations.rs

@@ -23,14 +23,11 @@ pub struct Operation<'query> {
 }
 
 impl<'query> Operation<'query> {
-    pub(crate) fn root_name<'schema>(
-        &self,
-        schema: &'schema ::schema::Schema,
-    ) -> Option<&'schema str> {
+    pub(crate) fn root_name<'schema>(&self, schema: &'schema ::schema::Schema) -> &'schema str {
         match self.operation_type {
-            OperationType::Query => schema.query_type,
-            OperationType::Mutation => schema.mutation_type,
-            OperationType::Subscription => schema.subscription_type,
+            OperationType::Query => schema.query_type.unwrap_or("Query"),
+            OperationType::Mutation => schema.mutation_type.unwrap_or("Mutation"),
+            OperationType::Subscription => schema.subscription_type.unwrap_or("Subscription"),
         }
     }