@ventlio/tanstack-query 0.4.0 → 0.4.2

package/src/queries/useGetInfiniteRequest.ts

@@ -1,4 +1,4 @@
-import type { QueryKey, UseQueryOptions } from '@tanstack/react-query';
+import type { InfiniteData, QueryKey, UseQueryOptions } from '@tanstack/react-query';
 import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
 import { startTransition, useEffect, useMemo, useState } from 'react';
 import { useEnvironmentVariables, useQueryConfig } from '../config';
@@ -110,17 +110,19 @@ export const useGetInfiniteRequest = <TResponse extends Record<string, any>>({
     return pathname + '?' + queryParams.toString();
   };
 
-  const query = useInfiniteQuery<any, any, IRequestSuccess<TResponse & { pagination: Pagination }>>({
-    queryKey: [requestPath, {}],
-    queryFn: ({ pageParam = requestPath, queryKey }) =>
+  const query = useInfiniteQuery<any, any, IRequestSuccess<TResponse & { pagination: Pagination }>>(
+    [requestPath, {}],
+    ({ pageParam = requestPath, queryKey }) =>
       new Promise<IRequestSuccess<TResponse & { pagination: Pagination }> | IRequestError>((res, rej) =>
-        sendRequest(res, rej, queryKey, pageParam as string)
+        sendRequest(res, rej, queryKey, pageParam)
       ),
-    enabled: load && !isFutureQueriesPaused,
-    getNextPageParam: (lastPage) => constructPaginationLink('next_page', lastPage),
-    getPreviousPageParam: (lastPage) => constructPaginationLink('previous_page', lastPage),
-    ...options,
-  });
+    {
+      enabled: load && !isFutureQueriesPaused,
+      getNextPageParam: (lastPage) => constructPaginationLink('next_page', lastPage),
+      getPreviousPageParam: (lastPage) => constructPaginationLink('previous_page', lastPage),
+      ...options,
+    }
+  );
 
   const setOptionsAsync = async (fetchOptions: any) => {
     startTransition(() => {
@@ -137,10 +139,12 @@ export const useGetInfiniteRequest = <TResponse extends Record<string, any>>({
       Array<any>
     >
   ): Promise<
-    | IRequestSuccess<
-        TResponse & {
-          pagination: Pagination;
-        }
+    | InfiniteData<
+        IRequestSuccess<
+          TResponse & {
+            pagination: Pagination;
+          }
+        >
       >
     | undefined
   > => {
@@ -173,6 +177,7 @@ export const useGetInfiniteRequest = <TResponse extends Record<string, any>>({
     if (keyTracker) {
       // set expiration time for the tracker
       queryClient.setQueryDefaults([keyTracker], {
+        cacheTime: Infinity,
         staleTime: Infinity,
       });
 

package/src/queries/useGetRequest.ts

@@ -78,13 +78,15 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     }
   };
 
-  const query = useQuery<any, any, IRequestSuccess<TResponse>>({
-    queryKey: [requestPath, {}],
-    queryFn: ({ queryKey }) =>
+  const query = useQuery<any, any, IRequestSuccess<TResponse>>(
+    [requestPath, {}],
+    ({ queryKey }) =>
       new Promise<IRequestSuccess<TResponse> | IRequestError>((res, rej) => sendRequest(res, rej, queryKey)),
-    enabled: load && !isFutureQueriesPaused,
-    ...options,
-  });
+    {
+      enabled: load && !isFutureQueriesPaused,
+      ...options,
+    }
+  );
 
   useEffect(() => {
     if (path) {
@@ -96,6 +98,7 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     if (keyTracker) {
       // set expiration time for the tracker
       queryClient.setQueryDefaults([keyTracker], {
+        cacheTime: Infinity,
         staleTime: Infinity,
       });
 

package/src/queries/usePatchRequest.ts

@@ -63,13 +63,13 @@ export const usePatchRequest = <TResponse>({ path, baseUrl, headers }: { path: s
   };
 
   // register post mutation
-  const mutation = useMutation<IRequestSuccess<TResponse>, IRequestError>({
-    mutationFn: (dataData: any) =>
+  const mutation = useMutation<IRequestSuccess<TResponse>, IRequestError>(
+    (dataData: any) =>
       new Promise<IRequestSuccess<TResponse>>((res, rej) => {
         return sendRequest(res, rej, dataData);
       }),
-    mutationKey: [path, { type: 'mutation' }],
-  });
+    { mutationKey: [path, { type: 'mutation' }] }
+  );
 
   const patch = async (
     data: any,
@@ -91,5 +91,5 @@ export const usePatchRequest = <TResponse>({ path, baseUrl, headers }: { path: s
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFutureMutationsPaused]);
 
-  return { patch, uploadProgressPercent, ...mutation, isLoading: mutation.isPending || isFutureMutationsPaused };
+  return { patch, uploadProgressPercent, ...mutation, isLoading: mutation.isLoading || isFutureMutationsPaused };
 };

package/src/queries/usePostRequest.ts

@@ -95,9 +95,7 @@ export const usePostRequest = <TResponse>({
     IRequestSuccess<TResponse>,
     IRequestError,
     { data: any; requestConfig?: Partial<Omit<IMakeRequest, 'body'>> }
-  >({
-    mutationFn: async (postData) =>
-      new Promise<IRequestSuccess<TResponse>>((res, rej) => sendRequest(res, rej, postData)),
+  >(async (postData) => new Promise<IRequestSuccess<TResponse>>((res, rej) => sendRequest(res, rej, postData)), {
     mutationKey: [path, { type: 'mutation' }],
   });
 
@@ -131,5 +129,5 @@ export const usePostRequest = <TResponse>({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFutureMutationsPaused]);
 
-  return { post, uploadProgressPercent, ...mutation, isLoading: mutation.isPending || isFutureMutationsPaused };
+  return { post, uploadProgressPercent, ...mutation, isLoading: mutation.isLoading || isFutureMutationsPaused };
 };

package/src/request/make-request.ts

@@ -1,3 +1,4 @@
+import type { AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 import { axiosInstance } from './axios-instance';
 
@@ -27,35 +28,38 @@ export async function makeRequest<TResponse>({
   // configure request header1
   if (!isFormData) {
     headers['Content-Type'] = ContentType.APPLICATION_JSON;
-  } else {
-    if (isApp) {
-      headers['Content-Type'] = ContentType.MULTIPART_FORM_DATA;
-      // add the app files
-      for (const fileKey in appFiles) {
-        const currentFile = appFiles[fileKey];
-        if (Array.isArray(currentFile)) {
-          for (const innerFile of currentFile) {
-            body.append(fileKey, innerFile);
-          }
-        } else {
-          body.append(fileKey, currentFile);
+  } else if (isApp) {
+    headers['Content-Type'] = ContentType.MULTIPART_FORM_DATA;
+    // add the app files
+    for (const fileKey in appFiles) {
+      const currentFile = appFiles[fileKey];
+      if (Array.isArray(currentFile)) {
+        for (const innerFile of currentFile) {
+          body.append(fileKey, innerFile);
         }
+      } else {
+        body.append(fileKey, currentFile);
       }
-    } else {
-      delete headers['Content-Type'];
     }
+  } else {
+    delete headers['Content-Type'];
   }
 
   try {
     const axiosRequest = axiosInstance({ baseURL, headers, timeout });
 
-    //   send request
-    const resp = await axiosRequest({
+    const axiosRequestConfig: AxiosRequestConfig<Record<string, any>> = {
       url: path,
       method,
-      data: body,
       onUploadProgress,
-    });
+    };
+
+    if (Object.keys(body).length > 0) {
+      axiosRequestConfig.data = body;
+    }
+
+    //   send request
+    const resp = await axiosRequest(axiosRequestConfig);
 
     // get response json
     const jsonResp: any = await resp.data;