Squashed 'apollo-ios-codegen/' changes from 2fd9a7b5d..68aee5940

68aee5940 Merge 2.0 into main branch (#780)

git-subtree-dir: apollo-ios-codegen
git-subtree-split: 68aee594025266447ea93fc0273a432afa6c4c72

Author: gh-action-runner

Package.swift

@@ -1,7 +1,4 @@
-// swift-tools-version:5.9
-//
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-// Swift 5.9 is available from Xcode 15.0.
+// swift-tools-version:6.1
 
 import PackageDescription
 
@@ -36,7 +33,7 @@ let package = Package(
         .product(name: "InflectorKit", package: "InflectorKit"),
         .product(name: "OrderedCollections", package: "swift-collections")
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
     .target(
       name: "GraphQLCompiler",
@@ -47,7 +44,7 @@ let package = Package(
       exclude: [
         "JavaScript"
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
     .target(
       name: "IR",
@@ -57,17 +54,17 @@ let package = Package(
         "Utilities",
         .product(name: "OrderedCollections", package: "swift-collections")        
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
     .target(
       name: "TemplateString",
       dependencies: [],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
     .target(
       name: "Utilities",
       dependencies: [],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
     .executableTarget(
       name: "apollo-ios-cli",
@@ -77,15 +74,16 @@ let package = Package(
       exclude: [
         "README.md",
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
     .target(
       name: "CodegenCLI",
       dependencies: [
         "ApolloCodegenLib",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [.swiftLanguageMode(.v6)]
     ),
-  ]
+  ],
+  swiftLanguageModes: [.v6, .v5]
 )

Sources/ApolloCodegenLib/ApolloCodegen+Errors.swift

@@ -67,7 +67,7 @@ extension ApolloCodegen {
   /// Errors that may occur during code generation that are not fatal. If these errors are present,
   /// the generated files will likely not compile correctly. Code generation execution can continue,
   /// but these errors should be surfaced to the user.
-  public enum NonFatalError: Equatable {
+  public enum NonFatalError: Equatable, Sendable {
     case typeNameConflict(name: String, conflictingName: String, containingObject: String)
 
     var errorTypeName: String {

Sources/ApolloCodegenLib/ApolloCodegen.swift

@@ -8,12 +8,12 @@ import Utilities
 #if os(macOS)
 
 /// A class to facilitate running code generation
-public class ApolloCodegen {
+public final class ApolloCodegen: Sendable {
 
   // MARK: - Public
 
   /// OptionSet used to configure what items should be generated during code generation.
-  public struct ItemsToGenerate: OptionSet {
+  public struct ItemsToGenerate: OptionSet, Sendable {
     public var rawValue: Int
 
     /// Only generate your code (Operations, Fragments, Enums, etc), this option maintains the codegen functionality
@@ -81,7 +81,7 @@ public class ApolloCodegen {
   // MARK: - Internal
 
   @dynamicMemberLookup
-  class ConfigurationContext {
+  struct ConfigurationContext: Sendable, Equatable {
     let config: ApolloCodegenConfiguration
     let pluralizer: Pluralizer
     let rootURL: URL?
@@ -654,7 +654,7 @@ public class ApolloCodegen {
     let filePathsToDelete = await oldGeneratedFilePaths.subtracting(fileManager.writtenFiles)
 
     for path in filePathsToDelete {
-      try fileManager.deleteFile(atPath: path)
+      try await fileManager.deleteFile(atPath: path)
     }
   }
 

Sources/ApolloCodegenLib/ApolloSchemaDownloadConfiguration.swift

@@ -1,12 +1,12 @@
 import Foundation
 
 /// A configuration object that defines behavior for schema download.
-public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
+public struct ApolloSchemaDownloadConfiguration: Equatable, Codable, Sendable {
 
   // MARK: Types
 
   /// How to attempt to download your schema
-  public enum DownloadMethod: Equatable, Codable {
+  public enum DownloadMethod: Equatable, Codable, Sendable {
 
     /// The Apollo Schema Registry, which serves as a central hub for managing your graph.
     case apolloRegistry(_ settings: ApolloRegistrySettings)
@@ -18,7 +18,7 @@ public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
       includeDeprecatedInputValues: Bool = false
     )
 
-    public struct ApolloRegistrySettings: Equatable, Codable {
+    public struct ApolloRegistrySettings: Equatable, Codable, Sendable {
       /// The API key to use when retrieving your schema from the Apollo Registry.
       public let apiKey: String
       /// The identifier of the graph to fetch. Can be found in Apollo Studio.
@@ -68,7 +68,7 @@ public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
 
     /// The HTTP request method. This is an option on Introspection schema downloads only.
     /// Apollo Registry downloads are always POST requests.
-    public enum HTTPMethod: Equatable, CustomStringConvertible, Codable {
+    public enum HTTPMethod: Equatable, CustomStringConvertible, Codable, Sendable {
       /// Use POST for HTTP requests. This is the default for GraphQL.
       case POST
       /// Use GET for HTTP requests with the GraphQL query being sent in the query string
@@ -88,7 +88,7 @@ public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
     /// The output format for the downloaded schema. This is an option on Introspection schema
     /// downloads only. For Apollo Registry schema downloads, the schema will always be output as
     /// an SDL document
-    public enum OutputFormat: String, Equatable, CustomStringConvertible, Codable {
+    public enum OutputFormat: String, Equatable, CustomStringConvertible, Codable, Sendable {
       /// A Schema Definition Language (SDL) document defining the schema as described in
       /// the [GraphQL Specification](https://spec.graphql.org/draft/#sec-Schema)
       case SDL
@@ -117,7 +117,7 @@ public struct ApolloSchemaDownloadConfiguration: Equatable, Codable {
   }
 
   /// An HTTP header that will be sent in the schema download request.
-  public struct HTTPHeader: Equatable, CustomDebugStringConvertible, Codable {
+  public struct HTTPHeader: Equatable, Sendable, CustomDebugStringConvertible, Codable {
     /// The name of the header field. HTTP header field names are case insensitive.
     let key: String
     /// The value for the header field.

Sources/ApolloCodegenLib/ApolloSchemaDownloader.swift

@@ -56,7 +56,7 @@ public struct ApolloSchemaDownloader {
     withRootURL rootURL: URL? = nil,
     session: (any NetworkSession)? = nil
   ) async throws {
-    try ApolloFileManager.default.createContainingDirectoryIfNeeded(
+    try await ApolloFileManager.default.createContainingDirectoryIfNeeded(
       forPath: configuration.outputPath
     )
 

Sources/ApolloCodegenLib/CodegenConfiguration/ApolloCodegenConfiguration+OperationManifestConfiguration.swift

@@ -2,16 +2,16 @@ import Foundation
 
 extension ApolloCodegenConfiguration {
 
-  public struct OperationManifestConfiguration: Codable, Equatable {
-    
+  public struct OperationManifestConfiguration: Codable, Equatable, Sendable {
+
     // MARK: - Properties
 
     /// Local path where the generated operation manifest file should be written.
     public let path: String
     /// The version format to use when generating the operation manifest. Defaults to `.persistedQueries`.
     public let version: Version
 
-    public enum Version: String, Codable, Equatable {
+    public enum Version: String, Codable, Equatable, Sendable {
       /// Generates an operation manifest for use with persisted queries.
       case persistedQueries
       /// Generates an operation manifest in the legacy safelisting format used prior to the

Sources/ApolloCodegenLib/CodegenConfiguration/ApolloCodegenConfiguration+SchemaCustomization.swift

@@ -2,8 +2,8 @@ import Foundation
 
 extension ApolloCodegenConfiguration {
 
-  public struct SchemaCustomization: Codable, Equatable {
-    
+  public struct SchemaCustomization: Codable, Equatable, Sendable {
+
     // MARK: - Properties
 
     /// Dictionary with Keys representing the types being renamed/customized, and
@@ -54,7 +54,7 @@ extension ApolloCodegenConfiguration {
 
     // MARK: - Enums
 
-    public enum CustomSchemaTypeName: Codable, ExpressibleByStringLiteral, Equatable {
+    public enum CustomSchemaTypeName: Codable, ExpressibleByStringLiteral, Equatable, Sendable {
       case type(name: String)
       case `enum`(name: String?, cases: [String: String]?)
       case inputObject(name: String?, fields: [String: String]?)