@varlet/axle 0.11.1 → 0.12.0

package/README.md

@@ -297,6 +297,8 @@ Axle provides the usage of Vue Composition API style, which encapsulates the `lo
     onTransform: (response) => response,
   })
 
+  const id = ref('1')
+
   const [
     users,
     // request runner/invoker
@@ -312,6 +314,13 @@ Axle provides the usage of Vue Composition API style, which encapsulates the `lo
     url: '/user',
     // Whether to send the request immediately, defaults true
     immediate: false,
+    // Automatically reload when reactive parameters change
+    // When set to true, watch all parameters (params, config, pathParams)
+    // When set to an object, watch specific parameters:
+    // - params: true - watch params changes
+    // - pathParams: true - watch pathParams changes (for API definitions)
+    // - config: true - watch config changes
+    watch: true,
     // Whether the value needs to be reset before requesting, defaults false
     resetValue: true,
     // Whether to clone when resetting value, defaults false

package/README.zh-CN.md

@@ -297,6 +297,8 @@ Axle 提供了 Vue Composition API 风格的用法，封装了请求的 `加载
     onTransform: (response) => response,
   })
 
+  const id = ref('1')
+
   const [
     users,
     // 请求触发器
@@ -312,6 +314,13 @@ Axle 提供了 Vue Composition API 风格的用法，封装了请求的 `加载
     url: '/user',
     // 是否立即发送请求, 默认值: true
     immediate: false,
+    // 监听响应式参数变化时自动重新加载
+    // 设置为 true 时，监听所有参数变化 (params, config, pathParams)
+    // 设置为对象时，监听指定参数变化：
+    // - params: true - 监听 params 参数变化
+    // - pathParams: true - 监听 pathParams 变化（用于 API 定义）
+    // - config: true - 监听 config 配置变化
+    watch: true,
     // 请求前是否需要重置 value, 默认值: false
     resetValue: true,
     // 重置 value 是否对 value 进行拷贝

package/lib/api.cjs

@@ -1,6 +1,8 @@
 "use strict";
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -17,6 +19,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -56,10 +59,13 @@ function createApi(axle, useAxle) {
       return axle[method](patchUrl(url, pathParams != null ? pathParams : {}), params, config);
     }
     function use(options = {}) {
-      const _a = options, { pathParams = {} } = _a, rest = __objRest(_a, ["pathParams"]);
+      const _a = options, { pathParams = {}, watch: watchOptions } = _a, rest = __objRest(_a, ["pathParams", "watch"]);
+      const enableWatchPathParams = (0, import_rattail.isFunction)(pathParams) && ((watchOptions == null ? void 0 : watchOptions.pathParams) || watchOptions === true);
+      const normalizedWatchOptions = watchOptions === true ? { params: true, config: true, _custom: enableWatchPathParams ? pathParams : void 0 } : watchOptions === false ? { params: false, config: false } : __spreadProps(__spreadValues({ params: false, config: false }, watchOptions), { _custom: enableWatchPathParams ? pathParams : void 0 });
       return useAxle(__spreadValues({
         url: () => patchUrl(url, pathParams),
-        method
+        method,
+        watch: normalizedWatchOptions
       }, rest));
     }
     function patchUrl(url2, pathParams) {

package/lib/api.d.cts

@@ -1,17 +1,28 @@
-import { UseAxleOptions, UseAxle, UseAxleInstance } from './use.cjs';
-import { e as AxleInstance, d as RunnerMethod, A as AxleRequestConfig } from './instance-ab0b388e.js';
-import 'vue';
+import { e as AxleInstance, d as RunnerMethod, A as AxleRequestConfig } from './instance-857fe07c.js';
+import { WatchOptions, UseAxleOptions, UseAxleOptionsWithRunnable, UseAxle, UseAxleInstance } from './use.cjs';
 import 'axios';
+import 'vue';
 
 type ApiPathParams = Record<string, any> | (() => Record<string, any>);
+type ApiWatchOptions = WatchOptions & {
+    pathParams?: boolean;
+};
 type ApiUseOptions<V, R, P, D> = Partial<UseAxleOptions<V, R, P, D>> & {
     pathParams?: ApiPathParams;
+    watch?: ApiWatchOptions;
+};
+type ApiUseOptionsWithRunnable<V, R, P, D> = Partial<Omit<UseAxleOptionsWithRunnable<V, R, P, D>, 'runnable'>> & Pick<UseAxleOptionsWithRunnable<V, R, P, D>, 'runnable'> & {
+    pathParams?: ApiPathParams;
+    watch?: ApiWatchOptions;
 };
 declare function createApi(axle: AxleInstance, useAxle: UseAxle): <R = any, P = Record<string, any>, D = Record<string, any>>(url: string, method: RunnerMethod) => {
     url: string;
-    load: (params?: P | undefined, pathParams?: ApiPathParams, config?: AxleRequestConfig<D> | undefined) => Promise<R>;
-    use: <V = R>(options?: ApiUseOptions<V, R, P, D>) => UseAxleInstance<V, R, P, D>;
+    load: (params?: P | undefined, pathParams?: ApiPathParams, config?: AxleRequestConfig<D, Record<string, any>> | undefined) => Promise<R>;
+    use: {
+        <V = R>(options?: ApiUseOptionsWithRunnable<V, R, P, D> | undefined): UseAxleInstance<V, R | undefined, P, D>;
+        <V_1 = R>(options?: ApiUseOptions<V_1, R, P, D> | undefined): UseAxleInstance<V_1, R, P, D>;
+    };
     patchUrl: (url: string, pathParams: ApiPathParams) => string;
 };
 
-export { ApiPathParams, ApiUseOptions, createApi };
+export { ApiPathParams, ApiUseOptions, ApiUseOptionsWithRunnable, ApiWatchOptions, createApi };

package/lib/api.d.ts

@@ -1,17 +1,28 @@
-import { UseAxleOptions, UseAxle, UseAxleInstance } from './use.js';
-import { e as AxleInstance, d as RunnerMethod, A as AxleRequestConfig } from './instance-ab0b388e.js';
-import 'vue';
+import { e as AxleInstance, d as RunnerMethod, A as AxleRequestConfig } from './instance-857fe07c.js';
+import { WatchOptions, UseAxleOptions, UseAxleOptionsWithRunnable, UseAxle, UseAxleInstance } from './use.js';
 import 'axios';
+import 'vue';
 
 type ApiPathParams = Record<string, any> | (() => Record<string, any>);
+type ApiWatchOptions = WatchOptions & {
+    pathParams?: boolean;
+};
 type ApiUseOptions<V, R, P, D> = Partial<UseAxleOptions<V, R, P, D>> & {
     pathParams?: ApiPathParams;
+    watch?: ApiWatchOptions;
+};
+type ApiUseOptionsWithRunnable<V, R, P, D> = Partial<Omit<UseAxleOptionsWithRunnable<V, R, P, D>, 'runnable'>> & Pick<UseAxleOptionsWithRunnable<V, R, P, D>, 'runnable'> & {
+    pathParams?: ApiPathParams;
+    watch?: ApiWatchOptions;
 };
 declare function createApi(axle: AxleInstance, useAxle: UseAxle): <R = any, P = Record<string, any>, D = Record<string, any>>(url: string, method: RunnerMethod) => {
     url: string;
-    load: (params?: P | undefined, pathParams?: ApiPathParams, config?: AxleRequestConfig<D> | undefined) => Promise<R>;
-    use: <V = R>(options?: ApiUseOptions<V, R, P, D>) => UseAxleInstance<V, R, P, D>;
+    load: (params?: P | undefined, pathParams?: ApiPathParams, config?: AxleRequestConfig<D, Record<string, any>> | undefined) => Promise<R>;
+    use: {
+        <V = R>(options?: ApiUseOptionsWithRunnable<V, R, P, D> | undefined): UseAxleInstance<V, R | undefined, P, D>;
+        <V_1 = R>(options?: ApiUseOptions<V_1, R, P, D> | undefined): UseAxleInstance<V_1, R, P, D>;
+    };
     patchUrl: (url: string, pathParams: ApiPathParams) => string;
 };
 
-export { ApiPathParams, ApiUseOptions, createApi };
+export { ApiPathParams, ApiUseOptions, ApiUseOptionsWithRunnable, ApiWatchOptions, createApi };

package/lib/api.js

@@ -1,5 +1,6 @@
 import {
   __objRest,
+  __spreadProps,
   __spreadValues
 } from "./chunk-G2ADBYYC.js";
 
@@ -11,10 +12,13 @@ function createApi(axle, useAxle) {
       return axle[method](patchUrl(url, pathParams != null ? pathParams : {}), params, config);
     }
     function use(options = {}) {
-      const _a = options, { pathParams = {} } = _a, rest = __objRest(_a, ["pathParams"]);
+      const _a = options, { pathParams = {}, watch: watchOptions } = _a, rest = __objRest(_a, ["pathParams", "watch"]);
+      const enableWatchPathParams = isFunction(pathParams) && ((watchOptions == null ? void 0 : watchOptions.pathParams) || watchOptions === true);
+      const normalizedWatchOptions = watchOptions === true ? { params: true, config: true, _custom: enableWatchPathParams ? pathParams : void 0 } : watchOptions === false ? { params: false, config: false } : __spreadProps(__spreadValues({ params: false, config: false }, watchOptions), { _custom: enableWatchPathParams ? pathParams : void 0 });
       return useAxle(__spreadValues({
         url: () => patchUrl(url, pathParams),
-        method
+        method,
+        watch: normalizedWatchOptions
       }, rest));
     }
     function patchUrl(url2, pathParams) {

package/lib/index.cjs

@@ -183,12 +183,15 @@ function createAxle(config = {}) {
 }
 
 // src/matcher.ts
-var import_minimatch = require("minimatch");
+var import_rattail = require("rattail");
 function matchPattern(pattern, method, url, status) {
+  if ((0, import_rattail.isFunction)(pattern)) {
+    return pattern({ url, method, status });
+  }
   if (pattern.startsWith("status:")) {
     return pattern.replace("status:", "").trim() === String(status);
   }
-  return pattern.startsWith("method:") ? pattern.replace("method:", "").trim() === method : (0, import_minimatch.minimatch)(url != null ? url : "", pattern);
+  return pattern.startsWith("method:") ? pattern.replace("method:", "").trim() === method : url === pattern;
 }
 function createMatcher(include, exclude) {
   function matcher(method, url, status) {
@@ -210,7 +213,7 @@ function createMatcher(include, exclude) {
 
 // src/helper.ts
 var import_axios3 = require("axios");
-var import_rattail = require("rattail");
+var import_rattail2 = require("rattail");
 function withResponse(promise) {
   return new Promise((resolve, reject) => {
     promise.then((response) => {
@@ -231,7 +234,7 @@ function withResponse(promise) {
   });
 }
 function download(url, filename) {
-  if (!(0, import_rattail.inBrowser)()) {
+  if (!(0, import_rattail2.inBrowser)()) {
     return;
   }
   const a = document.createElement("a");
@@ -245,7 +248,7 @@ function download(url, filename) {
 }
 
 // src/interceptors/requestHeadersInterceptor.ts
-var import_rattail2 = require("rattail");
+var import_rattail3 = require("rattail");
 function requestHeadersInterceptor(options = {}) {
   const { headers: headersOrGetter } = options;
   return {
@@ -255,7 +258,7 @@ function requestHeadersInterceptor(options = {}) {
       if (!matcher((_a = config.method) != null ? _a : "", (_b = config.url) != null ? _b : "")) {
         return config;
       }
-      const headers = (_c = (0, import_rattail2.isFunction)(headersOrGetter) ? headersOrGetter() : headersOrGetter) != null ? _c : {};
+      const headers = (_c = (0, import_rattail3.isFunction)(headersOrGetter) ? headersOrGetter() : headersOrGetter) != null ? _c : {};
       Object.entries(headers).forEach(([key, value]) => {
         config.headers[key] = value;
       });
@@ -268,7 +271,7 @@ function requestHeadersInterceptor(options = {}) {
 
 // src/interceptors/requestMockInterceptor.ts
 var import_axios4 = require("axios");
-var import_minimatch2 = require("minimatch");
+var import_rattail4 = require("rattail");
 function settle(response, resolve, reject, delay = 0) {
   if (delay > 0) {
     setTimeout(() => {
@@ -293,8 +296,8 @@ function requestMockInterceptor(options = {}) {
       const findMapping = () => {
         var _a2;
         return ((_a2 = options.mappings) != null ? _a2 : []).find((mapping2) => {
-          var _a3;
-          const isMatchUrl = (0, import_minimatch2.minimatch)((_a3 = config.url) != null ? _a3 : "", mapping2.url);
+          var _a3, _b2;
+          const isMatchUrl = (0, import_rattail4.isFunction)(mapping2.url) ? mapping2.url((_a3 = config.url) != null ? _a3 : "") : mapping2.url === ((_b2 = config.url) != null ? _b2 : "");
           const isMatchMethod = mapping2.method != null ? config.method === mapping2.method : true;
           return isMatchUrl && isMatchMethod;
         });
@@ -430,9 +433,8 @@ function responseStatusInterceptor(options) {
 var import_md5 = __toESM(require("crypto-js/md5.js"), 1);
 var import_get = __toESM(require("lodash/get.js"), 1);
 var import_set = __toESM(require("lodash/set.js"), 1);
-var import_minimatch3 = require("minimatch");
 var import_qs2 = __toESM(require("qs"), 1);
-var import_rattail3 = require("rattail");
+var import_rattail5 = require("rattail");
 function withCtxMd5(ctx, mapping) {
   mapping.path.forEach((path) => {
     const targetValue = (0, import_get.default)(ctx, path);
@@ -448,7 +450,7 @@ function withMd5(config, mapping) {
     params: JSON.parse(JSON.stringify(params)),
     headers: JSON.parse(JSON.stringify(headers))
   };
-  if ((0, import_rattail3.isString)(ctx.data) && ctx.data.length > 0 && ctx.headers["Content-Type"] === "application/x-www-form-urlencoded") {
+  if ((0, import_rattail5.isString)(ctx.data) && ctx.data.length > 0 && ctx.headers["Content-Type"] === "application/x-www-form-urlencoded") {
     ctx.data = import_qs2.default.parse(ctx.data);
     withCtxMd5(ctx, mapping);
     ctx.data = import_qs2.default.stringify(ctx.data);
@@ -472,8 +474,8 @@ function requestMd5Interceptor(options = {}) {
       const findMapping = () => {
         var _a2;
         return ((_a2 = options.mappings) != null ? _a2 : []).find((mapping2) => {
-          var _a3;
-          const isMatchUrl = (0, import_minimatch3.minimatch)((_a3 = config.url) != null ? _a3 : "", mapping2.url);
+          var _a3, _b2;
+          const isMatchUrl = (0, import_rattail5.isFunction)(mapping2.url) ? mapping2.url((_a3 = config.url) != null ? _a3 : "") : mapping2.url === ((_b2 = config.url) != null ? _b2 : "");
           const isMatchMethod = mapping2.method != null ? config.method === mapping2.method : true;
           return isMatchUrl && isMatchMethod;
         });

package/lib/index.d.cts

@@ -1,10 +1,15 @@
-import { R as RequestInterceptor, a as ResponseInterceptor } from './instance-ab0b388e.js';
-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, h as createAxle, f as createFetchRunner, g as createModifyRunner } from './instance-ab0b388e.js';
+import { R as RequestInterceptor, a as ResponseInterceptor } from './instance-857fe07c.js';
+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, h as createAxle, f as createFetchRunner, g as createModifyRunner } from './instance-857fe07c.js';
 import { AxiosResponse, AxiosInterceptorOptions, AxiosRequestConfig } from 'axios';
 export { AxiosError, AxiosInstance, AxiosInterceptorOptions, AxiosRequestConfig, AxiosRequestHeaders, AxiosResponse, HeadersDefaults, InternalAxiosRequestConfig, ResponseType, isAxiosError } from 'axios';
 
-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;
+type MatchPattern = string | ((options: {
+    url: string;
+    method: string;
+    status?: number;
+}) => boolean);
+declare function matchPattern(pattern: MatchPattern, method: string, url: string, status?: number): boolean;
+declare function createMatcher(include?: MatchPattern[], exclude?: MatchPattern[]): (method: string, url: string, status?: number) => boolean;
 
 interface WithResponseReturn<R> {
     response: R | undefined;
@@ -15,14 +20,14 @@ declare function download(url: string | Blob, filename: string): void;
 
 interface RequestHeadersInterceptorOptions {
     headers?: Record<string, string> | (() => Record<string, string>);
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestHeadersInterceptor(options?: RequestHeadersInterceptorOptions): RequestInterceptor;
 
 type RequestMockInterceptorMapping = {
-    url: string;
+    url: string | ((url: string) => boolean);
     handler: (config: AxiosRequestConfig) => {
         data: any;
         status?: number;
@@ -33,32 +38,32 @@ type RequestMockInterceptorMapping = {
 };
 interface RequestMockInterceptorOptions {
     mappings?: RequestMockInterceptorMapping[];
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestMockInterceptor(options?: RequestMockInterceptorOptions): RequestInterceptor;
 
 interface ResponseBlobInterceptorOptions {
     onResponse?: (response: AxiosResponse<any, any>) => any;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseBlobInterceptor(options?: ResponseBlobInterceptorOptions): ResponseInterceptor;
 
 interface ResponseTimeoutInterceptorOptions {
     normalizeErrorCode?: string;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseTimeoutInterceptor(options?: ResponseTimeoutInterceptorOptions): ResponseInterceptor;
 
 interface ResponseRetryInterceptorOptions {
     count?: number;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseRetryInterceptor(options: ResponseRetryInterceptorOptions): ResponseInterceptor;
@@ -66,23 +71,23 @@ declare function responseRetryInterceptor(options: ResponseRetryInterceptorOptio
 interface ResponseStatusInterceptorOptions {
     validStatusHandler?: Record<number | string, (response: AxiosResponse<any, any>) => any>;
     invalidStatusHandler?: Record<number | string, (error: any) => any>;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseStatusInterceptor(options: ResponseStatusInterceptorOptions): ResponseInterceptor;
 
 type RequestMd5InterceptorMapping = {
-    url: string;
+    url: string | ((url: string) => boolean);
     path: string[];
     method?: string;
 };
 interface RequestMd5InterceptorOptions {
     mappings?: RequestMd5InterceptorMapping[];
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestMd5Interceptor(options?: RequestMd5InterceptorOptions): RequestInterceptor;
 
-export { RequestHeadersInterceptorOptions, RequestInterceptor, RequestMd5InterceptorMapping, RequestMd5InterceptorOptions, RequestMockInterceptorMapping, RequestMockInterceptorOptions, ResponseBlobInterceptorOptions, ResponseInterceptor, ResponseRetryInterceptorOptions, ResponseStatusInterceptorOptions, ResponseTimeoutInterceptorOptions, WithResponseReturn, createMatcher, download, matchPattern, requestHeadersInterceptor, requestMd5Interceptor, requestMockInterceptor, responseBlobInterceptor, responseRetryInterceptor, responseStatusInterceptor, responseTimeoutInterceptor, withResponse };
+export { MatchPattern, RequestHeadersInterceptorOptions, RequestInterceptor, RequestMd5InterceptorMapping, RequestMd5InterceptorOptions, RequestMockInterceptorMapping, RequestMockInterceptorOptions, ResponseBlobInterceptorOptions, ResponseInterceptor, ResponseRetryInterceptorOptions, ResponseStatusInterceptorOptions, ResponseTimeoutInterceptorOptions, WithResponseReturn, createMatcher, download, matchPattern, requestHeadersInterceptor, requestMd5Interceptor, requestMockInterceptor, responseBlobInterceptor, responseRetryInterceptor, responseStatusInterceptor, responseTimeoutInterceptor, withResponse };

package/lib/index.d.ts

@@ -1,10 +1,15 @@
-import { R as RequestInterceptor, a as ResponseInterceptor } from './instance-ab0b388e.js';
-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, h as createAxle, f as createFetchRunner, g as createModifyRunner } from './instance-ab0b388e.js';
+import { R as RequestInterceptor, a as ResponseInterceptor } from './instance-857fe07c.js';
+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, h as createAxle, f as createFetchRunner, g as createModifyRunner } from './instance-857fe07c.js';
 import { AxiosResponse, AxiosInterceptorOptions, AxiosRequestConfig } from 'axios';
 export { AxiosError, AxiosInstance, AxiosInterceptorOptions, AxiosRequestConfig, AxiosRequestHeaders, AxiosResponse, HeadersDefaults, InternalAxiosRequestConfig, ResponseType, isAxiosError } from 'axios';
 
-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;
+type MatchPattern = string | ((options: {
+    url: string;
+    method: string;
+    status?: number;
+}) => boolean);
+declare function matchPattern(pattern: MatchPattern, method: string, url: string, status?: number): boolean;
+declare function createMatcher(include?: MatchPattern[], exclude?: MatchPattern[]): (method: string, url: string, status?: number) => boolean;
 
 interface WithResponseReturn<R> {
     response: R | undefined;
@@ -15,14 +20,14 @@ declare function download(url: string | Blob, filename: string): void;
 
 interface RequestHeadersInterceptorOptions {
     headers?: Record<string, string> | (() => Record<string, string>);
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestHeadersInterceptor(options?: RequestHeadersInterceptorOptions): RequestInterceptor;
 
 type RequestMockInterceptorMapping = {
-    url: string;
+    url: string | ((url: string) => boolean);
     handler: (config: AxiosRequestConfig) => {
         data: any;
         status?: number;
@@ -33,32 +38,32 @@ type RequestMockInterceptorMapping = {
 };
 interface RequestMockInterceptorOptions {
     mappings?: RequestMockInterceptorMapping[];
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestMockInterceptor(options?: RequestMockInterceptorOptions): RequestInterceptor;
 
 interface ResponseBlobInterceptorOptions {
     onResponse?: (response: AxiosResponse<any, any>) => any;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseBlobInterceptor(options?: ResponseBlobInterceptorOptions): ResponseInterceptor;
 
 interface ResponseTimeoutInterceptorOptions {
     normalizeErrorCode?: string;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseTimeoutInterceptor(options?: ResponseTimeoutInterceptorOptions): ResponseInterceptor;
 
 interface ResponseRetryInterceptorOptions {
     count?: number;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseRetryInterceptor(options: ResponseRetryInterceptorOptions): ResponseInterceptor;
@@ -66,23 +71,23 @@ declare function responseRetryInterceptor(options: ResponseRetryInterceptorOptio
 interface ResponseStatusInterceptorOptions {
     validStatusHandler?: Record<number | string, (response: AxiosResponse<any, any>) => any>;
     invalidStatusHandler?: Record<number | string, (error: any) => any>;
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function responseStatusInterceptor(options: ResponseStatusInterceptorOptions): ResponseInterceptor;
 
 type RequestMd5InterceptorMapping = {
-    url: string;
+    url: string | ((url: string) => boolean);
     path: string[];
     method?: string;
 };
 interface RequestMd5InterceptorOptions {
     mappings?: RequestMd5InterceptorMapping[];
-    include?: string[];
-    exclude?: string[];
+    include?: MatchPattern[];
+    exclude?: MatchPattern[];
     axiosInterceptorOptions?: AxiosInterceptorOptions;
 }
 declare function requestMd5Interceptor(options?: RequestMd5InterceptorOptions): RequestInterceptor;
 
-export { RequestHeadersInterceptorOptions, RequestInterceptor, RequestMd5InterceptorMapping, RequestMd5InterceptorOptions, RequestMockInterceptorMapping, RequestMockInterceptorOptions, ResponseBlobInterceptorOptions, ResponseInterceptor, ResponseRetryInterceptorOptions, ResponseStatusInterceptorOptions, ResponseTimeoutInterceptorOptions, WithResponseReturn, createMatcher, download, matchPattern, requestHeadersInterceptor, requestMd5Interceptor, requestMockInterceptor, responseBlobInterceptor, responseRetryInterceptor, responseStatusInterceptor, responseTimeoutInterceptor, withResponse };
+export { MatchPattern, RequestHeadersInterceptorOptions, RequestInterceptor, RequestMd5InterceptorMapping, RequestMd5InterceptorOptions, RequestMockInterceptorMapping, RequestMockInterceptorOptions, ResponseBlobInterceptorOptions, ResponseInterceptor, ResponseRetryInterceptorOptions, ResponseStatusInterceptorOptions, ResponseTimeoutInterceptorOptions, WithResponseReturn, createMatcher, download, matchPattern, requestHeadersInterceptor, requestMd5Interceptor, requestMockInterceptor, responseBlobInterceptor, responseRetryInterceptor, responseStatusInterceptor, responseTimeoutInterceptor, withResponse };

package/lib/index.js

@@ -120,12 +120,15 @@ function createAxle(config = {}) {
 }
 
 // src/matcher.ts
-import { minimatch } from "minimatch";
+import { isFunction } from "rattail";
 function matchPattern(pattern, method, url, status) {
+  if (isFunction(pattern)) {
+    return pattern({ url, method, 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);
+  return pattern.startsWith("method:") ? pattern.replace("method:", "").trim() === method : url === pattern;
 }
 function createMatcher(include, exclude) {
   function matcher(method, url, status) {
@@ -182,7 +185,7 @@ function download(url, filename) {
 }
 
 // src/interceptors/requestHeadersInterceptor.ts
-import { isFunction } from "rattail";
+import { isFunction as isFunction2 } from "rattail";
 function requestHeadersInterceptor(options = {}) {
   const { headers: headersOrGetter } = options;
   return {
@@ -192,7 +195,7 @@ function requestHeadersInterceptor(options = {}) {
       if (!matcher((_a = config.method) != null ? _a : "", (_b = config.url) != null ? _b : "")) {
         return config;
       }
-      const headers = (_c = isFunction(headersOrGetter) ? headersOrGetter() : headersOrGetter) != null ? _c : {};
+      const headers = (_c = isFunction2(headersOrGetter) ? headersOrGetter() : headersOrGetter) != null ? _c : {};
       Object.entries(headers).forEach(([key, value]) => {
         config.headers[key] = value;
       });
@@ -205,7 +208,7 @@ function requestHeadersInterceptor(options = {}) {
 
 // src/interceptors/requestMockInterceptor.ts
 import { AxiosError as AxiosError2 } from "axios";
-import { minimatch as minimatch2 } from "minimatch";
+import { isFunction as isFunction3 } from "rattail";
 function settle(response, resolve, reject, delay = 0) {
   if (delay > 0) {
     setTimeout(() => {
@@ -230,8 +233,8 @@ function requestMockInterceptor(options = {}) {
       const findMapping = () => {
         var _a2;
         return ((_a2 = options.mappings) != null ? _a2 : []).find((mapping2) => {
-          var _a3;
-          const isMatchUrl = minimatch2((_a3 = config.url) != null ? _a3 : "", mapping2.url);
+          var _a3, _b2;
+          const isMatchUrl = isFunction3(mapping2.url) ? mapping2.url((_a3 = config.url) != null ? _a3 : "") : mapping2.url === ((_b2 = config.url) != null ? _b2 : "");
           const isMatchMethod = mapping2.method != null ? config.method === mapping2.method : true;
           return isMatchUrl && isMatchMethod;
         });
@@ -367,9 +370,8 @@ function responseStatusInterceptor(options) {
 import md5 from "crypto-js/md5.js";
 import get from "lodash/get.js";
 import set from "lodash/set.js";
-import { minimatch as minimatch3 } from "minimatch";
 import qs2 from "qs";
-import { isString } from "rattail";
+import { isFunction as isFunction4, isString } from "rattail";
 function withCtxMd5(ctx, mapping) {
   mapping.path.forEach((path) => {
     const targetValue = get(ctx, path);
@@ -409,8 +411,8 @@ function requestMd5Interceptor(options = {}) {
       const findMapping = () => {
         var _a2;
         return ((_a2 = options.mappings) != null ? _a2 : []).find((mapping2) => {
-          var _a3;
-          const isMatchUrl = minimatch3((_a3 = config.url) != null ? _a3 : "", mapping2.url);
+          var _a3, _b2;
+          const isMatchUrl = isFunction4(mapping2.url) ? mapping2.url((_a3 = config.url) != null ? _a3 : "") : mapping2.url === ((_b2 = config.url) != null ? _b2 : "");
           const isMatchMethod = mapping2.method != null ? config.method === mapping2.method : true;
           return isMatchUrl && isMatchMethod;
         });

package/lib/{instance-ab0b388e.d.ts → instance-857fe07c.d.ts}

@@ -1,6 +1,7 @@
 import { AxiosRequestConfig, AxiosResponse, AxiosInterceptorOptions, InternalAxiosRequestConfig, HeadersDefaults, AxiosInstance, ResponseType } from 'axios';
 
-interface AxleRequestConfig<D = any> extends AxiosRequestConfig<D> {
+interface AxleRequestConfig<D = any, E = Record<string, any>> extends AxiosRequestConfig<D> {
+    extra?: E;
 }
 
 type FetchRunner = <R = AxiosResponse, P = Record<string, any>, D = Record<string, any>>(url: string, params?: P, config?: AxleRequestConfig<D>) => Promise<R>;
@@ -56,8 +57,8 @@ type AxleInstance = {
     useResponseInterceptor(...interceptors: ResponseInterceptor[]): void;
     axios: AxiosInstance;
 };
-declare function createFetchRunner(service: AxiosInstance, method: FetchMethod, responseType: ResponseType): <R = AxiosResponse<any, any>, P = Record<string, any>, D = Record<string, any>>(url: string, params?: P | undefined, config?: AxleRequestConfig<D> | undefined) => Promise<R>;
-declare function createModifyRunner(service: AxiosInstance, method: ModifyMethod, contentType: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded'): <R = AxiosResponse<any, any>, P = Record<string, any>, D = Record<string, any>>(url: string, params?: P | undefined, config?: AxleRequestConfig<D> | undefined) => Promise<R>;
+declare function createFetchRunner(service: AxiosInstance, method: FetchMethod, responseType: ResponseType): <R = AxiosResponse<any, any>, P = Record<string, any>, D = Record<string, any>>(url: string, params?: P | undefined, config?: AxleRequestConfig<D, Record<string, any>> | undefined) => Promise<R>;
+declare function createModifyRunner(service: AxiosInstance, method: ModifyMethod, contentType: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded'): <R = AxiosResponse<any, any>, P = Record<string, any>, D = Record<string, any>>(url: string, params?: P | undefined, config?: AxleRequestConfig<D, Record<string, any>> | undefined) => Promise<R>;
 declare function createAxle(config?: AxleRequestConfig): AxleInstance;
 
 export { AxleRequestConfig as A, FetchRunner as F, Interceptor as I, ModifyRunner as M, RequestInterceptor as R, ResponseInterceptor as a, FetchMethod as b, ModifyMethod as c, RunnerMethod as d, AxleInstance as e, createFetchRunner as f, createModifyRunner as g, createAxle as h };