test exposing route config custom fields

Author: yyx990803

src/route.js

@@ -11,35 +11,30 @@ export default class Route {
 
   constructor (path, router) {
     let matched = router._recognizer.recognize(path)
-
-    // copy all custom fields from route configs
     if (matched) {
+      // copy all custom fields from route configs
       [].forEach.call(matched, match => {
         for (let key in match.handler) {
           if (!internalKeysRE.test(key)) {
             this[key] = match.handler[key]
           }
         }
       })
+      // set query and params
+      this.query = matched.queryParams
+      this.params = [].reduce.call(matched, (prev, cur) => {
+        if (cur.params) {
+          for (let key in cur.params) {
+            prev[key] = cur.params[key]
+          }
+        }
+        return prev
+      }, {})
     }
-
+    // expose path and router
     this.path = path
     this.router = router
-    this.query = matched
-      ? matched.queryParams
-      : {}
-    this.params = matched
-      ? [].reduce.call(matched, (prev, cur) => {
-          if (cur.params) {
-            for (let key in cur.params) {
-              prev[key] = cur.params[key]
-            }
-          }
-          return prev
-        }, {})
-      : {}
-
-    // private stuff
+    // for internal use
     this._matched = matched || router._notFoundHandler
   }
 }

test/unit/specs/core.js

@@ -92,8 +92,9 @@ describe('Core', function () {
     router = new Router({ abstract: true })
     router.map({
       '/a/:id': {
+        customField: 'custom',
         component: {
-          template: '{{$route.path}},{{$route.params.id}},{{$route.query.id}}|'
+          template: '{{$route.path}},{{$route.params.id}},{{$route.query.id}},{{$route.customField}}|'
         }
       }
     })
@@ -107,20 +108,20 @@ describe('Core', function () {
         '</div>',
       components: {
         'view-b': {
-          template: '{{$route.path}},{{$route.params.id}},{{$route.query.id}}'
+          template: '{{$route.path}},{{$route.params.id}},{{$route.query.id}},{{$route.customField}}'
         }
       }
     })
     router.start(App, el)
     assertRoutes([
       // no param, no match (only view-b)
-      ['/a', '/a,,'],
+      ['/a', '/a,,,'],
       // params only
-      ['/a/123', '/a/123,123,|/a/123,123,'],
+      ['/a/123', '/a/123,123,,custom|/a/123,123,,custom'],
       // params + query
-      ['/a/123?id=234', '/a/123?id=234,123,234|/a/123?id=234,123,234'],
+      ['/a/123?id=234', '/a/123?id=234,123,234,custom|/a/123?id=234,123,234,custom'],
       // relative query
-      ['?id=345', '/a/123?id=345,123,345|/a/123?id=345,123,345']
+      ['?id=345', '/a/123?id=345,123,345,custom|/a/123?id=345,123,345,custom']
     ], done)
   })