@kakadu/components 3.10.0 → 3.10.1

package/build/hooks/use-fetch.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("react"),C=new Map,M=new Map,L=new Map,p=new Map;function R(t,s){let e=L.get(t);return e||(e=new Set,L.set(t,e)),e.add(s),()=>{e==null||e.delete(s),e&&e.size===0&&L.delete(t)}}function I(t,s){M.set(t,{timestamp:Date.now(),response:s});const e=L.get(t);if(e)for(const a of e)a(s)}function G(t,s){let e=p.get(t);return e||(e=new Set,p.set(t,e)),e.add(s),()=>{e==null||e.delete(s),e&&e.size===0&&p.delete(t)}}function U(t){M.delete(t);const s=p.get(t);if(s)for(const e of s)e()}function q(t){const[s,e]=n.useState(!1),[a,v]=n.useState(),[f,d]=n.useState(),g=n.useCallback(async(b,S)=>{try{d(void 0),e(!0);const l=await fetch(b,S),u=t?await t(l):l;return v(u),u}catch(l){const u=l instanceof Error?l:new Error("Unknown error");throw d(u),u}finally{e(!1)}},[t]);return n.useMemo(()=>({isLoading:s,fetch:g,response:a,error:f}),[s,g,a,f])}function k(t){const s=n.useCallback(async e=>{const a=await e.json();return t?t(a):a},[t]);return q(s)}function J(t,s,e,a){const{cacheLifetime:v=1e3*30,shouldFetch:f=!0}=a??{},[d,g]=n.useState(0),[b,S]=n.useState(()=>!!t),[l,u]=n.useState(()=>!!t&&f),o=n.useMemo(()=>t?JSON.stringify({url:t,options:s}):"",[t,s]),w=n.useCallback(()=>{if(!o)return;const c=M.get(o);if(c){if(Date.now()-c.timestamp>v){M.delete(o);return}return c.response}},[o,v]),[F,E]=n.useState(()=>w()),[y,m]=n.useState(),h=n.useMemo(()=>{var c;return((c=s==null?void 0:s.method)==null?void 0:c.toUpperCase())??"GET"},[s])==="GET";n.useEffect(()=>{if(!h)return;let c;const i=()=>{clearTimeout(c),!document.hidden&&(c=setTimeout(()=>{g(r=>r+1)},0))};return document.addEventListener("visibilitychange",i),window.addEventListener("focus",i),()=>{document.removeEventListener("visibilitychange",i),window.removeEventListener("focus",i),clearTimeout(c)}},[h]),n.useEffect(()=>{if(!t||!o){S(!1),E(void 0);return}const c=w();S(!0),c===void 0?(E(void 0),m(void 0)):(E(c),m(void 0));const i=R(o,r=>{E(r),m(void 0)});return()=>{i()}},[t,o,w]),n.useEffect(()=>{if(!t||!o)return;const c=G(o,()=>{g(i=>i+1)});return()=>{c()}},[t,o]),n.useEffect(()=>{if(!t||!o||d<0||!f){u(!1);return}if(h&&w()!==void 0){u(!1);return}let c=!0;m(void 0),u(!0);let i=h&&C.has(o)?C.get(o):void 0;if(!i){const r=fetch(t,s);C.set(o,r),r.then(()=>{C.delete(o)}),i=r}return i.then(async r=>{if(c){const j=e?await e(r):r;h&&I(o,j),E(j),m(void 0)}}).catch(r=>{c&&m(r)}).finally(()=>{c&&u(!1)}),()=>{c=!1}},[t,o,d,f,h,w,s,e]);const T=n.useCallback(()=>{h&&o&&U(o)},[o,h]);return n.useMemo(()=>({isReady:b,isLoading:l,response:F,error:y,purge:T}),[b,l,F,y,T])}function z(t,s,e,a){const v=n.useCallback(async f=>{const d=await f.json();return e?e(d):d},[e]);return J(t,s,v,a)}exports.default=J;exports.useFetcher=q;exports.useJsonFetch=z;exports.useJsonFetcher=k;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("react"),C=new Map,M=new Map,L=new Map,p=new Map;function R(t,s){let e=L.get(t);return e||(e=new Set,L.set(t,e)),e.add(s),()=>{e==null||e.delete(s),e&&e.size===0&&L.delete(t)}}function I(t,s){M.set(t,{timestamp:Date.now(),response:s});const e=L.get(t);if(e)for(const a of e)a(s)}function G(t,s){let e=p.get(t);return e||(e=new Set,p.set(t,e)),e.add(s),()=>{e==null||e.delete(s),e&&e.size===0&&p.delete(t)}}function U(t){M.delete(t);const s=p.get(t);if(s)for(const e of s)e()}function q(t){const[s,e]=n.useState(!1),[a,v]=n.useState(),[f,d]=n.useState(),g=n.useCallback(async(b,S)=>{try{d(void 0),e(!0);const l=await fetch(b,S),u=t?await t(l):l;return v(u),u}catch(l){const u=l instanceof Error?l:new Error("Unknown error");throw d(u),u}finally{e(!1)}},[t]);return n.useMemo(()=>({isLoading:s,fetch:g,response:a,error:f}),[s,g,a,f])}function k(t){const s=n.useCallback(async e=>{const a=await e.json();return t?t(a):a},[t]);return q(s)}function J(t,s,e,a){const{cacheLifetime:v=1e3*30,shouldFetch:f=!0}=a??{},[d,g]=n.useState(0),[b,S]=n.useState(()=>!!t),[l,u]=n.useState(()=>!!t&&f),o=n.useMemo(()=>t?JSON.stringify({url:t,options:s}):"",[t,s]),w=n.useCallback(()=>{if(!o)return;const c=M.get(o);if(c){if(Date.now()-c.timestamp>v){M.delete(o);return}return c.response}},[o,v]),[F,E]=n.useState(()=>w()),[y,m]=n.useState(),h=n.useMemo(()=>{var c;return((c=s==null?void 0:s.method)==null?void 0:c.toUpperCase())??"GET"},[s])==="GET";n.useEffect(()=>{if(!h)return;let c;const i=()=>{clearTimeout(c),!document.hidden&&(c=setTimeout(()=>{g(r=>r+1)},0))};return document.addEventListener("visibilitychange",i),window.addEventListener("focus",i),()=>{document.removeEventListener("visibilitychange",i),window.removeEventListener("focus",i),clearTimeout(c)}},[h]),n.useEffect(()=>{if(!t||!o){S(!1),E(void 0);return}const c=w();S(!0),c===void 0?(E(void 0),m(void 0)):(E(c),m(void 0));const i=R(o,r=>{E(r),m(void 0)});return()=>{i()}},[t,o,w]),n.useEffect(()=>{if(!t||!o)return;const c=G(o,()=>{g(i=>i+1)});return()=>{c()}},[t,o]),n.useEffect(()=>{if(!t||!o||d<0||!f){u(!1);return}if(h&&w()!==void 0){u(!1);return}let c=!0;m(void 0),u(!0);let i=h&&C.has(o)?C.get(o):void 0;if(!i){const r=fetch(t,s);C.set(o,r),r.then(()=>{C.delete(o)}),i=r}return i.then(async r=>{if(c){const j=e?await e(r):r;h&&I(o,j),E(j),m(void 0)}}).catch(r=>{c&&m(r)}).finally(()=>{c&&u(!1)}),()=>{c=!1}},[t,o,d,f,h,w,s,e]);const T=n.useCallback(()=>{h&&o&&U(o)},[o,h]);return n.useMemo(()=>({isReady:b,isLoading:l,response:F,error:y,purge:T}),[b,l,F,y,T])}function z(t,s,e,a){const v=n.useCallback(async f=>{const d=await f.clone().json();return e?e(d):d},[e]);return J(t,s,v,a)}exports.default=J;exports.useFetcher=q;exports.useJsonFetch=z;exports.useJsonFetcher=k;

package/build/hooks/use-fetch.mjs

@@ -27,12 +27,12 @@ function z(t) {
       e();
 }
 function B(t) {
-  const [n, e] = v(!1), [i, m] = v(), [u, f] = v(), g = p(
+  const [n, e] = v(!1), [i, l] = v(), [u, f] = v(), w = p(
     async (L, C) => {
       try {
         f(void 0), e(!0);
         const d = await fetch(L, C), a = t ? await t(d) : d;
-        return m(a), a;
+        return l(a), a;
       } catch (d) {
         const a = d instanceof Error ? d : new Error("Unknown error");
         throw f(a), a;
@@ -43,8 +43,8 @@ function B(t) {
     [t]
   );
   return F(
-    () => ({ isLoading: n, fetch: g, response: i, error: u }),
-    [n, g, i, u]
+    () => ({ isLoading: n, fetch: w, response: i, error: u }),
+    [n, w, i, u]
   );
 }
 function N(t) {
@@ -58,21 +58,21 @@ function N(t) {
   return B(n);
 }
 function D(t, n, e, i) {
-  const { cacheLifetime: m = 1e3 * 30, shouldFetch: u = !0 } = i ?? {}, [f, g] = v(0), [L, C] = v(() => !!t), [d, a] = v(() => !!t && u), s = F(
+  const { cacheLifetime: l = 1e3 * 30, shouldFetch: u = !0 } = i ?? {}, [f, w] = v(0), [L, C] = v(() => !!t), [d, a] = v(() => !!t && u), s = F(
     () => t ? JSON.stringify({ url: t, options: n }) : "",
     [t, n]
-  ), l = p(() => {
+  ), g = p(() => {
     if (!s)
       return;
     const o = T.get(s);
     if (o) {
-      if (Date.now() - o.timestamp > m) {
+      if (Date.now() - o.timestamp > l) {
         T.delete(s);
         return;
       }
       return o.response;
     }
-  }, [s, m]), [j, E] = v(() => l()), [I, w] = v(), h = F(
+  }, [s, l]), [j, E] = v(() => g()), [I, m] = v(), h = F(
     () => {
       var o;
       return ((o = n == null ? void 0 : n.method) == null ? void 0 : o.toUpperCase()) ?? "GET";
@@ -83,32 +83,32 @@ function D(t, n, e, i) {
     if (!h)
       return;
     let o;
-    const c = () => {
+    const r = () => {
       clearTimeout(o), !document.hidden && (o = setTimeout(() => {
-        g((r) => r + 1);
+        w((c) => c + 1);
       }, 0));
     };
-    return document.addEventListener("visibilitychange", c), window.addEventListener("focus", c), () => {
-      document.removeEventListener("visibilitychange", c), window.removeEventListener("focus", c), clearTimeout(o);
+    return document.addEventListener("visibilitychange", r), window.addEventListener("focus", r), () => {
+      document.removeEventListener("visibilitychange", r), window.removeEventListener("focus", r), clearTimeout(o);
     };
   }, [h]), b(() => {
     if (!t || !s) {
       C(!1), E(void 0);
       return;
     }
-    const o = l();
-    C(!0), o === void 0 ? (E(void 0), w(void 0)) : (E(o), w(void 0));
-    const c = G(s, (r) => {
-      E(r), w(void 0);
+    const o = g();
+    C(!0), o === void 0 ? (E(void 0), m(void 0)) : (E(o), m(void 0));
+    const r = G(s, (c) => {
+      E(c), m(void 0);
     });
     return () => {
-      c();
+      r();
     };
-  }, [t, s, l]), b(() => {
+  }, [t, s, g]), b(() => {
     if (!t || !s)
       return;
     const o = U(s, () => {
-      g((c) => c + 1);
+      w((r) => r + 1);
     });
     return () => {
       o();
@@ -118,32 +118,32 @@ function D(t, n, e, i) {
       a(!1);
       return;
     }
-    if (h && l() !== void 0) {
+    if (h && g() !== void 0) {
       a(!1);
       return;
     }
     let o = !0;
-    w(void 0), a(!0);
-    let c = h && y.has(s) ? y.get(s) : void 0;
-    if (!c) {
-      const r = fetch(t, n);
-      y.set(s, r), r.then(() => {
+    m(void 0), a(!0);
+    let r = h && y.has(s) ? y.get(s) : void 0;
+    if (!r) {
+      const c = fetch(t, n);
+      y.set(s, c), c.then(() => {
         y.delete(s);
-      }), c = r;
+      }), r = c;
     }
-    return c.then(async (r) => {
+    return r.then(async (c) => {
       if (o) {
-        const q = e ? await e(r) : r;
-        h && J(s, q), E(q), w(void 0);
+        const q = e ? await e(c) : c;
+        h && J(s, q), E(q), m(void 0);
       }
-    }).catch((r) => {
-      o && w(r);
+    }).catch((c) => {
+      o && m(c);
     }).finally(() => {
       o && a(!1);
     }), () => {
       o = !1;
     };
-  }, [t, s, f, u, h, l, n, e]);
+  }, [t, s, f, u, h, g, n, e]);
   const S = p(() => {
     h && s && z(s);
   }, [s, h]);
@@ -153,14 +153,14 @@ function D(t, n, e, i) {
   );
 }
 function O(t, n, e, i) {
-  const m = p(
+  const l = p(
     async (u) => {
-      const f = await u.json();
+      const f = await u.clone().json();
       return e ? e(f) : f;
     },
     [e]
   );
-  return D(t, n, m, i);
+  return D(t, n, l, i);
 }
 export {
   D as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kakadu/components",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Kakadu components library",
   "license": "MIT",
   "main": "./build/index.js",