From 6acd55c52735116accdf65f505aaaff13cfcf298 Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Thu, 13 Apr 2023 12:59:50 -0700 Subject: [PATCH 1/7] Update codegen SwiftScripts --- SwiftScripts/Sources/Codegen/main.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SwiftScripts/Sources/Codegen/main.swift b/SwiftScripts/Sources/Codegen/main.swift index 8d2883b67c..b3aa1af257 100644 --- a/SwiftScripts/Sources/Codegen/main.swift +++ b/SwiftScripts/Sources/Codegen/main.swift @@ -55,7 +55,7 @@ struct Codegen: ParsableCommand { // Actually attempt to generate code. try ApolloCodegen.build( with: ApolloCodegenConfiguration( - schemaName: target.moduleName, + schemaNamespace: target.moduleName, input: inputConfig, output: outputConfig, options: target.options(), From ea9ef9a0e7c0cf5be0a3634bcdfdf795371ef6f0 Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Thu, 13 Apr 2023 13:00:08 -0700 Subject: [PATCH 2/7] Fix generated code --- .../AllAnimalsIncludeSkipQuery.graphql.swift | 34 +++++++++---------- .../Operations/Queries/DogQuery.graphql.swift | 10 +++++- ...HeroNameConditionalBothQuery.graphql.swift | 2 +- ...ConditionalBothSeparateQuery.graphql.swift | 2 +- ...ameConditionalExclusionQuery.graphql.swift | 2 +- ...ameConditionalInclusionQuery.graphql.swift | 2 +- ...ficConditionalInclusionQuery.graphql.swift | 2 +- 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index e9e847c3a6..315ca55c03 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -147,7 +147,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator] ) { @@ -215,7 +215,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, - species: String + species: String? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, @@ -306,7 +306,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator] ) { @@ -385,7 +385,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator], bodyTemperature: Int @@ -473,7 +473,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator], humanName: String? = nil, @@ -519,8 +519,8 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public var inches: Int? { __data["inches"] } public init( - relativeSize: GraphQLEnum, - centimeters: Double, + relativeSize: GraphQLEnum? = nil, + centimeters: Double? = nil, feet: Int, inches: Int? = nil ) { @@ -571,7 +571,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator], humanName: String? = nil, @@ -618,8 +618,8 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( feet: Int, inches: Int? = nil, - relativeSize: GraphQLEnum, - centimeters: Double, + relativeSize: GraphQLEnum? = nil, + centimeters: Double? = nil, meters: Int ) { self.init(_dataDict: DataDict(data: [ @@ -673,7 +673,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( isJellicle: Bool, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator], humanName: String? = nil, @@ -720,8 +720,8 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( feet: Int, inches: Int? = nil, - relativeSize: GraphQLEnum, - centimeters: Double, + relativeSize: GraphQLEnum? = nil, + centimeters: Double? = nil, meters: Int ) { self.init(_dataDict: DataDict(data: [ @@ -769,7 +769,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( __typename: String, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator] ) { @@ -821,7 +821,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( wingspan: Double, height: Height, - species: String, + species: String? = nil, skinCovering: GraphQLEnum? = nil, predators: [Predator], humanName: String? = nil, @@ -869,8 +869,8 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public init( feet: Int, inches: Int? = nil, - relativeSize: GraphQLEnum, - centimeters: Double, + relativeSize: GraphQLEnum? = nil, + centimeters: Double? = nil, meters: Int ) { self.init(_dataDict: DataDict(data: [ diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift index 85b71aa3bf..8940df9943 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift @@ -12,6 +12,7 @@ public class DogQuery: GraphQLQuery { allAnimals { __typename id + skinCovering ... on Dog { ...DogFragment } @@ -57,20 +58,24 @@ public class DogQuery: GraphQLQuery { public static var __selections: [ApolloAPI.Selection] { [ .field("__typename", String.self), .field("id", AnimalKingdomAPI.ID.self), + .field("skinCovering", GraphQLEnum?.self), .inlineFragment(AsDog.self), ] } public var id: AnimalKingdomAPI.ID { __data["id"] } + public var skinCovering: GraphQLEnum? { __data["skinCovering"] } public var asDog: AsDog? { _asInlineFragment() } public init( __typename: String, - id: AnimalKingdomAPI.ID + id: AnimalKingdomAPI.ID, + skinCovering: GraphQLEnum? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, "id": id, + "skinCovering": skinCovering, "__fulfilled": Set([ ObjectIdentifier(Self.self) ]) @@ -91,6 +96,7 @@ public class DogQuery: GraphQLQuery { ] } public var id: AnimalKingdomAPI.ID { __data["id"] } + public var skinCovering: GraphQLEnum? { __data["skinCovering"] } public var species: String { __data["species"] } public struct Fragments: FragmentContainer { @@ -102,11 +108,13 @@ public class DogQuery: GraphQLQuery { public init( id: AnimalKingdomAPI.ID, + skinCovering: GraphQLEnum? = nil, species: String ) { self.init(_dataDict: DataDict(data: [ "__typename": AnimalKingdomAPI.Objects.Dog.typename, "id": id, + "skinCovering": skinCovering, "species": species, "__fulfilled": Set([ ObjectIdentifier(Self.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothQuery.graphql.swift index f5a847a0c8..0221cd69cd 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothQuery.graphql.swift @@ -75,7 +75,7 @@ public class HeroNameConditionalBothQuery: GraphQLQuery { public init( __typename: String, - name: String + name: String? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothSeparateQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothSeparateQuery.graphql.swift index f9a0b06c0f..c81c717ce6 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothSeparateQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalBothSeparateQuery.graphql.swift @@ -76,7 +76,7 @@ public class HeroNameConditionalBothSeparateQuery: GraphQLQuery { public init( __typename: String, - name: String + name: String? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalExclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalExclusionQuery.graphql.swift index f95e8aa2f3..2090e18ee2 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalExclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalExclusionQuery.graphql.swift @@ -67,7 +67,7 @@ public class HeroNameConditionalExclusionQuery: GraphQLQuery { public init( __typename: String, - name: String + name: String? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalInclusionQuery.graphql.swift index f69139dbad..1f4ce422d2 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameConditionalInclusionQuery.graphql.swift @@ -67,7 +67,7 @@ public class HeroNameConditionalInclusionQuery: GraphQLQuery { public init( __typename: String, - name: String + name: String? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift index c76a57b794..74b23c6a73 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift @@ -82,7 +82,7 @@ public class HeroNameTypeSpecificConditionalInclusionQuery: GraphQLQuery { public init( __typename: String, - name: String + name: String? = nil ) { self.init(_dataDict: DataDict(data: [ "__typename": __typename, From 39f03be7c698a71f80643b8bb33a777cdbac3ca5 Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Thu, 13 Apr 2023 14:03:30 -0700 Subject: [PATCH 3/7] Add test for bug --- .../SelectionSetTemplateTests.swift | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift index f8389ddf85..faa14c1711 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift @@ -5771,6 +5771,67 @@ class SelectionSetTemplateTests: XCTestCase { expect(actual).to(equalLineByLine(expected, atLine: 1, ignoringExtraLines: true)) } + /// Test for edge case in [#2949](https://github.com/apollographql/apollo-ios/issues/2949) + /// + /// When the `RootEntityType` would have duplicate naming, due to child fields with the same name + /// (or alias), the fully qualified name must be used. In this example, a `RootEntityType` of + /// `Predator.Predator` the first usage of the name `Predator` would be referencing the nearest + /// enclosing type (ie. `TestOperationQuery.Predator.Predator`), so it is looking for another + /// `Predator` type in that scope, which does not exist + /// (ie. `TestOperationQuery.Predator.Predator.Predator`). + /// + /// To correct this we must always use the fully qualified name including the operation name and + /// `Data` objects to ensure we are referring to the correct type. + func test__render_nestedTypeCaseWithNameConflictingWithChildAtQueryRoot__rendersRootEntityTypeWithFullyQualifiedName() throws { + // given + schemaSDL = """ + type Query { + predators: [Animal!] + } + + interface Animal { + species: String! + predators: [Animal!] + } + + interface Pet { + name: String! + } + """ + + document = """ + query TestOperation { + predators { + predators { + ... on Pet { + name + } + } + } + } + """ + + let expected = """ + /// AllAnimal.Predator.AsPet + public struct AsPet: TestSchema.InlineFragment { + public let __data: DataDict + public init(_dataDict: DataDict) { __data = _dataDict } + + public typealias RootEntityType = TestOperationQuery.Data.AllAnimal.Predator + """ + + // when + try buildSubjectAndOperation() + let predators_asPet = try XCTUnwrap( + operation[field: "query"]?[field: "predators"]?[field: "predators"]?[as: "Pet"] + ) + + let actual = subject.render(inlineFragment: predators_asPet) + + // then + expect(actual).to(equalLineByLine(expected, atLine: 1, ignoringExtraLines: true)) + } + // MARK: - Documentation Tests func test__render_nestedSelectionSet__givenSchemaDocumentation_include_hasDocumentation_shouldGenerateDocumentationComment() throws { From 636894a96aee149d9b639c7348fd90c3a706d6d5 Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Thu, 13 Apr 2023 15:34:29 -0700 Subject: [PATCH 4/7] WIP: Refactor templates to use definition --- Apollo.xcodeproj/project.pbxproj | 8 +- Sources/ApolloCodegenLib/IR/IR.swift | 15 ++ .../Templates/FragmentTemplate.swift | 15 +- ...LocalCacheMutationDefinitionTemplate.swift | 16 ++- .../OperationDefinitionTemplate.swift | 15 +- .../IRDefinition+RenderingHelpers.swift | 16 +++ .../Templates/SelectionSetTemplate.swift | 19 +-- ...CacheMutationDefinitionTemplateTests.swift | 36 +++++ .../OperationDefinitionTemplateTests.swift | 38 +++++ .../SelectionSetTemplateTests.swift | 1 + ...ectionSetTemplate_Initializers_Tests.swift | 1 + ...SetTemplate_LocalCacheMutation_Tests.swift | 134 +----------------- ...ionSetTemplate_RenderOperation_Tests.swift | 78 ---------- ...plateString_DeprecationMessage_Tests.swift | 35 +++-- 14 files changed, 173 insertions(+), 254 deletions(-) create mode 100644 Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift delete mode 100644 Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_RenderOperation_Tests.swift diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj index 57b7a22a5e..d7fa7b8aed 100644 --- a/Apollo.xcodeproj/project.pbxproj +++ b/Apollo.xcodeproj/project.pbxproj @@ -198,7 +198,6 @@ DE223C3327221144004A0148 /* IRMatchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE223C2A2721FAD6004A0148 /* IRMatchers.swift */; }; DE2739112769AEBA00B886EF /* SelectionSetTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2739102769AEBA00B886EF /* SelectionSetTemplate.swift */; }; DE296539279B3B8200BF9B49 /* SelectionSetTemplateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE296536279B3B8200BF9B49 /* SelectionSetTemplateTests.swift */; }; - DE29653B279B3B8200BF9B49 /* SelectionSetTemplate_RenderOperation_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE296538279B3B8200BF9B49 /* SelectionSetTemplate_RenderOperation_Tests.swift */; }; DE296BA527A07C37004F571F /* MockMergedSelections.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE296BA427A07C37004F571F /* MockMergedSelections.swift */; }; DE2A20E829032E1F008ADE48 /* VersionChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2A20E729032E1F008ADE48 /* VersionChecker.swift */; }; DE2A20ED29033ABE008ADE48 /* VersionCheckerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2A20EC29033ABE008ADE48 /* VersionCheckerTests.swift */; }; @@ -617,6 +616,7 @@ DE7C183C272A12EB00727031 /* ScopeDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE7C183B272A12EB00727031 /* ScopeDescriptor.swift */; }; DE7C183E272A154400727031 /* IR.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE7C183D272A154400727031 /* IR.swift */; }; DE80003428B5608E00C827BD /* SchemaMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE80003328B5608E00C827BD /* SchemaMetadata.swift */; }; + DE8C51CA29E8B03700E47A64 /* IRDefinition+RenderingHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8C51C929E8B03700E47A64 /* IRDefinition+RenderingHelpers.swift */; }; DE903E1329B7E6D300A74415 /* SelectionSet+JSONInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE903E1229B7E6D300A74415 /* SelectionSet+JSONInitializer.swift */; }; DE903E1729C10B7600A74415 /* FieldSelectionCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE903E1629C10B7600A74415 /* FieldSelectionCollector.swift */; }; DE903E1929CA20FC00A74415 /* TypeCaseConversionPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE903E1829CA20FC00A74415 /* TypeCaseConversionPerformanceTests.swift */; }; @@ -1372,7 +1372,6 @@ DE223C2C2721FCE8004A0148 /* ScopedSelectionSetHashable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScopedSelectionSetHashable.swift; sourceTree = ""; }; DE2739102769AEBA00B886EF /* SelectionSetTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectionSetTemplate.swift; sourceTree = ""; }; DE296536279B3B8200BF9B49 /* SelectionSetTemplateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectionSetTemplateTests.swift; sourceTree = ""; }; - DE296538279B3B8200BF9B49 /* SelectionSetTemplate_RenderOperation_Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectionSetTemplate_RenderOperation_Tests.swift; sourceTree = ""; }; DE296BA427A07C37004F571F /* MockMergedSelections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockMergedSelections.swift; sourceTree = ""; }; DE296BA627A09A11004F571F /* IsEverTrue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IsEverTrue.swift; sourceTree = ""; }; DE2A20E729032E1F008ADE48 /* VersionChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionChecker.swift; sourceTree = ""; }; @@ -1817,6 +1816,7 @@ DE7C183B272A12EB00727031 /* ScopeDescriptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScopeDescriptor.swift; sourceTree = ""; }; DE7C183D272A154400727031 /* IR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IR.swift; sourceTree = ""; }; DE80003328B5608E00C827BD /* SchemaMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchemaMetadata.swift; sourceTree = ""; }; + DE8C51C929E8B03700E47A64 /* IRDefinition+RenderingHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IRDefinition+RenderingHelpers.swift"; sourceTree = ""; }; DE903E1229B7E6D300A74415 /* SelectionSet+JSONInitializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SelectionSet+JSONInitializer.swift"; sourceTree = ""; }; DE903E1629C10B7600A74415 /* FieldSelectionCollector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FieldSelectionCollector.swift; sourceTree = ""; }; DE903E1829CA20FC00A74415 /* TypeCaseConversionPerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeCaseConversionPerformanceTests.swift; sourceTree = ""; }; @@ -2862,7 +2862,6 @@ DE296536279B3B8200BF9B49 /* SelectionSetTemplateTests.swift */, DE71FDC32853D681005FA9CC /* SelectionSetTemplate_LocalCacheMutation_Tests.swift */, DE1696D3298C51CF00345E1A /* SelectionSetTemplate_Initializers_Tests.swift */, - DE296538279B3B8200BF9B49 /* SelectionSetTemplate_RenderOperation_Tests.swift */, ); path = SelectionSet; sourceTree = ""; @@ -3757,6 +3756,7 @@ DE6B650B27C4293D00970E4E /* FieldArgumentRendering.swift */, DE71FDBF2853C242005FA9CC /* OperationTemplateRenderer.swift */, DE6388DE28CBF38E00559697 /* GraphQLEnumValue+Rendered.swift */, + DE8C51C929E8B03700E47A64 /* IRDefinition+RenderingHelpers.swift */, ); path = RenderingHelpers; sourceTree = ""; @@ -4951,6 +4951,7 @@ DE5FD5FD2769222D0033EE23 /* OperationDefinitionTemplate.swift in Sources */, DE6B650C27C4293D00970E4E /* FieldArgumentRendering.swift in Sources */, DE5EEC8527988F1A00AF5913 /* IR+SelectionSet.swift in Sources */, + DE8C51CA29E8B03700E47A64 /* IRDefinition+RenderingHelpers.swift in Sources */, E6AAA739286C87EA00F4659D /* OperationIdentifiersTemplate.swift in Sources */, DE3484622746FF8F0065B77E /* IR+OperationBuilder.swift in Sources */, E669352F2803F09C004E1FFC /* CustomScalarFileGenerator.swift in Sources */, @@ -5078,7 +5079,6 @@ DE9CEAF3282C6AC300959AF9 /* TemplateRenderer_TestMockFile_Tests.swift in Sources */, E68D824527A1D8A60040A46F /* ObjectTemplateTests.swift in Sources */, E6A6866427F63AEF008A1D13 /* FileGeneratorTests.swift in Sources */, - DE29653B279B3B8200BF9B49 /* SelectionSetTemplate_RenderOperation_Tests.swift in Sources */, E61F4BF827A8FC8E0049886A /* FragmentFileGeneratorTests.swift in Sources */, E657CDBA26FD01D4005834D6 /* ApolloSchemaInternalTests.swift in Sources */, DEFE695128134028001CF4E8 /* IRFieldCollectorTests.swift in Sources */, diff --git a/Sources/ApolloCodegenLib/IR/IR.swift b/Sources/ApolloCodegenLib/IR/IR.swift index 090e5c79bb..640a5a3bef 100644 --- a/Sources/ApolloCodegenLib/IR/IR.swift +++ b/Sources/ApolloCodegenLib/IR/IR.swift @@ -19,6 +19,21 @@ class IR { ) } + /// A top level GraphQL definition, which can be an operation or a named fragment. + enum Definition { + case operation(IR.Operation) + case namedFragment(IR.NamedFragment) + + var rootField: IR.EntityField { + switch self { + case let .operation(operation): + return operation.rootField + case let .namedFragment(fragment): + return fragment.rootField + } + } + } + /// Represents a concrete entity in an operation or fragment that fields are selected upon. /// /// Multiple `SelectionSet`s may select fields on the same `Entity`. All `SelectionSet`s that will diff --git a/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift b/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift index 3a098b8684..fcac9a7dc6 100644 --- a/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift @@ -11,26 +11,25 @@ struct FragmentTemplate: TemplateRenderer { let target: TemplateTarget = .operationFile var template: TemplateString { - TemplateString( + let definition = IR.Definition.namedFragment(fragment) + + return TemplateString( """ \(embeddedAccessControlModifier)\ - struct \(fragment.name.firstUppercased): \(config.schemaNamespace.firstUppercased)\ - .\(if: isMutable, "Mutable")SelectionSet, Fragment { + struct \(fragment.name.firstUppercased): \ + \(definition.renderedSelectionSetType(config)), Fragment { public static var fragmentDefinition: StaticString { ""\" \(fragment.definition.source) ""\" } \(SelectionSetTemplate( - mutable: isMutable, + definition: definition, generateInitializers: config.options.shouldGenerateSelectionSetInitializers(for: fragment), config: config - ).BodyTemplate(fragment.rootField.selectionSet)) + ).renderBody()) } """) } - private var isMutable: Bool { - fragment.definition.isLocalCacheMutation - } } diff --git a/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift b/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift index 7922260abd..ef5b6d488b 100644 --- a/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift @@ -9,7 +9,9 @@ struct LocalCacheMutationDefinitionTemplate: OperationTemplateRenderer { let target: TemplateTarget = .operationFile var template: TemplateString { - TemplateString( + let definition = IR.Definition.operation(operation) + + return TemplateString( """ \(embeddedAccessControlModifier)\ class \(operation.definition.nameWithSuffix.firstUppercased): LocalCacheMutation { @@ -21,11 +23,13 @@ struct LocalCacheMutationDefinitionTemplate: OperationTemplateRenderer { \(section: VariableAccessors(operation.definition.variables, graphQLOperation: false)) - \(SelectionSetTemplate( - mutable: true, - generateInitializers: config.options.shouldGenerateSelectionSetInitializers(for: operation), - config: config - ).render(for: operation)) + public struct Data: \(definition.renderedSelectionSetType(config)) { + \(SelectionSetTemplate( + definition: definition, + generateInitializers: config.options.shouldGenerateSelectionSetInitializers(for: operation), + config: config + ).renderBody()) + } } """) diff --git a/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift b/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift index 662380713b..4a6969e4ca 100644 --- a/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift @@ -11,7 +11,9 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer { let target: TemplateTarget = .operationFile var template: TemplateString { - TemplateString( + let definition = IR.Definition.operation(operation) + + return TemplateString( """ \(OperationDeclaration(operation.definition)) \(DocumentType.render( @@ -27,10 +29,13 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer { \(section: VariableAccessors(operation.definition.variables)) - \(SelectionSetTemplate( - generateInitializers: config.options.shouldGenerateSelectionSetInitializers(for: operation), - config: config - ).render(for: operation)) + public struct Data: \(definition.renderedSelectionSetType(config)) { + \(SelectionSetTemplate( + definition: definition, + generateInitializers: config.options.shouldGenerateSelectionSetInitializers(for: operation), + config: config + ).renderBody()) + } } """) diff --git a/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift b/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift new file mode 100644 index 0000000000..51eedc4153 --- /dev/null +++ b/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift @@ -0,0 +1,16 @@ +extension IR.Definition { + + func renderedSelectionSetType(_ config: ApolloCodegen.ConfigurationContext) -> TemplateString { + "\(config.schemaNamespace.firstUppercased).\(if: isMutable, "Mutable")SelectionSet" + } + + var isMutable: Bool { + switch self { + case let .operation(operation): + return operation.definition.isLocalCacheMutation + case let .namedFragment(fragment): + return fragment.definition.isLocalCacheMutation + } + } + +} diff --git a/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift b/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift index 04ed6eddac..3391744c3a 100644 --- a/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift @@ -3,6 +3,7 @@ import OrderedCollections struct SelectionSetTemplate { + let definition: IR.Definition let isMutable: Bool let generateInitializers: Bool let config: ApolloCodegen.ConfigurationContext @@ -10,26 +11,20 @@ struct SelectionSetTemplate { private let nameCache: SelectionSetNameCache init( - mutable: Bool = false, + definition: IR.Definition, generateInitializers: Bool, config: ApolloCodegen.ConfigurationContext ) { - self.isMutable = mutable + self.definition = definition + self.isMutable = definition.isMutable self.generateInitializers = generateInitializers self.config = config self.nameCache = SelectionSetNameCache(config: config) } - // MARK: - Operation - func render(for operation: IR.Operation) -> String { - TemplateString( - """ - public struct Data: \(SelectionSetType()) { - \(BodyTemplate(operation.rootField.selectionSet)) - } - """ - ).description + func renderBody() -> TemplateString { + BodyTemplate(definition.rootField.selectionSet) } // MARK: - Field @@ -129,7 +124,7 @@ struct SelectionSetTemplate { from: selectionSet.scopePath.head, to: selectionSet.scopePath.last.value.scopePath.head, withFieldPath: selectionSet.entity.fieldPath.head, - removingFirst: selectionSet.scopePath.head.value.type.isRootFieldType, + removingFirst: false, pluralizer: config.pluralizer ) return """ diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/LocalCacheMutationDefinitionTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/LocalCacheMutationDefinitionTemplateTests.swift index 16ea19e6fd..cbb59f003e 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/LocalCacheMutationDefinitionTemplateTests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/LocalCacheMutationDefinitionTemplateTests.swift @@ -241,6 +241,42 @@ class LocalCacheMutationDefinitionTemplateTests: XCTestCase { expect(actual).to(equalLineByLine(expected, atLine: 6, ignoringExtraLines: true)) } + func test__generate__givenLowercasedSchemaName_generatesSelectionSetsWithFirstUppercasedNamespace() throws { + // given + let expected = + """ + public struct Data: Myschema.MutableSelectionSet { + public var __data: DataDict + """ + + // when + config = .mock(schemaNamespace: "myschema") + try buildSubjectAndOperation() + + let actual = renderSubject() + + // then + expect(actual).to(equalLineByLine(expected, atLine: 6, ignoringExtraLines: true)) + } + + func test__generate__givenUppercasedSchemaName_generatesSelectionSetsWithUppercasedNamespace() throws { + // given + let expected = + """ + public struct Data: MYSCHEMA.MutableSelectionSet { + public var __data: DataDict + """ + + // when + config = .mock(schemaNamespace: "MYSCHEMA") + try buildSubjectAndOperation() + + let actual = renderSubject() + + // then + expect(actual).to(equalLineByLine(expected, atLine: 6, ignoringExtraLines: true)) + } + func test_render_givenModuleType_swiftPackageManager_generatesClassDefinition_withPublicModifier() throws { // given config = .mock(.swiftPackageManager) diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift index ab652b82bc..9f9c322112 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift @@ -262,6 +262,44 @@ class OperationDefinitionTemplateTests: XCTestCase { expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true)) } + // MARK: Selection Set Declaration + + func test__generate__givenOperationSelectionSet_rendersDeclaration() throws { + // given + schemaSDL = """ + type Query { + allAnimals: [Animal!] + } + + interface Animal { + species: String! + } + """ + + document = """ + query TestOperation { + allAnimals { + species + } + } + """ + + let expected = """ + public struct Data: TestSchema.SelectionSet { + public let __data: DataDict + public init(_dataDict: DataDict) { __data = _dataDict } + + public static var __parentType: ApolloAPI.ParentType { TestSchema.Objects.Query } + """ + + // when + try buildSubjectAndOperation() + let actual = renderSubject() + + // then + expect(actual).to(equalLineByLine(expected, atLine: 17, ignoringExtraLines: true)) + } + // MARK: - Selection Set Initializers func test__generate_givenOperationSelectionSet_configIncludesOperations_rendersInitializer() throws { diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift index faa14c1711..6a2edb19bb 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift @@ -48,6 +48,7 @@ class SelectionSetTemplateTests: XCTestCase { ) ) subject = SelectionSetTemplate( + definition: .operation(self.operation), generateInitializers: false, config: ApolloCodegen.ConfigurationContext(config: config) ) diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_Initializers_Tests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_Initializers_Tests.swift index f12e196b9e..1eb24e9b89 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_Initializers_Tests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_Initializers_Tests.swift @@ -37,6 +37,7 @@ class SelectionSetTemplate_Initializers_Tests: XCTestCase { options: .init() ) subject = SelectionSetTemplate( + definition: .operation(self.operation), generateInitializers: true, config: ApolloCodegen.ConfigurationContext(config: config) ) diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift index 67ce0c241e..9f2fe4699b 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift @@ -34,7 +34,7 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { let operationDefinition = try XCTUnwrap(ir.compilationResult[operation: operationName]) operation = ir.build(operation: operationDefinition) subject = SelectionSetTemplate( - mutable: true, + definition: .operation(self.operation), generateInitializers: false, config: .init(config: .mock(schemaNamespace: schemaNamespace)) ) @@ -42,38 +42,6 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { // MARK: - Declaration Tests - func test__renderForOperation__rendersDeclarationAsMutableSelectionSet() throws { - // given - schemaSDL = """ - type Query { - allAnimals: [Animal!] - } - - interface Animal { - species: String! - } - """ - - document = """ - query TestOperation @apollo_client_ios_localCacheMutation { - allAnimals { - species - } - } - """ - - let expected = """ - public struct Data: TestSchema.MutableSelectionSet { - """ - - // when - try buildSubjectAndOperation() - let actual = subject.render(for: operation) - - // then - expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true)) - } - func test__renderForEntityField__rendersDeclarationAsMutableSelectionSet() throws { // given schemaSDL = """ @@ -211,7 +179,7 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { """ document = """ - query TestOperation { + query TestOperation @apollo_client_ios_localCacheMutation { allAnimals { ...FragmentA } @@ -253,7 +221,7 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { """ document = """ - query TestOperation { + query TestOperation @apollo_client_ios_localCacheMutation { allAnimals { fieldName } @@ -416,102 +384,6 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { // MARK: - Casing Tests - func test__casingForMutableSelectionSet__givenLowercasedSchemaName_generatesFirstUppercasedNamespace() throws { - // given - schemaSDL = """ - type Query { - allAnimals: [Animal!] - } - - interface Animal { - species: String! - } - """ - - document = """ - query TestOperation { - allAnimals { - species - } - } - """ - - // when - try buildSubjectAndOperation(schemaNamespace: "myschema") - let actual = subject.render(for: operation) - - // then - let expected = """ - public struct Data: Myschema.MutableSelectionSet { - """ - - expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true)) - } - - func test__casingForMutableSelectionSet__givenUppercasedSchemaName_generatesUppercasedNamespace() throws { - // given - schemaSDL = """ - type Query { - allAnimals: [Animal!] - } - - interface Animal { - species: String! - } - """ - - document = """ - query TestOperation { - allAnimals { - species - } - } - """ - - // when - try buildSubjectAndOperation(schemaNamespace: "MYSCHEMA") - let actual = subject.render(for: operation) - - // then - let expected = """ - public struct Data: MYSCHEMA.MutableSelectionSet { - """ - - expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true)) - } - - func test__casingForMutableSelectionSet__givenCapitalizedSchemaName_generatesCapitalizedNamespace() throws { - // given - schemaSDL = """ - type Query { - allAnimals: [Animal!] - } - - interface Animal { - species: String! - } - """ - - document = """ - query TestOperation @apollo_client_ios_localCacheMutation { - allAnimals { - species - } - } - """ - - // when - try buildSubjectAndOperation(schemaNamespace: "MySchema") - let actual = subject.render(for: operation) - - // then - let expected = """ - public struct Data: MySchema.MutableSelectionSet { - """ - - expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true)) - } - func test__casingForMutableInlineFragment__givenLowercasedSchemaName_generatesFirstUppercasedNamespace() throws { // given schemaSDL = """ diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_RenderOperation_Tests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_RenderOperation_Tests.swift deleted file mode 100644 index 18ee0cbb87..0000000000 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_RenderOperation_Tests.swift +++ /dev/null @@ -1,78 +0,0 @@ -import XCTest -import Nimble -@testable import ApolloCodegenLib -import ApolloCodegenInternalTestHelpers - -class SelectionSetTemplate_RenderOperation_Tests: XCTestCase { - - var schemaSDL: String! - var document: String! - var ir: IR! - var operation: IR.Operation! - var subject: SelectionSetTemplate! - - override func setUp() { - super.setUp() - } - - override func tearDown() { - schemaSDL = nil - document = nil - ir = nil - operation = nil - subject = nil - super.tearDown() - } - - // MARK: - Helpers - - func buildSubjectAndOperation(named operationName: String = "TestOperation") throws { - ir = try .mock(schema: schemaSDL, document: document) - let operationDefinition = try XCTUnwrap(ir.compilationResult[operation: operationName]) - operation = ir.build(operation: operationDefinition) - subject = SelectionSetTemplate( - generateInitializers: false, - config: ApolloCodegen.ConfigurationContext(config: .mock()) - ) - } - - // MARK: - Tests - - func test__render__givenOperationWithName_rendersDeclaration() throws { - // given - schemaSDL = """ - type Query { - allAnimals: [Animal!] - } - - interface Animal { - species: String! - } - """ - - document = """ - query TestOperation { - allAnimals { - species - } - } - """ - - let expected = """ - public struct Data: TestSchema.SelectionSet { - public let __data: DataDict - public init(_dataDict: DataDict) { __data = _dataDict } - - public static var __parentType: ApolloAPI.ParentType { TestSchema.Objects.Query } - """ - - // when - try buildSubjectAndOperation() - let actual = subject.render(for: operation) - - // then - expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true)) - expect(String(actual.reversed())).to(equalLineByLine("}", ignoringExtraLines: true)) - } - -} diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/TemplateString_DeprecationMessage_Tests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/TemplateString_DeprecationMessage_Tests.swift index e013924a08..89eb8e2760 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/TemplateString_DeprecationMessage_Tests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/TemplateString_DeprecationMessage_Tests.swift @@ -267,16 +267,24 @@ final class TemplateString_DeprecationMessage_Tests: XCTestCase { let ir = try IR.mock(schema: schemaSDL, document: document) let operation = ir.build(operation: try XCTUnwrap(ir.compilationResult[operation: "GetAnimal"])) - let subject = SelectionSetTemplate(generateInitializers: true, config: config) + let subject = SelectionSetTemplate( + definition: .operation(operation), + generateInitializers: true, + config: config + ) let expected = #""" - @available(*, deprecated, message: "message with all allowed escape characters: \\ and \" and \t and \n and \r.") - """# + @available(*, deprecated, message: "message with all allowed escape characters: \\ and \" and \t and \n and \r.") + """# // then - let actual = subject.render(for: operation) + let animal = try XCTUnwrap( + operation[field: "query"]?[field: "animal"] as? IR.EntityField + ) - expect(actual).to(equalLineByLine(expected, atLine: 37, ignoringExtraLines: true)) + let actual = subject.render(field: animal) + + expect(actual).to(equalLineByLine(expected, atLine: 14, ignoringExtraLines: true)) } func test__inputField_givenSDLDeprecationMessageWithDoubleQuotes_shouldEscapeDoubleQuotes() throws { @@ -387,16 +395,23 @@ final class TemplateString_DeprecationMessage_Tests: XCTestCase { let ir = try IR.mock(schema: schemaSDL, document: document) let operation = ir.build(operation: try XCTUnwrap(ir.compilationResult[operation: "GetAnimal"])) - let subject = SelectionSetTemplate(generateInitializers: true, config: config) + let subject = SelectionSetTemplate( + definition: .operation(operation), + generateInitializers: true, + config: config + ) let expected = #""" - #warning("Argument 'genus' of field 'predators' is deprecated. Reason: 'message with all allowed escape characters: \\ and \" and \t and \n and \r.'") - """# + #warning("Argument 'genus' of field 'predators' is deprecated. Reason: 'message with all allowed escape characters: \\ and \" and \t and \n and \r.'") + """# // then - let actual = subject.render(for: operation) + let animal = try XCTUnwrap( + operation[field: "query"]?[field: "animal"] as? IR.EntityField + ) + let actual = subject.render(field: animal) - expect(actual).to(equalLineByLine(expected, atLine: 32, ignoringExtraLines: true)) + expect(actual).to(equalLineByLine(expected, atLine: 9, ignoringExtraLines: true)) } } From ec1448ee289cb91b84ab7bda9cc27679212fc6ad Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Thu, 13 Apr 2023 17:06:34 -0700 Subject: [PATCH 5/7] Fully quialify RootEntity typealias --- Sources/ApolloCodegenLib/IR/IR.swift | 9 +++++++ .../Templates/FragmentTemplate.swift | 2 +- ...LocalCacheMutationDefinitionTemplate.swift | 2 +- .../OperationDefinitionTemplate.swift | 9 ++++--- .../IRDefinition+RenderingHelpers.swift | 25 +++++++++++++++++++ .../Templates/SelectionSetTemplate.swift | 20 +++++++++++---- .../SelectionSetTemplateTests.swift | 10 ++++---- 7 files changed, 61 insertions(+), 16 deletions(-) diff --git a/Sources/ApolloCodegenLib/IR/IR.swift b/Sources/ApolloCodegenLib/IR/IR.swift index 640a5a3bef..5e9674e989 100644 --- a/Sources/ApolloCodegenLib/IR/IR.swift +++ b/Sources/ApolloCodegenLib/IR/IR.swift @@ -24,6 +24,15 @@ class IR { case operation(IR.Operation) case namedFragment(IR.NamedFragment) + var name: String { + switch self { + case let .operation(operation): + return operation.definition.name + case let .namedFragment(fragment): + return fragment.definition.name + } + } + var rootField: IR.EntityField { switch self { case let .operation(operation): diff --git a/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift b/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift index fcac9a7dc6..0780b5fbae 100644 --- a/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift @@ -16,7 +16,7 @@ struct FragmentTemplate: TemplateRenderer { return TemplateString( """ \(embeddedAccessControlModifier)\ - struct \(fragment.name.firstUppercased): \ + struct \(fragment.generatedDefinitionName): \ \(definition.renderedSelectionSetType(config)), Fragment { public static var fragmentDefinition: StaticString { ""\" \(fragment.definition.source) diff --git a/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift b/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift index ef5b6d488b..c2791d8b14 100644 --- a/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift @@ -14,7 +14,7 @@ struct LocalCacheMutationDefinitionTemplate: OperationTemplateRenderer { return TemplateString( """ \(embeddedAccessControlModifier)\ - class \(operation.definition.nameWithSuffix.firstUppercased): LocalCacheMutation { + class \(operation.generatedDefinitionName): LocalCacheMutation { public static let operationType: GraphQLOperationType = .\(operation.definition.operationType.rawValue) \(section: VariableProperties(operation.definition.variables)) diff --git a/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift b/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift index 4a6969e4ca..0f2950c222 100644 --- a/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift @@ -15,7 +15,7 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer { return TemplateString( """ - \(OperationDeclaration(operation.definition)) + \(OperationDeclaration()) \(DocumentType.render( operation.definition, identifier: operation.operationIdentifier, @@ -41,11 +41,12 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer { """) } - private func OperationDeclaration(_ operation: CompilationResult.OperationDefinition) -> TemplateString { + private func OperationDeclaration() -> TemplateString { return """ \(embeddedAccessControlModifier)\ - class \(operation.nameWithSuffix.firstUppercased): \(operation.operationType.renderedProtocolName) { - public static let operationName: String = "\(operation.name)" + class \(operation.generatedDefinitionName): \ + \(operation.definition.operationType.renderedProtocolName) { + public static let operationName: String = "\(operation.definition.name)" """ } diff --git a/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift b/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift index 51eedc4153..50261c775a 100644 --- a/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift +++ b/Sources/ApolloCodegenLib/Templates/RenderingHelpers/IRDefinition+RenderingHelpers.swift @@ -13,4 +13,29 @@ extension IR.Definition { } } + var generatedDefinitionName: String { + switch self { + case let .operation(operation): + return operation.generatedDefinitionName + case let .namedFragment(fragment): + return fragment.generatedDefinitionName + } + } + +} + +extension IR.Operation { + + var generatedDefinitionName: String { + definition.nameWithSuffix.firstUppercased + } + +} + +extension IR.NamedFragment { + + var generatedDefinitionName: String { + definition.name.firstUppercased + } + } diff --git a/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift b/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift index 3391744c3a..1d713857f1 100644 --- a/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift @@ -120,16 +120,26 @@ struct SelectionSetTemplate { private func RootEntityTypealias(_ selectionSet: IR.SelectionSet) -> TemplateString { guard !selectionSet.isEntityRoot else { return "" } + let rootEntityName = fullyQualifiedGeneratedSelectionSetName(selectionSet) + return """ + public typealias RootEntityType = \(rootEntityName) + """ + } + + private func fullyQualifiedGeneratedSelectionSetName(_ selectionSet: IR.SelectionSet) -> String { + let rootNode = selectionSet.scopePath.head + let rootTypeIsOperationRoot = rootNode.value.type.isRootFieldType + let rootEntityName = SelectionSetNameGenerator.generatedSelectionSetName( - from: selectionSet.scopePath.head, + from: rootNode, to: selectionSet.scopePath.last.value.scopePath.head, withFieldPath: selectionSet.entity.fieldPath.head, - removingFirst: false, + removingFirst: rootTypeIsOperationRoot, pluralizer: config.pluralizer ) - return """ - public typealias RootEntityType = \(rootEntityName) - """ + + return rootTypeIsOperationRoot ? + "\(definition.generatedDefinitionName.firstUppercased).Data.\(rootEntityName)" : rootEntityName } private func ParentTypeTemplate(_ type: GraphQLCompositeType) -> String { diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift index 6a2edb19bb..852c4213bc 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift @@ -5650,7 +5650,7 @@ class SelectionSetTemplateTests: XCTestCase { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = TestOperationQuery.Data.AllAnimal """ // when @@ -5704,7 +5704,7 @@ class SelectionSetTemplateTests: XCTestCase { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = TestOperationQuery.Data.AllAnimal """ // when @@ -5757,7 +5757,7 @@ class SelectionSetTemplateTests: XCTestCase { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = TestOperationQuery.Data.AllAnimal.Predator """ // when @@ -5813,12 +5813,12 @@ class SelectionSetTemplateTests: XCTestCase { """ let expected = """ - /// AllAnimal.Predator.AsPet + /// Predator.Predator.AsPet public struct AsPet: TestSchema.InlineFragment { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = TestOperationQuery.Data.AllAnimal.Predator + public typealias RootEntityType = TestOperationQuery.Data.Predator.Predator """ // when From 18a9c7d1807110a4aad498ec32d56659eb758d93 Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Fri, 14 Apr 2023 12:14:50 -0700 Subject: [PATCH 6/7] Fix fully qualified name generation for merged sources --- .../Templates/SelectionSetTemplate.swift | 51 ++++++------ .../SelectionSetTemplateTests.swift | 80 ++++++++++++++++++- 2 files changed, 104 insertions(+), 27 deletions(-) diff --git a/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift b/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift index 1d713857f1..f037c653b2 100644 --- a/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift +++ b/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift @@ -120,28 +120,16 @@ struct SelectionSetTemplate { private func RootEntityTypealias(_ selectionSet: IR.SelectionSet) -> TemplateString { guard !selectionSet.isEntityRoot else { return "" } - let rootEntityName = fullyQualifiedGeneratedSelectionSetName(selectionSet) + let rootEntityName = fullyQualifiedGeneratedSelectionSetName( + for: selectionSet.typeInfo, + to: selectionSet.scopePath.last.value.scopePath.head + ) + return """ public typealias RootEntityType = \(rootEntityName) """ } - private func fullyQualifiedGeneratedSelectionSetName(_ selectionSet: IR.SelectionSet) -> String { - let rootNode = selectionSet.scopePath.head - let rootTypeIsOperationRoot = rootNode.value.type.isRootFieldType - - let rootEntityName = SelectionSetNameGenerator.generatedSelectionSetName( - from: rootNode, - to: selectionSet.scopePath.last.value.scopePath.head, - withFieldPath: selectionSet.entity.fieldPath.head, - removingFirst: rootTypeIsOperationRoot, - pluralizer: config.pluralizer - ) - - return rootTypeIsOperationRoot ? - "\(definition.generatedDefinitionName.firstUppercased).Data.\(rootEntityName)" : rootEntityName - } - private func ParentTypeTemplate(_ type: GraphQLCompositeType) -> String { """ public static var __parentType: \(config.ApolloAPITargetName).ParentType { \ @@ -153,13 +141,7 @@ struct SelectionSetTemplate { return """ public static var __mergedSources: [any \(config.ApolloAPITargetName).SelectionSet.Type] { [ \(selectionSet.selections.merged.mergedSources.map { - let scopePath = $0.typeInfo.scopePath - let selectionSetName = SelectionSetNameGenerator.generatedSelectionSetName( - from: scopePath.head, - withFieldPath: $0.typeInfo.entity.fieldPath.head, - removingFirst: scopePath.head.value.type.isRootFieldType, - pluralizer: config.pluralizer - ) + let selectionSetName = fullyQualifiedGeneratedSelectionSetName(for: $0.typeInfo) return "\(selectionSetName).self" }) ] } @@ -543,6 +525,27 @@ struct SelectionSetTemplate { """ } + // MARK: - SelectionSet Name Computation + + private func fullyQualifiedGeneratedSelectionSetName( + for typeInfo: IR.SelectionSet.TypeInfo, + to toNode: LinkedList.Node? = nil + ) -> String { + let rootNode = typeInfo.scopePath.head + let rootTypeIsOperationRoot = rootNode.value.type.isRootFieldType + + let rootEntityName = SelectionSetNameGenerator.generatedSelectionSetName( + from: rootNode, + to: toNode, + withFieldPath: typeInfo.entity.fieldPath.head, + removingFirst: rootTypeIsOperationRoot, + pluralizer: config.pluralizer + ) + + return rootTypeIsOperationRoot ? + "\(definition.generatedDefinitionName.firstUppercased).Data.\(rootEntityName)" : rootEntityName + } + } fileprivate class SelectionSetNameCache { diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift index 852c4213bc..94463b0156 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift @@ -1925,8 +1925,8 @@ class SelectionSetTemplateTests: XCTestCase { let expected = """ public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - AllAnimal.Predator.AsPet.self, - AllAnimal.AsDog.Predator.self + TestOperationQuery.Data.AllAnimal.Predator.AsPet.self, + TestOperationQuery.Data.AllAnimal.AsDog.Predator.self ] } """ @@ -1988,7 +1988,7 @@ class SelectionSetTemplateTests: XCTestCase { let expected = """ public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - AllAnimal.Predator.self, + TestOperationQuery.Data.AllAnimal.Predator.self, PredatorDetails.AsPet.self ] } """ @@ -2005,6 +2005,80 @@ class SelectionSetTemplateTests: XCTestCase { expect(actual).to(equalLineByLine(expected, atLine: 8, ignoringExtraLines: true)) } + /// Test for edge case in [#2949](https://github.com/apollographql/apollo-ios/issues/2949) + /// + /// When the `MergedSource` would have duplicate naming, due to child fields with the same name + /// (or alias), the fully qualified name must be used. In this example, a `MergedSource` of + /// `Predator.Predator` the first usage of the name `Predator` would be referencing the nearest + /// enclosing type (ie. `TestOperationQuery.Predator.Predator`), so it is looking for another + /// `Predator` type in that scope, which does not exist + /// (ie. `TestOperationQuery.Predator.Predator.Predator`). + /// + /// To correct this we must always use the fully qualified name including the operation name and + /// `Data` objects to ensure we are referring to the correct type. + func test__render_mergedSources__givenMergedTypeCaseWithConflictingNames_rendersMergedSourceWithFullyQualifiedName() throws { + // given + schemaSDL = """ + type Query { + predators: [Animal!]! + } + + interface Animal { + species: String! + predator: Animal! + } + + interface Pet implements Animal { + species: String! + predator: Animal! + name: String! + } + + type Dog implements Animal & Pet { + species: String! + predator: Animal! + name: String! + } + """ + + document = """ + query TestOperation { + predators { + species + predator { + ... on Pet { + name + } + } + ... on Dog { + name + predator { + species + } + } + } + } + """ + + let expected = """ + public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ + TestOperationQuery.Data.Predator.Predator.AsPet.self, + TestOperationQuery.Data.Predator.AsDog.Predator.self + ] } + """ + + // when + try buildSubjectAndOperation() + let allAnimals_asDog_predator_asPet = try XCTUnwrap( + operation[field: "query"]?[field: "predators"]?[as: "Dog"]?[field: "predator"]?[as: "Pet"] + ) + + let actual = subject.render(inlineFragment: allAnimals_asDog_predator_asPet) + + // then + expect(actual).to(equalLineByLine(expected, atLine: 8, ignoringExtraLines: true)) + } + // MARK: - Field Accessors - Scalar func test__render_fieldAccessors__givenScalarFields_rendersAllFieldAccessors() throws { From a6280f4cf66f361668a8ba6143a8b56e31b9b11d Mon Sep 17 00:00:00 2001 From: Anthony Miller Date: Fri, 14 Apr 2023 13:06:24 -0700 Subject: [PATCH 7/7] Regenerate --- ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- .../Queries/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- .../Queries/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- .../Operations/Queries/DogQuery.graphql.swift | 2 +- ...ndCommentsForRepositoryQuery.graphql.swift | 8 +++---- .../Queries/RepositoryQuery.graphql.swift | 6 ++--- ...roidDetailsWithFragmentQuery.graphql.swift | 2 +- ...sNamesWithFragmentTwiceQuery.graphql.swift | 2 +- ...entConditionalInclusionQuery.graphql.swift | 2 +- ...ineConditionalInclusionQuery.graphql.swift | 2 +- .../Queries/HeroDetailsQuery.graphql.swift | 4 ++-- ...HeroDetailsWithFragmentQuery.graphql.swift | 8 +++---- ...ilsConditionalInclusionQuery.graphql.swift | 2 +- ...AndConditionalInclusionQuery.graphql.swift | 10 ++++---- ...ficConditionalInclusionQuery.graphql.swift | 2 +- ...arentTypeDependentFieldQuery.graphql.swift | 8 +++---- ...peDependentAliasedFieldQuery.graphql.swift | 4 ++-- .../Queries/SearchQuery.graphql.swift | 6 ++--- SwiftScripts/Package.resolved | 23 ++++++++++++------ ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- .../Queries/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- .../Queries/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- .../Operations/Queries/DogQuery.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../graphql/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../graphql/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- .../Queries/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- .../Queries/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- .../Operations/Queries/DogQuery.graphql.swift | 2 +- ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- .../Queries/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- .../Queries/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- .../Queries/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- .../Queries/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- .../Operations/Queries/DogQuery.graphql.swift | 2 +- .../Packages/GraphQLSchemaName/Package.swift | 2 +- ...AllAnimalsLocalCacheMutation.graphql.swift | 2 +- .../AllAnimalsIncludeSkipQuery.graphql.swift | 16 ++++++------- .../Queries/AllAnimalsQuery.graphql.swift | 16 ++++++------- .../ClassroomPetsCCNQuery.graphql.swift | 4 ++-- .../Queries/ClassroomPetsQuery.graphql.swift | 24 +++++++++---------- .../Operations/Queries/DogQuery.graphql.swift | 2 +- 56 files changed, 272 insertions(+), 263 deletions(-) diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift index 28baf17fd4..87903d6094 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift @@ -85,7 +85,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index 315ca55c03..e193060410 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -233,7 +233,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("species", String.self), @@ -285,7 +285,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeightInMeters.self), @@ -362,7 +362,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -444,7 +444,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -544,7 +544,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -645,7 +645,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -746,7 +746,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -793,7 +793,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift index 5463793080..04753ecd68 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift @@ -219,7 +219,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("predators", [Predator].self), @@ -303,7 +303,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -385,7 +385,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -487,7 +487,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -588,7 +588,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -689,7 +689,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -767,7 +767,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), @@ -870,7 +870,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .field("favoriteToy", String.self), diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift index 7c2cbc4efc..17d2439183 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift @@ -84,10 +84,10 @@ public class ClassroomPetsCCNQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift index bcdaedaf66..f971254401 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift @@ -89,10 +89,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -128,10 +128,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -167,10 +167,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -210,10 +210,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -263,10 +263,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -313,10 +313,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.PetRock } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift index 8940df9943..15b3ac1dca 100644 --- a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift +++ b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Operations/Queries/DogQuery.graphql.swift @@ -89,7 +89,7 @@ public class DogQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = DogQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .fragment(DogFragment.self), diff --git a/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/IssuesAndCommentsForRepositoryQuery.graphql.swift b/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/IssuesAndCommentsForRepositoryQuery.graphql.swift index dc19b53398..51eae34697 100644 --- a/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/IssuesAndCommentsForRepositoryQuery.graphql.swift +++ b/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/IssuesAndCommentsForRepositoryQuery.graphql.swift @@ -150,11 +150,11 @@ public class IssuesAndCommentsForRepositoryQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Repository.Issues.Node.Author + public typealias RootEntityType = IssuesAndCommentsForRepositoryQuery.Data.Repository.Issues.Node.Author public static var __parentType: ApolloAPI.ParentType { GitHubAPI.Objects.User } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ AuthorDetails.self, - Repository.Issues.Node.Author.self, + IssuesAndCommentsForRepositoryQuery.Data.Repository.Issues.Node.Author.self, AuthorDetails.AsUser.self ] } @@ -240,11 +240,11 @@ public class IssuesAndCommentsForRepositoryQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Repository.Issues.Node.Comments.Node.Author + public typealias RootEntityType = IssuesAndCommentsForRepositoryQuery.Data.Repository.Issues.Node.Comments.Node.Author public static var __parentType: ApolloAPI.ParentType { GitHubAPI.Objects.User } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ AuthorDetails.self, - Repository.Issues.Node.Comments.Node.Author.self, + IssuesAndCommentsForRepositoryQuery.Data.Repository.Issues.Node.Comments.Node.Author.self, AuthorDetails.AsUser.self ] } diff --git a/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/RepositoryQuery.graphql.swift b/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/RepositoryQuery.graphql.swift index c87a8b25b4..679a5b8e2b 100644 --- a/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/RepositoryQuery.graphql.swift +++ b/Sources/GitHubAPI/GitHubAPI/Sources/Operations/Queries/RepositoryQuery.graphql.swift @@ -99,7 +99,7 @@ public class RepositoryQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Repository.IssueOrPullRequest + public typealias RootEntityType = RepositoryQuery.Data.Repository.IssueOrPullRequest public static var __parentType: ApolloAPI.ParentType { GitHubAPI.Objects.Issue } public static var __selections: [ApolloAPI.Selection] { [ .field("body", String.self), @@ -143,7 +143,7 @@ public class RepositoryQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Repository.IssueOrPullRequest + public typealias RootEntityType = RepositoryQuery.Data.Repository.IssueOrPullRequest public static var __parentType: ApolloAPI.ParentType { GitHubAPI.Interfaces.Reactable } public static var __selections: [ApolloAPI.Selection] { [ .field("viewerCanReact", Bool.self), @@ -162,7 +162,7 @@ public class RepositoryQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Repository.IssueOrPullRequest + public typealias RootEntityType = RepositoryQuery.Data.Repository.IssueOrPullRequest public static var __parentType: ApolloAPI.ParentType { GitHubAPI.Interfaces.Comment } public static var __selections: [ApolloAPI.Selection] { [ .field("author", Author?.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/DroidDetailsWithFragmentQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/DroidDetailsWithFragmentQuery.graphql.swift index 03d9d6e5f3..3a81f6f8a5 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/DroidDetailsWithFragmentQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/DroidDetailsWithFragmentQuery.graphql.swift @@ -83,7 +83,7 @@ public class DroidDetailsWithFragmentQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = DroidDetailsWithFragmentQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .fragment(DroidDetails.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroAndFriendsNamesWithFragmentTwiceQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroAndFriendsNamesWithFragmentTwiceQuery.graphql.swift index 0fe9e52249..afa1f38e09 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroAndFriendsNamesWithFragmentTwiceQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroAndFriendsNamesWithFragmentTwiceQuery.graphql.swift @@ -137,7 +137,7 @@ public class HeroAndFriendsNamesWithFragmentTwiceQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroAndFriendsNamesWithFragmentTwiceQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("friends", [Friend?]?.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsFragmentConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsFragmentConditionalInclusionQuery.graphql.swift index 0792e5fd6c..61a5eda865 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsFragmentConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsFragmentConditionalInclusionQuery.graphql.swift @@ -90,7 +90,7 @@ public class HeroDetailsFragmentConditionalInclusionQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroDetailsFragmentConditionalInclusionQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Interfaces.Character } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeroDetails.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsInlineConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsInlineConditionalInclusionQuery.graphql.swift index ca3a9a329a..4ffdd15294 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsInlineConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsInlineConditionalInclusionQuery.graphql.swift @@ -86,7 +86,7 @@ public class HeroDetailsInlineConditionalInclusionQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroDetailsInlineConditionalInclusionQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Interfaces.Character } public static var __selections: [ApolloAPI.Selection] { [ .field("name", String.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsQuery.graphql.swift index d7fde1ca40..4d569a4150 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsQuery.graphql.swift @@ -98,7 +98,7 @@ public class HeroDetailsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroDetailsQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Double?.self), @@ -132,7 +132,7 @@ public class HeroDetailsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroDetailsQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("primaryFunction", String?.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsWithFragmentQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsWithFragmentQuery.graphql.swift index d6a79e903f..2c7beec22b 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsWithFragmentQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroDetailsWithFragmentQuery.graphql.swift @@ -97,11 +97,11 @@ public class HeroDetailsWithFragmentQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroDetailsWithFragmentQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ HeroDetails.self, - Hero.self, + HeroDetailsWithFragmentQuery.Data.Hero.self, HeroDetails.AsHuman.self ] } @@ -141,11 +141,11 @@ public class HeroDetailsWithFragmentQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroDetailsWithFragmentQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ HeroDetails.self, - Hero.self, + HeroDetailsWithFragmentQuery.Data.Hero.self, HeroDetails.AsDroid.self ] } diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsConditionalInclusionQuery.graphql.swift index d0404dcad7..aceb843609 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsConditionalInclusionQuery.graphql.swift @@ -124,7 +124,7 @@ public class HeroFriendsDetailsConditionalInclusionQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero.Friend + public typealias RootEntityType = HeroFriendsDetailsConditionalInclusionQuery.Data.Hero.Friend public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("primaryFunction", String?.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.graphql.swift index 310acee3de..d94f0d9023 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.graphql.swift @@ -129,7 +129,7 @@ public class HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery: GraphQ public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero.Friend + public typealias RootEntityType = HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.Data.Hero.Friend public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Interfaces.Character } public static var __selections: [ApolloAPI.Selection] { [ .field("name", String.self), @@ -162,7 +162,7 @@ public class HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery: GraphQ public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero.Friend + public typealias RootEntityType = HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.Data.Hero.Friend public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("primaryFunction", String?.self), @@ -196,11 +196,11 @@ public class HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery: GraphQ public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero.Friend + public typealias RootEntityType = HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.Data.Hero.Friend public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - Hero.Friend.self, - Hero.Friend.AsDroid.self + HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.Data.Hero.Friend.self, + HeroFriendsDetailsUnconditionalAndConditionalInclusionQuery.Data.Hero.Friend.AsDroid.self ] } /// The name of the character diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift index 74b23c6a73..ebb8b1aa3d 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroNameTypeSpecificConditionalInclusionQuery.graphql.swift @@ -100,7 +100,7 @@ public class HeroNameTypeSpecificConditionalInclusionQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroNameTypeSpecificConditionalInclusionQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("name", String.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroParentTypeDependentFieldQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroParentTypeDependentFieldQuery.graphql.swift index f645b198d1..e36dcc39c3 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroParentTypeDependentFieldQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroParentTypeDependentFieldQuery.graphql.swift @@ -112,7 +112,7 @@ public class HeroParentTypeDependentFieldQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroParentTypeDependentFieldQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __selections: [ApolloAPI.Selection] { [ .field("friends", [Friend?]?.self), @@ -177,7 +177,7 @@ public class HeroParentTypeDependentFieldQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero.AsHuman.Friend + public typealias RootEntityType = HeroParentTypeDependentFieldQuery.Data.Hero.AsHuman.Friend public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Double?.self, arguments: ["unit": "FOOT"]), @@ -213,7 +213,7 @@ public class HeroParentTypeDependentFieldQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroParentTypeDependentFieldQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("friends", [Friend?]?.self), @@ -278,7 +278,7 @@ public class HeroParentTypeDependentFieldQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero.AsDroid.Friend + public typealias RootEntityType = HeroParentTypeDependentFieldQuery.Data.Hero.AsDroid.Friend public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Double?.self, arguments: ["unit": "METER"]), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroTypeDependentAliasedFieldQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroTypeDependentAliasedFieldQuery.graphql.swift index 48b616f794..3c9a5dbac2 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroTypeDependentAliasedFieldQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/HeroTypeDependentAliasedFieldQuery.graphql.swift @@ -91,7 +91,7 @@ public class HeroTypeDependentAliasedFieldQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroTypeDependentAliasedFieldQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __selections: [ApolloAPI.Selection] { [ .field("homePlanet", alias: "property", String?.self), @@ -121,7 +121,7 @@ public class HeroTypeDependentAliasedFieldQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Hero + public typealias RootEntityType = HeroTypeDependentAliasedFieldQuery.Data.Hero public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("primaryFunction", alias: "property", String?.self), diff --git a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/SearchQuery.graphql.swift b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/SearchQuery.graphql.swift index a3a48c2704..9b2326d04b 100644 --- a/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/SearchQuery.graphql.swift +++ b/Sources/StarWarsAPI/StarWarsAPI/Sources/Operations/Queries/SearchQuery.graphql.swift @@ -100,7 +100,7 @@ public class SearchQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Search + public typealias RootEntityType = SearchQuery.Data.Search public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Human } public static var __selections: [ApolloAPI.Selection] { [ .field("id", StarWarsAPI.ID.self), @@ -135,7 +135,7 @@ public class SearchQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Search + public typealias RootEntityType = SearchQuery.Data.Search public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Droid } public static var __selections: [ApolloAPI.Selection] { [ .field("id", StarWarsAPI.ID.self), @@ -170,7 +170,7 @@ public class SearchQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = Search + public typealias RootEntityType = SearchQuery.Data.Search public static var __parentType: ApolloAPI.ParentType { StarWarsAPI.Objects.Starship } public static var __selections: [ApolloAPI.Selection] { [ .field("id", StarWarsAPI.ID.self), diff --git a/SwiftScripts/Package.resolved b/SwiftScripts/Package.resolved index 40ca943867..33d8371461 100644 --- a/SwiftScripts/Package.resolved +++ b/SwiftScripts/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/stephencelis/SQLite.swift.git", "state": { "branch": null, - "revision": "4d543d811ee644fa4cc4bfa0be996b4dd6ba0f54", - "version": "0.13.3" + "revision": "7a2e3cd27de56f6d396e84f63beefd0267b55ccb", + "version": "0.14.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/apple/swift-argument-parser.git", "state": { "branch": null, - "revision": "fddd1c00396eed152c45a46bea9f47b98e59301d", - "version": "1.2.0" + "revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a", + "version": "1.2.2" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/apple/swift-collections", "state": { "branch": null, - "revision": "48254824bb4248676bf7ce56014ff57b142b77eb", - "version": "1.0.2" + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" } }, { @@ -42,7 +42,16 @@ "repositoryURL": "https://github.com/apple/swift-docc-plugin", "state": { "branch": null, - "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", + "revision": "9b1258905c21fc1b97bf03d1b4ca12c4ec4e5fda", + "version": "1.2.0" + } + }, + { + "package": "SymbolKit", + "repositoryURL": "https://github.com/apple/swift-docc-symbolkit", + "state": { + "branch": null, + "revision": "b45d1f2ed151d057b54504d653e0da5552844e34", "version": "1.0.0" } } diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift index d5e7f38038..6334aa95ae 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift @@ -86,7 +86,7 @@ public extension MyGraphQLSchema { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index 7e88e1a551..70a4694469 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -182,7 +182,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("species", String.self), @@ -212,7 +212,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.Animal } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeightInMeters.self), @@ -252,7 +252,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -294,7 +294,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -349,7 +349,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -398,7 +398,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -447,7 +447,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -474,7 +474,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsQuery.graphql.swift index 8a36f7bb34..1067e31f32 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/AllAnimalsQuery.graphql.swift @@ -166,7 +166,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("predators", [Predator].self), @@ -213,7 +213,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -255,7 +255,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -309,7 +309,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -358,7 +358,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -407,7 +407,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -448,7 +448,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), @@ -498,7 +498,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .field("favoriteToy", String.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift index 7b3f2b5ca1..3aa6f2db49 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift @@ -61,10 +61,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsQuery.graphql.swift index 4edbb854c5..8c05242285 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/ClassroomPetsQuery.graphql.swift @@ -66,10 +66,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -90,10 +90,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.Pet } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -114,10 +114,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Interfaces.WarmBlooded } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -140,10 +140,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Cat } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -171,10 +171,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Bird } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -201,10 +201,10 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.PetRock } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/DogQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/DogQuery.graphql.swift index af442d8b5a..0800f5095d 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/DogQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-InSchemaModule/Sources/MySwiftPackage/Operations/Queries/DogQuery.graphql.swift @@ -64,7 +64,7 @@ public extension MyGraphQLSchema { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = DogQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MyGraphQLSchema.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .fragment(DogFragment.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsIncludeSkipQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsIncludeSkipQuery.graphql.swift index 9aa45e054d..554cde471c 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsIncludeSkipQuery.graphql.swift @@ -182,7 +182,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("species", String.self), @@ -212,7 +212,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.Animal } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeightInMeters.self), @@ -252,7 +252,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -294,7 +294,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -349,7 +349,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -398,7 +398,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -447,7 +447,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -474,7 +474,7 @@ class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsLocalCacheMutation.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsLocalCacheMutation.graphql.swift index f7c038b4ae..947f4ac2d4 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsLocalCacheMutation.graphql.swift @@ -86,7 +86,7 @@ class AllAnimalsLocalCacheMutation: LocalCacheMutation { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsQuery.graphql.swift index 51ae8393fe..78dc381b25 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/AllAnimalsQuery.graphql.swift @@ -162,7 +162,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("laysEggs", Bool.self), @@ -191,7 +191,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -233,7 +233,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -287,7 +287,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -336,7 +336,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -385,7 +385,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -426,7 +426,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), @@ -476,7 +476,7 @@ class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .field("favoriteToy", String.self), diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ClassroomPetsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ClassroomPetsQuery.graphql.swift index d6ace23605..00f7c719cd 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ClassroomPetsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ClassroomPetsQuery.graphql.swift @@ -66,10 +66,10 @@ class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -90,10 +90,10 @@ class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.Pet } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -114,10 +114,10 @@ class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.WarmBlooded } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -140,10 +140,10 @@ class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Cat } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -171,10 +171,10 @@ class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.Bird } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -201,10 +201,10 @@ class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Objects.PetRock } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ccnGraphql/ClassroomPetsCCNQuery.graphql.swift b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ccnGraphql/ClassroomPetsCCNQuery.graphql.swift index 3d262d8e50..f22df484b4 100644 --- a/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ccnGraphql/ClassroomPetsCCNQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/EmbeddedInTarget-RelativeAbsolute/PackageOne/Sources/PackageOne/graphql/ccnGraphql/ClassroomPetsCCNQuery.graphql.swift @@ -61,10 +61,10 @@ class ClassroomPetsCCNQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { MySchemaModule.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift index 0afb59cccf..71d5123d85 100644 --- a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift @@ -85,7 +85,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Bird } public static var __selections: [Apollo.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index 3654639053..83a0e46bd4 100644 --- a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -175,7 +175,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __selections: [Apollo.Selection] { [ .field("species", String.self), @@ -205,7 +205,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.Animal } public static var __selections: [Apollo.Selection] { [ .fragment(HeightInMeters.self), @@ -245,7 +245,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __selections: [Apollo.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -287,7 +287,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.Pet } public static var __selections: [Apollo.Selection] { [ .field("height", Height.self), @@ -342,7 +342,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __selections: [Apollo.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -391,7 +391,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Cat } public static var __selections: [Apollo.Selection] { [ .field("isJellicle", Bool.self), @@ -440,7 +440,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Unions.ClassroomPet } public static var __selections: [Apollo.Selection] { [ .inlineFragment(AsBird.self), @@ -467,7 +467,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Bird } public static var __selections: [Apollo.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsQuery.graphql.swift index 69ad154183..c6e3c5792f 100644 --- a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/AllAnimalsQuery.graphql.swift @@ -158,7 +158,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __selections: [Apollo.Selection] { [ .field("predators", [Predator].self), @@ -205,7 +205,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __selections: [Apollo.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -247,7 +247,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.Pet } public static var __selections: [Apollo.Selection] { [ .field("height", Height.self), @@ -301,7 +301,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __selections: [Apollo.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -350,7 +350,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Cat } public static var __selections: [Apollo.Selection] { [ .field("isJellicle", Bool.self), @@ -399,7 +399,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Unions.ClassroomPet } public static var __selections: [Apollo.Selection] { [ .inlineFragment(AsBird.self), @@ -440,7 +440,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Bird } public static var __selections: [Apollo.Selection] { [ .field("wingspan", Double.self), @@ -490,7 +490,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Dog } public static var __selections: [Apollo.Selection] { [ .field("favoriteToy", String.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift index aa74601a16..00d3938186 100644 --- a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift @@ -60,10 +60,10 @@ public class ClassroomPetsCCNQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.Animal } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsQuery.graphql.swift index 982ddbd41d..0e1046d48c 100644 --- a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/ClassroomPetsQuery.graphql.swift @@ -65,10 +65,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.Animal } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -89,10 +89,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.Pet } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -113,10 +113,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Interfaces.WarmBlooded } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -139,10 +139,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Cat } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -170,10 +170,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Bird } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -200,10 +200,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.PetRock } public static var __mergedSources: [any Apollo.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/DogQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/DogQuery.graphql.swift index 85c08bb0f5..6fce0d664a 100644 --- a/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/DogQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CocoaPods/MyCustomProject/Operations/Queries/DogQuery.graphql.swift @@ -62,7 +62,7 @@ public class DogQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = DogQuery.Data.AllAnimal public static var __parentType: Apollo.ParentType { MyCustomProject.Objects.Dog } public static var __selections: [Apollo.Selection] { [ .fragment(DogFragment.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift index d6b084ca7e..7d6db9f991 100644 --- a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift @@ -85,7 +85,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index 0fe54a7f0d..7492e4c67f 100644 --- a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -181,7 +181,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("species", String.self), @@ -211,7 +211,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.Animal } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeightInMeters.self), @@ -251,7 +251,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -293,7 +293,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -348,7 +348,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -397,7 +397,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -446,7 +446,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -473,7 +473,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsQuery.graphql.swift index e24a6ad76f..c65b7b1d01 100644 --- a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/AllAnimalsQuery.graphql.swift @@ -161,7 +161,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("laysEggs", Bool.self), @@ -190,7 +190,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -232,7 +232,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -286,7 +286,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -335,7 +335,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -384,7 +384,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -425,7 +425,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), @@ -475,7 +475,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .field("favoriteToy", String.self), diff --git a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift index ab550e3990..3b12fdec52 100644 --- a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift @@ -60,10 +60,10 @@ public class ClassroomPetsCCNQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsQuery.graphql.swift index 87cca5d843..7f11c61dd9 100644 --- a/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/Other-CustomTarget/GraphQLAPI/Operations/Queries/ClassroomPetsQuery.graphql.swift @@ -65,10 +65,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -89,10 +89,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.Pet } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -113,10 +113,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Interfaces.WarmBlooded } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -139,10 +139,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Cat } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -170,10 +170,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.Bird } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -200,10 +200,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLAPI.Objects.PetRock } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift index 28baf17fd4..87903d6094 100644 --- a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift @@ -85,7 +85,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index 2dfb47fee8..e7414ef35e 100644 --- a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -181,7 +181,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("species", String.self), @@ -211,7 +211,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeightInMeters.self), @@ -251,7 +251,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -293,7 +293,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -348,7 +348,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -397,7 +397,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -446,7 +446,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -473,7 +473,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift index 86aaba9f19..deac4da8f6 100644 --- a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift @@ -165,7 +165,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("predators", [Predator].self), @@ -212,7 +212,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -254,7 +254,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -308,7 +308,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -357,7 +357,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -406,7 +406,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -447,7 +447,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), @@ -497,7 +497,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .field("favoriteToy", String.self), diff --git a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift index 14279d2c17..09ead13fff 100644 --- a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift @@ -60,10 +60,10 @@ public class ClassroomPetsCCNQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift index 8955a1b6c2..a2b81a40f8 100644 --- a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift @@ -65,10 +65,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -89,10 +89,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.Pet } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -113,10 +113,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Interfaces.WarmBlooded } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -139,10 +139,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Cat } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -170,10 +170,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Bird } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -200,10 +200,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.PetRock } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/DogQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/DogQuery.graphql.swift index 6f025a5fbd..68bdfb2de9 100644 --- a/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/DogQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SPMInXcodeProject/GeneratedAPI/Sources/Operations/Queries/DogQuery.graphql.swift @@ -63,7 +63,7 @@ public class DogQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = DogQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { AnimalKingdomAPI.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .fragment(DogFragment.self), diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Package.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Package.swift index 9a75cd211c..e72828e3ff 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Package.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Package.swift @@ -15,7 +15,7 @@ let package = Package( .library(name: "GraphQLSchemaNameTestMocks", targets: ["GraphQLSchemaNameTestMocks"]), ], dependencies: [ - .package(name: "apollo-ios", path: "../../../../.."), + .package(url: "https://github.com/apollographql/apollo-ios.git", from: "1.0.0"), ], targets: [ .target( diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift index bd87785ace..42aac9ef3f 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/LocalCacheMutations/AllAnimalsLocalCacheMutation.graphql.swift @@ -85,7 +85,7 @@ public class AllAnimalsLocalCacheMutation: LocalCacheMutation { public var __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsLocalCacheMutation.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift index 2d5dd7c1a8..dd87c392ec 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsIncludeSkipQuery.graphql.swift @@ -181,7 +181,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("species", String.self), @@ -211,7 +211,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.Animal } public static var __selections: [ApolloAPI.Selection] { [ .fragment(HeightInMeters.self), @@ -251,7 +251,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -293,7 +293,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -348,7 +348,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -397,7 +397,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -446,7 +446,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -473,7 +473,7 @@ public class AllAnimalsIncludeSkipQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsIncludeSkipQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift index 9aa162301a..1f606cf957 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/AllAnimalsQuery.graphql.swift @@ -165,7 +165,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal.Predator + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal.Predator public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .field("predators", [Predator].self), @@ -212,7 +212,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -254,7 +254,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.Pet } public static var __selections: [ApolloAPI.Selection] { [ .field("height", Height.self), @@ -308,7 +308,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __selections: [ApolloAPI.Selection] { [ .fragment(WarmBloodedDetails.self), @@ -357,7 +357,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Cat } public static var __selections: [ApolloAPI.Selection] { [ .field("isJellicle", Bool.self), @@ -406,7 +406,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Unions.ClassroomPet } public static var __selections: [ApolloAPI.Selection] { [ .inlineFragment(AsBird.self), @@ -447,7 +447,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Bird } public static var __selections: [ApolloAPI.Selection] { [ .field("wingspan", Double.self), @@ -497,7 +497,7 @@ public class AllAnimalsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = AllAnimalsQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .field("favoriteToy", String.self), diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift index c37d11af92..7fad6d61ee 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsCCNQuery.graphql.swift @@ -60,10 +60,10 @@ public class ClassroomPetsCCNQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsCCNQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsCCNQuery.Data.ClassroomPet.self, ClassroomPetDetailsCCN.AsAnimal.self ] } diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift index aaf693d2eb..4dc6457700 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/ClassroomPetsQuery.graphql.swift @@ -65,10 +65,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.Animal } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self ] } @@ -89,10 +89,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.Pet } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self ] } @@ -113,10 +113,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Interfaces.WarmBlooded } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsWarmBlooded.self ] } @@ -139,10 +139,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Cat } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -170,10 +170,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Bird } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsAnimal.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsWarmBlooded.self, @@ -200,10 +200,10 @@ public class ClassroomPetsQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = ClassroomPet + public typealias RootEntityType = ClassroomPetsQuery.Data.ClassroomPet public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.PetRock } public static var __mergedSources: [any ApolloAPI.SelectionSet.Type] { [ - ClassroomPet.self, + ClassroomPetsQuery.Data.ClassroomPet.self, ClassroomPetDetails.AsPet.self, ClassroomPetDetails.AsPetRock.self ] } diff --git a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/DogQuery.graphql.swift b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/DogQuery.graphql.swift index 59d60bf7dd..3d1ccaad6a 100644 --- a/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/DogQuery.graphql.swift +++ b/Tests/TestCodeGenConfigurations/SwiftPackageManager/Packages/GraphQLSchemaName/Sources/Operations/Queries/DogQuery.graphql.swift @@ -63,7 +63,7 @@ public class DogQuery: GraphQLQuery { public let __data: DataDict public init(_dataDict: DataDict) { __data = _dataDict } - public typealias RootEntityType = AllAnimal + public typealias RootEntityType = DogQuery.Data.AllAnimal public static var __parentType: ApolloAPI.ParentType { GraphQLSchemaName.Objects.Dog } public static var __selections: [ApolloAPI.Selection] { [ .fragment(DogFragment.self),