handle query string in redirect

Author: yyx990803

src/router/internal.js

@@ -90,38 +90,17 @@ module.exports = function (Vue, Router) {
     var router = this
     this._guardRecognizer.add([{
       path: path,
-      handler: function (match) {
-        var realPath = mappedPath
-        if (match.isDynamic) {
-          for (var key in match.params) {
-            realPath = replaceParam(realPath, match, key)
-          }
-        }
+      handler: function (match, query) {
+        var realPath = routerUtil.mapParams(
+          mappedPath,
+          match.params,
+          query
+        )
         handler.call(router, realPath)
       }
     }])
   }
 
-  /**
-   * Replace a param segment with real value in a matched
-   * path.
-   *
-   * @param {String} path
-   * @param {Object} match
-   * @param {String} key
-   * @return {String}
-   */
-
-  function replaceParam (path, match, key) {
-    var regex = new RegExp(':' + key + '(\\/|$)')
-    var value = match.params[key]
-    return path.replace(regex, function (m) {
-      return m.charAt(m.length - 1) === '/'
-        ? value + '/'
-        : value
-    })
-  }
-
   /**
    * Check if a path matches any redirect records.
    *
@@ -132,7 +111,7 @@ module.exports = function (Vue, Router) {
   p._checkGuard = function (path) {
     var matched = this._guardRecognizer.recognize(path)
     if (matched) {
-      matched[0].handler(matched[0])
+      matched[0].handler(matched[0], matched.queryParams)
       return true
     }
   }

src/util.js

@@ -1,3 +1,6 @@
+var RouteRecognizer = require('route-recognizer')
+var genQuery = RouteRecognizer.prototype.generateQueryString
+
 /**
  * Warn stuff.
  *
@@ -113,3 +116,41 @@ exports.resolveAsyncComponent = function (handler, cb) {
     cb(Component)
   })
 }
+
+/**
+ * Map the dynamic segments in a path to params.
+ *
+ * @param {String} path
+ * @param {Object} params
+ * @param {Object} query
+ */
+
+exports.mapParams = function (path, params, query) {
+  for (var key in params) {
+    path = replaceParam(path, params, key)
+  }
+  if (query) {
+    path += genQuery(query)
+  }
+  return path
+}
+
+/**
+ * Replace a param segment with real value in a matched
+ * path.
+ *
+ * @param {String} path
+ * @param {Object} params
+ * @param {String} key
+ * @return {String}
+ */
+
+function replaceParam (path, params, key) {
+  var regex = new RegExp(':' + key + '(\\/|$)')
+  var value = params[key]
+  return path.replace(regex, function (m) {
+    return m.charAt(m.length - 1) === '/'
+      ? value + '/'
+      : value
+  })
+}

test/unit/specs/core.js

@@ -319,7 +319,7 @@ describe('Core', function () {
           },
           '/c': {
             component: {
-              template: 'world'
+              template: '{{$route.query.msg}}'
             }
           }
         }
@@ -335,7 +335,7 @@ describe('Core', function () {
     router.start(App, el)
     assertRoutes([
       ['/whatever', 'hello'],
-      ['/ok', 'world']
+      ['/ok?msg=world', 'world']
     ], done)
   })