reaxify 0.0.53 → 0.0.54

package/dist/axios/useAxios.cjs.js

@@ -1 +1 @@
-"use client";"use strict";const G=require("../helpers/wait.cjs.js"),I=require("axios"),r=require("react"),J=require("./AxiosProvider.cjs.js");function K(t=null){const w="Canceled.",u=r.useContext(J.AxiosContext),k=r.useRef([]),h=r.useRef(new Map),E=r.useRef(0),[L,T]=r.useTransition(),d=r.useMemo(()=>{const e={...u.config,...t==null?void 0:t.config};return I.create(e)},[u.config,t==null?void 0:t.config]),y=r.useMemo(()=>typeof(t==null?void 0:t.cancelDuplicatedRequests)=="boolean"?t.cancelDuplicatedRequests:u.cancelDuplicatedRequests??!1,[u.cancelDuplicatedRequests,t==null?void 0:t.cancelDuplicatedRequests]),R=r.useMemo(()=>typeof(t==null?void 0:t.cancelOnUnmount)=="boolean"?t.cancelOnUnmount:u.cancelOnUnmount??!1,[t==null?void 0:t.cancelOnUnmount,u.cancelOnUnmount]),a=r.useMemo(()=>({...u.retry,...t==null?void 0:t.retry}),[t==null?void 0:t.retry,u.retry]),[N,_]=r.useState([]),[z,D]=r.useState(null),v=r.useCallback(e=>{var s;if(!y&&!R)return e;const c=`${e.method}-${e.url}`,n=new AbortController;return y&&h.current.has(c)&&((s=h.current.get(c))==null||s.abort(w)),(y||R)&&(e.signal=n.signal),y&&h.current.set(c,n),R&&k.current.push(n),e},[y,R]),m=r.useCallback(e=>{if(!e)return;const c=`${e.method}-${e.url}`;h.current.delete(c)},[]),p=r.useCallback(e=>{T(()=>{_(c=>{const n=[...c];return e?n.push(""):n.pop(),n})})},[]),H=r.useCallback(e=>{const c=[...u.beforeRequest,...(t==null?void 0:t.beforeRequest)??[]];return c.length?c.reduce(async(n,s)=>{const l=await n;return await s(l)??l},Promise.resolve(e)):e},[u.beforeRequest,t==null?void 0:t.beforeRequest]),P=r.useCallback(e=>{const c=[...u.afterResponse,...(t==null?void 0:t.afterResponse)??[]];return c.length?c.reduce(async(n,s)=>{const l=await n;return await s(l)??l},Promise.resolve(e)):e},[u.afterResponse,t==null?void 0:t.afterResponse]),A=r.useCallback(e=>{const c=[...u.afterError,...(t==null?void 0:t.afterError)??[]];return c.length?c.reduce(async(n,s)=>{const l=await n;return await s(l)??l},Promise.resolve(e)):e},[u.afterError,t==null?void 0:t.afterError]),M=r.useCallback(e=>{const c=[...u.beforeRetry,...(t==null?void 0:t.beforeRetry)??[]];return c.length?c.reduce(async(n,s)=>{const l=await n;return await s(l)??l},Promise.resolve(e)):e},[u.beforeRetry,t==null?void 0:t.beforeRetry]),O=r.useCallback(e=>!(!a||a.count&&E.current>=a.count||a.statuses&&!a.statuses.includes(e)),[a]),U=r.useCallback(()=>{E.current++},[]),q=r.useCallback(()=>{E.current=0},[]),$=r.useCallback(async e=>{p(!0),D(null);const c=v(e);return await H(c)},[v,p,H]),j=r.useCallback(async e=>{m(e.config);const c=await P(e);return p(!1),D(null),q(),c},[p,P,m,q]),S=r.useCallback(async e=>{var l,b,B;const c=[(e==null?void 0:e.code)==="ERR_CANCELED",((b=(l=e==null?void 0:e.config)==null?void 0:l.signal)==null?void 0:b.reason)===w].some(Boolean),n=((B=e==null?void 0:e.response)==null?void 0:B.status)??0;if(O(n)){U(),a!=null&&a.delay&&await G(a.delay);const F=await M(e==null?void 0:e.config);return p(!1),d.request(F)}!c&&m(e==null?void 0:e.config);const s=await A(e);return p(!1),q(),!c&&D(s),Promise.reject(s)},[p,A,m,M,O,q,U,a]);return r.useEffect(()=>{const e=d.interceptors.request.use($),c=d.interceptors.response.use(j,S);return()=>{d.interceptors.request.eject(e),d.interceptors.response.eject(c)}},[d.interceptors.request,d.interceptors.response,$,j,S]),r.useEffect(()=>()=>{R&&(k.current.forEach(e=>{e.abort(w)}),k.current=[])},[R]),[d,!!N.length||L,z]}module.exports=K;
+"use client";"use strict";const G=require("../helpers/wait.cjs.js"),I=require("axios"),r=require("react"),J=require("./AxiosProvider.cjs.js");function K(e=null){const w="Canceled.",n=r.useContext(J.AxiosContext),k=r.useRef([]),h=r.useRef(new Map),E=r.useRef(0),[L,T]=r.useTransition(),d=r.useMemo(()=>{const t={...n.config,...e==null?void 0:e.config};return I.create(t)},[n.config,e==null?void 0:e.config]),y=r.useMemo(()=>typeof(e==null?void 0:e.cancelDuplicatedRequests)=="boolean"?e.cancelDuplicatedRequests:n.cancelDuplicatedRequests??!1,[n.cancelDuplicatedRequests,e==null?void 0:e.cancelDuplicatedRequests]),R=r.useMemo(()=>typeof(e==null?void 0:e.cancelOnUnmount)=="boolean"?e.cancelOnUnmount:n.cancelOnUnmount??!1,[e==null?void 0:e.cancelOnUnmount,n.cancelOnUnmount]),a=r.useMemo(()=>!(n!=null&&n.retry)&&!(e!=null&&e.retry)?null:{count:0,delay:0,statuses:[],...n.retry,...e==null?void 0:e.retry},[e==null?void 0:e.retry,n.retry]),[N,_]=r.useState([]),[z,D]=r.useState(null),v=r.useCallback(t=>{var s;if(!y&&!R)return t;const c=`${t.method}-${t.url}`,u=new AbortController;return y&&h.current.has(c)&&((s=h.current.get(c))==null||s.abort(w)),(y||R)&&(t.signal=u.signal),y&&h.current.set(c,u),R&&k.current.push(u),t},[y,R]),m=r.useCallback(t=>{if(!t)return;const c=`${t.method}-${t.url}`;h.current.delete(c)},[]),p=r.useCallback(t=>{T(()=>{_(c=>{const u=[...c];return t?u.push(""):u.pop(),u})})},[]),H=r.useCallback(t=>{const c=[...n.beforeRequest,...(e==null?void 0:e.beforeRequest)??[]];return c.length?c.reduce(async(u,s)=>{const l=await u;return await s(l)??l},Promise.resolve(t)):t},[n.beforeRequest,e==null?void 0:e.beforeRequest]),P=r.useCallback(t=>{const c=[...n.afterResponse,...(e==null?void 0:e.afterResponse)??[]];return c.length?c.reduce(async(u,s)=>{const l=await u;return await s(l)??l},Promise.resolve(t)):t},[n.afterResponse,e==null?void 0:e.afterResponse]),A=r.useCallback(t=>{const c=[...n.afterError,...(e==null?void 0:e.afterError)??[]];return c.length?c.reduce(async(u,s)=>{const l=await u;return await s(l)??l},Promise.resolve(t)):t},[n.afterError,e==null?void 0:e.afterError]),M=r.useCallback(t=>{const c=[...n.beforeRetry,...(e==null?void 0:e.beforeRetry)??[]];return c.length?c.reduce(async(u,s)=>{const l=await u;return await s(l)??l},Promise.resolve(t)):t},[n.beforeRetry,e==null?void 0:e.beforeRetry]),O=r.useCallback(t=>{if(!a)return!1;const c=a.count??0,u=a.statuses??[];return!(E.current>=c||!u.includes(t))},[a]),U=r.useCallback(()=>{E.current++},[]),q=r.useCallback(()=>{E.current=0},[]),$=r.useCallback(async t=>{p(!0),D(null);const c=v(t);return await H(c)},[v,p,H]),j=r.useCallback(async t=>{m(t.config);const c=await P(t);return p(!1),D(null),q(),c},[p,P,m,q]),S=r.useCallback(async t=>{var l,b,B;const c=[(t==null?void 0:t.code)==="ERR_CANCELED",((b=(l=t==null?void 0:t.config)==null?void 0:l.signal)==null?void 0:b.reason)===w].some(Boolean),u=((B=t==null?void 0:t.response)==null?void 0:B.status)??0;if(!c&&O(u)){U(),a!=null&&a.delay&&await G(a.delay);const F=await M(t==null?void 0:t.config);return p(!1),d.request(F)}!c&&m(t==null?void 0:t.config);const s=await A(t);return p(!1),q(),!c&&D(s),Promise.reject(s)},[p,A,m,M,O,q,U,a==null?void 0:a.delay]);return r.useEffect(()=>{const t=d.interceptors.request.use($),c=d.interceptors.response.use(j,S);return()=>{d.interceptors.request.eject(t),d.interceptors.response.eject(c)}},[d.interceptors.request,d.interceptors.response,$,j,S]),r.useEffect(()=>()=>{R&&(k.current.forEach(t=>{t.abort(w)}),k.current=[])},[R]),[d,!!N.length||L,z]}module.exports=K;

package/dist/axios/useAxios.es.js

@@ -3,104 +3,111 @@ import Q from "../helpers/wait.es.js";
 import V from "axios";
 import { useContext as W, useRef as O, useTransition as X, useMemo as q, useState as N, useCallback as s, useEffect as _ } from "react";
 import { AxiosContext as Y } from "./AxiosProvider.es.js";
-function C(t = null) {
-  const E = "Canceled.", n = W(Y), D = O([]), h = O(/* @__PURE__ */ new Map()), v = O(0), [z, F] = X(), d = q(() => {
-    const e = { ...n.config, ...t == null ? void 0 : t.config };
-    return V.create(e);
-  }, [n.config, t == null ? void 0 : t.config]), m = q(() => typeof (t == null ? void 0 : t.cancelDuplicatedRequests) == "boolean" ? t.cancelDuplicatedRequests : n.cancelDuplicatedRequests ?? !1, [
+function C(e = null) {
+  const E = "Canceled.", n = W(Y), D = O([]), h = O(/* @__PURE__ */ new Map()), v = O(0), [z, F] = X(), a = q(() => {
+    const t = { ...n.config, ...e == null ? void 0 : e.config };
+    return V.create(t);
+  }, [n.config, e == null ? void 0 : e.config]), m = q(() => typeof (e == null ? void 0 : e.cancelDuplicatedRequests) == "boolean" ? e.cancelDuplicatedRequests : n.cancelDuplicatedRequests ?? !1, [
     n.cancelDuplicatedRequests,
-    t == null ? void 0 : t.cancelDuplicatedRequests
-  ]), R = q(() => typeof (t == null ? void 0 : t.cancelOnUnmount) == "boolean" ? t.cancelOnUnmount : n.cancelOnUnmount ?? !1, [t == null ? void 0 : t.cancelOnUnmount, n.cancelOnUnmount]), a = q(() => ({
+    e == null ? void 0 : e.cancelDuplicatedRequests
+  ]), R = q(() => typeof (e == null ? void 0 : e.cancelOnUnmount) == "boolean" ? e.cancelOnUnmount : n.cancelOnUnmount ?? !1, [e == null ? void 0 : e.cancelOnUnmount, n.cancelOnUnmount]), d = q(() => !(n != null && n.retry) && !(e != null && e.retry) ? null : {
+    count: 0,
+    delay: 0,
+    statuses: [],
     ...n.retry,
-    ...t == null ? void 0 : t.retry
-  }), [t == null ? void 0 : t.retry, n.retry]), [G, I] = N([]), [J, H] = N(null), P = s(
-    (e) => {
+    ...e == null ? void 0 : e.retry
+  }, [e == null ? void 0 : e.retry, n.retry]), [G, I] = N([]), [J, H] = N(null), P = s(
+    (t) => {
       var l;
-      if (!m && !R) return e;
-      const r = `${e.method}-${e.url}`, c = new AbortController();
-      return m && h.current.has(r) && ((l = h.current.get(r)) == null || l.abort(E)), (m || R) && (e.signal = c.signal), m && h.current.set(r, c), R && D.current.push(c), e;
+      if (!m && !R) return t;
+      const r = `${t.method}-${t.url}`, c = new AbortController();
+      return m && h.current.has(r) && ((l = h.current.get(r)) == null || l.abort(E)), (m || R) && (t.signal = c.signal), m && h.current.set(r, c), R && D.current.push(c), t;
     },
     [m, R]
   ), b = s(
-    (e) => {
-      if (!e) return;
-      const r = `${e.method}-${e.url}`;
+    (t) => {
+      if (!t) return;
+      const r = `${t.method}-${t.url}`;
       h.current.delete(r);
     },
     []
-  ), p = s((e) => {
+  ), p = s((t) => {
     F(() => {
       I((r) => {
         const c = [...r];
-        return e ? c.push("") : c.pop(), c;
+        return t ? c.push("") : c.pop(), c;
       });
     });
   }, []), U = s(
-    (e) => {
+    (t) => {
       const r = [
         ...n.beforeRequest,
-        ...(t == null ? void 0 : t.beforeRequest) ?? []
+        ...(e == null ? void 0 : e.beforeRequest) ?? []
       ];
       return r.length ? r.reduce(async (c, l) => {
         const u = await c;
         return await l(u) ?? u;
-      }, Promise.resolve(e)) : e;
+      }, Promise.resolve(t)) : t;
     },
-    [n.beforeRequest, t == null ? void 0 : t.beforeRequest]
+    [n.beforeRequest, e == null ? void 0 : e.beforeRequest]
   ), A = s(
-    (e) => {
+    (t) => {
       const r = [
         ...n.afterResponse,
-        ...(t == null ? void 0 : t.afterResponse) ?? []
+        ...(e == null ? void 0 : e.afterResponse) ?? []
       ];
       return r.length ? r.reduce(async (c, l) => {
         const u = await c;
         return await l(u) ?? u;
-      }, Promise.resolve(e)) : e;
+      }, Promise.resolve(t)) : t;
     },
-    [n.afterResponse, t == null ? void 0 : t.afterResponse]
+    [n.afterResponse, e == null ? void 0 : e.afterResponse]
   ), $ = s(
-    (e) => {
+    (t) => {
       const r = [
         ...n.afterError,
-        ...(t == null ? void 0 : t.afterError) ?? []
+        ...(e == null ? void 0 : e.afterError) ?? []
       ];
       return r.length ? r.reduce(async (c, l) => {
         const u = await c;
         return await l(u) ?? u;
-      }, Promise.resolve(e)) : e;
+      }, Promise.resolve(t)) : t;
     },
-    [n.afterError, t == null ? void 0 : t.afterError]
+    [n.afterError, e == null ? void 0 : e.afterError]
   ), j = s(
-    (e) => {
+    (t) => {
       const r = [
         ...n.beforeRetry,
-        ...(t == null ? void 0 : t.beforeRetry) ?? []
+        ...(e == null ? void 0 : e.beforeRetry) ?? []
       ];
       return r.length ? r.reduce(async (c, l) => {
         const u = await c;
         return await l(u) ?? u;
-      }, Promise.resolve(e)) : e;
+      }, Promise.resolve(t)) : t;
     },
-    [n.beforeRetry, t == null ? void 0 : t.beforeRetry]
+    [n.beforeRetry, e == null ? void 0 : e.beforeRetry]
   ), k = s(
-    (e) => !(!a || a.count && v.current >= a.count || a.statuses && !a.statuses.includes(e)),
-    [a]
+    (t) => {
+      if (!d) return !1;
+      const r = d.count ?? 0, c = d.statuses ?? [];
+      return !(v.current >= r || !c.includes(t));
+    },
+    [d]
   ), M = s(() => {
     v.current++;
   }, []), w = s(() => {
     v.current = 0;
   }, []), B = s(
-    async (e) => {
+    async (t) => {
       p(!0), H(null);
-      const r = P(e);
+      const r = P(t);
       return await U(r);
     },
     [P, p, U]
   ), L = s(
-    async (e) => {
-      b(e.config);
-      const r = await A(e);
+    async (t) => {
+      b(t.config);
+      const r = await A(t);
       return p(!1), H(null), w(), r;
     },
     [
@@ -110,19 +117,19 @@ function C(t = null) {
       w
     ]
   ), S = s(
-    async (e) => {
+    async (t) => {
       var u, y, T;
       const r = [
-        (e == null ? void 0 : e.code) === "ERR_CANCELED",
-        ((y = (u = e == null ? void 0 : e.config) == null ? void 0 : u.signal) == null ? void 0 : y.reason) === E
-      ].some(Boolean), c = ((T = e == null ? void 0 : e.response) == null ? void 0 : T.status) ?? 0;
-      if (k(c)) {
-        M(), a != null && a.delay && await Q(a.delay);
-        const K = await j(e == null ? void 0 : e.config);
-        return p(!1), d.request(K);
+        (t == null ? void 0 : t.code) === "ERR_CANCELED",
+        ((y = (u = t == null ? void 0 : t.config) == null ? void 0 : u.signal) == null ? void 0 : y.reason) === E
+      ].some(Boolean), c = ((T = t == null ? void 0 : t.response) == null ? void 0 : T.status) ?? 0;
+      if (!r && k(c)) {
+        M(), d != null && d.delay && await Q(d.delay);
+        const K = await j(t == null ? void 0 : t.config);
+        return p(!1), a.request(K);
       }
-      !r && b(e == null ? void 0 : e.config);
-      const l = await $(e);
+      !r && b(t == null ? void 0 : t.config);
+      const l = await $(t);
       return p(!1), w(), !r && H(l), Promise.reject(l);
     },
     [
@@ -133,25 +140,25 @@ function C(t = null) {
       k,
       w,
       M,
-      a
+      d == null ? void 0 : d.delay
     ]
   );
   return _(() => {
-    const e = d.interceptors.request.use(B), r = d.interceptors.response.use(L, S);
+    const t = a.interceptors.request.use(B), r = a.interceptors.response.use(L, S);
     return () => {
-      d.interceptors.request.eject(e), d.interceptors.response.eject(r);
+      a.interceptors.request.eject(t), a.interceptors.response.eject(r);
     };
   }, [
-    d.interceptors.request,
-    d.interceptors.response,
+    a.interceptors.request,
+    a.interceptors.response,
     B,
     L,
     S
   ]), _(() => () => {
-    R && (D.current.forEach((e) => {
-      e.abort(E);
+    R && (D.current.forEach((t) => {
+      t.abort(E);
     }), D.current = []);
-  }, [R]), [d, !!G.length || z, J];
+  }, [R]), [a, !!G.length || z, J];
 }
 export {
   C as default

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reaxify",
   "private": false,
-  "version": "0.0.53",
+  "version": "0.0.54",
   "type": "module",
   "types": "./dist/index.d.ts",
   "files": [