@jelper/hooks 1.1.2 → 1.2.0

package/es/useAsync.js

@@ -1,16 +1,8 @@
-/**
- * @Author: apathyjade
- * @Date: 2025-03-18 23:44:38
- * @Last Modified by: apathyjade
- * @Last Modified time: 2025-05-29 17:58:54
- */
 import { useEffect, useState } from 'react';
 import useRtCb from './useRtCb';
-import useCreate from './useCreate';
-import useIsUnmounted from './useIsUnmount';
 import useUnmount from './useUnmount';
+import useSafeRunner from './useSafeRunner';
 const defOpt = {
-    immediate: false,
     catchParam: false,
 };
 const useAsync = (asyncFn, opt = Object.assign({}, defOpt)) => {
@@ -19,7 +11,7 @@ const useAsync = (asyncFn, opt = Object.assign({}, defOpt)) => {
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState(undefined);
     const [controller, setController] = useState();
-    const isUnmounted = useIsUnmounted();
+    const safeRunner = useSafeRunner();
     useEffect(() => {
         if (!controller || !opt.onAbort) {
             return;
@@ -32,34 +24,44 @@ const useAsync = (asyncFn, opt = Object.assign({}, defOpt)) => {
     }, [controller]);
     const run = useRtCb((runParam = {}) => {
         const currParam = opt.catchParam ? Object.assign(Object.assign({}, param), runParam) : runParam;
-        setLoading(true);
-        setError(undefined);
         if (controller) {
             controller.abort();
         }
         const abortController = new AbortController();
-        setController(abortController);
+        safeRunner(() => {
+            setLoading(true);
+            setError(undefined);
+            setController(abortController);
+        });
         return asyncFn(currParam, { signal: abortController.signal })
             .then((resData) => {
-            if (isUnmounted() || abortController.signal.aborted)
+            if (abortController.signal.aborted)
                 return;
-            setData(opt.format ? opt.format(resData) : resData);
-            setParam(currParam);
+            safeRunner(() => {
+                setData(opt.format ? opt.format(resData) : resData);
+                setParam(currParam);
+            });
         }, (err) => {
-            if (isUnmounted() || abortController.signal.aborted)
+            if (abortController.signal.aborted)
                 return;
-            setError(err);
+            safeRunner(() => {
+                setError(err);
+            });
         }).finally(() => {
-            if (isUnmounted())
-                return;
-            setLoading(false);
-            setController(undefined);
+            safeRunner(() => {
+                setLoading(false);
+                setController(undefined);
+            });
         });
     });
     const refresh = useRtCb(() => run(param));
-    useCreate(() => {
-        if (opt.immediate) {
-            run(param);
+    const cancel = useRtCb(() => {
+        if (controller) {
+            controller.abort();
+            safeRunner(() => {
+                setController(undefined);
+                setLoading(false);
+            });
         }
     });
     useUnmount(() => {
@@ -67,6 +69,6 @@ const useAsync = (asyncFn, opt = Object.assign({}, defOpt)) => {
             controller.abort();
         }
     });
-    return [data, { run, refresh, loading, error, param, controller }];
+    return [data, { run, refresh, cancel, loading, error, param, controller }];
 };
 export default useAsync;

package/es/useRtRef.js

@@ -4,10 +4,12 @@
  * @Last Modified by: apathyjade
  * @Last Modified time: 2025-05-30 15:05:26
  */
-import { useRef } from 'react';
+import { useEffect, useRef } from 'react';
 const useRtRef = (val) => {
     const ref = useRef(val);
-    ref.current = val;
+    useEffect(() => {
+        ref.current = val;
+    });
     return ref;
 };
 export default useRtRef;

package/lib/useAsync.js

@@ -1,10 +1,4 @@
 "use strict";
-/**
- * @Author: apathyjade
- * @Date: 2025-03-18 23:44:38
- * @Last Modified by: apathyjade
- * @Last Modified time: 2025-05-29 17:58:54
- */
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -22,11 +16,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var useRtCb_1 = __importDefault(require("./useRtCb"));
-var useCreate_1 = __importDefault(require("./useCreate"));
-var useIsUnmount_1 = __importDefault(require("./useIsUnmount"));
 var useUnmount_1 = __importDefault(require("./useUnmount"));
+var useSafeRunner_1 = __importDefault(require("./useSafeRunner"));
 var defOpt = {
-    immediate: false,
     catchParam: false,
 };
 var useAsync = function (asyncFn, opt) {
@@ -36,7 +28,7 @@ var useAsync = function (asyncFn, opt) {
     var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
     var _d = (0, react_1.useState)(undefined), error = _d[0], setError = _d[1];
     var _e = (0, react_1.useState)(), controller = _e[0], setController = _e[1];
-    var isUnmounted = (0, useIsUnmount_1.default)();
+    var safeRunner = (0, useSafeRunner_1.default)();
     (0, react_1.useEffect)(function () {
         if (!controller || !opt.onAbort) {
             return;
@@ -50,34 +42,44 @@ var useAsync = function (asyncFn, opt) {
     var run = (0, useRtCb_1.default)(function (runParam) {
         if (runParam === void 0) { runParam = {}; }
         var currParam = opt.catchParam ? __assign(__assign({}, param), runParam) : runParam;
-        setLoading(true);
-        setError(undefined);
         if (controller) {
             controller.abort();
         }
         var abortController = new AbortController();
-        setController(abortController);
+        safeRunner(function () {
+            setLoading(true);
+            setError(undefined);
+            setController(abortController);
+        });
         return asyncFn(currParam, { signal: abortController.signal })
             .then(function (resData) {
-            if (isUnmounted() || abortController.signal.aborted)
+            if (abortController.signal.aborted)
                 return;
-            setData(opt.format ? opt.format(resData) : resData);
-            setParam(currParam);
+            safeRunner(function () {
+                setData(opt.format ? opt.format(resData) : resData);
+                setParam(currParam);
+            });
         }, function (err) {
-            if (isUnmounted() || abortController.signal.aborted)
+            if (abortController.signal.aborted)
                 return;
-            setError(err);
+            safeRunner(function () {
+                setError(err);
+            });
         }).finally(function () {
-            if (isUnmounted())
-                return;
-            setLoading(false);
-            setController(undefined);
+            safeRunner(function () {
+                setLoading(false);
+                setController(undefined);
+            });
         });
     });
     var refresh = (0, useRtCb_1.default)(function () { return run(param); });
-    (0, useCreate_1.default)(function () {
-        if (opt.immediate) {
-            run(param);
+    var cancel = (0, useRtCb_1.default)(function () {
+        if (controller) {
+            controller.abort();
+            safeRunner(function () {
+                setController(undefined);
+                setLoading(false);
+            });
         }
     });
     (0, useUnmount_1.default)(function () {
@@ -85,6 +87,6 @@ var useAsync = function (asyncFn, opt) {
             controller.abort();
         }
     });
-    return [data, { run: run, refresh: refresh, loading: loading, error: error, param: param, controller: controller }];
+    return [data, { run: run, refresh: refresh, cancel: cancel, loading: loading, error: error, param: param, controller: controller }];
 };
 exports.default = useAsync;

package/lib/useRtRef.js

@@ -9,7 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var useRtRef = function (val) {
     var ref = (0, react_1.useRef)(val);
-    ref.current = val;
+    (0, react_1.useEffect)(function () {
+        ref.current = val;
+    });
     return ref;
 };
 exports.default = useRtRef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jelper/hooks",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "react hooks helper",
   "main": "lib/index.js",
   "module": "es/index.js",

package/types/useAsync.d.ts

@@ -1,13 +1,6 @@
-/**
- * @Author: apathyjade
- * @Date: 2025-03-18 23:44:38
- * @Last Modified by: apathyjade
- * @Last Modified time: 2025-05-29 17:58:54
- */
 type Parameter<T extends (p: any) => any> = Parameters<T>[0];
 interface Opt<T extends (p: any) => any, R> {
     defParam?: Partial<Parameter<T>>;
-    immediate?: boolean;
     format?: (p: ReturnType<T>) => R;
     catchParam?: boolean;
     onAbort?: (this: AbortSignal, ev: Event) => any;
@@ -19,6 +12,7 @@ declare const useAsync: <T extends (p: any, opt?: {
     {
         run: (runParam?: Partial<Parameter<T>>) => Promise<void>;
         refresh: () => Promise<void>;
+        cancel: () => void;
         loading: boolean;
         error?: Error;
         param: Partial<Parameter<T>>;