clear-router 2.9.0 → 2.9.2

package/README.md

@@ -95,7 +95,21 @@ See [API.md](https://arkstack-hq.github.io/clear-router/api) for complete API do
 ## Middleware Execution Order
 
 ```txt
-[ Global Middleware ] → [ Group Middleware ] → [ Route Middleware ]
+[ Global Middleware ] → [ Group Middleware ] → [ @middleware (class) ] → [ @middleware (method) ] → [ Route Middleware ]
+```
+
+Controllers and controller methods can declare middleware with the `@middleware`
+decorator, accepting the same shapes as any other middleware (callbacks,
+middleware classes, or instances exposing a `handle` method):
+
+```ts
+import { middleware } from 'clear-router/decorators';
+
+@middleware([auth])
+class AccountController {
+  @middleware(GuestMiddleware)
+  create() {}
+}
 ```
 
 ## Handler Execution

package/dist/core/CoreRouter.cjs

@@ -4,6 +4,7 @@ const require_RouteRegistrar = require('../RouteRegistrar.cjs');
 const require_Request = require('./Request.cjs');
 const require_Response = require('./Response.cjs');
 const require_bindings = require('./bindings.cjs');
+const require_middleware = require('../decorators/middleware.cjs');
 const require_ResourceRoutes = require('../ResourceRoutes.cjs');
 let node_async_hooks = require("node:async_hooks");
 let node_module = require("node:module");
@@ -20,10 +21,6 @@ var CoreRouter = class {
 	static stateStoreKey = Symbol.for("clear-router:router-state");
 	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 pluginHttpCtxResolversKey = Symbol.for("clear-router:plugin-http-ctx");
-	static pluginArgumentResolversKey = Symbol.for("clear-router:plugin-argument-resolvers");
 	static requestProvider;
 	static responseProvider;
 	static domainMatcherCache = /* @__PURE__ */ new Map();
@@ -38,7 +35,8 @@ var CoreRouter = class {
 		},
 		container: {
 			enabled: false,
-			autoDiscover: false
+			autoDiscover: false,
+			strict: false
 		}
 	};
 	static groupContext = new node_async_hooks.AsyncLocalStorage();
@@ -128,7 +126,8 @@ var CoreRouter = class {
 			},
 			container: {
 				enabled: false,
-				autoDiscover: false
+				autoDiscover: false,
+				strict: false
 			}
 		};
 	}
@@ -162,24 +161,20 @@ var CoreRouter = class {
 		return g[this.stateStoreKey];
 	}
 	static getPluginStore() {
-		const g = globalThis;
-		if (!g[this.pluginStoreKey]) g[this.pluginStoreKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginStoreKey];
+		this.bindStateAccessors();
+		return this.pluginStore;
 	}
 	static getPluginPendingStore() {
-		const g = globalThis;
-		if (!g[this.pluginPendingKey]) g[this.pluginPendingKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginPendingKey];
+		this.bindStateAccessors();
+		return this.pluginPending;
 	}
 	static getPluginArgumentResolvers() {
-		const g = globalThis;
-		if (!g[this.pluginArgumentResolversKey]) g[this.pluginArgumentResolversKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginArgumentResolversKey];
+		this.bindStateAccessors();
+		return this.pluginArgumentResolvers;
 	}
 	static getPluginHttpCtxResolvers() {
-		const g = globalThis;
-		if (!g[this.pluginHttpCtxResolversKey]) g[this.pluginHttpCtxResolversKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginHttpCtxResolversKey];
+		this.bindStateAccessors();
+		return this.pluginHttpCtxResolvers;
 	}
 	static createDefaultState() {
 		return {
@@ -191,7 +186,12 @@ var CoreRouter = class {
 			routesByName: /* @__PURE__ */ new Map(),
 			prefix: "",
 			groupMiddlewares: [],
-			globalMiddlewares: []
+			globalMiddlewares: [],
+			container: require_bindings.Container.create(),
+			pluginStore: /* @__PURE__ */ new Set(),
+			pluginPending: /* @__PURE__ */ new Set(),
+			pluginArgumentResolvers: /* @__PURE__ */ new Set(),
+			pluginHttpCtxResolvers: /* @__PURE__ */ new Set()
 		};
 	}
 	static bindStateAccessors() {
@@ -208,7 +208,12 @@ var CoreRouter = class {
 			"routesByName",
 			"prefix",
 			"groupMiddlewares",
-			"globalMiddlewares"
+			"globalMiddlewares",
+			"container",
+			"pluginStore",
+			"pluginPending",
+			"pluginArgumentResolvers",
+			"pluginHttpCtxResolvers"
 		]) Object.defineProperty(this, key, {
 			get() {
 				const ns = this.resolveStateNamespace();
@@ -283,13 +288,14 @@ var CoreRouter = class {
 	* @returns 
 	*/
 	static async use(plugin, options) {
+		this.ensureState();
 		const name = typeof plugin === "function" ? plugin.name : plugin.name;
 		const store = this.getPluginStore();
 		if (name && store.has(name)) return;
 		if (name) store.add(name);
 		const setup = async () => {
 			const ctx = {
-				container: require_bindings.Container,
+				container: this.container,
 				bind: this.createPluginBind(),
 				resolveArguments: (resolver) => {
 					this.getPluginArgumentResolvers().add(resolver);
@@ -297,7 +303,7 @@ var CoreRouter = class {
 				useHttpContext: (resolver) => {
 					this.getPluginHttpCtxResolvers().add(resolver);
 				},
-				bindings: require_bindings.Container.bindings(),
+				bindings: this.container.bindings(),
 				configure: this.configure.bind(this),
 				configureDefaults: this.configureDefaults.bind(this),
 				get request() {
@@ -341,17 +347,25 @@ var CoreRouter = class {
 			ctx,
 			request,
 			response,
-			getBindings: () => require_bindings.Container.bindings()
+			getBindings: () => require_bindings.Container.current().bindings()
 		};
 	}
 	static createPluginBind() {
-		const bind = (token, value) => {
+		const bind = (token, value, options) => {
+			if (value && typeof value === "object" && "useFactory" in value) {
+				const factory = value.useFactory;
+				this.container.bind(token, {
+					...value,
+					useFactory: (ctx) => factory(this.createPluginRequestContext(ctx))
+				});
+				return;
+			}
 			if (typeof value === "function" && !require_bindings.isClass(value)) {
 				const factory = value;
-				require_bindings.Container.bind(token, (ctx) => factory(this.createPluginRequestContext(ctx)));
+				this.container.bind(token, (ctx) => factory(this.createPluginRequestContext(ctx)), options);
 				return;
 			}
-			require_bindings.Container.bind(token, value);
+			this.container.bind(token, value, options);
 		};
 		return bind;
 	}
@@ -790,6 +804,7 @@ var CoreRouter = class {
 		const route = new require_Route.Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, this.resolveMiddlewares([
 			...this.globalMiddlewares,
 			...activeGroupMiddlewares,
+			...require_middleware.getControllerMiddlewares(handler),
 			...middlewares || []
 		]), {
 			registrationPaths,
@@ -1060,7 +1075,9 @@ var CoreRouter = class {
 		};
 	}
 	static async callHandler(handlerFunction, ctx, bindingTarget, bindingMethod, bindingHandler, bindingMetadata) {
-		return this.pluginRequestContext.run(this.createPluginRequestContext(ctx), async () => {
+		this.ensureState();
+		const requestContainer = this.container.createRequestScope(ctx);
+		return require_bindings.Container.run(requestContainer, () => this.pluginRequestContext.run(this.createPluginRequestContext(ctx), async () => {
 			await this.pluginsReady();
 			await this.resolvePluginHttpCtx(ctx);
 			if (!this.config.container?.enabled) return handlerFunction(ctx, ctx.clearRequest);
@@ -1089,12 +1106,12 @@ var CoreRouter = class {
 			if (!metadata || !tokens.length) return handlerFunction(ctx, ctx.clearRequest);
 			const args = [];
 			for (const token of tokens) {
-				const resolved = await require_bindings.Container.resolve(token, ctx, Boolean(this.config.container?.autoDiscover));
+				const resolved = this.config.container?.strict ? await requestContainer.resolveOrFail(token, ctx, Boolean(this.config.container?.autoDiscover)) : await requestContainer.resolve(token, ctx, Boolean(this.config.container?.autoDiscover));
 				if (typeof resolved === "undefined") return handlerFunction(ctx, ctx.clearRequest);
 				args.push(resolved);
 			}
 			return handlerFunction(...args);
-		});
+		}));
 	}
 	static bindRequestToInstance(ctx, instance, route, payload) {
 		const clearRequest = ctx.clearRequest instanceof require_Request.Request ? ctx.clearRequest : this.initializeInstance(require_Request.Request, {
@@ -1115,11 +1132,7 @@ var CoreRouter = class {
 		clearRequest.query = payload.query;
 		clearRequest.params = payload.params;
 		ctx.clearRequest = clearRequest;
-		require_bindings.Container.bind(require_Request.Request, ctx.clearRequest);
-		if (!(ctx.clearResponse instanceof require_Response.Response)) {
-			ctx.clearResponse = this.initializeInstance(require_Response.Response, ctx.response ?? ctx.reply ?? ctx.res);
-			require_bindings.Container.bind(require_Response.Response, ctx.clearResponse);
-		}
+		if (!(ctx.clearResponse instanceof require_Response.Response)) ctx.clearResponse = this.initializeInstance(require_Response.Response, ctx.response ?? ctx.reply ?? ctx.res);
 		if (!instance) return;
 		instance.ctx = ctx;
 		instance.body = payload.body;

package/dist/core/CoreRouter.d.cts

@@ -2,6 +2,7 @@ import { Response } from "./Response.cjs";
 import { Route } from "../Route.cjs";
 import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupContext, RouteGroupSource, RouterConfig } from "../types/basic.cjs";
 import { Request } from "./Request.cjs";
+import { Container } from "./bindings.cjs";
 import { ClearRouterPluginArgumentsContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind } from "./plugins.cjs";
 import { Controller } from "../Controller.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
@@ -21,16 +22,13 @@ declare abstract class CoreRouter {
   private static readonly stateStoreKey;
   private static readonly stateBoundKey;
   private static readonly defaultConfigKey;
-  private static readonly pluginStoreKey;
-  private static readonly pluginPendingKey;
-  private static readonly pluginHttpCtxResolversKey;
-  private static readonly pluginArgumentResolversKey;
   private static requestProvider?;
   private static responseProvider?;
   private static readonly domainMatcherCache;
   private static readonly constraintRegexCache;
   static routePatterns: Map<string, string | RegExp>;
   static config: RouterConfig;
+  static container: Container;
   protected static groupContext: AsyncLocalStorage<RouteGroupContext>;
   protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext<any>>;
   static routes: Set<Route<any, any, any>>;
@@ -75,6 +73,11 @@ declare abstract class CoreRouter {
     prefix: string;
     groupMiddlewares: any[];
     globalMiddlewares: any[];
+    container: Container;
+    pluginStore: Set<string>;
+    pluginPending: Set<Promise<void>>;
+    pluginArgumentResolvers: Set<PluginArgumentsResolver>;
+    pluginHttpCtxResolvers: Set<PluginArgumentsResolver>;
   };
   protected static bindStateAccessors(): void;
   protected static createDefaultOptionsHandler(): any;

package/dist/core/CoreRouter.d.mts

@@ -2,6 +2,7 @@ import { Response } from "./Response.mjs";
 import { Route } from "../Route.mjs";
 import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupContext, RouteGroupSource, RouterConfig } from "../types/basic.mjs";
 import { Request } from "./Request.mjs";
+import { Container } from "./bindings.mjs";
 import { ClearRouterPluginArgumentsContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind } from "./plugins.mjs";
 import { Controller } from "../Controller.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
@@ -21,16 +22,13 @@ declare abstract class CoreRouter {
   private static readonly stateStoreKey;
   private static readonly stateBoundKey;
   private static readonly defaultConfigKey;
-  private static readonly pluginStoreKey;
-  private static readonly pluginPendingKey;
-  private static readonly pluginHttpCtxResolversKey;
-  private static readonly pluginArgumentResolversKey;
   private static requestProvider?;
   private static responseProvider?;
   private static readonly domainMatcherCache;
   private static readonly constraintRegexCache;
   static routePatterns: Map<string, string | RegExp>;
   static config: RouterConfig;
+  static container: Container;
   protected static groupContext: AsyncLocalStorage<RouteGroupContext>;
   protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext<any>>;
   static routes: Set<Route<any, any, any>>;
@@ -75,6 +73,11 @@ declare abstract class CoreRouter {
     prefix: string;
     groupMiddlewares: any[];
     globalMiddlewares: any[];
+    container: Container;
+    pluginStore: Set<string>;
+    pluginPending: Set<Promise<void>>;
+    pluginArgumentResolvers: Set<PluginArgumentsResolver>;
+    pluginHttpCtxResolvers: Set<PluginArgumentsResolver>;
   };
   protected static bindStateAccessors(): void;
   protected static createDefaultOptionsHandler(): any;

package/dist/core/CoreRouter.mjs

@@ -4,6 +4,7 @@ import { RouteRegistrar } from "../RouteRegistrar.mjs";
 import { Request } from "./Request.mjs";
 import { Response } from "./Response.mjs";
 import { Container, getBindingMetadataFromTargets, getDesignParamTypes, getStandardMetadata, isClass } from "./bindings.mjs";
+import { getControllerMiddlewares } from "../decorators/middleware.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { createRequire } from "node:module";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -20,10 +21,6 @@ var CoreRouter = class {
 	static stateStoreKey = Symbol.for("clear-router:router-state");
 	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 pluginHttpCtxResolversKey = Symbol.for("clear-router:plugin-http-ctx");
-	static pluginArgumentResolversKey = Symbol.for("clear-router:plugin-argument-resolvers");
 	static requestProvider;
 	static responseProvider;
 	static domainMatcherCache = /* @__PURE__ */ new Map();
@@ -38,7 +35,8 @@ var CoreRouter = class {
 		},
 		container: {
 			enabled: false,
-			autoDiscover: false
+			autoDiscover: false,
+			strict: false
 		}
 	};
 	static groupContext = new AsyncLocalStorage();
@@ -128,7 +126,8 @@ var CoreRouter = class {
 			},
 			container: {
 				enabled: false,
-				autoDiscover: false
+				autoDiscover: false,
+				strict: false
 			}
 		};
 	}
@@ -162,24 +161,20 @@ var CoreRouter = class {
 		return g[this.stateStoreKey];
 	}
 	static getPluginStore() {
-		const g = globalThis;
-		if (!g[this.pluginStoreKey]) g[this.pluginStoreKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginStoreKey];
+		this.bindStateAccessors();
+		return this.pluginStore;
 	}
 	static getPluginPendingStore() {
-		const g = globalThis;
-		if (!g[this.pluginPendingKey]) g[this.pluginPendingKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginPendingKey];
+		this.bindStateAccessors();
+		return this.pluginPending;
 	}
 	static getPluginArgumentResolvers() {
-		const g = globalThis;
-		if (!g[this.pluginArgumentResolversKey]) g[this.pluginArgumentResolversKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginArgumentResolversKey];
+		this.bindStateAccessors();
+		return this.pluginArgumentResolvers;
 	}
 	static getPluginHttpCtxResolvers() {
-		const g = globalThis;
-		if (!g[this.pluginHttpCtxResolversKey]) g[this.pluginHttpCtxResolversKey] = /* @__PURE__ */ new Set();
-		return g[this.pluginHttpCtxResolversKey];
+		this.bindStateAccessors();
+		return this.pluginHttpCtxResolvers;
 	}
 	static createDefaultState() {
 		return {
@@ -191,7 +186,12 @@ var CoreRouter = class {
 			routesByName: /* @__PURE__ */ new Map(),
 			prefix: "",
 			groupMiddlewares: [],
-			globalMiddlewares: []
+			globalMiddlewares: [],
+			container: Container.create(),
+			pluginStore: /* @__PURE__ */ new Set(),
+			pluginPending: /* @__PURE__ */ new Set(),
+			pluginArgumentResolvers: /* @__PURE__ */ new Set(),
+			pluginHttpCtxResolvers: /* @__PURE__ */ new Set()
 		};
 	}
 	static bindStateAccessors() {
@@ -208,7 +208,12 @@ var CoreRouter = class {
 			"routesByName",
 			"prefix",
 			"groupMiddlewares",
-			"globalMiddlewares"
+			"globalMiddlewares",
+			"container",
+			"pluginStore",
+			"pluginPending",
+			"pluginArgumentResolvers",
+			"pluginHttpCtxResolvers"
 		]) Object.defineProperty(this, key, {
 			get() {
 				const ns = this.resolveStateNamespace();
@@ -283,13 +288,14 @@ var CoreRouter = class {
 	* @returns 
 	*/
 	static async use(plugin, options) {
+		this.ensureState();
 		const name = typeof plugin === "function" ? plugin.name : plugin.name;
 		const store = this.getPluginStore();
 		if (name && store.has(name)) return;
 		if (name) store.add(name);
 		const setup = async () => {
 			const ctx = {
-				container: Container,
+				container: this.container,
 				bind: this.createPluginBind(),
 				resolveArguments: (resolver) => {
 					this.getPluginArgumentResolvers().add(resolver);
@@ -297,7 +303,7 @@ var CoreRouter = class {
 				useHttpContext: (resolver) => {
 					this.getPluginHttpCtxResolvers().add(resolver);
 				},
-				bindings: Container.bindings(),
+				bindings: this.container.bindings(),
 				configure: this.configure.bind(this),
 				configureDefaults: this.configureDefaults.bind(this),
 				get request() {
@@ -341,17 +347,25 @@ var CoreRouter = class {
 			ctx,
 			request,
 			response,
-			getBindings: () => Container.bindings()
+			getBindings: () => Container.current().bindings()
 		};
 	}
 	static createPluginBind() {
-		const bind = (token, value) => {
+		const bind = (token, value, options) => {
+			if (value && typeof value === "object" && "useFactory" in value) {
+				const factory = value.useFactory;
+				this.container.bind(token, {
+					...value,
+					useFactory: (ctx) => factory(this.createPluginRequestContext(ctx))
+				});
+				return;
+			}
 			if (typeof value === "function" && !isClass(value)) {
 				const factory = value;
-				Container.bind(token, (ctx) => factory(this.createPluginRequestContext(ctx)));
+				this.container.bind(token, (ctx) => factory(this.createPluginRequestContext(ctx)), options);
 				return;
 			}
-			Container.bind(token, value);
+			this.container.bind(token, value, options);
 		};
 		return bind;
 	}
@@ -790,6 +804,7 @@ var CoreRouter = class {
 		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, this.resolveMiddlewares([
 			...this.globalMiddlewares,
 			...activeGroupMiddlewares,
+			...getControllerMiddlewares(handler),
 			...middlewares || []
 		]), {
 			registrationPaths,
@@ -1060,7 +1075,9 @@ var CoreRouter = class {
 		};
 	}
 	static async callHandler(handlerFunction, ctx, bindingTarget, bindingMethod, bindingHandler, bindingMetadata) {
-		return this.pluginRequestContext.run(this.createPluginRequestContext(ctx), async () => {
+		this.ensureState();
+		const requestContainer = this.container.createRequestScope(ctx);
+		return Container.run(requestContainer, () => this.pluginRequestContext.run(this.createPluginRequestContext(ctx), async () => {
 			await this.pluginsReady();
 			await this.resolvePluginHttpCtx(ctx);
 			if (!this.config.container?.enabled) return handlerFunction(ctx, ctx.clearRequest);
@@ -1089,12 +1106,12 @@ var CoreRouter = class {
 			if (!metadata || !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));
+				const resolved = this.config.container?.strict ? await requestContainer.resolveOrFail(token, ctx, Boolean(this.config.container?.autoDiscover)) : await requestContainer.resolve(token, ctx, Boolean(this.config.container?.autoDiscover));
 				if (typeof resolved === "undefined") return handlerFunction(ctx, ctx.clearRequest);
 				args.push(resolved);
 			}
 			return handlerFunction(...args);
-		});
+		}));
 	}
 	static bindRequestToInstance(ctx, instance, route, payload) {
 		const clearRequest = ctx.clearRequest instanceof Request ? ctx.clearRequest : this.initializeInstance(Request, {
@@ -1115,11 +1132,7 @@ var CoreRouter = class {
 		clearRequest.query = payload.query;
 		clearRequest.params = payload.params;
 		ctx.clearRequest = clearRequest;
-		Container.bind(Request, ctx.clearRequest);
-		if (!(ctx.clearResponse instanceof Response)) {
-			ctx.clearResponse = this.initializeInstance(Response, ctx.response ?? ctx.reply ?? ctx.res);
-			Container.bind(Response, ctx.clearResponse);
-		}
+		if (!(ctx.clearResponse instanceof Response)) ctx.clearResponse = this.initializeInstance(Response, ctx.response ?? ctx.reply ?? ctx.res);
 		if (!instance) return;
 		instance.ctx = ctx;
 		instance.body = payload.body;