@koa/router 9.3.0 → 10.1.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');
 
@@ -25,9 +24,9 @@ function Layer(path, methods, middleware, opts) {
   this.paramNames = [];
   this.stack = Array.isArray(middleware) ? middleware : [middleware];
 
-  for(let i = 0; i < methods.length; i++) {
+  for (let i = 0; i < methods.length; i++) {
     const l = this.methods.push(methods[i].toUpperCase());
-    if (this.methods[l-1] === 'GET') this.methods.unshift('HEAD');
+    if (this.methods[l - 1] === 'GET') this.methods.unshift('HEAD');
   }
 
   // ensure middleware is a function
@@ -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}`);
 };
 
 /**
@@ -71,10 +68,10 @@ Layer.prototype.match = function (path) {
 Layer.prototype.params = function (path, captures, existingParams) {
   const params = existingParams || {};
 
-  for (let len = captures.length, i=0; i<len; i++) {
+  for (let len = captures.length, i = 0; i < len; i++) {
     if (this.paramNames[i]) {
       const c = captures[i];
-      params[this.paramNames[i].name] = c ? safeDecodeURIComponent(c) : c;
+      if (c && c.length !== 0) params[this.paramNames[i].name] = c ? safeDecodeURIComponent(c) : c;
     }
   }
 
@@ -128,7 +125,7 @@ Layer.prototype.url = function (params, options) {
   let replace = {};
 
   if (args instanceof Array) {
-    for (let len = tokens.length, i=0, j=0; i<len; i++) {
+    for (let len = tokens.length, i = 0, j = 0; i < len; i++) {
       if (tokens[i].name) replace[tokens[i].name] = args[j++];
     }
   } else if (tokens.some(token => token.name)) {

package/lib/router.js

@@ -362,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;
@@ -532,7 +532,7 @@ Router.prototype.redirect = function (source, destination, code) {
   if (source[0] !== '/') source = this.url(source);
 
   // lookup destination route by name
-  if (destination[0] !== '/') destination = this.url(destination);
+  if (destination[0] !== '/' && !destination.includes('://')) destination = this.url(destination);
 
   return this.all(source, ctx => {
     ctx.redirect(destination);
@@ -588,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.3.0",
+  "version": "10.1.0",
   "author": "Alex Mingoia <talk@alexmingoia.com>",
   "bugs": {
     "url": "https://github.com/koajs/router/issues",