routup 5.0.0-beta.7 → 5.0.0

package/dist/{src-B5i9q3Ix.mjs → src-BIwUJ5wD.mjs}

@@ -924,18 +924,43 @@ function isPath(input) {
 	return typeof input === "string";
 }
 //#endregion
+//#region src/handler/utils.ts
+/**
+* Build a `PathMatcher` for a handler-side path.
+*
+* Returns `undefined` when no path is supplied. The `end` flag controls
+* whether the matcher requires a full match (`true` for method handlers
+* matching exact routes) or accepts a prefix (`false` for middleware).
+*/
+function buildHandlerPathMatcher(path, end) {
+	if (typeof path === "undefined") return;
+	return new PathMatcher(typeof path === "string" ? withLeadingSlash(path) : path, { end });
+}
+/**
+* Match a request method against a handler's bound method.
+*
+* - When the handler has no method bound, matches every request method.
+* - Otherwise matches when the request method is the same.
+* - HEAD requests additionally match GET handlers.
+*/
+function matchHandlerMethod(handlerMethod, requestMethod) {
+	return !handlerMethod || requestMethod === handlerMethod || requestMethod === MethodName.HEAD && handlerMethod === MethodName.GET;
+}
+//#endregion
 //#region src/handler/module.ts
 var Handler = class {
 	"@instanceof" = HandlerSymbol;
 	config;
 	hookManager;
 	pathMatcher;
-	_method;
+	method;
 	constructor(handler) {
 		this.config = handler;
 		this.hookManager = new HookManager();
 		this.mountHooks();
-		this.setPath(handler.path);
+		if (typeof handler.path === "string") this.config.path = withLeadingSlash(handler.path);
+		this.pathMatcher = buildHandlerPathMatcher(this.config.path, !!this.config.method);
+		this.method = this.config.method ? toMethodName(this.config.method) : void 0;
 	}
 	get type() {
 		return this.config.type;
@@ -943,11 +968,6 @@ var Handler = class {
 	get path() {
 		return this.config.path;
 	}
-	get method() {
-		if (this._method || !this.config.method) return this._method;
-		this._method = toMethodName(this.config.method);
-		return this._method;
-	}
 	async dispatch(event) {
 		if (this.pathMatcher) {
 			const pathMatch = this.pathMatcher.exec(event.path);
@@ -1006,23 +1026,6 @@ var Handler = class {
 		if (!this.pathMatcher) return true;
 		return this.pathMatcher.test(path);
 	}
-	setPath(path) {
-		if (typeof path === "string") path = withLeadingSlash(path);
-		this.config.path = path;
-		if (typeof path === "undefined") {
-			this.pathMatcher = void 0;
-			return;
-		}
-		this.pathMatcher = new PathMatcher(path, { end: !!this.config.method });
-	}
-	matchMethod(method) {
-		return !this.method || method === this.method || method === MethodName.HEAD && this.method === MethodName.GET;
-	}
-	setMethod(input) {
-		const method = toMethodName(input);
-		this.config.method = method;
-		this._method = method;
-	}
 	/**
 	* Resolve a handler's return value into the final value handed to `toResponse`.
 	*
@@ -1461,12 +1464,26 @@ const RouterPipelineStep = {
 	CHILD_AFTER: 4,
 	FINISH: 5
 };
+const RouterStackEntryType = {
+	ROUTER: "router",
+	HANDLER: "handler"
+};
 //#endregion
 //#region src/router/utils.ts
 function isRouterInstance(input) {
 	return isInstance(input, RouterSymbol);
 }
 /**
+* Build a non-terminal `PathMatcher` for a router mount path.
+*
+* Returns `undefined` when the path is the root (`/`) or omitted entirely —
+* a router mounted at the root has no intrinsic path filter.
+*/
+function buildRouterPathMatcher(value) {
+	if (value === "/" || typeof value === "undefined") return;
+	return new PathMatcher(withLeadingSlash(withoutTrailingSlash(`${value}`)), { end: false });
+}
+/**
 * Check if the request accepts JSON responses.
 * Matches application/json and +json suffixes (e.g. application/vnd.api+json).
 * Returns true if no Accept header is present (API-first default).
@@ -1485,7 +1502,9 @@ var Router = class Router {
 	*/
 	name;
 	/**
-	* Array of mounted layers, routes & routers.
+	* Array of mounted layers, routes & routers, each tagged by kind so the
+	* dispatch loop can discriminate without `isRouterInstance`/`isHandler`
+	* runtime checks.
 	*
 	* @protected
 	*/
@@ -1516,19 +1535,12 @@ var Router = class Router {
 		this.name = input.name;
 		this.hookManager = new HookManager();
 		this._options = normalizeRouterOptions(input);
-		this.setPath(input.path);
+		this.pathMatcher = buildRouterPathMatcher(input.path);
 	}
 	matchPath(path) {
 		if (this.pathMatcher) return this.pathMatcher.test(path);
 		return true;
 	}
-	setPath(value) {
-		if (value === "/" || typeof value === "undefined") {
-			this.pathMatcher = void 0;
-			return;
-		}
-		this.pathMatcher = new PathMatcher(withLeadingSlash(withoutTrailingSlash(`${value}`)), { end: false });
-	}
 	/**
 	* Public entry point — creates a DispatcherEvent from the request,
 	* runs the pipeline, and returns a Response (with 404/500 fallbacks).
@@ -1611,15 +1623,17 @@ var Router = class Router {
 	}
 	async executePipelineStepLookup(context) {
 		while (!context.event.dispatched && context.stackIndex < this.stack.length) {
-			const item = this.stack[context.stackIndex];
-			if (isHandler(item)) {
-				if (context.event.error && item.type === HandlerType.CORE || !context.event.error && item.type === HandlerType.ERROR) {
+			const entry = this.stack[context.stackIndex];
+			if (entry.type === RouterStackEntryType.HANDLER) {
+				const handler = entry.data;
+				if (context.event.error && handler.type === HandlerType.CORE || !context.event.error && handler.type === HandlerType.ERROR) {
 					context.stackIndex++;
 					continue;
 				}
-				if (item.matchPath(context.event.path)) {
-					if (item.method) context.event.methodsAllowed.add(item.method);
-					if (item.matchMethod(context.event.method)) {
+				if (entry.pathMatcher ? entry.pathMatcher.test(context.event.path) : handler.matchPath(context.event.path)) {
+					const method = entry.method ?? handler.method;
+					if (method) context.event.methodsAllowed.add(method);
+					if (matchHandlerMethod(method, context.event.method)) {
 						await this.hookManager.trigger(HookName.CHILD_MATCH, context.event);
 						if (context.event.dispatched) context.step = RouterPipelineStep.FINISH;
 						else context.step = RouterPipelineStep.CHILD_BEFORE;
@@ -1629,7 +1643,7 @@ var Router = class Router {
 				context.stackIndex++;
 				continue;
 			}
-			if (item.matchPath(context.event.path)) {
+			if (entry.pathMatcher ? entry.pathMatcher.test(context.event.path) : entry.data.matchPath(context.event.path)) {
 				await this.hookManager.trigger(HookName.CHILD_MATCH, context.event);
 				if (context.event.dispatched) context.step = RouterPipelineStep.FINISH;
 				else context.step = RouterPipelineStep.CHILD_BEFORE;
@@ -1650,12 +1664,33 @@ var Router = class Router {
 		else context.step = RouterPipelineStep.LOOKUP;
 	}
 	async executePipelineStepChildDispatch(context) {
-		if (context.event.dispatched || typeof this.stack[context.stackIndex] === "undefined") {
+		const entry = this.stack[context.stackIndex];
+		if (context.event.dispatched || typeof entry === "undefined") {
 			context.step = RouterPipelineStep.FINISH;
 			return;
 		}
-		const item = this.stack[context.stackIndex];
 		const { event } = context;
+		const savedPath = event.path;
+		const savedMountPath = event.mountPath;
+		const savedParams = event.params;
+		if (entry.type === RouterStackEntryType.ROUTER && entry.pathMatcher) {
+			const output = entry.pathMatcher.exec(event.path);
+			if (typeof output !== "undefined") {
+				event.mountPath = cleanDoubleSlashes(`${event.mountPath}/${output.path}`);
+				if (event.path === output.path) event.path = "/";
+				else event.path = withLeadingSlash(event.path.substring(output.path.length));
+				event.params = {
+					...event.params,
+					...output.params
+				};
+			}
+		} else if (entry.type === RouterStackEntryType.HANDLER && entry.pathMatcher) {
+			const output = entry.pathMatcher.exec(event.path);
+			if (typeof output !== "undefined") event.params = {
+				...event.params,
+				...output.params
+			};
+		}
 		try {
 			event.setNext(async (error) => {
 				if (error) event.error = createError(error);
@@ -1668,7 +1703,7 @@ var Router = class Router {
 				await this.executePipelineStep(nextContext);
 				return nextContext.response;
 			});
-			const response = await item.dispatch(event);
+			const response = await entry.data.dispatch(event);
 			if (response) {
 				context.response = response;
 				event.dispatched = true;
@@ -1677,6 +1712,11 @@ var Router = class Router {
 			event.error = createError(e);
 			await this.hookManager.trigger(HookName.ERROR, event);
 		}
+		if (!event.dispatched) {
+			event.path = savedPath;
+			event.mountPath = savedMountPath;
+			event.params = savedParams;
+		}
 		context.stackIndex++;
 		context.step = RouterPipelineStep.CHILD_AFTER;
 	}
@@ -1696,6 +1736,9 @@ var Router = class Router {
 		return this.hookManager.trigger(HookName.RESPONSE, context.event);
 	}
 	async dispatch(event) {
+		const savedPath = event.path;
+		const savedMountPath = event.mountPath;
+		const savedParams = event.params;
 		if (this.pathMatcher) {
 			const output = this.pathMatcher.exec(event.path);
 			if (typeof output !== "undefined") {
@@ -1721,6 +1764,11 @@ var Router = class Router {
 			await this.executePipelineStep(context);
 		} finally {
 			event.routerPath.pop();
+			if (!event.dispatched) {
+				event.path = savedPath;
+				event.mountPath = savedMountPath;
+				event.params = savedParams;
+			}
 		}
 		return context.response;
 	}
@@ -1759,17 +1807,20 @@ var Router = class Router {
 				path = element;
 				continue;
 			}
-			if (isHandlerOptions(element)) {
-				if (path) element.path = path;
-				element.method = method;
-				this.use(element);
-				continue;
-			}
-			if (isHandler(element)) {
-				if (path) element.setPath(path);
-				element.setMethod(method);
-				this.use(element);
-			}
+			let handler;
+			if (isHandlerOptions(element)) handler = new Handler({
+				...element,
+				method,
+				path: path ?? element.path
+			});
+			else if (isHandler(element)) handler = element;
+			else continue;
+			this.stack.push({
+				type: RouterStackEntryType.HANDLER,
+				data: handler,
+				method,
+				pathMatcher: buildHandlerPathMatcher(path ?? handler.path, true)
+			});
 		}
 	}
 	use(...input) {
@@ -1780,18 +1831,30 @@ var Router = class Router {
 				continue;
 			}
 			if (isRouterInstance(item)) {
-				if (path) item.setPath(path);
-				this.stack.push(item);
+				this.stack.push({
+					type: RouterStackEntryType.ROUTER,
+					data: item,
+					pathMatcher: buildRouterPathMatcher(path)
+				});
 				continue;
 			}
 			if (isHandlerOptions(item)) {
-				item.path = path || item.path;
-				this.stack.push(new Handler(item));
+				const handler = new Handler({
+					...item,
+					path: path ?? item.path
+				});
+				this.stack.push({
+					type: RouterStackEntryType.HANDLER,
+					data: handler
+				});
 				continue;
 			}
 			if (isHandler(item)) {
-				item.setPath(path || item.path);
-				this.stack.push(item);
+				this.stack.push({
+					type: RouterStackEntryType.HANDLER,
+					data: item,
+					pathMatcher: buildHandlerPathMatcher(path, !!item.method)
+				});
 				continue;
 			}
 			if (isPlugin(item)) if (path) this.install(item, { path });
@@ -1834,6 +1897,6 @@ var Router = class Router {
 	}
 };
 //#endregion
-export { appendResponseHeader as $, Handler as A, getRequestAcceptableContentType as B, fromWebHandler as C, fromNodeMiddleware as D, fromNodeHandler as E, DispatcherEvent as F, sendCreated as G, useRequestNegotiator as H, RoutupEvent as I, createError as J, sendAccepted as K, sendStream as L, PathMatcher as M, HandlerSymbol as N, defineErrorHandler as O, HandlerType as P, setResponseContentTypeByFileName as Q, sendRedirect as R, isHandlerOptions as S, isWebHandlerProvider as T, getRequestHeader as U, getRequestAcceptableContentTypes as V, sendFile as W, setResponseHeaderContentType as X, isError as Y, setResponseHeaderAttachment as Z, getRequestAcceptableEncodings as _, PluginInstallError as a, setResponseCacheHeaders as at, isRequestCacheable as b, isPluginError as c, getRequestIP as d, appendResponseHeaderDirective as et, getRequestHostName as f, getRequestAcceptableEncoding as g, getRequestAcceptableLanguages as h, PluginNotInstalledError as i, RoutupError as it, isPath as j, defineCoreHandler as k, PluginErrorCode as l, getRequestAcceptableLanguage as m, normalizeRouterOptions as n, serializeEventStreamMessage as nt, PluginAlreadyInstalledError as o, HeaderName as ot, matchRequestContentType as p, toResponse as q, isPlugin as r, ErrorSymbol as rt, PluginError as s, MethodName as st, Router as t, createEventStream as tt, getRequestProtocol as u, getRequestAcceptableCharset as v, isWebHandler as w, isHandler as x, getRequestAcceptableCharsets as y, sendFormat as z };
+export { setResponseHeaderAttachment as $, Handler as A, sendRedirect as B, fromWebHandler as C, fromNodeMiddleware as D, fromNodeHandler as E, HandlerSymbol as F, getRequestHeader as G, getRequestAcceptableContentType as H, HandlerType as I, sendAccepted as J, sendFile as K, DispatcherEvent as L, matchHandlerMethod as M, isPath as N, defineErrorHandler as O, PathMatcher as P, setResponseHeaderContentType as Q, RoutupEvent as R, isHandlerOptions as S, isWebHandlerProvider as T, getRequestAcceptableContentTypes as U, sendFormat as V, useRequestNegotiator as W, createError as X, toResponse as Y, isError as Z, getRequestAcceptableEncodings as _, PluginInstallError as a, ErrorSymbol as at, isRequestCacheable as b, isPluginError as c, HeaderName as ct, getRequestIP as d, setResponseContentTypeByFileName as et, getRequestHostName as f, getRequestAcceptableEncoding as g, getRequestAcceptableLanguages as h, PluginNotInstalledError as i, serializeEventStreamMessage as it, buildHandlerPathMatcher as j, defineCoreHandler as k, PluginErrorCode as l, MethodName as lt, getRequestAcceptableLanguage as m, normalizeRouterOptions as n, appendResponseHeaderDirective as nt, PluginAlreadyInstalledError as o, RoutupError as ot, matchRequestContentType as p, sendCreated as q, isPlugin as r, createEventStream as rt, PluginError as s, setResponseCacheHeaders as st, Router as t, appendResponseHeader as tt, getRequestProtocol as u, getRequestAcceptableCharset as v, isWebHandler as w, isHandler as x, getRequestAcceptableCharsets as y, sendStream as z };
 
-//# sourceMappingURL=src-B5i9q3Ix.mjs.map
+//# sourceMappingURL=src-BIwUJ5wD.mjs.map