@tanstack/query-core 5.0.0-alpha.2 → 5.0.0-alpha.23

package/build/lib/infiniteQueryBehavior.esm.js

@@ -3,12 +3,16 @@ import { addToStart, addToEnd } from './utils.esm.js';
 function infiniteQueryBehavior() {
   return {
     onFetch: context => {
-      context.fetchFn = () => {
+      context.fetchFn = async () => {
+        var _context$fetchOptions, _context$fetchOptions2, _context$fetchOptions3, _context$state$data, _context$state$data2;
         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 direction = (_context$fetchOptions = context.fetchOptions) == null ? void 0 : (_context$fetchOptions2 = _context$fetchOptions.meta) == null ? void 0 : (_context$fetchOptions3 = _context$fetchOptions2.fetchMore) == null ? void 0 : _context$fetchOptions3.direction;
+        const oldPages = ((_context$state$data = context.state.data) == null ? void 0 : _context$state$data.pages) || [];
+        const oldPageParams = ((_context$state$data2 = context.state.data) == null ? void 0 : _context$state$data2.pageParams) || [];
+        const empty = {
+          pages: [],
+          pageParams: []
+        };
         let cancelled = false;
         const addSignalProperty = object => {
           Object.defineProperty(object, 'signal', {
@@ -28,95 +32,95 @@ function infiniteQueryBehavior() {
 
         // 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 == null ? void 0 : 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';
 }
 
 export { hasNextPage, hasPreviousPage, infiniteQueryBehavior };

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

@@ -1 +1 @@
-{"version":3,"file":"infiniteQueryBehavior.esm.js","sources":["../../src/infiniteQueryBehavior.ts"],"sourcesContent":["import type { QueryBehavior } from './query'\nimport { addToEnd, addToStart } from './utils'\nimport type {\n  InfiniteData,\n  InfiniteQueryPageParamsOptions,\n  QueryFunctionContext,\n  QueryKey,\n} from './types'\n\nexport function infiniteQueryBehavior<\n  TQueryFnData,\n  TError,\n  TData,\n>(): QueryBehavior<TQueryFnData, TError, InfiniteData<TData>> {\n  return {\n    onFetch: (context) => {\n      context.fetchFn = () => {\n        const options = context.options as InfiniteQueryPageParamsOptions<TData>\n        const direction = context.fetchOptions?.meta?.fetchMore?.direction\n        const oldPages = context.state.data?.pages || []\n        const oldPageParams = context.state.data?.pageParams || []\n        let newPageParams = oldPageParams\n        let cancelled = false\n\n        const addSignalProperty = (object: unknown) => {\n          Object.defineProperty(object, 'signal', {\n            enumerable: true,\n            get: () => {\n              if (context.signal.aborted) {\n                cancelled = true\n              } else {\n                context.signal.addEventListener('abort', () => {\n                  cancelled = true\n                })\n              }\n              return context.signal\n            },\n          })\n        }\n\n        // Get query function\n        const queryFn =\n          context.options.queryFn ||\n          (() => Promise.reject(new Error('Missing queryFn')))\n\n        const buildNewPages = (\n          pages: unknown[],\n          param: unknown,\n          page: unknown,\n          previous?: boolean,\n        ) => {\n          const { maxPages } = context.options\n\n          if (previous) {\n            newPageParams = addToStart(newPageParams, param, maxPages)\n            return addToStart(pages, page, maxPages)\n          }\n\n          newPageParams = addToEnd(newPageParams, param, maxPages)\n          return addToEnd(pages, page, maxPages)\n        }\n\n        // Create function to fetch a page\n        const fetchPage = (\n          pages: unknown[],\n          param: unknown,\n          previous?: boolean,\n        ): Promise<unknown[]> => {\n          if (cancelled) {\n            return Promise.reject()\n          }\n\n          if (typeof param === 'undefined' && pages.length) {\n            return Promise.resolve(pages)\n          }\n\n          const queryFnContext: Omit<\n            QueryFunctionContext<QueryKey, unknown>,\n            'signal'\n          > = {\n            queryKey: context.queryKey,\n            pageParam: param,\n            meta: context.options.meta,\n          }\n\n          addSignalProperty(queryFnContext)\n\n          const queryFnResult = queryFn(\n            queryFnContext as QueryFunctionContext<QueryKey, unknown>,\n          )\n\n          const promise = Promise.resolve(queryFnResult).then((page) =>\n            buildNewPages(pages, param, page, previous),\n          )\n\n          return promise\n        }\n\n        let promise: Promise<unknown[]>\n\n        // Fetch first page?\n        if (!oldPages.length) {\n          promise = fetchPage([], options.defaultPageParam)\n        }\n\n        // fetch next / previous page?\n        else if (direction) {\n          const previous = direction === 'backward'\n          const param = previous\n            ? getPreviousPageParam(options, oldPages)\n            : getNextPageParam(options, oldPages)\n          promise = fetchPage(oldPages, param, previous)\n        }\n\n        // Refetch pages\n        else {\n          newPageParams = []\n\n          // Fetch first page\n          promise = fetchPage([], oldPageParams[0])\n\n          // Fetch remaining pages\n          for (let i = 1; i < oldPages.length; i++) {\n            promise = promise.then((pages) => {\n              const param = getNextPageParam(options, pages)\n              return fetchPage(pages, param)\n            })\n          }\n        }\n\n        const finalPromise = promise.then((pages) => ({\n          pages,\n          pageParams: newPageParams,\n        }))\n\n        return finalPromise\n      }\n    },\n  }\n}\n\nfunction getNextPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages: unknown[],\n): unknown | undefined {\n  return options.getNextPageParam(pages[pages.length - 1], pages)\n}\n\nfunction getPreviousPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages: unknown[],\n): unknown | undefined {\n  return options.getPreviousPageParam?.(pages[0], pages)\n}\n\n/**\n * Checks if there is a next page.\n */\nexport function hasNextPage(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages?: unknown[],\n): boolean {\n  if (!pages) return false\n  return typeof getNextPageParam(options, pages) !== 'undefined'\n}\n\n/**\n * Checks if there is a previous page.\n */\nexport function hasPreviousPage(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages?: unknown[],\n): boolean {\n  if (!pages || !options.getPreviousPageParam) return false\n  return typeof getPreviousPageParam(options, pages) !== 'undefined'\n}\n"],"names":["infiniteQueryBehavior","onFetch","context","fetchFn","options","direction","fetchOptions","meta","fetchMore","oldPages","state","data","pages","oldPageParams","pageParams","newPageParams","cancelled","addSignalProperty","object","Object","defineProperty","enumerable","get","signal","aborted","addEventListener","queryFn","Promise","reject","Error","buildNewPages","param","page","previous","maxPages","addToStart","addToEnd","fetchPage","length","resolve","queryFnContext","queryKey","pageParam","queryFnResult","promise","then","defaultPageParam","getPreviousPageParam","getNextPageParam","i","finalPromise","hasNextPage","hasPreviousPage"],"mappings":"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"}
+{"version":3,"file":"infiniteQueryBehavior.esm.js","sources":["../../src/infiniteQueryBehavior.ts"],"sourcesContent":["import type { QueryBehavior } from './query'\nimport { addToEnd, addToStart } from './utils'\nimport type {\n  InfiniteData,\n  InfiniteQueryPageParamsOptions,\n  QueryFunctionContext,\n  QueryKey,\n} from './types'\n\nexport function infiniteQueryBehavior<\n  TQueryFnData,\n  TError,\n  TData,\n>(): QueryBehavior<TQueryFnData, TError, InfiniteData<TData>> {\n  return {\n    onFetch: (context) => {\n      context.fetchFn = async () => {\n        const options = context.options as InfiniteQueryPageParamsOptions<TData>\n        const direction = context.fetchOptions?.meta?.fetchMore?.direction\n        const oldPages = context.state.data?.pages || []\n        const oldPageParams = context.state.data?.pageParams || []\n        const empty = { pages: [], pageParams: [] }\n        let cancelled = false\n\n        const addSignalProperty = (object: unknown) => {\n          Object.defineProperty(object, 'signal', {\n            enumerable: true,\n            get: () => {\n              if (context.signal.aborted) {\n                cancelled = true\n              } else {\n                context.signal.addEventListener('abort', () => {\n                  cancelled = true\n                })\n              }\n              return context.signal\n            },\n          })\n        }\n\n        // Get query function\n        const queryFn =\n          context.options.queryFn ||\n          (() => Promise.reject(new Error('Missing queryFn')))\n\n        // Create function to fetch a page\n        const fetchPage = async (\n          data: InfiniteData<unknown>,\n          param: unknown,\n          previous?: boolean,\n        ): Promise<InfiniteData<unknown>> => {\n          if (cancelled) {\n            return Promise.reject()\n          }\n\n          if (typeof param === 'undefined' && data.pages.length) {\n            return Promise.resolve(data)\n          }\n\n          const queryFnContext: Omit<\n            QueryFunctionContext<QueryKey, unknown>,\n            'signal'\n          > = {\n            queryKey: context.queryKey,\n            pageParam: param,\n            direction: previous ? 'backward' : 'forward',\n            meta: context.options.meta,\n          }\n\n          addSignalProperty(queryFnContext)\n\n          const page = await queryFn(\n            queryFnContext as QueryFunctionContext<QueryKey, unknown>,\n          )\n\n          const { maxPages } = context.options\n          const addTo = previous ? addToStart : addToEnd\n\n          return {\n            pages: addTo(data.pages, page, maxPages),\n            pageParams: addTo(data.pageParams, param, maxPages),\n          }\n        }\n\n        let result: InfiniteData<unknown>\n\n        // Fetch first page?\n        if (!oldPages.length) {\n          result = await fetchPage(empty, options.defaultPageParam)\n        }\n\n        // fetch next / previous page?\n        else if (direction) {\n          const previous = direction === 'backward'\n          const pageParamFn = previous ? getPreviousPageParam : getNextPageParam\n          const oldData = {\n            pages: oldPages,\n            pageParams: oldPageParams,\n          }\n          const param = pageParamFn(options, oldData)\n\n          result = await fetchPage(oldData, param, previous)\n        }\n\n        // Refetch pages\n        else {\n          // Fetch first page\n          result = await fetchPage(empty, oldPageParams[0])\n\n          // Fetch remaining pages\n          for (let i = 1; i < oldPages.length; i++) {\n            const param = getNextPageParam(options, result)\n            result = await fetchPage(result, param)\n          }\n        }\n\n        return result\n      }\n    },\n  }\n}\n\nfunction getNextPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  { pages, pageParams }: InfiniteData<unknown>,\n): unknown | undefined {\n  const lastIndex = pages.length - 1\n  return options.getNextPageParam(\n    pages[lastIndex],\n    pages,\n    pageParams[lastIndex],\n    pageParams,\n  )\n}\n\nfunction getPreviousPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  { pages, pageParams }: InfiniteData<unknown>,\n): unknown | undefined {\n  return options.getPreviousPageParam?.(\n    pages[0],\n    pages,\n    pageParams[0],\n    pageParams,\n  )\n}\n\n/**\n * Checks if there is a next page.\n */\nexport function hasNextPage(\n  options: InfiniteQueryPageParamsOptions<any, any>,\n  data?: InfiniteData<unknown>,\n): boolean {\n  if (!data) return false\n  return typeof getNextPageParam(options, data) !== 'undefined'\n}\n\n/**\n * Checks if there is a previous page.\n */\nexport function hasPreviousPage(\n  options: InfiniteQueryPageParamsOptions<any, any>,\n  data?: InfiniteData<unknown>,\n): boolean {\n  if (!data || !options.getPreviousPageParam) return false\n  return typeof getPreviousPageParam(options, data) !== 'undefined'\n}\n"],"names":["infiniteQueryBehavior","onFetch","context","fetchFn","options","direction","fetchOptions","meta","fetchMore","oldPages","state","data","pages","oldPageParams","pageParams","empty","cancelled","addSignalProperty","object","Object","defineProperty","enumerable","get","signal","aborted","addEventListener","queryFn","Promise","reject","Error","fetchPage","param","previous","length","resolve","queryFnContext","queryKey","pageParam","page","maxPages","addTo","addToStart","addToEnd","result","defaultPageParam","pageParamFn","getPreviousPageParam","getNextPageParam","oldData","i","lastIndex","hasNextPage","hasPreviousPage"],"mappings":"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"}

package/build/lib/infiniteQueryBehavior.js

@@ -5,12 +5,16 @@ var utils = require('./utils.js');
 function infiniteQueryBehavior() {
   return {
     onFetch: context => {
-      context.fetchFn = () => {
+      context.fetchFn = async () => {
+        var _context$fetchOptions, _context$fetchOptions2, _context$fetchOptions3, _context$state$data, _context$state$data2;
         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 direction = (_context$fetchOptions = context.fetchOptions) == null ? void 0 : (_context$fetchOptions2 = _context$fetchOptions.meta) == null ? void 0 : (_context$fetchOptions3 = _context$fetchOptions2.fetchMore) == null ? void 0 : _context$fetchOptions3.direction;
+        const oldPages = ((_context$state$data = context.state.data) == null ? void 0 : _context$state$data.pages) || [];
+        const oldPageParams = ((_context$state$data2 = context.state.data) == null ? void 0 : _context$state$data2.pageParams) || [];
+        const empty = {
+          pages: [],
+          pageParams: []
+        };
         let cancelled = false;
         const addSignalProperty = object => {
           Object.defineProperty(object, 'signal', {
@@ -30,95 +34,95 @@ function infiniteQueryBehavior() {
 
         // 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 = utils.addToStart(newPageParams, param, maxPages);
-            return utils.addToStart(pages, page, maxPages);
-          }
-          newPageParams = utils.addToEnd(newPageParams, param, maxPages);
-          return utils.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 ? utils.addToStart : utils.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 == null ? void 0 : 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';
 }
 
 exports.hasNextPage = hasNextPage;

package/build/lib/infiniteQueryBehavior.js.map

@@ -1 +1 @@
-{"version":3,"file":"infiniteQueryBehavior.js","sources":["../../src/infiniteQueryBehavior.ts"],"sourcesContent":["import type { QueryBehavior } from './query'\nimport { addToEnd, addToStart } from './utils'\nimport type {\n  InfiniteData,\n  InfiniteQueryPageParamsOptions,\n  QueryFunctionContext,\n  QueryKey,\n} from './types'\n\nexport function infiniteQueryBehavior<\n  TQueryFnData,\n  TError,\n  TData,\n>(): QueryBehavior<TQueryFnData, TError, InfiniteData<TData>> {\n  return {\n    onFetch: (context) => {\n      context.fetchFn = () => {\n        const options = context.options as InfiniteQueryPageParamsOptions<TData>\n        const direction = context.fetchOptions?.meta?.fetchMore?.direction\n        const oldPages = context.state.data?.pages || []\n        const oldPageParams = context.state.data?.pageParams || []\n        let newPageParams = oldPageParams\n        let cancelled = false\n\n        const addSignalProperty = (object: unknown) => {\n          Object.defineProperty(object, 'signal', {\n            enumerable: true,\n            get: () => {\n              if (context.signal.aborted) {\n                cancelled = true\n              } else {\n                context.signal.addEventListener('abort', () => {\n                  cancelled = true\n                })\n              }\n              return context.signal\n            },\n          })\n        }\n\n        // Get query function\n        const queryFn =\n          context.options.queryFn ||\n          (() => Promise.reject(new Error('Missing queryFn')))\n\n        const buildNewPages = (\n          pages: unknown[],\n          param: unknown,\n          page: unknown,\n          previous?: boolean,\n        ) => {\n          const { maxPages } = context.options\n\n          if (previous) {\n            newPageParams = addToStart(newPageParams, param, maxPages)\n            return addToStart(pages, page, maxPages)\n          }\n\n          newPageParams = addToEnd(newPageParams, param, maxPages)\n          return addToEnd(pages, page, maxPages)\n        }\n\n        // Create function to fetch a page\n        const fetchPage = (\n          pages: unknown[],\n          param: unknown,\n          previous?: boolean,\n        ): Promise<unknown[]> => {\n          if (cancelled) {\n            return Promise.reject()\n          }\n\n          if (typeof param === 'undefined' && pages.length) {\n            return Promise.resolve(pages)\n          }\n\n          const queryFnContext: Omit<\n            QueryFunctionContext<QueryKey, unknown>,\n            'signal'\n          > = {\n            queryKey: context.queryKey,\n            pageParam: param,\n            meta: context.options.meta,\n          }\n\n          addSignalProperty(queryFnContext)\n\n          const queryFnResult = queryFn(\n            queryFnContext as QueryFunctionContext<QueryKey, unknown>,\n          )\n\n          const promise = Promise.resolve(queryFnResult).then((page) =>\n            buildNewPages(pages, param, page, previous),\n          )\n\n          return promise\n        }\n\n        let promise: Promise<unknown[]>\n\n        // Fetch first page?\n        if (!oldPages.length) {\n          promise = fetchPage([], options.defaultPageParam)\n        }\n\n        // fetch next / previous page?\n        else if (direction) {\n          const previous = direction === 'backward'\n          const param = previous\n            ? getPreviousPageParam(options, oldPages)\n            : getNextPageParam(options, oldPages)\n          promise = fetchPage(oldPages, param, previous)\n        }\n\n        // Refetch pages\n        else {\n          newPageParams = []\n\n          // Fetch first page\n          promise = fetchPage([], oldPageParams[0])\n\n          // Fetch remaining pages\n          for (let i = 1; i < oldPages.length; i++) {\n            promise = promise.then((pages) => {\n              const param = getNextPageParam(options, pages)\n              return fetchPage(pages, param)\n            })\n          }\n        }\n\n        const finalPromise = promise.then((pages) => ({\n          pages,\n          pageParams: newPageParams,\n        }))\n\n        return finalPromise\n      }\n    },\n  }\n}\n\nfunction getNextPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages: unknown[],\n): unknown | undefined {\n  return options.getNextPageParam(pages[pages.length - 1], pages)\n}\n\nfunction getPreviousPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages: unknown[],\n): unknown | undefined {\n  return options.getPreviousPageParam?.(pages[0], pages)\n}\n\n/**\n * Checks if there is a next page.\n */\nexport function hasNextPage(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages?: unknown[],\n): boolean {\n  if (!pages) return false\n  return typeof getNextPageParam(options, pages) !== 'undefined'\n}\n\n/**\n * Checks if there is a previous page.\n */\nexport function hasPreviousPage(\n  options: InfiniteQueryPageParamsOptions<any>,\n  pages?: unknown[],\n): boolean {\n  if (!pages || !options.getPreviousPageParam) return false\n  return typeof getPreviousPageParam(options, pages) !== 'undefined'\n}\n"],"names":["infiniteQueryBehavior","onFetch","context","fetchFn","options","direction","fetchOptions","meta","fetchMore","oldPages","state","data","pages","oldPageParams","pageParams","newPageParams","cancelled","addSignalProperty","object","Object","defineProperty","enumerable","get","signal","aborted","addEventListener","queryFn","Promise","reject","Error","buildNewPages","param","page","previous","maxPages","addToStart","addToEnd","fetchPage","length","resolve","queryFnContext","queryKey","pageParam","queryFnResult","promise","then","defaultPageParam","getPreviousPageParam","getNextPageParam","i","finalPromise","hasNextPage","hasPreviousPage"],"mappings":"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"}
+{"version":3,"file":"infiniteQueryBehavior.js","sources":["../../src/infiniteQueryBehavior.ts"],"sourcesContent":["import type { QueryBehavior } from './query'\nimport { addToEnd, addToStart } from './utils'\nimport type {\n  InfiniteData,\n  InfiniteQueryPageParamsOptions,\n  QueryFunctionContext,\n  QueryKey,\n} from './types'\n\nexport function infiniteQueryBehavior<\n  TQueryFnData,\n  TError,\n  TData,\n>(): QueryBehavior<TQueryFnData, TError, InfiniteData<TData>> {\n  return {\n    onFetch: (context) => {\n      context.fetchFn = async () => {\n        const options = context.options as InfiniteQueryPageParamsOptions<TData>\n        const direction = context.fetchOptions?.meta?.fetchMore?.direction\n        const oldPages = context.state.data?.pages || []\n        const oldPageParams = context.state.data?.pageParams || []\n        const empty = { pages: [], pageParams: [] }\n        let cancelled = false\n\n        const addSignalProperty = (object: unknown) => {\n          Object.defineProperty(object, 'signal', {\n            enumerable: true,\n            get: () => {\n              if (context.signal.aborted) {\n                cancelled = true\n              } else {\n                context.signal.addEventListener('abort', () => {\n                  cancelled = true\n                })\n              }\n              return context.signal\n            },\n          })\n        }\n\n        // Get query function\n        const queryFn =\n          context.options.queryFn ||\n          (() => Promise.reject(new Error('Missing queryFn')))\n\n        // Create function to fetch a page\n        const fetchPage = async (\n          data: InfiniteData<unknown>,\n          param: unknown,\n          previous?: boolean,\n        ): Promise<InfiniteData<unknown>> => {\n          if (cancelled) {\n            return Promise.reject()\n          }\n\n          if (typeof param === 'undefined' && data.pages.length) {\n            return Promise.resolve(data)\n          }\n\n          const queryFnContext: Omit<\n            QueryFunctionContext<QueryKey, unknown>,\n            'signal'\n          > = {\n            queryKey: context.queryKey,\n            pageParam: param,\n            direction: previous ? 'backward' : 'forward',\n            meta: context.options.meta,\n          }\n\n          addSignalProperty(queryFnContext)\n\n          const page = await queryFn(\n            queryFnContext as QueryFunctionContext<QueryKey, unknown>,\n          )\n\n          const { maxPages } = context.options\n          const addTo = previous ? addToStart : addToEnd\n\n          return {\n            pages: addTo(data.pages, page, maxPages),\n            pageParams: addTo(data.pageParams, param, maxPages),\n          }\n        }\n\n        let result: InfiniteData<unknown>\n\n        // Fetch first page?\n        if (!oldPages.length) {\n          result = await fetchPage(empty, options.defaultPageParam)\n        }\n\n        // fetch next / previous page?\n        else if (direction) {\n          const previous = direction === 'backward'\n          const pageParamFn = previous ? getPreviousPageParam : getNextPageParam\n          const oldData = {\n            pages: oldPages,\n            pageParams: oldPageParams,\n          }\n          const param = pageParamFn(options, oldData)\n\n          result = await fetchPage(oldData, param, previous)\n        }\n\n        // Refetch pages\n        else {\n          // Fetch first page\n          result = await fetchPage(empty, oldPageParams[0])\n\n          // Fetch remaining pages\n          for (let i = 1; i < oldPages.length; i++) {\n            const param = getNextPageParam(options, result)\n            result = await fetchPage(result, param)\n          }\n        }\n\n        return result\n      }\n    },\n  }\n}\n\nfunction getNextPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  { pages, pageParams }: InfiniteData<unknown>,\n): unknown | undefined {\n  const lastIndex = pages.length - 1\n  return options.getNextPageParam(\n    pages[lastIndex],\n    pages,\n    pageParams[lastIndex],\n    pageParams,\n  )\n}\n\nfunction getPreviousPageParam(\n  options: InfiniteQueryPageParamsOptions<any>,\n  { pages, pageParams }: InfiniteData<unknown>,\n): unknown | undefined {\n  return options.getPreviousPageParam?.(\n    pages[0],\n    pages,\n    pageParams[0],\n    pageParams,\n  )\n}\n\n/**\n * Checks if there is a next page.\n */\nexport function hasNextPage(\n  options: InfiniteQueryPageParamsOptions<any, any>,\n  data?: InfiniteData<unknown>,\n): boolean {\n  if (!data) return false\n  return typeof getNextPageParam(options, data) !== 'undefined'\n}\n\n/**\n * Checks if there is a previous page.\n */\nexport function hasPreviousPage(\n  options: InfiniteQueryPageParamsOptions<any, any>,\n  data?: InfiniteData<unknown>,\n): boolean {\n  if (!data || !options.getPreviousPageParam) return false\n  return typeof getPreviousPageParam(options, data) !== 'undefined'\n}\n"],"names":["infiniteQueryBehavior","onFetch","context","fetchFn","options","direction","fetchOptions","meta","fetchMore","oldPages","state","data","pages","oldPageParams","pageParams","empty","cancelled","addSignalProperty","object","Object","defineProperty","enumerable","get","signal","aborted","addEventListener","queryFn","Promise","reject","Error","fetchPage","param","previous","length","resolve","queryFnContext","queryKey","pageParam","page","maxPages","addTo","addToStart","addToEnd","result","defaultPageParam","pageParamFn","getPreviousPageParam","getNextPageParam","oldData","i","lastIndex","hasNextPage","hasPreviousPage"],"mappings":"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"}

package/build/lib/infiniteQueryBehavior.mjs

@@ -3,12 +3,15 @@ import { addToStart, addToEnd } from './utils.mjs';
 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', {
@@ -28,95 +31,95 @@ function infiniteQueryBehavior() {
 
         // 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';
 }
 
 export { hasNextPage, hasPreviousPage, infiniteQueryBehavior };