@aiszlab/relax 2.1.3-beta.0 → 2.1.3-beta.1

package/dist/hooks/use-request.cjs

@@ -17,7 +17,10 @@ var useMounted = require('./use-mounted.cjs');
 var useRequest = function useRequest(request) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _ref$auto = _ref.auto,
-    auto = _ref$auto === void 0 ? false : _ref$auto;
+    auto = _ref$auto === void 0 ? false : _ref$auto,
+    thenCallback = _ref.then,
+    catchCallback = _ref["catch"],
+    finallyCallback = _ref["finally"];
   var _useState = react.useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -32,6 +35,18 @@ var useRequest = function useRequest(request) {
     setLoading = _useState6[1];
   var isMountedRef = react.useRef(false);
   var _request = useEvent.useEvent(request);
+  var _then = useEvent.useEvent(function (_data) {
+    thenCallback === null || thenCallback === void 0 || thenCallback(_data);
+    return _data;
+  });
+  var _catch = useEvent.useEvent(function (error) {
+    catchCallback === null || catchCallback === void 0 || catchCallback(error);
+    setError(error);
+    return null;
+  });
+  var _finally = useEvent.useEvent(function () {
+    finallyCallback === null || finallyCallback === void 0 || finallyCallback();
+  });
   var run = react.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
     var result,
       _args = arguments;
@@ -41,10 +56,7 @@ var useRequest = function useRequest(request) {
           setLoading(true);
           setError(null);
           _context.n = 1;
-          return _request.apply(void 0, _args)["catch"](function (error) {
-            setError(error);
-            return null;
-          });
+          return _request.apply(void 0, _args).then(_then)["catch"](_catch)["finally"](_finally);
         case 1:
           result = _context.v;
           setData(result);

package/dist/hooks/use-request.d.ts

@@ -1,9 +1,24 @@
-type UsingRequest = {
+type UsingRequest<T> = {
     /**
      * @description
      * auto request when component mounts
      */
     auto?: boolean;
+    /**
+     * @description
+     * called when the request succeeds, like Promise.then
+     */
+    then?: (data: T) => void;
+    /**
+     * @description
+     * called when the request fails, like Promise.catch
+     */
+    catch?: (error: Error) => void;
+    /**
+     * @description
+     * called when the request completes (success or failure), like Promise.finally
+     */
+    finally?: () => void;
 };
 type UsedRequest<T> = {
     /**
@@ -34,5 +49,5 @@ type UsedRequest<T> = {
  * wraps an async request function, tracking loading / error / data state.
  * when `auto` is true the request fires automatically on mount.
  */
-export declare const useRequest: <T>(request: (...args: any[]) => Promise<T>, { auto }?: UsingRequest) => UsedRequest<T>;
+export declare const useRequest: <T>(request: (...args: any[]) => Promise<T>, { auto, then: thenCallback, catch: catchCallback, finally: finallyCallback, }?: UsingRequest<T>) => UsedRequest<T>;
 export {};

package/dist/hooks/use-request.mjs

@@ -15,7 +15,10 @@ import { useMounted } from './use-mounted.mjs';
 var useRequest = function useRequest(request) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _ref$auto = _ref.auto,
-    auto = _ref$auto === void 0 ? false : _ref$auto;
+    auto = _ref$auto === void 0 ? false : _ref$auto,
+    thenCallback = _ref.then,
+    catchCallback = _ref["catch"],
+    finallyCallback = _ref["finally"];
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -30,6 +33,18 @@ var useRequest = function useRequest(request) {
     setLoading = _useState6[1];
   var isMountedRef = useRef(false);
   var _request = useEvent(request);
+  var _then = useEvent(function (_data) {
+    thenCallback === null || thenCallback === void 0 || thenCallback(_data);
+    return _data;
+  });
+  var _catch = useEvent(function (error) {
+    catchCallback === null || catchCallback === void 0 || catchCallback(error);
+    setError(error);
+    return null;
+  });
+  var _finally = useEvent(function () {
+    finallyCallback === null || finallyCallback === void 0 || finallyCallback();
+  });
   var run = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
     var result,
       _args = arguments;
@@ -39,10 +54,7 @@ var useRequest = function useRequest(request) {
           setLoading(true);
           setError(null);
           _context.n = 1;
-          return _request.apply(void 0, _args)["catch"](function (error) {
-            setError(error);
-            return null;
-          });
+          return _request.apply(void 0, _args).then(_then)["catch"](_catch)["finally"](_finally);
         case 1:
           result = _context.v;
           setData(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiszlab/relax",
-  "version": "2.1.3-beta.0",
+  "version": "2.1.3-beta.1",
   "description": "react utils collection",
   "exports": {
     ".": {