fix(mock): exact match priority, close #508

packages/mock/src/mock.service.spec.ts

@@ -77,8 +77,14 @@ describe('mock: service', () => {
       const editRes = editRule.callback(editRule as any);
       expect(editRes.s).toBe('edit');
       const detailRule = srv.getRule('GET', '/users/1');
-      const detailRes = detailRule.callback(detailRule as any);
-      expect(detailRes.s).toBe('detail');
+      expect((detailRule.callback as any).rank).not.toBeUndefined();
+    });
+
+    it('should be exact match priority', () => {
+      const detail1Rule = srv.getRule('GET', '/users/1');
+      expect((detail1Rule.callback as any).rank).not.toBeUndefined();
+      const detail2Rule = srv.getRule('GET', '/users/2');
+      expect(detail2Rule.callback.name).toBe('/users/:id');
     });
   });
 

packages/mock/src/mock.service.ts

@@ -36,10 +36,11 @@ export class MockService implements OnDestroy {
             typeof value === 'object' ||
             typeof value === 'string'
           )
-        )
+        ) {
           throw Error(
             `mock value of [${key}-${ruleKey}] should be function or object or string, but got ${typeof value}`,
           );
+        }
         const rule = this.genRule(ruleKey, value);
         if (
           ['GET', 'POST', 'PUT', 'HEAD', 'DELETE', 'PATCH', 'OPTIONS'].indexOf(
@@ -122,13 +123,14 @@ export class MockService implements OnDestroy {
   getRule(method: string, url: string): MockRule {
     method = (method || 'GET').toUpperCase();
     const params: any = {};
-    const ret =
-      this.cached.find(
+    const list =
+      this.cached.filter(
         w =>
           w.method === method &&
           (w.martcher ? w.martcher.test(url) : w.url === url),
-      ) || null;
-    if (!ret) return null;
+      );
+    if (list.length === 0) return null;
+    const ret = list.find(w => w.url === url) || list[0];
     if (ret.martcher) {
       const execArr = ret.martcher.exec(url);
       execArr.slice(1).map((value: string, index: number) => {