fix(packages/react): prevent fetch loops from cofetching resolvers

gqty-dev · Mar 23, 2024 · 523cb55 · 523cb55
1 parent cc1b627
commit 523cb55
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 266 deletions.
diff --git a/packages/react/src/query/preparedQuery.ts b/packages/react/src/query/preparedQuery.ts
@@ -1,5 +1,5 @@
 import { GQtyError, type BaseGeneratedSchema, type GQtyClient } from 'gqty';
-import { useSyncExternalStore } from 'use-sync-external-store/shim';
+import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js';
 import { createMemoryStore } from '../memoryStore';
 import type { ReactClientOptionsWithDefaults } from '../utils';
 

diff --git a/packages/react/src/query/useQuery.ts b/packages/react/src/query/useQuery.ts
@@ -299,10 +299,16 @@ export const createUseQuery = <TSchema extends BaseGeneratedSchema>(
             .map(({ context, resolve }) => {
               context.shouldFetch = true;
 
-              return resolve();
+              const ret = resolve();
+
+              context.shouldFetch = false;
+
+              return ret;
             })
             .concat(resolve());
 
+          context.shouldFetch = false;
+
           const promise = Promise.all(pendingPromises);
 
           // Mutex lock, prevents multiple refetches from happening at the