use explicit pathList for matching order

Author: yyx990803

src/create-matcher.js

@@ -17,10 +17,10 @@ export function createMatcher (
   routes: Array<RouteConfig>,
   router: VueRouter
 ): Matcher {
-  const { pathMap, nameMap } = createRouteMap(routes)
+  const { pathList, pathMap, nameMap } = createRouteMap(routes)
 
   function addRoutes (routes) {
-    createRouteMap(routes, pathMap, nameMap)
+    createRouteMap(routes, pathList, pathMap, nameMap)
   }
 
   function match (
@@ -58,7 +58,8 @@ export function createMatcher (
       }
     } else if (location.path) {
       location.params = {}
-      for (const path in pathMap) {
+      for (let i = 0; i < pathList.length; i++) {
+        const path = pathList[i]
         if (matchRoute(path, location.params, location.path)) {
           return _createRoute(pathMap[path], location, redirectedFrom)
         }

src/create-route-map.js

@@ -5,26 +5,32 @@ import { cleanPath } from './util/path'
 
 export function createRouteMap (
   routes: Array<RouteConfig>,
+  oldPathList?: Array<string>,
   oldPathMap?: Dictionary<RouteRecord>,
   oldNameMap?: Dictionary<RouteRecord>
 ): {
+  pathList: Array<string>;
   pathMap: Dictionary<RouteRecord>;
   nameMap: Dictionary<RouteRecord>;
 } {
+  // the path list is used to control path matching priority
+  const pathList: Array<string> = oldPathList || []
   const pathMap: Dictionary<RouteRecord> = oldPathMap || Object.create(null)
   const nameMap: Dictionary<RouteRecord> = oldNameMap || Object.create(null)
 
   routes.forEach(route => {
-    addRouteRecord(pathMap, nameMap, route)
+    addRouteRecord(pathList, pathMap, nameMap, route)
   })
 
   return {
+    pathList,
     pathMap,
     nameMap
   }
 }
 
 function addRouteRecord (
+  pathList: Array<string>,
   pathMap: Dictionary<RouteRecord>,
   nameMap: Dictionary<RouteRecord>,
   route: RouteConfig,
@@ -78,7 +84,7 @@ function addRouteRecord (
       const childMatchAs = matchAs
         ? cleanPath(`${matchAs}/${child.path}`)
         : undefined
-      addRouteRecord(pathMap, nameMap, child, record, childMatchAs)
+      addRouteRecord(pathList, pathMap, nameMap, child, record, childMatchAs)
     })
   }
 
@@ -89,18 +95,19 @@ function addRouteRecord (
           path: alias,
           children: route.children
         }
-        addRouteRecord(pathMap, nameMap, aliasRoute, parent, record.path)
+        addRouteRecord(pathList, pathMap, nameMap, aliasRoute, parent, record.path)
       })
     } else {
       const aliasRoute = {
         path: route.alias,
         children: route.children
       }
-      addRouteRecord(pathMap, nameMap, aliasRoute, parent, record.path)
+      addRouteRecord(pathList, pathMap, nameMap, aliasRoute, parent, record.path)
     }
   }
 
   if (!pathMap[record.path]) {
+    pathList.push(record.path)
     pathMap[record.path] = record
   }