Pass queryInfo to fetchQuery

apollographql · Jan 8, 2025 · abdc1e3 · abdc1e3
1 parent 971c45e
commit abdc1e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/core/ObservableQuery.ts b/src/core/ObservableQuery.ts
@@ -492,6 +492,7 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
     combinedOptions.query = this.transformDocument(combinedOptions.query);
 
     const qid = this.queryManager.generateQueryId();
+    const fetchMoreQueryInfo = this.queryManager.getQuery(qid);
 
     // If a temporary query is passed to `fetchMore`, we don't want to store
     // it as the last query result since it may be an optimized query for
@@ -524,7 +525,7 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
     }
 
     return this.queryManager
-      .fetchQuery(qid, combinedOptions, NetworkStatus.fetchMore)
+      .fetchQuery(fetchMoreQueryInfo, combinedOptions, NetworkStatus.fetchMore)
       .then((fetchMoreResult) => {
         this.queryManager.removeQuery(qid);
 

diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
@@ -656,15 +656,12 @@ export class QueryManager<TStore> {
   }
 
   public fetchQuery<TData, TVars extends OperationVariables>(
-    queryId: string,
+    queryInfo: QueryInfo,
     options: WatchQueryOptions<TVars, TData>,
     networkStatus?: NetworkStatus
   ): Promise<ApolloQueryResult<TData>> {
-    return this.fetchConcastWithInfo(
-      this.getQuery(queryId),
-      options,
-      networkStatus
-    ).concast.promise as TODO;
+    return this.fetchConcastWithInfo(queryInfo, options, networkStatus).concast
+      .promise as TODO;
   }
 
   public getQueryStore() {
@@ -824,8 +821,9 @@ export class QueryManager<TStore> {
     );
 
     const query = this.transform(options.query);
+    const queryInfo = this.getQuery(queryId);
 
-    return this.fetchQuery<TData, TVars>(queryId, { ...options, query })
+    return this.fetchQuery<TData, TVars>(queryInfo, { ...options, query })
       .then(
         (result) =>
           result && {

diff --git a/src/core/__tests__/QueryManager/index.ts b/src/core/__tests__/QueryManager/index.ts
@@ -3810,7 +3810,7 @@ describe("QueryManager", () => {
 
       const queryId = "1";
       queryManager
-        .fetchQuery(queryId, { query })
+        .fetchQuery(queryManager.getQuery(queryId), { query })
         .catch((e) => reject("Exception thrown for stopped query"));
 
       queryManager.removeQuery(queryId);
@@ -3840,7 +3840,7 @@ describe("QueryManager", () => {
           delay: 10000, //i.e. forever
         });
         queryManager
-          .fetchQuery("made up id", { query })
+          .fetchQuery(queryManager.getQuery("made up id"), { query })
           .then(() => {
             reject(new Error("Returned a result."));
           })
@@ -4325,7 +4325,7 @@ describe("QueryManager", () => {
           delay: 100,
         });
         queryManager
-          .fetchQuery("made up id", { query })
+          .fetchQuery(queryManager.getQuery("made up id"), { query })
           .then(resolve)
           .catch((error) => {
             reject(new Error("Should not return an error"));