routup 6.0.0-beta.3 → 6.0.0

package/dist/{src-KLwWuArk.mjs → src-CA6xFXqy.mjs}

@@ -490,6 +490,152 @@ function setResponseHeaderContentType(event, input, ifNotExists) {
 	if (contentType) event.response.headers.set(HeaderName.CONTENT_TYPE, contentType);
 }
 //#endregion
+//#region src/response/helpers/send-file.ts
+async function sendFile(event, options) {
+	let stats;
+	if (typeof options.stats === "function") stats = await options.stats();
+	else stats = options.stats;
+	const name = options.name || stats.name;
+	const { headers } = event.response;
+	const disposition = options.disposition ?? (options.attachment ? "attachment" : void 0);
+	if (name) {
+		const fileName = basename(name);
+		if (disposition) {
+			if (!headers.get(HeaderName.CONTENT_DISPOSITION)) if (disposition === "inline") setResponseHeaderInline(event, fileName);
+			else setResponseHeaderAttachment(event, fileName);
+		} else setResponseContentTypeByFileName(event, fileName);
+	}
+	const contentOptions = {};
+	let statusCode = event.response.status;
+	if (stats.size) {
+		const rangeHeader = event.headers.get(HeaderName.RANGE);
+		if (rangeHeader) {
+			const [x, y] = rangeHeader.replace("bytes=", "").split("-");
+			const parsedStart = Number.parseInt(x, 10);
+			const parsedEnd = Number.parseInt(y, 10);
+			contentOptions.start = Number.isFinite(parsedStart) && parsedStart >= 0 ? parsedStart : 0;
+			contentOptions.end = Number.isFinite(parsedEnd) && parsedEnd >= 0 ? Math.min(parsedEnd, stats.size - 1) : stats.size - 1;
+			if (contentOptions.start >= stats.size || contentOptions.start > contentOptions.end) {
+				const rangeHeaders = new Headers(headers);
+				rangeHeaders.set(HeaderName.CONTENT_RANGE, `bytes */${stats.size}`);
+				return new Response(null, {
+					status: 416,
+					headers: rangeHeaders
+				});
+			}
+			headers.set(HeaderName.CONTENT_RANGE, `bytes ${contentOptions.start}-${contentOptions.end}/${stats.size}`);
+			headers.set(HeaderName.CONTENT_LENGTH, `${contentOptions.end - contentOptions.start + 1}`);
+			statusCode = 206;
+		} else headers.set(HeaderName.CONTENT_LENGTH, `${stats.size}`);
+		headers.set(HeaderName.ACCEPT_RANGES, "bytes");
+		if (stats.mtime) {
+			const mtime = new Date(stats.mtime);
+			headers.set(HeaderName.LAST_MODIFIED, mtime.toUTCString());
+			headers.set(HeaderName.ETag, `W/"${stats.size}-${mtime.getTime()}"`);
+		}
+	}
+	const content = await options.content(contentOptions);
+	return new Response(content, {
+		status: statusCode,
+		headers
+	});
+}
+//#endregion
+//#region src/request/helpers/header.ts
+function getRequestHeader(event, name) {
+	return event.headers.get(name);
+}
+//#endregion
+//#region src/request/helpers/negotiator.ts
+const NEGOTIATOR_KEY = Symbol.for("routup:negotiator");
+function headersToPlainObject(headers) {
+	const result = {};
+	headers.forEach((value, key) => {
+		result[key] = value;
+	});
+	return result;
+}
+function useRequestNegotiator(event) {
+	let value = event.store[NEGOTIATOR_KEY];
+	if (value) return value;
+	value = new Negotiator({ headers: headersToPlainObject(event.headers) });
+	event.store[NEGOTIATOR_KEY] = value;
+	return value;
+}
+//#endregion
+//#region src/request/helpers/header-accept.ts
+function getRequestAcceptableContentTypes(event) {
+	return useRequestNegotiator(event).mediaTypes();
+}
+function getRequestAcceptableContentType(event, input) {
+	input = input || [];
+	const items = Array.isArray(input) ? input : [input];
+	if (items.length === 0) return getRequestAcceptableContentTypes(event).shift();
+	if (!getRequestHeader(event, HeaderName.ACCEPT)) return items[0];
+	let polluted = false;
+	const mimeTypes = [];
+	for (const item of items) {
+		const mimeType = getMimeType(item);
+		if (mimeType) mimeTypes.push(mimeType);
+		else polluted = true;
+	}
+	const matches = useRequestNegotiator(event).mediaTypes(mimeTypes);
+	if (matches.length > 0) {
+		if (polluted) return items[0];
+		return items[mimeTypes.indexOf(matches[0])];
+	}
+}
+//#endregion
+//#region src/response/helpers/send-format.ts
+function sendFormat(event, input) {
+	const { default: formatDefault, ...formats } = input;
+	const contentTypes = Object.keys(formats);
+	if (contentTypes.length === 0) return formatDefault();
+	const contentType = getRequestAcceptableContentType(event, contentTypes);
+	if (contentType && formats[contentType]) return formats[contentType]();
+	return formatDefault();
+}
+//#endregion
+//#region src/response/helpers/send-redirect.ts
+function escapeHtml(str) {
+	return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function isAllowedRedirectUrl(location) {
+	if (location.startsWith("//")) return false;
+	if (location.startsWith("/") || location.startsWith(".")) return true;
+	try {
+		const url = new URL(location);
+		return url.protocol === "http:" || url.protocol === "https:";
+	} catch {
+		return true;
+	}
+}
+function sendRedirect(event, location, statusCode = 302) {
+	if (!isAllowedRedirectUrl(location)) throw new AppError({
+		status: 400,
+		message: "Invalid redirect URL scheme."
+	});
+	const sanitizedLocation = sanitizeHeaderValue(location);
+	const html = `<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=${escapeHtml(location)}"></head></html>`;
+	const headers = new Headers(event.response.headers);
+	headers.set("location", sanitizedLocation);
+	headers.set("content-type", "text/html; charset=utf-8");
+	headers.delete("content-length");
+	return new Response(html, {
+		status: statusCode,
+		headers
+	});
+}
+//#endregion
+//#region src/response/helpers/send-stream.ts
+function sendStream(event, stream) {
+	const { status, headers } = event.response;
+	return new Response(stream, {
+		status,
+		headers
+	});
+}
+//#endregion
 //#region src/error/is.ts
 function isError(input) {
 	return hasInstanceof(input, ErrorSymbol);
@@ -638,164 +784,6 @@ function toResponse(value, event) {
 	});
 }
 //#endregion
-//#region src/response/helpers/send-accepted.ts
-async function sendAccepted(event, data) {
-	event.response.status = 202;
-	return await toResponse(data ?? "", event);
-}
-//#endregion
-//#region src/response/helpers/send-created.ts
-async function sendCreated(event, data) {
-	event.response.status = 201;
-	return await toResponse(data ?? "", event);
-}
-//#endregion
-//#region src/response/helpers/send-file.ts
-async function sendFile(event, options) {
-	let stats;
-	if (typeof options.stats === "function") stats = await options.stats();
-	else stats = options.stats;
-	const name = options.name || stats.name;
-	const { headers } = event.response;
-	const disposition = options.disposition ?? (options.attachment ? "attachment" : void 0);
-	if (name) {
-		const fileName = basename(name);
-		if (disposition) {
-			if (!headers.get(HeaderName.CONTENT_DISPOSITION)) if (disposition === "inline") setResponseHeaderInline(event, fileName);
-			else setResponseHeaderAttachment(event, fileName);
-		} else setResponseContentTypeByFileName(event, fileName);
-	}
-	const contentOptions = {};
-	let statusCode = event.response.status;
-	if (stats.size) {
-		const rangeHeader = event.headers.get(HeaderName.RANGE);
-		if (rangeHeader) {
-			const [x, y] = rangeHeader.replace("bytes=", "").split("-");
-			const parsedStart = Number.parseInt(x, 10);
-			const parsedEnd = Number.parseInt(y, 10);
-			contentOptions.start = Number.isFinite(parsedStart) && parsedStart >= 0 ? parsedStart : 0;
-			contentOptions.end = Number.isFinite(parsedEnd) && parsedEnd >= 0 ? Math.min(parsedEnd, stats.size - 1) : stats.size - 1;
-			if (contentOptions.start >= stats.size || contentOptions.start > contentOptions.end) {
-				const rangeHeaders = new Headers(headers);
-				rangeHeaders.set(HeaderName.CONTENT_RANGE, `bytes */${stats.size}`);
-				return new Response(null, {
-					status: 416,
-					headers: rangeHeaders
-				});
-			}
-			headers.set(HeaderName.CONTENT_RANGE, `bytes ${contentOptions.start}-${contentOptions.end}/${stats.size}`);
-			headers.set(HeaderName.CONTENT_LENGTH, `${contentOptions.end - contentOptions.start + 1}`);
-			statusCode = 206;
-		} else headers.set(HeaderName.CONTENT_LENGTH, `${stats.size}`);
-		headers.set(HeaderName.ACCEPT_RANGES, "bytes");
-		if (stats.mtime) {
-			const mtime = new Date(stats.mtime);
-			headers.set(HeaderName.LAST_MODIFIED, mtime.toUTCString());
-			headers.set(HeaderName.ETag, `W/"${stats.size}-${mtime.getTime()}"`);
-		}
-	}
-	const content = await options.content(contentOptions);
-	return new Response(content, {
-		status: statusCode,
-		headers
-	});
-}
-//#endregion
-//#region src/request/helpers/header.ts
-function getRequestHeader(event, name) {
-	return event.headers.get(name);
-}
-//#endregion
-//#region src/request/helpers/negotiator.ts
-const NEGOTIATOR_KEY = Symbol.for("routup:negotiator");
-function headersToPlainObject(headers) {
-	const result = {};
-	headers.forEach((value, key) => {
-		result[key] = value;
-	});
-	return result;
-}
-function useRequestNegotiator(event) {
-	let value = event.store[NEGOTIATOR_KEY];
-	if (value) return value;
-	value = new Negotiator({ headers: headersToPlainObject(event.headers) });
-	event.store[NEGOTIATOR_KEY] = value;
-	return value;
-}
-//#endregion
-//#region src/request/helpers/header-accept.ts
-function getRequestAcceptableContentTypes(event) {
-	return useRequestNegotiator(event).mediaTypes();
-}
-function getRequestAcceptableContentType(event, input) {
-	input = input || [];
-	const items = Array.isArray(input) ? input : [input];
-	if (items.length === 0) return getRequestAcceptableContentTypes(event).shift();
-	if (!getRequestHeader(event, HeaderName.ACCEPT)) return items[0];
-	let polluted = false;
-	const mimeTypes = [];
-	for (const item of items) {
-		const mimeType = getMimeType(item);
-		if (mimeType) mimeTypes.push(mimeType);
-		else polluted = true;
-	}
-	const matches = useRequestNegotiator(event).mediaTypes(mimeTypes);
-	if (matches.length > 0) {
-		if (polluted) return items[0];
-		return items[mimeTypes.indexOf(matches[0])];
-	}
-}
-//#endregion
-//#region src/response/helpers/send-format.ts
-function sendFormat(event, input) {
-	const { default: formatDefault, ...formats } = input;
-	const contentTypes = Object.keys(formats);
-	if (contentTypes.length === 0) return formatDefault();
-	const contentType = getRequestAcceptableContentType(event, contentTypes);
-	if (contentType && formats[contentType]) return formats[contentType]();
-	return formatDefault();
-}
-//#endregion
-//#region src/response/helpers/send-redirect.ts
-function escapeHtml(str) {
-	return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function isAllowedRedirectUrl(location) {
-	if (location.startsWith("//")) return false;
-	if (location.startsWith("/") || location.startsWith(".")) return true;
-	try {
-		const url = new URL(location);
-		return url.protocol === "http:" || url.protocol === "https:";
-	} catch {
-		return true;
-	}
-}
-function sendRedirect(event, location, statusCode = 302) {
-	if (!isAllowedRedirectUrl(location)) throw new AppError({
-		status: 400,
-		message: "Invalid redirect URL scheme."
-	});
-	const sanitizedLocation = sanitizeHeaderValue(location);
-	const html = `<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=${escapeHtml(location)}"></head></html>`;
-	const headers = new Headers(event.response.headers);
-	headers.set("location", sanitizedLocation);
-	headers.set("content-type", "text/html; charset=utf-8");
-	headers.delete("content-length");
-	return new Response(html, {
-		status: statusCode,
-		headers
-	});
-}
-//#endregion
-//#region src/response/helpers/send-stream.ts
-function sendStream(event, stream) {
-	const { status, headers } = event.response;
-	return new Response(stream, {
-		status,
-		headers
-	});
-}
-//#endregion
 //#region src/dispatcher/module.ts
 var DispatcherEvent = class {
 	request;
@@ -2491,7 +2479,7 @@ var App = class App {
 		let response;
 		try {
 			const matches = this.router.lookup(event.path, event.method);
-			response = await this.runMatches(event, matches, event.path, 0);
+			response = await this.runMatches(event, matches, 0);
 			if (!event.error && !event.dispatched && isRoot && event.method === MethodName.OPTIONS) {
 				if (event.methodsAllowed.has(MethodName.GET)) event.methodsAllowed.add(MethodName.HEAD);
 				const options = [...event.methodsAllowed].map((key) => key.toUpperCase()).join(",");
@@ -2518,8 +2506,16 @@ var App = class App {
 	* Walk the matched routes for the current event, dispatching each
 	* handler in order. Re-entered (recursively) from the `setNext`
 	* continuation so `event.next()` resumes from the next match.
+	*
+	* The match list is captured once per dispatch — there is no
+	* mid-walk path-rewrite refresh. `IAppEvent.path` is a snapshot
+	* on the handler's facade event (see `event/module.ts`), so user
+	* middleware cannot mutate the dispatcher's path before calling
+	* `event.next()`. If a future API surface lets middleware rewrite
+	* paths end-to-end, this loop will need a per-call refresh + a
+	* `methodsAllowed` reset (see closed issue #913).
 	*/
-	async runMatches(event, matches, matchesPath, startIndex) {
+	async runMatches(event, matches, startIndex) {
 		let i = startIndex;
 		let response;
 		while (!event.dispatched && i < matches.length) {
@@ -2539,15 +2535,10 @@ var App = class App {
 			const savedMountPath = event.mountPath;
 			if (typeof match.path === "string") event.mountPath = match.path;
 			const capturedMatches = matches;
-			const capturedMatchesPath = matchesPath;
 			const nextIndex = i + 1;
 			event.setNext(async (error) => {
 				if (error) event.error = createError(error);
-				const pathChanged = event.path !== capturedMatchesPath;
-				const nextMatches = pathChanged ? this.router.lookup(event.path, event.method) : capturedMatches;
-				const nextMatchesPath = pathChanged ? event.path : capturedMatchesPath;
-				const nextStart = pathChanged ? 0 : nextIndex;
-				return this.runMatches(event, nextMatches, nextMatchesPath, nextStart);
+				return this.runMatches(event, capturedMatches, nextIndex);
 			});
 			try {
 				const dispatchResponse = await handler.dispatch(event);
@@ -2755,6 +2746,6 @@ var App = class App {
 	}
 };
 //#endregion
-export { setResponseHeaderContentType as $, isWebHandler as A, sendStream as B, getRequestAcceptableCharset as C, isHandler as D, matchHandlerMethod as E, defineCoreHandler as F, useRequestNegotiator as G, sendFormat as H, Handler as I, sendCreated as J, getRequestHeader as K, HandlerSymbol as L, fromNodeHandler as M, fromNodeMiddleware as N, isHandlerOptions as O, defineErrorHandler as P, isError as Q, HandlerType as R, getRequestAcceptableEncodings as S, isRequestCacheable as T, getRequestAcceptableContentType as U, sendRedirect as V, getRequestAcceptableContentTypes as W, toResponse as X, sendAccepted as Y, createError as Z, getRequestHostName as _, LinearRouter as a, createEventStream as at, getRequestAcceptableLanguages as b, PluginNotInstalledError as c, ErrorSymbol as ct, isPluginError as d, HeaderName as dt, setResponseHeaderAttachment as et, PluginErrorCode as f, MethodName as ft, getRequestIP as g, getRequestProtocol as h, TrieRouter as i, appendResponseHeaderDirective as it, isWebHandlerProvider as j, fromWebHandler as k, PluginInstallError as l, setResponseCacheHeaders as lt, PathMatcher as m, normalizeAppOptions as n, setResponseContentTypeByFileName as nt, buildRoutePathMatcher as o, serializeEventStreamMessage as ot, isPath as p, LruCache as pt, sendFile as q, SmartRouter as r, appendResponseHeader as rt, isPlugin as s, AppError as st, App as t, setResponseHeaderInline as tt, PluginError as u, AppEvent as ut, matchRequestContentType as v, getRequestAcceptableCharsets as w, getRequestAcceptableEncoding as x, getRequestAcceptableLanguage as y, DispatcherEvent as z };
+export { setResponseHeaderInline as $, isWebHandler as A, toResponse as B, getRequestAcceptableCharset as C, isHandler as D, matchHandlerMethod as E, defineCoreHandler as F, sendFormat as G, isError as H, Handler as I, useRequestNegotiator as J, getRequestAcceptableContentType as K, HandlerSymbol as L, fromNodeHandler as M, fromNodeMiddleware as N, isHandlerOptions as O, defineErrorHandler as P, setResponseHeaderAttachment as Q, HandlerType as R, getRequestAcceptableEncodings as S, isRequestCacheable as T, sendStream as U, createError as V, sendRedirect as W, sendFile as X, getRequestHeader as Y, setResponseHeaderContentType as Z, getRequestHostName as _, LinearRouter as a, AppError as at, getRequestAcceptableLanguages as b, PluginNotInstalledError as c, AppEvent as ct, isPluginError as d, LruCache as dt, setResponseContentTypeByFileName as et, PluginErrorCode as f, getRequestIP as g, getRequestProtocol as h, TrieRouter as i, serializeEventStreamMessage as it, isWebHandlerProvider as j, fromWebHandler as k, PluginInstallError as l, HeaderName as lt, PathMatcher as m, normalizeAppOptions as n, appendResponseHeaderDirective as nt, buildRoutePathMatcher as o, ErrorSymbol as ot, isPath as p, getRequestAcceptableContentTypes as q, SmartRouter as r, createEventStream as rt, isPlugin as s, setResponseCacheHeaders as st, App as t, appendResponseHeader as tt, PluginError as u, MethodName as ut, matchRequestContentType as v, getRequestAcceptableCharsets as w, getRequestAcceptableEncoding as x, getRequestAcceptableLanguage as y, DispatcherEvent as z };
 
-//# sourceMappingURL=src-KLwWuArk.mjs.map
+//# sourceMappingURL=src-CA6xFXqy.mjs.map