fix: flow

Author: iurisilvio

src/create-matcher.js

@@ -54,7 +54,7 @@ export function createMatcher (
     redirectedFrom?: Location
   ): Route {
     const location = normalizeLocation(raw, currentRoute, false, router)
-    const { name } = location
+    const { name, path } = location
 
     if (name) {
       const record = nameMap[name]
@@ -80,18 +80,17 @@ export function createMatcher (
 
       location.path = fillParams(record.path, location.params, `named route "${name}"`)
       return _createRoute(record, location, redirectedFrom)
-    } else if (location.path) {
+    } else if (path) {
       location.params = {}
-      const staticRecord = pathMap[location.path]
+      const staticRecord = pathMap[path]
       if (staticRecord) {
-        if (matchRoute(staticRecord.regex, location.path, location.params)) {
+        if (matchRoute(staticRecord.regex, path, location.params)) {
           return _createRoute(staticRecord, location, redirectedFrom)
         }
       }
       for (let i = 0; i < pathList.length; i++) {
-        const path = pathList[i]
-        const record = pathMap[path]
-        if (matchRoute(record.regex, location.path, location.params)) {
+        const record = pathMap[pathList[i]]
+        if (matchRoute(record.regex, path, location.params)) {
           return _createRoute(record, location, redirectedFrom)
         }
       }

src/create-route-map.js

@@ -144,10 +144,10 @@ function addRouteRecord (
     })
   }
 
-  if (
-    !pathMap[record.path] &&
-    !Object.values(pathMap).some(r => r.path.indexOf('*') === -1 && record.path.match(r.regex))
-  ) {
+  if (!pathMap[record.path] && !pathList.some(pathItem => {
+    const r = pathMap[pathItem]
+    return r.path.indexOf('*') === -1 && record.path.match(r.regex)
+  })) {
     pathList.push(record.path)
     pathMap[record.path] = record
   }