fix conflict accident per #75 and <11306e1>

koajs · Apr 28, 2020 · 6131069 · 6131069 · avindra · Jul 6, 2020
1 parent 5660b68
commit 6131069
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lib/layer.js b/lib/layer.js
@@ -1,6 +1,6 @@
 const debug = require('debug')('koa-router');
 const { pathToRegexp, compile, parse } = require('path-to-regexp');
-const uri = require('urijs');
+const { parse: parseUrl, format: formatUrl } = require('url');
 
 module.exports = Layer;
 
@@ -145,9 +145,14 @@ Layer.prototype.url = function (params, options) {
   replaced = toPath(replace);
 
   if (options && options.query) {
-    replaced = new uri(replaced)
-    replaced.search(options.query);
-    return replaced.toString();
+    replaced = parseUrl(replaced);
+    if (typeof options.query === 'string') {
+      replaced.search = options.query;
+    } else {
+      replaced.search = undefined;
+      replaced.query = options.query;
+    }
+    return formatUrl(replaced);
   }
 
   return replaced;