@varlet/axle 0.3.0 → 0.3.1

package/README.md

@@ -250,14 +250,14 @@ Each built-in interceptor supports `include` `exclude` `axiosInterceptorOptions
 
 #### include & exclude
 
-It is used to request filtering to determine what request should apply the interceptor and support specifying the `method` or `glob` syntax. The usage method is as follows.
+It is used to request filtering to determine what request should apply the interceptor and support specifying the `method`、 `glob` syntax or `status` code. The usage method is as follows.
 
 ```ts
 axle.useResponseInterceptor(
   responseRetryInterceptor({ 
     count: 3,
-    include: ['method:put', 'method:post'],
-    exclude: ['/system/**', '/user/addUser']
+    include: ['method:put', 'method:post', 'status:500'],
+    exclude: ['/system/**', '/user/addUser', 'status:400']
   }),
 )
 ```

package/README.zh-CN.md

@@ -250,14 +250,14 @@ axle.useResponseInterceptor(responseRetryInterceptor({ count: 3 }))
 
 #### include & exclude
 
-用于请求过滤，以确定什么请求应该应用该拦截器，支持指定 method 或是 glob 语法，使用方式如下。
+用于请求过滤，以确定什么请求应该应用该拦截器，支持指定 `method`、 `glob` 或者 `status`，使用方式如下。
 
 ```ts
 axle.useResponseInterceptor(
   responseRetryInterceptor({ 
     count: 3,
-    include: ['method:put', 'method:post'],
-    exclude: ['/system/**', '/user/addUser']
+    include: ['method:put', 'method:post', 'status:500'],
+    exclude: ['/system/**', '/user/addUser', 'status:400']
   }),
 )
 ```

package/es/index.d.ts

@@ -2,8 +2,8 @@ import { R as RequestInterceptor, a as ResponseInterceptor } from './instance-8e
 export { e as AxleInstance, A as AxleRequestConfig, b as FetchMethod, F as FetchRunner, I as Interceptor, c as ModifyMethod, M as ModifyRunner, d as RunnerMethod, i as createAxle, f as createFetchRunner, g as createModifyRunner, h as download } from './instance-8e68a761.js';
 import { AxiosInterceptorOptions, AxiosRequestConfig, AxiosResponse } from 'axios';
 
-declare function matchPattern(pattern: string, method: string, url: string): boolean;
-declare function createMatcher(include?: string[], exclude?: string[]): (method: string, url: string) => boolean;
+declare function matchPattern(pattern: string, method: string, url: string, status?: number | null | undefined): boolean;
+declare function createMatcher(include?: string[], exclude?: string[]): (method: string, url: string, status?: number | null | undefined) => boolean;
 
 interface RequestHeadersInterceptorOptions {
     headers?: Record<string, string> | (() => Record<string, string>);

package/es/index.js

@@ -133,22 +133,25 @@ function createAxle(config = {}) {
 
 // src/matcher.ts
 import { minimatch } from "minimatch";
-function matchPattern(pattern, method, url) {
+function matchPattern(pattern, method, url, status) {
+  if (pattern.startsWith("status:")) {
+    return pattern.replace("status:", "").trim() === String(status);
+  }
   return pattern.startsWith("method:") ? pattern.replace("method:", "").trim() === method : minimatch(url != null ? url : "", pattern);
 }
 function createMatcher(include, exclude) {
-  function matcher(method, url) {
+  function matcher(method, url, status) {
     if (!include && !exclude) {
       return true;
     }
-    const isExclude = (exclude != null ? exclude : []).some((pattern) => matchPattern(pattern, method, url));
+    const isExclude = (exclude != null ? exclude : []).some((pattern) => matchPattern(pattern, method, url, status));
     if (isExclude) {
       return false;
     }
     if (!include) {
       return true;
     }
-    const isInclude = (include != null ? include : []).some((pattern) => matchPattern(pattern, method, url));
+    const isInclude = (include != null ? include : []).some((pattern) => matchPattern(pattern, method, url, status));
     return isInclude;
   }
   return matcher;
@@ -241,7 +244,7 @@ function responseBlobInterceptor(options = {}) {
     onFulfilled(response) {
       var _a, _b, _c, _d;
       const matcher = createMatcher(options.include, options.exclude);
-      if (!matcher((_a = response.config.method) != null ? _a : "", (_b = response.config.url) != null ? _b : "")) {
+      if (!matcher((_a = response.config.method) != null ? _a : "", (_b = response.config.url) != null ? _b : "", response.status)) {
         return response;
       }
       if (response.request.responseType === "blob") {
@@ -259,13 +262,13 @@ function responseTimeoutInterceptor(options = {}) {
   return {
     onFulfilled: (response) => response,
     onRejected(error) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const matcher = createMatcher(options.include, options.exclude);
-      if (!matcher((_a = error.config.method) != null ? _a : "", (_b = error.config.url) != null ? _b : "")) {
+      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)) {
         return Promise.reject(error);
       }
       if (error.code === "ECONNABORTED" && error.message.includes("timeout") || error.code === "ETIMEDOUT") {
-        error.code = (_c = options == null ? void 0 : options.normalizeErrorCode) != null ? _c : "TIMEOUT";
+        error.code = (_d = options == null ? void 0 : options.normalizeErrorCode) != null ? _d : "TIMEOUT";
       }
       return Promise.reject(error);
     },
@@ -279,9 +282,9 @@ function responseRetryInterceptor(options) {
   return {
     onFulfilled: (response) => response,
     async onRejected(error) {
-      var _a, _b;
+      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 : "") || 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) || isCancel(error)) {
         return Promise.reject(error);
       }
       const { count = 1 } = options;
@@ -309,7 +312,7 @@ function responseStatusInterceptor(options) {
     onFulfilled: (response) => {
       var _a, _b, _c;
       const matcher = createMatcher(options.include, options.exclude);
-      if (!matcher((_a = response.config.method) != null ? _a : "", (_b = response.config.url) != null ? _b : "")) {
+      if (!matcher((_a = response.config.method) != null ? _a : "", (_b = response.config.url) != null ? _b : "", response.status)) {
         return response;
       }
       const handler = ((_c = options.validStatusHandler) != null ? _c : {})[response.status];
@@ -320,12 +323,12 @@ function responseStatusInterceptor(options) {
       return handlerResponse != null ? handlerResponse : response;
     },
     onRejected: (error) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const matcher = createMatcher(options.include, options.exclude);
-      if (!matcher((_a = error.config.method) != null ? _a : "", (_b = error.config.url) != null ? _b : "")) {
+      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)) {
         return Promise.reject(error);
       }
-      const handler = ((_c = options.invalidStatusHandler) != null ? _c : {})[error.response.status];
+      const handler = ((_d = options.invalidStatusHandler) != null ? _d : {})[error.response.status];
       if (!handler) {
         return Promise.reject(error);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/axle",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Progressive request tool based on axios",
   "type": "module",
   "main": "es/index.js",