Include result if parsed from server error

Author: jerelmiller

src/link/persisted-queries/__tests__/persisted-queries.test.ts

@@ -1148,6 +1148,9 @@ test("calls `disable` with GraphQL errors when parsed from non-2xx response", as
       persistedQueryNotFound: false,
       persistedQueryNotSupported: false,
     },
+    result: {
+      errors: [{ message: "Something went wrong" }],
+    },
   });
 });
 
@@ -1496,5 +1499,8 @@ test("calls `retry` with GraphQL errors when parsed from non-2xx response", asyn
       persistedQueryNotFound: false,
       persistedQueryNotSupported: false,
     },
+    result: {
+      errors: [{ message: "Something went wrong" }],
+    },
   });
 });

src/link/persisted-queries/index.ts

@@ -248,31 +248,39 @@ export const createPersistedQueryLink = (
           },
           error: (incomingError) => {
             const error = toErrorLike(incomingError);
-            let graphQLErrors: ReadonlyArray<GraphQLFormattedError> | undefined;
+            const callback = () => observer.error(incomingError);
 
             // This is persisted-query specific (see #9410) and deviates from the
             // GraphQL-over-HTTP spec for application/json responses.
             // This is intentional.
             if (ServerError.is(error) && error.bodyText) {
               try {
-                const result = JSON.parse(error.bodyText) as
-                  | FormattedExecutionResult
-                  | undefined;
-
-                graphQLErrors = result?.errors;
+                const result = JSON.parse(error.bodyText);
+
+                if (isFormattedExecutionResult(result)) {
+                  return handleRetry(
+                    {
+                      error: new CombinedGraphQLErrors(result),
+                      result,
+                      operation,
+                      meta: processErrors(result.errors),
+                    },
+                    callback
+                  );
+                }
               } catch {}
             }
 
             handleRetry(
               {
-                error:
-                  isNonEmptyArray(graphQLErrors) ?
-                    new CombinedGraphQLErrors({ errors: graphQLErrors })
-                  : error,
+                error,
                 operation,
-                meta: processErrors(graphQLErrors),
+                meta: {
+                  persistedQueryNotSupported: false,
+                  persistedQueryNotFound: false,
+                },
               },
-              () => observer.error(incomingError)
+              callback
             );
           },
           complete: observer.complete.bind(observer),