@acrool/react-fetcher 0.0.4-test.4 → 0.0.4-test.6

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

@@ -85,11 +85,13 @@ function Gt(e) {
 var de = /* @__PURE__ */ ((e) => (e.formData = "multipart/form-data", e.formUrlDecode = "application/x-www-form-urlencoded", e.json = "application/json", e))(de || {}), Zt = /* @__PURE__ */ ((e) => (e.GET = "GET", e.POST = "POST", e.PUT = "PUT", e.DELETE = "DELETE", e.PATCH = "PATCH", e))(Zt || {});
 const Qt = (e, t = {}) => [de.formData, de.formUrlDecode].includes(e) ? Gt(t) : JSON.stringify(t), en = (e) => de.json, Vr = (e, t, n = en) => async (r) => {
   var p;
-  const s = (t == null ? void 0 : t.method) || "", o = r == null ? void 0 : r.fetchOptions, i = typeof r == "object" && r !== null && "variables" in r ? r.variables : void 0, c = i == null ? void 0 : i.params, d = ((p = o == null ? void 0 : o.headers) == null ? void 0 : p.contentType) ?? n(s.toUpperCase()), l = {
+  const s = (t == null ? void 0 : t.method) || "", o = r == null ? void 0 : r.fetchOptions, i = typeof r == "object" && r !== null && "body" in r ? r.body : void 0, c = typeof r == "object" && r !== null && "params" in r ? r.params : void 0;
+  console.log("variables", r);
+  const d = ((p = o == null ? void 0 : o.headers) == null ? void 0 : p.contentType) ?? n(s.toUpperCase()), l = {
     url: t.url,
     method: s,
     params: c,
-    data: Qt(d, i == null ? void 0 : i.body),
+    data: Qt(d, i),
     ...o,
     headers: {
       ...o == null ? void 0 : o.headers,
@@ -428,7 +430,7 @@ function ln(e, ...t) {
   ]).join(";");
   oe(e, n, ...t);
 }
-const v = {
+const F = {
   primary: sn,
   success: on,
   info: an,
@@ -472,11 +474,11 @@ class K extends Error {
 const Rt = ft({
   lastUpdateTimestamp: 0,
   isAuth: !1,
-  getTokens: () => (v.warning("AuthStateContext", "getTokens not yet ready"), null),
-  updateTokens: () => v.warning("AuthStateContext", "updateTokens not yet ready"),
-  forceLogout: () => v.warning("AuthStateContext", "forceLogout not yet ready"),
+  getTokens: () => (F.warning("AuthStateContext", "getTokens not yet ready"), null),
+  updateTokens: () => F.warning("AuthStateContext", "updateTokens not yet ready"),
+  forceLogout: () => F.warning("AuthStateContext", "forceLogout not yet ready"),
   refreshTokens: async () => {
-    v.warning("AuthStateContext", "refreshToken not yet ready");
+    F.warning("AuthStateContext", "refreshToken not yet ready");
   }
 }), un = () => Vt(Rt), Yr = ({
   children: e,
@@ -495,11 +497,11 @@ const Rt = ft({
     var h;
     const T = (h = t()) == null ? void 0 : h.refreshToken;
     if (!T || !r)
-      throw o && v.danger("[AuthStateProvider] handleOnRefreshTokens", "refreshToken|onRefreshTokens empty"), new K({ message: "refreshToken|onRefreshTokens empty", code: "REFRESH_TOKEN_EMPTY" });
+      throw o && F.danger("[AuthStateProvider] handleOnRefreshTokens", "refreshToken|onRefreshTokens empty"), new K({ message: "refreshToken|onRefreshTokens empty", code: "REFRESH_TOKEN_EMPTY" });
     try {
       const R = await r(T);
       if (Ue(R))
-        throw o && v.danger("[AuthStateProvider] handleOnRefreshTokens", "new refresh token fail"), new K({ message: "new refresh token fail", code: "NEW_REFRESH_TOKEN_EMPTY" });
+        throw o && F.danger("[AuthStateProvider] handleOnRefreshTokens", "new refresh token fail"), new K({ message: "new refresh token fail", code: "NEW_REFRESH_TOKEN_EMPTY" });
       u(R);
       return;
     } catch {
@@ -620,12 +622,12 @@ const pn = ft(null), Xr = ({
     };
   }, [l, p, u, y]);
   const T = (E) => {
-    d && v.warning("[FetcherProvider] runPendingRequest", { isSuccess: E }), ee = !1;
+    d && F.warning("[FetcherProvider] runPendingRequest", { isSuccess: E }), ee = !1;
     for (const O of _e)
       O(E);
     _e = [];
   }, h = (E, O) => (g) => {
-    d && v.info("[FetcherProvider] Request add pending queue", { originConfig: g }), _e.push((x) => {
+    d && F.info("[FetcherProvider] Request add pending queue", { originConfig: g }), _e.push((x) => {
       x ? (g.pendingRequest = !0, E(t(g))) : O(new K({
         message: S(401),
         code: "UNAUTHORIZED",
@@ -644,19 +646,19 @@ const pn = ft(null), Xr = ({
       return;
     }
     O(E);
-  }), m = (E) => (d && v.info("[FetcherProvider] interceptorsResponseSuccess", { response: E }), E), S = (E) => {
+  }), m = (E) => (d && F.info("[FetcherProvider] interceptorsResponseSuccess", { response: E }), E), S = (E) => {
     const O = (c == null ? void 0 : c[n]) || Ge[n] || Ge["en-US"];
     return (O == null ? void 0 : O[E]) || `Error: ${E}`;
   }, A = (E) => {
     const O = E.response, g = E.config, x = E.status, N = r(O);
-    d && v.warning("[FetcherProvider] interceptorsResponseError", { status: x, responseFirstError: N }), s && s(N);
+    d && F.warning("[FetcherProvider] interceptorsResponseError", { status: x, responseFirstError: N }), s && s(N);
     const B = g && o ? o(g) : !1;
     if (O && g && (x === 401 || N.code === "UNAUTHENTICATED")) {
       const j = l();
-      return d && v.warning("[FetcherProvider] enter refresh token flow", { refreshToken: j == null ? void 0 : j.refreshToken }), Ue(j == null ? void 0 : j.refreshToken) || B || g.pendingRequest ? (ee = !1, d && v.warning("[FetcherProvider] no refreshToken/refreshAPI|pendingRequest fail, force logout"), y(), Promise.reject(new K(N))) : (ee || (ee = !0, d && v.warning("[FetcherProvider] refreshTokens"), p().then(() => {
-        d && v.info("[FetcherProvider] refreshTokens success"), T(!0);
+      return d && F.warning("[FetcherProvider] enter refresh token flow", { refreshToken: j == null ? void 0 : j.refreshToken }), Ue(j == null ? void 0 : j.refreshToken) || B || g.pendingRequest ? (ee = !1, d && F.warning("[FetcherProvider] no refreshToken/refreshAPI|pendingRequest fail, force logout"), y(), Promise.reject(new K(N))) : (ee || (ee = !0, d && F.warning("[FetcherProvider] refreshTokens"), p().then(() => {
+        d && F.info("[FetcherProvider] refreshTokens success"), T(!0);
       }).catch(() => {
-        d && v.danger("[FetcherProvider] refreshTokens fail"), T(!1);
+        d && F.danger("[FetcherProvider] refreshTokens fail"), T(!1);
       })), new Promise((V, H) => {
         h(V, H)(g);
       }));
@@ -733,7 +735,7 @@ function Ce() {
 }
 const kn = (e, t, n, { allOwnKeys: r } = {}) => (ie(t, (s, o) => {
   n && L(s) ? e[o] = Et(s, n) : e[o] = s;
-}, { allOwnKeys: r }), e), Fn = (e) => (e.charCodeAt(0) === 65279 && (e = e.slice(1)), e), vn = (e, t, n, r) => {
+}, { allOwnKeys: r }), e), vn = (e) => (e.charCodeAt(0) === 65279 && (e = e.slice(1)), e), Fn = (e, t, n, r) => {
   e.prototype = Object.create(t.prototype, r), e.prototype.constructor = e, Object.defineProperty(e, "super", {
     value: t.prototype
   }), n && Object.assign(e.prototype, n);
@@ -864,8 +866,8 @@ const Yn = (e) => {
   merge: Ce,
   extend: kn,
   trim: Cn,
-  stripBOM: Fn,
-  inherits: vn,
+  stripBOM: vn,
+  inherits: Fn,
   toFlatObject: jn,
   kindOf: Re,
   kindOfTest: D,
@@ -1136,22 +1138,22 @@ const Ct = {
     Blob: or
   },
   protocols: ["http", "https", "file", "blob", "url", "data"]
-}, qe = typeof window < "u" && typeof document < "u", Fe = typeof navigator == "object" && navigator || void 0, ar = qe && (!Fe || ["ReactNative", "NativeScript", "NS"].indexOf(Fe.product) < 0), cr = typeof WorkerGlobalScope < "u" && // eslint-disable-next-line no-undef
+}, qe = typeof window < "u" && typeof document < "u", ve = typeof navigator == "object" && navigator || void 0, ar = qe && (!ve || ["ReactNative", "NativeScript", "NS"].indexOf(ve.product) < 0), cr = typeof WorkerGlobalScope < "u" && // eslint-disable-next-line no-undef
 self instanceof WorkerGlobalScope && typeof self.importScripts == "function", lr = qe && window.location.href || "http://localhost", ur = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   hasBrowserEnv: qe,
   hasStandardBrowserEnv: ar,
   hasStandardBrowserWebWorkerEnv: cr,
-  navigator: Fe,
+  navigator: ve,
   origin: lr
-}, Symbol.toStringTag, { value: "Module" })), F = {
+}, Symbol.toStringTag, { value: "Module" })), v = {
   ...ur,
   ...ir
 };
 function fr(e, t) {
-  return ye(e, new F.classes.URLSearchParams(), Object.assign({
+  return ye(e, new v.classes.URLSearchParams(), Object.assign({
     visitor: function(n, r, s, o) {
-      return F.isNode && a.isBuffer(n) ? (this.append(r, n.toString("base64")), !1) : o.defaultVisitor.apply(this, arguments);
+      return v.isNode && a.isBuffer(n) ? (this.append(r, n.toString("base64")), !1) : o.defaultVisitor.apply(this, arguments);
     }
   }, t));
 }
@@ -1245,8 +1247,8 @@ const ae = {
   maxContentLength: -1,
   maxBodyLength: -1,
   env: {
-    FormData: F.classes.FormData,
-    Blob: F.classes.Blob
+    FormData: v.classes.FormData,
+    Blob: v.classes.Blob
   },
   validateStatus: function(t) {
     return t >= 200 && t < 300;
@@ -1469,7 +1471,7 @@ function xe(e, t) {
     o = c.call(n, o, s.normalize(), t ? t.status : void 0);
   }), s.normalize(), o;
 }
-function Ft(e) {
+function vt(e) {
   return !!(e && e.__CANCEL__);
 }
 function G(e, t, n) {
@@ -1478,7 +1480,7 @@ function G(e, t, n) {
 a.inherits(G, b, {
   __CANCEL__: !0
 });
-function vt(e, t, n) {
+function Ft(e, t, n) {
   const r = n.config.validateStatus;
   !n.status || !r || r(n.status) ? e(n) : t(new b(
     "Request failed with status code " + n.status,
@@ -1546,10 +1548,10 @@ const pe = (e, t, n = 3) => {
     total: e,
     loaded: r
   }), t[1]];
-}, st = (e) => (...t) => a.asap(() => e(...t)), Or = F.hasStandardBrowserEnv ? /* @__PURE__ */ ((e, t) => (n) => (n = new URL(n, F.origin), e.protocol === n.protocol && e.host === n.host && (t || e.port === n.port)))(
-  new URL(F.origin),
-  F.navigator && /(msie|trident)/i.test(F.navigator.userAgent)
-) : () => !0, Ar = F.hasStandardBrowserEnv ? (
+}, st = (e) => (...t) => a.asap(() => e(...t)), Or = v.hasStandardBrowserEnv ? /* @__PURE__ */ ((e, t) => (n) => (n = new URL(n, v.origin), e.protocol === n.protocol && e.host === n.host && (t || e.port === n.port)))(
+  new URL(v.origin),
+  v.navigator && /(msie|trident)/i.test(v.navigator.userAgent)
+) : () => !0, Ar = v.hasStandardBrowserEnv ? (
   // Standard browser envs support document.cookie
   {
     write(e, t, n, r, s, o) {
@@ -1660,14 +1662,14 @@ const Lt = (e) => {
   );
   let d;
   if (a.isFormData(n)) {
-    if (F.hasStandardBrowserEnv || F.hasStandardBrowserWebWorkerEnv)
+    if (v.hasStandardBrowserEnv || v.hasStandardBrowserWebWorkerEnv)
       i.setContentType(void 0);
     else if ((d = i.getContentType()) !== !1) {
       const [l, ...u] = d ? d.split(";").map((p) => p.trim()).filter(Boolean) : [];
       i.setContentType([l || "multipart/form-data", ...u].join("; "));
     }
   }
-  if (F.hasStandardBrowserEnv && (r && a.isFunction(r) && (r = r(t)), r || r !== !1 && Or(t.url))) {
+  if (v.hasStandardBrowserEnv && (r && a.isFunction(r) && (r = r(t)), r || r !== !1 && Or(t.url))) {
     const l = s && o && Ar.read(o);
     l && i.set(s, l);
   }
@@ -1696,7 +1698,7 @@ const Lt = (e) => {
         config: e,
         request: m
       };
-      vt(function(N) {
+      Ft(function(N) {
         n(N), R();
       }, function(N) {
         r(N), R();
@@ -1723,7 +1725,7 @@ const Lt = (e) => {
       m && (r(!E || E.type ? new G(null, e, m) : E), m.abort(), m = null);
     }, s.cancelToken && s.cancelToken.subscribe(u), s.signal && (s.signal.aborted ? u() : s.signal.addEventListener("abort", u)));
     const A = Tr(s.url);
-    if (A && F.protocols.indexOf(A) === -1) {
+    if (A && v.protocols.indexOf(A) === -1) {
       r(new b("Unsupported protocol " + A + ":", b.ERR_BAD_REQUEST, e));
       return;
     }
@@ -1761,10 +1763,10 @@ const Lt = (e) => {
   let r = 0, s;
   for (; r < n; )
     s = r + t, yield e.slice(r, s), r = s;
-}, Fr = async function* (e, t) {
-  for await (const n of vr(e))
+}, vr = async function* (e, t) {
+  for await (const n of Fr(e))
     yield* kr(n, t);
-}, vr = async function* (e) {
+}, Fr = async function* (e) {
   if (e[Symbol.asyncIterator]) {
     yield* e;
     return;
@@ -1781,7 +1783,7 @@ const Lt = (e) => {
     await t.cancel();
   }
 }, it = (e, t, n, r) => {
-  const s = Fr(e, t);
+  const s = vr(e, t);
   let o = 0, i, c = (d) => {
     i || (i = !0, r && r(d));
   };
@@ -1817,7 +1819,7 @@ const Lt = (e) => {
   }
 }, Lr = Ut && Dt(() => {
   let e = !1;
-  const t = new Request(F.origin, {
+  const t = new Request(v.origin, {
     body: new ReadableStream(),
     method: "POST",
     get duplex() {
@@ -1825,8 +1827,8 @@ const Lt = (e) => {
     }
   }).headers.has("Content-Type");
   return e && !t;
-}), at = 64 * 1024, ve = Ut && Dt(() => a.isReadableStream(new Response("").body)), he = {
-  stream: ve && ((e) => e.body)
+}), at = 64 * 1024, Fe = Ut && Dt(() => a.isReadableStream(new Response("").body)), he = {
+  stream: Fe && ((e) => e.body)
 };
 we && ((e) => {
   ["text", "arrayBuffer", "blob", "formData", "stream"].forEach((t) => {
@@ -1841,7 +1843,7 @@ const Ur = async (e) => {
   if (a.isBlob(e))
     return e.size;
   if (a.isSpecCompliantForm(e))
-    return (await new Request(F.origin, {
+    return (await new Request(v.origin, {
       method: "POST",
       body: e
     }).arrayBuffer()).byteLength;
@@ -1900,8 +1902,8 @@ const Ur = async (e) => {
       credentials: S ? p : void 0
     });
     let A = await fetch(h);
-    const E = ve && (l === "stream" || l === "response");
-    if (ve && (c || E && R)) {
+    const E = Fe && (l === "stream" || l === "response");
+    if (Fe && (c || E && R)) {
       const g = {};
       ["status", "statusText", "headers"].forEach((j) => {
         g[j] = A[j];
@@ -1920,7 +1922,7 @@ const Ur = async (e) => {
     l = l || "text";
     let O = await he[a.findKey(he, l) || "text"](A, e);
     return !E && R && R(), await new Promise((g, x) => {
-      vt(g, x, {
+      Ft(g, x, {
         data: O,
         headers: U.from(A.headers),
         status: A.status,
@@ -1997,7 +1999,7 @@ function lt(e) {
       r
     ), r.headers = U.from(r.headers), r;
   }, function(r) {
-    return Ft(r) || (Ne(e), r && r.response && (r.response.data = xe.call(
+    return vt(r) || (Ne(e), r && r.response && (r.response.data = xe.call(
       e,
       e.transformResponse,
       r.response
@@ -2336,7 +2338,7 @@ const P = $t(ae);
 P.Axios = J;
 P.CanceledError = G;
 P.CancelToken = $r;
-P.isCancel = Ft;
+P.isCancel = vt;
 P.VERSION = qt;
 P.toFormData = ye;
 P.AxiosError = b;

package/dist/fetchers/createRestFulFetcher/createRestFulFetcher.d.ts

@@ -1,5 +1,5 @@
 import { AxiosInstance } from 'axios';
-import { IDocument, IUseRestFulFetcherArgs, TContentTypeResolver, TFileMapVariables } from './types';
+import { IDocument, ICreateRestFulFetcherArgs, TContentTypeResolver, TFileMapVariables } from './types';
 /**
  * RestFul 的查詢器
  * https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-react-query#usage-example-isreacthook-true
@@ -7,5 +7,5 @@ import { IDocument, IUseRestFulFetcherArgs, TContentTypeResolver, TFileMapVariab
  * @param document
  * @param contentTypeResolver
  */
-declare const createRestFulFetcher: <TData, TArgs extends IUseRestFulFetcherArgs<TFileMapVariables | void>>(axiosInstance: AxiosInstance, document: IDocument, contentTypeResolver?: TContentTypeResolver) => ((args?: TArgs) => Promise<TData>);
+declare const createRestFulFetcher: <TData, TArgs extends ICreateRestFulFetcherArgs<TFileMapVariables | void>>(axiosInstance: AxiosInstance, document: IDocument, contentTypeResolver?: TContentTypeResolver) => ((args?: TArgs) => Promise<TData>);
 export default createRestFulFetcher;

package/dist/fetchers/createRestFulFetcher/index.d.ts

@@ -1,3 +1,3 @@
 export { default as createRestFulFetcher } from './createRestFulFetcher';
-export type { IUseRestFulFetcherArgs, TContentTypeResolver } from './types';
+export type { IRestFulEndpointsQueryReturn, ICreateRestFulFetcherArgs, TContentTypeResolver } from './types';
 export * from './config';

package/dist/fetchers/createRestFulFetcher/types.d.ts

@@ -1,11 +1,18 @@
 import { IRequestConfig } from '../types';
 import { ERequestMethod } from './config';
-export type IUseRestFulFetcherArgs<TVariables> = TVariables extends void ? void | {
+export type IRestFulEndpointsQueryReturn<TVariables> = TVariables extends void ? void | {
     fetchOptions?: IRequestConfig;
 } : {
     variables: TVariables;
     fetchOptions?: IRequestConfig;
 };
+export type ICreateRestFulFetcherArgs<TVariables> = TVariables extends void ? void | {
+    fetchOptions?: IRequestConfig;
+} : {
+    body: TFileMapVariables;
+    param: TFileMapVariables;
+    fetchOptions?: IRequestConfig;
+};
 export interface IDocument {
     url: string;
     method?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acrool/react-fetcher",
-  "version": "0.0.4-test.4",
+  "version": "0.0.4-test.6",
   "description": "Fetcher library based for Reactjs",
   "keywords": [
     "acrool",