@koa/router 15.1.0 → 15.1.2

package/dist/index.d.mts

@@ -172,6 +172,7 @@ declare class Layer<StateT = DefaultState, ContextT = DefaultContext, BodyT = un
     private _reconfigurePathMatching;
 }
 
+type RouterInstance<StateT = koa.DefaultState, ContextT = koa.DefaultContext> = RouterImplementation<StateT, ContextT>;
 /**
  * Middleware with router property
  */
@@ -181,7 +182,7 @@ type RouterComposedMiddleware<StateT = koa.DefaultState, ContextT = koa.DefaultC
 /**
  * @module koa-router
  */
-declare class Router<StateT = koa.DefaultState, ContextT = koa.DefaultContext> {
+declare class RouterImplementation<StateT = koa.DefaultState, ContextT = koa.DefaultContext> {
     opts: RouterOptions;
     methods: string[];
     exclusive: boolean;
@@ -642,7 +643,8 @@ interface RouterConstructor {
     url(path: string, ...parameters: unknown[]): string;
     readonly prototype: Router;
 }
-declare const RouterExport: RouterConstructor;
+type Router<StateT = koa.DefaultState, ContextT = koa.DefaultContext> = RouterInstance<StateT, ContextT>;
+declare const Router: RouterConstructor;
 
 /**
  * Type definitions for @koa/router
@@ -738,7 +740,7 @@ type RouterParameterContext<StateT = DefaultState, ContextT = DefaultContext> =
     /**
      * Router instance
      */
-    router: Router<StateT, ContextT>;
+    router: RouterInstance<StateT, ContextT>;
     /**
      * Matched route path (internal)
      */
@@ -816,7 +818,7 @@ type RouterContext<StateT = DefaultState, ContextT = DefaultContext, BodyT = unk
 /**
  * Router middleware function type
  */
-type RouterMiddleware<StateT = DefaultState, ContextT = DefaultContext, BodyT = unknown> = (context: RouterContext<StateT, ContextT, BodyT>, next: () => Promise<unknown>) => unknown | Promise<unknown>;
+type RouterMiddleware<StateT = DefaultState, ContextT = DefaultContext, BodyT = unknown> = Middleware<StateT, RouterContext<StateT, ContextT, BodyT>, BodyT>;
 /**
  * HTTP method names in lowercase
  */
@@ -831,13 +833,13 @@ type RouterOptionsWithMethods<M extends string = string> = Omit<RouterOptions, '
  * Type for a dynamic HTTP method function on Router
  */
 type RouterMethodFunction<StateT = DefaultState, ContextT = DefaultContext> = {
-    <T = {}, U = {}, B = unknown>(name: string, path: string | RegExp, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): Router<StateT, ContextT>;
-    <T = {}, U = {}, B = unknown>(path: string | RegExp | Array<string | RegExp>, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): Router<StateT, ContextT>;
+    <T = {}, U = {}, B = unknown>(name: string, path: string | RegExp, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): RouterInstance<StateT, ContextT>;
+    <T = {}, U = {}, B = unknown>(path: string | RegExp | Array<string | RegExp>, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): RouterInstance<StateT, ContextT>;
 };
 /**
  * Router with additional HTTP methods based on the methods option.
  * Use createRouter() factory function for automatic type inference.
  */
-type RouterWithMethods<M extends string, StateT = DefaultState, ContextT = DefaultContext> = Router<StateT, ContextT> & Record<Lowercase<M>, RouterMethodFunction<StateT, ContextT>>;
+type RouterWithMethods<M extends string, StateT = DefaultState, ContextT = DefaultContext> = RouterInstance<StateT, ContextT> & Record<Lowercase<M>, RouterMethodFunction<StateT, ContextT>>;
 
-export { type AllowedMethodsOptions, type HttpMethod, Layer, type LayerOptions, type MatchResult, RouterExport as Router, type RouterContext, Router as RouterInstance, type RouterMethodFunction, type RouterMiddleware, type RouterOptions, type RouterOptionsWithMethods, type RouterParameterMiddleware, type RouterWithMethods, type UrlOptions, RouterExport as default };
+export { type AllowedMethodsOptions, type HttpMethod, Layer, type LayerOptions, type MatchResult, Router, type RouterContext, type RouterInstance, type RouterMethodFunction, type RouterMiddleware, type RouterOptions, type RouterOptionsWithMethods, type RouterParameterMiddleware, type RouterWithMethods, type UrlOptions, Router as default };

package/dist/index.d.ts

@@ -172,6 +172,7 @@ declare class Layer<StateT = DefaultState, ContextT = DefaultContext, BodyT = un
     private _reconfigurePathMatching;
 }
 
+type RouterInstance<StateT = koa.DefaultState, ContextT = koa.DefaultContext> = RouterImplementation<StateT, ContextT>;
 /**
  * Middleware with router property
  */
@@ -181,7 +182,7 @@ type RouterComposedMiddleware<StateT = koa.DefaultState, ContextT = koa.DefaultC
 /**
  * @module koa-router
  */
-declare class Router<StateT = koa.DefaultState, ContextT = koa.DefaultContext> {
+declare class RouterImplementation<StateT = koa.DefaultState, ContextT = koa.DefaultContext> {
     opts: RouterOptions;
     methods: string[];
     exclusive: boolean;
@@ -642,7 +643,8 @@ interface RouterConstructor {
     url(path: string, ...parameters: unknown[]): string;
     readonly prototype: Router;
 }
-declare const RouterExport: RouterConstructor;
+type Router<StateT = koa.DefaultState, ContextT = koa.DefaultContext> = RouterInstance<StateT, ContextT>;
+declare const Router: RouterConstructor;
 
 /**
  * Type definitions for @koa/router
@@ -738,7 +740,7 @@ type RouterParameterContext<StateT = DefaultState, ContextT = DefaultContext> =
     /**
      * Router instance
      */
-    router: Router<StateT, ContextT>;
+    router: RouterInstance<StateT, ContextT>;
     /**
      * Matched route path (internal)
      */
@@ -816,7 +818,7 @@ type RouterContext<StateT = DefaultState, ContextT = DefaultContext, BodyT = unk
 /**
  * Router middleware function type
  */
-type RouterMiddleware<StateT = DefaultState, ContextT = DefaultContext, BodyT = unknown> = (context: RouterContext<StateT, ContextT, BodyT>, next: () => Promise<unknown>) => unknown | Promise<unknown>;
+type RouterMiddleware<StateT = DefaultState, ContextT = DefaultContext, BodyT = unknown> = Middleware<StateT, RouterContext<StateT, ContextT, BodyT>, BodyT>;
 /**
  * HTTP method names in lowercase
  */
@@ -831,13 +833,13 @@ type RouterOptionsWithMethods<M extends string = string> = Omit<RouterOptions, '
  * Type for a dynamic HTTP method function on Router
  */
 type RouterMethodFunction<StateT = DefaultState, ContextT = DefaultContext> = {
-    <T = {}, U = {}, B = unknown>(name: string, path: string | RegExp, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): Router<StateT, ContextT>;
-    <T = {}, U = {}, B = unknown>(path: string | RegExp | Array<string | RegExp>, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): Router<StateT, ContextT>;
+    <T = {}, U = {}, B = unknown>(name: string, path: string | RegExp, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): RouterInstance<StateT, ContextT>;
+    <T = {}, U = {}, B = unknown>(path: string | RegExp | Array<string | RegExp>, ...middleware: Array<RouterMiddleware<StateT & T, ContextT & U, B>>): RouterInstance<StateT, ContextT>;
 };
 /**
  * Router with additional HTTP methods based on the methods option.
  * Use createRouter() factory function for automatic type inference.
  */
-type RouterWithMethods<M extends string, StateT = DefaultState, ContextT = DefaultContext> = Router<StateT, ContextT> & Record<Lowercase<M>, RouterMethodFunction<StateT, ContextT>>;
+type RouterWithMethods<M extends string, StateT = DefaultState, ContextT = DefaultContext> = RouterInstance<StateT, ContextT> & Record<Lowercase<M>, RouterMethodFunction<StateT, ContextT>>;
 
-export { type AllowedMethodsOptions, type HttpMethod, Layer, type LayerOptions, type MatchResult, RouterExport as Router, type RouterContext, Router as RouterInstance, type RouterMethodFunction, type RouterMiddleware, type RouterOptions, type RouterOptionsWithMethods, type RouterParameterMiddleware, type RouterWithMethods, type UrlOptions, RouterExport as default };
+export { type AllowedMethodsOptions, type HttpMethod, Layer, type LayerOptions, type MatchResult, Router, type RouterContext, type RouterInstance, type RouterMethodFunction, type RouterMiddleware, type RouterOptions, type RouterOptionsWithMethods, type RouterParameterMiddleware, type RouterWithMethods, type UrlOptions, Router as default };

package/dist/index.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  Router: () => RouterExport,
+  Router: () => Router,
   default: () => router_default
 });
 module.exports = __toCommonJS(index_exports);
@@ -594,7 +594,7 @@ var debug = (0, import_debug.default)("koa-router");
 
 // src/router.ts
 var httpMethods = getAllHttpMethods();
-var Router = class {
+var RouterImplementation = class {
   opts;
   methods;
   exclusive;
@@ -850,16 +850,10 @@ var Router = class {
     const previousPrefix = this.opts.prefix || "";
     this.opts.prefix = normalizedPrefix;
     for (const route of this.stack) {
-      if (previousPrefix && typeof route.path === "string") {
-        if (route.path.startsWith(previousPrefix)) {
-          route.path = route.path.slice(previousPrefix.length) || "/";
-          route.setPrefix(normalizedPrefix);
-        } else {
-          route.setPrefix(normalizedPrefix);
-        }
-      } else {
-        route.setPrefix(normalizedPrefix);
+      if (previousPrefix && typeof route.path === "string" && route.path.startsWith(previousPrefix)) {
+        route.path = route.path.slice(previousPrefix.length) || "/";
       }
+      route.setPrefix(normalizedPrefix);
     }
     return this;
   }
@@ -1425,12 +1419,12 @@ var Router = class {
     return this._registerMethod("options", ...arguments_);
   }
 };
-var RouterExport = Router;
-var router_default = RouterExport;
+var Router = RouterImplementation;
+var router_default = Router;
 for (const httpMethod of httpMethods) {
-  const isAlreadyDefined = COMMON_HTTP_METHODS.includes(httpMethod) || httpMethod in Router.prototype;
+  const isAlreadyDefined = COMMON_HTTP_METHODS.includes(httpMethod) || httpMethod in RouterImplementation.prototype;
   if (!isAlreadyDefined) {
-    Object.defineProperty(Router.prototype, httpMethod, {
+    Object.defineProperty(RouterImplementation.prototype, httpMethod, {
       value: function(...arguments_) {
         return this._registerMethod(httpMethod, ...arguments_);
       },

package/dist/index.mjs

@@ -557,7 +557,7 @@ var debug = debugModule("koa-router");
 
 // src/router.ts
 var httpMethods = getAllHttpMethods();
-var Router = class {
+var RouterImplementation = class {
   opts;
   methods;
   exclusive;
@@ -813,16 +813,10 @@ var Router = class {
     const previousPrefix = this.opts.prefix || "";
     this.opts.prefix = normalizedPrefix;
     for (const route of this.stack) {
-      if (previousPrefix && typeof route.path === "string") {
-        if (route.path.startsWith(previousPrefix)) {
-          route.path = route.path.slice(previousPrefix.length) || "/";
-          route.setPrefix(normalizedPrefix);
-        } else {
-          route.setPrefix(normalizedPrefix);
-        }
-      } else {
-        route.setPrefix(normalizedPrefix);
+      if (previousPrefix && typeof route.path === "string" && route.path.startsWith(previousPrefix)) {
+        route.path = route.path.slice(previousPrefix.length) || "/";
       }
+      route.setPrefix(normalizedPrefix);
     }
     return this;
   }
@@ -1388,12 +1382,12 @@ var Router = class {
     return this._registerMethod("options", ...arguments_);
   }
 };
-var RouterExport = Router;
-var router_default = RouterExport;
+var Router = RouterImplementation;
+var router_default = Router;
 for (const httpMethod of httpMethods) {
-  const isAlreadyDefined = COMMON_HTTP_METHODS.includes(httpMethod) || httpMethod in Router.prototype;
+  const isAlreadyDefined = COMMON_HTTP_METHODS.includes(httpMethod) || httpMethod in RouterImplementation.prototype;
   if (!isAlreadyDefined) {
-    Object.defineProperty(Router.prototype, httpMethod, {
+    Object.defineProperty(RouterImplementation.prototype, httpMethod, {
       value: function(...arguments_) {
         return this._registerMethod(httpMethod, ...arguments_);
       },
@@ -1404,6 +1398,6 @@ for (const httpMethod of httpMethods) {
   }
 }
 export {
-  RouterExport as Router,
+  Router,
   router_default as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@koa/router",
   "description": "Router middleware for koa. Maintained by Forward Email and Lad.",
-  "version": "15.1.0",
+  "version": "15.1.2",
   "author": "Alex Mingoia <talk@alexmingoia.com>",
   "bugs": {
     "url": "https://github.com/koajs/router/issues",
@@ -35,19 +35,19 @@
     "path-to-regexp": "^8.3.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.2.0",
-    "@commitlint/config-conventional": "^20.2.0",
+    "@commitlint/cli": "^20.3.0",
+    "@commitlint/config-conventional": "^20.3.0",
     "@koa/bodyparser": "^6.0.0",
     "@types/debug": "^4.1.12",
-    "@types/jsonwebtoken": "^9.0.7",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/koa": "^3.0.1",
-    "@types/node": "^25.0.1",
+    "@types/node": "^25.0.3",
     "@types/supertest": "^6.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.49.0",
-    "@typescript-eslint/parser": "^8.49.0",
+    "@typescript-eslint/eslint-plugin": "^8.51.0",
+    "@typescript-eslint/parser": "^8.51.0",
     "c8": "^10.1.3",
-    "chalk": "^5.4.1",
-    "eslint": "^9.39.1",
+    "chalk": "^5.6.2",
+    "eslint": "^9.39.2",
     "eslint-plugin-unicorn": "^62.0.0",
     "husky": "^9.1.7",
     "joi": "^18.0.2",
@@ -108,7 +108,7 @@
     "lint": "npm run lint:ts",
     "test:core": "TS_NODE_PROJECT=tsconfig.ts-node.json node --require ts-node/register --test test/*.test.ts test/**/*.test.ts",
     "test:recipes": "TS_NODE_PROJECT=tsconfig.recipes.json node --require ts-node/register --test recipes/**/*.test.ts",
-    "pretest:all": "npm run lint",
+    "pretest:all": "npm run lint && npm run build",
     "test:all": "TS_NODE_PROJECT=tsconfig.ts-node.json node --require ts-node/register --test test/*.test.ts test/**/*.test.ts recipes/**/*.test.ts",
     "test:coverage": "c8 npm run test:all",
     "ts:check": "tsc --noEmit --project tsconfig.typecheck.json",