Field Merging [5/x] Move fieldMerging option to experimental

Tests/ApolloCodegenInternalTestHelpers/MockApolloCodegenConfiguration.swift

@@ -30,6 +30,7 @@ extension ApolloCodegenConfiguration {
   public static func mock(
     _ moduleType: ApolloCodegenConfiguration.SchemaTypesFileOutput.ModuleType,
     options: ApolloCodegenConfiguration.OutputOptions = .init(),
+    experimentalFeatures: ExperimentalFeatures = .init(),
     schemaNamespace: String = "TestSchema",
     to path: String = "MockModulePath"
   ) -> Self {
@@ -42,7 +43,8 @@ extension ApolloCodegenConfiguration {
       output: .init(
         schemaTypes: .init(path: path, moduleType: moduleType)
       ),
-      options: options
+      options: options,
+      experimentalFeatures: experimentalFeatures
     )
   }
 }

Tests/ApolloCodegenTests/ApolloCodegenConfigurationCodableTests.swift

@@ -43,7 +43,6 @@ class ApolloCodegenConfigurationCodableTests: XCTestCase {
           ],
           deprecatedEnumCases: .exclude,
           schemaDocumentation: .exclude,
-          fieldMerging: .all,
           cocoapodsCompatibleImportStatements: true,
           warningsOnDeprecatedUsage: .exclude,
           conversionStrategies:.init(
@@ -55,6 +54,7 @@ class ApolloCodegenConfigurationCodableTests: XCTestCase {
           markOperationDefinitionsAsFinal: true
         ),
         experimentalFeatures: .init(
+          fieldMerging: .all,
           legacySafelistingCompatibleOperations: true
         ),
         operationManifest: .init(
@@ -69,6 +69,9 @@ class ApolloCodegenConfigurationCodableTests: XCTestCase {
       """
       {
         "experimentalFeatures" : {
+          "fieldMerging" : [
+            "all"
+          ],
           "legacySafelistingCompatibleOperations" : true
         },
         "input" : {
@@ -100,9 +103,6 @@ class ApolloCodegenConfigurationCodableTests: XCTestCase {
             "inputObjects" : "none"
           },
           "deprecatedEnumCases" : "exclude",
-          "fieldMerging" : [
-            "all"
-          ],
           "markOperationDefinitionsAsFinal" : true,
           "operationDocumentFormat" : [
             "definition"

Tests/ApolloCodegenTests/ApolloCodegenTests.swift

@@ -2374,6 +2374,46 @@ class ApolloCodegenTests: XCTestCase {
     })
   }
 
+  func test__validation__givenFieldMerging_notAll_andSelectionSetInitializers_enabled_shouldThrowError() throws {
+    // given
+    let fieldMergingOptions: [ApolloCodegenConfiguration.FieldMerging] = [
+      .none,
+      .ancestors,
+      .namedFragments,
+      .siblings,
+      [.ancestors, .namedFragments],
+      [.siblings, .ancestors],
+      [.siblings, .namedFragments]
+    ]
+    let initializerOptions: [ApolloCodegenConfiguration.SelectionSetInitializers] = [
+      .all,
+      .localCacheMutations,
+      .operations,
+      .namedFragments,
+      .fragment(named: "TestFragment"),
+      [.operations, .localCacheMutations]
+    ]
+
+    for fieldMergingOption in fieldMergingOptions {
+      for initializerOption in initializerOptions {
+
+        let config = ApolloCodegenConfiguration.mock(
+          .other,
+          options: .init(
+            selectionSetInitializers: initializerOption
+          ),
+          experimentalFeatures: .init(
+            fieldMerging: fieldMergingOption
+          )
+        )
+
+        // then
+        expect(try ApolloCodegen._validate(config: config))
+          .to(throwError(ApolloCodegen.Error.fieldMergingIncompatibility))
+      }
+    }
+  }
+
   // MARK: Path Match Exclusion Tests
 
   func test__match__givenFilesInSpecialExcludedPaths_shouldNotReturnExcludedPaths() throws {

Tests/ApolloCodegenTests/CodeGeneration/Templates/FragmentTemplateTests.swift

@@ -653,9 +653,9 @@ class FragmentTemplateTests: XCTestCase {
       // when
       try await buildSubjectAndFragment(config: .mock(
         options: .init(
-          selectionSetInitializers: [.all],
-          fieldMerging: test
-        )
+          selectionSetInitializers: [.all]
+        ),
+        experimentalFeatures: .init(fieldMerging: test)
       ))
 
       let actual = renderSubject()

Tests/ApolloCodegenTests/CodeGeneration/Templates/OperationDefinitionTemplateTests.swift

@@ -312,7 +312,7 @@
     throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")
 
     // given
     schemaSDL = """
     type Query {
       allAnimals: [Animal!]
     }
@@ -352,7 +352,7 @@
     throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")
 
     // given
     schemaSDL = """
     type Query {
       allAnimals: [Animal!]
     }
@@ -394,7 +394,7 @@
     throw XCTSkip("Skipped in PR #235 - must be reverted when the feature/defer-execution-networking branch is merged into main!")
 
     // given
     schemaSDL = """
     type Query {
       allAnimals: [Animal!]
     }
@@ -669,9 +669,9 @@
 
       config = .mock(
         options: .init(
-          selectionSetInitializers: [.all],
-          fieldMerging: test
-        )
+          selectionSetInitializers: [.all]
+        ),
+        experimentalFeatures: .init(fieldMerging: test)
       )
 
       // when

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

@@ -44,7 +44,7 @@ class SelectionSetTemplate_ErrorHandling_Tests: XCTestCase {
     let config = ApolloCodegenConfiguration.mock(
       schemaNamespace: "TestSchema",
       output: .mock(moduleType: .swiftPackageManager, operations: .inSchemaModule),
-      options: .init(
+      experimentalFeatures: .init(
         fieldMerging: fieldMerging
       )
     )

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

@@ -52,11 +52,11 @@ class SelectionSetTemplate_FieldMerging_Tests: XCTestCase {
       options: .init(
         additionalInflectionRules: inflectionRules,
         schemaDocumentation: schemaDocumentation,
-        fieldMerging: fieldMerging,
         cocoapodsCompatibleImportStatements: cocoapodsImportStatements,
         warningsOnDeprecatedUsage: warningsOnDeprecatedUsage,
         conversionStrategies: conversionStrategies
-      )
+      ),
+      experimentalFeatures: .init(fieldMerging: fieldMerging)
     ))
     let mockTemplateRenderer = MockTemplateRenderer(
       target: .operationFile(),

apollo-ios-codegen/Sources/ApolloCodegenLib/ApolloCodegen+Errors.swift

@@ -17,6 +17,7 @@ extension ApolloCodegen {
     case invalidConfiguration(message: String)
     case invalidSchemaName(_ name: String, message: String)
     case targetNameConflict(name: String)
+    case fieldMergingIncompatibility
 
     public var errorDescription: String? {
       switch self {
@@ -52,6 +53,13 @@ extension ApolloCodegen {
           Target name '\(name)' conflicts with a reserved library name. Please choose a different \
           target name.
           """
+      case .fieldMergingIncompatibility:
+        return """
+          Options for disabling 'fieldMerging' and enabling 'selectionSetInitializers' are
+          incompatible.
+
+          Please set either 'fieldMerging' to 'all' or 'selectionSetInitializers' to be empty.
+          """
       }
     }
   }