clear-router 2.5.6 → 2.5.8

package/dist/{router-B3QjblRX.mjs → router-we2Hw9nA.mjs}

@@ -1,4 +1,4 @@
-import { a as getStandardMetadata, i as getDesignParamTypes, n as Container, o as Response, r as getBindingMetadataFromTargets, s as Request } from "./bindings-DIanvIVd.mjs";
+import { a as getStandardMetadata, c as Request, i as getDesignParamTypes, n as Container, o as isClass, r as getBindingMetadataFromTargets, s as Response } from "./bindings-DJDdQv1q.mjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/Route.ts
@@ -42,6 +42,7 @@ var CoreRouter = class {
 	static stateBoundKey = Symbol.for("clear-router:router-state-bound");
 	static defaultConfigKey = Symbol.for("clear-router:default-config");
 	static pluginStoreKey = Symbol.for("clear-router:plugins");
+	static pluginPendingKey = Symbol.for("clear-router:plugin-promises");
 	static createBaseConfig() {
 		return {
 			methodOverride: {
@@ -88,6 +89,11 @@ var CoreRouter = class {
 		if (!g[this.pluginStoreKey]) g[this.pluginStoreKey] = /* @__PURE__ */ new Set();
 		return g[this.pluginStoreKey];
 	}
+	static getPluginPendingStore() {
+		const g = globalThis;
+		if (!g[this.pluginPendingKey]) g[this.pluginPendingKey] = /* @__PURE__ */ new Set();
+		return g[this.pluginPendingKey];
+	}
 	static createDefaultState() {
 		return {
 			config: this.getDefaultConfig(),
@@ -193,28 +199,81 @@ var CoreRouter = class {
 	* @param options 
 	* @returns 
 	*/
-	static use(plugin, options) {
+	static async use(plugin, options) {
 		const name = typeof plugin === "function" ? plugin.name : plugin.name;
 		const store = this.getPluginStore();
 		if (name && store.has(name)) return;
-		const ctx = {
-			container: Container,
-			bind: Container.bind.bind(Container),
-			configure: this.configure.bind(this),
-			configureDefaults: this.configureDefaults.bind(this),
-			options
-		};
-		if (typeof plugin === "function") plugin(ctx);
-		else plugin.setup(ctx);
 		if (name) store.add(name);
+		const setup = async () => {
+			const ctx = {
+				container: Container,
+				bind: this.createPluginBind(),
+				configure: this.configure.bind(this),
+				configureDefaults: this.configureDefaults.bind(this),
+				get request() {
+					return this.getRequest();
+				},
+				get response() {
+					return this.getResponse();
+				},
+				getRequest: () => this.getCurrentPluginRequestContext()?.request,
+				getResponse: () => this.getCurrentPluginRequestContext()?.response,
+				options
+			};
+			if (typeof plugin === "function") await plugin(ctx);
+			else await plugin.setup(ctx);
+		};
+		const pending = this.getPluginPendingStore();
+		const promise = setup();
+		pending.add(promise);
+		try {
+			await promise;
+		} catch (error) {
+			if (name) store.delete(name);
+			throw error;
+		} finally {
+			pending.delete(promise);
+		}
+	}
+	static async pluginsReady() {
+		const pending = Array.from(this.getPluginPendingStore());
+		if (!pending.length) return;
+		await Promise.all(pending);
 	}
 	static groupContext = new AsyncLocalStorage();
+	static pluginRequestContext = new AsyncLocalStorage();
 	static routes = [];
 	static routesByPathMethod = {};
 	static routesByMethod = {};
 	static prefix = "";
 	static groupMiddlewares = [];
 	static globalMiddlewares = [];
+	static getCurrentPluginRequestContext() {
+		return this.pluginRequestContext.getStore();
+	}
+	static createPluginRequestContext(ctx) {
+		const request = ctx.clearRequest;
+		const response = ctx.clearResponse;
+		return {
+			...ctx,
+			ctx,
+			request,
+			response,
+			clearRequest: request,
+			clearResponse: response
+		};
+	}
+	static createPluginBind() {
+		const bind = (token, value) => {
+			if (typeof value === "function" && !isClass(value)) {
+				const factory = value;
+				Container.bind(token, (ctx) => factory(this.createPluginRequestContext(ctx)));
+				return;
+			}
+			Container.bind(token, value);
+		};
+		return bind;
+	}
 	static ensureState() {
 		this.bindStateAccessors();
 		if (!this.config) this.config = { methodOverride: {
@@ -529,29 +588,32 @@ var CoreRouter = class {
 		};
 	}
 	static async callHandler(handlerFunction, ctx, bindingTarget, bindingMethod, bindingHandler, bindingMetadata) {
-		if (!this.config.container?.enabled) return handlerFunction(ctx, ctx.clearRequest);
-		const metadata = getBindingMetadataFromTargets([
-			{
-				target: bindingTarget,
-				propertyKey: bindingMethod
-			},
-			{ target: bindingHandler },
-			{
-				target: bindingTarget,
-				propertyKey: "__class__"
+		return this.pluginRequestContext.run(this.createPluginRequestContext(ctx), async () => {
+			await this.pluginsReady();
+			if (!this.config.container?.enabled) return handlerFunction(ctx, ctx.clearRequest);
+			const metadata = getBindingMetadataFromTargets([
+				{
+					target: bindingTarget,
+					propertyKey: bindingMethod
+				},
+				{ target: bindingHandler },
+				{
+					target: bindingTarget,
+					propertyKey: "__class__"
+				}
+			]) ?? getStandardMetadata(bindingMetadata, bindingMethod) ?? getStandardMetadata(bindingMetadata, "__class__");
+			if (!metadata) return handlerFunction(ctx, ctx.clearRequest);
+			const designTokens = [...bindingTarget ? getDesignParamTypes(bindingTarget, bindingMethod) : [], ...bindingHandler ? getDesignParamTypes(bindingHandler) : []];
+			const tokens = metadata.tokens?.length ? metadata.tokens : designTokens;
+			if (!tokens.length) return handlerFunction(ctx, ctx.clearRequest);
+			const args = [];
+			for (const token of tokens) {
+				const resolved = await Container.resolve(token, ctx, Boolean(this.config.container?.autoDiscover));
+				if (typeof resolved === "undefined") return handlerFunction(ctx, ctx.clearRequest);
+				args.push(resolved);
 			}
-		]) ?? getStandardMetadata(bindingMetadata, bindingMethod) ?? getStandardMetadata(bindingMetadata, "__class__");
-		if (!metadata) return handlerFunction(ctx, ctx.clearRequest);
-		const designTokens = [...bindingTarget ? getDesignParamTypes(bindingTarget, bindingMethod) : [], ...bindingHandler ? getDesignParamTypes(bindingHandler) : []];
-		const tokens = metadata.tokens?.length ? metadata.tokens : designTokens;
-		if (!tokens.length) return handlerFunction(ctx, ctx.clearRequest);
-		const args = [];
-		for (const token of tokens) {
-			const resolved = await Container.resolve(token, ctx, Boolean(this.config.container?.autoDiscover));
-			if (typeof resolved === "undefined") return handlerFunction(ctx, ctx.clearRequest);
-			args.push(resolved);
-		}
-		return handlerFunction(...args);
+			return handlerFunction(...args);
+		});
 	}
 	static bindRequestToInstance(ctx, instance, route, payload) {
 		const clearRequest = ctx.clearRequest instanceof Request ? ctx.clearRequest : new Request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-router",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "description": "Laravel-style routing for Node.js with support for Express, H3, Fastify, Hono, and Koa, including CommonJS, ESM, and TypeScript support.",
   "keywords": [
     "h3",
@@ -121,7 +121,7 @@
     "@types/koa": "^3.0.2",
     "@types/koa__router": "^12.0.5",
     "@types/node": "^20.10.6",
-    "@vitest/coverage-v8": "4.0.18",
+    "@vitest/coverage-v8": "4.1.5",
     "eslint": "^10.0.2",
     "fastify": "^5.8.2",
     "hono": "^4.12.8",
@@ -133,9 +133,9 @@
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.56.1",
     "unrun": "0.2.27",
-    "vite-tsconfig-paths": "^6.1.1",
-    "vitepress": "^1.6.4",
-    "vitest": "^4.0.18"
+    "vite": "^8.0.11",
+    "vitepress": "^2.0.0-alpha.17",
+    "vitest": "^4.1.5"
   },
   "engines": {
     "node": ">=20.0.0"