@ventlio/tanstack-query 0.5.6 → 0.5.7

package/dist/index.mjs

@@ -440,7 +440,7 @@ const useDeleteRequest = (deleteOptions) => {
         let deleteResponse;
         if (queryConfigOptions?.middleware) {
             // perform global middleware
-            deleteResponse = await queryConfigOptions.middleware(async () => await makeRequest(requestOptions), {
+            deleteResponse = await queryConfigOptions.middleware(async (middlewareOptions) => await makeRequest(middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions), {
                 path: requestUrl,
                 baseUrl: baseUrl ?? API_URL,
             });
@@ -515,7 +515,7 @@ const useGetInfiniteRequest = ({ path, load = false, queryOptions, keyTracker, b
             let getResponse;
             if (queryConfigOptions?.middleware) {
                 // perform global middleware
-                getResponse = await queryConfigOptions.middleware(async () => await makeRequest(requestOptions), {
+                getResponse = await queryConfigOptions.middleware(async (middlewareOptions) => await makeRequest(middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions), {
                     path,
                     baseUrl: baseUrl ?? API_URL,
                 });
@@ -621,7 +621,7 @@ const useGetRequest = ({ path, load = false, queryOptions, keyTracker, baseUrl,
         let getResponse;
         if (queryConfigOptions?.middleware) {
             // perform global middleware
-            getResponse = await queryConfigOptions.middleware(async () => await makeRequest(requestOptions), {
+            getResponse = await queryConfigOptions.middleware(async (middlewareOptions) => await makeRequest(middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions), {
                 path,
                 baseUrl: baseUrl ?? API_URL,
             });
@@ -749,7 +749,7 @@ const usePatchRequest = ({ path, baseUrl, headers }) => {
         let patchResponse;
         if (config.options?.middleware) {
             // perform global middleware
-            const middlewareResponse = await config.options.middleware(async () => await makeRequest(requestOptions), {
+            const middlewareResponse = await config.options.middleware(async (options) => await makeRequest(options ? { ...requestOptions, ...options } : requestOptions), {
                 path,
                 baseUrl: baseUrl ?? API_URL,
                 body: data,
@@ -830,7 +830,7 @@ const usePostRequest = ({ path, isFormData = false, baseUrl, headers, fileSelect
         let postResponse;
         if (config.options?.middleware) {
             // perform global middleware
-            postResponse = await config.options.middleware(async () => await makeRequest(requestOptions), {
+            postResponse = await config.options.middleware(async (options) => await makeRequest(options ? { ...requestOptions, ...options } : requestOptions), {
                 path,
                 baseUrl: baseUrl ?? API_URL,
                 body: data,

package/dist/queries/useDeleteRequest.js

@@ -31,7 +31,7 @@ const useDeleteRequest = (deleteOptions) => {
         let deleteResponse;
         if (queryConfigOptions?.middleware) {
             // perform global middleware
-            deleteResponse = await queryConfigOptions.middleware(async () => await makeRequest(requestOptions), {
+            deleteResponse = await queryConfigOptions.middleware(async (middlewareOptions) => await makeRequest(middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions), {
                 path: requestUrl,
                 baseUrl: baseUrl ?? API_URL,
             });

package/dist/queries/useGetInfiniteRequest.js

@@ -32,7 +32,7 @@ const useGetInfiniteRequest = ({ path, load = false, queryOptions, keyTracker, b
             let getResponse;
             if (queryConfigOptions?.middleware) {
                 // perform global middleware
-                getResponse = await queryConfigOptions.middleware(async () => await makeRequest(requestOptions), {
+                getResponse = await queryConfigOptions.middleware(async (middlewareOptions) => await makeRequest(middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions), {
                     path,
                     baseUrl: baseUrl ?? API_URL,
                 });

package/dist/queries/useGetRequest.js

@@ -33,7 +33,7 @@ const useGetRequest = ({ path, load = false, queryOptions, keyTracker, baseUrl,
         let getResponse;
         if (queryConfigOptions?.middleware) {
             // perform global middleware
-            getResponse = await queryConfigOptions.middleware(async () => await makeRequest(requestOptions), {
+            getResponse = await queryConfigOptions.middleware(async (middlewareOptions) => await makeRequest(middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions), {
                 path,
                 baseUrl: baseUrl ?? API_URL,
             });

package/dist/queries/usePatchRequest.js

@@ -32,7 +32,7 @@ const usePatchRequest = ({ path, baseUrl, headers }) => {
         let patchResponse;
         if (config.options?.middleware) {
             // perform global middleware
-            const middlewareResponse = await config.options.middleware(async () => await makeRequest(requestOptions), {
+            const middlewareResponse = await config.options.middleware(async (options) => await makeRequest(options ? { ...requestOptions, ...options } : requestOptions), {
                 path,
                 baseUrl: baseUrl ?? API_URL,
                 body: data,

package/dist/queries/usePostRequest.js

@@ -42,7 +42,7 @@ const usePostRequest = ({ path, isFormData = false, baseUrl, headers, fileSelect
         let postResponse;
         if (config.options?.middleware) {
             // perform global middleware
-            postResponse = await config.options.middleware(async () => await makeRequest(requestOptions), {
+            postResponse = await config.options.middleware(async (options) => await makeRequest(options ? { ...requestOptions, ...options } : requestOptions), {
                 path,
                 baseUrl: baseUrl ?? API_URL,
                 body: data,

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import type { RawAxiosRequestHeaders } from 'axios';
-import type { IRequestError, IRequestSuccess } from '../request';
+import type { AxiosProgressEvent, RawAxiosRequestHeaders } from 'axios';
+import type { AppFileConfig, HttpMethod, IMakeRequest, IRequestError, IRequestSuccess } from '../request';
 export interface BootstrapConfig {
     environments?: {
         appBaseUrl: string;
@@ -7,12 +7,23 @@ export interface BootstrapConfig {
     };
     context?: ContextType;
     modelConfig?: BootstrapModelConfig;
-    middleware?: <T = any>(next: () => Promise<IRequestSuccess<T> | IRequestError>, configs?: {
+    middleware?: <T = any>(next: (options?: Partial<NextOptions>) => Promise<IRequestSuccess<T> | IRequestError>, configs?: {
         baseUrl: string;
         path: string;
         body?: Record<string, any>;
     }) => Promise<IRequestError | IRequestSuccess<T>>;
 }
+export interface NextOptions extends Partial<IMakeRequest> {
+    baseURL: string;
+    timeout: number;
+    path: string;
+    body: any;
+    method: HttpMethod;
+    isFormData: boolean;
+    headers: RawAxiosRequestHeaders;
+    appFileConfig: AppFileConfig;
+    onUploadProgress: (progressEvent: AxiosProgressEvent) => void;
+}
 export interface BootstrapModelConfig {
     idColumn: string;
 }

package/package.json

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

package/src/queries/useDeleteRequest.ts

@@ -36,10 +36,16 @@ export const useDeleteRequest = <TResponse>(deleteOptions?: DefaultRequestOption
     let deleteResponse: IRequestError | IRequestSuccess<TResponse>;
     if (queryConfigOptions?.middleware) {
       // perform global middleware
-      deleteResponse = await queryConfigOptions.middleware(async () => await makeRequest<TResponse>(requestOptions), {
-        path: requestUrl,
-        baseUrl: baseUrl ?? API_URL,
-      });
+      deleteResponse = await queryConfigOptions.middleware(
+        async (middlewareOptions) =>
+          await makeRequest<TResponse>(
+            middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions
+          ),
+        {
+          path: requestUrl,
+          baseUrl: baseUrl ?? API_URL,
+        }
+      );
     } else {
       deleteResponse = await makeRequest<TResponse>(requestOptions);
     }

package/src/queries/useGetInfiniteRequest.ts

@@ -68,10 +68,16 @@ export const useGetInfiniteRequest = <TResponse extends Record<string, any>>({
       let getResponse: IRequestError | IRequestSuccess<TResponse>;
       if (queryConfigOptions?.middleware) {
         // perform global middleware
-        getResponse = await queryConfigOptions.middleware(async () => await makeRequest<TResponse>(requestOptions), {
-          path,
-          baseUrl: baseUrl ?? API_URL,
-        });
+        getResponse = await queryConfigOptions.middleware(
+          async (middlewareOptions) =>
+            await makeRequest<TResponse>(
+              middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions
+            ),
+          {
+            path,
+            baseUrl: baseUrl ?? API_URL,
+          }
+        );
       } else {
         getResponse = await makeRequest<TResponse>(requestOptions);
       }

package/src/queries/useGetRequest.ts

@@ -56,10 +56,16 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     let getResponse: IRequestError | IRequestSuccess<TResponse>;
     if (queryConfigOptions?.middleware) {
       // perform global middleware
-      getResponse = await queryConfigOptions.middleware(async () => await makeRequest<TResponse>(requestOptions), {
-        path,
-        baseUrl: baseUrl ?? API_URL,
-      });
+      getResponse = await queryConfigOptions.middleware(
+        async (middlewareOptions) =>
+          await makeRequest<TResponse>(
+            middlewareOptions ? { ...requestOptions, ...middlewareOptions } : requestOptions
+          ),
+        {
+          path,
+          baseUrl: baseUrl ?? API_URL,
+        }
+      );
     } else {
       getResponse = await makeRequest<TResponse>(requestOptions);
     }

package/src/queries/usePatchRequest.ts

@@ -37,7 +37,7 @@ export const usePatchRequest = <TResponse>({ path, baseUrl, headers }: { path: s
     if (config.options?.middleware) {
       // perform global middleware
       const middlewareResponse = await config.options.middleware(
-        async () => await makeRequest<TResponse>(requestOptions),
+        async (options) => await makeRequest<TResponse>(options ? { ...requestOptions, ...options } : requestOptions),
         {
           path,
           baseUrl: baseUrl ?? API_URL,

package/src/queries/usePostRequest.ts

@@ -62,11 +62,14 @@ export const usePostRequest = <TResponse>({
     let postResponse: IRequestError | IRequestSuccess<TResponse>;
     if (config.options?.middleware) {
       // perform global middleware
-      postResponse = await config.options.middleware(async () => await makeRequest<TResponse>(requestOptions), {
-        path,
-        baseUrl: baseUrl ?? API_URL,
-        body: data,
-      });
+      postResponse = await config.options.middleware(
+        async (options) => await makeRequest<TResponse>(options ? { ...requestOptions, ...options } : requestOptions),
+        {
+          path,
+          baseUrl: baseUrl ?? API_URL,
+          body: data,
+        }
+      );
     } else {
       postResponse = await makeRequest<TResponse>(requestOptions);
     }

package/src/queries/usePutRequest.ts

@@ -36,11 +36,14 @@ export const usePutRequest = <TResponse>({ path, baseUrl, headers }: { path: str
     let putResponse: IRequestError | IRequestSuccess<TResponse>;
     if (config.options?.middleware) {
       // perform global middleware
-      putResponse = await config.options.middleware(async () => await makeRequest<TResponse>(requestOptions), {
-        path,
-        baseUrl: baseUrl ?? API_URL,
-        body: data,
-      });
+      putResponse = await config.options.middleware(
+        async (options) => await makeRequest<TResponse>(options ? { ...requestOptions, ...options } : requestOptions),
+        {
+          path,
+          baseUrl: baseUrl ?? API_URL,
+          body: data,
+        }
+      );
     } else {
       putResponse = await makeRequest<TResponse>(requestOptions);
     }

package/src/types/index.ts

@@ -1,5 +1,5 @@
-import type { RawAxiosRequestHeaders } from 'axios';
-import type { IRequestError, IRequestSuccess } from '../request';
+import type { AxiosProgressEvent, RawAxiosRequestHeaders } from 'axios';
+import type { AppFileConfig, HttpMethod, IMakeRequest, IRequestError, IRequestSuccess } from '../request';
 
 export interface BootstrapConfig {
   environments?: {
@@ -9,11 +9,23 @@ export interface BootstrapConfig {
   context?: ContextType;
   modelConfig?: BootstrapModelConfig;
   middleware?: <T = any>(
-    next: () => Promise<IRequestSuccess<T> | IRequestError>,
+    next: (options?: Partial<NextOptions>) => Promise<IRequestSuccess<T> | IRequestError>,
     configs?: { baseUrl: string; path: string; body?: Record<string, any> }
   ) => Promise<IRequestError | IRequestSuccess<T>>;
 }
 
+export interface NextOptions extends Partial<IMakeRequest> {
+  baseURL: string;
+  timeout: number;
+  path: string;
+  body: any;
+  method: HttpMethod;
+  isFormData: boolean;
+  headers: RawAxiosRequestHeaders;
+  appFileConfig: AppFileConfig;
+  onUploadProgress: (progressEvent: AxiosProgressEvent) => void;
+}
+
 export interface BootstrapModelConfig {
   idColumn: string;
 }