@jelper/hooks 1.1.0 → 1.1.2

package/es/useAsync.js

@@ -13,11 +13,11 @@ const defOpt = {
     immediate: false,
     catchParam: false,
 };
-const useAsync = (asyncFn, opt = defOpt) => {
-    const [data, setData] = useState();
+const useAsync = (asyncFn, opt = Object.assign({}, defOpt)) => {
+    const [data, setData] = useState(undefined);
     const [param, setParam] = useState(opt.defParam || {});
     const [loading, setLoading] = useState(false);
-    const [error, setError] = useState();
+    const [error, setError] = useState(undefined);
     const [controller, setController] = useState();
     const isUnmounted = useIsUnmounted();
     useEffect(() => {
@@ -30,8 +30,8 @@ const useAsync = (asyncFn, opt = defOpt) => {
             controller.signal.removeEventListener('abort', onAbort);
         };
     }, [controller]);
-    const run = useRtCb((runParam) => {
-        const currParam = opt.catchParam ? Object.assign(Object.assign({}, param), (runParam || {})) : runParam;
+    const run = useRtCb((runParam = {}) => {
+        const currParam = opt.catchParam ? Object.assign(Object.assign({}, param), runParam) : runParam;
         setLoading(true);
         setError(undefined);
         if (controller) {
@@ -45,15 +45,14 @@ const useAsync = (asyncFn, opt = defOpt) => {
                 return;
             setData(opt.format ? opt.format(resData) : resData);
             setParam(currParam);
-            setLoading(false);
         }, (err) => {
             if (isUnmounted() || abortController.signal.aborted)
-                return Promise.reject(err);
+                return;
             setError(err);
-            setLoading(false);
         }).finally(() => {
             if (isUnmounted())
                 return;
+            setLoading(false);
             setController(undefined);
         });
     });

package/es/useDebounce.js

@@ -2,16 +2,16 @@
  * @Author: apathyjade
  * @Date: 2025-03-19 22:55:14
  * @Last Modified by: apathyjade
- * @Last Modified time: 2025-05-29 18:56:32
+ * @Last Modified time: 2025-05-29 18:56:33
  */
-import { debounce } from 'lodash-es';
+import { debounce } from 'lodash';
 import { useMemo } from 'react';
 import useRtCb from './useRtCb';
-const useDebounce = (cb, wait, opts) => {
+const useDebounce = (cb, wait = 200, opts) => {
     const rtCb = useRtCb(cb);
     return useMemo(() => {
         return debounce((...arg) => {
-            rtCb(...arg);
+            return rtCb(...arg);
         }, wait, opts);
     }, [wait, opts]);
 };

package/es/useOption.js

@@ -12,7 +12,7 @@ const useOption = (defOpt = {}) => {
         setOption(initOpt);
     }, [initOpt]);
     const update = useCallback((newOpts) => {
-        setOption((oldOpts) => (Object.assign(Object.assign({}, (oldOpts || {})), (typeof newOpts === 'function' ? newOpts(oldOpts) : newOpts || {}))));
+        setOption((oldOpts) => (Object.assign(Object.assign({}, oldOpts), (typeof newOpts === 'function' ? newOpts(oldOpts) : newOpts))));
     }, []);
     return [option, { setOption, reset, update }];
 };

package/es/useResizeObserver.js

@@ -5,40 +5,37 @@
  * @Last Modified time: 2025-05-30 14:35:56
  */
 import { useCallback, useEffect } from 'react';
-let resizeObserver = null;
-let observeCatch = null;
-function init() {
-    if (resizeObserver) {
-        return;
-    }
+let resizeObserver;
+let observeCatch;
+let init = () => {
     observeCatch = new Map();
-    resizeObserver = new window.ResizeObserver((targets) => {
-        targets === null || targets === void 0 ? void 0 : targets.forEach((item) => {
+    resizeObserver = new window.ResizeObserver((targets = []) => {
+        targets.forEach((item = {}) => {
             var _a;
-            (_a = observeCatch === null || observeCatch === void 0 ? void 0 : observeCatch.get(item === null || item === void 0 ? void 0 : item.target)) === null || _a === void 0 ? void 0 : _a(item);
+            (_a = observeCatch.get(item.target)) === null || _a === void 0 ? void 0 : _a(item);
         });
     });
-}
-;
+    init = null;
+};
 const observe = (target, cb) => {
-    if (!resizeObserver) {
+    if (init) {
         init();
     }
     if (!target) {
         return;
     }
-    observeCatch === null || observeCatch === void 0 ? void 0 : observeCatch.set(target, cb);
-    resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.observe(target);
+    observeCatch.set(target, cb);
+    resizeObserver.observe(target);
 };
 const unobserve = (target) => {
-    if (!resizeObserver) {
+    if (init) {
         init();
     }
     if (!target) {
         return;
     }
-    resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.unobserve(target);
-    observeCatch === null || observeCatch === void 0 ? void 0 : observeCatch.delete(target);
+    resizeObserver.unobserve(target);
+    observeCatch.delete(target);
 };
 export const useResizeObserverHandler = () => {
     return [observe, unobserve];

package/es/useRtCb.js

@@ -6,10 +6,10 @@
  */
 import { useCallback } from 'react';
 import useRtRef from './useRtRef';
-const useRtCb = (cb, deps = []) => {
+const useRtCb = (cb) => {
     const ref = useRtRef(cb);
     return useCallback((...args) => {
         return ref.current(...args);
-    }, deps);
+    }, []);
 };
 export default useRtCb;

package/es/useThrottle.js

@@ -4,14 +4,14 @@
  * @Last Modified by: apathyjade
  * @Last Modified time: 2025-05-30 15:31:34
  */
-import { throttle } from 'lodash-es';
+import { throttle } from 'lodash';
 import { useMemo } from 'react';
 import useRtCb from './useRtCb';
-const useThrottle = (cb, wait, opts) => {
+const useThrottle = (cb, wait = 200, opts) => {
     const rtCb = useRtCb(cb);
     return useMemo(() => {
-        return throttle((...arg) => {
-            rtCb(...arg);
+        return throttle((...args) => {
+            rtCb(...args);
         }, wait, opts);
     }, [wait, opts]);
 };

package/lib/useAsync.js

@@ -30,11 +30,11 @@ var defOpt = {
     catchParam: false,
 };
 var useAsync = function (asyncFn, opt) {
-    if (opt === void 0) { opt = defOpt; }
-    var _a = (0, react_1.useState)(), data = _a[0], setData = _a[1];
+    if (opt === void 0) { opt = __assign({}, defOpt); }
+    var _a = (0, react_1.useState)(undefined), data = _a[0], setData = _a[1];
     var _b = (0, react_1.useState)(opt.defParam || {}), param = _b[0], setParam = _b[1];
     var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
-    var _d = (0, react_1.useState)(), error = _d[0], setError = _d[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)();
     (0, react_1.useEffect)(function () {
@@ -48,7 +48,8 @@ var useAsync = function (asyncFn, opt) {
         };
     }, [controller]);
     var run = (0, useRtCb_1.default)(function (runParam) {
-        var currParam = opt.catchParam ? __assign(__assign({}, param), (runParam || {})) : runParam;
+        if (runParam === void 0) { runParam = {}; }
+        var currParam = opt.catchParam ? __assign(__assign({}, param), runParam) : runParam;
         setLoading(true);
         setError(undefined);
         if (controller) {
@@ -62,15 +63,14 @@ var useAsync = function (asyncFn, opt) {
                 return;
             setData(opt.format ? opt.format(resData) : resData);
             setParam(currParam);
-            setLoading(false);
         }, function (err) {
             if (isUnmounted() || abortController.signal.aborted)
-                return Promise.reject(err);
+                return;
             setError(err);
-            setLoading(false);
         }).finally(function () {
             if (isUnmounted())
                 return;
+            setLoading(false);
             setController(undefined);
         });
     });

package/lib/useDebounce.js

@@ -3,24 +3,25 @@
  * @Author: apathyjade
  * @Date: 2025-03-19 22:55:14
  * @Last Modified by: apathyjade
- * @Last Modified time: 2025-05-29 18:56:32
+ * @Last Modified time: 2025-05-29 18:56:33
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var lodash_es_1 = require("lodash-es");
+var lodash_1 = require("lodash");
 var react_1 = require("react");
 var useRtCb_1 = __importDefault(require("./useRtCb"));
 var useDebounce = function (cb, wait, opts) {
+    if (wait === void 0) { wait = 200; }
     var rtCb = (0, useRtCb_1.default)(cb);
     return (0, react_1.useMemo)(function () {
-        return (0, lodash_es_1.debounce)(function () {
+        return (0, lodash_1.debounce)(function () {
             var arg = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 arg[_i] = arguments[_i];
             }
-            rtCb.apply(void 0, arg);
+            return rtCb.apply(void 0, arg);
         }, wait, opts);
     }, [wait, opts]);
 };

package/lib/useOption.js

@@ -26,7 +26,7 @@ var useOption = function (defOpt) {
         setOption(initOpt);
     }, [initOpt]);
     var update = (0, react_1.useCallback)(function (newOpts) {
-        setOption(function (oldOpts) { return (__assign(__assign({}, (oldOpts || {})), (typeof newOpts === 'function' ? newOpts(oldOpts) : newOpts || {}))); });
+        setOption(function (oldOpts) { return (__assign(__assign({}, oldOpts), (typeof newOpts === 'function' ? newOpts(oldOpts) : newOpts))); });
     }, []);
     return [option, { setOption: setOption, reset: reset, update: update }];
 };

package/lib/useResizeObserver.js

@@ -8,40 +8,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useResizeObserver = exports.useResizeObserverHandler = void 0;
 var react_1 = require("react");
-var resizeObserver = null;
-var observeCatch = null;
-function init() {
-    if (resizeObserver) {
-        return;
-    }
+var resizeObserver;
+var observeCatch;
+var init = function () {
     observeCatch = new Map();
     resizeObserver = new window.ResizeObserver(function (targets) {
-        targets === null || targets === void 0 ? void 0 : targets.forEach(function (item) {
+        if (targets === void 0) { targets = []; }
+        targets.forEach(function (item) {
             var _a;
-            (_a = observeCatch === null || observeCatch === void 0 ? void 0 : observeCatch.get(item === null || item === void 0 ? void 0 : item.target)) === null || _a === void 0 ? void 0 : _a(item);
+            if (item === void 0) { item = {}; }
+            (_a = observeCatch.get(item.target)) === null || _a === void 0 ? void 0 : _a(item);
         });
     });
-}
-;
+    init = null;
+};
 var observe = function (target, cb) {
-    if (!resizeObserver) {
+    if (init) {
         init();
     }
     if (!target) {
         return;
     }
-    observeCatch === null || observeCatch === void 0 ? void 0 : observeCatch.set(target, cb);
-    resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.observe(target);
+    observeCatch.set(target, cb);
+    resizeObserver.observe(target);
 };
 var unobserve = function (target) {
-    if (!resizeObserver) {
+    if (init) {
         init();
     }
     if (!target) {
         return;
     }
-    resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.unobserve(target);
-    observeCatch === null || observeCatch === void 0 ? void 0 : observeCatch.delete(target);
+    resizeObserver.unobserve(target);
+    observeCatch.delete(target);
 };
 var useResizeObserverHandler = function () {
     return [observe, unobserve];

package/lib/useRtCb.js

@@ -11,8 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var useRtRef_1 = __importDefault(require("./useRtRef"));
-var useRtCb = function (cb, deps) {
-    if (deps === void 0) { deps = []; }
+var useRtCb = function (cb) {
     var ref = (0, useRtRef_1.default)(cb);
     return (0, react_1.useCallback)(function () {
         var args = [];
@@ -20,6 +19,6 @@ var useRtCb = function (cb, deps) {
             args[_i] = arguments[_i];
         }
         return ref.current.apply(ref, args);
-    }, deps);
+    }, []);
 };
 exports.default = useRtCb;

package/lib/useThrottle.js

@@ -9,18 +9,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var lodash_es_1 = require("lodash-es");
+var lodash_1 = require("lodash");
 var react_1 = require("react");
 var useRtCb_1 = __importDefault(require("./useRtCb"));
 var useThrottle = function (cb, wait, opts) {
+    if (wait === void 0) { wait = 200; }
     var rtCb = (0, useRtCb_1.default)(cb);
     return (0, react_1.useMemo)(function () {
-        return (0, lodash_es_1.throttle)(function () {
-            var arg = [];
+        return (0, lodash_1.throttle)(function () {
+            var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                arg[_i] = arguments[_i];
+                args[_i] = arguments[_i];
             }
-            rtCb.apply(void 0, arg);
+            rtCb.apply(void 0, args);
         }, wait, opts);
     }, [wait, opts]);
 };

package/package.json

@@ -1,47 +1,56 @@
-{
-	"name": "@jelper/hooks",
-	"version": "1.1.0",
-	"description": "react hooks helper",
-	"main": "lib/index.js",
-	"module": "es/index.js",
-	"types": "types/index.d.ts",
-	"keywords": [
-		"store",
-		"helper"
-	],
-	"files": [
-		"package.json",
-		"README.md",
-		"es/**",
-		"lib/**",
-		"types/**"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"devDependencies": {
-		"@jelper/builder": "1.1.0",
-		"@types/node": "~18.0.0",
-		"@types/react": "~18.2.17",
-		"@types/lodash-es": "~4.17.8",
-		"@jest/globals": "~29.7.0",
-		"@testing-library/react": "~16.2.0",
-		"@testing-library/dom": "~10.4.0",
-		"@jest/environment": "~29.7.0",
-		"jest-environment-jsdom": "~29.7.0",
-		"jsdom": "~26.0.0"
-	},
-	"dependencies": {
-		"react": "~18.2.0",
-		"lodash-es": "~4.17.21"
-	},
-	"author": "apathyjade@outlook.com",
-	"license": "ISC",
-	"scripts": {
-		"serve": "jelper serve",
-		"build": "jelper build",
-		"build:debug": "jelper build --debug",
-		"build:help": "jelper build --help",
-		"test": "jelper test"
-	}
-}
+{
+  "name": "@jelper/hooks",
+  "version": "1.1.2",
+  "description": "react hooks helper",
+  "main": "lib/index.js",
+  "module": "es/index.js",
+	"types": "types/index.d.ts",
+  "scripts": {
+    "serve": "jelper serve",
+    "build": "jelper build",
+    "build:debug": "jelper build --debug",
+    "build:help": "jelper build --help",
+    "test": "jelper test"
+  },
+  "keywords": [
+    "store",
+    "helper"
+  ],
+  "files": [
+    "package.json",
+    "README.md",
+    "es/**",
+    "lib/**",
+    "types/**"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+	"peerDependencies": {
+		"react": ">=19.2.3",
+		"react-dom": ">=19.2.3",
+    "lodash": ">=4.17.21"
+	},
+  "devDependencies": {
+    "@jelper/builder": "workspace:*",
+		"react": "~19.x.x",
+		"react-dom": "~19.x.x",
+    "lodash": "~4.17.21",
+		"typescript": "~5.9.3",
+    "@types/node": "~18.0.0",
+    "@types/lodash": "~4.17.21",
+    "@types/react": "~18.2.17",
+    "@jest/globals": "~29.7.0",
+    "@testing-library/react": "~16.2.0",
+    "@testing-library/dom": "~10.4.0",
+    "@jest/environment": "~29.7.0",
+    "jest-environment-jsdom": "~29.7.0",
+    "jsdom": "~26.0.0"
+  },
+  "author": "apathyjade@outlook.com",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apathyjade/jelper.git"
+  }
+}

package/types/useAsync.d.ts

@@ -6,7 +6,7 @@
  */
 type Parameter<T extends (p: any) => any> = Parameters<T>[0];
 interface Opt<T extends (p: any) => any, R> {
-    defParam?: Parameter<T>;
+    defParam?: Partial<Parameter<T>>;
     immediate?: boolean;
     format?: (p: ReturnType<T>) => R;
     catchParam?: boolean;

package/types/useBoolState.d.ts

@@ -6,6 +6,6 @@
  */
 declare const useBoolState: (value: boolean) => [
     boolean,
-    (val?: boolean) => void
+    (switchValue?: React.SetStateAction<boolean>) => void
 ];
 export default useBoolState;

package/types/useDebounce.d.ts

@@ -2,8 +2,8 @@
  * @Author: apathyjade
  * @Date: 2025-03-19 22:55:14
  * @Last Modified by: apathyjade
- * @Last Modified time: 2025-05-29 18:56:32
+ * @Last Modified time: 2025-05-29 18:56:33
  */
-import { DebounceSettings, DebouncedFunc } from 'lodash-es';
-declare const useDebounce: <T extends (...args: any) => any>(cb: T, wait?: number, opts?: DebounceSettings) => DebouncedFunc<T>;
+import { DebounceSettings, DebouncedFunc } from 'lodash';
+declare const useDebounce: <T extends (...args: any[]) => any>(cb: T, wait?: number, opts?: DebounceSettings) => DebouncedFunc<T>;
 export default useDebounce;

package/types/useInterval.d.ts

@@ -2,5 +2,5 @@ export declare const useIntervalHandler: () => [
     (callback: Function, timeout?: number, ...arg: any[]) => void,
     () => void
 ];
-export declare const useInterval: (callback: Function, timeout?: number, ...arg: any[]) => (() => void);
+export declare const useInterval: (callback: (args: any[]) => any, timeout?: number, ...arg: any[]) => (() => void);
 export default useInterval;

package/types/useResizeObserver.d.ts

@@ -1,3 +1,8 @@
-export declare const useResizeObserverHandler: () => ((target: HTMLElement, cb: (dom: ResizeObserverEntry) => void) => void)[];
+declare const observe: (target: HTMLElement, cb: (dom: ResizeObserverEntry) => void) => void;
+declare const unobserve: (target: HTMLElement) => void;
+export declare const useResizeObserverHandler: () => [
+    typeof observe,
+    typeof unobserve
+];
 export declare const useResizeObserver: <T extends HTMLElement>(domRef: React.RefObject<T>, cb: (entry: ResizeObserverEntry) => void) => () => void;
 export default useResizeObserver;

package/types/useRtCb.d.ts

@@ -4,6 +4,5 @@
  * @Last Modified by: apathyjade
  * @Last Modified time: 2025-03-17 00:22:56
  */
-import { DependencyList } from 'react';
-declare const useRtCb: <T extends Function>(cb: T, deps?: DependencyList) => T;
+declare const useRtCb: <T extends (...args: any[]) => any>(cb: T) => T;
 export default useRtCb;

package/types/useThrottle.d.ts

@@ -4,6 +4,6 @@
  * @Last Modified by: apathyjade
  * @Last Modified time: 2025-05-30 15:31:34
  */
-import { ThrottleSettings, DebouncedFunc } from 'lodash-es';
-declare const useThrottle: <T extends (...args: any) => any>(cb: T, wait?: number, opts?: ThrottleSettings) => DebouncedFunc<T>;
+import { ThrottleSettings, DebouncedFuncLeading } from 'lodash';
+declare const useThrottle: <T extends (...args: any) => any>(cb: T, wait?: number, opts?: ThrottleSettings) => DebouncedFuncLeading<T>;
 export default useThrottle;

package/types/useTimeout.d.ts

@@ -8,5 +8,5 @@ export declare const useTimeoutHandler: () => [
     (callback: Function, timeout?: number, ...arg: any[]) => void,
     () => void
 ];
-export declare const useTimeout: (callback: Function, timeout?: number, ...arg: any[]) => () => void;
+export declare const useTimeout: (callback: (...any: any[]) => any, timeout?: number, ...arg: any[]) => () => void;
 export default useTimeout;