reaxify 0.0.56 → 0.0.57

package/dist/axios/useAxios.cjs.js

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

package/dist/axios/useAxios.es.js

@@ -1,10 +1,10 @@
 "use client";
-import W from "../helpers/wait.es.js";
+import V from "../helpers/wait.es.js";
 import N from "axios";
-import { useContext as X, useRef as O, useTransition as Y, useMemo as q, useState as _, useCallback as s, useEffect as z } from "react";
-import { AxiosContext as Z } from "./AxiosProvider.es.js";
-function x(e = null) {
-  const E = "Canceled.", n = X(Z), D = O([]), h = O(/* @__PURE__ */ new Map()), v = O(0), [F, G] = Y(), d = q(() => {
+import { useContext as W, useRef as P, useTransition as X, useMemo as q, useState as _, useCallback as s, useEffect as z } from "react";
+import { AxiosContext as Y } from "./AxiosProvider.es.js";
+function C(e = null) {
+  const E = "Canceled.", n = W(Y), D = P([]), h = P(/* @__PURE__ */ new Map()), v = P(0), [F, G] = X(), d = q(() => {
     const t = { ...n.config, ...e == null ? void 0 : e.config };
     return N.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, [
@@ -16,7 +16,7 @@ function x(e = null) {
     statuses: [],
     ...n.retry,
     ...e == null ? void 0 : e.retry
-  }, [e == null ? void 0 : e.retry, n.retry]), [I, J] = _([]), [K, H] = _(null), P = s(
+  }, [e == null ? void 0 : e.retry, n.retry]), [I, J] = _([]), [K, H] = _(null), O = s(
     (t) => {
       var l;
       if (!m && !R) return t;
@@ -62,7 +62,7 @@ function x(e = null) {
       }, Promise.resolve(t)) : t;
     },
     [n.afterResponse, e == null ? void 0 : e.afterResponse]
-  ), $ = s(
+  ), j = s(
     (t) => {
       const r = [
         ...n.afterError,
@@ -74,7 +74,7 @@ function x(e = null) {
       }, Promise.resolve(t)) : t;
     },
     [n.afterError, e == null ? void 0 : e.afterError]
-  ), j = s(
+  ), $ = s(
     (t) => {
       const r = [
         ...n.beforeRetry,
@@ -100,10 +100,10 @@ function x(e = null) {
   }, []), B = s(
     async (t) => {
       p(!0), H(null);
-      const r = P(t);
+      const r = O(t);
       return await U(r);
     },
-    [P, p, U]
+    [O, p, U]
   ), L = s(
     async (t) => {
       b(t.config);
@@ -124,21 +124,21 @@ function x(e = null) {
         ((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)) {
-        a != null && a.delay && await W(a.delay);
-        const Q = await j(t == null ? void 0 : t.config);
-        M();
-        const V = await N.request(Q);
-        return p(!1), V;
+        a != null && a.delay && await V(a.delay);
+        const Q = await $(t == null ? void 0 : t.config);
+        return M(), N.request(Q).then(Promise.resolve).catch(Promise.reject).finally(() => {
+          p(!1);
+        });
       }
       !r && b(t == null ? void 0 : t.config);
-      const l = await $(t);
+      const l = await j(t);
       return p(!1), w(), !r && H(l), Promise.reject(l);
     },
     [
       p,
-      $,
-      b,
       j,
+      b,
+      $,
       k,
       w,
       M,
@@ -163,5 +163,5 @@ function x(e = null) {
   }, [R]), [d, !!I.length || F, K];
 }
 export {
-  x as default
+  C as default
 };

package/package.json

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