Pass request to QueryInfo.markQueryResult

Author: jerelmiller

src/core/QueryInfo.ts

@@ -27,6 +27,7 @@ import type { ApolloClient } from "./ApolloClient.js";
 import { NetworkStatus } from "./networkStatus.js";
 import type { ObservableQuery } from "./ObservableQuery.js";
 import type { QueryManager } from "./QueryManager.js";
+import type { QueryRequest } from "./QueryRequest.js";
 import type {
   DataValue,
   DefaultContext,
@@ -225,6 +226,7 @@ export class QueryInfo<
 
   public markQueryResult(
     incoming: ApolloLink.Result<TData>,
+    request: QueryRequest<TData, TVariables>,
     {
       document: query,
       variables,

src/core/QueryManager.ts

@@ -1056,15 +1056,19 @@ export class QueryManager {
         // Use linkDocument rather than queryInfo.document so the
         // operation/fragments used to write the result are the same as the
         // ones used to obtain it from the link.
-        const { dataState, ...result } = queryInfo.markQueryResult(incoming, {
-          errorPolicy: request.errorPolicy,
-          fetchPolicy: request.fetchPolicy,
-          document: request.query,
-          cacheWriteBehavior: request.cacheWriteBehavior,
-          networkStatus: request.networkStatus,
-          returnPartialData: request.returnPartialData,
-          variables: request.variables,
-        });
+        const { dataState, ...result } = queryInfo.markQueryResult(
+          incoming,
+          request,
+          {
+            errorPolicy: request.errorPolicy,
+            fetchPolicy: request.fetchPolicy,
+            document: request.query,
+            cacheWriteBehavior: request.cacheWriteBehavior,
+            networkStatus: request.networkStatus,
+            returnPartialData: request.returnPartialData,
+            variables: request.variables,
+          }
+        );
         const hasErrors = graphQLResultHasError(result);
 
         if (hasErrors && request.errorPolicy === "none") {