@acrool/react-fetcher 0.0.7 → 0.0.8-alpha.0

package/dist/acrool-react-fetcher.es.js

@@ -9,7 +9,6 @@ function r$1(e2) {
     }, e2);
   });
 }
-const fetcherLeastTime = 400;
 const isFile$1 = (input) => "File" in window && input instanceof File;
 const isBlob$1 = (input) => "Blob" in window && input instanceof Blob;
 const getVariablesFileMap = (originVariables, parentKey = ["variables"]) => {
@@ -36,11 +35,17 @@ const getVariablesFileMap = (originVariables, parentKey = ["variables"]) => {
     };
   }, { variables: {}, map: [], values: [] });
 };
-const createGraphQLFetcher = (axiosInstance, query) => {
+const createGraphQLFetcher = (axiosInstance, query, options) => {
   return async (args) => {
     let data = void 0;
     let contentType = void 0;
-    const options = args == null ? void 0 : args.fetchOptions;
+    let fetchOptions = {};
+    let headers = {};
+    if (args == null ? void 0 : args.fetchOptions) {
+      const { headers: tmpHeader, ...tmpFetchOptions } = args.fetchOptions;
+      fetchOptions = tmpFetchOptions;
+      headers = tmpHeader;
+    }
     const variables = args == null ? void 0 : args.variables;
     let isMultipartFormData = false;
     if (variables) {
@@ -74,18 +79,17 @@ const createGraphQLFetcher = (axiosInstance, query) => {
       data = JSON.stringify({ query, variables });
     }
     const endpoint = "";
-    const headers = {
-      "Content-Type": contentType,
-      "Apollo-Require-Preflight": "true",
-      "X-Requested-With": "XMLHttpRequest",
-      ...options == null ? void 0 : options.headers
-    };
     const [res] = await Promise.all([
       axiosInstance.post(endpoint, data, {
-        ...options,
-        headers
+        fetchOptions,
+        headers: {
+          ...headers,
+          "Content-Type": contentType,
+          "Apollo-Require-Preflight": "true",
+          "X-Requested-With": "XMLHttpRequest"
+        }
       }),
-      r$1((options == null ? void 0 : options.leastTime) ?? fetcherLeastTime)
+      r$1((fetchOptions == null ? void 0 : fetchOptions.leastTime) ?? (options == null ? void 0 : options.fetcherLeastTime) ?? 100)
     ]);
     return res.data.data;
   };
@@ -127,28 +131,34 @@ const getDataWithContentType = (contentType, data = {}) => {
 const getContentTypeWithMethod = (method) => {
   return ERequestContentType.json;
 };
-const createRestFulFetcher = (axiosInstance, document2, contentTypeResolver = getContentTypeWithMethod) => {
+const createRestFulFetcher = (axiosInstance, document2, options) => {
   return async (args) => {
-    var _a;
     const method = (document2 == null ? void 0 : document2.method) || "";
-    const options = args == null ? void 0 : args.fetchOptions;
+    let fetchOptions = {};
+    let headers = {};
+    if (args == null ? void 0 : args.fetchOptions) {
+      const { headers: tmpHeader, ...tmpFetchOptions } = args.fetchOptions;
+      fetchOptions = tmpFetchOptions;
+      headers = tmpHeader;
+    }
     const body = typeof args === "object" && args !== null && "body" in args ? args.body : void 0;
     const params = typeof args === "object" && args !== null && "params" in args ? args.params : void 0;
-    const contentType = ((_a = options == null ? void 0 : options.headers) == null ? void 0 : _a.contentType) ?? contentTypeResolver(method.toUpperCase());
+    const contentTypeResolver = (options == null ? void 0 : options.contentTypeResolver) ?? getContentTypeWithMethod;
+    const contentType = (headers == null ? void 0 : headers.contentType) ?? contentTypeResolver(method.toUpperCase());
     const config = {
       url: document2.url,
       method,
       params,
       data: getDataWithContentType(contentType, body),
-      ...options,
+      fetchOptions,
       headers: {
-        ...options == null ? void 0 : options.headers,
+        ...headers,
         "Content-Type": contentType
       }
     };
     const [res] = await Promise.all([
       axiosInstance(config),
-      r$1((options == null ? void 0 : options.leastTime) ?? fetcherLeastTime)
+      r$1((fetchOptions == null ? void 0 : fetchOptions.leastTime) ?? (options == null ? void 0 : options.fetcherLeastTime) ?? 100)
     ]);
     return res.data;
   };
@@ -3182,7 +3192,7 @@ const FetcherProvider = ({
           isTokenRefreshing = false;
           if (isDebug) u.warning("[FetcherProvider] no refreshToken/refreshAPI|pendingRequest fail, force logout");
           forceLogout();
-          if (originalConfig.ignoreErrorCallback !== true) handleOnResponseError(responseFirstError);
+          if (originalConfig.ignoreGlobalError !== true) handleOnResponseError(responseFirstError);
           return Promise.reject(new FetcherException(responseFirstError));
         }
         if (!isTokenRefreshing) {
@@ -3201,7 +3211,7 @@ const FetcherProvider = ({
         });
       }
     }
-    if (originalConfig.ignoreErrorCallback !== true) handleOnResponseError(responseFirstError);
+    if (originalConfig.ignoreGlobalError !== true) handleOnResponseError(responseFirstError);
     return Promise.reject(new FetcherException(responseFirstError));
   };
   return /* @__PURE__ */ jsxRuntimeExports.jsx(