@tanstack/react-query 5.0.0-alpha.4 → 5.0.0-alpha.6

package/build/lib/__tests__/ssr.test.d.ts

@@ -1,4 +1 @@
-/**
- * @jest-environment node
- */
 export {};

package/build/lib/__tests__/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 /// <reference types="node" />
 import * as React from 'react';
 import { render } from '@testing-library/react';
@@ -10,8 +9,8 @@ export declare const Blink: ({ duration, children, }: {
     children: React.ReactNode;
 }) => JSX.Element;
 export declare function createQueryClient(config?: QueryClientConfig): QueryClient;
-export declare function mockVisibilityState(value: DocumentVisibilityState): jest.SpyInstance<DocumentVisibilityState, [], any>;
-export declare function mockNavigatorOnLine(value: boolean): jest.SpyInstance<boolean, [], any>;
+export declare function mockVisibilityState(value: DocumentVisibilityState): import("vitest/dist/index-1cfc7f58").S<[], DocumentVisibilityState>;
+export declare function mockNavigatorOnLine(value: boolean): import("vitest/dist/index-1cfc7f58").S<[], boolean>;
 export declare function queryKey(): Array<string>;
 export declare function sleep(timeout: number): Promise<void>;
 export declare function setActTimeout(fn: () => void, ms?: number): NodeJS.Timeout;

package/build/lib/suspense.esm.js

@@ -8,16 +8,16 @@ const ensureStaleTime = defaultedOptions => {
   }
 };
 const willFetch = (result, isRestoring) => result.isLoading && result.isFetching && !isRestoring;
-const shouldSuspend = (defaultedOptions, result, isRestoring) => defaultedOptions?.suspense && willFetch(result, isRestoring);
+const shouldSuspend = (defaultedOptions, result, isRestoring) => (defaultedOptions == null ? void 0 : defaultedOptions.suspense) && willFetch(result, isRestoring);
 const fetchOptimistic = (defaultedOptions, observer, errorResetBoundary) => observer.fetchOptimistic(defaultedOptions).then(({
   data
 }) => {
-  defaultedOptions.onSuccess?.(data);
-  defaultedOptions.onSettled?.(data, null);
+  defaultedOptions.onSuccess == null ? void 0 : defaultedOptions.onSuccess(data);
+  defaultedOptions.onSettled == null ? void 0 : defaultedOptions.onSettled(data, null);
 }).catch(error => {
   errorResetBoundary.clearReset();
-  defaultedOptions.onError?.(error);
-  defaultedOptions.onSettled?.(undefined, error);
+  defaultedOptions.onError == null ? void 0 : defaultedOptions.onError(error);
+  defaultedOptions.onSettled == null ? void 0 : defaultedOptions.onSettled(undefined, error);
 });
 
 export { ensureStaleTime, fetchOptimistic, shouldSuspend, willFetch };

package/build/lib/suspense.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"suspense.esm.js","sources":["../../src/suspense.ts"],"sourcesContent":["import type { DefaultedQueryObserverOptions } from '@tanstack/query-core'\nimport type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'\nimport type { QueryObserverResult } from '@tanstack/query-core'\nimport type { QueryKey } from '@tanstack/query-core'\n\nexport const ensureStaleTime = (\n  defaultedOptions: DefaultedQueryObserverOptions<any, any, any, any, any>,\n) => {\n  if (defaultedOptions.suspense) {\n    // Always set stale time when using suspense to prevent\n    // fetching again when directly mounting after suspending\n    if (typeof defaultedOptions.staleTime !== 'number') {\n      defaultedOptions.staleTime = 1000\n    }\n  }\n}\n\nexport const willFetch = (\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => result.isLoading && result.isFetching && !isRestoring\n\nexport const shouldSuspend = (\n  defaultedOptions:\n    | DefaultedQueryObserverOptions<any, any, any, any, any>\n    | undefined,\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => defaultedOptions?.suspense && willFetch(result, isRestoring)\n\nexport const fetchOptimistic = <\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  defaultedOptions: DefaultedQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  observer: QueryObserver<TQueryFnData, TError, TData, TQueryData, TQueryKey>,\n  errorResetBoundary: QueryErrorResetBoundaryValue,\n) =>\n  observer\n    .fetchOptimistic(defaultedOptions)\n    .then(({ data }) => {\n      defaultedOptions.onSuccess?.(data as TData)\n      defaultedOptions.onSettled?.(data, null)\n    })\n    .catch((error) => {\n      errorResetBoundary.clearReset()\n      defaultedOptions.onError?.(error)\n      defaultedOptions.onSettled?.(undefined, error)\n    })\n"],"names":["ensureStaleTime","defaultedOptions","suspense","staleTime","willFetch","result","isRestoring","isLoading","isFetching","shouldSuspend","fetchOptimistic","observer","errorResetBoundary","then","data","onSuccess","onSettled","catch","error","clearReset","onError","undefined"],"mappings":"AAMaA,MAAAA,eAAe,GAC1BC,gBAAwE,IACrE;EACH,IAAIA,gBAAgB,CAACC,QAAQ,EAAE;AAC7B;AACA;AACA,IAAA,IAAI,OAAOD,gBAAgB,CAACE,SAAS,KAAK,QAAQ,EAAE;MAClDF,gBAAgB,CAACE,SAAS,GAAG,IAAI,CAAA;AACnC,KAAA;AACF,GAAA;AACF,EAAC;MAEYC,SAAS,GAAG,CACvBC,MAAqC,EACrCC,WAAoB,KACjBD,MAAM,CAACE,SAAS,IAAIF,MAAM,CAACG,UAAU,IAAI,CAACF,YAAW;MAE7CG,aAAa,GAAG,CAC3BR,gBAEa,EACbI,MAAqC,EACrCC,WAAoB,KACjBL,gBAAgB,EAAEC,QAAQ,IAAIE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAC;MAEpDI,eAAe,GAAG,CAO7BT,gBAMC,EACDU,QAA2E,EAC3EC,kBAAgD,KAEhDD,QAAQ,CACLD,eAAe,CAACT,gBAAgB,CAAC,CACjCY,IAAI,CAAC,CAAC;AAAEC,EAAAA,IAAAA;AAAK,CAAC,KAAK;AAClBb,EAAAA,gBAAgB,CAACc,SAAS,GAAGD,IAAI,CAAU,CAAA;AAC3Cb,EAAAA,gBAAgB,CAACe,SAAS,GAAGF,IAAI,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAC,CACDG,KAAK,CAAEC,KAAK,IAAK;EAChBN,kBAAkB,CAACO,UAAU,EAAE,CAAA;AAC/BlB,EAAAA,gBAAgB,CAACmB,OAAO,GAAGF,KAAK,CAAC,CAAA;AACjCjB,EAAAA,gBAAgB,CAACe,SAAS,GAAGK,SAAS,EAAEH,KAAK,CAAC,CAAA;AAChD,CAAC;;;;"}
+{"version":3,"file":"suspense.esm.js","sources":["../../src/suspense.ts"],"sourcesContent":["import type { DefaultedQueryObserverOptions } from '@tanstack/query-core'\nimport type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'\nimport type { QueryObserverResult } from '@tanstack/query-core'\nimport type { QueryKey } from '@tanstack/query-core'\n\nexport const ensureStaleTime = (\n  defaultedOptions: DefaultedQueryObserverOptions<any, any, any, any, any>,\n) => {\n  if (defaultedOptions.suspense) {\n    // Always set stale time when using suspense to prevent\n    // fetching again when directly mounting after suspending\n    if (typeof defaultedOptions.staleTime !== 'number') {\n      defaultedOptions.staleTime = 1000\n    }\n  }\n}\n\nexport const willFetch = (\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => result.isLoading && result.isFetching && !isRestoring\n\nexport const shouldSuspend = (\n  defaultedOptions:\n    | DefaultedQueryObserverOptions<any, any, any, any, any>\n    | undefined,\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => defaultedOptions?.suspense && willFetch(result, isRestoring)\n\nexport const fetchOptimistic = <\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  defaultedOptions: DefaultedQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  observer: QueryObserver<TQueryFnData, TError, TData, TQueryData, TQueryKey>,\n  errorResetBoundary: QueryErrorResetBoundaryValue,\n) =>\n  observer\n    .fetchOptimistic(defaultedOptions)\n    .then(({ data }) => {\n      defaultedOptions.onSuccess?.(data as TData)\n      defaultedOptions.onSettled?.(data, null)\n    })\n    .catch((error) => {\n      errorResetBoundary.clearReset()\n      defaultedOptions.onError?.(error)\n      defaultedOptions.onSettled?.(undefined, error)\n    })\n"],"names":["ensureStaleTime","defaultedOptions","suspense","staleTime","willFetch","result","isRestoring","isLoading","isFetching","shouldSuspend","fetchOptimistic","observer","errorResetBoundary","then","data","onSuccess","onSettled","catch","error","clearReset","onError","undefined"],"mappings":"AAMaA,MAAAA,eAAe,GAC1BC,gBAAwE,IACrE;EACH,IAAIA,gBAAgB,CAACC,QAAQ,EAAE;AAC7B;AACA;AACA,IAAA,IAAI,OAAOD,gBAAgB,CAACE,SAAS,KAAK,QAAQ,EAAE;MAClDF,gBAAgB,CAACE,SAAS,GAAG,IAAI,CAAA;AACnC,KAAA;AACF,GAAA;AACF,EAAC;MAEYC,SAAS,GAAG,CACvBC,MAAqC,EACrCC,WAAoB,KACjBD,MAAM,CAACE,SAAS,IAAIF,MAAM,CAACG,UAAU,IAAI,CAACF,YAAW;AAEnD,MAAMG,aAAa,GAAG,CAC3BR,gBAEa,EACbI,MAAqC,EACrCC,WAAoB,KACjB,CAAAL,gBAAgB,IAAhBA,IAAAA,GAAAA,KAAAA,CAAAA,GAAAA,gBAAgB,CAAEC,QAAQ,KAAIE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAC;MAEpDI,eAAe,GAAG,CAO7BT,gBAMC,EACDU,QAA2E,EAC3EC,kBAAgD,KAEhDD,QAAQ,CACLD,eAAe,CAACT,gBAAgB,CAAC,CACjCY,IAAI,CAAC,CAAC;AAAEC,EAAAA,IAAAA;AAAK,CAAC,KAAK;EAClBb,gBAAgB,CAACc,SAAS,IAA1Bd,IAAAA,GAAAA,KAAAA,CAAAA,GAAAA,gBAAgB,CAACc,SAAS,CAAGD,IAAI,CAAU,CAAA;EAC3Cb,gBAAgB,CAACe,SAAS,IAAA,IAAA,GAAA,KAAA,CAAA,GAA1Bf,gBAAgB,CAACe,SAAS,CAAGF,IAAI,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAC,CACDG,KAAK,CAAEC,KAAK,IAAK;EAChBN,kBAAkB,CAACO,UAAU,EAAE,CAAA;EAC/BlB,gBAAgB,CAACmB,OAAO,IAAxBnB,IAAAA,GAAAA,KAAAA,CAAAA,GAAAA,gBAAgB,CAACmB,OAAO,CAAGF,KAAK,CAAC,CAAA;EACjCjB,gBAAgB,CAACe,SAAS,IAAA,IAAA,GAAA,KAAA,CAAA,GAA1Bf,gBAAgB,CAACe,SAAS,CAAGK,SAAS,EAAEH,KAAK,CAAC,CAAA;AAChD,CAAC;;;;"}

package/build/lib/suspense.js

@@ -10,16 +10,16 @@ const ensureStaleTime = defaultedOptions => {
   }
 };
 const willFetch = (result, isRestoring) => result.isLoading && result.isFetching && !isRestoring;
-const shouldSuspend = (defaultedOptions, result, isRestoring) => defaultedOptions?.suspense && willFetch(result, isRestoring);
+const shouldSuspend = (defaultedOptions, result, isRestoring) => (defaultedOptions == null ? void 0 : defaultedOptions.suspense) && willFetch(result, isRestoring);
 const fetchOptimistic = (defaultedOptions, observer, errorResetBoundary) => observer.fetchOptimistic(defaultedOptions).then(({
   data
 }) => {
-  defaultedOptions.onSuccess?.(data);
-  defaultedOptions.onSettled?.(data, null);
+  defaultedOptions.onSuccess == null ? void 0 : defaultedOptions.onSuccess(data);
+  defaultedOptions.onSettled == null ? void 0 : defaultedOptions.onSettled(data, null);
 }).catch(error => {
   errorResetBoundary.clearReset();
-  defaultedOptions.onError?.(error);
-  defaultedOptions.onSettled?.(undefined, error);
+  defaultedOptions.onError == null ? void 0 : defaultedOptions.onError(error);
+  defaultedOptions.onSettled == null ? void 0 : defaultedOptions.onSettled(undefined, error);
 });
 
 exports.ensureStaleTime = ensureStaleTime;

package/build/lib/suspense.js.map

@@ -1 +1 @@
-{"version":3,"file":"suspense.js","sources":["../../src/suspense.ts"],"sourcesContent":["import type { DefaultedQueryObserverOptions } from '@tanstack/query-core'\nimport type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'\nimport type { QueryObserverResult } from '@tanstack/query-core'\nimport type { QueryKey } from '@tanstack/query-core'\n\nexport const ensureStaleTime = (\n  defaultedOptions: DefaultedQueryObserverOptions<any, any, any, any, any>,\n) => {\n  if (defaultedOptions.suspense) {\n    // Always set stale time when using suspense to prevent\n    // fetching again when directly mounting after suspending\n    if (typeof defaultedOptions.staleTime !== 'number') {\n      defaultedOptions.staleTime = 1000\n    }\n  }\n}\n\nexport const willFetch = (\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => result.isLoading && result.isFetching && !isRestoring\n\nexport const shouldSuspend = (\n  defaultedOptions:\n    | DefaultedQueryObserverOptions<any, any, any, any, any>\n    | undefined,\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => defaultedOptions?.suspense && willFetch(result, isRestoring)\n\nexport const fetchOptimistic = <\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  defaultedOptions: DefaultedQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  observer: QueryObserver<TQueryFnData, TError, TData, TQueryData, TQueryKey>,\n  errorResetBoundary: QueryErrorResetBoundaryValue,\n) =>\n  observer\n    .fetchOptimistic(defaultedOptions)\n    .then(({ data }) => {\n      defaultedOptions.onSuccess?.(data as TData)\n      defaultedOptions.onSettled?.(data, null)\n    })\n    .catch((error) => {\n      errorResetBoundary.clearReset()\n      defaultedOptions.onError?.(error)\n      defaultedOptions.onSettled?.(undefined, error)\n    })\n"],"names":["ensureStaleTime","defaultedOptions","suspense","staleTime","willFetch","result","isRestoring","isLoading","isFetching","shouldSuspend","fetchOptimistic","observer","errorResetBoundary","then","data","onSuccess","onSettled","catch","error","clearReset","onError","undefined"],"mappings":";;AAMaA,MAAAA,eAAe,GAC1BC,gBAAwE,IACrE;EACH,IAAIA,gBAAgB,CAACC,QAAQ,EAAE;AAC7B;AACA;AACA,IAAA,IAAI,OAAOD,gBAAgB,CAACE,SAAS,KAAK,QAAQ,EAAE;MAClDF,gBAAgB,CAACE,SAAS,GAAG,IAAI,CAAA;AACnC,KAAA;AACF,GAAA;AACF,EAAC;MAEYC,SAAS,GAAG,CACvBC,MAAqC,EACrCC,WAAoB,KACjBD,MAAM,CAACE,SAAS,IAAIF,MAAM,CAACG,UAAU,IAAI,CAACF,YAAW;MAE7CG,aAAa,GAAG,CAC3BR,gBAEa,EACbI,MAAqC,EACrCC,WAAoB,KACjBL,gBAAgB,EAAEC,QAAQ,IAAIE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAC;MAEpDI,eAAe,GAAG,CAO7BT,gBAMC,EACDU,QAA2E,EAC3EC,kBAAgD,KAEhDD,QAAQ,CACLD,eAAe,CAACT,gBAAgB,CAAC,CACjCY,IAAI,CAAC,CAAC;AAAEC,EAAAA,IAAAA;AAAK,CAAC,KAAK;AAClBb,EAAAA,gBAAgB,CAACc,SAAS,GAAGD,IAAI,CAAU,CAAA;AAC3Cb,EAAAA,gBAAgB,CAACe,SAAS,GAAGF,IAAI,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAC,CACDG,KAAK,CAAEC,KAAK,IAAK;EAChBN,kBAAkB,CAACO,UAAU,EAAE,CAAA;AAC/BlB,EAAAA,gBAAgB,CAACmB,OAAO,GAAGF,KAAK,CAAC,CAAA;AACjCjB,EAAAA,gBAAgB,CAACe,SAAS,GAAGK,SAAS,EAAEH,KAAK,CAAC,CAAA;AAChD,CAAC;;;;;;;"}
+{"version":3,"file":"suspense.js","sources":["../../src/suspense.ts"],"sourcesContent":["import type { DefaultedQueryObserverOptions } from '@tanstack/query-core'\nimport type { QueryObserver } from '@tanstack/query-core'\nimport type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'\nimport type { QueryObserverResult } from '@tanstack/query-core'\nimport type { QueryKey } from '@tanstack/query-core'\n\nexport const ensureStaleTime = (\n  defaultedOptions: DefaultedQueryObserverOptions<any, any, any, any, any>,\n) => {\n  if (defaultedOptions.suspense) {\n    // Always set stale time when using suspense to prevent\n    // fetching again when directly mounting after suspending\n    if (typeof defaultedOptions.staleTime !== 'number') {\n      defaultedOptions.staleTime = 1000\n    }\n  }\n}\n\nexport const willFetch = (\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => result.isLoading && result.isFetching && !isRestoring\n\nexport const shouldSuspend = (\n  defaultedOptions:\n    | DefaultedQueryObserverOptions<any, any, any, any, any>\n    | undefined,\n  result: QueryObserverResult<any, any>,\n  isRestoring: boolean,\n) => defaultedOptions?.suspense && willFetch(result, isRestoring)\n\nexport const fetchOptimistic = <\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  defaultedOptions: DefaultedQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  observer: QueryObserver<TQueryFnData, TError, TData, TQueryData, TQueryKey>,\n  errorResetBoundary: QueryErrorResetBoundaryValue,\n) =>\n  observer\n    .fetchOptimistic(defaultedOptions)\n    .then(({ data }) => {\n      defaultedOptions.onSuccess?.(data as TData)\n      defaultedOptions.onSettled?.(data, null)\n    })\n    .catch((error) => {\n      errorResetBoundary.clearReset()\n      defaultedOptions.onError?.(error)\n      defaultedOptions.onSettled?.(undefined, error)\n    })\n"],"names":["ensureStaleTime","defaultedOptions","suspense","staleTime","willFetch","result","isRestoring","isLoading","isFetching","shouldSuspend","fetchOptimistic","observer","errorResetBoundary","then","data","onSuccess","onSettled","catch","error","clearReset","onError","undefined"],"mappings":";;AAMaA,MAAAA,eAAe,GAC1BC,gBAAwE,IACrE;EACH,IAAIA,gBAAgB,CAACC,QAAQ,EAAE;AAC7B;AACA;AACA,IAAA,IAAI,OAAOD,gBAAgB,CAACE,SAAS,KAAK,QAAQ,EAAE;MAClDF,gBAAgB,CAACE,SAAS,GAAG,IAAI,CAAA;AACnC,KAAA;AACF,GAAA;AACF,EAAC;MAEYC,SAAS,GAAG,CACvBC,MAAqC,EACrCC,WAAoB,KACjBD,MAAM,CAACE,SAAS,IAAIF,MAAM,CAACG,UAAU,IAAI,CAACF,YAAW;AAEnD,MAAMG,aAAa,GAAG,CAC3BR,gBAEa,EACbI,MAAqC,EACrCC,WAAoB,KACjB,CAAAL,gBAAgB,IAAhBA,IAAAA,GAAAA,KAAAA,CAAAA,GAAAA,gBAAgB,CAAEC,QAAQ,KAAIE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAC;MAEpDI,eAAe,GAAG,CAO7BT,gBAMC,EACDU,QAA2E,EAC3EC,kBAAgD,KAEhDD,QAAQ,CACLD,eAAe,CAACT,gBAAgB,CAAC,CACjCY,IAAI,CAAC,CAAC;AAAEC,EAAAA,IAAAA;AAAK,CAAC,KAAK;EAClBb,gBAAgB,CAACc,SAAS,IAA1Bd,IAAAA,GAAAA,KAAAA,CAAAA,GAAAA,gBAAgB,CAACc,SAAS,CAAGD,IAAI,CAAU,CAAA;EAC3Cb,gBAAgB,CAACe,SAAS,IAAA,IAAA,GAAA,KAAA,CAAA,GAA1Bf,gBAAgB,CAACe,SAAS,CAAGF,IAAI,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAC,CACDG,KAAK,CAAEC,KAAK,IAAK;EAChBN,kBAAkB,CAACO,UAAU,EAAE,CAAA;EAC/BlB,gBAAgB,CAACmB,OAAO,IAAxBnB,IAAAA,GAAAA,KAAAA,CAAAA,GAAAA,gBAAgB,CAACmB,OAAO,CAAGF,KAAK,CAAC,CAAA;EACjCjB,gBAAgB,CAACe,SAAS,IAAA,IAAA,GAAA,KAAA,CAAA,GAA1Bf,gBAAgB,CAACe,SAAS,CAAGK,SAAS,EAAEH,KAAK,CAAC,CAAA;AAChD,CAAC;;;;;;;"}

package/build/lib/useQueries.esm.js

@@ -53,13 +53,16 @@ function useQueries({
   if (suspensePromises.length > 0) {
     throw Promise.all(suspensePromises);
   }
-  const firstSingleResultWhichShouldThrow = optimisticResult.find((result, index) => getHasError({
-    result,
-    errorResetBoundary,
-    throwErrors: defaultedQueries[index]?.throwErrors ?? false,
-    query: observer.getQueries()[index]
-  }));
-  if (firstSingleResultWhichShouldThrow?.error) {
+  const firstSingleResultWhichShouldThrow = optimisticResult.find((result, index) => {
+    var _defaultedQueries$ind, _defaultedQueries$ind2;
+    return getHasError({
+      result,
+      errorResetBoundary,
+      throwErrors: (_defaultedQueries$ind = (_defaultedQueries$ind2 = defaultedQueries[index]) == null ? void 0 : _defaultedQueries$ind2.throwErrors) != null ? _defaultedQueries$ind : false,
+      query: observer.getQueries()[index]
+    });
+  });
+  if (firstSingleResultWhichShouldThrow != null && firstSingleResultWhichShouldThrow.error) {
     throw firstSingleResultWhichShouldThrow.error;
   }
   return optimisticResult;

package/build/lib/useQueries.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQueries.esm.js","sources":["../../src/useQueries.ts"],"sourcesContent":["import * as React from 'react'\n\nimport type {\n  QueryKey,\n  QueryFunction,\n  QueriesPlaceholderDataFunction,\n  QueryClient,\n  DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { UseQueryOptions, UseQueryResult } from './types'\nimport { useIsRestoring } from './isRestoring'\nimport { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'\nimport {\n  ensurePreventErrorBoundaryRetry,\n  getHasError,\n  useClearResetErrorBoundary,\n} from './errorBoundaryUtils'\nimport {\n  ensureStaleTime,\n  shouldSuspend,\n  fetchOptimistic,\n  willFetch,\n} from './suspense'\n\n// This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype UseQueryOptionsForUseQueries<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n  'placeholderData'\n> & {\n  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n  T extends {\n    queryFnData: infer TQueryFnData\n    error?: infer TError\n    data: infer TData\n  }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<unknown, TError, TData>\n    : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n    T extends [infer TQueryFnData, infer TError, infer TData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData>\n    : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TData, TQueryKey>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TQueryFnData, TQueryKey>\n    : // Fallback\n      UseQueryOptionsForUseQueries\n\ntype GetResults<T> =\n  // Part 1: responsible for mapping explicit type parameter to function result, if object\n  T extends { queryFnData: any; error?: infer TError; data: infer TData }\n    ? UseQueryResult<TData, TError>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryResult<TData, TError>\n    : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n    T extends [any, infer TError, infer TData]\n    ? UseQueryResult<TData, TError>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryResult<TQueryFnData>\n    : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<unknown, any>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryResult<TData>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }\n    ? UseQueryResult<TQueryFnData>\n    : // Fallback\n      UseQueryResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryOptionsForUseQueries[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetOptions<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>\n  : unknown[] extends T\n  ? T\n  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n  // use this to infer the param types in the case of Array.map() argument\n  T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      infer TQueryKey\n    >[]\n  ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>[]\n  : // Fallback\n    UseQueryOptionsForUseQueries[]\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryResult[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetResults<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>\n  : T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      any\n    >[]\n  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results\n    UseQueryResult<\n      unknown extends TData ? TQueryFnData : TData,\n      unknown extends TError ? DefaultError : TError\n    >[]\n  : // Fallback\n    UseQueryResult[]\n\nexport function useQueries<T extends any[]>(\n  {\n    queries,\n  }: {\n    queries: readonly [...QueriesOptions<T>]\n  },\n  queryClient?: QueryClient,\n): QueriesResults<T> {\n  const client = useQueryClient(queryClient)\n  const isRestoring = useIsRestoring()\n\n  const defaultedQueries = React.useMemo(\n    () =>\n      queries.map((options) => {\n        const defaultedOptions = client.defaultQueryOptions(options)\n\n        // Make sure the results are already in fetching state before subscribing or updating options\n        defaultedOptions._optimisticResults = isRestoring\n          ? 'isRestoring'\n          : 'optimistic'\n\n        return defaultedOptions\n      }),\n    [queries, client, isRestoring],\n  )\n\n  const [observer] = React.useState(\n    () => new QueriesObserver(client, defaultedQueries),\n  )\n\n  const optimisticResult = observer.getOptimisticResult(defaultedQueries)\n\n  React.useSyncExternalStore(\n    React.useCallback(\n      (onStoreChange) =>\n        isRestoring\n          ? () => undefined\n          : observer.subscribe(notifyManager.batchCalls(onStoreChange)),\n      [observer, isRestoring],\n    ),\n    () => observer.getCurrentResult(),\n    () => observer.getCurrentResult(),\n  )\n\n  React.useEffect(() => {\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    observer.setQueries(defaultedQueries, { listeners: false })\n  }, [defaultedQueries, observer])\n\n  const errorResetBoundary = useQueryErrorResetBoundary()\n\n  defaultedQueries.forEach((query) => {\n    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)\n    ensureStaleTime(query)\n  })\n\n  useClearResetErrorBoundary(errorResetBoundary)\n\n  const shouldAtLeastOneSuspend = optimisticResult.some((result, index) =>\n    shouldSuspend(defaultedQueries[index], result, isRestoring),\n  )\n\n  const suspensePromises = shouldAtLeastOneSuspend\n    ? optimisticResult.flatMap((result, index) => {\n        const options = defaultedQueries[index]\n        const queryObserver = observer.getObservers()[index]\n\n        if (options && queryObserver) {\n          if (shouldSuspend(options, result, isRestoring)) {\n            return fetchOptimistic(options, queryObserver, errorResetBoundary)\n          } else if (willFetch(result, isRestoring)) {\n            void fetchOptimistic(options, queryObserver, errorResetBoundary)\n          }\n        }\n        return []\n      })\n    : []\n\n  if (suspensePromises.length > 0) {\n    throw Promise.all(suspensePromises)\n  }\n\n  const firstSingleResultWhichShouldThrow = optimisticResult.find(\n    (result, index) =>\n      getHasError({\n        result,\n        errorResetBoundary,\n        throwErrors: defaultedQueries[index]?.throwErrors ?? false,\n        query: observer.getQueries()[index]!,\n      }),\n  )\n\n  if (firstSingleResultWhichShouldThrow?.error) {\n    throw firstSingleResultWhichShouldThrow.error\n  }\n\n  return optimisticResult as QueriesResults<T>\n}\n"],"names":["useQueries","queries","queryClient","client","useQueryClient","isRestoring","useIsRestoring","defaultedQueries","React","useMemo","map","options","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","useState","QueriesObserver","optimisticResult","getOptimisticResult","useSyncExternalStore","useCallback","onStoreChange","undefined","subscribe","notifyManager","batchCalls","getCurrentResult","useEffect","setQueries","listeners","errorResetBoundary","useQueryErrorResetBoundary","forEach","query","ensurePreventErrorBoundaryRetry","ensureStaleTime","useClearResetErrorBoundary","shouldAtLeastOneSuspend","some","result","index","shouldSuspend","suspensePromises","flatMap","queryObserver","getObservers","fetchOptimistic","willFetch","length","Promise","all","firstSingleResultWhichShouldThrow","find","getHasError","throwErrors","getQueries","error"],"mappings":"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"}
+{"version":3,"file":"useQueries.esm.js","sources":["../../src/useQueries.ts"],"sourcesContent":["import * as React from 'react'\n\nimport type {\n  QueryKey,\n  QueryFunction,\n  QueriesPlaceholderDataFunction,\n  QueryClient,\n  DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { UseQueryOptions, UseQueryResult } from './types'\nimport { useIsRestoring } from './isRestoring'\nimport { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'\nimport {\n  ensurePreventErrorBoundaryRetry,\n  getHasError,\n  useClearResetErrorBoundary,\n} from './errorBoundaryUtils'\nimport {\n  ensureStaleTime,\n  shouldSuspend,\n  fetchOptimistic,\n  willFetch,\n} from './suspense'\n\n// This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype UseQueryOptionsForUseQueries<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n  'placeholderData'\n> & {\n  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n  T extends {\n    queryFnData: infer TQueryFnData\n    error?: infer TError\n    data: infer TData\n  }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<unknown, TError, TData>\n    : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n    T extends [infer TQueryFnData, infer TError, infer TData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData>\n    : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TData, TQueryKey>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TQueryFnData, TQueryKey>\n    : // Fallback\n      UseQueryOptionsForUseQueries\n\ntype GetResults<T> =\n  // Part 1: responsible for mapping explicit type parameter to function result, if object\n  T extends { queryFnData: any; error?: infer TError; data: infer TData }\n    ? UseQueryResult<TData, TError>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryResult<TData, TError>\n    : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n    T extends [any, infer TError, infer TData]\n    ? UseQueryResult<TData, TError>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryResult<TQueryFnData>\n    : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<unknown, any>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryResult<TData>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }\n    ? UseQueryResult<TQueryFnData>\n    : // Fallback\n      UseQueryResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryOptionsForUseQueries[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetOptions<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>\n  : unknown[] extends T\n  ? T\n  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n  // use this to infer the param types in the case of Array.map() argument\n  T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      infer TQueryKey\n    >[]\n  ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>[]\n  : // Fallback\n    UseQueryOptionsForUseQueries[]\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryResult[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetResults<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>\n  : T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      any\n    >[]\n  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results\n    UseQueryResult<\n      unknown extends TData ? TQueryFnData : TData,\n      unknown extends TError ? DefaultError : TError\n    >[]\n  : // Fallback\n    UseQueryResult[]\n\nexport function useQueries<T extends any[]>(\n  {\n    queries,\n  }: {\n    queries: readonly [...QueriesOptions<T>]\n  },\n  queryClient?: QueryClient,\n): QueriesResults<T> {\n  const client = useQueryClient(queryClient)\n  const isRestoring = useIsRestoring()\n\n  const defaultedQueries = React.useMemo(\n    () =>\n      queries.map((options) => {\n        const defaultedOptions = client.defaultQueryOptions(options)\n\n        // Make sure the results are already in fetching state before subscribing or updating options\n        defaultedOptions._optimisticResults = isRestoring\n          ? 'isRestoring'\n          : 'optimistic'\n\n        return defaultedOptions\n      }),\n    [queries, client, isRestoring],\n  )\n\n  const [observer] = React.useState(\n    () => new QueriesObserver(client, defaultedQueries),\n  )\n\n  const optimisticResult = observer.getOptimisticResult(defaultedQueries)\n\n  React.useSyncExternalStore(\n    React.useCallback(\n      (onStoreChange) =>\n        isRestoring\n          ? () => undefined\n          : observer.subscribe(notifyManager.batchCalls(onStoreChange)),\n      [observer, isRestoring],\n    ),\n    () => observer.getCurrentResult(),\n    () => observer.getCurrentResult(),\n  )\n\n  React.useEffect(() => {\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    observer.setQueries(defaultedQueries, { listeners: false })\n  }, [defaultedQueries, observer])\n\n  const errorResetBoundary = useQueryErrorResetBoundary()\n\n  defaultedQueries.forEach((query) => {\n    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)\n    ensureStaleTime(query)\n  })\n\n  useClearResetErrorBoundary(errorResetBoundary)\n\n  const shouldAtLeastOneSuspend = optimisticResult.some((result, index) =>\n    shouldSuspend(defaultedQueries[index], result, isRestoring),\n  )\n\n  const suspensePromises = shouldAtLeastOneSuspend\n    ? optimisticResult.flatMap((result, index) => {\n        const options = defaultedQueries[index]\n        const queryObserver = observer.getObservers()[index]\n\n        if (options && queryObserver) {\n          if (shouldSuspend(options, result, isRestoring)) {\n            return fetchOptimistic(options, queryObserver, errorResetBoundary)\n          } else if (willFetch(result, isRestoring)) {\n            void fetchOptimistic(options, queryObserver, errorResetBoundary)\n          }\n        }\n        return []\n      })\n    : []\n\n  if (suspensePromises.length > 0) {\n    throw Promise.all(suspensePromises)\n  }\n\n  const firstSingleResultWhichShouldThrow = optimisticResult.find(\n    (result, index) =>\n      getHasError({\n        result,\n        errorResetBoundary,\n        throwErrors: defaultedQueries[index]?.throwErrors ?? false,\n        query: observer.getQueries()[index]!,\n      }),\n  )\n\n  if (firstSingleResultWhichShouldThrow?.error) {\n    throw firstSingleResultWhichShouldThrow.error\n  }\n\n  return optimisticResult as QueriesResults<T>\n}\n"],"names":["useQueries","queries","queryClient","client","useQueryClient","isRestoring","useIsRestoring","defaultedQueries","React","useMemo","map","options","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","useState","QueriesObserver","optimisticResult","getOptimisticResult","useSyncExternalStore","useCallback","onStoreChange","undefined","subscribe","notifyManager","batchCalls","getCurrentResult","useEffect","setQueries","listeners","errorResetBoundary","useQueryErrorResetBoundary","forEach","query","ensurePreventErrorBoundaryRetry","ensureStaleTime","useClearResetErrorBoundary","shouldAtLeastOneSuspend","some","result","index","shouldSuspend","suspensePromises","flatMap","queryObserver","getObservers","fetchOptimistic","willFetch","length","Promise","all","firstSingleResultWhichShouldThrow","find","getHasError","throwErrors","getQueries","error"],"mappings":"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"}

package/build/lib/useQueries.js

@@ -74,13 +74,16 @@ function useQueries({
   if (suspensePromises.length > 0) {
     throw Promise.all(suspensePromises);
   }
-  const firstSingleResultWhichShouldThrow = optimisticResult.find((result, index) => errorBoundaryUtils.getHasError({
-    result,
-    errorResetBoundary,
-    throwErrors: defaultedQueries[index]?.throwErrors ?? false,
-    query: observer.getQueries()[index]
-  }));
-  if (firstSingleResultWhichShouldThrow?.error) {
+  const firstSingleResultWhichShouldThrow = optimisticResult.find((result, index) => {
+    var _defaultedQueries$ind, _defaultedQueries$ind2;
+    return errorBoundaryUtils.getHasError({
+      result,
+      errorResetBoundary,
+      throwErrors: (_defaultedQueries$ind = (_defaultedQueries$ind2 = defaultedQueries[index]) == null ? void 0 : _defaultedQueries$ind2.throwErrors) != null ? _defaultedQueries$ind : false,
+      query: observer.getQueries()[index]
+    });
+  });
+  if (firstSingleResultWhichShouldThrow != null && firstSingleResultWhichShouldThrow.error) {
     throw firstSingleResultWhichShouldThrow.error;
   }
   return optimisticResult;

package/build/lib/useQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQueries.js","sources":["../../src/useQueries.ts"],"sourcesContent":["import * as React from 'react'\n\nimport type {\n  QueryKey,\n  QueryFunction,\n  QueriesPlaceholderDataFunction,\n  QueryClient,\n  DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { UseQueryOptions, UseQueryResult } from './types'\nimport { useIsRestoring } from './isRestoring'\nimport { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'\nimport {\n  ensurePreventErrorBoundaryRetry,\n  getHasError,\n  useClearResetErrorBoundary,\n} from './errorBoundaryUtils'\nimport {\n  ensureStaleTime,\n  shouldSuspend,\n  fetchOptimistic,\n  willFetch,\n} from './suspense'\n\n// This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype UseQueryOptionsForUseQueries<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n  'placeholderData'\n> & {\n  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n  T extends {\n    queryFnData: infer TQueryFnData\n    error?: infer TError\n    data: infer TData\n  }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<unknown, TError, TData>\n    : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n    T extends [infer TQueryFnData, infer TError, infer TData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData>\n    : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TData, TQueryKey>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TQueryFnData, TQueryKey>\n    : // Fallback\n      UseQueryOptionsForUseQueries\n\ntype GetResults<T> =\n  // Part 1: responsible for mapping explicit type parameter to function result, if object\n  T extends { queryFnData: any; error?: infer TError; data: infer TData }\n    ? UseQueryResult<TData, TError>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryResult<TData, TError>\n    : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n    T extends [any, infer TError, infer TData]\n    ? UseQueryResult<TData, TError>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryResult<TQueryFnData>\n    : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<unknown, any>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryResult<TData>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }\n    ? UseQueryResult<TQueryFnData>\n    : // Fallback\n      UseQueryResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryOptionsForUseQueries[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetOptions<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>\n  : unknown[] extends T\n  ? T\n  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n  // use this to infer the param types in the case of Array.map() argument\n  T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      infer TQueryKey\n    >[]\n  ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>[]\n  : // Fallback\n    UseQueryOptionsForUseQueries[]\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryResult[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetResults<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>\n  : T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      any\n    >[]\n  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results\n    UseQueryResult<\n      unknown extends TData ? TQueryFnData : TData,\n      unknown extends TError ? DefaultError : TError\n    >[]\n  : // Fallback\n    UseQueryResult[]\n\nexport function useQueries<T extends any[]>(\n  {\n    queries,\n  }: {\n    queries: readonly [...QueriesOptions<T>]\n  },\n  queryClient?: QueryClient,\n): QueriesResults<T> {\n  const client = useQueryClient(queryClient)\n  const isRestoring = useIsRestoring()\n\n  const defaultedQueries = React.useMemo(\n    () =>\n      queries.map((options) => {\n        const defaultedOptions = client.defaultQueryOptions(options)\n\n        // Make sure the results are already in fetching state before subscribing or updating options\n        defaultedOptions._optimisticResults = isRestoring\n          ? 'isRestoring'\n          : 'optimistic'\n\n        return defaultedOptions\n      }),\n    [queries, client, isRestoring],\n  )\n\n  const [observer] = React.useState(\n    () => new QueriesObserver(client, defaultedQueries),\n  )\n\n  const optimisticResult = observer.getOptimisticResult(defaultedQueries)\n\n  React.useSyncExternalStore(\n    React.useCallback(\n      (onStoreChange) =>\n        isRestoring\n          ? () => undefined\n          : observer.subscribe(notifyManager.batchCalls(onStoreChange)),\n      [observer, isRestoring],\n    ),\n    () => observer.getCurrentResult(),\n    () => observer.getCurrentResult(),\n  )\n\n  React.useEffect(() => {\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    observer.setQueries(defaultedQueries, { listeners: false })\n  }, [defaultedQueries, observer])\n\n  const errorResetBoundary = useQueryErrorResetBoundary()\n\n  defaultedQueries.forEach((query) => {\n    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)\n    ensureStaleTime(query)\n  })\n\n  useClearResetErrorBoundary(errorResetBoundary)\n\n  const shouldAtLeastOneSuspend = optimisticResult.some((result, index) =>\n    shouldSuspend(defaultedQueries[index], result, isRestoring),\n  )\n\n  const suspensePromises = shouldAtLeastOneSuspend\n    ? optimisticResult.flatMap((result, index) => {\n        const options = defaultedQueries[index]\n        const queryObserver = observer.getObservers()[index]\n\n        if (options && queryObserver) {\n          if (shouldSuspend(options, result, isRestoring)) {\n            return fetchOptimistic(options, queryObserver, errorResetBoundary)\n          } else if (willFetch(result, isRestoring)) {\n            void fetchOptimistic(options, queryObserver, errorResetBoundary)\n          }\n        }\n        return []\n      })\n    : []\n\n  if (suspensePromises.length > 0) {\n    throw Promise.all(suspensePromises)\n  }\n\n  const firstSingleResultWhichShouldThrow = optimisticResult.find(\n    (result, index) =>\n      getHasError({\n        result,\n        errorResetBoundary,\n        throwErrors: defaultedQueries[index]?.throwErrors ?? false,\n        query: observer.getQueries()[index]!,\n      }),\n  )\n\n  if (firstSingleResultWhichShouldThrow?.error) {\n    throw firstSingleResultWhichShouldThrow.error\n  }\n\n  return optimisticResult as QueriesResults<T>\n}\n"],"names":["useQueries","queries","queryClient","client","useQueryClient","isRestoring","useIsRestoring","defaultedQueries","React","useMemo","map","options","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","useState","QueriesObserver","optimisticResult","getOptimisticResult","useSyncExternalStore","useCallback","onStoreChange","undefined","subscribe","notifyManager","batchCalls","getCurrentResult","useEffect","setQueries","listeners","errorResetBoundary","useQueryErrorResetBoundary","forEach","query","ensurePreventErrorBoundaryRetry","ensureStaleTime","useClearResetErrorBoundary","shouldAtLeastOneSuspend","some","result","index","shouldSuspend","suspensePromises","flatMap","queryObserver","getObservers","fetchOptimistic","willFetch","length","Promise","all","firstSingleResultWhichShouldThrow","find","getHasError","throwErrors","getQueries","error"],"mappings":"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"}
+{"version":3,"file":"useQueries.js","sources":["../../src/useQueries.ts"],"sourcesContent":["import * as React from 'react'\n\nimport type {\n  QueryKey,\n  QueryFunction,\n  QueriesPlaceholderDataFunction,\n  QueryClient,\n  DefaultError,\n} from '@tanstack/query-core'\nimport { notifyManager, QueriesObserver } from '@tanstack/query-core'\nimport { useQueryClient } from './QueryClientProvider'\nimport type { UseQueryOptions, UseQueryResult } from './types'\nimport { useIsRestoring } from './isRestoring'\nimport { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'\nimport {\n  ensurePreventErrorBoundaryRetry,\n  getHasError,\n  useClearResetErrorBoundary,\n} from './errorBoundaryUtils'\nimport {\n  ensureStaleTime,\n  shouldSuspend,\n  fetchOptimistic,\n  willFetch,\n} from './suspense'\n\n// This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype UseQueryOptionsForUseQueries<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n  'placeholderData'\n> & {\n  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n  T extends {\n    queryFnData: infer TQueryFnData\n    error?: infer TError\n    data: infer TData\n  }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryOptionsForUseQueries<unknown, TError, TData>\n    : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n    T extends [infer TQueryFnData, infer TError, infer TData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryOptionsForUseQueries<TQueryFnData>\n    : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TData, TQueryKey>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }\n    ? UseQueryOptionsForUseQueries<TQueryFnData, Error, TQueryFnData, TQueryKey>\n    : // Fallback\n      UseQueryOptionsForUseQueries\n\ntype GetResults<T> =\n  // Part 1: responsible for mapping explicit type parameter to function result, if object\n  T extends { queryFnData: any; error?: infer TError; data: infer TData }\n    ? UseQueryResult<TData, TError>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends { data: infer TData; error?: infer TError }\n    ? UseQueryResult<TData, TError>\n    : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n    T extends [any, infer TError, infer TData]\n    ? UseQueryResult<TData, TError>\n    : T extends [infer TQueryFnData, infer TError]\n    ? UseQueryResult<TQueryFnData, TError>\n    : T extends [infer TQueryFnData]\n    ? UseQueryResult<TQueryFnData>\n    : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n    T extends {\n        queryFn?: QueryFunction<unknown, any>\n        select: (data: any) => infer TData\n      }\n    ? UseQueryResult<TData>\n    : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }\n    ? UseQueryResult<TQueryFnData>\n    : // Fallback\n      UseQueryResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryOptionsForUseQueries[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetOptions<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>\n  : unknown[] extends T\n  ? T\n  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n  // use this to infer the param types in the case of Array.map() argument\n  T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      infer TQueryKey\n    >[]\n  ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>[]\n  : // Fallback\n    UseQueryOptionsForUseQueries[]\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n  T extends any[],\n  Result extends any[] = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? UseQueryResult[]\n  : T extends []\n  ? []\n  : T extends [infer Head]\n  ? [...Result, GetResults<Head>]\n  : T extends [infer Head, ...infer Tail]\n  ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>\n  : T extends UseQueryOptionsForUseQueries<\n      infer TQueryFnData,\n      infer TError,\n      infer TData,\n      any\n    >[]\n  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results\n    UseQueryResult<\n      unknown extends TData ? TQueryFnData : TData,\n      unknown extends TError ? DefaultError : TError\n    >[]\n  : // Fallback\n    UseQueryResult[]\n\nexport function useQueries<T extends any[]>(\n  {\n    queries,\n  }: {\n    queries: readonly [...QueriesOptions<T>]\n  },\n  queryClient?: QueryClient,\n): QueriesResults<T> {\n  const client = useQueryClient(queryClient)\n  const isRestoring = useIsRestoring()\n\n  const defaultedQueries = React.useMemo(\n    () =>\n      queries.map((options) => {\n        const defaultedOptions = client.defaultQueryOptions(options)\n\n        // Make sure the results are already in fetching state before subscribing or updating options\n        defaultedOptions._optimisticResults = isRestoring\n          ? 'isRestoring'\n          : 'optimistic'\n\n        return defaultedOptions\n      }),\n    [queries, client, isRestoring],\n  )\n\n  const [observer] = React.useState(\n    () => new QueriesObserver(client, defaultedQueries),\n  )\n\n  const optimisticResult = observer.getOptimisticResult(defaultedQueries)\n\n  React.useSyncExternalStore(\n    React.useCallback(\n      (onStoreChange) =>\n        isRestoring\n          ? () => undefined\n          : observer.subscribe(notifyManager.batchCalls(onStoreChange)),\n      [observer, isRestoring],\n    ),\n    () => observer.getCurrentResult(),\n    () => observer.getCurrentResult(),\n  )\n\n  React.useEffect(() => {\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    observer.setQueries(defaultedQueries, { listeners: false })\n  }, [defaultedQueries, observer])\n\n  const errorResetBoundary = useQueryErrorResetBoundary()\n\n  defaultedQueries.forEach((query) => {\n    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)\n    ensureStaleTime(query)\n  })\n\n  useClearResetErrorBoundary(errorResetBoundary)\n\n  const shouldAtLeastOneSuspend = optimisticResult.some((result, index) =>\n    shouldSuspend(defaultedQueries[index], result, isRestoring),\n  )\n\n  const suspensePromises = shouldAtLeastOneSuspend\n    ? optimisticResult.flatMap((result, index) => {\n        const options = defaultedQueries[index]\n        const queryObserver = observer.getObservers()[index]\n\n        if (options && queryObserver) {\n          if (shouldSuspend(options, result, isRestoring)) {\n            return fetchOptimistic(options, queryObserver, errorResetBoundary)\n          } else if (willFetch(result, isRestoring)) {\n            void fetchOptimistic(options, queryObserver, errorResetBoundary)\n          }\n        }\n        return []\n      })\n    : []\n\n  if (suspensePromises.length > 0) {\n    throw Promise.all(suspensePromises)\n  }\n\n  const firstSingleResultWhichShouldThrow = optimisticResult.find(\n    (result, index) =>\n      getHasError({\n        result,\n        errorResetBoundary,\n        throwErrors: defaultedQueries[index]?.throwErrors ?? false,\n        query: observer.getQueries()[index]!,\n      }),\n  )\n\n  if (firstSingleResultWhichShouldThrow?.error) {\n    throw firstSingleResultWhichShouldThrow.error\n  }\n\n  return optimisticResult as QueriesResults<T>\n}\n"],"names":["useQueries","queries","queryClient","client","useQueryClient","isRestoring","useIsRestoring","defaultedQueries","React","useMemo","map","options","defaultedOptions","defaultQueryOptions","_optimisticResults","observer","useState","QueriesObserver","optimisticResult","getOptimisticResult","useSyncExternalStore","useCallback","onStoreChange","undefined","subscribe","notifyManager","batchCalls","getCurrentResult","useEffect","setQueries","listeners","errorResetBoundary","useQueryErrorResetBoundary","forEach","query","ensurePreventErrorBoundaryRetry","ensureStaleTime","useClearResetErrorBoundary","shouldAtLeastOneSuspend","some","result","index","shouldSuspend","suspensePromises","flatMap","queryObserver","getObservers","fetchOptimistic","willFetch","length","Promise","all","firstSingleResultWhichShouldThrow","find","getHasError","throwErrors","getQueries","error"],"mappings":"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"}

package/build/umd/index.development.js

@@ -1473,12 +1473,15 @@
   function infiniteQueryBehavior() {
     return {
       onFetch: context => {
-        context.fetchFn = () => {
+        context.fetchFn = async () => {
           const options = context.options;
           const direction = context.fetchOptions?.meta?.fetchMore?.direction;
           const oldPages = context.state.data?.pages || [];
           const oldPageParams = context.state.data?.pageParams || [];
-          let newPageParams = oldPageParams;
+          const empty = {
+            pages: [],
+            pageParams: []
+          };
           let cancelled = false;
           const addSignalProperty = object => {
             Object.defineProperty(object, 'signal', {
@@ -1498,95 +1501,95 @@
 
           // Get query function
           const queryFn = context.options.queryFn || (() => Promise.reject(new Error('Missing queryFn')));
-          const buildNewPages = (pages, param, page, previous) => {
-            const {
-              maxPages
-            } = context.options;
-            if (previous) {
-              newPageParams = addToStart(newPageParams, param, maxPages);
-              return addToStart(pages, page, maxPages);
-            }
-            newPageParams = addToEnd(newPageParams, param, maxPages);
-            return addToEnd(pages, page, maxPages);
-          };
 
           // Create function to fetch a page
-          const fetchPage = (pages, param, previous) => {
+          const fetchPage = async (data, param, previous) => {
             if (cancelled) {
               return Promise.reject();
             }
-            if (typeof param === 'undefined' && pages.length) {
-              return Promise.resolve(pages);
+            if (typeof param === 'undefined' && data.pages.length) {
+              return Promise.resolve(data);
             }
             const queryFnContext = {
               queryKey: context.queryKey,
               pageParam: param,
+              direction: previous ? 'backward' : 'forward',
               meta: context.options.meta
             };
             addSignalProperty(queryFnContext);
-            const queryFnResult = queryFn(queryFnContext);
-            const promise = Promise.resolve(queryFnResult).then(page => buildNewPages(pages, param, page, previous));
-            return promise;
+            const page = await queryFn(queryFnContext);
+            const {
+              maxPages
+            } = context.options;
+            const addTo = previous ? addToStart : addToEnd;
+            return {
+              pages: addTo(data.pages, page, maxPages),
+              pageParams: addTo(data.pageParams, param, maxPages)
+            };
           };
-          let promise;
+          let result;
 
           // Fetch first page?
           if (!oldPages.length) {
-            promise = fetchPage([], options.defaultPageParam);
+            result = await fetchPage(empty, options.defaultPageParam);
           }
 
           // fetch next / previous page?
           else if (direction) {
             const previous = direction === 'backward';
-            const param = previous ? getPreviousPageParam(options, oldPages) : getNextPageParam(options, oldPages);
-            promise = fetchPage(oldPages, param, previous);
+            const pageParamFn = previous ? getPreviousPageParam : getNextPageParam;
+            const oldData = {
+              pages: oldPages,
+              pageParams: oldPageParams
+            };
+            const param = pageParamFn(options, oldData);
+            result = await fetchPage(oldData, param, previous);
           }
 
           // Refetch pages
           else {
-            newPageParams = [];
-
             // Fetch first page
-            promise = fetchPage([], oldPageParams[0]);
+            result = await fetchPage(empty, oldPageParams[0]);
 
             // Fetch remaining pages
             for (let i = 1; i < oldPages.length; i++) {
-              promise = promise.then(pages => {
-                const param = getNextPageParam(options, pages);
-                return fetchPage(pages, param);
-              });
+              const param = getNextPageParam(options, result);
+              result = await fetchPage(result, param);
             }
           }
-          const finalPromise = promise.then(pages => ({
-            pages,
-            pageParams: newPageParams
-          }));
-          return finalPromise;
+          return result;
         };
       }
     };
   }
-  function getNextPageParam(options, pages) {
-    return options.getNextPageParam(pages[pages.length - 1], pages);
+  function getNextPageParam(options, {
+    pages,
+    pageParams
+  }) {
+    const lastIndex = pages.length - 1;
+    return options.getNextPageParam(pages[lastIndex], pages, pageParams[lastIndex], pageParams);
   }
-  function getPreviousPageParam(options, pages) {
-    return options.getPreviousPageParam?.(pages[0], pages);
+  function getPreviousPageParam(options, {
+    pages,
+    pageParams
+  }) {
+    return options.getPreviousPageParam?.(pages[0], pages, pageParams[0], pageParams);
   }
 
   /**
    * Checks if there is a next page.
    */
-  function hasNextPage(options, pages) {
-    if (!pages) return false;
-    return typeof getNextPageParam(options, pages) !== 'undefined';
+  function hasNextPage(options, data) {
+    if (!data) return false;
+    return typeof getNextPageParam(options, data) !== 'undefined';
   }
 
   /**
    * Checks if there is a previous page.
    */
-  function hasPreviousPage(options, pages) {
-    if (!pages || !options.getPreviousPageParam) return false;
-    return typeof getPreviousPageParam(options, pages) !== 'undefined';
+  function hasPreviousPage(options, data) {
+    if (!data || !options.getPreviousPageParam) return false;
+    return typeof getPreviousPageParam(options, data) !== 'undefined';
   }
 
   // CLASS
@@ -2444,7 +2447,7 @@
       options.behavior = infiniteQueryBehavior();
       return super.getOptimisticResult(options);
     }
-    fetchNextPage(options = {}) {
+    fetchNextPage(options) {
       return this.fetch({
         ...options,
         meta: {
@@ -2454,9 +2457,7 @@
         }
       });
     }
-    fetchPreviousPage({
-      ...options
-    } = {}) {
+    fetchPreviousPage(options) {
       return this.fetch({
         ...options,
         meta: {
@@ -2481,8 +2482,8 @@
         ...result,
         fetchNextPage: this.fetchNextPage,
         fetchPreviousPage: this.fetchPreviousPage,
-        hasNextPage: hasNextPage(options, state.data?.pages),
-        hasPreviousPage: hasPreviousPage(options, state.data?.pages),
+        hasNextPage: hasNextPage(options, state.data),
+        hasPreviousPage: hasPreviousPage(options, state.data),
         isFetchingNextPage,
         isFetchingPreviousPage,
         isRefetching: isRefetching && !isFetchingNextPage && !isFetchingPreviousPage