@kakadu/components 3.7.2 → 3.7.3

package/build/hooks/use-fetch.d.ts

@@ -15,11 +15,13 @@ type FetchParameters = {
     cacheLifetime?: number;
 };
 export default function useFetch<Type>(url?: string, options?: RequestInit, handler?: (response: Response) => PromiseOrValue<Type | undefined>, parameters?: FetchParameters): {
+    isReady: boolean;
     isLoading: boolean;
     response: Type | undefined;
     error: Error | undefined;
 };
 export declare function useJsonFetch<Type = unknown>(url?: string, options?: RequestInit, handler?: (json: unknown) => PromiseOrValue<Type | undefined>, parameters?: FetchParameters): {
+    isReady: boolean;
     isLoading: boolean;
     response: Type | undefined;
     error: Error | undefined;

package/build/hooks/use-fetch.js

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

package/build/hooks/use-fetch.mjs

@@ -1,144 +1,144 @@
-import { useState as h, useMemo as L, useCallback as b, useEffect as F } from "react";
-const p = /* @__PURE__ */ new Map(), j = /* @__PURE__ */ new Map(), C = /* @__PURE__ */ new Map();
+import { useState as f, useMemo as C, useCallback as F, useEffect as R } from "react";
+const L = /* @__PURE__ */ new Map(), j = /* @__PURE__ */ new Map(), b = /* @__PURE__ */ new Map();
 function q(e, n) {
-  let t = C.get(e);
-  return t || (t = /* @__PURE__ */ new Set(), C.set(e, t)), t.add(n), () => {
-    t == null || t.delete(n), t && t.size === 0 && C.delete(e);
+  let t = b.get(e);
+  return t || (t = /* @__PURE__ */ new Set(), b.set(e, t)), t.add(n), () => {
+    t == null || t.delete(n), t && t.size === 0 && b.delete(e);
   };
 }
-function I(e, n) {
+function J(e, n) {
   j.set(e, { timestamp: Date.now(), response: n });
-  const t = C.get(e);
+  const t = b.get(e);
   if (t)
     for (const r of t)
       r(n);
 }
-function J(e) {
-  const [n, t] = h(!1), [r, v] = h(), [u, d] = h(), l = b(
-    async (m, s) => {
+function S(e) {
+  const [n, t] = f(!1), [r, h] = f(), [d, u] = f(), l = F(
+    async (E, y) => {
       try {
-        d(void 0), t(!0);
-        const c = await fetch(m, s), a = e ? await e(c) : c;
-        return v(a), a;
+        u(void 0), t(!0);
+        const c = await fetch(E, y), s = e ? await e(c) : c;
+        return h(s), s;
       } catch (c) {
-        const a = c instanceof Error ? c : new Error("Unknown error");
-        throw d(a), a;
+        const s = c instanceof Error ? c : new Error("Unknown error");
+        throw u(s), s;
       } finally {
         t(!1);
       }
     },
     [e]
   );
-  return L(
-    () => ({ isLoading: n, fetch: l, response: r, error: u }),
-    [n, l, r, u]
+  return C(
+    () => ({ isLoading: n, fetch: l, response: r, error: d }),
+    [n, l, r, d]
   );
 }
-function T(e) {
-  const n = b(
+function B(e) {
+  const n = F(
     async (t) => {
       const r = await t.json();
       return e ? e(r) : r;
     },
     [e]
   );
-  return J(n);
+  return S(n);
 }
-function R(e, n, t, r) {
-  const { cacheLifetime: v = 1e3 * 60 } = r ?? {}, [u, d] = h(0), [l, m] = h(() => !!e), s = L(
+function T(e, n, t, r) {
+  const { cacheLifetime: h = 1e3 * 60 } = r ?? {}, [d, u] = f(0), [l, E] = f(() => !!e), [y, c] = f(() => !!e), s = C(
     () => e ? JSON.stringify({ url: e, options: n }) : "",
     [e, n]
-  ), c = b(() => {
+  ), m = F(() => {
     if (!s)
       return;
     const o = j.get(s);
     if (o) {
-      if (Date.now() - o.timestamp > v) {
+      if (Date.now() - o.timestamp > h) {
         j.delete(s);
         return;
       }
       return o.response;
     }
-  }, [s, v]), [a, g] = h(() => c()), [G, w] = h(), y = L(
+  }, [s, h]), [G, w] = f(() => m()), [I, v] = f(), p = C(
     () => {
       var o;
       return ((o = n == null ? void 0 : n.method) == null ? void 0 : o.toUpperCase()) ?? "GET";
     },
     [n]
   );
-  return F(() => {
-    if (y !== "GET")
+  return R(() => {
+    if (p !== "GET")
       return;
     const o = () => {
-      document.hidden || d((f) => f + 1);
+      document.hidden || u((a) => a + 1);
     };
     return document.addEventListener("visibilitychange", o), () => {
       document.removeEventListener("visibilitychange", o);
     };
-  }, [y]), F(() => {
+  }, [p]), R(() => {
     if (!e || !s) {
-      g(void 0);
+      E(!1), w(void 0);
       return;
     }
-    const o = c();
-    o === void 0 ? (g(void 0), w(void 0)) : (g(o), w(void 0));
-    const f = q(s, (E) => {
-      g(E), w(void 0);
+    const o = m();
+    E(!0), o === void 0 ? (w(void 0), v(void 0)) : (w(o), v(void 0));
+    const a = q(s, (g) => {
+      w(g), v(void 0);
     });
     return () => {
-      f();
+      a();
     };
-  }, [e, s, c]), F(() => {
+  }, [e, s, m]), R(() => {
     if (!e || !s) {
-      m(!1);
+      c(!1);
       return;
     }
-    if (u < 0)
+    if (d < 0)
       return;
-    const o = y === "GET";
-    if (o && c() !== void 0) {
-      m(!1);
+    const o = p === "GET";
+    if (o && m() !== void 0) {
+      c(!1);
       return;
     }
-    let f = !0;
-    w(void 0), m(!0);
-    let E = o && p.has(s) ? p.get(s) : void 0;
-    if (!E) {
+    let a = !0;
+    v(void 0), c(!0);
+    let g = o && L.has(s) ? L.get(s) : void 0;
+    if (!g) {
       const i = fetch(e, n);
-      p.set(s, i), i.then(() => {
-        p.delete(s);
-      }), E = i;
+      L.set(s, i), i.then(() => {
+        L.delete(s);
+      }), g = i;
     }
-    return E.then(async (i) => {
-      if (f) {
+    return g.then(async (i) => {
+      if (a) {
         const M = t ? await t(i) : i;
-        o && I(s, M), g(M), w(void 0);
+        o && J(s, M), w(M), v(void 0);
       }
     }).catch((i) => {
-      f && w(i);
+      a && v(i);
     }).finally(() => {
-      f && m(!1);
+      a && c(!1);
     }), () => {
-      f = !1;
+      a = !1;
     };
-  }, [e, s, u, y, c, n, t]), L(
-    () => ({ isLoading: l, response: a, error: G }),
-    [l, a, G]
+  }, [e, s, d, p, m, n, t]), C(
+    () => ({ isReady: l, isLoading: y, response: G, error: I }),
+    [l, y, G, I]
   );
 }
-function U(e, n, t, r) {
-  const v = b(
-    async (u) => {
-      const d = await u.json();
-      return t ? t(d) : d;
+function D(e, n, t, r) {
+  const h = F(
+    async (d) => {
+      const u = await d.json();
+      return t ? t(u) : u;
     },
     [t]
   );
-  return R(e, n, v, r);
+  return T(e, n, h, r);
 }
 export {
-  R as default,
-  J as useFetcher,
-  U as useJsonFetch,
-  T as useJsonFetcher
+  T as default,
+  S as useFetcher,
+  D as useJsonFetch,
+  B as useJsonFetcher
 };

package/package.json

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