@koa/router 9.1.0 → 9.4.0

package/lib/layer.js

@@ -1,4 +1,3 @@
-const debug = require('debug')('koa-router');
 const { pathToRegexp, compile, parse } = require('path-to-regexp');
 const { parse: parseUrl, format: formatUrl } = require('url');
 
@@ -42,8 +41,6 @@ function Layer(path, methods, middleware, opts) {
 
   this.path = path;
   this.regexp = pathToRegexp(path, this.paramNames, this.opts);
-
-  debug('defined route %s %s', this.methods, `${this.opts.prefix}${this.path}`);
 };
 
 /**
@@ -133,7 +130,7 @@ Layer.prototype.url = function (params, options) {
     }
   } else if (tokens.some(token => token.name)) {
     replace = params;
-  } else {
+  } else if (!options) {
     options = params;
   }
 

package/lib/router.js

@@ -10,6 +10,7 @@ const compose = require('koa-compose');
 const HttpError = require('http-errors');
 const methods = require('methods');
 const Layer = require('./layer');
+const { pathToRegexp } = require('path-to-regexp');
 
 /**
  * @module koa-router
@@ -289,7 +290,10 @@ Router.prototype.use = function () {
         setRouterParams(Object.keys(router.params));
       }
     } else {
-      router.register(path || '(.*)', [], m, { end: false, ignoreCaptures: !hasPath });
+      const keys = [];
+      pathToRegexp(router.opts.prefix || '', keys);
+      const routerPrefixHasParam = router.opts.prefix && keys.length;
+      router.register(path || '([^\/]*)', [], m, { end: false, ignoreCaptures: !hasPath && !routerPrefixHasParam });
     }
   }
 
@@ -358,7 +362,7 @@ Router.prototype.routes = Router.prototype.middleware = function () {
     layerChain = matchedLayers.reduce(function(memo, layer) {
       memo.push(function(ctx, next) {
         ctx.captures = layer.captures(path, ctx.captures);
-        ctx.params = layer.params(path, ctx.captures, ctx.params);
+        ctx.params = ctx.request.params = layer.params(path, ctx.captures, ctx.params);
         ctx.routerPath = layer.path;
         ctx.routerName = layer.name;
         ctx._matchedRoute = layer.path;
@@ -584,6 +588,8 @@ Router.prototype.register = function (path, methods, middleware, opts) {
 
   stack.push(route);
 
+  debug('defined route %s %s', route.methods, route.path);
+
   return route;
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@koa/router",
   "description": "Router middleware for koa. Provides RESTful resource routing.",
-  "version": "9.1.0",
+  "version": "9.4.0",
   "author": "Alex Mingoia <talk@alexmingoia.com>",
   "bugs": {
     "url": "https://github.com/koajs/router/issues",