@varlet/axle 0.0.20 → 0.0.22

package/es/use.d.ts

@@ -14,15 +14,20 @@ export interface UseAxleOptions<D = any, R = any, P = Record<string, any>> {
     config?: AxleRequestConfig;
     immediate?: boolean;
     onBefore?(): void;
-    onSuccess?(response: UnwrapRef<R>, prev: UnwrapRef<D>): UnwrapRef<D>;
+    onAfter?(): void;
+    onTransform?(response: UnwrapRef<R>, prev: UnwrapRef<D>): UnwrapRef<D>;
+    onSuccess?(response: UnwrapRef<R>): void;
     onError?(error: Error, prev: Error | undefined): Error;
 }
-export type UseAxleReturn<D = any, R = any, P = Record<string, any>> = [
-    data: Ref<UnwrapRef<D | R | undefined | null>>,
+export type UseAxleReturn<D, P> = [
+    data: Ref<UnwrapRef<D>>,
     run: Run<D, P>,
-    loading: Ref<UnwrapRef<boolean>>,
     extra: {
+        loading: Ref<UnwrapRef<boolean>>;
         error: Ref<UnwrapRef<Error | undefined>>;
     }
 ];
-export declare function createUseAxle(): <D = any, R = any, P = Record<string, any>>(options: UseAxleOptions<D, R, P>) => UseAxleReturn<D, R, P>;
+export interface CreateUseAxleOptions {
+    onTransform?(response: any, prev: any): any;
+}
+export declare function createUseAxle(options?: CreateUseAxleOptions): <D = any, R = any, P = Record<string, any>>(options: UseAxleOptions<D, R, P>) => UseAxleReturn<D, P>;

package/es/use.js

@@ -1,7 +1,9 @@
 import { ref } from 'vue';
-export function createUseAxle() {
+export function createUseAxle(options = {}) {
+    const { onTransform: defaultOnTransform } = options;
     const useAxle = (options) => {
-        const { url, runner, immediate, data: initialData, params: initialParams, config: initialConfig, onBefore = () => { }, onSuccess = (response) => response, onError = (error) => error, } = options;
+        var _a;
+        const { url, runner, immediate, data: initialData, params: initialParams, config: initialConfig, onBefore = () => { }, onAfter = () => { }, onTransform = (_a = defaultOnTransform) !== null && _a !== void 0 ? _a : ((response) => response), onSuccess = () => { }, onError = (error) => error, } = options;
         const initialUrl = url;
         const data = ref(initialData);
         const loading = ref(false);
@@ -13,15 +15,18 @@ export function createUseAxle() {
             loading.value = true;
             return runner(url, options.params, options.config)
                 .then((response) => {
-                data.value = onSuccess(response, data.value);
+                data.value = onTransform(response, data.value);
                 error.value = undefined;
-                loading.value = false;
+                onSuccess(response);
                 return data.value;
             })
                 .catch((responseError) => {
                 error.value = onError(responseError, error.value);
-                loading.value = false;
                 throw responseError;
+            })
+                .finally(() => {
+                loading.value = false;
+                onAfter();
             });
         };
         if (immediate) {
@@ -34,8 +39,8 @@ export function createUseAxle() {
         return [
             data,
             run,
-            loading,
             {
+                loading,
                 error,
             },
         ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/axle",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "A useful axios helper",
   "type": "module",
   "main": "es/index.js",