Import statements update (w/tests)

Tests/ApolloCodegenTests/CodeGeneration/Templates/TemplateRenderer_OperationFile_Tests.swift

@@ -2,6 +2,7 @@ import XCTest
 @testable import ApolloCodegenLib
 @testable import ApolloCodegenInternalTestHelpers
 import Nimble
+import OrderedCollections
 
 class TemplateRenderer_OperationFile_Tests: XCTestCase {
 
@@ -21,8 +22,13 @@ class TemplateRenderer_OperationFile_Tests: XCTestCase {
     )
   }
 
-  private func buildSubject(config: ApolloCodegenConfiguration = .mock()) -> MockFileTemplate {
-    MockFileTemplate(target: .operationFile(), config: ApolloCodegen.ConfigurationContext(config: config))
+  private func buildSubject(
+    config: ApolloCodegenConfiguration = .mock(),
+    moduleImports: OrderedSet<String>? = nil
+  ) -> MockFileTemplate {
+    MockFileTemplate(
+      target: .operationFile(moduleImports: moduleImports),
+      config: ApolloCodegen.ConfigurationContext(config: config))
   }
 
   // MARK: Render Target .operationFile Tests
@@ -359,6 +365,32 @@ class TemplateRenderer_OperationFile_Tests: XCTestCase {
     expect(actual).to(equalLineByLine(expected, atLine: 6, ignoringExtraLines: true))
   }
 
+  func test__moduleImports__givenValues_shouldGenerateImportStatements() {
+    // given
+    let config = buildConfig(
+      moduleType: 
+          .embeddedInTarget(
+            name: "MockApplication",
+            accessModifier: .public),
+      operations: .inSchemaModule
+    )
+
+    let moduleImports = OrderedSet(["TestA", "TestB"])
+
+    let subject = buildSubject(config: config, moduleImports: moduleImports)
+
+    let expected = """
+    import TestA
+    import TestB
+    """
+
+    // when
+    let (actual, _) = subject.render()
+
+    // then
+    expect(actual).to(equalLineByLine(expected, atLine: 5, ignoringExtraLines: true))
+  }
+
   func test__casing__givenUppercasedSchemaName_shouldGenerateUppercasedNamespace() {
     // given
 

apollo-ios-codegen/Sources/ApolloCodegenLib/Templates/TemplateRenderer.swift

@@ -103,10 +103,17 @@ extension TemplateRenderer {
 
     let body = {
       switch target {
-      case let .schemaFile(type): return renderSchemaFile(type, errorRecorder)
-      case let .operationFile(moduleImports): return renderOperationFile(moduleImports, errorRecorder)
-      case .moduleFile: return renderModuleFile(errorRecorder)
-      case .testMockFile: return renderTestMockFile(errorRecorder)
+      case let .schemaFile(type): 
+        return renderSchemaFile(type, errorRecorder)
+
+      case let .operationFile(moduleImports):
+        return renderOperationFile(moduleImports, errorRecorder)
+
+      case .moduleFile:
+        return renderModuleFile(errorRecorder)
+
+      case .testMockFile:
+        return renderTestMockFile(errorRecorder)
       }
     }()
 
@@ -161,7 +168,7 @@ extension TemplateRenderer {
     """
     \(ifLet: renderHeaderTemplate(nonFatalErrorRecorder: errorRecorder), { "\($0)\n" })
     \(ImportStatementTemplate.Operation.template(for: config))
-    \(ifLet: ModuleImportStatementTemplate.template(moduleImports: moduleImports), { "\($0)" })
+    \(ifLet: moduleImports, { "\(ModuleImportStatementTemplate.template(moduleImports: $0))" })
 
     \(if: config.output.operations.isInModule && !config.output.schemaTypes.isInModule,
       renderBodyTemplate(nonFatalErrorRecorder: errorRecorder)
@@ -357,9 +364,8 @@ struct ImportStatementTemplate {
 struct ModuleImportStatementTemplate {
 
   static func template(
-    moduleImports: OrderedSet<String>?
-  ) -> TemplateString? {
-    guard let moduleImports else  { return nil }
+    moduleImports: OrderedSet<String>
+  ) -> TemplateString {
     return """
     \(moduleImports.map { "import \($0)" }.joined(separator: "\n"))
     """