Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merged source name generation when shared root is operation root #3073

Merged
merged 2 commits into from
Jun 14, 2023
Merged

Fix merged source name generation when shared root is operation root #3073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e12b80
Re-run codegen
AnthonyMDev Jun 13, 2023
889a958
Fix merged source name generation when shared root is operation root
AnthonyMDev Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions ...ces/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetails.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
"__typename": __typename,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(ClassroomPetDetails.self)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down
8 changes: 4 additions & 4 deletions .../AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetailsCCN.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
"__typename": __typename,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(ClassroomPetDetailsCCN.self)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down Expand Up @@ -95,7 +95,7 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
"inches": inches,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(ClassroomPetDetailsCCN.AsAnimal.Height.self)
]
))
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/DogFragment.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public struct DogFragment: AnimalKingdomAPI.SelectionSet, Fragment {
"species": species,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(DogFragment.self)
]
))
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/HeightInMeters.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
"height": height._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(HeightInMeters.self)
]
))
}
Expand Down Expand Up @@ -64,7 +64,7 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
"meters": meters,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(HeightInMeters.Height.self)
]
))
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/PetDetails.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
"owner": owner._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetDetails.self)
]
))
}
Expand Down Expand Up @@ -74,7 +74,7 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
"firstName": firstName,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetDetails.Owner.self)
]
))
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/WarmBloodedDetails.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public struct WarmBloodedDetails: AnimalKingdomAPI.SelectionSet, Fragment {
"height": height._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self),
ObjectIdentifier(WarmBloodedDetails.self),
ObjectIdentifier(HeightInMeters.self)
]
))
Expand Down
8 changes: 4 additions & 4 deletions ...I/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
"allAnimals": allAnimals._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(AllAnimalsLocalCacheMutation.Data.self)
]
))
}
Expand Down Expand Up @@ -77,7 +77,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
"skinCovering": skinCovering,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(AllAnimalsLocalCacheMutation.Data.AllAnimal.self)
]
))
}
Expand Down Expand Up @@ -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)
]
))
}
Expand Down
4 changes: 2 additions & 2 deletions ...lKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/PetDetailsMutation.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public struct PetDetailsMutation: AnimalKingdomAPI.MutableSelectionSet, Fragment
"owner": owner._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetDetailsMutation.self)
]
))
}
Expand Down Expand Up @@ -70,7 +70,7 @@ public struct PetDetailsMutation: AnimalKingdomAPI.MutableSelectionSet, Fragment
"firstName": firstName,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetDetailsMutation.Owner.self)
]
))
}
Expand Down
4 changes: 2 additions & 2 deletions ...PI/AnimalKingdomAPI/Sources/LocalCacheMutations/PetSearchLocalCacheMutation.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class PetSearchLocalCacheMutation: LocalCacheMutation {
"pets": pets._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetSearchLocalCacheMutation.Data.self)
]
))
}
Expand Down Expand Up @@ -88,7 +88,7 @@ public class PetSearchLocalCacheMutation: LocalCacheMutation {
"humanName": humanName,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetSearchLocalCacheMutation.Data.Pet.self)
]
))
}
Expand Down
4 changes: 2 additions & 2 deletions ...ingdomAPI/AnimalKingdomAPI/Sources/Operations/Mutations/PetAdoptionMutation.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class PetAdoptionMutation: GraphQLMutation {
"adoptPet": adoptPet._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetAdoptionMutation.Data.self)
]
))
}
Expand Down Expand Up @@ -80,7 +80,7 @@ public class PetAdoptionMutation: GraphQLMutation {
"humanName": humanName,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(PetAdoptionMutation.Data.AdoptPet.self)
]
))
}
Expand Down
6 changes: 3 additions & 3 deletions ...alKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsCCNQuery.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
"allAnimals": allAnimals._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(AllAnimalsCCNQuery.Data.self)
]
))
}
Expand Down Expand Up @@ -73,7 +73,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
"height": height._fieldData,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(AllAnimalsCCNQuery.Data.AllAnimal.self)
]
))
}
Expand Down Expand Up @@ -106,7 +106,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
"inches": inches,
],
fulfilledFragments: [
ObjectIdentifier(Self.self)
ObjectIdentifier(AllAnimalsCCNQuery.Data.AllAnimal.Height.self)
]
))
}
Expand Down
Loading