@koa/router 13.0.0 → 13.0.1

package/lib/layer.js

@@ -1,6 +1,6 @@
 const { parse: parseUrl, format: formatUrl } = require('node:url');
 
-const { pathToRegexp, compile, parse } = require('path-to-regexp');
+const { pathToRegexp, compile, parse, stringify } = require('path-to-regexp');
 
 module.exports = class Layer {
   /**
@@ -13,6 +13,7 @@ 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
    */
@@ -41,7 +42,19 @@ module.exports = class Layer {
     }
 
     this.path = path;
-    this.regexp = pathToRegexp(path, this.paramNames, this.opts);
+
+    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;
+    }
   }
 
   /**
@@ -116,13 +129,14 @@ 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;
@@ -130,6 +144,10 @@ 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) {
@@ -212,8 +230,13 @@ module.exports = class Layer {
         this.path !== '/' || this.opts.strict === true
           ? `${prefix}${this.path}`
           : prefix;
-      this.paramNames = [];
-      this.regexp = pathToRegexp(this.path, this.paramNames, this.opts);
+      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;
+      }
     }
 
     return this;

package/lib/router.js

@@ -165,14 +165,14 @@ class Router {
           }
         }
       } else {
-        const keys = [];
-        pathToRegexp(router.opts.prefix || '', keys);
+        const { keys } = pathToRegexp(router.opts.prefix || '', router.opts);
         const routerPrefixHasParam = Boolean(
           router.opts.prefix && keys.length > 0
         );
         router.register(path || '([^/]*)', [], m, {
           end: false,
-          ignoreCaptures: !hasPath && !routerPrefixHasParam
+          ignoreCaptures: !hasPath && !routerPrefixHasParam,
+          pathIsRegexp: true
         });
       }
     }
@@ -228,7 +228,7 @@ class Router {
         ctx.routerPath;
       const matched = router.match(path, ctx.method);
       if (ctx.matched) {
-        ctx.matched.push(matched.path);
+        ctx.matched.push.apply(ctx.matched, matched.path);
       } else {
         ctx.matched = matched.path;
       }
@@ -380,7 +380,7 @@ class Router {
    * @returns {Router}
    */
   all(name, path, middleware) {
-    if (typeof path === 'string') {
+    if (typeof path === 'string' || path instanceof RegExp) {
       middleware = Array.prototype.slice.call(arguments, 2);
     } else {
       middleware = Array.prototype.slice.call(arguments, 1);
@@ -396,7 +396,12 @@ class Router {
     )
       throw new Error('You have to provide a path when adding an all handler');
 
-    this.register(path, methods, middleware, { name });
+    const opts = {
+      name,
+      pathIsRegexp: path instanceof RegExp
+    };
+
+    this.register(path, methods, middleware, { ...this.opts, ...opts });
 
     return this;
   }
@@ -455,10 +460,10 @@ class Router {
    * @returns {Layer}
    * @private
    */
-  register(path, methods, middleware, opts = {}) {
+  register(path, methods, middleware, newOpts = {}) {
     const router = this;
     const { stack } = this;
-
+    const opts = { ...this.opts, ...newOpts };
     // support array of paths
     if (Array.isArray(path)) {
       for (const curPath of path) {
@@ -472,12 +477,14 @@ class Router {
     const route = new Layer(path, methods, middleware, {
       end: opts.end === false ? opts.end : true,
       name: opts.name,
-      sensitive: opts.sensitive || this.opts.sensitive || false,
-      strict: opts.strict || this.opts.strict || false,
-      prefix: opts.prefix || this.opts.prefix || '',
-      ignoreCaptures: opts.ignoreCaptures
+      sensitive: opts.sensitive || false,
+      strict: opts.strict || false,
+      prefix: opts.prefix || '',
+      ignoreCaptures: opts.ignoreCaptures,
+      pathIsRegexp: opts.pathIsRegexp
     });
 
+    // if parent prefix exists, add prefix to new route
     if (this.opts.prefix) {
       route.setPrefix(this.opts.prefix);
     }
@@ -812,8 +819,13 @@ for (const method of methods) {
         `You have to provide a path when adding a ${method} handler`
       );
 
-    this.register(path, [method], middleware, { name });
+    const opts = {
+      name,
+      pathIsRegexp: path instanceof RegExp
+    };
 
+    // 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.0",
+  "version": "13.0.1",
   "author": "Alex Mingoia <talk@alexmingoia.com>",
   "bugs": {
     "url": "https://github.com/koajs/router/issues",
@@ -23,7 +23,7 @@
   "dependencies": {
     "http-errors": "^2.0.0",
     "koa-compose": "^4.1.0",
-    "path-to-regexp": "^6.2.2"
+    "path-to-regexp": "^8.1.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.2",
@@ -60,7 +60,7 @@
   "main": "lib/router.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/koajs/router.git"
+    "url": "git+https://github.com/koajs/router.git"
   },
   "scripts": {
     "bench": "make -C bench",