fix: improve path matching logic, fix #25

vbenjs · May 31, 2021 · 5079e4b · 5079e4b
1 parent fdfed60
commit 5079e4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/es/createProdMockServer.js b/es/createProdMockServer.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import mockJs from 'mockjs';
+import { pathToRegexp } from 'path-to-regexp';
 const Mock = mockJs;
 export function createProdMockServer(mockList) {
   Mock.XHR.prototype.__send = Mock.XHR.prototype.send;
@@ -31,7 +32,11 @@ export function createProdMockServer(mockList) {
   };
   for (const { url, method, response, timeout } of mockList) {
     __setupMock__(timeout);
-    Mock.mock(new RegExp(url), method || 'get', __XHR2ExpressReqWrapper__(response));
+    Mock.mock(
+      pathToRegexp(url, undefined, { end: false }),
+      method || 'get',
+      __XHR2ExpressReqWrapper__(response)
+    );
   }
 }
 function __param2Obj__(url) {

diff --git a/src/createProdMockServer.ts b/src/createProdMockServer.ts
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import mockJs from 'mockjs';
+import { pathToRegexp } from 'path-to-regexp';
 
 const Mock = mockJs as any;
 export function createProdMockServer(mockList: any[]) {
@@ -36,7 +37,11 @@ export function createProdMockServer(mockList: any[]) {
 
   for (const { url, method, response, timeout } of mockList) {
     __setupMock__(timeout);
-    Mock.mock(new RegExp(url), method || 'get', __XHR2ExpressReqWrapper__(response));
+    Mock.mock(
+      pathToRegexp(url, undefined, { end: false }),
+      method || 'get',
+      __XHR2ExpressReqWrapper__(response)
+    );
   }
 }