reaxify 0.0.8 → 0.0.10

package/dist/axios/useAxios.cjs.js

@@ -1 +1 @@
-"use strict";const $=require("axios"),r=require("react"),j=require("./AxiosProvider.cjs.js");function L(t=null){const h="Canceled due to duplication.",l=r.useContext(j.AxiosContext),R=r.useRef([]),a=r.useMemo(()=>new Map,[]),s=r.useMemo(()=>{const e={...l.config,...t==null?void 0:t.config};return $.create(e)},[l.config,t==null?void 0:t.config]),q=r.useMemo(()=>typeof(t==null?void 0:t.cancelDuplicatedRequests)=="boolean"?t.cancelDuplicatedRequests:l.cancelDuplicatedRequests??!1,[l.cancelDuplicatedRequests,t==null?void 0:t.cancelDuplicatedRequests]),y=r.useMemo(()=>typeof(t==null?void 0:t.cancelOnUnmount)=="boolean"?t.cancelOnUnmount:l.cancelOnUnmount??!1,[t==null?void 0:t.cancelOnUnmount,l.cancelOnUnmount]),[O,U]=r.useState([]),[A,m]=r.useState(null),k=r.useCallback(e=>{var u;if(!q)return e;const c=`${e.method}-${e.url}`;a.has(c)&&((u=a.get(c))==null||u.abort(h));const n=new AbortController;return e.signal=n.signal,a.set(c,n),R.current.push(n),e},[a,q]),b=r.useCallback(e=>{if(!e)return;const c=`${e.method}-${e.url}`;a.delete(c)},[a]),d=r.useCallback(e=>{U(c=>{const n=[...c];return e?n.push(""):n.pop(),n})},[]),w=r.useCallback(e=>{const c=[...l.beforeRequest,...(t==null?void 0:t.beforeRequest)??[]];return c.length?c.reduce(async(n,u)=>{const p=await n;return await u(p)??p},Promise.resolve(e)):e},[l.beforeRequest,t==null?void 0:t.beforeRequest]),D=r.useCallback(e=>{const c=[...l.afterResponse,...(t==null?void 0:t.afterResponse)??[]];return c.length?c.reduce(async(n,u)=>{const p=await n;return await u(p)??p},Promise.resolve(e)):e},[l.afterResponse,t==null?void 0:t.afterResponse]),E=r.useCallback(e=>{const c=[...l.afterError,...(t==null?void 0:t.afterError)??[]];return c.length?c.reduce(async(n,u)=>u(await n),Promise.resolve(e)):e},[l.afterError,t==null?void 0:t.afterError]),H=r.useCallback(async e=>{const c=k(e);return d(!0),m(null),await w(c)},[k,d,w]),v=r.useCallback(async e=>{b(e.config);const c=await D(e);return d(!1),m(null),c},[d,D,b]),M=r.useCallback(async e=>{var u;!(((u=e==null?void 0:e.config)==null?void 0:u.signal.reason)===h)&&b(e==null?void 0:e.config);const n=await E(e);return d(!1),m(e),Promise.reject(n)},[d,E,b]);return r.useLayoutEffect(()=>{const e=s.interceptors.request.use(H),c=s.interceptors.response.use(v,M);return()=>{s.interceptors.request.eject(e),s.interceptors.response.eject(c)}},[s.interceptors.request,s.interceptors.response,H,v,M]),r.useLayoutEffect(()=>()=>{y&&(R.current.forEach(e=>{e.abort("Canceled due to component unmount.")}),R.current=[])},[y]),[s,!!O.length,A]}module.exports=L;
+"use strict";const P=require("axios"),r=require("react"),$=require("./AxiosProvider.cjs.js");function j(t=null){const q="Canceled.",l=r.useContext($.AxiosContext),m=r.useRef([]),d=r.useMemo(()=>new Map,[]),a=r.useMemo(()=>{const e={...l.config,...t==null?void 0:t.config};return P.create(e)},[l.config,t==null?void 0:t.config]),p=r.useMemo(()=>typeof(t==null?void 0:t.cancelDuplicatedRequests)=="boolean"?t.cancelDuplicatedRequests:l.cancelDuplicatedRequests??!1,[l.cancelDuplicatedRequests,t==null?void 0:t.cancelDuplicatedRequests]),b=r.useMemo(()=>typeof(t==null?void 0:t.cancelOnUnmount)=="boolean"?t.cancelOnUnmount:l.cancelOnUnmount??!1,[t==null?void 0:t.cancelOnUnmount,l.cancelOnUnmount]),[M,O]=r.useState([]),[U,y]=r.useState(null),k=r.useCallback(e=>{var s;if(!p&&!b)return e;const c=`${e.method}-${e.url}`;console.log({key:c});const n=new AbortController;return console.log({controller:n}),p&&d.has(c)&&(console.log("pendingRequests.has(key)"),(s=d.get(c))==null||s.abort(q)),(p||b)&&(console.log("abort"),e.signal=n.signal),p&&d.set(c,n),p&&console.log("pendingRequests.set"),b&&m.current.push(n),e},[d,p,b]),h=r.useCallback(e=>{if(!e)return;const c=`${e.method}-${e.url}`;d.delete(c)},[d]),R=r.useCallback(e=>{O(c=>{const n=[...c];return e?n.push(""):n.pop(),n})},[]),o=r.useCallback(e=>{const c=[...l.beforeRequest,...(t==null?void 0:t.beforeRequest)??[]];return c.length?c.reduce(async(n,s)=>{const u=await n;return await s(u)??u},Promise.resolve(e)):e},[l.beforeRequest,t==null?void 0:t.beforeRequest]),w=r.useCallback(e=>{const c=[...l.afterResponse,...(t==null?void 0:t.afterResponse)??[]];return c.length?c.reduce(async(n,s)=>{const u=await n;return await s(u)??u},Promise.resolve(e)):e},[l.afterResponse,t==null?void 0:t.afterResponse]),D=r.useCallback(e=>{const c=[...l.afterError,...(t==null?void 0:t.afterError)??[]];return c.length?c.reduce(async(n,s)=>s(await n),Promise.resolve(e)):e},[l.afterError,t==null?void 0:t.afterError]),E=r.useCallback(async e=>{const c=k(e);return R(!0),y(null),await o(c)},[k,R,o]),H=r.useCallback(async e=>{h(e.config);const c=await w(e);return R(!1),y(null),c},[R,w,h]),v=r.useCallback(async e=>{var s,u;!(((u=(s=e==null?void 0:e.config)==null?void 0:s.signal)==null?void 0:u.reason)===q)&&h(e==null?void 0:e.config);const n=await D(e);return R(!1),y(e),Promise.reject(n)},[R,D,h]);return r.useLayoutEffect(()=>{const e=a.interceptors.request.use(E),c=a.interceptors.response.use(H,v);return()=>{a.interceptors.request.eject(e),a.interceptors.response.eject(c)}},[a.interceptors.request,a.interceptors.response,E,H,v]),r.useLayoutEffect(()=>()=>{b&&(m.current.forEach(e=>{e.abort(q)}),m.current=[])},[b]),[a,!!M.length,U]}module.exports=j;

package/dist/axios/useAxios.es.js

@@ -1,60 +1,60 @@
-import S from "axios";
-import { useContext as B, useRef as z, useMemo as R, useState as P, useCallback as u, useLayoutEffect as $ } from "react";
-import { AxiosContext as F } from "./AxiosProvider.es.js";
-function K(t = null) {
-  const q = "Canceled due to duplication.", n = B(F), h = z([]), a = R(() => /* @__PURE__ */ new Map(), []), s = R(() => {
+import L from "axios";
+import { useContext as S, useRef as B, useMemo as q, useState as k, useCallback as s, useLayoutEffect as A } from "react";
+import { AxiosContext as z } from "./AxiosProvider.es.js";
+function J(t = null) {
+  const b = "Canceled.", n = S(z), y = B([]), d = q(() => /* @__PURE__ */ new Map(), []), a = q(() => {
     const e = { ...n.config, ...t == null ? void 0 : t.config };
-    return S.create(e);
-  }, [n.config, t == null ? void 0 : t.config]), y = R(() => typeof (t == null ? void 0 : t.cancelDuplicatedRequests) == "boolean" ? t.cancelDuplicatedRequests : n.cancelDuplicatedRequests ?? !1, [
+    return L.create(e);
+  }, [n.config, t == null ? void 0 : t.config]), p = q(() => typeof (t == null ? void 0 : t.cancelDuplicatedRequests) == "boolean" ? t.cancelDuplicatedRequests : n.cancelDuplicatedRequests ?? !1, [
     n.cancelDuplicatedRequests,
     t == null ? void 0 : t.cancelDuplicatedRequests
-  ]), w = R(() => typeof (t == null ? void 0 : t.cancelOnUnmount) == "boolean" ? t.cancelOnUnmount : n.cancelOnUnmount ?? !1, [t == null ? void 0 : t.cancelOnUnmount, n.cancelOnUnmount]), [j, k] = P([]), [M, b] = P(null), D = u(
+  ]), R = q(() => typeof (t == null ? void 0 : t.cancelOnUnmount) == "boolean" ? t.cancelOnUnmount : n.cancelOnUnmount ?? !1, [t == null ? void 0 : t.cancelOnUnmount, n.cancelOnUnmount]), [P, $] = k([]), [j, w] = k(null), D = s(
     (e) => {
       var l;
-      if (!y) return e;
+      if (!p && !R) return e;
       const r = `${e.method}-${e.url}`;
-      a.has(r) && ((l = a.get(r)) == null || l.abort(q));
+      console.log({ key: r });
       const c = new AbortController();
-      return e.signal = c.signal, a.set(r, c), h.current.push(c), e;
+      return console.log({ controller: c }), p && d.has(r) && (console.log("pendingRequests.has(key)"), (l = d.get(r)) == null || l.abort(b)), (p || R) && (console.log("abort"), e.signal = c.signal), p && d.set(r, c), p && console.log("pendingRequests.set"), R && y.current.push(c), e;
     },
-    [a, y]
-  ), m = u(
+    [d, p, R]
+  ), h = s(
     (e) => {
       if (!e) return;
       const r = `${e.method}-${e.url}`;
-      a.delete(r);
+      d.delete(r);
     },
-    [a]
-  ), d = u((e) => {
-    k((r) => {
+    [d]
+  ), m = s((e) => {
+    $((r) => {
       const c = [...r];
       return e ? c.push("") : c.pop(), c;
     });
-  }, []), E = u(
+  }, []), o = s(
     (e) => {
       const r = [
         ...n.beforeRequest,
         ...(t == null ? void 0 : t.beforeRequest) ?? []
       ];
       return r.length ? r.reduce(async (c, l) => {
-        const p = await c;
-        return await l(p) ?? p;
+        const u = await c;
+        return await l(u) ?? u;
       }, Promise.resolve(e)) : e;
     },
     [n.beforeRequest, t == null ? void 0 : t.beforeRequest]
-  ), H = u(
+  ), E = s(
     (e) => {
       const r = [
         ...n.afterResponse,
         ...(t == null ? void 0 : t.afterResponse) ?? []
       ];
       return r.length ? r.reduce(async (c, l) => {
-        const p = await c;
-        return await l(p) ?? p;
+        const u = await c;
+        return await l(u) ?? u;
       }, Promise.resolve(e)) : e;
     },
     [n.afterResponse, t == null ? void 0 : t.afterResponse]
-  ), O = u(
+  ), H = s(
     (e) => {
       const r = [
         ...n.afterError,
@@ -66,45 +66,45 @@ function K(t = null) {
       ) : e;
     },
     [n.afterError, t == null ? void 0 : t.afterError]
-  ), U = u(
+  ), O = s(
     async (e) => {
       const r = D(e);
-      return d(!0), b(null), await E(r);
+      return m(!0), w(null), await o(r);
     },
-    [D, d, E]
-  ), v = u(
+    [D, m, o]
+  ), U = s(
     async (e) => {
-      m(e.config);
-      const r = await H(e);
-      return d(!1), b(null), r;
+      h(e.config);
+      const r = await E(e);
+      return m(!1), w(null), r;
     },
-    [d, H, m]
-  ), A = u(
+    [m, E, h]
+  ), v = s(
     async (e) => {
-      var l;
-      !(((l = e == null ? void 0 : e.config) == null ? void 0 : l.signal.reason) === q) && m(e == null ? void 0 : e.config);
-      const c = await O(e);
-      return d(!1), b(e), Promise.reject(c);
+      var l, u;
+      !(((u = (l = e == null ? void 0 : e.config) == null ? void 0 : l.signal) == null ? void 0 : u.reason) === b) && h(e == null ? void 0 : e.config);
+      const c = await H(e);
+      return m(!1), w(e), Promise.reject(c);
     },
-    [d, O, m]
+    [m, H, h]
   );
-  return $(() => {
-    const e = s.interceptors.request.use(U), r = s.interceptors.response.use(v, A);
+  return A(() => {
+    const e = a.interceptors.request.use(O), r = a.interceptors.response.use(U, v);
     return () => {
-      s.interceptors.request.eject(e), s.interceptors.response.eject(r);
+      a.interceptors.request.eject(e), a.interceptors.response.eject(r);
     };
   }, [
-    s.interceptors.request,
-    s.interceptors.response,
+    a.interceptors.request,
+    a.interceptors.response,
+    O,
     U,
-    v,
-    A
-  ]), $(() => () => {
-    w && (h.current.forEach((e) => {
-      e.abort("Canceled due to component unmount.");
-    }), h.current = []);
-  }, [w]), [s, !!j.length, M];
+    v
+  ]), A(() => () => {
+    R && (y.current.forEach((e) => {
+      e.abort(b);
+    }), y.current = []);
+  }, [R]), [a, !!P.length, j];
 }
 export {
-  K as default
+  J as default
 };

package/package.json

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