@varlet/axle 0.0.23 → 0.0.24

package/es/use.d.ts

@@ -1,11 +1,11 @@
-import { type Ref, type UnwrapRef } from 'vue';
+import { type Ref } from 'vue';
 import { type AxleRequestConfig, createFetchHelper, createModifyHelper } from './instance.js';
 export interface RunOptions<P> {
     url?: string;
     params?: P;
     config?: AxleRequestConfig;
 }
-export type Run<D, P> = (options?: RunOptions<P>) => Promise<UnwrapRef<D>>;
+export type Run<D, P> = (options?: RunOptions<P>) => Promise<D>;
 export interface UseAxleOptions<D = any, R = any, P = Record<string, any>> {
     url: string;
     runner: ReturnType<typeof createFetchHelper> | ReturnType<typeof createModifyHelper>;
@@ -15,16 +15,19 @@ export interface UseAxleOptions<D = any, R = any, P = Record<string, any>> {
     immediate?: boolean;
     onBefore?(): void;
     onAfter?(): void;
-    onTransform?(response: UnwrapRef<R>, prev: UnwrapRef<D>): UnwrapRef<D>;
-    onSuccess?(response: UnwrapRef<R>): void;
+    onTransform?(response: R, prev: D): D;
+    onSuccess?(response: R): void;
     onError?(error: Error): void;
 }
 export type UseAxleReturn<D, P> = [
-    data: Ref<UnwrapRef<D>>,
+    data: Ref<D>,
     run: Run<D, P>,
     extra: {
-        loading: Ref<UnwrapRef<boolean>>;
-        error: Ref<UnwrapRef<Error | undefined>>;
+        uploadProgress: Ref<number>;
+        downloadProgress: Ref<number>;
+        loading: Ref<boolean>;
+        error: Ref<Error | undefined>;
+        abort(): void;
     }
 ];
 export interface CreateUseAxleOptions {

package/es/use.js

@@ -8,12 +8,30 @@ export function createUseAxle(options = {}) {
         const data = ref(initialData);
         const loading = ref(false);
         const error = ref();
+        const downloadProgress = ref(0);
+        const uploadProgress = ref(0);
+        let controller = new AbortController();
+        const abort = () => {
+            controller.abort();
+        };
         const run = (options = {}) => {
             var _a;
+            if (controller.signal.aborted) {
+                controller = new AbortController();
+            }
+            uploadProgress.value = 0;
+            downloadProgress.value = 0;
             const url = (_a = options.url) !== null && _a !== void 0 ? _a : initialUrl;
             onBefore();
             loading.value = true;
-            return runner(url, options.params, options.config)
+            return runner(url, options.params, Object.assign({ signal: controller.signal, onUploadProgress(event) {
+                    var _a;
+                    uploadProgress.value = (_a = event.progress) !== null && _a !== void 0 ? _a : 0;
+                },
+                onDownloadProgress(event) {
+                    var _a;
+                    downloadProgress.value = (_a = event.progress) !== null && _a !== void 0 ? _a : 0;
+                } }, options.config))
                 .then((response) => {
                 data.value = onTransform(response, data.value);
                 error.value = undefined;
@@ -43,6 +61,9 @@ export function createUseAxle(options = {}) {
             {
                 loading,
                 error,
+                uploadProgress,
+                downloadProgress,
+                abort,
             },
         ];
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/axle",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "A useful axios helper",
   "type": "module",
   "main": "es/index.js",
@@ -38,7 +38,7 @@
     "@varlet/cli": "^2.11.8",
     "rimraf": "^5.0.1",
     "typescript": "^5.1.5",
-    "vue": "^3.3.4"
+    "vue": "3.3.4"
   },
   "repository": {
     "type": "git",