Merge pull request #10 from futuredapp/feature/Update-to-Apollo-2.0.4

 Update to Apollo 2.0.4

Author: jmarek41

Package.resolved

@@ -20,7 +20,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/apollographql/apollo-ios.git",
-            exact: "1.17.0" // Do not forget to download related to this version Apollo CLI and include it with package
+            exact: "2.0.4"
         )
     ],
     targets: [

Package.swift

@@ -7,7 +7,7 @@ Developed to simplify [Futured](https://www.futured.app) in-house development of
 
 - iOS 16.0+ / macOS 13.0+
 - Swift 5.9+
-- Apollo iOS 1.17.0
+- Apollo iOS 2.0.4
 
 ## Limitations
 
@@ -51,7 +51,7 @@ Copy and paste json configuration to the newly created file:
     "schemaTypes" : {
       "path" : "./",
       "moduleType" : {
-        "swiftPackageManager": {}
+        "swiftPackage": {}
       }
     },
     "operations" : {
@@ -74,7 +74,7 @@ Add `Queries` and `Mutations` folders to `GraphQLGenerated` folder.
 #### 5. Define Your first GraphQL Query Or Mutation
 Add your first Query or Mutation and save it with `.graphql` extension to `Queries` or `Mutations` folders.
 
-#### 6. Add Xcode Biuld Phase Script
+#### 6. Add Xcode Build Phase Script
 At your main app's target add a new build phase named `Generate GraphQL Operations`.
 Move your newly created build phase above the `Compile Sources` phase.
 Add script:
@@ -120,11 +120,12 @@ let mutation = MyExampleMutation()
 import GraphQLAPIKit
 import GraphQLGenerated
 
-let apiAdapter = GraphQLAPIAdapter(
+let configuration = GraphQLAPIConfiguration(
     url: URL(string: "https://api.example.com/graphql")!
 )
-let queryResult = await apiAdapter.fetch(query: query)
-let mutationResult = await apiAdapter.perform(mutation: mutation)
+let apiAdapter = GraphQLAPIAdapter(configuration: configuration)
+let queryResult = try await apiAdapter.fetch(query: query)
+let mutationResult = try await apiAdapter.perform(mutation: mutation)
 ```
 
 ## Contributors

README.md

@@ -0,0 +1,38 @@
+import Foundation
+
+/// Configuration for initializing a GraphQL API adapter.
+///
+/// Use this struct to configure the GraphQL client with endpoint URL,
+/// session configuration, default headers, and network observers.
+public struct GraphQLAPIConfiguration: Sendable {
+    /// The GraphQL endpoint URL.
+    public let url: URL
+
+    /// URL session configuration. Defaults to `.default`.
+    public let urlSessionConfiguration: URLSessionConfiguration
+
+    /// Headers to include in every request.
+    public let defaultHeaders: [String: String]
+
+    /// Network observers for monitoring requests (logging, analytics, etc.).
+    public let networkObservers: [any GraphQLNetworkObserver]
+
+    /// Creates a new GraphQL API configuration.
+    ///
+    /// - Parameters:
+    ///   - url: The GraphQL endpoint URL.
+    ///   - urlSessionConfiguration: URL session configuration. Defaults to `.default`.
+    ///   - defaultHeaders: Headers to include in every request. Defaults to empty.
+    ///   - networkObservers: Network observers for monitoring requests. Defaults to empty.
+    public init(
+        url: URL,
+        urlSessionConfiguration: URLSessionConfiguration = .default,
+        defaultHeaders: [String: String] = [:],
+        networkObservers: [any GraphQLNetworkObserver] = []
+    ) {
+        self.url = url
+        self.urlSessionConfiguration = urlSessionConfiguration
+        self.defaultHeaders = defaultHeaders
+        self.networkObservers = networkObservers
+    }
+}

Resources/apollo-ios-cli

@@ -0,0 +1,24 @@
+import Foundation
+
+/// Base protocol for GraphQL operation configurations.
+///
+/// Defines common options shared across all GraphQL operations (queries, mutations, subscriptions).
+public protocol GraphQLOperationConfiguration: Sendable {
+    /// Additional headers to add to the request.
+    var headers: RequestHeaders? { get }
+}
+
+/// Configuration for GraphQL queries and mutations.
+///
+/// Use this struct to customize request-specific options like additional headers.
+public struct GraphQLRequestConfiguration: GraphQLOperationConfiguration {
+    /// Additional headers to add to the request.
+    public let headers: RequestHeaders?
+
+    /// Creates a new request configuration.
+    ///
+    /// - Parameter headers: Additional headers to add to the request. Defaults to `nil`.
+    public init(headers: RequestHeaders? = nil) {
+        self.headers = headers
+    }
+}

Sources/GraphQLAPIKit/Configuration/GraphQLAPIConfiguration.swift

@@ -1,5 +1,5 @@
 import Apollo
 
-struct ApolloError: Error {
+struct ApolloError: Error, Sendable {
     let errors: [Apollo.GraphQLError]
 }

Sources/GraphQLAPIKit/Configuration/GraphQLRequestConfiguration.swift

@@ -1,14 +1,14 @@
 import Apollo
 import Foundation
 
-public enum GraphQLAPIAdapterError: LocalizedError {
-    /// Network error received by Apollo from `URLSessionTaskDelegate`
+public enum GraphQLAPIAdapterError: LocalizedError, Sendable {
+    /// Network error with HTTP status code
     case network(code: Int, error: Error)
 
     /// The app is offline or doesn't have access to the network.
     case connection(Error)
 
-    /// Unhandled network error received from `Apollo.URLSessionClient`
+    /// Unhandled error
     case unhandled(Error)
 
     /// Request was cancelled
@@ -23,15 +23,31 @@ public enum GraphQLAPIAdapterError: LocalizedError {
             self = error
         } else if let error = error as? ApolloError {
             self = .graphQl(error.errors.map(GraphQLError.init))
-        } else if let error = error as? URLSessionClient.URLSessionClientError,
-                  case let URLSessionClient.URLSessionClientError.networkError(_, response, underlyingError) = error {
-            if let response = response {
-                self = .network(code: response.statusCode, error: underlyingError)
-            } else {
-                self = .connection(underlyingError)
+        } else if error is CancellationError {
+            self = .cancelled
+        } else if let urlError = error as? URLError {
+            switch urlError.code {
+            case .cancelled:
+                self = .cancelled
+            case .notConnectedToInternet, .networkConnectionLost, .dataNotAllowed:
+                self = .connection(urlError)
+            default:
+                self = .unhandled(urlError)
             }
         } else {
-            self = .unhandled(error)
+            let nsError = error as NSError
+            if nsError.domain == NSURLErrorDomain {
+                if nsError.code == NSURLErrorCancelled {
+                    self = .cancelled
+                } else if nsError.code == NSURLErrorNotConnectedToInternet ||
+                          nsError.code == NSURLErrorNetworkConnectionLost {
+                    self = .connection(error)
+                } else {
+                    self = .unhandled(error)
+                }
+            } else {
+                self = .unhandled(error)
+            }
         }
     }
 

Sources/GraphQLAPIKit/Errors/ApolloError.swift

@@ -1,7 +1,7 @@
 import Apollo
 import Foundation
 
-public struct GraphQLError: LocalizedError {
+public struct GraphQLError: LocalizedError, Sendable {
     public let message: String
     public let code: String?