@koa/router 8.0.3 → 8.0.8

package/README.md

@@ -17,12 +17,6 @@ Router middleware for [koa](https://github.com/koajs/koa)
 * Multiple and nestable routers
 * `async/await` support
 
-## Call for Maintainers
-
-This module is forked from the original [koa-router](https://github.com/ZijianHe/koa-router) due to its lack of activity. `koa-router` is the most widely used router module in the Koa community and we need maintainers. If you're interested in fixing bugs or implementing new features feel free to open a pull request. We'll be adding active contributors as collaborators.
-
-Thanks to the original authors @alexmingoia and the original team for their great work.
-
 ## Migrating to 7 / Koa 2
 
 - The API has changed to match the new promise-based middleware
@@ -53,3 +47,10 @@ Run tests using `npm test`.
 ## Support
 
 If you have any problem or suggestion please open an issue [here](https://github.com/koajs/router/issues).
+
+## Call for Maintainers
+
+This module is forked from the original [koa-router](https://github.com/ZijianHe/koa-router) due to its lack of activity. `koa-router` is the most widely used router module in the Koa community and we need maintainers. If you're interested in fixing bugs or implementing new features feel free to open a pull request. We'll be adding active contributors as collaborators.
+
+Thanks to the original authors @alexmingoia and the original team for their great work.
+

package/lib/layer.js

@@ -25,15 +25,16 @@ function Layer(path, methods, middleware, opts) {
   this.paramNames = [];
   this.stack = Array.isArray(middleware) ? middleware : [middleware];
 
-  methods.forEach(function(method) {
-    var l = this.methods.push(method.toUpperCase());
+  for(var i = 0; i < methods.length; i++) {
+    var l = this.methods.push(methods[i].toUpperCase());
     if (this.methods[l-1] === 'GET') {
-      this.methods.unshift('HEAD');
+       this.methods.unshift('HEAD');
     }
-  }, this);
+  }
 
   // ensure middleware is a function
-  this.stack.forEach(function(fn) {
+  for (var i = 0; i < this.stack.length; i++) {
+    var fn = this.stack[i];
     var type = (typeof fn);
     if (type !== 'function') {
       throw new Error(
@@ -41,7 +42,7 @@ function Layer(path, methods, middleware, opts) {
         + "must be a function, not `" + type + "`"
       );
     }
-  }, this);
+  }
 
   this.path = path;
   this.regexp = pathToRegExp(path, this.paramNames, this.opts);

package/lib/router.js

@@ -187,25 +187,28 @@ function Router(opts) {
  * @returns {Router}
  */
 
-methods.forEach(function (method) {
-  Router.prototype[method] = function (name, path, middleware) {
-    var middleware;
-
-    if (typeof path === 'string' || path instanceof RegExp) {
-      middleware = Array.prototype.slice.call(arguments, 2);
-    } else {
-      middleware = Array.prototype.slice.call(arguments, 1);
-      path = name;
-      name = null;
-    }
+for (var i = 0; i < methods.length; i++) {
+  function setMethodVerb(method) {
+    Router.prototype[method] = function(name, path, middleware) {
+      var middleware;
+
+      if (typeof path === "string" || path instanceof RegExp) {
+        middleware = Array.prototype.slice.call(arguments, 2);
+      } else {
+        middleware = Array.prototype.slice.call(arguments, 1);
+        path = name;
+        name = null;
+      }
 
-    this.register(path, [method], middleware, {
-      name: name
-    });
+      this.register(path, [method], middleware, {
+        name: name
+      });
 
-    return this;
-  };
-});
+      return this;
+    };
+  }
+  setMethodVerb(methods[i]);
+}
 
 // Alias for `router.delete()` because delete is a reserved word
 Router.prototype.del = Router.prototype['delete'];
@@ -247,10 +250,11 @@ Router.prototype.use = function () {
 
   // support array of paths
   if (Array.isArray(middleware[0]) && typeof middleware[0][0] === 'string') {
-    middleware[0].forEach(function (p) {
+    var arrPaths = middleware[0];
+    for (var i = 0; i < arrPaths.length; i++) {
+      var p = arrPaths[i];
       router.use.apply(router, [p].concat(middleware.slice(1)));
-    });
-
+    }
     return this;
   }
 
@@ -259,30 +263,40 @@ Router.prototype.use = function () {
     path = middleware.shift();
   }
 
-  middleware.forEach(function (m) {
+  for (var i = 0; i < middleware.length; i++) {
+    var m = middleware[i];
     if (m.router) {
-      const cloneRouter = Object.assign(Object.create(Router.prototype), m.router, {
+      var cloneRouter = Object.assign(Object.create(Router.prototype), m.router, {
         stack: m.router.stack.slice(0)
       });
 
-      cloneRouter.stack.forEach(function (nestedLayer, index) {
-        const cloneLayer = Object.assign(Object.create(Layer.prototype), nestedLayer);
+      for (var j = 0; j < cloneRouter.stack.length; j++) {
+        var nestedLayer = cloneRouter.stack[j];
+        var cloneLayer = Object.assign(
+          Object.create(Layer.prototype),
+          nestedLayer
+        );
 
         if (path) cloneLayer.setPrefix(path);
         if (router.opts.prefix) cloneLayer.setPrefix(router.opts.prefix);
         router.stack.push(cloneLayer);
-        this[index] = cloneLayer;
-      }, cloneRouter.stack);
+        cloneRouter.stack[j] = cloneLayer;
+      }
 
       if (router.params) {
-        Object.keys(router.params).forEach(function (key) {
-          cloneRouter.param(key, router.params[key]);
-        });
+        function setRouterParams(paramArr) {
+          var routerParams = paramArr;
+          for (var j = 0; j < routerParams.length; j++) {
+            var key = routerParams[j];
+            cloneRouter.param(key, router.params[key]);
+          }
+        }
+        setRouterParams(Object.keys(router.params));
       }
     } else {
       router.register(path || '(.*)', [], m, { end: false, ignoreCaptures: !hasPath });
     }
-  });
+  }
 
   return this;
 };
@@ -305,10 +319,11 @@ Router.prototype.prefix = function (prefix) {
 
   this.opts.prefix = prefix;
 
-  this.stack.forEach(function (route) {
+  for (var i = 0; i < this.stack.length; i++) {
+    var route = this.stack[i];
     route.setPrefix(prefix);
-  });
-
+  }
+  
   return this;
 };
 
@@ -415,11 +430,13 @@ Router.prototype.allowedMethods = function (options) {
       var allowed = {};
 
       if (!ctx.status || ctx.status === 404) {
-        ctx.matched.forEach(function (route) {
-          route.methods.forEach(function (method) {
-            allowed[method] = method;
-          });
-        });
+        for (var i = 0; i < ctx.matched.length; i++) {
+          var route = ctx.matched[i];
+          for (var j = 0; j < route.methods.length; j++) {
+            var method = route.methods[j];
+              allowed[method] = method
+          }
+        }
 
         var allowedArr = Object.keys(allowed);
 
@@ -549,9 +566,10 @@ Router.prototype.register = function (path, methods, middleware, opts) {
 
   // support array of paths
   if (Array.isArray(path)) {
-    path.forEach(function (p) {
-      router.register.call(router, p, methods, middleware, opts);
-    });
+    for (var i = 0; i < path.length; i++) {
+      var curPath = path[i];
+      router.register.call(router, curPath, methods, middleware, opts);
+    }
 
     return this;
   }
@@ -571,9 +589,10 @@ Router.prototype.register = function (path, methods, middleware, opts) {
   }
 
   // add parameter middleware
-  Object.keys(this.params).forEach(function (param) {
+  for (var i = 0; i < Object.keys(this.params).length; i++) {
+    var param = Object.keys(this.params)[i];
     route.param(param, this.params[param]);
-  }, this);
+  }
 
   stack.push(route);
 
@@ -712,11 +731,13 @@ Router.prototype.match = function (path, method) {
  * @returns {Router}
  */
 
-Router.prototype.param = function (param, middleware) {
+Router.prototype.param = function(param, middleware) {
   this.params[param] = middleware;
-  this.stack.forEach(function (route) {
+  for (var i = 0; i < this.stack.length; i++) {
+    var route = this.stack[i];
     route.param(param, middleware);
-  });
+  }
+
   return this;
 };
 
@@ -734,7 +755,7 @@ Router.prototype.param = function (param, middleware) {
  * @param {Object} params url parameters
  * @returns {String}
  */
-Router.url = function (path, params) {
+Router.url = function (path) {
     var args = Array.prototype.slice.call(arguments, 1);
     return Layer.prototype.url.apply({ path: path }, args);
 };

package/package.json

@@ -1,44 +1,49 @@
 {
   "name": "@koa/router",
   "description": "Router middleware for koa. Provides RESTful resource routing.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/koajs/koa-router.git"
-  },
-  "main": "lib/router.js",
-  "files": [
-    "lib"
-  ],
+  "version": "8.0.8",
   "author": "Alex Mingoia <talk@alexmingoia.com>",
-  "version": "8.0.3",
-  "keywords": [
-    "koa",
-    "middleware",
-    "router",
-    "route"
-  ],
+  "bugs": {
+    "url": "https://github.com/koajs/router/issues",
+    "email": "niftylettuce@gmail.com"
+  },
   "dependencies": {
-    "debug": "^3.1.0",
-    "http-errors": "^1.3.1",
-    "koa-compose": "^3.0.0",
-    "methods": "^1.0.1",
-    "path-to-regexp": "^1.1.1",
-    "urijs": "^1.19.0"
+    "debug": "^4.1.1",
+    "http-errors": "^1.7.3",
+    "koa-compose": "^4.1.0",
+    "methods": "^1.1.2",
+    "path-to-regexp": "1.x",
+    "urijs": "^1.19.2"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "jsdoc-to-markdown": "^5.0.1",
-    "koa": "2.2.0",
-    "mocha": "^6.2.0",
-    "should": "^6.0.3",
+    "jsdoc-to-markdown": "^5.0.3",
+    "koa": "^2.11.0",
+    "mocha": "^6.2.2",
+    "should": "^13.2.3",
     "supertest": "^4.0.2"
   },
-  "scripts": {
-    "test": "NODE_ENV=test mocha test/**/*.js",
-    "docs": "NODE_ENV=test jsdoc2md -t ./lib/API_tpl.hbs --src ./lib/*.js  >| API.md"
-  },
   "engines": {
     "node": ">= 8.0.0"
   },
-  "license": "MIT"
+  "files": [
+    "lib"
+  ],
+  "homepage": "https://github.com/koajs/router",
+  "keywords": [
+    "koa",
+    "middleware",
+    "route",
+    "router"
+  ],
+  "license": "MIT",
+  "main": "lib/router.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/koajs/koa-router.git"
+  },
+  "scripts": {
+    "docs": "NODE_ENV=test jsdoc2md -t ./lib/API_tpl.hbs --src ./lib/*.js  >| API.md",
+    "test": "NODE_ENV=test mocha test/**/*.js"
+  }
 }