[In Progress] Apollo iOS 2.0 - Base

.package.resolved

@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mattgallagher/CwlCatchException.git",
       "state" : {
-        "revision" : "3ef6999c73b6938cc0da422f2c912d0158abb0a0",
-        "version" : "2.2.0"
+        "revision" : "07b2ba21d361c223e25e3c1e924288742923f08c",
+        "version" : "2.2.1"
       }
     },
     {
       "identity" : "cwlpreconditiontesting",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
       "state" : {
-        "revision" : "2ef56b2caf25f55fa7eef8784c30d5a767550f54",
-        "version" : "2.2.1"
+        "revision" : "0139c665ebb45e6a9fbdb68aabfd7c39f3fe0071",
+        "version" : "2.2.2"
       }
     },
     {
@@ -32,26 +32,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Quick/Nimble.git",
       "state" : {
-        "revision" : "1c49fc1243018f81a7ea99cb5e0985b00096e9f4",
-        "version" : "13.3.0"
+        "revision" : "7795df4fff1a9cd231fe4867ae54f4dc5f5734f9",
+        "version" : "13.7.1"
       }
     },
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
-        "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
-        "version" : "1.4.0"
+        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
+        "version" : "1.5.0"
+      }
+    },
+    {
+      "identity" : "swift-atomics",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-atomics",
+      "state" : {
+        "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
+        "version" : "1.2.0"
       }
     },
     {
       "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
-        "version" : "1.1.1"
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
       }
     }
   ],

Tests/ApolloInternalTestHelpers/InterceptorTester.swift

@@ -15,7 +15,7 @@ public class InterceptorTester {
   public func intercept<Operation>(
     request: Apollo.HTTPRequest<Operation>,
     response: Apollo.HTTPResponse<Operation>? = nil,
-    completion: @escaping (Result<HTTPResponse<Operation>?, any Error>) -> Void
+    completion: @escaping @Sendable (Result<HTTPResponse<Operation>?, any Error>) -> Void
   ) {
     let requestChain = ResponseCaptureRequestChain<Operation>({ result in
       completion(result)
@@ -38,13 +38,13 @@ fileprivate class ResponseCaptureRequestChain<T: GraphQLOperation>: RequestChain
 
   func kickoff<Operation>(
     request: Apollo.HTTPRequest<Operation>,
-    completion: @escaping (Result<Apollo.GraphQLResult<Operation.Data>, any Error>) -> Void
+    completion: @escaping GraphQLResultHandler<Operation.Data>
   ) {}
 
   func proceedAsync<Operation>(
     request: Apollo.HTTPRequest<Operation>,
     response: Apollo.HTTPResponse<Operation>?,
-    completion: @escaping (Result<Apollo.GraphQLResult<Operation.Data>, any Error>) -> Void
+    completion: @escaping GraphQLResultHandler<Operation.Data>
   ) {
     self.completion(.success(response as? HTTPResponse<T>))
   }
@@ -53,7 +53,7 @@ fileprivate class ResponseCaptureRequestChain<T: GraphQLOperation>: RequestChain
     request: HTTPRequest<Operation>,
     response: HTTPResponse<Operation>?,
     interceptor: any ApolloInterceptor,
-    completion: @escaping (Result<GraphQLResult<Operation.Data>, any Error>) -> Void
+    completion: @escaping GraphQLResultHandler<Operation.Data>
   ) {
     self.completion(.success(response as? HTTPResponse<T>))
   }
@@ -62,21 +62,21 @@ fileprivate class ResponseCaptureRequestChain<T: GraphQLOperation>: RequestChain
 
   func retry<Operation>(
     request: Apollo.HTTPRequest<Operation>,
-    completion: @escaping (Result<Apollo.GraphQLResult<Operation.Data>, any Error>) -> Void
+    completion: @escaping GraphQLResultHandler<Operation.Data>
   ) {}
 
   func handleErrorAsync<Operation>(
     _ error: any Error,
     request: Apollo.HTTPRequest<Operation>,
     response: Apollo.HTTPResponse<Operation>?,
-    completion: @escaping (Result<Apollo.GraphQLResult<Operation.Data>, any Error>) -> Void
+    completion: @escaping GraphQLResultHandler<Operation.Data>
   ) {
     self.completion(.failure(error))
   }
 
   func returnValueAsync<Operation>(
     for request: Apollo.HTTPRequest<Operation>,
     value: Apollo.GraphQLResult<Operation.Data>,
-    completion: @escaping (Result<Apollo.GraphQLResult<Operation.Data>, any Error>) -> Void
+    completion: @escaping GraphQLResultHandler<Operation.Data>
   ) {}
 }

Tests/ApolloInternalTestHelpers/SelectionSet+TestHelpers.swift

@@ -1,15 +1,16 @@
 import ApolloAPI
 import Apollo
+import Foundation
 
 public extension SelectionSet {
 
-  var _rawData: [String: AnyHashable] { self.__data._data }
+  var _rawData: [String: DataDict.FieldValue] { self.__data._data }
 
   func hasNullValue(forKey key: String) -> Bool {
     guard let value = self.__data._data[key] else {
       return false
     }
-    return value == DataDict._NullValue
+    return value is NSNull
   }
 
 }

Tests/ApolloPaginationTests/ForwardPaginationTests.swift

@@ -124,7 +124,7 @@ final class ForwardPaginationTests: XCTestCase, CacheDependentTesting {
       "after": "Y3Vyc29yMg==",
     ]
 
-    let expectedVariables = Set(nextQuery.__variables?.values.compactMap { $0._jsonEncodableValue?._jsonValue } ?? [])
+    let expectedVariables = Set(nextQuery.__variables?.underlyingJsonValues ?? [])
     let actualVariables = try await XCTUnwrapping(await pager.nextPageVarMap.keys.first)
 
     XCTAssertEqual(expectedVariables.count, actualVariables.count)

Tests/ApolloTests/ApolloClientOperationTests.swift

@@ -62,8 +62,8 @@ final class ApolloClientOperationTests: XCTestCase {
         "__typename": "Review",
         "stars": 3,
         "commentary": ""
-      ]
-    ]
+      ] as JSONValue
+    ] as JSONValue
   ]
 
   func test__performMutation_givenPublishResultToStore_true_publishResultsToStore() throws {

Tests/ApolloTests/AutomaticPersistedQueriesTests.swift

@@ -69,16 +69,18 @@ class AutomaticPersistedQueriesTests: XCTestCase {
     operation: O,
     queryDocument: Bool = false,
     persistedQuery: Bool = false,
+    fileID: String = #fileID,
     file: Nimble.FileString = #filePath,
-    line: UInt = #line
+    line: UInt = #line,
+    column: UInt = #column
   ) throws {
-
+    let location = SourceLocation(fileID: fileID, filePath: file, line: line, column: column)
     guard
       let httpBody = request.httpBody,
-      let jsonBody = try? JSONSerializationFormat.deserialize(data: httpBody) as? JSONObject else {
+      let jsonBody = try? JSONSerializationFormat.deserialize(data: httpBody) as JSONObject else {
       fail(
         "httpBody invalid",
-        location: SourceLocation(file: file, line: line)
+        location: location
       )
       return
     }
@@ -102,7 +104,7 @@ class AutomaticPersistedQueriesTests: XCTestCase {
       } else {
         fail(
           "variables should not be nil",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
       }
     }
@@ -112,31 +114,31 @@ class AutomaticPersistedQueriesTests: XCTestCase {
       guard let ext = ext else {
         fail(
           "extensions json data should not be nil",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
 
       guard let persistedQuery = ext["persistedQuery"] as? JSONObject else {
         fail(
           "persistedQuery is missing",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
 
       guard let version = persistedQuery["version"] as? Int else {
         fail(
           "version is missing",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
 
       guard let sha256Hash = persistedQuery["sha256Hash"] as? String else {
         fail(
           "sha256Hash is missing",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
@@ -153,13 +155,16 @@ class AutomaticPersistedQueriesTests: XCTestCase {
     query: MockHeroNameQuery,
     queryDocument: Bool = false,
     persistedQuery: Bool = false,
+    fileID: String = #fileID,
     file: Nimble.FileString = #filePath,
-    line: UInt = #line
+    line: UInt = #line,
+    column: UInt = #column
   ) throws {
+    let location = SourceLocation(fileID: fileID, filePath: file, line: line, column: column)
     guard let url = request.url else {
       fail(
         "URL not valid",
-        location: SourceLocation(file: file, line: line)
+        location: location
       )
       return
     }
@@ -190,7 +195,7 @@ class AutomaticPersistedQueriesTests: XCTestCase {
     } else {
       fail(
         "variables should not be nil",
-        location: SourceLocation(file: file, line: line)
+        location: location
       )
     }
 
@@ -199,35 +204,35 @@ class AutomaticPersistedQueriesTests: XCTestCase {
       guard
         let ext = ext,
         let data = ext.data(using: .utf8),
-        let jsonBody = try? JSONSerializationFormat.deserialize(data: data) as? JSONObject
+        let jsonBody = try? JSONSerializationFormat.deserialize(data: data) as JSONObject
         else {
         fail(
           "extensions json data should not be nil",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
 
       guard let persistedQuery = jsonBody["persistedQuery"] as? JSONObject else {
         fail(
           "persistedQuery is missing",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
 
       guard let sha256Hash = persistedQuery["sha256Hash"] as? String else {
         fail(
           "sha256Hash is missing",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }
 
       guard let version = persistedQuery["version"] as? Int else {
         fail(
           "version is missing",
-          location: SourceLocation(file: file, line: line)
+          location: location
         )
         return
       }

Tests/ApolloTests/Cache/FetchQueryTests.swift

@@ -236,7 +236,7 @@ class FetchQueryTests: XCTestCase, CacheDependentTesting {
             "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
             "__typename": "Droid"
           ]
-        ]
+        ] as JSONValue
       ]
     }
 
@@ -411,7 +411,7 @@ class FetchQueryTests: XCTestCase, CacheDependentTesting {
     let query = MockQuery.mock()
 
     let serverRequestExpectation = server.expect(MockQuery<MockSelectionSet>.self) { request in
-      ["data": [:]]
+      ["data": [:] as JSONValue]
     }
 
     let resultObserver = makeResultObserver(for: query)

Tests/ApolloTests/Cache/LoadQueryFromStoreTests.swift

@@ -484,7 +484,7 @@ class LoadQueryFromStoreTests: XCTestCase, CacheDependentTesting, StoreLoading {
           CacheReference("1003")
         ]
       ],
-      "1000": ["__typename": "Human", "name": ["dictionary": "badValues", "nested bad val": ["subdictionary": "some value"] ]
+      "1000": ["__typename": "Human", "name": ["dictionary": "badValues", "nested bad val": ["subdictionary": "some value"] ] as JSONValue
       ],
       "1002": ["__typename": "Human", "name": "Han Solo"],
       "1003": ["__typename": "Human", "name": "Leia Organa"],

Tests/ApolloTests/Cache/ReadWriteFromStoreTests.swift

@@ -1816,11 +1816,11 @@ class ReadWriteFromStoreTests: XCTestCase, CacheDependentTesting, StoreLoading {
           override class var __selections: [Selection] {[
             .field("name", String.self),
             .include(if: !"c", .field("friend", Friend.self)),
-            .include(if: !"d", .field("other", String.self))
+            .include(if: !"d", .field("other", String?.self))
           ]}
           var name: String { __data["name"] }
           var friend: Friend? { __data["friend"] }
-          var other: String? { __data["name"] }
+          var other: String? { __data["other"] }
 
           convenience init(
             name: String,
@@ -2686,13 +2686,13 @@ class ReadWriteFromStoreTests: XCTestCase, CacheDependentTesting, StoreLoading {
         ]
       ],
       "1101": [
-        "__typename": "Human", "name": "Luke Skywalker", "id": "1101", "friends": []
+        "__typename": "Human", "name": "Luke Skywalker", "id": "1101", "friends": [] as JSONValue
       ],
       "1002": [
-        "__typename": "Human", "name": "Han Solo", "id": "1002", "friends": []
+        "__typename": "Human", "name": "Han Solo", "id": "1002", "friends": [] as JSONValue
       ],
       "1003": [
-        "__typename": "Human", "name": "Leia Organa", "id": "1003", "friends": []
+        "__typename": "Human", "name": "Leia Organa", "id": "1003", "friends": [] as JSONValue
       ],
     ])
 

Tests/ApolloTests/Cache/StoreConcurrencyTests.swift

@@ -207,7 +207,7 @@ class StoreConcurrencyTests: XCTestCase, CacheDependentTesting {
         "name": "R2-D2",
         "id": "2001",
         "__typename": "Droid",
-        "friends": []
+        "friends": [] as JSONValue
       ]
     ])
 
@@ -331,7 +331,7 @@ class StoreConcurrencyTests: XCTestCase, CacheDependentTesting {
         "name": "R2-D2",
         "id": "2001",
         "__typename": "Droid",
-        "friends": []
+        "friends": [] as JSONValue
       ]
     ])