fix: Use correct schema namespace casing in fragments

Sources/ApolloCodegenLib/ApolloCodegen.swift

@@ -85,10 +85,7 @@ public class ApolloCodegen {
 
     try validate(schemaName: configContext.schemaName, compilationResult: compilationResult)
 
-    let ir = IR(
-      schemaName: configContext.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     var existingGeneratedFilePaths = configuration.options.pruneGeneratedFiles ?
     try findExistingGeneratedFilePaths(
@@ -267,7 +264,7 @@ public class ApolloCodegen {
     for fragment in compilationResult.fragments {
       try autoreleasepool {
         let irFragment = ir.build(fragment: fragment)
-        try FragmentFileGenerator(irFragment: irFragment, schema: ir.schema, config: config)
+        try FragmentFileGenerator(irFragment: irFragment, config: config)
           .generate(forConfig: config, fileManager: fileManager)
       }
     }
@@ -277,7 +274,7 @@ public class ApolloCodegen {
     for operation in compilationResult.operations {
       try autoreleasepool {
         let irOperation = ir.build(operation: operation)
-        try OperationFileGenerator(irOperation: irOperation, schema: ir.schema, config: config)
+        try OperationFileGenerator(irOperation: irOperation, config: config)
           .generate(forConfig: config, fileManager: fileManager)
 
         operationIDsFileGenerator?.collectOperationIdentifier(irOperation)
@@ -340,7 +337,6 @@ public class ApolloCodegen {
       try autoreleasepool {
         try InputObjectFileGenerator(
           graphqlInputObject: graphQLInputObject,
-          schema: ir.schema,
           config: config
         ).generate(
           forConfig: config,
@@ -375,7 +371,7 @@ public class ApolloCodegen {
 
     try SchemaMetadataFileGenerator(schema: ir.schema, config: config)
       .generate(forConfig: config, fileManager: fileManager)
-    try SchemaConfigurationFileGenerator(schema: ir.schema, config: config)
+    try SchemaConfigurationFileGenerator(config: config)
       .generate(forConfig: config, fileManager: fileManager)
 
     try SchemaModuleFileGenerator.generate(config, fileManager: fileManager)

Sources/ApolloCodegenLib/FileGenerators/FragmentFileGenerator.swift

@@ -4,14 +4,11 @@ import Foundation
 struct FragmentFileGenerator: FileGenerator {
   /// Source IR fragment.
   let irFragment: IR.NamedFragment
-  /// Source IR schema.
-  let schema: IR.Schema
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
   var template: TemplateRenderer { FragmentTemplate(
     fragment: irFragment,
-    schema: schema,
     config: config
   ) }
   var target: FileTarget { .fragment(irFragment.definition) }

Sources/ApolloCodegenLib/FileGenerators/InputObjectFileGenerator.swift

@@ -5,13 +5,11 @@ import Foundation
 struct InputObjectFileGenerator: FileGenerator {
   /// Source GraphQL input object.
   let graphqlInputObject: GraphQLInputObjectType
-  /// IR representation of a GraphQL schema.
-  let schema: IR.Schema
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
   var template: TemplateRenderer {
-    InputObjectTemplate(graphqlInputObject: graphqlInputObject, schema: schema, config: config)
+    InputObjectTemplate(graphqlInputObject: graphqlInputObject, config: config)
   }
   var target: FileTarget { .inputObject }
   var fileName: String { graphqlInputObject.name }

Sources/ApolloCodegenLib/FileGenerators/OperationFileGenerator.swift

@@ -4,21 +4,17 @@ import Foundation
 struct OperationFileGenerator: FileGenerator {
   /// Source IR operation.
   let irOperation: IR.Operation
-  /// Source IR schema.
-  let schema: IR.Schema
   /// Shared codegen configuration
   let config: ApolloCodegen.ConfigurationContext
 
   var template: TemplateRenderer {
     irOperation.definition.isLocalCacheMutation ?
     LocalCacheMutationDefinitionTemplate(
       operation: irOperation,
-      schema: schema,
       config: config
     ) :
     OperationDefinitionTemplate(
       operation: irOperation,
-      schema: schema,
       config: config
     )
   }

Sources/ApolloCodegenLib/FileGenerators/SchemaConfigurationFileGenerator.swift

@@ -3,12 +3,10 @@ import OrderedCollections
 
 /// Generates a file containing schema metadata used by the GraphQL executor at runtime.
 struct SchemaConfigurationFileGenerator: FileGenerator {
-  /// Source IR schema.
-  let schema: IR.Schema
   /// Shared codegen configuration
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer { SchemaConfigurationTemplate(schema: schema, config: config) }
+  var template: TemplateRenderer { SchemaConfigurationTemplate(config: config) }
   var overwrite: Bool { false }
   var target: FileTarget { .schema }
   var fileName: String { "SchemaConfiguration" }

Sources/ApolloCodegenLib/IR/IR+Schema.swift

@@ -3,16 +3,13 @@ import OrderedCollections
 
 extension IR {
   final class Schema {
-    let name: String
     let referencedTypes: ReferencedTypes
     let documentation: String?
 
     init(
-      name: String,
       referencedTypes: IR.Schema.ReferencedTypes,
       documentation: String? = nil
     ) {
-      self.name = name
       self.referencedTypes = referencedTypes
       self.documentation = documentation
     }

Sources/ApolloCodegenLib/IR/IR.swift

@@ -11,10 +11,9 @@ class IR {
 
   var builtFragments: [String: NamedFragment] = [:]
 
-  init(schemaName: String, compilationResult: CompilationResult) {
+  init(compilationResult: CompilationResult) {
     self.compilationResult = compilationResult
     self.schema = Schema(
-      name: schemaName,
       referencedTypes: .init(compilationResult.referencedTypes),
       documentation: compilationResult.schemaDocumentation
     )

Sources/ApolloCodegenLib/Templates/FragmentTemplate.swift

@@ -5,8 +5,6 @@ import Foundation
 struct FragmentTemplate: TemplateRenderer {
   /// IR representation of source [GraphQL Fragment](https://spec.graphql.org/draft/#sec-Language.Fragments).
   let fragment: IR.NamedFragment
-  /// IR representation of source GraphQL schema.
-  let schema: IR.Schema
 
   let config: ApolloCodegen.ConfigurationContext
 
@@ -16,14 +14,13 @@ struct FragmentTemplate: TemplateRenderer {
     TemplateString(
     """
     \(embeddedAccessControlModifier)\
-    struct \(fragment.name.firstUppercased): \(schema.name)\
+    struct \(fragment.name.firstUppercased): \(config.schemaName.firstUppercased)\
     .\(if: isMutable, "Mutable")SelectionSet, Fragment {
       public static var fragmentDefinition: StaticString { ""\"
         \(fragment.definition.source)
         ""\" }
 
       \(SelectionSetTemplate(
-        schema: schema,
         mutable: isMutable,
         config: config
       ).BodyTemplate(fragment.rootField.selectionSet))

Sources/ApolloCodegenLib/Templates/InputObjectTemplate.swift

@@ -5,8 +5,6 @@ import Foundation
 struct InputObjectTemplate: TemplateRenderer {
   /// IR representation of source [GraphQL Input Object](https://spec.graphql.org/draft/#sec-Input-Objects).
   let graphqlInputObject: GraphQLInputObjectType
-  /// IR representation of a GraphQL schema.
-  let schema: IR.Schema
 
   let config: ApolloCodegen.ConfigurationContext
 

Sources/ApolloCodegenLib/Templates/LocalCacheMutationDefinitionTemplate.swift

@@ -3,8 +3,6 @@ import OrderedCollections
 struct LocalCacheMutationDefinitionTemplate: OperationTemplateRenderer {
   /// IR representation of source [GraphQL Operation](https://spec.graphql.org/draft/#sec-Language.Operations).
   let operation: IR.Operation
-  /// IR representation of source GraphQL schema.
-  let schema: IR.Schema
 
   let config: ApolloCodegen.ConfigurationContext
 
@@ -23,7 +21,7 @@ struct LocalCacheMutationDefinitionTemplate: OperationTemplateRenderer {
 
       \(section: VariableAccessors(operation.definition.variables, graphQLOperation: false))
 
-      \(SelectionSetTemplate(schema: schema, mutable: true, config: config).render(for: operation))
+      \(SelectionSetTemplate(mutable: true, config: config).render(for: operation))
     }
 
     """)

Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift

@@ -5,8 +5,6 @@ import OrderedCollections
 struct OperationDefinitionTemplate: OperationTemplateRenderer {
   /// IR representation of source [GraphQL Operation](https://spec.graphql.org/draft/#sec-Language.Operations).
   let operation: IR.Operation
-  /// IR representation of source GraphQL schema.
-  let schema: IR.Schema
 
   let config: ApolloCodegen.ConfigurationContext
 
@@ -29,7 +27,7 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer {
 
       \(section: VariableAccessors(operation.definition.variables))
 
-      \(SelectionSetTemplate(schema: schema, config: config).render(for: operation))
+      \(SelectionSetTemplate(config: config).render(for: operation))
     }
 
     """)

Sources/ApolloCodegenLib/Templates/RenderingHelpers/OperationTemplateRenderer.swift

@@ -1,8 +1,6 @@
 /// Protocol for a `TemplateRenderer` that renders an operation definition template.
 /// This protocol provides rendering helper functions for common template elements.
-protocol OperationTemplateRenderer: TemplateRenderer {
-  var schema: IR.Schema { get }
-}
+protocol OperationTemplateRenderer: TemplateRenderer { }
 
 extension OperationTemplateRenderer {
   func Initializer(

Sources/ApolloCodegenLib/Templates/SchemaConfigurationTemplate.swift

@@ -2,9 +2,6 @@ import Foundation
 
 /// Renders the Cache Key Resolution extension for a generated schema.
 struct SchemaConfigurationTemplate: TemplateRenderer {
-
-  /// Source IR schema.
-  let schema: IR.Schema
   /// Shared codegen configuration
   let config: ApolloCodegen.ConfigurationContext
 

Sources/ApolloCodegenLib/Templates/SchemaMetadataTemplate.swift

@@ -77,7 +77,7 @@ struct SchemaMetadataTemplate: TemplateRenderer {
 
   init(schema: IR.Schema, config: ApolloCodegen.ConfigurationContext) {
     self.schema = schema
-    self.schemaName = schema.name.firstUppercased
+    self.schemaName = config.schemaName.firstUppercased
     self.config = config
   }
 

Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift

@@ -2,22 +2,19 @@ import InflectorKit
 
 struct SelectionSetTemplate {
 
-  let schema: IR.Schema
   let isMutable: Bool
   let config: ApolloCodegen.ConfigurationContext
 
   private let nameCache: SelectionSetNameCache
 
   init(
-    schema: IR.Schema,
     mutable: Bool = false,
     config: ApolloCodegen.ConfigurationContext
   ) {
-    self.schema = schema
     self.isMutable = mutable
     self.config = config
 
-    self.nameCache = SelectionSetNameCache(schema: schema, config: config)
+    self.nameCache = SelectionSetNameCache(config: config)
   }
 
   // MARK: - Operation
@@ -416,11 +413,9 @@ struct SelectionSetTemplate {
 fileprivate class SelectionSetNameCache {
   private var generatedSelectionSetNames: [ObjectIdentifier: String] = [:]
 
-  unowned let schema: IR.Schema
   let config: ApolloCodegen.ConfigurationContext
 
-  init(schema: IR.Schema, config: ApolloCodegen.ConfigurationContext) {
-    self.schema = schema
+  init(config: ApolloCodegen.ConfigurationContext) {
     self.config = config
   }
 

Tests/ApolloCodegenInternalTestHelpers/IR+Mocking.swift

@@ -49,7 +49,7 @@ extension IR {
     schemaName: String = "TestSchema",
     compilationResult: CompilationResult
   ) -> IR {
-    return IR(schemaName: schemaName, compilationResult: compilationResult)
+    return IR(compilationResult: compilationResult)
   }
 
 }

Tests/ApolloCodegenTests/ApolloCodegenTests.swift

@@ -664,10 +664,7 @@ class ApolloCodegenTests: XCTestCase {
     // when
     let compilationResult = try ApolloCodegen.compileGraphQLResult(config)
 
-    let ir = IR(
-      schemaName: config.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     try ApolloCodegen.generateFiles(
       compilationResult: compilationResult,
@@ -763,10 +760,7 @@ class ApolloCodegenTests: XCTestCase {
     // when
     let compilationResult = try ApolloCodegen.compileGraphQLResult(config)
 
-    let ir = IR(
-      schemaName: config.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     try ApolloCodegen.generateFiles(
       compilationResult: compilationResult,
@@ -868,10 +862,7 @@ class ApolloCodegenTests: XCTestCase {
       experimentalFeatures: .init(clientControlledNullability: true)
     )
 
-    let ir = IR(
-      schemaName: config.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     try ApolloCodegen.generateFiles(
       compilationResult: compilationResult,
@@ -935,10 +926,7 @@ class ApolloCodegenTests: XCTestCase {
       experimentalFeatures: .init(clientControlledNullability: true)
     )
 
-    let ir = IR(
-      schemaName: config.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     try ApolloCodegen.generateFiles(
       compilationResult: compilationResult,
@@ -1039,10 +1027,7 @@ class ApolloCodegenTests: XCTestCase {
     // when
     let compilationResult = try ApolloCodegen.compileGraphQLResult(config)
 
-    let ir = IR(
-      schemaName: config.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     try ApolloCodegen.generateFiles(
       compilationResult: compilationResult,
@@ -1141,10 +1126,7 @@ class ApolloCodegenTests: XCTestCase {
     // when
     let compilationResult = try ApolloCodegen.compileGraphQLResult(config)
 
-    let ir = IR(
-      schemaName: config.schemaName,
-      compilationResult: compilationResult
-    )
+    let ir = IR(compilationResult: compilationResult)
 
     try ApolloCodegen.generateFiles(
       compilationResult: compilationResult,

Tests/ApolloCodegenTests/CodeGeneration/FileGenerators/FragmentFileGeneratorTests.swift

@@ -49,7 +49,6 @@ class FragmentFileGeneratorTests: XCTestCase {
 
     subject = FragmentFileGenerator(
       irFragment: irFragment,
-      schema: ir.schema,
       config: ApolloCodegen.ConfigurationContext(config: ApolloCodegenConfiguration.mock())
     )
   }

Tests/ApolloCodegenTests/CodeGeneration/FileGenerators/InputObjectFileGeneratorTests.swift

@@ -13,11 +13,9 @@ class InputObjectFileGeneratorTests: XCTestCase {
 
   // MARK: Test Helpers
 
-  private func buildSubject() {
-    let schema = IR.Schema(name: "TestSchema", referencedTypes: .init([]))    
+  private func buildSubject() { 
     subject = InputObjectFileGenerator(
       graphqlInputObject: graphqlInputObject,
-      schema: schema,
       config: ApolloCodegen.ConfigurationContext(config: ApolloCodegenConfiguration.mock())
     )
   }

Tests/ApolloCodegenTests/CodeGeneration/FileGenerators/OperationFileGeneratorTests.swift

@@ -45,7 +45,7 @@ class OperationFileGeneratorTests: XCTestCase {
 
     let config = ApolloCodegen.ConfigurationContext(config: ApolloCodegenConfiguration.mock())
 
-    subject = OperationFileGenerator(irOperation: irOperation, schema: ir.schema, config: config)
+    subject = OperationFileGenerator(irOperation: irOperation, config: config)
   }
 
   // MARK: Property Tests