QueryReference: check for resolve/reject

apollographql · Jun 21, 2023 · 816a7b6 · 816a7b6
1 parent 43c506a
commit 816a7b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.changeset/little-schools-roll.md b/.changeset/little-schools-roll.md
@@ -0,0 +1,5 @@
+---
+'@apollo/client': patch
+---
+
+Fix a bug in `QueryReference` where `this.resolve` or `this.reject` might be executed even if `undefined`.
diff --git a/src/react/cache/QueryReference.ts b/src/react/cache/QueryReference.ts
@@ -36,8 +36,8 @@ export class QueryReference<TData = unknown> {
   private initialized = false;
   private refetching = false;
 
-  private resolve: (result: ApolloQueryResult<TData>) => void;
-  private reject: (error: unknown) => void;
+  private resolve: ((result: ApolloQueryResult<TData>) => void) | undefined;
+  private reject: ((error: unknown) => void) | undefined;
 
   constructor(
     observable: ObservableQuery<TData>,
@@ -157,7 +157,9 @@ export class QueryReference<TData = unknown> {
       this.initialized = true;
       this.refetching = false;
       this.result = result;
-      this.resolve(result);
+      if (this.resolve) {
+        this.resolve(result);
+      }
       return;
     }
 
@@ -182,7 +184,9 @@ export class QueryReference<TData = unknown> {
     if (!this.initialized || this.refetching) {
       this.initialized = true;
       this.refetching = false;
-      this.reject(error);
+      if (this.reject) {
+        this.reject(error);
+      }
       return;
     }