Merge pull request #426 from tejitak/expose-stringifyPath

expose router.stringifyPath (fix #409)

Author: yyx990803

src/directives/link.js

@@ -101,9 +101,9 @@ export default function (Vue) {
     },
 
     onRouteUpdate (route) {
-      // router._stringifyPath is dependent on current route
+      // router.stringifyPath is dependent on current route
       // and needs to be called again whenver route changes.
-      var newPath = this.router._stringifyPath(this.target)
+      var newPath = this.router.stringifyPath(this.target)
       if (this.path !== newPath) {
         this.path = newPath
         this.updateActiveMatch()

src/index.js

@@ -206,7 +206,7 @@ class Router {
       replace = path.replace
       append = path.append
     }
-    path = this._stringifyPath(path)
+    path = this.stringifyPath(path)
     if (path) {
       this.history.go(path, replace, append)
     }
@@ -295,6 +295,47 @@ class Router {
     this._started = false
   }
 
+  /**
+   * Normalize named route object / string paths into
+   * a string.
+   *
+   * @param {Object|String|Number} path
+   * @return {String}
+   */
+
+  stringifyPath (path) {
+    let fullPath = ''
+    if (path && typeof path === 'object') {
+      if (path.name) {
+        const extend = Vue.util.extend
+        const currentParams =
+          this._currentTransition &&
+          this._currentTransition.to.params
+        const targetParams = path.params || {}
+        const params = currentParams
+          ? extend(extend({}, currentParams), targetParams)
+          : targetParams
+        if (path.query) {
+          params.queryParams = path.query
+        }
+        fullPath = encodeURI(this._recognizer.generate(path.name, params))
+      } else if (path.path) {
+        fullPath = encodeURI(path.path)
+        if (path.query) {
+          const query = this._recognizer.generateQueryString(path.query)
+          if (fullPath.indexOf('?') > -1) {
+            fullPath += '&' + query.slice(1)
+          } else {
+            fullPath += query
+          }
+        }
+      }
+    } else {
+      fullPath = encodeURI(path ? path + '' : '')
+    }
+    return fullPath
+  }
+
   // Internal methods ======================================
 
     /**
@@ -558,47 +599,6 @@ class Router {
       })
     }
   }
-
-  /**
-   * Normalize named route object / string paths into
-   * a string.
-   *
-   * @param {Object|String|Number} path
-   * @return {String}
-   */
-
-  _stringifyPath (path) {
-    let fullPath = ''
-    if (path && typeof path === 'object') {
-      if (path.name) {
-        const extend = Vue.util.extend
-        const currentParams =
-          this._currentTransition &&
-          this._currentTransition.to.params
-        const targetParams = path.params || {}
-        const params = currentParams
-          ? extend(extend({}, currentParams), targetParams)
-          : targetParams
-        if (path.query) {
-          params.queryParams = path.query
-        }
-        fullPath = encodeURI(this._recognizer.generate(path.name, params))
-      } else if (path.path) {
-        fullPath = encodeURI(path.path)
-        if (path.query) {
-          const query = this._recognizer.generateQueryString(path.query)
-          if (fullPath.indexOf('?') > -1) {
-            fullPath += '&' + query.slice(1)
-          } else {
-            fullPath += query
-          }
-        }
-      }
-    } else {
-      fullPath = encodeURI(path ? path + '' : '')
-    }
-    return fullPath
-  }
 }
 
 /**

test/unit/specs/core.js

@@ -1117,14 +1117,14 @@ describe('Stringify Path', function () {
   })
 
   it('plain string', function () {
-    expect(router._stringifyPath('a')).toBe('a')
+    expect(router.stringifyPath('a')).toBe('a')
   })
 
   it('object path', function () {
-    expect(router._stringifyPath({ path: '/hi' })).toBe('/hi')
-    expect(router._stringifyPath({ path: '/hi', query: { a: 1 } })).toBe('/hi?a=1')
-    expect(router._stringifyPath({ path: '/hi', query: { a: 1, b: 2 } })).toBe('/hi?a=1&b=2')
-    expect(router._stringifyPath({ path: '/hi?c=3', query: { a: 1, b: 2 } })).toBe('/hi?c=3&a=1&b=2')
+    expect(router.stringifyPath({ path: '/hi' })).toBe('/hi')
+    expect(router.stringifyPath({ path: '/hi', query: { a: 1 } })).toBe('/hi?a=1')
+    expect(router.stringifyPath({ path: '/hi', query: { a: 1, b: 2 } })).toBe('/hi?a=1&b=2')
+    expect(router.stringifyPath({ path: '/hi?c=3', query: { a: 1, b: 2 } })).toBe('/hi?c=3&a=1&b=2')
   })
 
   it('named route', function () {
@@ -1134,14 +1134,14 @@ describe('Stringify Path', function () {
         component: {}
       }
     })
-    expect(router._stringifyPath({ name: 'a' })).toBe('/test/:id')
-    expect(router._stringifyPath({ name: 'a', params: { id: 0 } })).toBe('/test/0')
-    expect(router._stringifyPath({ name: 'a', params: { id: 'hi' } })).toBe('/test/hi')
+    expect(router.stringifyPath({ name: 'a' })).toBe('/test/:id')
+    expect(router.stringifyPath({ name: 'a', params: { id: 0 } })).toBe('/test/0')
+    expect(router.stringifyPath({ name: 'a', params: { id: 'hi' } })).toBe('/test/hi')
   })
 
   it('named route not found should throw error', function () {
     expect(function () {
-      router._stringifyPath({
+      router.stringifyPath({
         name: 'a'
       })
     }).toThrow()
@@ -1154,9 +1154,9 @@ describe('Stringify Path', function () {
         component: {}
       }
     })
-    expect(router._stringifyPath('/hi/你好')).toBe(encodeURI('/hi/你好'))
-    expect(router._stringifyPath({ path: '/hi/你好' })).toBe(encodeURI('/hi/你好'))
-    expect(router._stringifyPath({ name: 'a', params: { id: '你好' }})).toBe(encodeURI('/test/你好'))
+    expect(router.stringifyPath('/hi/你好')).toBe(encodeURI('/hi/你好'))
+    expect(router.stringifyPath({ path: '/hi/你好' })).toBe(encodeURI('/hi/你好'))
+    expect(router.stringifyPath({ name: 'a', params: { id: '你好' }})).toBe(encodeURI('/test/你好'))
   })
 
 })