@zlikemario/helper 1.0.2 → 1.0.3

package/dist/react/useCatchError.d.ts

@@ -15,5 +15,6 @@ declare const useCatchError: <Args extends any[], R, IsThrowError extends boolea
     timeoutError: any;
     isThrowError: IsThrowError;
     onError: (error: unknown, target: MaybeUndefined<string>, ...args: Args) => any;
+    onFinally: (target: MaybeUndefined<string>, ...args: Args) => any;
 }>) => (...args: Args) => Promise<R | (IsThrowError extends true ? never : undefined)>;
 export default useCatchError;

package/dist/react.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("react"),d=require("./utils.cjs"),i=s=>{const e=n.useRef(s);return e.current=s,n.useMemo(()=>Object.freeze({get current(){return e.current}}),[])},m=(s,e)=>{const r=e?.timeout??2e4,o=i({options:{timeout:r,timeoutError:e?.timeoutError?e?.timeoutError:new Error(`${e?.target?`${e?.target} `:""}Timeout of ${r}ms exceeded`),isThrowError:e?.isThrowError??!1,...e},execute:s});return n.useCallback(async(...u)=>{try{return await d.preventTimeout(Promise.resolve(o.current.execute(...u)),{timeout:o.current.options.timeout,timeoutError:o.current.options.timeoutError})}catch(t){if(o.current.options.onError?.(t,o.current.options.target,...u),o.current.options.isThrowError)throw t;return}},[])},E=(s,e)=>{const[r,o]=n.useState(!1),u=n.useRef(0),t=n.useRef(void 0),c=i({options:{isAllowMulticall:!1,...e},execute:s,isLoading:r}),l=a=>{c.current.isLoading=a,o(a)};return[n.useCallback(async(...a)=>{if(c.current.isLoading&&t.current&&!c.current.options.isAllowMulticall)return t.current;l(!0);const f=u.current+=1;return t.current=c.current.execute(...a).finally(()=>{f===u.current&&(t.current=void 0,l(!1))}),t.current},[]),r]},y=(s,e)=>{const r=i({execute:s,options:{...e}}),[o,u]=n.useState(r.current.options.defaultData),t=n.useCallback(()=>{d.tryCatchAsync(r.current.execute(),r.current.options.onError??(()=>r.current.options.defaultData)).then(c=>{u(c)})},[]);return n.useEffect(()=>{t()},[]),[o,t]};exports.useAsyncData=y;exports.useCatchError=m;exports.useLoadingEvent=E;exports.useSyncedRef=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("react"),d=require("./utils.cjs"),i=s=>{const e=o.useRef(s);return e.current=s,o.useMemo(()=>Object.freeze({get current(){return e.current}}),[])},m=(s,e)=>{const n=e?.timeout??2e4,t=i({options:{timeout:n,timeoutError:e?.timeoutError?e?.timeoutError:new Error(`${e?.target?`${e?.target} `:""}Timeout of ${n}ms exceeded`),isThrowError:e?.isThrowError??!1,...e},execute:s});return o.useCallback(async(...u)=>{try{return await d.preventTimeout(Promise.resolve(t.current.execute(...u)),{timeout:t.current.options.timeout,timeoutError:t.current.options.timeoutError})}catch(r){if(t.current.options.onError?.(r,t.current.options.target,...u),t.current.options.isThrowError)throw r;return}finally{t.current.options.onFinally?.(t.current.options.target,...u)}},[])},E=(s,e)=>{const[n,t]=o.useState(!1),u=o.useRef(0),r=o.useRef(void 0),c=i({options:{isAllowMulticall:!1,...e},execute:s,isLoading:n}),l=a=>{c.current.isLoading=a,t(a)};return[o.useCallback(async(...a)=>{if(c.current.isLoading&&r.current&&!c.current.options.isAllowMulticall)return r.current;l(!0);const f=u.current+=1;return r.current=c.current.execute(...a).finally(()=>{f===u.current&&(r.current=void 0,l(!1))}),r.current},[]),n]},y=(s,e)=>{const n=i({execute:s,options:{...e}}),[t,u]=o.useState(n.current.options.defaultData),r=o.useCallback(()=>{d.tryCatchAsync(n.current.execute(),n.current.options.onError??(()=>n.current.options.defaultData)).then(c=>{u(c)})},[]);return o.useEffect(()=>{r()},[]),[t,r]};exports.useAsyncData=y;exports.useCatchError=m;exports.useLoadingEvent=E;exports.useSyncedRef=i;

package/dist/react.js

@@ -1,5 +1,5 @@
 import { useRef as i, useMemo as E, useCallback as a, useState as d, useEffect as p } from "react";
-import { preventTimeout as h, tryCatchAsync as g } from "./utils.js";
+import { preventTimeout as y, tryCatchAsync as h } from "./utils.js";
 const l = (n) => {
   const t = i(n);
   return t.current = n, E(
@@ -11,10 +11,10 @@ const l = (n) => {
     []
   );
 }, L = (n, t) => {
-  const e = t?.timeout ?? 2e4, o = l({
+  const o = t?.timeout ?? 2e4, r = l({
     options: {
-      timeout: e,
-      timeoutError: t?.timeoutError ? t?.timeoutError : new Error(`${t?.target ? `${t?.target} ` : ""}Timeout of ${e}ms exceeded`),
+      timeout: o,
+      timeoutError: t?.timeoutError ? t?.timeoutError : new Error(`${t?.target ? `${t?.target} ` : ""}Timeout of ${o}ms exceeded`),
       isThrowError: t?.isThrowError ?? !1,
       ...t
     },
@@ -22,18 +22,20 @@ const l = (n) => {
   });
   return a(async (...s) => {
     try {
-      return await h(Promise.resolve(o.current.execute(...s)), {
-        timeout: o.current.options.timeout,
-        timeoutError: o.current.options.timeoutError
+      return await y(Promise.resolve(r.current.execute(...s)), {
+        timeout: r.current.options.timeout,
+        timeoutError: r.current.options.timeoutError
       });
-    } catch (r) {
-      if (o.current.options.onError?.(r, o.current.options.target, ...s), o.current.options.isThrowError)
-        throw r;
+    } catch (e) {
+      if (r.current.options.onError?.(e, r.current.options.target, ...s), r.current.options.isThrowError)
+        throw e;
       return;
+    } finally {
+      r.current.options.onFinally?.(r.current.options.target, ...s);
     }
   }, []);
 }, v = (n, t) => {
-  const [e, o] = d(!1), s = i(0), r = i(void 0), u = l({
+  const [o, r] = d(!1), s = i(0), e = i(void 0), u = l({
     options: {
       /**
        * 是否允许函数多次调用，默认: false
@@ -43,34 +45,34 @@ const l = (n) => {
       ...t
     },
     execute: n,
-    isLoading: e
+    isLoading: o
   }), m = (c) => {
-    u.current.isLoading = c, o(c);
+    u.current.isLoading = c, r(c);
   };
   return [
     a(async (...c) => {
-      if (u.current.isLoading && r.current && !u.current.options.isAllowMulticall)
-        return r.current;
+      if (u.current.isLoading && e.current && !u.current.options.isAllowMulticall)
+        return e.current;
       m(!0);
       const f = s.current += 1;
-      return r.current = u.current.execute(...c).finally(() => {
-        f === s.current && (r.current = void 0, m(!1));
-      }), r.current;
+      return e.current = u.current.execute(...c).finally(() => {
+        f === s.current && (e.current = void 0, m(!1));
+      }), e.current;
     }, []),
-    e
+    o
   ];
 }, D = (n, t) => {
-  const e = l({ execute: n, options: { ...t } }), [o, s] = d(e.current.options.defaultData), r = a(() => {
-    g(
-      e.current.execute(),
-      e.current.options.onError ?? (() => e.current.options.defaultData)
+  const o = l({ execute: n, options: { ...t } }), [r, s] = d(o.current.options.defaultData), e = a(() => {
+    h(
+      o.current.execute(),
+      o.current.options.onError ?? (() => o.current.options.defaultData)
     ).then((u) => {
       s(u);
     });
   }, []);
   return p(() => {
-    r();
-  }, []), [o, r];
+    e();
+  }, []), [r, e];
 };
 export {
   D as useAsyncData,

package/dist/vue/useCatchError.d.ts

@@ -15,5 +15,6 @@ declare const useCatchError: <Args extends any[], R, IsThrowError extends boolea
     timeoutError: any;
     isThrowError: IsThrowError;
     onError: (error: unknown, target: MaybeUndefined<string>, ...args: Args) => any;
+    onFinally: (target: MaybeUndefined<string>, ...args: Args) => any;
 }>) => (...args: Args) => Promise<IsThrowError extends true ? R : MaybeUndefined<R>>;
 export default useCatchError;

package/dist/vue.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./utils.cjs"),a=require("vue"),l=(s,t)=>{const u=t?.timeout??2e4,e={timeout:u,timeoutError:t?.timeoutError?t?.timeoutError:new Error(`${t?.target?`${t?.target} `:""}Timeout of ${u}ms exceeded`),isThrowError:t?.isThrowError??!1,...t};return(async(...o)=>{try{return await i.preventTimeout(Promise.resolve(s(...o)),{timeout:e.timeout,timeoutError:e.timeoutError})}catch(r){if(e.onError?.(r,e.target,...o),e.isThrowError)throw r;return}})},m=(s,t)=>{const u={isAllowMulticall:!1,...t},e=a.ref(!1);let o=0,r;return[async(...n)=>{if(e.value&&r&&!u.isAllowMulticall)return r;e.value=!0;const c=o+=1;return r=s(...n).finally(()=>{c===o&&(r=void 0,e.value=!1)}),r},a.computed(()=>e.value)]},d=(s,t)=>{const u=a.toRef(()=>a.unref(t?.defaultData)),e=a.ref(u.value),o=async()=>{await i.tryCatchAsync(s(),t?.onError??(()=>u.value)).then(r=>{e.value=r})};return o(),[a.computed(()=>e.value),o]};exports.useAsyncData=d;exports.useCatchError=l;exports.useLoadingEvent=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("./utils.cjs"),u=require("vue"),c=(s,t)=>{const a=t?.timeout??2e4,e={timeout:a,timeoutError:t?.timeoutError?t?.timeoutError:new Error(`${t?.target?`${t?.target} `:""}Timeout of ${a}ms exceeded`),isThrowError:t?.isThrowError??!1,...t};return(async(...o)=>{try{return await n.preventTimeout(Promise.resolve(s(...o)),{timeout:e.timeout,timeoutError:e.timeoutError})}catch(r){if(e.onError?.(r,e.target,...o),e.isThrowError)throw r;return}finally{e.onFinally?.(e.target,...o)}})},m=(s,t)=>{const a={isAllowMulticall:!1,...t},e=u.ref(!1);let o=0,r;return[async(...i)=>{if(e.value&&r&&!a.isAllowMulticall)return r;e.value=!0;const l=o+=1;return r=s(...i).finally(()=>{l===o&&(r=void 0,e.value=!1)}),r},u.computed(()=>e.value)]},d=(s,t)=>{const a=u.toRef(()=>u.unref(t?.defaultData)),e=u.ref(a.value),o=async()=>{await n.tryCatchAsync(s(),t?.onError??(()=>a.value)).then(r=>{e.value=r})};return o(),[u.computed(()=>e.value),o]};exports.useAsyncData=d;exports.useCatchError=c;exports.useLoadingEvent=m;

package/dist/vue.js

@@ -1,6 +1,6 @@
 import { preventTimeout as c, tryCatchAsync as m } from "./utils.js";
-import { ref as s, computed as i, toRef as f, unref as v } from "vue";
-const h = (u, t) => {
+import { ref as i, computed as l, toRef as f, unref as v } from "vue";
+const w = (u, t) => {
   const a = t?.timeout ?? 2e4, r = {
     timeout: a,
     timeoutError: t?.timeoutError ? t?.timeoutError : new Error(`${t?.target ? `${t?.target} ` : ""}Timeout of ${a}ms exceeded`),
@@ -17,9 +17,11 @@ const h = (u, t) => {
       if (r.onError?.(e, r.target, ...o), r.isThrowError)
         throw e;
       return;
+    } finally {
+      r.onFinally?.(r.target, ...o);
     }
   });
-}, y = (u, t) => {
+}, h = (u, t) => {
   const a = {
     /**
      * 是否允许函数多次调用，默认: false
@@ -27,29 +29,29 @@ const h = (u, t) => {
      */
     isAllowMulticall: !1,
     ...t
-  }, r = s(!1);
+  }, r = i(!1);
   let o = 0, e;
   return [
-    async (...l) => {
+    async (...s) => {
       if (r.value && e && !a.isAllowMulticall) return e;
       r.value = !0;
       const n = o += 1;
-      return e = u(...l).finally(() => {
+      return e = u(...s).finally(() => {
         n === o && (e = void 0, r.value = !1);
       }), e;
     },
-    i(() => r.value)
+    l(() => r.value)
   ];
 }, T = (u, t) => {
-  const a = f(() => v(t?.defaultData)), r = s(a.value), o = async () => {
+  const a = f(() => v(t?.defaultData)), r = i(a.value), o = async () => {
     await m(u(), t?.onError ?? (() => a.value)).then((e) => {
       r.value = e;
     });
   };
-  return o(), [i(() => r.value), o];
+  return o(), [l(() => r.value), o];
 };
 export {
   T as useAsyncData,
-  h as useCatchError,
-  y as useLoadingEvent
+  w as useCatchError,
+  h as useLoadingEvent
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlikemario/helper",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A utility library with number operations and common helper functions",
   "keywords": [
     "utility",