feat(requestMockInterceptor): support handler overload

varletjs · Dec 16, 2023 · 9b2ccaa · 9b2ccaa
1 parent 5280b6a
commit 9b2ccaa
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 24 deletions.
diff --git a/packages/axle/src/interceptors/examples/requestMockInterceptor.md b/packages/axle/src/interceptors/examples/requestMockInterceptor.md
@@ -9,12 +9,25 @@ axle.useRequestInterceptor(
   requestMockInterceptor({
     // url and handler mapping
     mapping: {
+      '/user/getUser': () => ({
+        data: {
+          code: 200,
+          message: 'success',
+          data: {
+            id: 1,
+            name: 'Mock Jack Ma',
+          },
+        }
+      }),
+
       '/user/getUsers': {
         // request delay time (ms)
         delay: 1000,
+        method: 'get',
         handler: () => ({
           data: {
             code: 200,
+            message: 'success',
             data: [
               {
                 id: 1,
@@ -25,7 +38,6 @@ axle.useRequestInterceptor(
                 name: 'Mock Tom',
               },
             ],
-            message: 'success',
           },
         }),
       },

diff --git a/packages/axle/src/interceptors/requestMockInterceptor.ts b/packages/axle/src/interceptors/requestMockInterceptor.ts
@@ -3,6 +3,7 @@ import { AxiosError } from 'axios'
 import { minimatch } from 'minimatch'
 import type { RequestInterceptor } from '../instance'
 import type { AxiosInterceptorOptions, AxiosRequestConfig, AxiosResponse } from 'axios'
+import { isFunction } from '@varlet/shared'
 
 export type RequestMockInterceptorMappingValue = {
   handler: (config: AxiosRequestConfig) => { data: any; status?: number; statusText?: string }
@@ -11,7 +12,7 @@ export type RequestMockInterceptorMappingValue = {
 }
 
 export interface RequestMockInterceptorOptions {
-  mapping?: Record<string, RequestMockInterceptorMappingValue>
+  mapping?: Record<string, RequestMockInterceptorMappingValue | RequestMockInterceptorMappingValue['handler']>
   include?: string[]
   exclude?: string[]
   axiosInterceptorOptions?: AxiosInterceptorOptions
@@ -37,6 +38,14 @@ function settle(
   }
 }
 
+function normalizeMapping(mapping: RequestMockInterceptorOptions['mapping']) {
+  return Object.entries(mapping ?? {}).reduce((normalizedMapping, [key, value]) => {
+    const normalizedValue: RequestMockInterceptorMappingValue = isFunction(value) ? { handler: value } : value
+    normalizedMapping[key] = normalizedValue
+    return normalizedMapping
+  }, {} as Record<string, RequestMockInterceptorMappingValue>)
+}
+
 export function requestMockInterceptor(options: RequestMockInterceptorOptions = {}): RequestInterceptor {
   return {
     onFulfilled(config) {
@@ -45,10 +54,14 @@ export function requestMockInterceptor(options: RequestMockInterceptorOptions =
         return config
       }
 
+      const mapping = normalizeMapping(options.mapping)
+
       const findMappingRecord = () =>
-        Object.entries(options.mapping ?? {}).find(
-          ([key, value]) => minimatch(config.url ?? '', key) && config.method === (value.method ?? 'get')
-        )
+        Object.entries(mapping).find(([key, value]) => {
+          const isMatchUrl = minimatch(config.url ?? '', key)
+          const isMatchMethod = value.method != null ? config.method === value.method : true
+          return isMatchUrl && isMatchMethod
+        })
 
       const mappingRecord = findMappingRecord()
       if (!mappingRecord) {

diff --git a/packages/playground/src/request/index.ts b/packages/playground/src/request/index.ts
@@ -28,25 +28,22 @@ axle.useRequestInterceptor(
 
   requestMockInterceptor({
     mapping: {
-      '/mock/**': {
-        delay: 1000,
-        handler: () => ({
-          data: {
-            code: 200,
-            data: [
-              {
-                id: 1,
-                name: 'Mock Jack Ma',
-              },
-              {
-                id: 2,
-                name: 'Mock Tom',
-              },
-            ],
-            message: 'success',
-          },
-        }),
-      },
+      '/mock/**': () => ({
+        data: {
+          code: 200,
+          data: [
+            {
+              id: 1,
+              name: 'Mock Jack Ma',
+            },
+            {
+              id: 2,
+              name: 'Mock Tom',
+            },
+          ],
+          message: 'success',
+        },
+      }),
     },
   }),