@varlet/axle 0.9.4 → 0.10.0

package/README.md

@@ -295,21 +295,27 @@ const axle = createAxle(/** @see https://axios-http.com **/)
 
 const useAxle = createUseAxle({
   axle,
-  // Optional value: Default immediate of the useAxle
-  immediate: true,
+  // Optional value: Default immediate of the useAxle, defaults true
+  immediate: false,
   // Optional value: Default onTransform of the useAxle
   onTransform: (response) => response,
 })
 
-const [users, getUsers, { loading, error, uploadProgress, downloadProgress, abort, resetValue }] = useAxle({
+const [
+  users, 
+  // request runner/invoker
+  getUsers, 
+  // extra properties
+  { loading, error, uploadProgress, downloadProgress, abort, resetValue }
+] = useAxle({
   // Request initial value
   value: [],
   // Request method
   method: 'get',
   // Request url can be a getter function
   url: '/user',
-  // Whether to send the request immediately, defaults false
-  immediate: true,
+  // Whether to send the request immediately, defaults true
+  immediate: false,
   // Whether the value needs to be reset before requesting, defaults false
   resetValue: true,
   // Whether to clone when resetting value, defaults false
@@ -367,13 +373,11 @@ const axle = createAxle(/** @see https://axios-http.com **/)
 const useAxle = createUseAxle({ axle })
 
 const [users, getUsers, { loading: isUsersLoading, downloadProgress: usersDownloadProgress }] = useAxle({
-  value: [],
   method: 'get',
   url: '/user',
 })
 
 const [roles, getRoles, { loading: isRolesLoading, downloadProgress: rolesDownloadProgress }] = useAxle({
-  value: [],
   method: 'get',
   url: '/role',
 })
@@ -406,3 +410,141 @@ function sendAllRequest() {
   <button @click="sendAllRequest">Send All Request</button>
 </template>
 ```
+
+### API Definition Enhancement
+
+`createApi` is supported since `v0.9.0`, which is used to define APIs.
+
+#### Define APIs
+
+```ts
+import { createAxle } from '@varlet/axle'
+import { createUseAxle } from '@varlet/axle/use'
+import { createApi } from '@varlet/axle/api'
+
+const axle = createAxle({
+  baseURL: '/api',
+})
+
+const useAxle = createUseAxle({
+  axle,
+})
+
+const api = createApi(axle, useAxle)
+
+export const apiGetUsers = api<Response<User[]>>('/user', 'get')
+
+export const apiGetUser = api<Response<User>>('/user/:id', 'get')
+
+export const apiCreateUser = api<Response<User>, CreateUser>('/user', 'post')
+
+export const apiUpdateUser = api<Response<User>, UpdateUser>('/user/:id', 'put')
+
+export const apiDeleteUser = api<Response<User>>('/user/:id', 'delete')
+
+export type Response<T> = {
+  data: T
+  code: number
+  message: string
+  success: boolean
+}
+
+export interface User {
+  id: string
+  name: string
+}
+
+export interface CreateUser {
+  name: string
+}
+
+export interface UpdateUser {
+  name: string
+}
+```
+
+#### Invoke APIs
+
+```ts
+const route = useRoute()
+
+const [users, getUsers] = apiGetUsers.use<Response<User[]>>(/** same as useAxle and extends pathParams **/)
+
+const [user, getUser] = apiGetUser.use<Response<User>>({
+  pathParams: () => ({ id: route.params.id }),
+})
+
+async function handleCreate(params: CreateUser) {
+  const { success } = await apiCreateUser.load(params)
+
+  if (success) {
+    getUsers()
+  }
+}
+
+async function handleUpdate(params: UpdateUser, id: string) {
+  const { success } = await apiUpdateUser.load(params, { id })
+
+  if (success) {
+    getUsers()
+  }
+}
+
+async function handleDelete(id: string) {
+  const { success } = await apiDeleteUser.load({}, { id })
+
+  if (success) {
+    getUsers()
+  }
+}
+```
+
+### Runner Enhancement
+
+Since `v0.10.0`, the `runner` will include all the extra properties, so we can further simplify the work.
+
+before:
+
+```html
+<script setup>
+const [users, getUsers, { loading: isUsersLoading }] = useAxle({
+  method: 'get',
+  url: '/user',
+})
+
+const [posts, getPosts, { loading: isPostsLoading }] = useAxle({
+  method: 'get',
+  url: '/post',
+})
+</script>
+
+<template>
+  <span>{{ isUsersLoading ? 'loading...' : users }}</span>
+  <span>{{ isPostsLoading ? 'loading...' : posts }}</span>
+  <button @click="getUsers">Send Request</button>
+  <button @click="getPosts">Send Request</button>
+</template>
+```
+
+after:
+
+```html
+<script setup>
+const [users, getUsers] = useAxle({
+  method: 'get',
+  url: '/user',
+})
+
+const [posts, getPosts] = useAxle({
+  method: 'get',
+  url: '/post',
+})
+</script>
+
+<template>
+  <span>{{ getUsers.loading ? 'loading...' : users }}</span>
+  <span>{{ getPosts.loading ? 'loading...' : posts }}</span>
+  <button @click="getUsers">Send Request</button>
+  <button @click="getPosts">Send Request</button>
+</template>
+```

package/README.zh-CN.md

@@ -295,21 +295,27 @@ const axle = createAxle(/** @see https://axios-http.com **/)
 
 const useAxle = createUseAxle({
   axle,
-  // 可选项: useAxle 的默认 immediate
-  immediate: true,
+  // 可选项: useAxle 的默认 immediate, 默认值: true
+  immediate: false,
   // 可选项: useAxle 的默认 onTransform
   onTransform: (response) => response,
 })
 
-const [users, getUsers, { loading, error, uploadProgress, downloadProgress, abort }] = useAxle({
+const [
+  users, 
+  // 请求触发器
+  getUsers, 
+  // 附加属性
+  { loading, error, uploadProgress, downloadProgress, abort }
+] = useAxle({
   // 请求初始化数据
   value: [],
   // 请求方法
   method: 'get',
   // 请求地址, 可以是 getter 函数
   url: '/user',
-  // 是否立即发送请求, 默认值: false
-  immediate: true,
+  // 是否立即发送请求, 默认值: true
+  immediate: false,
   // 请求前是否需要重置 value, 默认值: false
   resetValue: true,
   // 重置 value 是否对 value 进行拷贝
@@ -367,13 +373,11 @@ const axle = createAxle(/** @see https://axios-http.com **/)
 const useAxle = createUseAxle({ axle })
 
 const [users, getUsers, { loading: isUsersLoading, downloadProgress: usersDownloadProgress }] = useAxle({
-  value: [],
   method: 'get',
   url: '/user',
 })
 
 const [roles, getRoles, { loading: isRolesLoading, downloadProgress: rolesDownloadProgress }] = useAxle({
-  value: [],
   method: 'get',
   url: '/role',
 })
@@ -406,3 +410,141 @@ function sendAllRequest() {
   <button @click="sendAllRequest">发送全部请求</button>
 </template>
 ```
+
+### API 定义增强
+
+从 `0.9.0` 开始支持 `createApi`，以增强 API 定义能力。
+
+#### 定义 API
+
+```ts
+import { createAxle } from '@varlet/axle'
+import { createUseAxle } from '@varlet/axle/use'
+import { createApi } from '@varlet/axle/api'
+
+const axle = createAxle({
+  baseURL: '/api',
+})
+
+const useAxle = createUseAxle({
+  axle,
+})
+
+const api = createApi(axle, useAxle)
+
+export const apiGetUsers = api<Response<User[]>>('/user', 'get')
+
+export const apiGetUser = api<Response<User>>('/user/:id', 'get')
+
+export const apiCreateUser = api<Response<User>, CreateUser>('/user', 'post')
+
+export const apiUpdateUser = api<Response<User>, UpdateUser>('/user/:id', 'put')
+
+export const apiDeleteUser = api<Response<User>>('/user/:id', 'delete')
+
+export type Response<T> = {
+  data: T
+  code: number
+  message: string
+  success: boolean
+}
+
+export interface User {
+  id: string
+  name: string
+}
+
+export interface CreateUser {
+  name: string
+}
+
+export interface UpdateUser {
+  name: string
+}
+```
+
+#### 调用 API
+
+```ts
+const route = useRoute()
+
+const [users, getUsers] = apiGetUsers.use<Response<User[]>>(/** 和 useAxle 一致并且扩展了 pathParams **/)
+
+const [user, getUser] = apiGetUser.use<Response<User>>({
+  pathParams: () => ({ id: route.params.id }),
+})
+
+async function handleCreate(params: CreateUser) {
+  const { success } = await apiCreateUser.load(params)
+
+  if (success) {
+    getUsers()
+  }
+}
+
+async function handleUpdate(params: UpdateUser, id: string) {
+  const { success } = await apiUpdateUser.load(params, { id })
+
+  if (success) {
+    getUsers()
+  }
+}
+
+async function handleDelete(id: string) {
+  const { success } = await apiDeleteUser.load({}, { id })
+
+  if (success) {
+    getUsers()
+  }
+}
+```
+
+### 请求触发器增强
+
+从 `v0.10.0` 开始, 请求触发器将包含附加属性中的全部属性。
+
+增强前:
+
+```html
+<script setup>
+const [users, getUsers, { loading: isUsersLoading }] = useAxle({
+  method: 'get',
+  url: '/user',
+})
+
+const [posts, getPosts, { loading: isPostsLoading }] = useAxle({
+  method: 'get',
+  url: '/post',
+})
+</script>
+
+<template>
+  <span>{{ isUsersLoading ? 'loading...' : users }}</span>
+  <span>{{ isPostsLoading ? 'loading...' : posts }}</span>
+  <button @click="getUsers">Send Request</button>
+  <button @click="getPosts">Send Request</button>
+</template>
+```
+
+增强后:
+
+```html
+<script setup>
+const [users, getUsers] = useAxle({
+  method: 'get',
+  url: '/user',
+})
+
+const [posts, getPosts] = useAxle({
+  method: 'get',
+  url: '/post',
+})
+</script>
+
+<template>
+  <span>{{ getUsers.loading ? 'loading...' : users }}</span>
+  <span>{{ getPosts.loading ? 'loading...' : posts }}</span>
+  <button @click="getUsers">Send Request</button>
+  <button @click="getPosts">Send Request</button>
+</template>
+```

package/lib/index.cjs

@@ -47,11 +47,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  AxiosError: () => import_axios2.AxiosError,
   createAxle: () => createAxle,
   createFetchRunner: () => createFetchRunner,
   createMatcher: () => createMatcher,
   createModifyRunner: () => createModifyRunner,
   download: () => download,
+  isAxiosError: () => import_axios2.isAxiosError,
   matchPattern: () => matchPattern,
   requestHeadersInterceptor: () => requestHeadersInterceptor,
   requestMd5Interceptor: () => requestMd5Interceptor,
@@ -86,6 +88,7 @@ function objectToFormData(object) {
 }
 
 // src/instance.ts
+var import_axios2 = require("axios");
 function createFetchRunner(service, method, responseType) {
   return function(url, params, config) {
     return service[method](url, __spreadValues({
@@ -207,7 +210,7 @@ function createMatcher(include, exclude) {
 
 // src/helper.ts
 var import_rattail = require("rattail");
-var import_axios2 = require("axios");
+var import_axios3 = require("axios");
 function withResponse(promise) {
   return new Promise((resolve, reject) => {
     promise.then((response) => {
@@ -216,7 +219,7 @@ function withResponse(promise) {
         errorResponse: void 0
       });
     }).catch((error) => {
-      if ((0, import_axios2.isAxiosError)(error)) {
+      if ((0, import_axios3.isAxiosError)(error)) {
         resolve({
           response: void 0,
           errorResponse: error.response
@@ -264,7 +267,7 @@ function requestHeadersInterceptor(options = {}) {
 }
 
 // src/interceptors/requestMockInterceptor.ts
-var import_axios3 = require("axios");
+var import_axios4 = require("axios");
 var import_minimatch2 = require("minimatch");
 function settle(response, resolve, reject, delay = 0) {
   if (delay > 0) {
@@ -276,7 +279,7 @@ function settle(response, resolve, reject, delay = 0) {
   if (!response.config.validateStatus || response.config.validateStatus(response.status)) {
     resolve(response);
   } else {
-    reject(new import_axios3.AxiosError(`Request failed with status code ${response.status}`, void 0, response.config, response));
+    reject(new import_axios4.AxiosError(`Request failed with status code ${response.status}`, void 0, response.config, response));
   }
 }
 function requestMockInterceptor(options = {}) {
@@ -361,14 +364,14 @@ function responseTimeoutInterceptor(options = {}) {
 }
 
 // src/interceptors/responseRetryInterceptor.ts
-var import_axios4 = __toESM(require("axios"), 1);
+var import_axios5 = __toESM(require("axios"), 1);
 function responseRetryInterceptor(options) {
   return {
     onFulfilled: (response) => response,
     async onRejected(error) {
       var _a, _b, _c;
       const matcher = createMatcher(options.include, options.exclude);
-      if (!matcher((_a = error.config.method) != null ? _a : "", (_b = error.config.url) != null ? _b : "", (_c = error == null ? void 0 : error.response) == null ? void 0 : _c.status) || (0, import_axios4.isCancel)(error)) {
+      if (!matcher((_a = error.config.method) != null ? _a : "", (_b = error.config.url) != null ? _b : "", (_c = error == null ? void 0 : error.response) == null ? void 0 : _c.status) || (0, import_axios5.isCancel)(error)) {
         return Promise.reject(error);
       }
       const { count = 1 } = options;
@@ -376,7 +379,7 @@ function responseRetryInterceptor(options) {
       async function retry() {
         try {
           retryCount++;
-          return await import_axios4.default.create()(error.config);
+          return await import_axios5.default.create()(error.config);
         } catch (error2) {
           if (retryCount === count) {
             return Promise.reject(error2);
@@ -487,11 +490,13 @@ function requestMd5Interceptor(options = {}) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AxiosError,
   createAxle,
   createFetchRunner,
   createMatcher,
   createModifyRunner,
   download,
+  isAxiosError,
   matchPattern,
   requestHeadersInterceptor,
   requestMd5Interceptor,

package/lib/index.js

@@ -25,6 +25,7 @@ function objectToFormData(object) {
 }
 
 // src/instance.ts
+import { AxiosError, isAxiosError } from "axios";
 function createFetchRunner(service, method, responseType) {
   return function(url, params, config) {
     return service[method](url, __spreadValues({
@@ -425,11 +426,13 @@ function requestMd5Interceptor(options = {}) {
   };
 }
 export {
+  AxiosError,
   createAxle,
   createFetchRunner,
   createMatcher,
   createModifyRunner,
   download,
+  isAxiosError,
   matchPattern,
   requestHeadersInterceptor,
   requestMd5Interceptor,

package/lib/use.cjs

@@ -124,58 +124,67 @@ function createUseAxle(options) {
       downloadProgress,
       uploadProgress
     };
-    let controller = new AbortController();
-    const resetValue = (options3 = {}) => {
-      var _a, _b;
-      const cloneResetValue = (_b = (_a = options3.cloneResetValue) != null ? _a : initialCloneResetValue) != null ? _b : false;
-      const cloneFn = cloneResetValue === true ? (v) => v == null ? null : JSON.parse(JSON.stringify(v)) : (0, import_rattail.isFunction)(initialCloneResetValue) ? initialCloneResetValue : (v) => v;
-      value.value = cloneFn(initialValue);
+    const extra = {
+      uploadProgress,
+      downloadProgress,
+      loading,
+      error,
+      abort,
+      resetValue
     };
-    const run = async (options3 = {}) => {
-      var _a, _b, _c, _d, _e;
-      if (controller.signal.aborted) {
-        controller = new AbortController();
-      }
-      const resetValueOption = (_b = (_a = options3.resetValue) != null ? _a : initialResetValue) != null ? _b : false;
-      if (resetValueOption === true) {
-        resetValue(options3);
-      }
-      uploadProgress.value = 0;
-      downloadProgress.value = 0;
-      const url = (_c = options3.url) != null ? _c : normalizeValueGetter(initialUrlOrGetter);
-      const params = (_d = options3.params) != null ? _d : normalizeValueGetter(initialParamsOrGetter);
-      const config = (_e = options3.config) != null ? _e : normalizeValueGetter(initialConfigOrGetter);
-      onBefore(refs);
-      loading.value = true;
-      try {
-        const response = await axle[method](url, params, __spreadValues({
-          signal: controller.signal,
-          onUploadProgress(event) {
-            var _a2;
-            uploadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
-          },
-          onDownloadProgress(event) {
-            var _a2;
-            downloadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
-          }
-        }, config));
-        value.value = await onTransform(response, refs);
-        error.value = void 0;
-        onSuccess(response, refs);
-        loading.value = false;
-        onAfter(refs);
-        return response;
-      } catch (responseError) {
-        error.value = responseError;
-        onError(responseError, refs);
-        loading.value = false;
-        onAfter(refs);
-        throw responseError;
+    let controller = new AbortController();
+    const run = Object.assign(
+      async (options3 = {}) => {
+        var _a, _b, _c, _d, _e;
+        if (controller.signal.aborted) {
+          controller = new AbortController();
+        }
+        const resetValueOption = (_b = (_a = options3.resetValue) != null ? _a : initialResetValue) != null ? _b : false;
+        if (resetValueOption === true) {
+          resetValue(options3);
+        }
+        uploadProgress.value = 0;
+        downloadProgress.value = 0;
+        const url = (_c = options3.url) != null ? _c : normalizeValueGetter(initialUrlOrGetter);
+        const params = (_d = options3.params) != null ? _d : normalizeValueGetter(initialParamsOrGetter);
+        const config = (_e = options3.config) != null ? _e : normalizeValueGetter(initialConfigOrGetter);
+        onBefore(refs);
+        loading.value = true;
+        try {
+          const response = await axle[method](url, params, __spreadValues({
+            signal: controller.signal,
+            onUploadProgress(event) {
+              var _a2;
+              uploadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
+            },
+            onDownloadProgress(event) {
+              var _a2;
+              downloadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
+            }
+          }, config));
+          value.value = await onTransform(response, refs);
+          error.value = void 0;
+          onSuccess(response, refs);
+          loading.value = false;
+          onAfter(refs);
+          return response;
+        } catch (responseError) {
+          error.value = responseError;
+          onError(responseError, refs);
+          loading.value = false;
+          onAfter(refs);
+          throw responseError;
+        }
+      },
+      {
+        uploadProgress,
+        downloadProgress,
+        loading,
+        error,
+        abort,
+        resetValue
       }
-    };
-    const abort = () => {
-      controller.abort();
-    };
+    );
     if (immediate) {
       run({
         url: normalizeValueGetter(initialUrlOrGetter),
@@ -183,18 +192,16 @@ function createUseAxle(options) {
         config: normalizeValueGetter(initialConfigOrGetter)
       });
     }
-    return [
-      value,
-      run,
-      {
-        loading,
-        error,
-        uploadProgress,
-        downloadProgress,
-        abort,
-        resetValue
-      }
-    ];
+    function resetValue(options3 = {}) {
+      var _a, _b;
+      const cloneResetValue = (_b = (_a = options3.cloneResetValue) != null ? _a : initialCloneResetValue) != null ? _b : false;
+      const cloneFn = cloneResetValue === true ? (v) => v == null ? null : JSON.parse(JSON.stringify(v)) : (0, import_rattail.isFunction)(initialCloneResetValue) ? initialCloneResetValue : (v) => v;
+      value.value = cloneFn(initialValue);
+    }
+    function abort() {
+      controller.abort();
+    }
+    return [value, run, extra];
   };
   return useAxle;
 }

package/lib/use.d.cts

@@ -15,7 +15,14 @@ interface RunOptions<V, P> {
     resetValue?: boolean;
     cloneResetValue?: boolean | ((value: V) => V);
 }
-type Run<V, R, P> = (options?: RunOptions<V, P>) => Promise<R>;
+type UseAxleExtra<V> = {
+    uploadProgress: Ref<number>;
+    downloadProgress: Ref<number>;
+    loading: Ref<boolean>;
+    error: Ref<Error | undefined>;
+    abort(): void;
+    resetValue(options?: ResetValueOptions<V>): void;
+};
 interface UseAxleRefs<V> {
     value: Ref<V>;
     loading: Ref<boolean>;
@@ -23,6 +30,9 @@ interface UseAxleRefs<V> {
     uploadProgress: Ref<number>;
     downloadProgress: Ref<number>;
 }
+type Run<V, R, P> = {
+    (options?: RunOptions<V, P>): Promise<R>;
+} & UseAxleExtra<V>;
 interface UseAxleOptions<V = any, R = any, P = Record<string, any>> {
     url: string | (() => string);
     method: RunnerMethod;
@@ -41,18 +51,7 @@ interface UseAxleOptions<V = any, R = any, P = Record<string, any>> {
 interface ResetValueOptions<V> {
     cloneResetValue?: boolean | ((value: V) => V);
 }
-type UseAxleInstance<V, R, P> = [
-    value: Ref<V>,
-    run: Run<V, R, P>,
-    extra: {
-        uploadProgress: Ref<number>;
-        downloadProgress: Ref<number>;
-        loading: Ref<boolean>;
-        error: Ref<Error | undefined>;
-        abort(): void;
-        resetValue(options?: ResetValueOptions<V>): void;
-    }
-];
+type UseAxleInstance<V, R, P> = [value: Ref<V>, run: Run<V, R, P>, extra: UseAxleExtra<V>];
 interface CreateUseAxleOptions {
     axle: AxleInstance;
     immediate?: boolean;
@@ -62,4 +61,4 @@ type UseAxle = <V = any, R = any, P = Record<string, any>>(options: UseAxleOptio
 declare function normalizeValueGetter<T>(valueGetter: T | (() => T)): T;
 declare function createUseAxle(options: CreateUseAxleOptions): UseAxle;
 
-export { CreateUseAxleOptions, ResetValueOptions, Run, RunOptions, UseAxle, UseAxleInstance, UseAxleOptions, UseAxleRefs, createUseAxle, normalizeValueGetter, useAverageProgress, useHasLoading, useValues };
+export { CreateUseAxleOptions, ResetValueOptions, Run, RunOptions, UseAxle, UseAxleExtra, UseAxleInstance, UseAxleOptions, UseAxleRefs, createUseAxle, normalizeValueGetter, useAverageProgress, useHasLoading, useValues };

package/lib/use.d.ts

@@ -15,7 +15,14 @@ interface RunOptions<V, P> {
     resetValue?: boolean;
     cloneResetValue?: boolean | ((value: V) => V);
 }
-type Run<V, R, P> = (options?: RunOptions<V, P>) => Promise<R>;
+type UseAxleExtra<V> = {
+    uploadProgress: Ref<number>;
+    downloadProgress: Ref<number>;
+    loading: Ref<boolean>;
+    error: Ref<Error | undefined>;
+    abort(): void;
+    resetValue(options?: ResetValueOptions<V>): void;
+};
 interface UseAxleRefs<V> {
     value: Ref<V>;
     loading: Ref<boolean>;
@@ -23,6 +30,9 @@ interface UseAxleRefs<V> {
     uploadProgress: Ref<number>;
     downloadProgress: Ref<number>;
 }
+type Run<V, R, P> = {
+    (options?: RunOptions<V, P>): Promise<R>;
+} & UseAxleExtra<V>;
 interface UseAxleOptions<V = any, R = any, P = Record<string, any>> {
     url: string | (() => string);
     method: RunnerMethod;
@@ -41,18 +51,7 @@ interface UseAxleOptions<V = any, R = any, P = Record<string, any>> {
 interface ResetValueOptions<V> {
     cloneResetValue?: boolean | ((value: V) => V);
 }
-type UseAxleInstance<V, R, P> = [
-    value: Ref<V>,
-    run: Run<V, R, P>,
-    extra: {
-        uploadProgress: Ref<number>;
-        downloadProgress: Ref<number>;
-        loading: Ref<boolean>;
-        error: Ref<Error | undefined>;
-        abort(): void;
-        resetValue(options?: ResetValueOptions<V>): void;
-    }
-];
+type UseAxleInstance<V, R, P> = [value: Ref<V>, run: Run<V, R, P>, extra: UseAxleExtra<V>];
 interface CreateUseAxleOptions {
     axle: AxleInstance;
     immediate?: boolean;
@@ -62,4 +61,4 @@ type UseAxle = <V = any, R = any, P = Record<string, any>>(options: UseAxleOptio
 declare function normalizeValueGetter<T>(valueGetter: T | (() => T)): T;
 declare function createUseAxle(options: CreateUseAxleOptions): UseAxle;
 
-export { CreateUseAxleOptions, ResetValueOptions, Run, RunOptions, UseAxle, UseAxleInstance, UseAxleOptions, UseAxleRefs, createUseAxle, normalizeValueGetter, useAverageProgress, useHasLoading, useValues };
+export { CreateUseAxleOptions, ResetValueOptions, Run, RunOptions, UseAxle, UseAxleExtra, UseAxleInstance, UseAxleOptions, UseAxleRefs, createUseAxle, normalizeValueGetter, useAverageProgress, useHasLoading, useValues };

package/lib/use.js

@@ -86,58 +86,67 @@ function createUseAxle(options) {
       downloadProgress,
       uploadProgress
     };
-    let controller = new AbortController();
-    const resetValue = (options3 = {}) => {
-      var _a, _b;
-      const cloneResetValue = (_b = (_a = options3.cloneResetValue) != null ? _a : initialCloneResetValue) != null ? _b : false;
-      const cloneFn = cloneResetValue === true ? (v) => v == null ? null : JSON.parse(JSON.stringify(v)) : isFunction(initialCloneResetValue) ? initialCloneResetValue : (v) => v;
-      value.value = cloneFn(initialValue);
+    const extra = {
+      uploadProgress,
+      downloadProgress,
+      loading,
+      error,
+      abort,
+      resetValue
     };
-    const run = async (options3 = {}) => {
-      var _a, _b, _c, _d, _e;
-      if (controller.signal.aborted) {
-        controller = new AbortController();
-      }
-      const resetValueOption = (_b = (_a = options3.resetValue) != null ? _a : initialResetValue) != null ? _b : false;
-      if (resetValueOption === true) {
-        resetValue(options3);
-      }
-      uploadProgress.value = 0;
-      downloadProgress.value = 0;
-      const url = (_c = options3.url) != null ? _c : normalizeValueGetter(initialUrlOrGetter);
-      const params = (_d = options3.params) != null ? _d : normalizeValueGetter(initialParamsOrGetter);
-      const config = (_e = options3.config) != null ? _e : normalizeValueGetter(initialConfigOrGetter);
-      onBefore(refs);
-      loading.value = true;
-      try {
-        const response = await axle[method](url, params, __spreadValues({
-          signal: controller.signal,
-          onUploadProgress(event) {
-            var _a2;
-            uploadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
-          },
-          onDownloadProgress(event) {
-            var _a2;
-            downloadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
-          }
-        }, config));
-        value.value = await onTransform(response, refs);
-        error.value = void 0;
-        onSuccess(response, refs);
-        loading.value = false;
-        onAfter(refs);
-        return response;
-      } catch (responseError) {
-        error.value = responseError;
-        onError(responseError, refs);
-        loading.value = false;
-        onAfter(refs);
-        throw responseError;
+    let controller = new AbortController();
+    const run = Object.assign(
+      async (options3 = {}) => {
+        var _a, _b, _c, _d, _e;
+        if (controller.signal.aborted) {
+          controller = new AbortController();
+        }
+        const resetValueOption = (_b = (_a = options3.resetValue) != null ? _a : initialResetValue) != null ? _b : false;
+        if (resetValueOption === true) {
+          resetValue(options3);
+        }
+        uploadProgress.value = 0;
+        downloadProgress.value = 0;
+        const url = (_c = options3.url) != null ? _c : normalizeValueGetter(initialUrlOrGetter);
+        const params = (_d = options3.params) != null ? _d : normalizeValueGetter(initialParamsOrGetter);
+        const config = (_e = options3.config) != null ? _e : normalizeValueGetter(initialConfigOrGetter);
+        onBefore(refs);
+        loading.value = true;
+        try {
+          const response = await axle[method](url, params, __spreadValues({
+            signal: controller.signal,
+            onUploadProgress(event) {
+              var _a2;
+              uploadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
+            },
+            onDownloadProgress(event) {
+              var _a2;
+              downloadProgress.value = (_a2 = event.progress) != null ? _a2 : 0;
+            }
+          }, config));
+          value.value = await onTransform(response, refs);
+          error.value = void 0;
+          onSuccess(response, refs);
+          loading.value = false;
+          onAfter(refs);
+          return response;
+        } catch (responseError) {
+          error.value = responseError;
+          onError(responseError, refs);
+          loading.value = false;
+          onAfter(refs);
+          throw responseError;
+        }
+      },
+      {
+        uploadProgress,
+        downloadProgress,
+        loading,
+        error,
+        abort,
+        resetValue
       }
-    };
-    const abort = () => {
-      controller.abort();
-    };
+    );
     if (immediate) {
       run({
         url: normalizeValueGetter(initialUrlOrGetter),
@@ -145,18 +154,16 @@ function createUseAxle(options) {
         config: normalizeValueGetter(initialConfigOrGetter)
       });
     }
-    return [
-      value,
-      run,
-      {
-        loading,
-        error,
-        uploadProgress,
-        downloadProgress,
-        abort,
-        resetValue
-      }
-    ];
+    function resetValue(options3 = {}) {
+      var _a, _b;
+      const cloneResetValue = (_b = (_a = options3.cloneResetValue) != null ? _a : initialCloneResetValue) != null ? _b : false;
+      const cloneFn = cloneResetValue === true ? (v) => v == null ? null : JSON.parse(JSON.stringify(v)) : isFunction(initialCloneResetValue) ? initialCloneResetValue : (v) => v;
+      value.value = cloneFn(initialValue);
+    }
+    function abort() {
+      controller.abort();
+    }
+    return [value, run, extra];
   };
   return useAxle;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/axle",
-  "version": "0.9.4",
+  "version": "0.10.0",
   "description": "Progressive request tool based on axios",
   "type": "module",
   "main": "lib/index.cjs",