tweak router.resolve API

Author: yyx990803

docs/en/SUMMARY.md

@@ -13,7 +13,7 @@
   - [Named Routes](essentials/named-routes.md)
   - [Named Views](essentials/named-views.md)
   - [Redirect and Alias](essentials/redirect-and-alias.md)
-  - [Passing props](essentials/passing-props.md)
+  - [Passing Props to Route Components](essentials/passing-props.md)
   - [HTML5 History Mode](essentials/history-mode.md)
 - Advanced
   - [Navigation Guards](advanced/navigation-guards.md)

docs/en/api/router-instance.md

@@ -48,8 +48,8 @@
 
   ``` js
   {
-    normalizedTo: Location;
-    resolved: Route;
+    location: Location;
+    route: Route;
     href: string;
   }
   ```

docs/en/essentials/passing-props.md

@@ -1,4 +1,4 @@
-# Passing props
+# Passing Props to Route Components
 
 Using `$route` in your component creates a tight coupling with the route which limits the flexibility of the component as it can only be used on certain urls.
 

docs/ja/api/router-instance.md

@@ -48,8 +48,8 @@
 
   ``` js
   {
-    normalizedTo: Location;
-    resolved: Route;
+    location: Location;
+    route: Route;
     href: string;
   }
   ```

docs/kr/api/router-instance.md

@@ -45,11 +45,11 @@
   > 2.1.0+
 
   역방향 URL 해석. `<router-link/>`에서 사용된 것과 같은 형식의 위치가 주어지면 다음과 같이 처리된 속성을 가진 객체를 반환합니다.
-  
+
   ``` js
   {
-    normalizedTo: Location;
-    resolved: Route;
+    location: Location;
+    route: Route;
     href: string;
   }
   ```

docs/ru/api/router-instance.md

@@ -48,8 +48,8 @@
 
   ``` js
   {
-    normalizedTo: Location;
-    resolved: Route;
+    location: Location;
+    route: Route;
     href: string;
   }
-  ```
+  ```

docs/zh-cn/api/router-instance.md

@@ -48,8 +48,8 @@
 
   ``` js
   {
-    normalizedTo: Location;
-    resolved: Route;
+    location: Location;
+    route: Route;
     href: string;
   }
   ```

src/components/link.js

@@ -30,20 +30,20 @@ export default {
   render (h: Function) {
     const router = this.$router
     const current = this.$route
-    const { normalizedTo, resolved, href } = router.resolve(this.to, current, this.append)
+    const { location, route, href } = router.resolve(this.to, current, this.append)
     const classes = {}
     const activeClass = this.activeClass || router.options.linkActiveClass || 'router-link-active'
-    const compareTarget = normalizedTo.path ? createRoute(null, normalizedTo) : resolved
+    const compareTarget = location.path ? createRoute(null, location) : route
     classes[activeClass] = this.exact
       ? isSameRoute(current, compareTarget)
       : isIncludedRoute(current, compareTarget)
 
     const handler = e => {
       if (guardEvent(e)) {
         if (this.replace) {
-          router.replace(normalizedTo)
+          router.replace(location)
         } else {
-          router.push(normalizedTo)
+          router.push(location)
         }
       }
     }

src/index.js

@@ -123,7 +123,7 @@ export default class VueRouter {
 
   getMatchedComponents (to?: RawLocation): Array<any> {
     const route = to
-      ? this.resolve(to).resolved
+      ? this.resolve(to).route
       : this.currentRoute
     if (!route) {
       return []
@@ -140,19 +140,25 @@ export default class VueRouter {
     current?: Route,
     append?: boolean
   ): {
+    location: Location,
+    route: Route,
+    href: string,
+    // for backwards compat
     normalizedTo: Location,
-    resolved: Route,
-    href: string
+    resolved: Route
   } {
-    const normalizedTo = normalizeLocation(to, current || this.history.current, append)
-    const resolved = this.match(normalizedTo, current)
-    const fullPath = resolved.redirectedFrom || resolved.fullPath
+    const location = normalizeLocation(to, current || this.history.current, append)
+    const route = this.match(location, current)
+    const fullPath = route.redirectedFrom || route.fullPath
     const base = this.history.base
     const href = createHref(base, fullPath, this.mode)
     return {
-      normalizedTo,
-      resolved,
-      href
+      location,
+      route,
+      href,
+      // for backwards compat
+      normalizedTo: location,
+      resolved: route
     }
   }
 

types/router.d.ts

@@ -30,9 +30,12 @@ declare class VueRouter {
   getMatchedComponents (to?: RawLocation): Component[];
   addRoutes (routes: RouteConfig[]): void;
   resolve (to: RawLocation, current?: Route, append?: boolean): {
+    location: Location;
+    route: Route;
+    href: string;
+    // backwards compat
     normalizedTo: Location;
     resolved: Route;
-    href: string;
   };
 
   static install: PluginFunction<never>;