From ab0a779ba6f09f5b28138c9445ce84d7263daef6 Mon Sep 17 00:00:00 2001
From: Rahul Kadyan <hi@znck.me>
Date: Thu, 17 Nov 2016 13:36:44 +0530
Subject: [PATCH 1/2] :bug: Remove extra old params in named routes

---
 src/create-matcher.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/create-matcher.js b/src/create-matcher.js
index 1850c5284..789ff4443 100644
--- a/src/create-matcher.js
+++ b/src/create-matcher.js
@@ -14,6 +14,10 @@ const regexpCache: {
   }
 } = Object.create(null)
 
+const regexpParamsCache: {
+  [key: string]: Array<string>
+} = Object.create(null)
+
 const regexpCompileCache: {
   [key: string]: Function
 } = Object.create(null)
@@ -31,6 +35,7 @@ export function createMatcher (routes: Array<RouteConfig>): Matcher {
 
     if (name) {
       const record = nameMap[name]
+      const paramNames = getParams(record.path)
 
       if (typeof location.params !== 'object') {
         location.params = {}
@@ -38,7 +43,7 @@ export function createMatcher (routes: Array<RouteConfig>): Matcher {
 
       if (currentRoute && typeof currentRoute.params === 'object') {
         for (const key in currentRoute.params) {
-          if (!(key in location.params)) {
+          if (!(key in location.params) && paramNames.indexOf(key) > -1) {
             location.params[key] = currentRoute.params[key]
           }
         }
@@ -198,6 +203,26 @@ function fillParams (
   }
 }
 
+function getParams (path: string): Array<string> {
+  const hit = regexpParamsCache[path]
+
+  if (hit) {
+    return hit
+  }
+
+  const keys = []
+  const paramNames: Array<string> = []
+
+  Regexp(path, keys)
+
+  for (let i = 0, len = keys.length; i < len; ++i) {
+    const key = keys[i]
+    if (key && 'name' in key) paramNames.push(key.name)
+  }
+
+  return (regexpParamsCache[path] = paramNames)
+}
+
 function resolveRecordPath (path: string, record: RouteRecord): string {
   return resolvePath(path, record.parent ? record.parent.path : '/', true)
 }

From 3730e881274e8b512a66bd8a7299f5cd5761d72f Mon Sep 17 00:00:00 2001
From: Rahul Kadyan <hi@znck.me>
Date: Fri, 18 Nov 2016 11:24:38 +0530
Subject: [PATCH 2/2] :white_check_mark: Add tests

---
 examples/nested-routes/app.js   | 13 ++++++++++-
 src/create-matcher.js           | 38 +++++++++++++--------------------
 test/e2e/specs/nested-routes.js | 13 ++++++++++-
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/examples/nested-routes/app.js b/examples/nested-routes/app.js
index 6e8ba8689..9f35e3064 100644
--- a/examples/nested-routes/app.js
+++ b/examples/nested-routes/app.js
@@ -28,6 +28,14 @@ const Qux = {
     </div>
   `
 }
+const Quy = {
+  template: `
+    <div class="nested-parent-other">
+      <h3>quy</h3>
+      <pre>{{ JSON.stringify(Object.keys($route.params)) }}</pre>
+    </div>
+  `
+}
 const Quux = { template: '<div>quux</div>' }
 
 const router = new VueRouter({
@@ -57,7 +65,9 @@ const router = new VueRouter({
           path: 'qux/:quxId',
           component: Qux,
           children: [{ path: 'quux', name: 'quux', component: Quux }]
-        }
+        },
+
+        { path: 'quy/:quyId', component: Quy }
       ]
     }
   ]
@@ -74,6 +84,7 @@ new Vue({
         <li><router-link to="/parent/bar">/parent/bar</router-link></li>
         <li><router-link to="/baz">/baz</router-link></li>
         <li><router-link to="/parent/qux/123">/parent/qux</router-link></li>
+        <li><router-link to="/parent/quy/123">/parent/quy</router-link></li>
       </ul>
       <router-view class="view"></router-view>
     </div>
diff --git a/src/create-matcher.js b/src/create-matcher.js
index 789ff4443..748f451e8 100644
--- a/src/create-matcher.js
+++ b/src/create-matcher.js
@@ -155,13 +155,10 @@ export function createMatcher (routes: Array<RouteConfig>): Matcher {
   return match
 }
 
-function matchRoute (
-  path: string,
-  params: Object,
-  pathname: string
-): boolean {
-  let keys, regexp
+function getRouteRegex (path: string): Object {
   const hit = regexpCache[path]
+  let keys, regexp
+
   if (hit) {
     keys = hit.keys
     regexp = hit.regexp
@@ -170,6 +167,16 @@ function matchRoute (
     regexp = Regexp(path, keys)
     regexpCache[path] = { keys, regexp }
   }
+
+  return { keys, regexp }
+}
+
+function matchRoute (
+  path: string,
+  params: Object,
+  pathname: string
+): boolean {
+  const { regexp, keys } = getRouteRegex(path)
   const m = pathname.match(regexp)
 
   if (!m) {
@@ -204,23 +211,8 @@ function fillParams (
 }
 
 function getParams (path: string): Array<string> {
-  const hit = regexpParamsCache[path]
-
-  if (hit) {
-    return hit
-  }
-
-  const keys = []
-  const paramNames: Array<string> = []
-
-  Regexp(path, keys)
-
-  for (let i = 0, len = keys.length; i < len; ++i) {
-    const key = keys[i]
-    if (key && 'name' in key) paramNames.push(key.name)
-  }
-
-  return (regexpParamsCache[path] = paramNames)
+  return regexpParamsCache[path] ||
+    (regexpParamsCache[path] = getRouteRegex(path).keys.map(key => key.name))
 }
 
 function resolveRecordPath (path: string, record: RouteRecord): string {
diff --git a/test/e2e/specs/nested-routes.js b/test/e2e/specs/nested-routes.js
index 41aecaa2d..172ded37e 100644
--- a/test/e2e/specs/nested-routes.js
+++ b/test/e2e/specs/nested-routes.js
@@ -3,7 +3,7 @@ module.exports = {
     browser
     .url('http://localhost:8080/nested-routes/')
       .waitForElementVisible('#app', 1000)
-      .assert.count('li a', 5)
+      .assert.count('li a', 6)
       .assert.urlEquals('http://localhost:8080/nested-routes/parent')
       .assert.containsText('.view', 'Parent')
       .assert.containsText('.view', 'default')
@@ -34,6 +34,17 @@ module.exports = {
       .assert.containsText('.view', 'qux')
       .assert.containsText('.view', 'quux')
 
+      .click('li:nth-child(6) a')
+      .assert.urlEquals('http://localhost:8080/nested-routes/parent/quy/123')
+      .assert.containsText('.view', 'Parent')
+      .assert.containsText('.view', 'quy')
+      .assert.evaluate(function () {
+        var params = JSON.parse(document.querySelector('pre').textContent)
+        return (
+          JSON.stringify(params) === JSON.stringify(['quyId'])
+        )
+      }, null, '/')
+
     // check initial visit
     .url('http://localhost:8080/nested-routes/parent/foo')
       .waitForElementVisible('#app', 1000)