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 naming collisions for Selection and ParentType #2754

Merged
merged 2 commits into from
Jan 5, 2023
Merged

Fix naming collisions for Selection and ParentType #2754

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
ef2b618
Fix namespacing of Selection and ParentType
AnthonyMDev Jan 5, 2023
43b1829
Regenerate example
AnthonyMDev Jan 5, 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
28 changes: 14 additions & 14 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 @@ -32,8 +32,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Unions.ClassroomPet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Unions.ClassroomPet }
public static var __selections: [ApolloAPI.Selection] { [
.inlineFragment(AsAnimal.self),
.inlineFragment(AsPet.self),
.inlineFragment(AsWarmBlooded.self),
Expand All @@ -56,8 +56,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [ApolloAPI.Selection] { [
.field("species", String.self),
] }

Expand All @@ -71,8 +71,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [ApolloAPI.Selection] { [
.field("humanName", String?.self),
] }

Expand All @@ -86,8 +86,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded }
public static var __selections: [ApolloAPI.Selection] { [
.field("laysEggs", Bool.self),
] }

Expand All @@ -102,8 +102,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Cat }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat }
public static var __selections: [ApolloAPI.Selection] { [
.field("bodyTemperature", Int.self),
.field("isJellicle", Bool.self),
] }
Expand All @@ -122,8 +122,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Bird }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird }
public static var __selections: [ApolloAPI.Selection] { [
.field("wingspan", Double.self),
] }

Expand All @@ -140,8 +140,8 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.PetRock }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.PetRock }
public static var __selections: [ApolloAPI.Selection] { [
.field("favoriteToy", String.self),
] }

Expand Down
12 changes: 6 additions & 6 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 @@ -19,8 +19,8 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Unions.ClassroomPet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Unions.ClassroomPet }
public static var __selections: [ApolloAPI.Selection] { [
.inlineFragment(AsAnimal.self),
] }

Expand All @@ -33,8 +33,8 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [ApolloAPI.Selection] { [
.field("height", Height.self),
] }

Expand All @@ -47,8 +47,8 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Height }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Height }
public static var __selections: [ApolloAPI.Selection] { [
.field("inches", Int.self),
] }

Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -14,8 +14,8 @@ public struct DogFragment: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Dog }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Dog }
public static var __selections: [ApolloAPI.Selection] { [
.field("species", String.self),
] }

Expand Down
8 changes: 4 additions & 4 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 @@ -17,8 +17,8 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [ApolloAPI.Selection] { [
.field("height", Height.self),
] }

Expand All @@ -31,8 +31,8 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Height }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Height }
public static var __selections: [ApolloAPI.Selection] { [
.field("meters", Int.self),
] }

Expand Down
8 changes: 4 additions & 4 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 @@ -19,8 +19,8 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [ApolloAPI.Selection] { [
.field("humanName", String?.self),
.field("favoriteToy", String.self),
.field("owner", Owner?.self),
Expand All @@ -37,8 +37,8 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Human }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Human }
public static var __selections: [ApolloAPI.Selection] { [
.field("firstName", String.self),
] }

Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -15,8 +15,8 @@ public struct WarmBloodedDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded }
public static var __selections: [ApolloAPI.Selection] { [
.field("bodyTemperature", Int.self),
.fragment(HeightInMeters.self),
] }
Expand Down
12 changes: 6 additions & 6 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 @@ -12,8 +12,8 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Query }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Query }
public static var __selections: [ApolloAPI.Selection] { [
.field("allAnimals", [AllAnimal].self),
] }

Expand All @@ -29,8 +29,8 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [ApolloAPI.Selection] { [
.field("species", String.self),
.field("skinCovering", GraphQLEnum<SkinCovering>?.self),
.inlineFragment(AsBird.self),
Expand All @@ -57,8 +57,8 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation {
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Bird }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird }
public static var __selections: [ApolloAPI.Selection] { [
.field("wingspan", Double.self),
] }

Expand Down
8 changes: 4 additions & 4 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 @@ -17,8 +17,8 @@ public struct PetDetailsMutation: AnimalKingdomAPI.MutableSelectionSet, Fragment
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [ApolloAPI.Selection] { [
.field("owner", Owner?.self),
] }

Expand All @@ -34,8 +34,8 @@ public struct PetDetailsMutation: AnimalKingdomAPI.MutableSelectionSet, Fragment
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Human }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Human }
public static var __selections: [ApolloAPI.Selection] { [
.field("firstName", String.self),
] }

Expand Down
8 changes: 4 additions & 4 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 @@ -29,8 +29,8 @@ public class PetSearchLocalCacheMutation: LocalCacheMutation {
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Query }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Query }
public static var __selections: [ApolloAPI.Selection] { [
.field("pets", [Pet].self, arguments: ["filters": .variable("filters")]),
] }

Expand All @@ -46,8 +46,8 @@ public class PetSearchLocalCacheMutation: LocalCacheMutation {
public var __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [ApolloAPI.Selection] { [
.field("id", ID.self),
.field("humanName", String?.self),
] }
Expand Down
12 changes: 6 additions & 6 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 @@ -7,15 +7,15 @@ public class PetAdoptionMutation: GraphQLMutation {
public static let operationName: String = "PetAdoptionMutation"
public static let document: ApolloAPI.DocumentType = .notPersisted(
definition: .init(
"""
#"""
mutation PetAdoptionMutation($input: PetAdoptionInput!) {
adoptPet(input: $input) {
__typename
id
humanName
}
}
"""
"""#
))

public var input: PetAdoptionInput
Expand All @@ -30,8 +30,8 @@ public class PetAdoptionMutation: GraphQLMutation {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Mutation }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Mutation }
public static var __selections: [ApolloAPI.Selection] { [
.field("adoptPet", AdoptPet.self, arguments: ["input": .variable("input")]),
] }

Expand All @@ -44,8 +44,8 @@ public class PetAdoptionMutation: GraphQLMutation {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet }
public static var __selections: [ApolloAPI.Selection] { [
.field("id", ID.self),
.field("humanName", String?.self),
] }
Expand Down
16 changes: 8 additions & 8 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 @@ -7,7 +7,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
public static let operationName: String = "AllAnimalsCCN"
public static let document: ApolloAPI.DocumentType = .notPersisted(
definition: .init(
"""
#"""
query AllAnimalsCCN {
allAnimals {
__typename
Expand All @@ -18,7 +18,7 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
}
}
}
"""
"""#
))

public init() {}
Expand All @@ -27,8 +27,8 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Query }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Query }
public static var __selections: [ApolloAPI.Selection] { [
.field("allAnimals", [AllAnimal].self),
] }

Expand All @@ -41,8 +41,8 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal }
public static var __selections: [ApolloAPI.Selection] { [
.field("height", Height?.self),
] }

Expand All @@ -55,8 +55,8 @@ public class AllAnimalsCCNQuery: GraphQLQuery {
public let __data: DataDict
public init(data: DataDict) { __data = data }

public static var __parentType: ParentType { AnimalKingdomAPI.Objects.Height }
public static var __selections: [Selection] { [
public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Height }
public static var __selections: [ApolloAPI.Selection] { [
.field("feet", Int?.self),
.field("inches", Int.self),
] }
Expand Down
Loading