Chore: Add pathIsRegexp option to docs, revert new trailing option as unneeded

lib/layer.js

@@ -1,6 +1,6 @@
 const { parse: parseUrl, format: formatUrl } = require('node:url');
 
 const { pathToRegexp, compile, parse, stringify } = require('path-to-regexp');
 
 module.exports = class Layer {
   /**
@@ -13,6 +13,7 @@
    * @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
    */
@@ -45,6 +46,11 @@
     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;
@@ -114,7 +120,7 @@
     const url = this.path.replace(/\(\.\*\)/g, '');
 
     if (typeof params !== 'object') {
       args = Array.prototype.slice.call(arguments);
       if (typeof args[args.length - 1] === 'object') {
         options = args[args.length - 1];
         args = args.slice(0, -1);
@@ -197,7 +203,7 @@
     const x = names.indexOf(param);
     if (x > -1) {
       // iterate through the stack, to figure out where to place the handler fn
       stack.some((fn, i) => {
         // param handlers are always first, so when we find an fn w/o a param property, stop here
         // if the param handler at this part of the stack comes after the one we are adding, stop here
         if (!fn.param || names.indexOf(fn.param) > x) {

lib/router.js

@@ -126,7 +126,7 @@
     if (Array.isArray(middleware[0]) && typeof middleware[0][0] === 'string') {
       const arrPaths = middleware[0];
       for (const p of arrPaths) {
         router.use.apply(router, [p, ...middleware.slice(1)]);
       }
 
       return this;
@@ -228,7 +228,7 @@
         ctx.routerPath;
       const matched = router.match(path, ctx.method);
       if (ctx.matched) {
         ctx.matched.push.apply(ctx.matched, matched.path);
       } else {
         ctx.matched = matched.path;
       }
@@ -246,7 +246,7 @@
 
       const layerChain = (
         router.exclusive ? [mostSpecificLayer] : matchedLayers
       ).reduce((memo, layer) => {
         memo.push((ctx, next) => {
           ctx.captures = layer.captures(path, ctx.captures);
           ctx.request.params = layer.params(path, ctx.captures, ctx.params);
@@ -381,9 +381,9 @@
    */
   all(name, path, 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;
     }
@@ -467,7 +467,7 @@
     // support array of paths
     if (Array.isArray(path)) {
       for (const curPath of path) {
         router.register.call(router, curPath, methods, middleware, opts);
       }
 
       return this;
@@ -481,8 +481,7 @@
       strict: opts.strict || false,
       prefix: opts.prefix || '',
       ignoreCaptures: opts.ignoreCaptures,
-      pathIsRegexp: opts.pathIsRegexp,
-      trailing: opts.trailing
+      pathIsRegexp: opts.pathIsRegexp
     });
 
     // if parent prefix exists, add prefix to new route
@@ -555,7 +554,7 @@
    */
   url(name, ...args) {
     const route = this.route(name);
     if (route) return route.url.apply(route, args);
 
     return new Error(`No route found for name: ${String(name)}`);
   }

test/lib/router.js

@@ -1657,7 +1657,7 @@ describe('Router#opts', () => {
   it('responds with 200', async () => {
     const app = new Koa();
     const router = new Router({
-      trailing: false
+      strict: true
     });
     router.get('/info', (ctx) => {
       ctx.body = 'hello';
@@ -1689,7 +1689,7 @@ describe('Router#opts', () => {
   it('responds with 404 when has a trailing slash', async () => {
     const app = new Koa();
     const router = new Router({
-      trailing: false
+      strict: true
     });
     router.get('/info', (ctx) => {
       ctx.body = 'hello';
@@ -1704,7 +1704,7 @@ describe('use middleware with opts', () => {
   it('responds with 200', async () => {
     const app = new Koa();
     const router = new Router({
-      trailing: false
+      strict: true
     });
     router.get('/info', (ctx) => {
       ctx.body = 'hello';
@@ -1720,7 +1720,7 @@ describe('use middleware with opts', () => {
   it('responds with 404 when has a trailing slash', async () => {
     const app = new Koa();
     const router = new Router({
-      trailing: false
+      strict: true
     });
     router.get('/info', (ctx) => {
       ctx.body = 'hello';