feature: Adding codegen config support for spm module type versions (#…

…539)
apollographql · Nov 27, 2024 · c528c4d · c528c4d
1 parent ce26b2d
commit c528c4d
Show file tree

Hide file tree

Showing 39 changed files with 1,795 additions and 225 deletions.
diff --git a/Tests/ApolloCodegenTests/ApolloCodegenConfigurationCodableTests.swift b/Tests/ApolloCodegenTests/ApolloCodegenConfigurationCodableTests.swift
diff --git a/Tests/ApolloCodegenTests/ApolloCodegenTests.swift b/Tests/ApolloCodegenTests/ApolloCodegenTests.swift
@@ -640,7 +640,7 @@ class ApolloCodegenTests: XCTestCase {
         operationSearchPaths: [operationsPath]
       ),
       output: .mock(
-        moduleType: .swiftPackageManager,
+        moduleType: .swiftPackage(),
         operations: .inSchemaModule,
         path: directoryURL.path
       )
@@ -756,7 +756,7 @@ class ApolloCodegenTests: XCTestCase {
         operationSearchPaths: [operationsPath]
       ),
       output: .mock(
-        moduleType: .swiftPackageManager,
+        moduleType: .swiftPackage(),
         operations: .absolute(path: operationsOutputURL.path),
         path: directoryURL.path
       )
@@ -862,7 +862,7 @@ class ApolloCodegenTests: XCTestCase {
       input: .init(schemaPath: schemaPath, operationSearchPaths: [operationsPath]),
       output: .init(
         schemaTypes: .init(path: directoryURL.path,
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .inSchemaModule,
         testMocks: .absolute(path: directoryURL.appendingPathComponent("TestMocks").path)
       )
@@ -938,7 +938,7 @@ class ApolloCodegenTests: XCTestCase {
         operationSearchPaths: [operationsPath]
       ),
       output: .mock(
-        moduleType: .swiftPackageManager,
+        moduleType: .swiftPackage(),
         operations: .inSchemaModule,
         path: "./RelativePath"
       )
@@ -1051,7 +1051,7 @@ class ApolloCodegenTests: XCTestCase {
         operationSearchPaths: [operationsPath]
       ),
       output: .mock(
-        moduleType: .swiftPackageManager,
+        moduleType: .swiftPackage(),
         operations: .absolute(path: "./RelativeOperations"),
         path: "./RelativePath"
       )
@@ -1183,7 +1183,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .inSchemaModule
       ),
       options: .init(pruneGeneratedFiles: false)
@@ -1241,7 +1241,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .inSchemaModule
       )
     )
@@ -1295,7 +1295,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .absolute(path: "OperationPath")
       )
     )
@@ -1364,7 +1364,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .relative(subpath: nil)
       )
     )
@@ -1437,7 +1437,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .relative(subpath: nil)
       )
     )
@@ -1489,7 +1489,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: schemaDirectory,
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .relative(subpath: relativeSubPath)
       ),
       options: .init(
@@ -1586,7 +1586,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .relative(subpath: "subpath")
       )
     )
@@ -1694,7 +1694,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .relative(subpath: "subpath")
       )
     )
@@ -1796,7 +1796,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .relative(subpath: "subpath")
       )
     )
@@ -1860,7 +1860,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .inSchemaModule,
         testMocks: .absolute(path: absolutePath)
       )
@@ -1917,7 +1917,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         testMocks: .swiftPackage()
       )
     )
@@ -1975,7 +1975,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         testMocks: .swiftPackage(targetName: testMockTargetName)
       )
     )
@@ -2285,7 +2285,7 @@ class ApolloCodegenTests: XCTestCase {
   func test__validation__givenSchemaTypesModule_swiftPackageManager_withCocoapodsCompatibleImportStatements_true_shouldThrow() throws {
     // given
     let config = ApolloCodegenConfiguration.mock(
-      .swiftPackageManager,
+      .swiftPackage(),
       options: .init(cocoapodsCompatibleImportStatements: true)
     )
 
@@ -2301,7 +2301,7 @@ class ApolloCodegenTests: XCTestCase {
   func test__validation__givenSchemaTypesModule_swiftPackageManager_withCocoapodsCompatibleImportStatements_false_shouldNotThrow() throws {
     // given
     let config = ApolloCodegenConfiguration.mock(
-      .swiftPackageManager,
+      .swiftPackage(),
       options: .init(cocoapodsCompatibleImportStatements: false)
     )
 
@@ -2387,7 +2387,7 @@ class ApolloCodegenTests: XCTestCase {
       ),
       output: .init(
         schemaTypes: .init(path: "SchemaModule",
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .inSchemaModule
       )
     )
@@ -2538,7 +2538,7 @@ class ApolloCodegenTests: XCTestCase {
       input: .init(schemaPath: schemaPath, operationSearchPaths: [operationsPath]),
       output: .init(
         schemaTypes: .init(path: directoryURL.path,
-                           moduleType: .swiftPackageManager),
+                           moduleType: .swiftPackage()),
         operations: .inSchemaModule
       ),
       options: .init(

diff --git a/Tests/ApolloCodegenTests/CodeGeneration/FileGenerators/FileGeneratorTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/FileGenerators/FileGeneratorTests.swift
@@ -30,7 +30,7 @@ class FileGeneratorTests: XCTestCase {
 
   private func buildConfig() {
     let mockedConfig = ApolloCodegenConfiguration.mock(output: .mock(
-      moduleType: .swiftPackageManager,      
+      moduleType: .swiftPackage(),      
       operations: .inSchemaModule
     ))