Do not try to parse the result when data is None

ghostdogpr · Jun 16, 2021 · f705935 · f705935
1 parent 585d372
commit f705935
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/client/src/main/scala/caliban/client/SelectionBuilder.scala b/client/src/main/scala/caliban/client/SelectionBuilder.scala
@@ -58,7 +58,8 @@ sealed trait SelectionBuilder[-Origin, +A] { self =>
                        .decode[GraphQLResponse](payload)
                        .left
                        .map(ex => DecodingError("Json deserialization error", Some(ex)))
-      data        <- if (parsed.errors.nonEmpty && parsed.data.contains(__Value.__NullValue)) Left(ServerError(parsed.errors))
+      data        <- if (parsed.errors.nonEmpty && parsed.data.forall(_ == __Value.__NullValue))
+                       Left(ServerError(parsed.errors))
                      else Right(parsed.data)
       objectValue <- data match {
                        case Some(o: __ObjectValue) => Right(o)