clear-router 2.1.8 → 2.1.9

package/README.md

@@ -1,5 +1,11 @@
 # Clear Router
 
+[![NPM Downloads](https://img.shields.io/npm/dt/clear-router.svg)](https://www.npmjs.com/package/clear-router)
+[![npm version](https://img.shields.io/npm/v/clear-router.svg)](https://www.npmjs.com/package/clear-router)
+[![License](https://img.shields.io/npm/l/clear-router.svg)](https://github.com/toneflix/clear-router/blob/main/LICENSE)
+[![Publish to NPM](https://github.com/arkstack-hq/clear-router/actions/workflows/npm-publish.yml/badge.svg)](https://github.com/arkstack-hq/clear-router/actions/workflows/npm-publish.yml)
+[![Run Tests](https://github.com/arkstack-hq/clear-router/actions/workflows/ci.yml/badge.svg)](https://github.com/arkstack-hq/clear-router/actions/workflows/ci.yml)
+
 Laravel-style routing system for H3 and Express.js, with clean route definitions, middleware support, controller bindings and full TypeScript support.
 
 ## Installation

package/dist/express/index.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_Route = require('../Route-DhC4kNPX.cjs');
+let node_async_hooks = require("node:async_hooks");
 
 //#region src/express/router.ts
 /**
@@ -10,6 +11,7 @@ const require_Route = require('../Route-DhC4kNPX.cjs');
 * @repository https://github.com/toneflix/clear-router
 */
 var Router = class Router {
+	static groupContext = new node_async_hooks.AsyncLocalStorage();
 	/**
 	* All registered routes
 	*/
@@ -50,12 +52,15 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
+		const context = this.groupContext.getStore();
+		const activePrefix = context?.prefix ?? this.prefix;
+		const activeGroupMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		methods = Array.isArray(methods) ? methods : [methods];
 		middlewares = middlewares ? Array.isArray(middlewares) ? middlewares : [middlewares] : void 0;
-		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
+		const fullPath = this.normalizePath(`${activePrefix}/${path}`);
 		const route = new require_Route.Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
-			...this.groupMiddlewares,
+			...activeGroupMiddlewares,
 			...middlewares || []
 		]);
 		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
@@ -181,17 +186,17 @@ var Router = class Router {
 	* @param middlewares - Middleware functions applied to all routes in group
 	*/
 	static async group(prefix, callback, middlewares) {
-		const previousPrefix = this.prefix;
-		const previousMiddlewares = this.groupMiddlewares;
+		const context = this.groupContext.getStore();
+		const previousPrefix = context?.prefix ?? this.prefix;
+		const previousMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		const fullPrefix = [previousPrefix, prefix].filter(Boolean).join("/");
-		this.prefix = this.normalizePath(fullPrefix);
-		this.groupMiddlewares = [...previousMiddlewares, ...middlewares || []];
-		try {
+		const nextContext = {
+			prefix: this.normalizePath(fullPrefix),
+			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
+		};
+		await this.groupContext.run(nextContext, async () => {
 			await Promise.resolve(callback());
-		} finally {
-			this.prefix = previousPrefix;
-			this.groupMiddlewares = previousMiddlewares;
-		}
+		});
 	}
 	/**
 	* Apply global middlewares for the duration of the callback

package/dist/express/index.d.cts

@@ -10,6 +10,7 @@ import { Router as Router$1 } from "express";
  * @repository https://github.com/toneflix/clear-router
  */
 declare class Router {
+  private static readonly groupContext;
   /**
    * All registered routes
    */

package/dist/express/index.d.mts

@@ -10,6 +10,7 @@ import { Router as Router$1 } from "express";
  * @repository https://github.com/toneflix/clear-router
  */
 declare class Router {
+  private static readonly groupContext;
   /**
    * All registered routes
    */

package/dist/express/index.mjs

@@ -1,4 +1,5 @@
 import { n as ClearRequest, t as Route } from "../Route-BbPXcDGX.mjs";
+import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/express/router.ts
 /**
@@ -9,6 +10,7 @@ import { n as ClearRequest, t as Route } from "../Route-BbPXcDGX.mjs";
 * @repository https://github.com/toneflix/clear-router
 */
 var Router = class Router {
+	static groupContext = new AsyncLocalStorage();
 	/**
 	* All registered routes
 	*/
@@ -49,12 +51,15 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
+		const context = this.groupContext.getStore();
+		const activePrefix = context?.prefix ?? this.prefix;
+		const activeGroupMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		methods = Array.isArray(methods) ? methods : [methods];
 		middlewares = middlewares ? Array.isArray(middlewares) ? middlewares : [middlewares] : void 0;
-		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
+		const fullPath = this.normalizePath(`${activePrefix}/${path}`);
 		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
-			...this.groupMiddlewares,
+			...activeGroupMiddlewares,
 			...middlewares || []
 		]);
 		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
@@ -180,17 +185,17 @@ var Router = class Router {
 	* @param middlewares - Middleware functions applied to all routes in group
 	*/
 	static async group(prefix, callback, middlewares) {
-		const previousPrefix = this.prefix;
-		const previousMiddlewares = this.groupMiddlewares;
+		const context = this.groupContext.getStore();
+		const previousPrefix = context?.prefix ?? this.prefix;
+		const previousMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		const fullPrefix = [previousPrefix, prefix].filter(Boolean).join("/");
-		this.prefix = this.normalizePath(fullPrefix);
-		this.groupMiddlewares = [...previousMiddlewares, ...middlewares || []];
-		try {
+		const nextContext = {
+			prefix: this.normalizePath(fullPrefix),
+			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
+		};
+		await this.groupContext.run(nextContext, async () => {
 			await Promise.resolve(callback());
-		} finally {
-			this.prefix = previousPrefix;
-			this.groupMiddlewares = previousMiddlewares;
-		}
+		});
 	}
 	/**
 	* Apply global middlewares for the duration of the callback

package/dist/h3/index.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_Route = require('../Route-DhC4kNPX.cjs');
+let node_async_hooks = require("node:async_hooks");
 let h3 = require("h3");
 
 //#region src/h3/router.ts
@@ -10,6 +11,7 @@ let h3 = require("h3");
 * @repository https://github.com/toneflix/clear-router
 */
 var Router = class Router {
+	static groupContext = new node_async_hooks.AsyncLocalStorage();
 	/**
 	* All registered routes
 	*/
@@ -50,12 +52,15 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
+		const context = this.groupContext.getStore();
+		const activePrefix = context?.prefix ?? this.prefix;
+		const activeGroupMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		methods = Array.isArray(methods) ? methods : [methods];
 		middlewares = middlewares ? Array.isArray(middlewares) ? middlewares : [middlewares] : void 0;
-		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
+		const fullPath = this.normalizePath(`${activePrefix}/${path}`);
 		const route = new require_Route.Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
-			...this.groupMiddlewares,
+			...activeGroupMiddlewares,
 			...middlewares || []
 		]);
 		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
@@ -181,17 +186,17 @@ var Router = class Router {
 	* @param middlewares - Middleware functions applied to all routes in group
 	*/
 	static async group(prefix, callback, middlewares) {
-		const previousPrefix = this.prefix;
-		const previousMiddlewares = this.groupMiddlewares;
+		const context = this.groupContext.getStore();
+		const previousPrefix = context?.prefix ?? this.prefix;
+		const previousMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		const fullPrefix = [previousPrefix, prefix].filter(Boolean).join("/");
-		this.prefix = this.normalizePath(fullPrefix);
-		this.groupMiddlewares = [...previousMiddlewares, ...middlewares || []];
-		try {
+		const nextContext = {
+			prefix: this.normalizePath(fullPrefix),
+			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
+		};
+		await this.groupContext.run(nextContext, async () => {
 			await Promise.resolve(callback());
-		} finally {
-			this.prefix = previousPrefix;
-			this.groupMiddlewares = previousMiddlewares;
-		}
+		});
 	}
 	/**
 	* Apply global middlewares for the duration of the callback

package/dist/h3/index.d.cts

@@ -9,6 +9,7 @@ import { H3 } from "h3";
  * @repository https://github.com/toneflix/clear-router
  */
 declare class Router {
+  private static readonly groupContext;
   /**
    * All registered routes
    */

package/dist/h3/index.d.mts

@@ -9,6 +9,7 @@ import { H3 } from "h3";
  * @repository https://github.com/toneflix/clear-router
  */
 declare class Router {
+  private static readonly groupContext;
   /**
    * All registered routes
    */

package/dist/h3/index.mjs

@@ -1,4 +1,5 @@
 import { n as ClearRequest, t as Route } from "../Route-BbPXcDGX.mjs";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { getQuery, getRouterParams, readBody } from "h3";
 
 //#region src/h3/router.ts
@@ -9,6 +10,7 @@ import { getQuery, getRouterParams, readBody } from "h3";
 * @repository https://github.com/toneflix/clear-router
 */
 var Router = class Router {
+	static groupContext = new AsyncLocalStorage();
 	/**
 	* All registered routes
 	*/
@@ -49,12 +51,15 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
+		const context = this.groupContext.getStore();
+		const activePrefix = context?.prefix ?? this.prefix;
+		const activeGroupMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		methods = Array.isArray(methods) ? methods : [methods];
 		middlewares = middlewares ? Array.isArray(middlewares) ? middlewares : [middlewares] : void 0;
-		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
+		const fullPath = this.normalizePath(`${activePrefix}/${path}`);
 		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
-			...this.groupMiddlewares,
+			...activeGroupMiddlewares,
 			...middlewares || []
 		]);
 		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
@@ -180,17 +185,17 @@ var Router = class Router {
 	* @param middlewares - Middleware functions applied to all routes in group
 	*/
 	static async group(prefix, callback, middlewares) {
-		const previousPrefix = this.prefix;
-		const previousMiddlewares = this.groupMiddlewares;
+		const context = this.groupContext.getStore();
+		const previousPrefix = context?.prefix ?? this.prefix;
+		const previousMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
 		const fullPrefix = [previousPrefix, prefix].filter(Boolean).join("/");
-		this.prefix = this.normalizePath(fullPrefix);
-		this.groupMiddlewares = [...previousMiddlewares, ...middlewares || []];
-		try {
+		const nextContext = {
+			prefix: this.normalizePath(fullPrefix),
+			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
+		};
+		await this.groupContext.run(nextContext, async () => {
 			await Promise.resolve(callback());
-		} finally {
-			this.prefix = previousPrefix;
-			this.groupMiddlewares = previousMiddlewares;
-		}
+		});
 	}
 	/**
 	* Apply global middlewares for the duration of the callback

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-router",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "Laravel-style routing system for Express.js and H3, with CommonJS, ESM, and TypeScript support",
   "keywords": [
     "h3",
@@ -90,6 +90,7 @@
     "lint": "eslint",
     "test:esm": "vitest tests/esm.test.ts",
     "test:ts": "vitest tests/typescript.test.ts",
+    "test:coverage": "vitest run --coverage",
     "example": "tsx example/express/index.ts",
     "example:esm": "tsx example/express/esm.ts",
     "example:ts": "tsx example/express/typescript.ts",