Import statements update (w/tests)

.package.resolved

@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "a902f1823a7ff3c9ab2fba0f992396b948eda307",
-        "version" : "1.0.5"
+        "revision" : "d029d9d39c87bed85b1c50adee7c41795261a192",
+        "version" : "1.0.6"
       }
     }
   ],

Tests/ApolloCodegenTests/CodeGeneration/Templates/FragmentTemplateTests.swift

@@ -61,6 +61,30 @@ class FragmentTemplateTests: XCTestCase {
     subject.renderBodyTemplate(nonFatalErrorRecorder: .init()).description
   }
 
+  // MARK: - Target Configuration Tests
+
+  func test__target__givenModuleImports_targetHasModuleImports() async throws {
+    // given
+    document = """
+    fragment TestFragment on Query @import(module: "ModuleA") {
+      allAnimals {
+        species
+      }
+    }
+    """
+
+    // when
+    try await buildSubjectAndFragment()
+
+    guard case let .operationFile(actual) = subject.target else {
+      fail("expected operationFile target")
+      return
+    }
+
+    // then
+    expect(actual).to(equal(["ModuleA"]))
+  }
+
   // MARK: Fragment Definition
 
   func test__render__givenFragment_generatesFragmentDeclarationDefinitionAndBoilerplate() async throws {

Tests/ApolloCodegenTests/CodeGeneration/Templates/LocalCacheMutationDefinitionTemplateTests.swift

@@ -63,6 +63,30 @@ class LocalCacheMutationDefinitionTemplateTests: XCTestCase {
     subject.renderBodyTemplate(nonFatalErrorRecorder: .init()).description
   }
 
+  // MARK: - Target Configuration Tests
+
+  func test__target__givenModuleImports_targetHasModuleImports() async throws {
+    // given
+    document = """
+    query TestOperation @apollo_client_ios_localCacheMutation @import(module: "ModuleA") {
+      allAnimals {
+        species
+      }
+    }
+    """
+
+    // when
+    try await buildSubjectAndOperation()
+
+    guard case let .operationFile(actual) = subject.target else {
+      fail("expected operationFile target")
+      return
+    }
+
+    // then
+    expect(actual).to(equal(["ModuleA"]))
+  }
+
   // MARK: - Access Level Tests
 
   func test__generate__givenQuery_whenModuleTypeIsSwiftPackageManager_andOperationsInSchemaModule_generatesWithPublicAccess() async throws {

Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift

@@ -64,7 +64,31 @@ class OperationDefinitionTemplateTests: XCTestCase {
     subject.renderBodyTemplate(nonFatalErrorRecorder: .init()).description
   }
 
-  // MARK: - Operation Definition
+  // MARK: - Target Configuration Tests
+
+  func test__target__givenModuleImports_targetHasModuleImports() async throws {
+    // given
+    document = """
+    query TestOperation @import(module: "ModuleA") {
+      allAnimals {
+        species
+      }
+    }
+    """
+
+    // when
+    try await buildSubjectAndOperation()
+
+    guard case let .operationFile(actual) = subject.target else {
+      fail("expected operationFile target")
+      return
+    }
+
+    // then
+    expect(actual).to(equal(["ModuleA"]))
+  }
+
+  // MARK: - Operation Definition Tests
 
   func test__generate__givenQuery_generatesQueryOperation() async throws {
     // given

Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift

@@ -51,7 +51,7 @@
       )
     ))
     let mockTemplateRenderer = MockTemplateRenderer(
-      target: .operationFile,
+      target: .operationFile(),
       template: "",
       config: config
     )
@@ -1716,11 +1716,11 @@
     ))
   }
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests")
 
   // MARK: Selections - Deferred Named Fragment
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests")
 
   // MARK: Selections - Include/Skip
 
@@ -4664,11 +4664,11 @@
     ))
   }
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests")
 
   // MARK: Field Accessors - Deferred Named Fragments
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests")
 
   // MARK: - Inline Fragment Accessors
 
@@ -5522,11 +5522,11 @@
     ))
   }
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests")
 
   // MARK: Fragment Accessors - Deferred Named Fragment
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests")
 
   // MARK: - Nested Selection Sets
 
@@ -7532,7 +7532,7 @@
     ))
   }
 
   #warning("need more tests here - same test cases as IRRootFieldBuilderTests (inline fragment only")
 
   // MARK: - Documentation Tests
 

Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_ErrorHandling_Tests.swift

@@ -41,7 +41,7 @@ class SelectionSetTemplate_ErrorHandling_Tests: XCTestCase {
       options: .init()
     )
     let mockTemplateRenderer = MockTemplateRenderer(
-      target: .operationFile,
+      target: .operationFile(),
       template: "",
       config: .init(config: config)
     )
@@ -64,7 +64,7 @@ class SelectionSetTemplate_ErrorHandling_Tests: XCTestCase {
       options: .init()
     )
     let mockTemplateRenderer = MockTemplateRenderer(
-      target: .operationFile,
+      target: .operationFile(),
       template: "",
       config: .init(config: config)
     )

Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_Initializers_Tests.swift

@@ -42,7 +42,7 @@ class SelectionSetTemplate_Initializers_Tests: XCTestCase {
       options: .init()
     )
     let mockTemplateRenderer = MockTemplateRenderer(
-      target: .operationFile,
+      target: .operationFile(),
       template: "",
       config: .init(config: config)
     )
@@ -70,7 +70,7 @@ class SelectionSetTemplate_Initializers_Tests: XCTestCase {
       options: .init()
     )
     let mockTemplateRenderer = MockTemplateRenderer(
-      target: .operationFile,
+      target: .operationFile(),
       template: "",
       config: .init(config: config)
     )

Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift

@@ -43,7 +43,7 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase {
       )
     )
     let mockTemplateRenderer = MockTemplateRenderer(
-      target: .operationFile,
+      target: .operationFile(),
       template: "",
       config: config
     )

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