@acrool/react-fetcher 0.0.2-alpha.0 → 0.0.2-alpha.2

package/dist/AuthStateProvider/AuthStateProvider.d.ts

@@ -13,8 +13,8 @@ interface AuthStateProviderProps {
     children: ReactNode;
     onSetTokens: TOnSetTokens;
     onGetTokens: TOnGetTokens;
-    onRefreshTokens: TOnRefreshToken;
-    onForceLogout: TOnForceLogout;
+    onRefreshTokens?: TOnRefreshToken;
+    onForceLogout?: TOnForceLogout;
 }
 declare const AuthStateProvider: ({ children, onGetTokens, onSetTokens, onRefreshTokens, onForceLogout }: AuthStateProviderProps) => import("react/jsx-runtime").JSX.Element;
 export default AuthStateProvider;

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

@@ -7,14 +7,14 @@ function ft(e, t) {
     return e.apply(t, arguments);
   };
 }
-const { toString: Yt } = Object.prototype, { getPrototypeOf: Le } = Object, { iterator: pe, toStringTag: dt } = Symbol, he = /* @__PURE__ */ ((e) => (t) => {
+const { toString: Yt } = Object.prototype, { getPrototypeOf: Ue } = Object, { iterator: pe, toStringTag: dt } = Symbol, he = /* @__PURE__ */ ((e) => (t) => {
   const n = Yt.call(t);
   return e[n] || (e[n] = n.slice(8, -1).toLowerCase());
-})(/* @__PURE__ */ Object.create(null)), U = (e) => (e = e.toLowerCase(), (t) => he(t) === e), me = (e) => (t) => typeof t === e, { isArray: V } = Array, ee = me("undefined");
+})(/* @__PURE__ */ Object.create(null)), L = (e) => (e = e.toLowerCase(), (t) => he(t) === e), me = (e) => (t) => typeof t === e, { isArray: V } = Array, ee = me("undefined");
 function Kt(e) {
   return e !== null && !ee(e) && e.constructor !== null && !ee(e.constructor) && k(e.constructor.isBuffer) && e.constructor.isBuffer(e);
 }
-const pt = U("ArrayBuffer");
+const pt = L("ArrayBuffer");
 function Xt(e) {
   let t;
   return typeof ArrayBuffer < "u" && ArrayBuffer.isView ? t = ArrayBuffer.isView(e) : t = e && e.buffer && pt(e.buffer), t;
@@ -22,13 +22,13 @@ function Xt(e) {
 const Zt = me("string"), k = me("function"), ht = me("number"), Re = (e) => e !== null && typeof e == "object", Gt = (e) => e === !0 || e === !1, ce = (e) => {
   if (he(e) !== "object")
     return !1;
-  const t = Le(e);
+  const t = Ue(e);
   return (t === null || t === Object.prototype || Object.getPrototypeOf(t) === null) && !(dt in e) && !(pe in e);
-}, Qt = U("Date"), en = U("File"), tn = U("Blob"), nn = U("FileList"), rn = (e) => Re(e) && k(e.pipe), sn = (e) => {
+}, Qt = L("Date"), en = L("File"), tn = L("Blob"), nn = L("FileList"), rn = (e) => Re(e) && k(e.pipe), sn = (e) => {
   let t;
   return e && (typeof FormData == "function" && e instanceof FormData || k(e.append) && ((t = he(e)) === "formdata" || // detect form-data instance
   t === "object" && k(e.toString) && e.toString() === "[object FormData]"));
-}, on = U("URLSearchParams"), [an, cn, un, ln] = ["ReadableStream", "Request", "Response", "Headers"].map(U), fn = (e) => e.trim ? e.trim() : e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "");
+}, on = L("URLSearchParams"), [an, cn, un, ln] = ["ReadableStream", "Request", "Response", "Headers"].map(L), fn = (e) => e.trim ? e.trim() : e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "");
 function te(e, t, { allOwnKeys: n = !1 } = {}) {
   if (e === null || typeof e > "u")
     return;
@@ -75,7 +75,7 @@ const dn = (e, t, n, { allOwnKeys: r } = {}) => (te(t, (s, o) => {
   do {
     for (s = Object.getOwnPropertyNames(e), o = s.length; o-- > 0; )
       i = s[o], (!r || r(i, e, t)) && !c[i] && (t[i] = e[i], c[i] = !0);
-    e = n !== !1 && Le(e);
+    e = n !== !1 && Ue(e);
   } while (e && (!n || n(e, t)) && e !== Object.prototype);
   return t;
 }, Rn = (e, t, n) => {
@@ -91,7 +91,7 @@ const dn = (e, t, n, { allOwnKeys: r } = {}) => (te(t, (s, o) => {
   for (; t-- > 0; )
     n[t] = e[t];
   return n;
-}, bn = /* @__PURE__ */ ((e) => (t) => e && t instanceof e)(typeof Uint8Array < "u" && Le(Uint8Array)), yn = (e, t) => {
+}, bn = /* @__PURE__ */ ((e) => (t) => e && t instanceof e)(typeof Uint8Array < "u" && Ue(Uint8Array)), yn = (e, t) => {
   const r = (e && e[pe]).call(e);
   let s;
   for (; (s = r.next()) && !s.done; ) {
@@ -104,12 +104,12 @@ const dn = (e, t, n, { allOwnKeys: r } = {}) => (te(t, (s, o) => {
   for (; (n = e.exec(t)) !== null; )
     r.push(n);
   return r;
-}, gn = U("HTMLFormElement"), Tn = (e) => e.toLowerCase().replace(
+}, gn = L("HTMLFormElement"), Tn = (e) => e.toLowerCase().replace(
   /[-_\s]([a-z\d])(\w*)/g,
   function(n, r, s) {
     return r.toUpperCase() + s;
   }
-), We = (({ hasOwnProperty: e }) => (t, n) => e.call(t, n))(Object.prototype), Sn = U("RegExp"), Et = (e, t) => {
+), We = (({ hasOwnProperty: e }) => (t, n) => e.call(t, n))(Object.prototype), Sn = L("RegExp"), Et = (e, t) => {
   const n = Object.getOwnPropertyDescriptors(e), r = {};
   te(n, (s, o) => {
     let i;
@@ -159,7 +159,7 @@ const Cn = (e) => {
     return r;
   };
   return n(e, 0);
-}, Pn = U("AsyncFunction"), kn = (e) => e && (Re(e) || k(e)) && k(e.then) && k(e.catch), bt = ((e, t) => e ? setImmediate : t ? ((n, r) => (H.addEventListener("message", ({ source: s, data: o }) => {
+}, Pn = L("AsyncFunction"), kn = (e) => e && (Re(e) || k(e)) && k(e.then) && k(e.catch), bt = ((e, t) => e ? setImmediate : t ? ((n, r) => (H.addEventListener("message", ({ source: s, data: o }) => {
   s === H && o === n && r.length && r.shift()();
 }, !1), (s) => {
   r.push(s), H.postMessage(n, "*");
@@ -199,7 +199,7 @@ const Cn = (e) => {
   inherits: hn,
   toFlatObject: mn,
   kindOf: he,
-  kindOfTest: U,
+  kindOfTest: L,
   endsWith: Rn,
   toArray: En,
   forEachEntry: yn,
@@ -287,10 +287,10 @@ function Ve(e, t, n) {
     return s = gt(s), !n && o ? "[" + s + "]" : s;
   }).join(n ? "." : "") : t;
 }
-function Ln(e) {
+function Un(e) {
   return a.isArray(e) && !e.some(Pe);
 }
-const Un = a.toFlatObject(a, {}, null, function(t) {
+const Ln = a.toFlatObject(a, {}, null, function(t) {
   return /^is[A-Z]/.test(t);
 });
 function Ee(e, t, n) {
@@ -319,7 +319,7 @@ function Ee(e, t, n) {
     if (m && !d && typeof m == "object") {
       if (a.endsWith(p, "{}"))
         p = r ? p : p.slice(0, -2), m = JSON.stringify(m);
-      else if (a.isArray(m) && Ln(m) || (a.isFileList(m) || a.endsWith(p, "[]")) && (w = a.toArray(m)))
+      else if (a.isArray(m) && Un(m) || (a.isFileList(m) || a.endsWith(p, "[]")) && (w = a.toArray(m)))
         return p = gt(p), w.forEach(function(S, _) {
           !(a.isUndefined(S) || S === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
@@ -330,7 +330,7 @@ function Ee(e, t, n) {
     }
     return Pe(m) ? !0 : (t.append(Ve(d, p, o), l(m)), !1);
   }
-  const R = [], E = Object.assign(Un, {
+  const R = [], E = Object.assign(Ln, {
     defaultVisitor: u,
     convertValue: l,
     isVisitable: Pe
@@ -368,10 +368,10 @@ function Ye(e) {
     return t[r];
   });
 }
-function Ue(e, t) {
+function Le(e, t) {
   this._pairs = [], e && Ee(e, this, t);
 }
-const Tt = Ue.prototype;
+const Tt = Le.prototype;
 Tt.append = function(t, n) {
   this._pairs.push([t, n]);
 };
@@ -395,7 +395,7 @@ function St(e, t, n) {
   });
   const s = n && n.serialize;
   let o;
-  if (s ? o = s(t, n) : o = a.isURLSearchParams(t) ? t.toString() : new Ue(t, n).toString(r), o) {
+  if (s ? o = s(t, n) : o = a.isURLSearchParams(t) ? t.toString() : new Le(t, n).toString(r), o) {
     const i = e.indexOf("#");
     i !== -1 && (e = e.slice(0, i)), e += (e.indexOf("?") === -1 ? "?" : "&") + o;
   }
@@ -459,7 +459,7 @@ const Ot = {
   silentJSONParsing: !0,
   forcedJSONParsing: !0,
   clarifyTimeoutError: !1
-}, Bn = typeof URLSearchParams < "u" ? URLSearchParams : Ue, qn = typeof FormData < "u" ? FormData : null, In = typeof Blob < "u" ? Blob : null, Mn = {
+}, Bn = typeof URLSearchParams < "u" ? URLSearchParams : Le, qn = typeof FormData < "u" ? FormData : null, In = typeof Blob < "u" ? Blob : null, Mn = {
   isBrowser: !0,
   classes: {
     URLSearchParams: Bn,
@@ -1027,10 +1027,10 @@ const Ct = (e) => {
         config: e,
         request: d
       };
-      _t(function(j) {
-        n(j), p();
-      }, function(j) {
-        r(j), p();
+      _t(function(U) {
+        n(U), p();
+      }, function(U) {
+        r(U), p();
       }, O), d = null;
     }
     "onloadend" in d ? d.onloadend = w : d.onreadystatechange = function() {
@@ -1212,11 +1212,11 @@ const Er = async (e) => {
         duplex: "half"
       }), v;
       if (a.isFormData(r) && (v = O.headers.get("content-type")) && u.setContentType(v), O.body) {
-        const [j, $] = Ze(
+        const [U, $] = Ze(
           d,
           fe(Ge(h))
         );
-        r = et(O.body, tt, j, $);
+        r = et(O.body, tt, U, $);
       }
     }
     a.isString(R) || (R = R ? "include" : "omit");
@@ -1237,12 +1237,12 @@ const Er = async (e) => {
       ["status", "statusText", "headers"].forEach((ie) => {
         O[ie] = T[ie];
       });
-      const v = a.toFiniteNumber(T.headers.get("content-length")), [j, $] = c && Ze(
+      const v = a.toFiniteNumber(T.headers.get("content-length")), [U, $] = c && Ze(
         v,
         fe(Ge(c), !0)
       ) || [];
       T = new Response(
-        et(T.body, tt, j, () => {
+        et(T.body, tt, U, () => {
           $ && $(), p && p();
         }),
         O
@@ -1657,13 +1657,13 @@ const je = {
 Object.entries(je).forEach(([e, t]) => {
   je[t] = e;
 });
-function Lt(e) {
+function Ut(e) {
   const t = new z(e), n = ft(z.prototype.request, t);
   return a.extend(n, z.prototype, t, { allOwnKeys: !0 }), a.extend(n, t, null, { allOwnKeys: !0 }), n.create = function(s) {
-    return Lt(J(e, s));
+    return Ut(J(e, s));
   }, n;
 }
-const x = Lt(ne);
+const x = Ut(ne);
 x.Axios = z;
 x.CanceledError = Y;
 x.CancelToken = Tr;
@@ -1752,7 +1752,7 @@ const {
     SERVER_ERROR: "任意500系列错误",
     TIMEOUT_ERROR: "服务器已超过 {sec} 秒未响应。请确认您的网络连接状态或联系客服"
   }
-}, Ar = (e) => "File" in window && e instanceof File, xr = (e) => "Blob" in window && e instanceof Blob, Ut = (e, t = ["variables"]) => e && Object.keys(e).reduce((n, r) => {
+}, Ar = (e) => "File" in window && e instanceof File, xr = (e) => "Blob" in window && e instanceof Blob, Lt = (e, t = ["variables"]) => e && Object.keys(e).reduce((n, r) => {
   const s = e[r];
   if (Ar(s) || xr(s)) {
     const o = s;
@@ -1762,7 +1762,7 @@ const {
       values: [...n.values, o]
     };
   } else if (s && typeof s == "object") {
-    const o = Ut(s, t.concat(r));
+    const o = Lt(s, t.concat(r));
     return {
       variables: { ...n.variables, [r]: o.variables },
       map: [...n.map, ...o.map],
@@ -1783,7 +1783,7 @@ const {
   const s = t == null ? void 0 : t.fetchOptions, o = t == null ? void 0 : t.variables;
   let i = !1;
   if (o) {
-    const u = Ut(o);
+    const u = Lt(o);
     if (i = u.values.length > 0, i) {
       r = "multipart/form-data";
       const R = JSON.stringify({
@@ -1891,7 +1891,7 @@ function Cr() {
           case _:
             var y = f.render;
             return f = f.displayName, f || (f = y.displayName || y.name || "", f = f !== "" ? "ForwardRef(" + f + ")" : "ForwardRef"), f;
-          case j:
+          case U:
             return y = f.displayName || null, y !== null ? y : e(f.type) || "Memo";
           case $:
             y = f._payload, f = f._init;
@@ -2050,7 +2050,7 @@ React keys must be passed directly to JSX without using spread:
     function R(f) {
       typeof f == "object" && f !== null && f.$$typeof === g && f._store && (f._store.validated = 1);
     }
-    var E = zt, g = Symbol.for("react.transitional.element"), m = Symbol.for("react.portal"), p = Symbol.for("react.fragment"), d = Symbol.for("react.strict_mode"), w = Symbol.for("react.profiler"), T = Symbol.for("react.consumer"), S = Symbol.for("react.context"), _ = Symbol.for("react.forward_ref"), O = Symbol.for("react.suspense"), v = Symbol.for("react.suspense_list"), j = Symbol.for("react.memo"), $ = Symbol.for("react.lazy"), ie = Symbol.for("react.activity"), qt = Symbol.for("react.client.reference"), we = E.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, qe = Object.prototype.hasOwnProperty, It = Array.isArray, ge = console.createTask ? console.createTask : function() {
+    var E = zt, g = Symbol.for("react.transitional.element"), m = Symbol.for("react.portal"), p = Symbol.for("react.fragment"), d = Symbol.for("react.strict_mode"), w = Symbol.for("react.profiler"), T = Symbol.for("react.consumer"), S = Symbol.for("react.context"), _ = Symbol.for("react.forward_ref"), O = Symbol.for("react.suspense"), v = Symbol.for("react.suspense_list"), U = Symbol.for("react.memo"), $ = Symbol.for("react.lazy"), ie = Symbol.for("react.activity"), qt = Symbol.for("react.client.reference"), we = E.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, qe = Object.prototype.hasOwnProperty, It = Array.isArray, ge = console.createTask ? console.createTask : function() {
       return null;
     };
     E = {
@@ -2135,18 +2135,18 @@ function jr(e, ...t) {
   ]).join(";");
   oe(e, n, ...t);
 }
-function Lr(e, ...t) {
+function Ur(e, ...t) {
   const n = re.concat([
     `background-color: ${se.danger}`
   ]).join(";");
   oe(e, n, ...t);
 }
-const L = {
+const j = {
   primary: kr,
   success: Fr,
   info: vr,
   warning: jr,
-  danger: Lr
+  danger: Ur
 };
 function Be(e, t) {
   const n = {
@@ -2185,13 +2185,13 @@ class Q extends Error {
 const Bt = lt({
   lastUpdateTimestamp: 0,
   isAuth: !1,
-  getTokens: () => (L.warning("AuthStateContext", "getTokens not yet ready"), null),
-  updateTokens: () => L.warning("AuthStateContext", "updateTokens not yet ready"),
-  forceLogout: () => L.warning("AuthStateContext", "forceLogout not yet ready"),
+  getTokens: () => (j.warning("AuthStateContext", "getTokens not yet ready"), null),
+  updateTokens: () => j.warning("AuthStateContext", "updateTokens not yet ready"),
+  forceLogout: () => j.warning("AuthStateContext", "forceLogout not yet ready"),
   refreshTokens: async () => {
-    L.warning("AuthStateContext", "refreshToken not yet ready");
+    j.warning("AuthStateContext", "refreshToken not yet ready");
   }
-}), Ur = () => Jt(Bt), as = ({
+}), Lr = () => Jt(Bt), as = ({
   children: e,
   onGetTokens: t,
   onSetTokens: n,
@@ -2204,13 +2204,13 @@ const Bt = lt({
   }, []);
   const l = (E) => {
     let g;
-    typeof E == "function" ? g = E(t()) : g = E, L.danger("更新Token", g), n(g), h(ut(g)), i(Date.now());
+    typeof E == "function" ? g = E(t()) : g = E, j.danger("更新Token", g), n(g), h(ut(g)), i(Date.now());
   }, u = () => {
-    l(null), s();
+    l(null), s && s();
   }, R = async () => {
     var g;
     const E = (g = t()) == null ? void 0 : g.refreshToken;
-    if (E)
+    if (!(!E || !r))
       try {
         const m = await r(E);
         if (Be(m))
@@ -2271,7 +2271,7 @@ const qr = lt(M), cs = ({
     updateTokens: i,
     refreshTokens: c,
     forceLogout: h
-  } = Ur();
+  } = Lr();
   Vt(() => {
     const p = M.interceptors.request.use(R), d = M.interceptors.response.use(E, m);
     return () => {
@@ -2279,7 +2279,7 @@ const qr = lt(M), cs = ({
     };
   }, [o, c, i, h]);
   const l = (p) => {
-    L.warning("runPendingRequest"), G = !1;
+    j.warning("runPendingRequest"), G = !1;
     for (const d of Ne)
       d(p);
     Ne = [];
@@ -2293,9 +2293,9 @@ const qr = lt(M), cs = ({
     });
   }, R = (p) => new Promise((d, w) => {
     var _;
-    L.warning("interceptorsRequest"), p.headers["Accept-Language"] = t();
+    j.warning("interceptorsRequest"), p.headers["Accept-Language"] = t();
     const T = (_ = o()) == null ? void 0 : _.accessToken;
-    if (T && (p.headers.Authorization = `Bearer ${T}`), !(p && s ? s(p) : !1) && G) {
+    if (j.info("setHeader", T), T && (p.headers.Authorization = `Bearer ${T}`), !(p && s ? s(p) : !1) && G) {
       u(d, w)(p), w(new Dr({ message: "Token refreshing, so request save queues not send", code: "REFRESH_TOKEN" }));
       return;
     }
@@ -2305,14 +2305,14 @@ const qr = lt(M), cs = ({
     return (w == null ? void 0 : w[p]) || `Error: ${p}`;
   }, m = (p) => {
     const d = p.response, w = p.config, T = p.status, S = Br(d);
-    L.warning("interceptorsResponseError"), n && n(S);
+    j.warning("interceptorsResponseError"), n && n(S);
     const _ = w && s ? s(w) : !1;
     if (d && w && (T === 401 || S.code === "UNAUTHENTICATED")) {
       const O = o();
-      return L.warning("401OrUNAUTHENTICATED", O == null ? void 0 : O.refreshToken), Be(O == null ? void 0 : O.refreshToken) || _ ? (G = !1, h(), Promise.reject(new Q(S))) : (G || (G = !0, L.warning("postRefreshToken"), c().then(() => l(!0)).catch(() => {
-        L.danger("refreshTokens fail"), l(!1);
-      })), new Promise((v, j) => {
-        u(v, j)(w);
+      return j.warning("401OrUNAUTHENTICATED", O == null ? void 0 : O.refreshToken), Be(O == null ? void 0 : O.refreshToken) || _ ? (G = !1, h(), Promise.reject(new Q(S))) : (G || (G = !0, j.warning("postRefreshToken"), c().then(() => l(!0)).catch(() => {
+        j.danger("refreshTokens fail"), l(!1);
+      })), new Promise((v, U) => {
+        u(v, U)(w);
       }));
     }
     return Promise.reject(new Q(S));
@@ -2323,5 +2323,5 @@ export {
   as as AuthStateProvider,
   cs as FetcherProvider,
   is as graphqlFetcher,
-  Ur as useAuthState
+  Lr as useAuthState
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acrool/react-fetcher",
-  "version": "0.0.2-alpha.0",
+  "version": "0.0.2-alpha.2",
   "description": "Fetcher library based for Reactjs",
   "keywords": [
     "acrool",