[In Progress] Apollo iOS 2.0 - Base

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

@@ -75,7 +75,7 @@ class AutomaticPersistedQueriesTests: XCTestCase {
 
     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)
@@ -199,7 +199,7 @@ 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",

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

@@ -373,7 +373,7 @@
       "hero": [
         "name": "R2-D2",
         "__typename": "Droid",
         "friends": [
           CacheReference("hero.friends.0"),
           NSNull(),
         ]
@@ -484,7 +484,7 @@
           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
       ]
     ])
 

Tests/ApolloTests/Cache/WatchQueryTests.swift

@@ -455,7 +455,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "name": "Leia Organa"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -598,7 +598,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1003", "name": "Leia Organa"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -633,7 +633,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -745,7 +745,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1003", "name": "Leia Organa"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -781,7 +781,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -799,7 +799,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000", "name": "Luke Skywalker"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -913,7 +913,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1003", "name": "Leia Organa"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -949,7 +949,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -1044,7 +1044,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "name": "Leia Organa"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -1283,7 +1283,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -1595,7 +1595,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000", "name": "Luke Skywalker"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -1730,7 +1730,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000", "name": "Luke Skywalker"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -1782,7 +1782,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1002", "name": "Han Solo"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 
@@ -1884,7 +1884,7 @@ class WatchQueryTests: XCTestCase, CacheDependentTesting {
                 ["__typename": "Human", "id": "1000", "name": "Luke Skywalker"],
               ]
             ]
-          ]
+          ] as JSONValue
         ]
       }
 

Tests/ApolloTests/CacheKeyForFieldTests.swift

@@ -1,5 +1,6 @@
 import XCTest
 @testable import Apollo
+import ApolloAPI
 
 class CacheKeyForFieldTests: XCTestCase {
   func testFieldWithNameOnly() {
@@ -30,7 +31,9 @@ class CacheKeyForFieldTests: XCTestCase {
   func testFieldWithNestedNullArgument() throws {
     let actual = CacheKeyForField(
       named: "hero",
-      arguments: ["nested": ["foo": 1, "bar": NSNull()]]
+      arguments: [
+        "nested": ["foo": 1, "bar": NSNull()] as JSONValue
+      ]
     )
     XCTAssertEqual(actual, "hero([nested:bar:null,foo:1])")
   }
@@ -43,7 +46,9 @@ class CacheKeyForFieldTests: XCTestCase {
   func testFieldWithDictionaryArgument() throws {
     let actual = CacheKeyForField(
       named: "hero",
-      arguments: ["nested": ["foo": 1, "bar": "2"]]
+      arguments: [
+        "nested": ["foo": 1, "bar": "2"] as JSONValue
+      ]
     )
     XCTAssertEqual(actual, "hero([nested:bar:2,foo:1])")
   }

Tests/ApolloTests/DataDictMergingTests.swift

@@ -324,3 +324,4 @@ class DataDictMergingTests: XCTestCase {
   }
 
 }
+

Tests/ApolloTests/DeferTests.swift

@@ -39,6 +39,8 @@ final class DeferTests: XCTestCase {
           override class var __selections: [Selection] {[
             .field("genres", [String].self),
           ]}
+
+          var genres: [String] { __data["genres"] }
         }
 
         class Character: AbstractMockSelectionSet<Character.Fragments, MockSchemaMetadata> {

Tests/ApolloTests/ExecutionSources/NetworkResponseExecutionSource_OpaqueObjectDataWrapper_Tests.swift

@@ -136,7 +136,7 @@ class NetworkResponseExecutionSource_OpaqueObjectDataWrapper_Tests: XCTestCase {
     }
     """.data(using: .utf8)!
 
-    let deserialized = try JSONSerializationFormat.deserialize(data: data) as! JSONObject
+    let deserialized = try JSONSerializationFormat.deserialize(data: data) as JSONObject
     let objectData = subject.opaqueObjectDataWrapper(for: deserialized)
 
     // when