@ventlio/tanstack-query 0.2.30 → 0.2.32

package/dist/config/useQueryHeaders.js

@@ -4,23 +4,26 @@ var reactQuery = require('@tanstack/react-query');
 
 const useQueryHeaders = () => {
     const queryClient = reactQuery.useQueryClient();
-    const getHeadersAsync = async () => {
-        return queryClient.ensureQueryData({
-            queryKey: ['config'],
-            queryFn: () => {
-                return queryClient.getQueryData(['config']);
-            },
-            staleTime: Infinity,
-            cacheTime: Infinity,
-        });
+    const getHeaders = () => {
+        const config = queryClient.getQueryData(['config']);
+        return config.headers;
     };
     const setQueryHeaders = (newHeaders) => {
+        // make sure the config does not expire
+        queryClient.setDefaultOptions({
+            queries: {
+                queryKey: ['config'],
+                staleTime: Infinity,
+                cacheTime: Infinity,
+            },
+        });
+        // set the config
         queryClient.setQueryData(['config'], (config) => {
             const newConfig = { ...config, headers: newHeaders };
             return newConfig;
-        });
+        }, {});
     };
-    return { setQueryHeaders, getHeadersAsync };
+    return { setQueryHeaders, getHeaders };
 };
 
 exports.useQueryHeaders = useQueryHeaders;

package/dist/config/useQueryHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQueryHeaders.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"useQueryHeaders.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/index.mjs

@@ -19,23 +19,26 @@ const useQueryConfig = () => {
 
 const useQueryHeaders = () => {
     const queryClient = useQueryClient();
-    const getHeadersAsync = async () => {
-        return queryClient.ensureQueryData({
-            queryKey: ['config'],
-            queryFn: () => {
-                return queryClient.getQueryData(['config']);
-            },
-            staleTime: Infinity,
-            cacheTime: Infinity,
-        });
+    const getHeaders = () => {
+        const config = queryClient.getQueryData(['config']);
+        return config.headers;
     };
     const setQueryHeaders = (newHeaders) => {
+        // make sure the config does not expire
+        queryClient.setDefaultOptions({
+            queries: {
+                queryKey: ['config'],
+                staleTime: Infinity,
+                cacheTime: Infinity,
+            },
+        });
+        // set the config
         queryClient.setQueryData(['config'], (config) => {
             const newConfig = { ...config, headers: newHeaders };
             return newConfig;
-        });
+        }, {});
     };
-    return { setQueryHeaders, getHeadersAsync };
+    return { setQueryHeaders, getHeaders };
 };
 
 const scrollToTop = () => {
@@ -143,7 +146,6 @@ async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, he
         headers['Content-Type'] = ContentType.APPLICATION_JSON;
     }
     else {
-        console.log({ headers });
         delete headers['Content-Type'];
     }
     try {
@@ -183,12 +185,11 @@ const useDeleteRequest = () => {
     const [requestPath, updateDeletePath] = useState('');
     const [options, setOptions] = useState();
     const { API_URL, TIMEOUT } = useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders();
+    const { getHeaders } = useQueryHeaders();
     const query = useQuery([requestPath, {}], () => new Promise((res, rej) => {
         setTimeout(async () => {
             // get request headers
-            const headers = (await getHeadersAsync())
-                .headers;
+            const headers = getHeaders();
             const postResponse = await makeRequest({
                 path: requestPath,
                 headers,
@@ -229,13 +230,13 @@ const useGetRequest = ({ path, load = false, queryOptions, keyTracker, }) => {
     const [options, setOptions] = useState(queryOptions);
     const [page, setPage] = useState(1);
     const { API_URL, TIMEOUT } = useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders();
+    const { getHeaders } = useQueryHeaders();
     let queryClient = useQueryClient();
     // eslint-disable-next-line react-hooks/exhaustive-deps
     queryClient = useMemo(() => queryClient, []);
     const sendRequest = async (res, rej) => {
         // get request headers
-        const headers = (await getHeadersAsync()).headers;
+        const headers = getHeaders();
         const postResponse = await makeRequest({
             path: requestPath,
             headers,
@@ -328,13 +329,12 @@ const useGetRequest = ({ path, load = false, queryOptions, keyTracker, }) => {
 
 const usePatchRequest = ({ path }) => {
     const { API_URL, TIMEOUT } = useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders();
+    const { getHeaders } = useQueryHeaders();
     // register post mutation
     const mutation = useMutation((postData) => new Promise((res, rej) => {
         return (async () => {
             // get request headers
-            const headers = (await getHeadersAsync())
-                .headers;
+            const headers = getHeaders();
             makeRequest({
                 path: path,
                 body: postData,
@@ -367,13 +367,12 @@ const usePatchRequest = ({ path }) => {
 
 const usePostRequest = ({ path, isFormData = false, }) => {
     const { API_URL, TIMEOUT } = useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders();
+    const { getHeaders } = useQueryHeaders();
     // register post mutation
     const mutation = useMutation(async (postData) => new Promise((res, rej) => {
         return (async () => {
             // get request headers
-            const headers = (await getHeadersAsync())
-                .headers;
+            const headers = getHeaders();
             makeRequest({
                 path: path,
                 body: postData,

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/queries/useDeleteRequest.js

@@ -12,12 +12,11 @@ const useDeleteRequest = () => {
     const [requestPath, updateDeletePath] = react.useState('');
     const [options, setOptions] = react.useState();
     const { API_URL, TIMEOUT } = useEnvironmentVariables.useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders.useQueryHeaders();
+    const { getHeaders } = useQueryHeaders.useQueryHeaders();
     const query = reactQuery.useQuery([requestPath, {}], () => new Promise((res, rej) => {
         setTimeout(async () => {
             // get request headers
-            const headers = (await getHeadersAsync())
-                .headers;
+            const headers = getHeaders();
             const postResponse = await makeRequest.makeRequest({
                 path: requestPath,
                 headers,

package/dist/queries/useDeleteRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDeleteRequest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"useDeleteRequest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/queries/useGetRequest.js

@@ -13,13 +13,13 @@ const useGetRequest = ({ path, load = false, queryOptions, keyTracker, }) => {
     const [options, setOptions] = react.useState(queryOptions);
     const [page, setPage] = react.useState(1);
     const { API_URL, TIMEOUT } = useEnvironmentVariables.useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders.useQueryHeaders();
+    const { getHeaders } = useQueryHeaders.useQueryHeaders();
     let queryClient = reactQuery.useQueryClient();
     // eslint-disable-next-line react-hooks/exhaustive-deps
     queryClient = react.useMemo(() => queryClient, []);
     const sendRequest = async (res, rej) => {
         // get request headers
-        const headers = (await getHeadersAsync()).headers;
+        const headers = getHeaders();
         const postResponse = await makeRequest.makeRequest({
             path: requestPath,
             headers,

package/dist/queries/usePatchRequest.js

@@ -10,13 +10,12 @@ var request_enum = require('../request/request.enum.js');
 
 const usePatchRequest = ({ path }) => {
     const { API_URL, TIMEOUT } = useEnvironmentVariables.useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders.useQueryHeaders();
+    const { getHeaders } = useQueryHeaders.useQueryHeaders();
     // register post mutation
     const mutation = reactQuery.useMutation((postData) => new Promise((res, rej) => {
         return (async () => {
             // get request headers
-            const headers = (await getHeadersAsync())
-                .headers;
+            const headers = getHeaders();
             makeRequest.makeRequest({
                 path: path,
                 body: postData,

package/dist/queries/usePatchRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePatchRequest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"usePatchRequest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/queries/usePostRequest.js

@@ -9,13 +9,12 @@ var request_enum = require('../request/request.enum.js');
 
 const usePostRequest = ({ path, isFormData = false, }) => {
     const { API_URL, TIMEOUT } = useEnvironmentVariables.useEnvironmentVariables();
-    const { getHeadersAsync } = useQueryHeaders.useQueryHeaders();
+    const { getHeaders } = useQueryHeaders.useQueryHeaders();
     // register post mutation
     const mutation = reactQuery.useMutation(async (postData) => new Promise((res, rej) => {
         return (async () => {
             // get request headers
-            const headers = (await getHeadersAsync())
-                .headers;
+            const headers = getHeaders();
             makeRequest.makeRequest({
                 path: path,
                 body: postData,

package/dist/queries/usePostRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePostRequest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"usePostRequest.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/request/make-request.js

@@ -13,7 +13,6 @@ async function makeRequest({ body, method = request_enum.HttpMethod.GET, path, i
         headers['Content-Type'] = request_enum.ContentType.APPLICATION_JSON;
     }
     else {
-        console.log({ headers });
         delete headers['Content-Type'];
     }
     try {

package/dist/request/make-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-request.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"make-request.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/types/index.d.ts

@@ -3,6 +3,6 @@ export interface TanstackQueryConfig {
     headers: RawAxiosRequestHeaders;
 }
 export interface IUseQueryHeaders {
-    getHeadersAsync: () => Promise<TanstackQueryConfig>;
+    getHeaders: () => TanstackQueryConfig['headers'];
     setQueryHeaders: (header: TanstackQueryConfig['headers']) => void;
 }

package/package.json

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

package/src/config/useQueryHeaders.ts

@@ -4,23 +4,31 @@ import type { IUseQueryHeaders, TanstackQueryConfig } from '../types';
 export const useQueryHeaders = (): IUseQueryHeaders => {
   const queryClient = useQueryClient();
 
-  const getHeadersAsync = async (): Promise<TanstackQueryConfig> => {
-    return queryClient.ensureQueryData({
-      queryKey: ['config'],
-      queryFn: () => {
-        return queryClient.getQueryData(['config']);
-      },
-      staleTime: Infinity,
-      cacheTime: Infinity,
-    });
+  const getHeaders = (): TanstackQueryConfig['headers'] => {
+    const config = queryClient.getQueryData(['config']) as TanstackQueryConfig;
+    return config.headers;
   };
 
   const setQueryHeaders = (newHeaders: TanstackQueryConfig['headers']) => {
-    queryClient.setQueryData<TanstackQueryConfig>(['config'], (config): any => {
-      const newConfig = { ...config, headers: newHeaders };
-      return newConfig;
+    // make sure the config does not expire
+    queryClient.setDefaultOptions({
+      queries: {
+        queryKey: ['config'],
+        staleTime: Infinity,
+        cacheTime: Infinity,
+      },
     });
+
+    // set the config
+    queryClient.setQueryData<TanstackQueryConfig>(
+      ['config'],
+      (config): any => {
+        const newConfig = { ...config, headers: newHeaders };
+        return newConfig;
+      },
+      {}
+    );
   };
 
-  return { setQueryHeaders, getHeadersAsync };
+  return { setQueryHeaders, getHeaders };
 };

package/src/queries/useDeleteRequest.ts

@@ -12,7 +12,7 @@ export const useDeleteRequest = <TResponse>() => {
 
   const { API_URL, TIMEOUT } = useEnvironmentVariables();
 
-  const { getHeadersAsync } = useQueryHeaders();
+  const { getHeaders } = useQueryHeaders();
 
   const query = useQuery<any, any, IRequestSuccess<TResponse>>(
     [requestPath, {}],
@@ -20,8 +20,7 @@ export const useDeleteRequest = <TResponse>() => {
       new Promise<IRequestSuccess<TResponse> | IRequestError>((res, rej) => {
         setTimeout(async () => {
           // get request headers
-          const headers: RawAxiosRequestHeaders = (await getHeadersAsync())
-            .headers;
+          const headers: RawAxiosRequestHeaders = getHeaders();
 
           const postResponse = await makeRequest<TResponse>({
             path: requestPath,

package/src/queries/useGetRequest.ts

@@ -24,7 +24,7 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
   const [page, setPage] = useState<number>(1);
 
   const { API_URL, TIMEOUT } = useEnvironmentVariables();
-  const { getHeadersAsync } = useQueryHeaders();
+  const { getHeaders } = useQueryHeaders();
 
   let queryClient = useQueryClient();
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -40,7 +40,7 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     rej: (reason?: any) => void
   ) => {
     // get request headers
-    const headers: RawAxiosRequestHeaders = (await getHeadersAsync()).headers;
+    const headers: RawAxiosRequestHeaders = getHeaders();
 
     const postResponse = await makeRequest<TResponse>({
       path: requestPath,

package/src/queries/usePatchRequest.ts

@@ -13,7 +13,7 @@ import type {
 export const usePatchRequest = <TResponse>({ path }: { path: string }) => {
   const { API_URL, TIMEOUT } = useEnvironmentVariables();
 
-  const { getHeadersAsync } = useQueryHeaders();
+  const { getHeaders } = useQueryHeaders();
 
   // register post mutation
   const mutation = useMutation<IRequestSuccess<TResponse>, IRequestError>(
@@ -21,8 +21,7 @@ export const usePatchRequest = <TResponse>({ path }: { path: string }) => {
       new Promise<IRequestSuccess<TResponse>>((res, rej) => {
         return (async () => {
           // get request headers
-          const headers: RawAxiosRequestHeaders = (await getHeadersAsync())
-            .headers;
+          const headers: RawAxiosRequestHeaders = getHeaders();
 
           makeRequest<TResponse>({
             path: path,

package/src/queries/usePostRequest.ts

@@ -15,7 +15,7 @@ export const usePostRequest = <TResponse>({
 }) => {
   const { API_URL, TIMEOUT } = useEnvironmentVariables();
 
-  const { getHeadersAsync } = useQueryHeaders();
+  const { getHeaders } = useQueryHeaders();
 
   // register post mutation
   const mutation = useMutation<IRequestSuccess<TResponse>, IRequestError>(
@@ -23,8 +23,7 @@ export const usePostRequest = <TResponse>({
       new Promise<IRequestSuccess<TResponse>>((res, rej) => {
         return (async () => {
           // get request headers
-          const headers: RawAxiosRequestHeaders = (await getHeadersAsync())
-            .headers;
+          const headers: RawAxiosRequestHeaders = getHeaders();
 
           makeRequest<TResponse>({
             path: path,

package/src/request/make-request.ts

@@ -21,7 +21,6 @@ export async function makeRequest<TResponse>({
   if (!isFormData) {
     headers['Content-Type'] = ContentType.APPLICATION_JSON;
   } else {
-    console.log({ headers });
     delete headers['Content-Type'];
   }
 

package/src/types/index.ts

@@ -5,6 +5,6 @@ export interface TanstackQueryConfig {
 }
 
 export interface IUseQueryHeaders {
-  getHeadersAsync: () => Promise<TanstackQueryConfig>;
+  getHeaders: () => TanstackQueryConfig['headers'];
   setQueryHeaders: (header: TanstackQueryConfig['headers']) => void;
 }