@ventlio/tanstack-query 0.2.63-beta.2 → 0.2.63-beta.4

package/dist/index.mjs

@@ -199,20 +199,33 @@ const successTransformer = (data) => {
     };
 };
 
-async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, headers = {}, baseURL, timeout, }) {
+async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, headers = {}, baseURL, timeout, appFileConfig, }) {
+    // check if file is included in mobile app environment and extract all file input to avoid
+    // it being formatted to object using axios formData builder
+    const isApp = appFileConfig?.isApp;
+    const appFiles = isApp ? getAppFiles(body, appFileConfig.fileSelectors) : {};
     // configure body
-    body = isFormData ? axios.toFormData(body) : body;
-    // configure request header
+    body = (isFormData ? axios.toFormData(body) : body);
+    // configure request header1
     if (!isFormData) {
         headers['Content-Type'] = ContentType.APPLICATION_JSON;
     }
     else {
-        delete headers['Content-Type'];
+        if (isApp) {
+            headers['Content-Type'] = ContentType.MULTIPART_FORM_DATA;
+            // add the app files
+            for (const fileKey in appFiles) {
+                body.append(fileKey, appFiles[fileKey]);
+            }
+        }
+        else {
+            delete headers['Content-Type'];
+        }
     }
     try {
-        const axios = axiosInstance({ baseURL, headers, timeout });
+        const axiosRequest = axiosInstance({ baseURL, headers, timeout });
         //   send request
-        const resp = await axios({
+        const resp = await axiosRequest({
             url: path,
             method,
             data: body,
@@ -240,6 +253,19 @@ async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, he
             ...errorData,
         });
     }
+}
+function getAppFiles(body, fileSelectors = []) {
+    const files = {};
+    if (body) {
+        if (fileSelectors.length > 0) {
+            //
+            for (const fileKey of fileSelectors) {
+                files[fileKey] = body[fileKey];
+                delete body[fileKey];
+            }
+        }
+    }
+    return files;
 }
 
 const useDeleteRequest = (deleteOptions) => {
@@ -277,7 +303,7 @@ const useDeleteRequest = (deleteOptions) => {
         internalDeleteOptions = internalDeleteOptions ?? {};
         internalDeleteOptions.enabled = true;
         await updatedPathAsync(link);
-        await setOptionsAsync(deleteOptions);
+        await setOptionsAsync(internalDeleteOptions);
         return query.data;
     };
     return { destroy, ...query };
@@ -420,10 +446,11 @@ const usePatchRequest = ({ path, baseUrl, headers }) => {
     return { patch, ...mutation };
 };
 
-const usePostRequest = ({ path, isFormData = false, baseUrl, headers, }) => {
+const usePostRequest = ({ path, isFormData = false, baseUrl, headers, fileSelectors, }) => {
     const { API_URL, TIMEOUT } = useEnvironmentVariables();
     const queryClient = useQueryClient();
     const { getHeaders } = useQueryHeaders();
+    const { isApp } = useReactNativeEnv();
     const sendRequest = async (res, rej, postData) => {
         // get request headers
         const globalHeaders = getHeaders();
@@ -436,6 +463,10 @@ const usePostRequest = ({ path, isFormData = false, baseUrl, headers, }) => {
             headers: { ...globalHeaders, ...headers },
             baseURL: baseUrl ?? API_URL,
             timeout: TIMEOUT,
+            appFileConfig: {
+                isApp,
+                fileSelectors,
+            },
         });
         if (postResponse.status) {
             // scroll to top after success

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

@@ -41,7 +41,7 @@ const useDeleteRequest = (deleteOptions) => {
         internalDeleteOptions = internalDeleteOptions ?? {};
         internalDeleteOptions.enabled = true;
         await updatedPathAsync(link);
-        await setOptionsAsync(deleteOptions);
+        await setOptionsAsync(internalDeleteOptions);
         return query.data;
     };
     return { destroy, ...query };

package/dist/queries/usePostRequest.d.ts

@@ -1,9 +1,10 @@
 import type { MutateOptions } from '@tanstack/react-query';
 import type { IRequestError, IRequestSuccess } from '../request';
 import type { DefaultRequestOptions } from './queries.interface';
-export declare const usePostRequest: <TResponse>({ path, isFormData, baseUrl, headers, }: {
+export declare const usePostRequest: <TResponse>({ path, isFormData, baseUrl, headers, fileSelectors, }: {
     path: string;
     isFormData?: boolean | undefined;
+    fileSelectors?: string[] | undefined;
 } & DefaultRequestOptions) => {
     data: undefined;
     error: null;

package/dist/queries/usePostRequest.js

@@ -1,15 +1,17 @@
 import { useQueryClient, useMutation } from '@tanstack/react-query';
 import { useEnvironmentVariables } from '../config/useEnvironmentVariables.js';
 import { useQueryHeaders } from '../config/useQueryHeaders.js';
+import { useReactNativeEnv } from '../config/useReactNativeEnv.js';
 import { scrollToTop } from '../helpers/scrollToTop.js';
 import 'axios';
 import { makeRequest } from '../request/make-request.js';
 import { HttpMethod } from '../request/request.enum.js';
 
-const usePostRequest = ({ path, isFormData = false, baseUrl, headers, }) => {
+const usePostRequest = ({ path, isFormData = false, baseUrl, headers, fileSelectors, }) => {
     const { API_URL, TIMEOUT } = useEnvironmentVariables();
     const queryClient = useQueryClient();
     const { getHeaders } = useQueryHeaders();
+    const { isApp } = useReactNativeEnv();
     const sendRequest = async (res, rej, postData) => {
         // get request headers
         const globalHeaders = getHeaders();
@@ -22,6 +24,10 @@ const usePostRequest = ({ path, isFormData = false, baseUrl, headers, }) => {
             headers: { ...globalHeaders, ...headers },
             baseURL: baseUrl ?? API_URL,
             timeout: TIMEOUT,
+            appFileConfig: {
+                isApp,
+                fileSelectors,
+            },
         });
         if (postResponse.status) {
             // scroll to top after success

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.d.ts

@@ -1,2 +1,2 @@
 import type { IMakeRequest } from './request.interface';
-export declare function makeRequest<TResponse>({ body, method, path, isFormData, headers, baseURL, timeout, }: IMakeRequest): Promise<import("./request.interface").IRequestError>;
+export declare function makeRequest<TResponse>({ body, method, path, isFormData, headers, baseURL, timeout, appFileConfig, }: IMakeRequest): Promise<import("./request.interface").IRequestError>;

package/dist/request/make-request.js

@@ -3,20 +3,33 @@ import { axiosInstance } from './axios-instance.js';
 import { ContentType, HttpMethod } from './request.enum.js';
 import { errorTransformer, successTransformer } from './transformer.js';
 
-async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, headers = {}, baseURL, timeout, }) {
+async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, headers = {}, baseURL, timeout, appFileConfig, }) {
+    // check if file is included in mobile app environment and extract all file input to avoid
+    // it being formatted to object using axios formData builder
+    const isApp = appFileConfig?.isApp;
+    const appFiles = isApp ? getAppFiles(body, appFileConfig.fileSelectors) : {};
     // configure body
-    body = isFormData ? axios.toFormData(body) : body;
-    // configure request header
+    body = (isFormData ? axios.toFormData(body) : body);
+    // configure request header1
     if (!isFormData) {
         headers['Content-Type'] = ContentType.APPLICATION_JSON;
     }
     else {
-        delete headers['Content-Type'];
+        if (isApp) {
+            headers['Content-Type'] = ContentType.MULTIPART_FORM_DATA;
+            // add the app files
+            for (const fileKey in appFiles) {
+                body.append(fileKey, appFiles[fileKey]);
+            }
+        }
+        else {
+            delete headers['Content-Type'];
+        }
     }
     try {
-        const axios = axiosInstance({ baseURL, headers, timeout });
+        const axiosRequest = axiosInstance({ baseURL, headers, timeout });
         //   send request
-        const resp = await axios({
+        const resp = await axiosRequest({
             url: path,
             method,
             data: body,
@@ -44,6 +57,19 @@ async function makeRequest({ body, method = HttpMethod.GET, path, isFormData, he
             ...errorData,
         });
     }
+}
+function getAppFiles(body, fileSelectors = []) {
+    const files = {};
+    if (body) {
+        if (fileSelectors.length > 0) {
+            //
+            for (const fileKey of fileSelectors) {
+                files[fileKey] = body[fileKey];
+                delete body[fileKey];
+            }
+        }
+    }
+    return files;
 }
 
 export { makeRequest };

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/request/request.interface.d.ts

@@ -8,6 +8,11 @@ export interface IMakeRequest {
     method?: HttpMethod;
     isFormData?: boolean;
     headers: RawAxiosRequestHeaders;
+    appFileConfig?: AppFileConfig;
+}
+export interface AppFileConfig {
+    fileSelectors?: string[];
+    isApp: boolean;
 }
 export interface AxiosInstanceOption {
     bearerToken?: string;

package/dist/types/index.d.ts

@@ -4,8 +4,9 @@ export interface BootstrapQueryRequest {
         appBaseUrl: string;
         appTimeout: number;
     };
-    context?: 'app' | 'web' | 'electronjs';
+    context?: ContextType;
 }
+export type ContextType = 'app' | 'web' | 'electronjs';
 export interface TanstackQueryConfig {
     headers: RawAxiosRequestHeaders;
     options?: BootstrapQueryRequest;

package/package.json

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

package/src/queries/useDeleteRequest.ts

@@ -63,7 +63,7 @@ export const useDeleteRequest = <TResponse>(deleteOptions?: DefaultRequestOption
     internalDeleteOptions.enabled = true;
 
     await updatedPathAsync(link);
-    await setOptionsAsync(deleteOptions);
+    await setOptionsAsync(internalDeleteOptions);
 
     return query.data;
   };

package/src/queries/usePostRequest.ts

@@ -1,6 +1,6 @@
 import type { MutateOptions } from '@tanstack/react-query';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useEnvironmentVariables, useQueryHeaders } from '../config';
+import { useEnvironmentVariables, useQueryHeaders, useReactNativeEnv } from '../config';
 
 import type { RawAxiosRequestHeaders } from 'axios';
 import { scrollToTop } from '../helpers';
@@ -14,14 +14,16 @@ export const usePostRequest = <TResponse>({
   isFormData = false,
   baseUrl,
   headers,
+  fileSelectors,
 }: {
   path: string;
   isFormData?: boolean;
+  fileSelectors?: string[];
 } & DefaultRequestOptions) => {
   const { API_URL, TIMEOUT } = useEnvironmentVariables();
   const queryClient = useQueryClient();
   const { getHeaders } = useQueryHeaders();
-
+  const { isApp } = useReactNativeEnv();
   const sendRequest = async (res: (value: any) => void, rej: (reason?: any) => void, postData: any) => {
     // get request headers
     const globalHeaders: RawAxiosRequestHeaders = getHeaders();
@@ -35,6 +37,10 @@ export const usePostRequest = <TResponse>({
       headers: { ...globalHeaders, ...headers },
       baseURL: baseUrl ?? API_URL,
       timeout: TIMEOUT,
+      appFileConfig: {
+        isApp,
+        fileSelectors,
+      },
     });
 
     if (postResponse.status) {

package/src/request/make-request.ts

@@ -13,22 +13,36 @@ export async function makeRequest<TResponse>({
   headers = {},
   baseURL,
   timeout,
+  appFileConfig,
 }: IMakeRequest) {
+  // check if file is included in mobile app environment and extract all file input to avoid
+  // it being formatted to object using axios formData builder
+  const isApp = appFileConfig?.isApp;
+  const appFiles: Record<string, string> = isApp ? getAppFiles(body, appFileConfig.fileSelectors) : {};
+
   // configure body
-  body = isFormData ? axios.toFormData(body as Record<string, any>) : body;
+  body = (isFormData ? axios.toFormData(body as FormData) : body) as FormData;
 
-  // configure request header
+  // configure request header1
   if (!isFormData) {
     headers['Content-Type'] = ContentType.APPLICATION_JSON;
   } else {
-    delete headers['Content-Type'];
+    if (isApp) {
+      headers['Content-Type'] = ContentType.MULTIPART_FORM_DATA;
+      // add the app files
+      for (const fileKey in appFiles) {
+        body.append(fileKey, appFiles[fileKey]);
+      }
+    } else {
+      delete headers['Content-Type'];
+    }
   }
 
   try {
-    const axios = axiosInstance({ baseURL, headers, timeout });
+    const axiosRequest = axiosInstance({ baseURL, headers, timeout });
 
     //   send request
-    const resp = await axios({
+    const resp = await axiosRequest({
       url: path,
       method,
       data: body,
@@ -60,3 +74,18 @@ export async function makeRequest<TResponse>({
     });
   }
 }
+function getAppFiles(body: any, fileSelectors: string[] = []) {
+  const files: Record<string, string> = {};
+
+  if (body) {
+    if (fileSelectors.length > 0) {
+      //
+      for (const fileKey of fileSelectors) {
+        files[fileKey] = body[fileKey];
+        delete body[fileKey];
+      }
+    }
+  }
+
+  return files;
+}

package/src/request/request.interface.ts

@@ -9,8 +9,13 @@ export interface IMakeRequest {
   method?: HttpMethod;
   isFormData?: boolean;
   headers: RawAxiosRequestHeaders;
+  appFileConfig?: AppFileConfig;
 }
 
+export interface AppFileConfig {
+  fileSelectors?: string[];
+  isApp: boolean;
+}
 export interface AxiosInstanceOption {
   bearerToken?: string;
   contentType?: string;

package/src/types/index.ts

@@ -5,9 +5,9 @@ export interface BootstrapQueryRequest {
     appBaseUrl: string;
     appTimeout: number;
   };
-  context?: 'app' | 'web' | 'electronjs';
+  context?: ContextType;
 }
-
+export type ContextType = 'app' | 'web' | 'electronjs';
 export interface TanstackQueryConfig {
   headers: RawAxiosRequestHeaders;
   options?: BootstrapQueryRequest;