fix: remove duplicate and fix __typename in Interface and Union (#3318)

Author: MedHeikelBouzayene

src/core/blueprint/index.rs

@@ -87,9 +87,14 @@ impl Index {
         if type_name == type_or_interface {
             return true;
         }
-
         if let Some((Definition::Object(obj), _)) = self.map.get(type_name) {
-            obj.implements.contains(type_or_interface)
+            if obj.implements.contains(type_or_interface) {
+                true
+            } else if let Some((Definition::Union(union), _)) = self.map.get(type_or_interface) {
+                union.types.contains(type_name)
+            } else {
+                false
+            }
         } else {
             false
         }

src/core/jit/builder.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::ops::Deref;
 use std::sync::Arc;
 
@@ -135,10 +135,22 @@ impl<'a> Builder<'a> {
         fragments: &HashMap<&str, &FragmentDefinition>,
     ) -> Vec<Field<Value>> {
         let mut fields = vec![];
+        let mut fragments_fields = vec![];
+        let mut visited = HashSet::new();
 
         for selection in &selection.items {
             match &selection.node {
                 Selection::Field(Positioned { node: gql_field, .. }) => {
+                    let field_name = gql_field.name.node.as_str();
+                    let output_name = gql_field
+                        .alias
+                        .as_ref()
+                        .map(|a| a.node.as_str())
+                        .unwrap_or(field_name);
+                    if visited.contains(output_name) {
+                        continue;
+                    }
+                    visited.insert(output_name);
                     let conditions = self.include(&gql_field.directives);
 
                     // Skip fields based on GraphQL's skip/include conditions
@@ -163,7 +175,6 @@ impl<'a> Builder<'a> {
                     }
 
                     let (include, skip) = conditions.into_variable_tuple();
-                    let field_name = gql_field.name.node.as_str();
                     let request_args = gql_field
                         .arguments
                         .iter()
@@ -229,11 +240,7 @@ impl<'a> Builder<'a> {
                             selection: child_fields,
                             parent_fragment,
                             name: field_name.to_string(),
-                            output_name: gql_field
-                                .alias
-                                .as_ref()
-                                .map(|a| a.node.to_string())
-                                .unwrap_or(field_name.to_owned()),
+                            output_name: output_name.to_string(),
                             ir,
                             is_enum: self.index.type_is_enum(type_of.name()),
                             type_of,
@@ -251,10 +258,10 @@ impl<'a> Builder<'a> {
                         let typename_field = Field {
                             id: FieldId::new(self.field_id.next()),
                             name: field_name.to_string(),
-                            output_name: field_name.to_string(),
+                            output_name: output_name.to_string(),
                             ir: None,
                             type_of: Type::Named { name: "String".to_owned(), non_null: true },
-                            type_condition: None,
+                            type_condition: Some(type_condition.to_string()),
                             skip,
                             include,
                             args: Vec::new(),
@@ -273,7 +280,7 @@ impl<'a> Builder<'a> {
                     if let Some(fragment) =
                         fragments.get(fragment_spread.fragment_name.node.as_str())
                     {
-                        fields.extend(self.iter(
+                        fragments_fields.extend(self.iter(
                             Some(fragment.type_condition.node.on.node.as_str()),
                             &fragment.selection_set.node,
                             fragment.type_condition.node.on.node.as_str(),
@@ -287,7 +294,7 @@ impl<'a> Builder<'a> {
                         .as_ref()
                         .map(|cond| cond.node.on.node.as_str())
                         .unwrap_or(type_condition);
-                    fields.extend(self.iter(
+                    fragments_fields.extend(self.iter(
                         Some(type_of),
                         &fragment.selection_set.node,
                         type_of,
@@ -296,7 +303,13 @@ impl<'a> Builder<'a> {
                 }
             }
         }
-
+        for field in fragments_fields {
+            if visited.contains(field.output_name.as_str()) {
+                continue;
+            }
+            fields.push(field);
+        }
+        fields.sort_by(|a, b| a.id.cmp(&b.id));
         fields
     }
     #[inline(always)]

src/core/jit/model.rs

@@ -150,7 +150,7 @@ impl ArgId {
     }
 }
 
-#[derive(Clone, PartialEq, Eq, Hash)]
+#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct FieldId(usize);
 
 impl Debug for FieldId {

src/core/jit/transform/graphql.rs

@@ -78,7 +78,8 @@ fn format_selection_set<'a, A: 'a + Display + JsonLikeOwned>(
             let is_this_field_interface = interfaces.contains(field.type_of.name());
             let formatted_selection_fields =
                 format_selection_field(field, &field_name, interfaces, is_this_field_interface);
-            is_typename_requested = is_typename_requested || field_name == "__typename";
+            is_typename_requested = is_typename_requested
+                || (field_name == "__typename" && field.parent_fragment.is_none());
             match &field.parent_fragment {
                 Some(fragment) if is_parent_interface => {
                     fragments_fields

tests/core/snapshots/auth-multiple-complex.md_0.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -15,12 +14,8 @@ snapshot_kind: text
           "__typename": "Dog",
           "bark": "woof"
         },
-        {
-          "__typename": "Cat"
-        },
-        {
-          "__typename": "Bird"
-        }
+        {},
+        {}
       ]
     }
   }

tests/core/snapshots/auth-multiple-complex.md_1.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -11,16 +10,12 @@ snapshot_kind: text
   "body": {
     "data": {
       "animals": [
-        {
-          "__typename": "Dog"
-        },
+        {},
         {
           "__typename": "Cat",
           "meow": "meow"
         },
-        {
-          "__typename": "Bird"
-        }
+        {}
       ]
     }
   }

tests/core/snapshots/auth-multiple-complex.md_2.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -11,12 +10,8 @@ snapshot_kind: text
   "body": {
     "data": {
       "animals": [
-        {
-          "__typename": "Dog"
-        },
-        {
-          "__typename": "Cat"
-        },
+        {},
+        {},
         {
           "__typename": "Bird",
           "tweet": "tweet"

tests/core/snapshots/auth-multiple-complex.md_3.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -11,12 +10,8 @@ snapshot_kind: text
   "body": {
     "data": {
       "animals": [
-        {
-          "__typename": "Dog"
-        },
-        {
-          "__typename": "Cat"
-        },
+        {},
+        {},
         {
           "__typename": "Bird",
           "tweet": "tweet"

tests/core/snapshots/auth-multiple-complex.md_4.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -15,12 +14,8 @@ snapshot_kind: text
           "__typename": "Dog",
           "bark": "woof"
         },
-        {
-          "__typename": "Cat"
-        },
-        {
-          "__typename": "Bird"
-        }
+        {},
+        {}
       ]
     }
   }

tests/core/snapshots/auth-multiple-complex.md_5.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -11,16 +10,12 @@ snapshot_kind: text
   "body": {
     "data": {
       "animals": [
-        {
-          "__typename": "Dog"
-        },
+        {},
         {
           "__typename": "Cat",
           "meow": "meow"
         },
-        {
-          "__typename": "Bird"
-        }
+        {}
       ]
     }
   }