Add Router#url() query params support

Author: wachunei

lib/layer.js

@@ -1,5 +1,6 @@
 var debug = require('debug')('koa-router');
 var pathToRegExp = require('path-to-regexp');
+var uri = require('urijs');
 
 module.exports = Layer;
 
@@ -112,27 +113,42 @@ Layer.prototype.captures = function (path) {
  * @private
  */
 
-Layer.prototype.url = function (params) {
+Layer.prototype.url = function (params, options) {
   var args = params;
   var url = this.path.replace('\(\.\*\)', '');
   var toPath = pathToRegExp.compile(url);
+  var replaced;
 
-  // argument is of form { key: val }
   if (typeof params != 'object') {
     args = Array.prototype.slice.call(arguments);
+    if (typeof args[args.length - 1] == 'object') {
+      options = args[args.length - 1];
+      args = args.slice(0, args.length - 1);
+    }
   }
 
+  var tokens = pathToRegExp.parse(url);
+  var replace = {};
+
   if (args instanceof Array) {
-    var tokens = pathToRegExp.parse(url);
-    var replace = {};
     for (var len = tokens.length, i=0, j=0; i<len; i++) {
       if (tokens[i].name) replace[tokens[i].name] = args[j++];
     }
-    return toPath(replace);
+  } else if (tokens.some(token => token.name)) {
+    replace = params;
+  } else {
+    options = params;
   }
-  else {
-    return toPath(params);
+
+  replaced = toPath(replace);
+
+  if (options && options.query) {
+    var replaced = new uri(replaced)
+    replaced.search(options.query);
+    return replaced.toString();
   }
+
+  return replaced;
 };
 
 /**

package.json

@@ -22,7 +22,8 @@
     "http-errors": "^1.3.1",
     "koa-compose": "^3.0.0",
     "methods": "^1.0.1",
-    "path-to-regexp": "^1.1.1"
+    "path-to-regexp": "^1.1.1",
+    "urijs": "^1.19.0"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",