@koa/router 13.0.1 → 13.1.1

package/lib/layer.js

@@ -1,6 +1,6 @@
 const { parse: parseUrl, format: formatUrl } = require('node:url');
 
-const { pathToRegexp, compile, parse, stringify } = require('path-to-regexp');
+const { pathToRegexp, compile, parse } = require('path-to-regexp');
 
 module.exports = class Layer {
   /**
@@ -13,7 +13,6 @@ module.exports = class Layer {
    * @param {String=} opts.name route name
    * @param {String=} opts.sensitive case sensitive (default: false)
    * @param {String=} opts.strict require the trailing slash (default: false)
-   * @param {Boolean=} opts.pathIsRegexp if true, treat `path` as a regular expression
    * @returns {Layer}
    * @private
    */
@@ -42,19 +41,7 @@ module.exports = class Layer {
     }
 
     this.path = path;
-
-    if (this.opts.pathIsRegexp === true) {
-      this.regexp = new RegExp(path);
-    } else if (this.path) {
-      if (this.opts.strict === true) {
-        // path-to-regexp renamed strict to trailing in v8.1.0
-        this.opts.trailing = false;
-      }
-
-      const { regexp: regex, keys } = pathToRegexp(this.path, this.opts);
-      this.regexp = regex;
-      this.paramNames = keys;
-    }
+    this.regexp = pathToRegexp(path, this.paramNames, this.opts);
   }
 
   /**
@@ -129,14 +116,13 @@ module.exports = class Layer {
 
     const toPath = compile(url, { encode: encodeURIComponent, ...options });
     let replaced;
-    const { tokens } = parse(url);
+
+    const tokens = parse(url);
     let replace = {};
 
     if (Array.isArray(args)) {
       for (let len = tokens.length, i = 0, j = 0; i < len; i++) {
-        if (tokens[i].name) {
-          replace[tokens[i].name] = args[j++];
-        }
+        if (tokens[i].name) replace[tokens[i].name] = args[j++];
       }
     } else if (tokens.some((token) => token.name)) {
       replace = params;
@@ -144,10 +130,6 @@ module.exports = class Layer {
       options = params;
     }
 
-    for (const [key, value] of Object.entries(replace)) {
-      replace[key] = String(value);
-    }
-
     replaced = toPath(replace);
 
     if (options && options.query) {
@@ -230,13 +212,8 @@ module.exports = class Layer {
         this.path !== '/' || this.opts.strict === true
           ? `${prefix}${this.path}`
           : prefix;
-      if (this.opts.pathIsRegexp === true || prefix instanceof RegExp) {
-        this.regexp = new RegExp(this.path);
-      } else if (this.path) {
-        const { regexp: regex, keys } = pathToRegexp(this.path, this.opts);
-        this.regexp = regex;
-        this.paramNames = keys;
-      }
+      this.paramNames = [];
+      this.regexp = pathToRegexp(this.path, this.paramNames, this.opts);
     }
 
     return this;
@@ -254,6 +231,7 @@ module.exports = class Layer {
 
 function safeDecodeURIComponent(text) {
   try {
+    // TODO: take a look on `safeDecodeURIComponent` if we use it only with route params let's remove the `replace` method otherwise make it flexible.
     // @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent#decoding_query_parameters_from_a_url
     return decodeURIComponent(text.replace(/\+/g, ' '));
   } catch {

package/lib/router.js

@@ -5,9 +5,8 @@
  * @link https://github.com/alexmingoia/koa-router
  */
 const http = require('node:http');
-const util = require('node:util');
 
-const debug = util.debuglog('koa-router');
+const debug = require('debug')('koa-router');
 
 const compose = require('koa-compose');
 const HttpError = require('http-errors');
@@ -165,14 +164,14 @@ class Router {
           }
         }
       } else {
-        const { keys } = pathToRegexp(router.opts.prefix || '', router.opts);
+        const keys = [];
+        pathToRegexp(router.opts.prefix || '', keys);
         const routerPrefixHasParam = Boolean(
           router.opts.prefix && keys.length > 0
         );
         router.register(path || '([^/]*)', [], m, {
           end: false,
-          ignoreCaptures: !hasPath && !routerPrefixHasParam,
-          pathIsRegexp: true
+          ignoreCaptures: !hasPath && !routerPrefixHasParam
         });
       }
     }
@@ -380,7 +379,7 @@ class Router {
    * @returns {Router}
    */
   all(name, path, middleware) {
-    if (typeof path === 'string' || path instanceof RegExp) {
+    if (typeof path === 'string') {
       middleware = Array.prototype.slice.call(arguments, 2);
     } else {
       middleware = Array.prototype.slice.call(arguments, 1);
@@ -396,12 +395,7 @@ class Router {
     )
       throw new Error('You have to provide a path when adding an all handler');
 
-    const opts = {
-      name,
-      pathIsRegexp: path instanceof RegExp
-    };
-
-    this.register(path, methods, middleware, { ...this.opts, ...opts });
+    this.register(path, methods, middleware, { name });
 
     return this;
   }
@@ -460,10 +454,10 @@ class Router {
    * @returns {Layer}
    * @private
    */
-  register(path, methods, middleware, newOpts = {}) {
+  register(path, methods, middleware, opts = {}) {
     const router = this;
     const { stack } = this;
-    const opts = { ...this.opts, ...newOpts };
+
     // support array of paths
     if (Array.isArray(path)) {
       for (const curPath of path) {
@@ -477,14 +471,12 @@ class Router {
     const route = new Layer(path, methods, middleware, {
       end: opts.end === false ? opts.end : true,
       name: opts.name,
-      sensitive: opts.sensitive || false,
-      strict: opts.strict || false,
-      prefix: opts.prefix || '',
-      ignoreCaptures: opts.ignoreCaptures,
-      pathIsRegexp: opts.pathIsRegexp
+      sensitive: opts.sensitive || this.opts.sensitive || false,
+      strict: opts.strict || this.opts.strict || false,
+      prefix: opts.prefix || this.opts.prefix || '',
+      ignoreCaptures: opts.ignoreCaptures
     });
 
-    // if parent prefix exists, add prefix to new route
     if (this.opts.prefix) {
       route.setPrefix(this.opts.prefix);
     }
@@ -819,13 +811,8 @@ for (const method of methods) {
         `You have to provide a path when adding a ${method} handler`
       );
 
-    const opts = {
-      name,
-      pathIsRegexp: path instanceof RegExp
-    };
+    this.register(path, [method], middleware, { name });
 
-    // pass opts to register call on verb methods
-    this.register(path, [method], middleware, { ...this.opts, ...opts });
     return this;
   };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@koa/router",
   "description": "Router middleware for koa. Maintained by Forward Email and Lad.",
-  "version": "13.0.1",
+  "version": "13.1.1",
   "author": "Alex Mingoia <talk@alexmingoia.com>",
   "bugs": {
     "url": "https://github.com/koajs/router/issues",
@@ -21,9 +21,10 @@
     }
   ],
   "dependencies": {
+    "debug": "^4.4.1",
     "http-errors": "^2.0.0",
     "koa-compose": "^4.1.0",
-    "path-to-regexp": "^8.1.0"
+    "path-to-regexp": "^6.3.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.2",