add unions

Author: tomhoule

graphql_query_derive/src/schema.rs

@@ -276,8 +276,14 @@ impl ::std::convert::From<graphql_parser::schema::Document> for Schema {
                         schema.scalars.insert(scalar.name);
                     }
                     schema::TypeDefinition::Union(union) => {
-                        let tys: BTreeSet<String> = union.types.into_iter().collect();
-                        schema.unions.insert(union.name, GqlUnion(tys));
+                        let variants: BTreeSet<String> = union.types.into_iter().collect();
+                        schema.unions.insert(
+                            union.name,
+                            GqlUnion {
+                                variants,
+                                description: union.description,
+                            },
+                        );
                     }
                     schema::TypeDefinition::Interface(interface) => {
                         let mut iface = GqlInterface::new(
@@ -374,7 +380,13 @@ impl ::std::convert::From<::introspection_response::IntrospectionResponse> for S
                         .into_iter()
                         .filter_map(|t| t.and_then(|t| t.type_ref.name.clone()))
                         .collect();
-                    schema.unions.insert(name.clone(), GqlUnion(variants));
+                    schema.unions.insert(
+                        name.clone(),
+                        GqlUnion {
+                            description: ty.description.as_ref().map(|d| d.to_owned()),
+                            variants,
+                        },
+                    );
                 }
                 Some(__TypeKind::OBJECT) => {
                     for implementing in ty

graphql_query_derive/src/unions.rs

@@ -6,7 +6,10 @@ use selection::{Selection, SelectionItem};
 use std::collections::BTreeSet;
 
 #[derive(Debug, PartialEq)]
-pub struct GqlUnion(pub BTreeSet<String>);
+pub struct GqlUnion {
+    pub description: Option<String>,
+    pub variants: BTreeSet<String>,
+}
 
 #[derive(Debug, Fail)]
 #[fail(display = "UnionError")]
@@ -109,7 +112,7 @@ impl GqlUnion {
             union_variants(selection, query_context, prefix)?;
 
         variants.extend(
-            self.0
+            self.variants
                 .iter()
                 .filter(|v| used_variants.iter().find(|a| a == v).is_none())
                 .map(|v| {
@@ -158,7 +161,10 @@ mod tests {
         let mut context = QueryContext::new_empty();
         let selection = Selection(fields);
         let prefix = "Meow";
-        let union = GqlUnion(BTreeSet::new());
+        let union = GqlUnion {
+            description: None,
+            variants: BTreeSet::new(),
+        };
 
         context.schema.objects.insert(
             "User".to_string(),
@@ -240,7 +246,10 @@ mod tests {
         let mut context = QueryContext::new_empty();
         let selection = Selection(fields);
         let prefix = "Meow";
-        let union = GqlUnion(BTreeSet::new());
+        let union = GqlUnion {
+            description: None,
+            variants: BTreeSet::new(),
+        };
 
         let result = union.response_for_selection(&context, &selection, &prefix);