@varlet/axle 0.2.7 → 0.2.8

package/README.md

@@ -199,59 +199,58 @@ axle.removeHeader('TOKEN')
 
 ## Vue Composition API
 
-Axle provides the usage of Vue Composition API style, which encapsulates the `loading status`, `error status`, `upload and download progress` of the request, `return data`, `error retry`, `lifecycle`, etc., And inherit all the configuration of `axios`.
+Axle provides the usage of Vue Composition API style, which encapsulates the `loading status`, `error status`, `upload and download progress` of the request, `return data`, `lifecycle`, etc., And inherit all the configuration of `axios`.
 
 ```html
 <script setup>
-  import { createAxle } from '@varlet/axle'
-  import { createUseAxle } from '@varlet/axle/use'
-
-  const axle = createAxle(/** @see https://axios-http.com **/)
-  const useAxle = createUseAxle({
-    axle,
-    // Optional value: Default onTransform of the useAxle
-    onTransform: (response) => response,
-  })
-
-  const [users, getUsers, { loading, error, uploadProgress, downloadProgress, abort }] = useAxle({
-    // Request initial value
-    value: [],
-    // Request method
-    method: 'get',
-    // Request url
-    url: '/user',
-    // Whether to send the request immediately, defaults false
-    immediate: true,
-    // The number of retries after a failed request, defaults 0
-    retry: 3,
-    // Whether the value needs to be reset before requesting, defaults false
-    resetValue: true,
-    // Request params, defaults {}
-    // When params is an object, it will be carried when sending the first request (immediate)
-    // When params is a function, it will be carried every time a request is sent.
-    params: { current: 1, pageSize: 10 },
-    // Axios config, see https://axios-http.com
-    config: { headers: {} },
-    // lifecycle
-    onBefore(refs) {
-      const { data, loading, error, uploadProgress, downloadProgress } = refs
-      console.log(data.value, loading.value, error.value, uploadProgress.value, downloadProgress.value)
-      // Do request before
-    },
-    onTransform(response, refs) {
-      // Handle data transform, The transformed data will be the value of users.
-      return response.data
-    },
-    onSuccess(response, refs) {
-      // Do request success
-    },
-    onError(error, refs) {
-      // Do request error
-    },
-    onAfter(refs) {
-      // Do request after
-    },
-  })
+import { createAxle } from '@varlet/axle'
+import { createUseAxle } from '@varlet/axle/use'
+
+const axle = createAxle(/** @see https://axios-http.com **/)
+
+const useAxle = createUseAxle({
+  axle,
+  // Optional value: Default onTransform of the useAxle
+  onTransform: (response) => response,
+})
+
+const [users, getUsers, { loading, error, uploadProgress, downloadProgress, abort }] = useAxle({
+  // Request initial value
+  value: [],
+  // Request method
+  method: 'get',
+  // Request url
+  url: '/user',
+  // Whether to send the request immediately, defaults false
+  immediate: true,
+  // Whether the value needs to be reset before requesting, defaults false
+  resetValue: true,
+  // Request params, defaults {}
+  // When params is an object, it will be carried when sending the first request (immediate)
+  // When params is a function, it will be carried every time a request is sent.
+  params: { current: 1, pageSize: 10 },
+  // Axios config, see https://axios-http.com
+  config: { headers: {} },
+  // lifecycle
+  onBefore(refs) {
+    const { data, loading, error, uploadProgress, downloadProgress } = refs
+    console.log(data.value, loading.value, error.value, uploadProgress.value, downloadProgress.value)
+    // Do request before
+  },
+  onTransform(response, refs) {
+    // Handle data transform, The transformed data will be the value of users.
+    return response.data
+  },
+  onSuccess(response, refs) {
+    // Do request success
+  },
+  onError(error, refs) {
+    // Do request error
+  },
+  onAfter(refs) {
+    // Do request after
+  },
+})
 </script>
 
 <template>
@@ -271,43 +270,44 @@ Axle provides some parallel request processing tools, please refer to the follow
 
 ```html
 <script setup>
-  import { createAxle } from '@varlet/axle'
-  import { createUseAxle, useValues, useAverageProgress, useHasLoading } from '@varlet/axle/use'
-
-  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',
-  })
-
-  // At the end of all requests, loading is false
-  const loading = useHasLoading(isUsersLoading, isRolesLoading)
-  // At the end of all requests, downloadProgress is 1
-  const downloadProgress = useAverageProgress(usersDownloadProgress, rolesDownloadProgress)
-  // Ref<[
-  //   [{ name: 'foo' }, { name: 'bar' }],
-  //   [{ role: 'admin' }, { role: 'user' }]
-  // ]> <-
-  // [
-  //   Ref<[{ name: 'foo' }, { name: 'bar' }]>,
-  //   Ref<[{ role: 'admin' }, { role: 'user' }]>
-  // ]
-  const usersRoles = useValues(users, roles)
-
-  function sendAllRequest() {
-    // parallel
-    getUsers()
-    getRoles()
-  }
+import { createAxle } from '@varlet/axle'
+import { createUseAxle, useValues, useAverageProgress, useHasLoading } from '@varlet/axle/use'
+
+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',
+})
+
+// At the end of all requests, loading is false
+const loading = useHasLoading(isUsersLoading, isRolesLoading)
+// At the end of all requests, downloadProgress is 1
+const downloadProgress = useAverageProgress(usersDownloadProgress, rolesDownloadProgress)
+// Ref<[
+//   [{ name: 'foo' }, { name: 'bar' }],
+//   [{ role: 'admin' }, { role: 'user' }]
+// ]> <-
+// [
+//   Ref<[{ name: 'foo' }, { name: 'bar' }]>,
+//   Ref<[{ role: 'admin' }, { role: 'user' }]>
+// ]
+const usersRoles = useValues(users, roles)
+
+function sendAllRequest() {
+  // parallel
+  getUsers()
+  getRoles()
+}
 </script>
 
 <template>

package/README.zh-CN.md

@@ -199,59 +199,58 @@ axle.removeHeader('TOKEN')
 
 ## Vue 组合式 API
 
-Axle 提供了 Vue Composition API 风格的用法，封装了请求的 `加载状态`, `错误状态`, `请求的上下行进度`，`返回数据`，`错误重试`，`生命周期` 等等，并继承了 `axios` 的所有配置。
+Axle 提供了 Vue Composition API 风格的用法，封装了请求的 `加载状态`, `错误状态`, `请求的上下行进度`，`返回数据`，`生命周期` 等等，并继承了 `axios` 的所有配置。
 
 ```html
 <script setup>
-  import { createAxle } from '@varlet/axle'
-  import { createUseAxle } from '@varlet/axle/use'
-
-  const axle = createAxle(/** @see https://axios-http.com **/)
-  const useAxle = createUseAxle({
-    axle,
-    // 可选项: useAxle 的默认 onTransform
-    onTransform: (response) => response,
-  })
-
-  const [users, getUsers, { loading, error, uploadProgress, downloadProgress, abort }] = useAxle({
-    // 请求初始化数据
-    value: [],
-    // 请求方法
-    method: 'get',
-    // 请求地址
-    url: '/user',
-    // 是否立即发送请求, 默认值: false
-    immediate: true,
-    // 错误重试次数, 默认值: 0
-    retry: 3,
-    // 请求前是否需要重置 value, 默认值: false
-    resetValue: true,
-    // 请求参数, 默认值: {}
-    // 当参数是一个对象时，发送第一个请求（immediate）时将携带它
-    // 当参数是一个函数时，每次发送请求时都会携带它。
-    params: { current: 1, pageSize: 10 },
-    // Axios 配置, see https://axios-http.com
-    config: { headers: {} },
-    // 生命周期
-    onBefore(refs) {
-      const { data, loading, error, uploadProgress, downloadProgress } = refs
-      console.log(data.value, loading.value, error.value, uploadProgress.value, downloadProgress.value)
-      // 处理请求前逻辑
-    },
-    onTransform(response, refs) {
-      // 处理数据转换，转换后的数据将成为 users 的值。
-      return response.data
-    },
-    onSuccess(response, refs) {
-      // 处理请求成功逻辑
-    },
-    onError(error, refs) {
-      // 处理请求错误逻辑
-    },
-    onAfter(refs) {
-      // 处理请求结束逻辑，无论成功失败都会触发。
-    },
-  })
+import { createAxle } from '@varlet/axle'
+import { createUseAxle } from '@varlet/axle/use'
+
+const axle = createAxle(/** @see https://axios-http.com **/)
+
+const useAxle = createUseAxle({
+  axle,
+  // 可选项: useAxle 的默认 onTransform
+  onTransform: (response) => response,
+})
+
+const [users, getUsers, { loading, error, uploadProgress, downloadProgress, abort }] = useAxle({
+  // 请求初始化数据
+  value: [],
+  // 请求方法
+  method: 'get',
+  // 请求地址
+  url: '/user',
+  // 是否立即发送请求, 默认值: false
+  immediate: true,
+  // 请求前是否需要重置 value, 默认值: false
+  resetValue: true,
+  // 请求参数, 默认值: {}
+  // 当参数是一个对象时，发送第一个请求（immediate）时将携带它
+  // 当参数是一个函数时，每次发送请求时都会携带它。
+  params: { current: 1, pageSize: 10 },
+  // Axios 配置, see https://axios-http.com
+  config: { headers: {} },
+  // 生命周期
+  onBefore(refs) {
+    const { data, loading, error, uploadProgress, downloadProgress } = refs
+    console.log(data.value, loading.value, error.value, uploadProgress.value, downloadProgress.value)
+    // 处理请求前逻辑
+  },
+  onTransform(response, refs) {
+    // 处理数据转换，转换后的数据将成为 users 的值。
+    return response.data
+  },
+  onSuccess(response, refs) {
+    // 处理请求成功逻辑
+  },
+  onError(error, refs) {
+    // 处理请求错误逻辑
+  },
+  onAfter(refs) {
+    // 处理请求结束逻辑，无论成功失败都会触发。
+  },
+})
 </script>
 
 <template>
@@ -271,43 +270,44 @@ Axle 提供了一些并行请求处理工具，请参考以下示例。
 
 ```html
 <script setup>
-  import { createAxle } from '@varlet/axle'
-  import { createUseAxle, useValues, useAverageProgress, useHasLoading } from '@varlet/axle/use'
-
-  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',
-  })
-
-  // 所有请求结束时，loading 为 false
-  const loading = useHasLoading(isUsersLoading, isRolesLoading)
-  // 所有请求结束时，downloadProgress 为 1
-  const downloadProgress = useAverageProgress(usersDownloadProgress, rolesDownloadProgress)
-  // Ref<[
-  //   [{ name: 'foo' }, { name: 'bar' }],
-  //   [{ role: 'admin' }, { role: 'user' }]
-  // ]> <-
-  // [
-  //   Ref<[{ name: 'foo' }, { name: 'bar' }]>,
-  //   Ref<[{ role: 'admin' }, { role: 'user' }]>
-  // ]
-  const usersRoles = useValues(users, roles)
-
-  function sendAllRequest() {
-    // parallel
-    getUsers()
-    getRoles()
-  }
+import { createAxle } from '@varlet/axle'
+import { createUseAxle, useValues, useAverageProgress, useHasLoading } from '@varlet/axle/use'
+
+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',
+})
+
+// 所有请求结束时，loading 为 false
+const loading = useHasLoading(isUsersLoading, isRolesLoading)
+// 所有请求结束时，downloadProgress 为 1
+const downloadProgress = useAverageProgress(usersDownloadProgress, rolesDownloadProgress)
+// Ref<[
+//   [{ name: 'foo' }, { name: 'bar' }],
+//   [{ role: 'admin' }, { role: 'user' }]
+// ]> <-
+// [
+//   Ref<[{ name: 'foo' }, { name: 'bar' }]>,
+//   Ref<[{ role: 'admin' }, { role: 'user' }]>
+// ]
+const usersRoles = useValues(users, roles)
+
+function sendAllRequest() {
+  // parallel
+  getUsers()
+  getRoles()
+}
 </script>
 
 <template>

package/es/{chunk-KLNSLHAC.js → chunk-ZSUG26OQ.js}

@@ -1,6 +1,4 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -16,9 +14,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 export {
-  __spreadValues,
-  __spreadProps
+  __spreadValues
 };

package/es/index.d.ts

@@ -4,26 +4,34 @@ import { AxiosInterceptorOptions, AxiosResponse } from 'axios';
 
 interface RequestHeadersInterceptorOptions {
     headers?: Record<string, string> | (() => Record<string, string>);
-    axiosInterceptorOptions?: AxiosInterceptorOptions;
     include?: string[];
     exclude?: string[];
+    axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestHeadersInterceptor(options?: RequestHeadersInterceptorOptions): RequestInterceptor;
 
 interface ResponseBlobInterceptorOptions {
     onResponse?: (response: AxiosResponse<any, any>) => any;
-    axiosInterceptorOptions?: AxiosInterceptorOptions;
     include?: string[];
     exclude?: string[];
+    axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseBlobInterceptor(options?: ResponseBlobInterceptorOptions): ResponseInterceptor;
 
 interface ResponseTimeoutInterceptorOptions {
     normalizeErrorCode?: string;
-    axiosInterceptorOptions?: AxiosInterceptorOptions;
     include?: string[];
     exclude?: string[];
+    axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseTimeoutInterceptor(options?: ResponseTimeoutInterceptorOptions): ResponseInterceptor;
 
-export { RequestHeadersInterceptorOptions, RequestInterceptor, ResponseBlobInterceptorOptions, ResponseInterceptor, ResponseTimeoutInterceptorOptions, requestHeadersInterceptor, responseBlobInterceptor, responseTimeoutInterceptor };
+interface ResponseRetryInterceptorOptions {
+    count?: number;
+    include?: string[];
+    exclude?: string[];
+    axiosInterceptorOptions?: AxiosInterceptorOptions;
+}
+declare function responseRetryInterceptor(options: ResponseRetryInterceptorOptions): ResponseInterceptor;
+
+export { RequestHeadersInterceptorOptions, RequestInterceptor, ResponseBlobInterceptorOptions, ResponseInterceptor, ResponseRetryInterceptorOptions, ResponseTimeoutInterceptorOptions, requestHeadersInterceptor, responseBlobInterceptor, responseRetryInterceptor, responseTimeoutInterceptor };

package/es/index.js

@@ -1,6 +1,6 @@
 import {
   __spreadValues
-} from "./chunk-KLNSLHAC.js";
+} from "./chunk-ZSUG26OQ.js";
 
 // src/instance.ts
 import axios from "axios";
@@ -155,9 +155,7 @@ function requestHeadersInterceptor(options = {}) {
       });
       return config;
     },
-    onRejected(error) {
-      return Promise.reject(error);
-    },
+    onRejected: (error) => Promise.reject(error),
     options: options.axiosInterceptorOptions
   };
 }
@@ -176,9 +174,7 @@ function responseBlobInterceptor(options = {}) {
       }
       return response;
     },
-    onRejected(error) {
-      return Promise.reject(error);
-    },
+    onRejected: (error) => Promise.reject(error),
     options: options.axiosInterceptorOptions
   };
 }
@@ -186,9 +182,7 @@ function responseBlobInterceptor(options = {}) {
 // src/interceptors/responseTimeoutInterceptor.ts
 function responseTimeoutInterceptor(options = {}) {
   return {
-    onFulfilled(response) {
-      return response;
-    },
+    onFulfilled: (response) => response,
     onRejected(error) {
       var _a, _b, _c;
       const matcher = createMatcher(options.include, options.exclude);
@@ -203,6 +197,39 @@ function responseTimeoutInterceptor(options = {}) {
     options: options.axiosInterceptorOptions
   };
 }
+
+// src/interceptors/responseRetryInterceptor.ts
+import axios2, { isCancel } from "axios";
+function responseRetryInterceptor(options) {
+  return {
+    onFulfilled: (response) => response,
+    async onRejected(error) {
+      var _a, _b;
+      const matcher = createMatcher(options.include, options.exclude);
+      if (!matcher((_a = error.config.method) != null ? _a : "", (_b = error.config.url) != null ? _b : "")) {
+        return Promise.reject(error);
+      }
+      const { count = 1 } = options;
+      let retryCount = 0;
+      if (isCancel(error)) {
+        return Promise.reject(error);
+      }
+      async function loop() {
+        try {
+          retryCount++;
+          return await axios2.create()(error.config);
+        } catch (error2) {
+          if (retryCount === count) {
+            return Promise.reject(error2);
+          }
+          return loop();
+        }
+      }
+      return loop();
+    },
+    options: options.axiosInterceptorOptions
+  };
+}
 export {
   createAxle,
   createFetchRunner,
@@ -210,5 +237,6 @@ export {
   download,
   requestHeadersInterceptor,
   responseBlobInterceptor,
+  responseRetryInterceptor,
   responseTimeoutInterceptor
 };

package/es/use.d.ts

@@ -13,7 +13,6 @@ interface RunOptions<P> {
     params?: P;
     config?: AxleRequestConfig;
     resetValue?: boolean;
-    _retryCount?: number;
 }
 type Run<R, P> = (options?: RunOptions<P>) => Promise<R>;
 interface UseAxleRefs<V> {
@@ -28,7 +27,6 @@ interface UseAxleOptions<V = any, R = any, P = Record<string, any>> {
     method: RunnerMethod;
     value?: V;
     params?: P | (() => P);
-    retry?: number;
     resetValue?: boolean;
     config?: AxleRequestConfig;
     immediate?: boolean;

package/es/use.js

@@ -1,7 +1,6 @@
 import {
-  __spreadProps,
   __spreadValues
-} from "./chunk-KLNSLHAC.js";
+} from "./chunk-ZSUG26OQ.js";
 
 // src/use.ts
 import { ref as ref3 } from "vue";
@@ -61,7 +60,6 @@ function createUseAxle(options) {
       resetValue: initialResetValue,
       params: initialParamsOrGetter,
       config: initialConfig,
-      retry = 0,
       onBefore = () => {
       },
       onAfter = () => {
@@ -78,7 +76,6 @@ function createUseAxle(options) {
     const error = ref3();
     const downloadProgress = ref3(0);
     const uploadProgress = ref3(0);
-    const shouldRetry = retry > 0;
     const refs = {
       value,
       loading,
@@ -125,10 +122,6 @@ function createUseAxle(options) {
         onAfter(refs);
         return response;
       } catch (responseError) {
-        const currentRetryCount = options3._retryCount == null ? 0 : options3._retryCount;
-        if (shouldRetry && currentRetryCount < retry) {
-          return run(__spreadProps(__spreadValues({}, options3), { _retryCount: currentRetryCount + 1 }));
-        }
         error.value = responseError;
         onError(responseError, refs);
         loading.value = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/axle",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Progressive request tool based on axios",
   "type": "module",
   "main": "es/index.js",
@@ -41,7 +41,6 @@
   "dependencies": {
     "@varlet/shared": "^2.19.2",
     "axios": "^1.4.0",
-    "micromatch": "^4.0.5",
     "minimatch": "^9.0.3",
     "qs": "^6.11.0"
   },