Fix merged source name generation when shared root is operation root …

…(#3073)
apollographql · Jun 14, 2023 · ff49bec · ff49bec
1 parent f64927c
commit ff49bec
Show file tree

Hide file tree

Showing 73 changed files with 504 additions and 321 deletions.
diff --git a/...ces/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetails.graphql.swift b/...ces/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetails.graphql.swift
@@ -58,7 +58,7 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
         "__typename": __typename,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self)
+        ObjectIdentifier(ClassroomPetDetails.self)
       ]
     ))
   }
@@ -88,8 +88,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "species": species,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetails.self)
+          ObjectIdentifier(ClassroomPetDetails.self),
+          ObjectIdentifier(ClassroomPetDetails.AsAnimal.self)
         ]
       ))
     }
@@ -120,8 +120,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "humanName": humanName,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetails.self)
+          ObjectIdentifier(ClassroomPetDetails.self),
+          ObjectIdentifier(ClassroomPetDetails.AsPet.self)
         ]
       ))
     }
@@ -155,8 +155,9 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "species": species,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetails.self)
+          ObjectIdentifier(ClassroomPetDetails.self),
+          ObjectIdentifier(ClassroomPetDetails.AsWarmBlooded.self),
+          ObjectIdentifier(ClassroomPetDetails.AsAnimal.self)
         ]
       ))
     }
@@ -199,8 +200,11 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "laysEggs": laysEggs,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetails.self)
+          ObjectIdentifier(ClassroomPetDetails.self),
+          ObjectIdentifier(ClassroomPetDetails.AsCat.self),
+          ObjectIdentifier(ClassroomPetDetails.AsAnimal.self),
+          ObjectIdentifier(ClassroomPetDetails.AsPet.self),
+          ObjectIdentifier(ClassroomPetDetails.AsWarmBlooded.self)
         ]
       ))
     }
@@ -239,8 +243,11 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "laysEggs": laysEggs,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetails.self)
+          ObjectIdentifier(ClassroomPetDetails.self),
+          ObjectIdentifier(ClassroomPetDetails.AsBird.self),
+          ObjectIdentifier(ClassroomPetDetails.AsAnimal.self),
+          ObjectIdentifier(ClassroomPetDetails.AsPet.self),
+          ObjectIdentifier(ClassroomPetDetails.AsWarmBlooded.self)
         ]
       ))
     }
@@ -273,8 +280,9 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "humanName": humanName,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetails.self)
+          ObjectIdentifier(ClassroomPetDetails.self),
+          ObjectIdentifier(ClassroomPetDetails.AsPetRock.self),
+          ObjectIdentifier(ClassroomPetDetails.AsPet.self)
         ]
       ))
     }

diff --git a/.../AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetailsCCN.graphql.swift b/.../AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetailsCCN.graphql.swift
@@ -35,7 +35,7 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
         "__typename": __typename,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self)
+        ObjectIdentifier(ClassroomPetDetailsCCN.self)
       ]
     ))
   }
@@ -65,8 +65,8 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
           "height": height._fieldData,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self),
-          ObjectIdentifier(ClassroomPetDetailsCCN.self)
+          ObjectIdentifier(ClassroomPetDetailsCCN.self),
+          ObjectIdentifier(ClassroomPetDetailsCCN.AsAnimal.self)
         ]
       ))
     }
@@ -95,7 +95,7 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
             "inches": inches,
           ],
           fulfilledFragments: [
-            ObjectIdentifier(Self.self)
+            ObjectIdentifier(ClassroomPetDetailsCCN.AsAnimal.Height.self)
           ]
         ))
       }

diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/DogFragment.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/DogFragment.graphql.swift
@@ -31,7 +31,7 @@ public struct DogFragment: AnimalKingdomAPI.SelectionSet, Fragment {
         "species": species,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self)
+        ObjectIdentifier(DogFragment.self)
       ]
     ))
   }

diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/HeightInMeters.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/HeightInMeters.graphql.swift
@@ -35,7 +35,7 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
         "height": height._fieldData,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self)
+        ObjectIdentifier(HeightInMeters.self)
       ]
     ))
   }
@@ -64,7 +64,7 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
           "meters": meters,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(HeightInMeters.Height.self)
         ]
       ))
     }

diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/PetDetails.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/PetDetails.graphql.swift
@@ -45,7 +45,7 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
         "owner": owner._fieldData,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self)
+        ObjectIdentifier(PetDetails.self)
       ]
     ))
   }
@@ -74,7 +74,7 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
           "firstName": firstName,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(PetDetails.Owner.self)
         ]
       ))
     }

diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/WarmBloodedDetails.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/WarmBloodedDetails.graphql.swift
@@ -44,7 +44,7 @@ public struct WarmBloodedDetails: AnimalKingdomAPI.SelectionSet, Fragment {
         "height": height._fieldData,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self),
+        ObjectIdentifier(WarmBloodedDetails.self),
         ObjectIdentifier(HeightInMeters.self)
       ]
     ))

diff --git a/...I/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/...I/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift
@@ -31,7 +31,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
           "allAnimals": allAnimals._fieldData,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(AllAnimalsLocalCacheMutation.Data.self)
         ]
       ))
     }
@@ -77,7 +77,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
             "skinCovering": skinCovering,
           ],
           fulfilledFragments: [
-            ObjectIdentifier(Self.self)
+            ObjectIdentifier(AllAnimalsLocalCacheMutation.Data.AllAnimal.self)
           ]
         ))
       }
@@ -121,8 +121,8 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
               "skinCovering": skinCovering,
             ],
             fulfilledFragments: [
-              ObjectIdentifier(Self.self),
-              ObjectIdentifier(AllAnimal.self)
+              ObjectIdentifier(AllAnimalsLocalCacheMutation.Data.AllAnimal.self),
+              ObjectIdentifier(AllAnimalsLocalCacheMutation.Data.AllAnimal.AsBird.self)
             ]
           ))
         }

diff --git a/...lKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/PetDetailsMutation.graphql.swift b/...lKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/PetDetailsMutation.graphql.swift
@@ -38,7 +38,7 @@ public struct PetDetailsMutation: AnimalKingdomAPI.MutableSelectionSet, Fragment
         "owner": owner._fieldData,
       ],
       fulfilledFragments: [
-        ObjectIdentifier(Self.self)
+        ObjectIdentifier(PetDetailsMutation.self)
       ]
     ))
   }
@@ -70,7 +70,7 @@ public struct PetDetailsMutation: AnimalKingdomAPI.MutableSelectionSet, Fragment
           "firstName": firstName,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(PetDetailsMutation.Owner.self)
         ]
       ))
     }

diff --git a/...PI/AnimalKingdomAPI/Sources/LocalCacheMutations/PetSearchLocalCacheMutation.graphql.swift b/...PI/AnimalKingdomAPI/Sources/LocalCacheMutations/PetSearchLocalCacheMutation.graphql.swift
@@ -48,7 +48,7 @@ public class PetSearchLocalCacheMutation: LocalCacheMutation {
           "pets": pets._fieldData,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(PetSearchLocalCacheMutation.Data.self)
         ]
       ))
     }
@@ -88,7 +88,7 @@ public class PetSearchLocalCacheMutation: LocalCacheMutation {
             "humanName": humanName,
           ],
           fulfilledFragments: [
-            ObjectIdentifier(Self.self)
+            ObjectIdentifier(PetSearchLocalCacheMutation.Data.Pet.self)
           ]
         ))
       }

diff --git a/...ingdomAPI/AnimalKingdomAPI/Sources/Operations/Mutations/PetAdoptionMutation.graphql.swift b/...ingdomAPI/AnimalKingdomAPI/Sources/Operations/Mutations/PetAdoptionMutation.graphql.swift
@@ -46,7 +46,7 @@ public class PetAdoptionMutation: GraphQLMutation {
           "adoptPet": adoptPet._fieldData,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(PetAdoptionMutation.Data.self)
         ]
       ))
     }
@@ -80,7 +80,7 @@ public class PetAdoptionMutation: GraphQLMutation {
             "humanName": humanName,
           ],
           fulfilledFragments: [
-            ObjectIdentifier(Self.self)
+            ObjectIdentifier(PetAdoptionMutation.Data.AdoptPet.self)
           ]
         ))
       }

diff --git a/...alKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsCCNQuery.graphql.swift b/...alKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsCCNQuery.graphql.swift
@@ -43,7 +43,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
           "allAnimals": allAnimals._fieldData,
         ],
         fulfilledFragments: [
-          ObjectIdentifier(Self.self)
+          ObjectIdentifier(AllAnimalsCCNQuery.Data.self)
         ]
       ))
     }
@@ -73,7 +73,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
             "height": height._fieldData,
           ],
           fulfilledFragments: [
-            ObjectIdentifier(Self.self)
+            ObjectIdentifier(AllAnimalsCCNQuery.Data.AllAnimal.self)
           ]
         ))
       }
@@ -106,7 +106,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
               "inches": inches,
             ],
             fulfilledFragments: [
-              ObjectIdentifier(Self.self)
+              ObjectIdentifier(AllAnimalsCCNQuery.Data.AllAnimal.Height.self)
             ]
           ))
         }