@zlikemario/helper 0.0.12 → 0.0.13

package/dist/number.d.ts

@@ -2,6 +2,7 @@
  * 数字相关工具函数
  */
 import BigNumber from "bignumber.js";
+import type { Numberish, NumberString, MaybeUndefined } from "./types";
 export { BigNumber };
 export default BigNumber;
 /**

package/dist/react/index.d.ts

@@ -1,3 +1,4 @@
 export { default as useCatchError } from "./useCatchError";
 export { default as useLoadingEvent } from "./useLoadingEvent";
 export { default as useSyncedRef } from "./useSyncedRef";
+export { default as useAsyncData } from "./useAsyncData";

package/dist/react/useAsyncData.d.ts

@@ -0,0 +1,6 @@
+import type { MaybeUndefined } from "../types";
+declare const useAsyncData: <R>(getDataFunc: () => Promise<R>, options?: Partial<{
+    defaultData: R;
+    onError: (error: unknown) => any;
+}>) => [MaybeUndefined<R>, () => void];
+export default useAsyncData;

package/dist/react/useCatchError.d.ts

@@ -1,3 +1,4 @@
+import type { MaybePromise, MaybeUndefined } from "../types";
 declare const useCatchError: <Args extends any[], R, IsThrowError extends boolean = false>(execute: (...args: Args) => MaybePromise<R>, options?: Partial<{
     target: string;
     timeout: number;

package/dist/react.cjs

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

package/dist/react.js

@@ -1,67 +1,80 @@
-import { useRef as i, useMemo as f, useCallback as m, useState as E } from "react";
-import { preventTimeout as g } from "./utils.js";
-const l = (o) => {
-  const r = i(o);
-  return r.current = o, f(
+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";
+const l = (n) => {
+  const t = i(n);
+  return t.current = n, E(
     () => Object.freeze({
       get current() {
-        return r.current;
+        return t.current;
       }
     }),
     []
   );
-}, v = (o, r) => {
-  const n = r?.timeout ?? 2e4, e = l({
+}, L = (n, t) => {
+  const e = t?.timeout ?? 2e4, o = l({
     options: {
-      timeout: n,
-      timeoutError: r?.timeoutError ? r?.timeoutError : new Error(`${r?.target ? `${r?.target} ` : ""}Timeout of ${n}ms exceeded`),
-      isThrowError: r?.isThrowError ?? !1,
-      ...r
+      timeout: e,
+      timeoutError: t?.timeoutError ? t?.timeoutError : new Error(`${t?.target ? `${t?.target} ` : ""}Timeout of ${e}ms exceeded`),
+      isThrowError: t?.isThrowError ?? !1,
+      ...t
     },
-    execute: o
+    execute: n
   });
-  return m(async (...u) => {
+  return a(async (...s) => {
     try {
-      return await g(Promise.resolve(e.current.execute(...u)), {
-        timeout: e.current.options.timeout,
-        timeoutError: e.current.options.timeoutError
+      return await h(Promise.resolve(o.current.execute(...s)), {
+        timeout: o.current.options.timeout,
+        timeoutError: o.current.options.timeoutError
       });
-    } catch (t) {
-      if (e.current.options.onError?.(t, e.current.options.target, ...u), e.current.options.isThrowError)
-        throw t;
+    } catch (r) {
+      if (o.current.options.onError?.(r, o.current.options.target, ...s), o.current.options.isThrowError)
+        throw r;
       return;
     }
   }, []);
-}, p = (o, r) => {
-  const [n, e] = E(!1), u = i(0), t = i(void 0), s = l({
+}, v = (n, t) => {
+  const [e, o] = d(!1), s = i(0), r = i(void 0), u = l({
     options: {
       /**
        * 是否允许函数多次调用，默认: false
        * false 情况下，如果再次执行 execute 会引用上一次的 promise 直接返回
        */
       isAllowMulticall: !1,
-      ...r
+      ...t
     },
-    execute: o,
-    isLoading: n
-  }), a = (c) => {
-    s.current.isLoading = c, e(c);
+    execute: n,
+    isLoading: e
+  }), m = (c) => {
+    u.current.isLoading = c, o(c);
   };
   return [
-    m(async (...c) => {
-      if (s.current.isLoading && t.current && !s.current.options.isAllowMulticall)
-        return t.current;
-      a(!0);
-      const d = u.current += 1;
-      return t.current = s.current.execute(...c).finally(() => {
-        d === u.current && (t.current = void 0, a(!1));
-      }), t.current;
+    a(async (...c) => {
+      if (u.current.isLoading && r.current && !u.current.options.isAllowMulticall)
+        return r.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;
     }, []),
-    n
+    e
   ];
+}, 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)
+    ).then((u) => {
+      s(u);
+    });
+  }, []);
+  return p(() => {
+    r();
+  }, []), [o, r];
 };
 export {
-  v as useCatchError,
-  p as useLoadingEvent,
+  D as useAsyncData,
+  L as useCatchError,
+  v as useLoadingEvent,
   l as useSyncedRef
 };

package/dist/types.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 公共类型定义
+ */
+export type IntString = `${number}`;
+export type DecimalsString = `${number}.${number}`;
+export type NumberString = IntString | DecimalsString;
+export type Numberish = NumberString | number | bigint;
+export type MaybeNull<T> = T | null;
+export type MaybeUndefined<T> = T | undefined;
+export type MaybePromise<T> = T | PromiseLike<T>;
+export type Defined<T> = T extends undefined ? never : T;
+export type AnyFn = (...args: any[]) => any;
+export type Noop = () => void;

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
 /**
  * 常用操作的工具函数集合
  */
+import type { MaybeUndefined } from "./types";
 /**
  * 延迟指定的时间间隔（毫秒）
  * @param interval - 延迟的毫秒数，默认 1500ms
@@ -72,7 +73,7 @@ export declare function isEmail(text: string): boolean;
  * @param p - 要执行的 Promise
  * @param catchFn - 可选的错误处理函数
  */
-export declare const tryCatchAsync: <T, F extends ((error: unknown) => any) | undefined = undefined>(p: Promise<T>, catchFn?: F) => Promise<T | (F extends (...args: any) => any ? ReturnType<F> : undefined)>;
+export declare const tryCatchAsync: <T, FR = any, F extends ((error: unknown) => FR) | undefined = undefined>(p: Promise<T>, catchFn?: F) => Promise<T | (F extends Function ? FR : undefined)>;
 /**
  * 执行回调函数或 Promise，并确保在指定的超时时间内完成
  * 如果操作未能及时完成，返回的 Promise 将以超时错误被拒绝

package/dist/vue/index.d.ts

@@ -1,2 +1,3 @@
 export { default as useCatchError } from "./useCatchError";
 export { default as useLoadingEvent } from "./useLoadingEvent";
+export { default as useAsyncData } from "./useAsyncData";

package/dist/vue/useAsyncData.d.ts

@@ -0,0 +1,7 @@
+import { type ComputedRef, type MaybeRef } from "vue";
+import type { MaybeUndefined } from "../types";
+declare const useAsyncData: <R>(getDataFunc: () => Promise<R>, options?: Partial<{
+    defaultData: MaybeRef<R>;
+    onError: (error: unknown) => any;
+}>) => [ComputedRef<MaybeUndefined<R>>, () => void];
+export default useAsyncData;

package/dist/vue/useCatchError.d.ts

@@ -1,3 +1,4 @@
+import type { MaybePromise, MaybeUndefined } from "../types";
 declare const useCatchError: <Args extends any[], R, IsThrowError extends boolean = false>(execute: (...args: Args) => MaybePromise<R>, options?: Partial<{
     target: string;
     timeout: number;

package/dist/vue.cjs

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

package/dist/vue.js

@@ -1,47 +1,55 @@
-import { preventTimeout as a } from "./utils.js";
-import { ref as m, computed as c } from "vue";
-const v = (u, e) => {
-  const i = e?.timeout ?? 2e4, r = {
-    timeout: i,
-    timeoutError: e?.timeoutError ? e?.timeoutError : new Error(`${e?.target ? `${e?.target} ` : ""}Timeout of ${i}ms exceeded`),
-    isThrowError: e?.isThrowError ?? !1,
-    ...e
+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) => {
+  const a = t?.timeout ?? 2e4, r = {
+    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 a(Promise.resolve(u(...o)), {
+      return await c(Promise.resolve(u(...o)), {
         timeout: r.timeout,
         timeoutError: r.timeoutError
       });
-    } catch (t) {
-      if (r.onError?.(t, r.target, ...o), r.isThrowError)
-        throw t;
+    } catch (e) {
+      if (r.onError?.(e, r.target, ...o), r.isThrowError)
+        throw e;
       return;
     }
   });
-}, d = (u, e) => {
-  const i = {
+}, y = (u, t) => {
+  const a = {
     /**
      * 是否允许函数多次调用，默认: false
      * false 情况下，如果再次执行 execute 会引用上一次的 promise 直接返回
      */
     isAllowMulticall: !1,
-    ...e
-  }, r = m(!1);
-  let o = 0, t;
+    ...t
+  }, r = s(!1);
+  let o = 0, e;
   return [
-    async (...s) => {
-      if (r.value && t && !i.isAllowMulticall) return t;
+    async (...l) => {
+      if (r.value && e && !a.isAllowMulticall) return e;
       r.value = !0;
-      const l = o += 1;
-      return t = u(...s).finally(() => {
-        l === o && (t = void 0, r.value = !1);
-      }), t;
+      const n = o += 1;
+      return e = u(...l).finally(() => {
+        n === o && (e = void 0, r.value = !1);
+      }), e;
     },
-    c(() => r.value)
+    i(() => r.value)
   ];
+}, T = (u, t) => {
+  const a = f(() => v(t?.defaultData)), r = s(a.value), o = async () => {
+    await m(u(), t?.onError ?? (() => a.value)).then((e) => {
+      r.value = e;
+    });
+  };
+  return o(), [i(() => r.value), o];
 };
 export {
-  v as useCatchError,
-  d as useLoadingEvent
+  T as useAsyncData,
+  h as useCatchError,
+  y as useLoadingEvent
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlikemario/helper",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "A utility library with number operations and common helper functions",
   "keywords": [
     "utility",
@@ -81,6 +81,9 @@
       "types": "./dist/react.d.ts",
       "import": "./dist/react.js",
       "require": "./dist/react.cjs"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts"
     }
   },
   "packageManager": "yarn@4.9.4+sha512.7b1cb0b62abba6a537b3a2ce00811a843bea02bcf53138581a6ae5b1bf563f734872bd47de49ce32a9ca9dcaff995aa789577ffb16811da7c603dcf69e73750b",