Fix bug with AnyHashable coercion (#68)

apollographql · Oct 10, 2023 · 5529fd2 · 5529fd2
1 parent bd973ab
commit 5529fd2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/Tests/ApolloTests/GraphQLExecutor_SelectionSetMapper_FromResponse_Tests.swift b/Tests/ApolloTests/GraphQLExecutor_SelectionSetMapper_FromResponse_Tests.swift
@@ -567,7 +567,7 @@ class GraphQLExecutor_SelectionSetMapper_FromResponse_Tests: XCTestCase {
     class GivenSelectionSet: MockSelectionSet {
       override class var __selections: [Selection] { [.field("favorites", [String]?.self)] }
     }
-    let object: JSONObject = ["favorites": NSNull()]
+    let object: JSONObject = ["favorites": DataDict._NullValue]
 
     // when
     let data = try readValues(GivenSelectionSet.self, from: object)

diff --git a/Tests/ApolloTests/SelectionSetTests.swift b/Tests/ApolloTests/SelectionSetTests.swift
@@ -226,6 +226,31 @@ class SelectionSetTests: XCTestCase {
     expect(actual.friend).to(beNil())
   }
 
+  func test__selection_givenOptionalEntityField_givenNullValue__returnsNil() {
+    // given
+    class Hero: MockSelectionSet {
+      typealias Schema = MockSchemaMetadata
+
+      override class var __selections: [Selection] {[
+        .field("__typename", String.self),
+        .field("friend", Hero?.self)
+      ]}
+
+      var friend: Hero? { __data["friend"] }
+    }
+
+    let object: JSONObject = [
+      "__typename": "Human",
+      "friend": DataDict._NullValue
+    ]
+
+    // when
+    let actual = try! Hero(data: object)
+
+    // then
+    expect(actual.friend).to(beNil())
+  }
+
   // MARK: Entity - Array Tests
 
   func test__selection__arrayOfEntity_nonNull_givenValue__returnsValue() {

diff --git a/apollo-ios/Sources/ApolloAPI/DataDict.swift b/apollo-ios/Sources/ApolloAPI/DataDict.swift
@@ -151,13 +151,13 @@ extension DataDict {
   /// In iOS versions 14.4 and lower, `AnyHashable` coercion does not work. On these platforms,
   /// we need to do some additional unwrapping and casting of the values to avoid crashes and other
   /// run time bugs.
-  public static var _AnyHashableCanBeCoerced: Bool {
+  public static let _AnyHashableCanBeCoerced: Bool = {
     if #available(iOS 14.5, *) {
       return true
     } else {
       return false
     }
-  }
+  }()
 
 }
 
@@ -195,7 +195,7 @@ extension Optional: SelectionSetEntityValue where Wrapped: SelectionSetEntityVal
       case .none:
         self = .none
       case .some(let hashable):
-      if DataDict._AnyHashableCanBeCoerced && hashable == DataDict._NullValue {
+      if !DataDict._AnyHashableCanBeCoerced && hashable == DataDict._NullValue {
         self = .none
       } else if let optional = hashable.base as? Optional<AnyHashable>, optional == nil {
         self = .none