Squashed 'apollo-ios-codegen/' changes from 363f942c..d48baeb7

d48baeb7 Added Existential Any requirement (#379) git-subtree-dir: apollo-ios-codegen git-subtree-split: d48baeb705e8ede2247e8ebbf2fae5c6fd0430df
apollographql · Jun 6, 2024 · f7414b4 · f7414b4
1 parent a507b72
commit f7414b4
Show file tree

Hide file tree

Showing 34 changed files with 100 additions and 93 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -33,7 +33,8 @@ let package = Package(
         "TemplateString",
         .product(name: "InflectorKit", package: "InflectorKit"),
         .product(name: "OrderedCollections", package: "swift-collections")
-      ]
+      ],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
     .target(
       name: "GraphQLCompiler",
@@ -43,7 +44,8 @@ let package = Package(
       ],
       exclude: [
         "JavaScript"
-      ]
+      ],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
     .target(
       name: "IR",
@@ -52,15 +54,18 @@ let package = Package(
         "TemplateString",
         "Utilities",
         .product(name: "OrderedCollections", package: "swift-collections")        
-      ]
+      ],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
     .target(
       name: "TemplateString",
-      dependencies: []
+      dependencies: [],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
     .target(
       name: "Utilities",
-      dependencies: []
+      dependencies: [],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
     .executableTarget(
       name: "apollo-ios-cli",
@@ -69,14 +74,16 @@ let package = Package(
       ],
       exclude: [
         "README.md",
-      ]
+      ],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
     .target(
       name: "CodegenCLI",
       dependencies: [
         "ApolloCodegenLib",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
-      ]
+      ],
+      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
     ),
   ]
 )
diff --git a/Sources/ApolloCodegenLib/ApolloCodegen.swift b/Sources/ApolloCodegenLib/ApolloCodegen.swift
@@ -553,7 +553,7 @@ public class ApolloCodegen {
 
 extension ApolloCodegen {
   fileprivate func nonFatalErrorCollectingTaskGroup(
-    _ block: (inout ThrowingTaskGroup<NonFatalErrors.DefinitionEntry, Swift.Error>) async throws -> Void
+    _ block: (inout ThrowingTaskGroup<NonFatalErrors.DefinitionEntry, any Swift.Error>) async throws -> Void
   ) async throws -> NonFatalErrors {
     return try await withThrowingTaskGroup(
       of: (NonFatalErrors.DefinitionEntry).self
@@ -571,8 +571,8 @@ extension ApolloCodegen {
   }
 
   fileprivate func addFileGenerationTask(
-    for fileGenerator: FileGenerator,
-    to group: inout ThrowingTaskGroup<ApolloCodegen.NonFatalErrors.DefinitionEntry, Swift.Error>,
+    for fileGenerator: any FileGenerator,
+    to group: inout ThrowingTaskGroup<ApolloCodegen.NonFatalErrors.DefinitionEntry, any Swift.Error>,
     fileManager: ApolloFileManager
   ) {
     let config = config

diff --git a/Sources/ApolloCodegenLib/ApolloCodegenConfiguration.swift b/Sources/ApolloCodegenLib/ApolloCodegenConfiguration.swift
@@ -210,7 +210,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
 
     /// `Decodable` implementation to allow for properties to be optional in the encoded JSON with
     /// specified defaults when not present.
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let values = try decoder.container(keyedBy: CodingKeys.self)
       try throwIfContainsUnexpectedKey(container: values, type: Self.self, decoder: decoder)
       schemaTypes = try values.decode(
@@ -232,7 +232,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       )
     }
 
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
       var container = encoder.container(keyedBy: CodingKeys.self)
 
       try container.encode(self.schemaTypes, forKey: .schemaTypes)
@@ -294,7 +294,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       /// location.
       case other
 
-      public init(from decoder: Decoder) throws {
+      public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
         guard let key = container.allKeys.first else {
@@ -344,7 +344,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
     /// control the visibility of generated code, defaults to `.public`.
     case absolute(path: String, accessModifier: AccessModifier = .public)
 
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let container = try decoder.container(keyedBy: CodingKeys.self)
 
       guard let key = container.allKeys.first else {
@@ -414,7 +414,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
     /// will fail.
     case swiftPackage(targetName: String? = nil)
 
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let container = try decoder.container(keyedBy: CodingKeys.self)
 
       guard let key = container.allKeys.first else {
@@ -581,7 +581,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       case markOperationDefinitionsAsFinal
     }
 
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let values = try decoder.container(keyedBy: CodingKeys.self)
       try throwIfContainsUnexpectedKey(container: values, type: Self.self, decoder: decoder)
 
@@ -641,7 +641,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       ) ?? Default.markOperationDefinitionsAsFinal
     }
 
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
       var container = encoder.container(keyedBy: CodingKeys.self)
 
       try container.encode(self.additionalInflectionRules, forKey: .additionalInflectionRules)
@@ -744,7 +744,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
     }
 
     @available(*, deprecated) // Deprecation attribute added to supress warning.
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let values = try decoder.container(keyedBy: CodingKeys.self)
       guard values.allKeys.first != nil else {
         throw DecodingError.typeMismatch(Self.self, DecodingError.Context.init(
@@ -804,7 +804,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       case operationId
     }
 
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       self = OperationDocumentFormat(rawValue: 0)
 
       var container = try decoder.unkeyedContainer()
@@ -828,7 +828,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       }
     }
 
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
       var container = encoder.unkeyedContainer()
       if self.contains(.definition) {
         try container.encode(CodingKeys.definition.rawValue)
@@ -931,7 +931,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
       case legacySafelistingCompatibleOperations
     }
 
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let values = try decoder.container(keyedBy: CodingKeys.self)
 
       legacySafelistingCompatibleOperations = try values.decodeIfPresent(
@@ -1015,7 +1015,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
     case operationManifest
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     try container.encode(self.schemaNamespace, forKey: .schemaNamespace)
@@ -1033,7 +1033,7 @@ public struct ApolloCodegenConfiguration: Codable, Equatable {
     }
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let values = try decoder.container(keyedBy: CodingKeys.self)
     try throwIfContainsUnexpectedKey(container: values, type: Self.self, decoder: decoder)
 
@@ -1177,7 +1177,7 @@ extension ApolloCodegenConfiguration.SelectionSetInitializers {
     case definitionsNamed
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let values = try decoder.container(keyedBy: CodingKeys.self)
     try throwIfContainsUnexpectedKey(container: values, type: Self.self, decoder: decoder)
     var options: Options = []
@@ -1198,7 +1198,7 @@ extension ApolloCodegenConfiguration.SelectionSetInitializers {
       forKey: .definitionsNamed) ?? []
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     func encodeIfPresent(option: Options, forKey key: CodingKeys) throws {
@@ -1502,7 +1502,7 @@ private struct AnyCodingKey: CodingKey {
 func throwIfContainsUnexpectedKey<T, C: CodingKey & CaseIterable>(
   container: KeyedDecodingContainer<C>,
   type: T.Type,
-  decoder: Decoder
+  decoder: any Decoder
 ) throws {
   // Map all keys from the input object
   let allKeys = Set(try decoder.container(keyedBy: AnyCodingKey.self).allKeys.map(\.stringValue))

diff --git a/Sources/ApolloCodegenLib/ApolloSchemaDownloadConfiguration.swift b/Sources/ApolloCodegenLib/ApolloSchemaDownloadConfiguration.swift
@@ -53,7 +53,7 @@ public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
         case variant
       }
 
-      public init(from decoder: Decoder) throws {
+      public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
         self.apiKey = try container.decode(String.self, forKey: .apiKey)
@@ -185,7 +185,7 @@ public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
     case outputPath
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     self.downloadMethod = try container.decode(DownloadMethod.self, forKey: .downloadMethod)

diff --git a/Sources/ApolloCodegenLib/ApolloSchemaDownloader.swift b/Sources/ApolloCodegenLib/ApolloSchemaDownloader.swift
@@ -8,13 +8,13 @@ import GraphQLCompiler
 public struct ApolloSchemaDownloader {
 
   public enum SchemaDownloadError: Swift.Error, LocalizedError {
-    case downloadedRegistryJSONFileNotFound(underlying: Error)
-    case downloadedIntrospectionJSONFileNotFound(underlying: Error)
-    case couldNotParseRegistryJSON(underlying: Error)
+    case downloadedRegistryJSONFileNotFound(underlying: any Error)
+    case downloadedIntrospectionJSONFileNotFound(underlying: any Error)
+    case couldNotParseRegistryJSON(underlying: any Error)
     case unexpectedRegistryJSONType
     case couldNotExtractSDLFromRegistryJSON
     case couldNotCreateSDLDataToWrite(schema: String)
-    case couldNotConvertIntrospectionJSONToSDL(underlying: Error)
+    case couldNotConvertIntrospectionJSONToSDL(underlying: any Error)
     case couldNotCreateURLComponentsFromEndpointURL(url: URL)
     case couldNotGetURLFromURLComponents(components: URLComponents)
 
@@ -54,7 +54,7 @@ public struct ApolloSchemaDownloader {
   public static func fetch(
     configuration: ApolloSchemaDownloadConfiguration,
     withRootURL rootURL: URL? = nil,
-    session: NetworkSession? = nil
+    session: (any NetworkSession)? = nil
   ) async throws {
     try ApolloFileManager.default.createContainingDirectoryIfNeeded(
       forPath: configuration.outputPath
@@ -143,7 +143,7 @@ public struct ApolloSchemaDownloader {
     registry: ApolloSchemaDownloadConfiguration.DownloadMethod.ApolloRegistrySettings,
     configuration: ApolloSchemaDownloadConfiguration,
     withRootURL rootURL: URL?,
-    session: NetworkSession? = nil
+    session: (any NetworkSession)? = nil
   ) async throws {
     CodegenLogger.log("Downloading schema from registry", logLevel: .debug)
 
@@ -347,7 +347,7 @@ public struct ApolloSchemaDownloader {
     includeDeprecatedInputValues: Bool,
     configuration: ApolloSchemaDownloadConfiguration,
     withRootURL: URL?,
-    session: NetworkSession? = nil
+    session: (any NetworkSession)? = nil
   ) async throws {
 
     CodegenLogger.log("Downloading schema via introspection from \(endpoint)", logLevel: .debug)

diff --git a/...nLib/CodegenConfiguration/ApolloCodegenConfiguration+OperationManifestConfiguration.swift b/...nLib/CodegenConfiguration/ApolloCodegenConfiguration+OperationManifestConfiguration.swift
@@ -54,7 +54,7 @@ extension ApolloCodegenConfiguration {
       case generateManifestOnCodeGeneration
     }
 
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
       let values = try decoder.container(keyedBy: CodingKeys.self)
       try throwIfContainsUnexpectedKey(
         container: values,
@@ -78,7 +78,7 @@ extension ApolloCodegenConfiguration {
       )
     }
 
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
       var container = encoder.container(keyedBy: CodingKeys.self)
 
       try container.encode(self.path, forKey: .path)

diff --git a/Sources/ApolloCodegenLib/FileGenerators/CustomScalarFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/CustomScalarFileGenerator.swift
@@ -8,7 +8,7 @@ struct CustomScalarFileGenerator: FileGenerator {
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     CustomScalarTemplate(graphqlScalar: graphqlScalar, config: config)
   }
 

diff --git a/Sources/ApolloCodegenLib/FileGenerators/EnumFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/EnumFileGenerator.swift
@@ -8,7 +8,7 @@ struct EnumFileGenerator: FileGenerator {
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     EnumTemplate(graphqlEnum: graphqlEnum, config: config)
   }
 

diff --git a/Sources/ApolloCodegenLib/FileGenerators/FileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/FileGenerator.swift
@@ -8,7 +8,7 @@ protocol FileGenerator {
   var fileName: String { get }
   var fileExtension: String { get }
   var overwrite: Bool { get }
-  var template: TemplateRenderer { get }
+  var template: any TemplateRenderer { get }
   var target: FileTarget { get }
 }
 

diff --git a/Sources/ApolloCodegenLib/FileGenerators/FragmentFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/FragmentFileGenerator.swift
@@ -8,7 +8,7 @@ struct FragmentFileGenerator: FileGenerator {
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer { FragmentTemplate(
+  var template: any TemplateRenderer { FragmentTemplate(
     fragment: irFragment,
     config: config
   ) }

diff --git a/Sources/ApolloCodegenLib/FileGenerators/InputObjectFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/InputObjectFileGenerator.swift
@@ -9,7 +9,7 @@ struct InputObjectFileGenerator: FileGenerator {
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     InputObjectTemplate(graphqlInputObject: graphqlInputObject, config: config)
   }
   var target: FileTarget { .inputObject }

diff --git a/Sources/ApolloCodegenLib/FileGenerators/InterfaceFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/InterfaceFileGenerator.swift
@@ -8,7 +8,7 @@ struct InterfaceFileGenerator: FileGenerator {
   /// Shared codegen configuration.
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     InterfaceTemplate(graphqlInterface: graphqlInterface, config: config)
   }
 

diff --git a/Sources/ApolloCodegenLib/FileGenerators/MockInterfacesFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/MockInterfacesFileGenerator.swift
@@ -18,7 +18,7 @@ struct MockInterfacesFileGenerator: FileGenerator {
     self.config = config
   }
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     MockInterfacesTemplate(
       graphQLInterfaces: graphQLInterfaces,
       config: config

diff --git a/Sources/ApolloCodegenLib/FileGenerators/MockObjectFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/MockObjectFileGenerator.swift
@@ -13,7 +13,7 @@ struct MockObjectFileGenerator: FileGenerator {
 
   let config: ApolloCodegen.ConfigurationContext
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     MockObjectTemplate(
       graphqlObject: graphqlObject,
       fields: fields,

diff --git a/Sources/ApolloCodegenLib/FileGenerators/MockUnionsFileGenerator.swift b/Sources/ApolloCodegenLib/FileGenerators/MockUnionsFileGenerator.swift
@@ -18,7 +18,7 @@ struct MockUnionsFileGenerator: FileGenerator {
     self.config = config
   }
 
-  var template: TemplateRenderer {
+  var template: any TemplateRenderer {
     MockUnionsTemplate(
       graphQLUnions: graphQLUnions,
       config: config