@ventlio/tanstack-query 0.2.75 → 0.2.76

package/dist/index.mjs

@@ -459,23 +459,23 @@ const useGetInfiniteRequest = ({ path, load = false, queryOptions, keyTracker, b
             res(null);
         }
     };
-    const query = useInfiniteQuery([path, {}], ({ pageParam = path }) => new Promise((res, rej) => sendRequest(res, rej, pageParam)), {
-        enabled: load,
-        getNextPageParam: (lastPage, pages) => constructPaginationLink('next_page', lastPage, pages),
-        getPreviousPageParam: (lastPage, pages) => constructPaginationLink('previous_page', lastPage, pages),
-        ...queryOptions,
-    });
     /**
      *
      * This pagination implementation is currently tied to our use case
      */
-    const constructPaginationLink = (direction, lastPage, pages) => {
-        const [pathname, queryString] = lastPage.split('?');
+    const constructPaginationLink = (direction, lastPage) => {
+        const [pathname, queryString] = path.split('?');
         const queryParams = new URLSearchParams(queryString);
-        const lastPageItem = pages[pages.length - 1];
-        queryParams.set('page', String(lastPageItem?.data.pagination[direction]));
+        const lastPageItem = lastPage.data.pagination[direction];
+        queryParams.set('page', String(lastPageItem));
         return pathname + '?' + queryParams.toString();
     };
+    const query = useInfiniteQuery([path, {}], ({ pageParam = path }) => new Promise((res, rej) => sendRequest(res, rej, pageParam)), {
+        enabled: load,
+        getNextPageParam: (lastPage) => constructPaginationLink('next_page', lastPage),
+        getPreviousPageParam: (lastPage) => constructPaginationLink('previous_page', lastPage),
+        ...queryOptions,
+    });
     useEffect(() => {
         if (keyTracker) {
             // set expiration time for the tracker

package/dist/queries/useGetInfiniteRequest.js

@@ -34,23 +34,23 @@ const useGetInfiniteRequest = ({ path, load = false, queryOptions, keyTracker, b
             res(null);
         }
     };
-    const query = useInfiniteQuery([path, {}], ({ pageParam = path }) => new Promise((res, rej) => sendRequest(res, rej, pageParam)), {
-        enabled: load,
-        getNextPageParam: (lastPage, pages) => constructPaginationLink('next_page', lastPage, pages),
-        getPreviousPageParam: (lastPage, pages) => constructPaginationLink('previous_page', lastPage, pages),
-        ...queryOptions,
-    });
     /**
      *
      * This pagination implementation is currently tied to our use case
      */
-    const constructPaginationLink = (direction, lastPage, pages) => {
-        const [pathname, queryString] = lastPage.split('?');
+    const constructPaginationLink = (direction, lastPage) => {
+        const [pathname, queryString] = path.split('?');
         const queryParams = new URLSearchParams(queryString);
-        const lastPageItem = pages[pages.length - 1];
-        queryParams.set('page', String(lastPageItem?.data.pagination[direction]));
+        const lastPageItem = lastPage.data.pagination[direction];
+        queryParams.set('page', String(lastPageItem));
         return pathname + '?' + queryParams.toString();
     };
+    const query = useInfiniteQuery([path, {}], ({ pageParam = path }) => new Promise((res, rej) => sendRequest(res, rej, pageParam)), {
+        enabled: load,
+        getNextPageParam: (lastPage) => constructPaginationLink('next_page', lastPage),
+        getPreviousPageParam: (lastPage) => constructPaginationLink('previous_page', lastPage),
+        ...queryOptions,
+    });
     useEffect(() => {
         if (keyTracker) {
             // set expiration time for the tracker

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ventlio/tanstack-query",
-  "version": "0.2.75",
+  "version": "0.2.76",
   "license": "MIT",
   "main": "dist/index.js",
   "contributors": [

package/src/queries/useGetInfiniteRequest.ts

@@ -68,43 +68,42 @@ export const useGetInfiniteRequest = <TResponse extends Record<string, any>>({
     }
   };
 
-  const query = useInfiniteQuery<any, any, IRequestSuccess<TResponse & { pagination: Pagination }>>(
-    [path, {}],
-    ({ pageParam = path }) =>
-      new Promise<IRequestSuccess<TResponse & { pagination: Pagination }> | IRequestError>((res, rej) =>
-        sendRequest(res, rej, pageParam)
-      ),
-    {
-      enabled: load,
-      getNextPageParam: (lastPage, pages) => constructPaginationLink('next_page', lastPage, pages),
-      getPreviousPageParam: (lastPage, pages) => constructPaginationLink('previous_page', lastPage, pages),
-      ...(queryOptions as any),
-    }
-  );
-
   /**
    *
    * This pagination implementation is currently tied to our use case
    */
   const constructPaginationLink = (
     direction: 'next_page' | 'previous_page',
-    lastPage: string,
-    pages: IRequestSuccess<
+    lastPage: IRequestSuccess<
       TResponse & {
         pagination: Pagination;
       }
-    >[]
+    >
   ) => {
-    const [pathname, queryString] = lastPage.split('?');
+    const [pathname, queryString] = path.split('?');
 
     const queryParams = new URLSearchParams(queryString);
-    const lastPageItem = pages[pages.length - 1];
+    const lastPageItem = lastPage.data.pagination[direction];
 
-    queryParams.set('page', String(lastPageItem?.data.pagination[direction]));
+    queryParams.set('page', String(lastPageItem));
 
     return pathname + '?' + queryParams.toString();
   };
 
+  const query = useInfiniteQuery<any, any, IRequestSuccess<TResponse & { pagination: Pagination }>>(
+    [path, {}],
+    ({ pageParam = path }) =>
+      new Promise<IRequestSuccess<TResponse & { pagination: Pagination }> | IRequestError>((res, rej) =>
+        sendRequest(res, rej, pageParam)
+      ),
+    {
+      enabled: load,
+      getNextPageParam: (lastPage) => constructPaginationLink('next_page', lastPage),
+      getPreviousPageParam: (lastPage) => constructPaginationLink('previous_page', lastPage),
+      ...(queryOptions as any),
+    }
+  );
+
   useEffect(() => {
     if (keyTracker) {
       // set expiration time for the tracker