Squashed 'apollo-ios/' changes from 39098c59..9d0bb802

9d0bb802 fix Array JSONEncodable (#128) git-subtree-dir: apollo-ios git-subtree-split: 9d0bb802d9eb8aaa9ede384461824779807dff0b
apollographql · Jul 29, 2024 · 17df440 · 17df440
1 parent deac509
commit 17df440
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Sources/ApolloAPI/GraphQLOperation.swift b/Sources/ApolloAPI/GraphQLOperation.swift
@@ -153,7 +153,7 @@ public protocol GraphQLOperationVariableValue {
 }
 
 extension Array: GraphQLOperationVariableValue
-where Element: GraphQLOperationVariableValue & Hashable {}
+where Element: GraphQLOperationVariableValue & JSONEncodable & Hashable {}
 
 extension Dictionary: GraphQLOperationVariableValue
 where Key == String, Value == any GraphQLOperationVariableValue {

diff --git a/Sources/ApolloAPI/JSONStandardTypeConversions.swift b/Sources/ApolloAPI/JSONStandardTypeConversions.swift
@@ -147,14 +147,8 @@ extension JSONObject: JSONDecodable {
   }
 }
 
-extension Array: JSONEncodable {
+extension Array: JSONEncodable where Element: JSONEncodable {
   @inlinable public var _jsonValue: JSONValue {
-    return map { element -> JSONValue in
-      if case let element as any JSONEncodable = element {
-        return element._jsonValue
-      } else {
-        fatalError("Array is only JSONEncodable if Element is")
-      }
-    }
+    map(\._jsonValue)
   }
 }