@qwik.dev/router 2.0.0-beta.39 → 2.0.0-beta.40

package/lib/chunks/http-error.qwik.mjs

@@ -1,35 +1,27 @@
-import { componentQrl, inlinedQrl, _jsxSorted, _fnSignal } from '@qwik.dev/core';
-import { f as useHttpStatus } from './use-functions.qwik.mjs';
-
-const _hf0 = (p0) => p0.status || 500;
-const _hf0_str = "p0.status||500";
-const _hf1 = (p0) => p0.message || "";
-const _hf1_str = 'p0.message||""';
-const cacheKey = (ev) => String(ev.status);
-const COLOR_400 = "#006ce9";
-const COLOR_500 = "#713fc2";
-const DisplayHttpStatus = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(() => {
-  const httpstatus = useHttpStatus();
-  const width = httpstatus.message ? "600px" : "300px";
-  const color = httpstatus.status < 500 ? COLOR_400 : COLOR_500;
-  const style = `
+import { useHttpStatus } from "../index.qwik.mjs";
+import { _fnSignal, _jsxSorted, componentQrl, inlinedQrl } from "@qwik.dev/core";
+var _hf0 = (p0) => p0.status || 500;
+var _hf0_str = "p0.status||500";
+var _hf1 = (p0) => p0.message || "";
+var _hf1_str = "p0.message||\"\"";
+/** Cache error pages per status code so all 404s (or 500s) share one cache entry. */ var cacheKey = (ev) => String(ev.status);
+var COLOR_400 = "#006ce9";
+var COLOR_500 = "#713fc2";
+var DisplayHttpStatus = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(() => {
+	const httpstatus = useHttpStatus();
+	const width = httpstatus.message ? "600px" : "300px";
+	const color = httpstatus.status < 500 ? COLOR_400 : COLOR_500;
+	const style = `
 			body { color: ${color}; background-color: #fafafa; padding: 30px; font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Roboto, sans-serif; }
 			p { max-width: ${width}; margin: 60px auto 30px auto; background: white; border-radius: 4px; box-shadow: 0px 0px 50px -20px ${color}; overflow: hidden; }
 			strong { display: inline-block; padding: 15px; background: ${color}; color: white; }
 			span { display: inline-block; padding: 15px; }
 	`;
-  return /* @__PURE__ */ _jsxSorted("p", null, null, [
-    /* @__PURE__ */ _jsxSorted("style", {
-      dangerouslySetInnerHTML: style
-    }, null, null, 3, null),
-    /* @__PURE__ */ _jsxSorted("strong", null, null, _fnSignal(_hf0, [
-      httpstatus
-    ], _hf0_str), 3, null),
-    " ",
-    /* @__PURE__ */ _jsxSorted("span", null, null, _fnSignal(_hf1, [
-      httpstatus
-    ], _hf1_str), 3, null)
-  ], 1, "vY_0");
+	return /*#__PURE__*/ _jsxSorted("p", null, null, [
+		/*#__PURE__*/ _jsxSorted("style", { dangerouslySetInnerHTML: style }, null, null, 3, null),
+		/*#__PURE__*/ _jsxSorted("strong", null, null, _fnSignal(_hf0, [httpstatus], _hf0_str), 3, null),
+		" ",
+		/*#__PURE__*/ _jsxSorted("span", null, null, _fnSignal(_hf1, [httpstatus], _hf1_str), 3, null)
+	], 1, "vY_0");
 }, "DisplayHttpStatus_component_PJf4K4PL7Oc"));
-
 export { cacheKey, DisplayHttpStatus as default };

package/lib/chunks/pathname.mjs

@@ -1,76 +1,57 @@
-const ensureSlash = (pathname) => pathname.endsWith("/") ? pathname : pathname + "/";
+/** Ensures the pathname ends with a slash */ var ensureSlash = (pathname) => pathname.endsWith("/") ? pathname : pathname + "/";
 function normalizePathname(pathname, basePathname) {
-  if (typeof pathname === "string") {
-    pathname = pathname.trim();
-    if (pathname !== "") {
-      try {
-        pathname = pathname.replace(/\/+/g, "/");
-        if (pathname.startsWith("/")) {
-          pathname = pathname.slice(1);
-        }
-        pathname = new URL(basePathname + pathname, `https://qwik.dev`).pathname;
-        if (pathname !== basePathname) {
-          if (!globalThis.__NO_TRAILING_SLASH__) {
-            if (!pathname.endsWith("/")) {
-              const segments = pathname.split("/");
-              const lastSegment = segments[segments.length - 1];
-              if (!lastSegment.includes(".")) {
-                pathname = ensureSlash(pathname);
-              }
-            }
-          } else {
-            if (pathname.endsWith("/")) {
-              pathname = pathname.slice(0, pathname.length - 1);
-            }
-          }
-        }
-        return pathname;
-      } catch (e) {
-        console.error(e);
-      }
-    }
-  }
-  return null;
+	if (typeof pathname === "string") {
+		pathname = pathname.trim();
+		if (pathname !== "") try {
+			pathname = pathname.replace(/\/+/g, "/");
+			if (pathname.startsWith("/")) pathname = pathname.slice(1);
+			pathname = new URL(basePathname + pathname, `https://qwik.dev`).pathname;
+			if (pathname !== basePathname) {
+				if (!globalThis.__NO_TRAILING_SLASH__) {
+					if (!pathname.endsWith("/")) {
+						const segments = pathname.split("/");
+						if (!segments[segments.length - 1].includes(".")) pathname = ensureSlash(pathname);
+					}
+				} else if (pathname.endsWith("/")) pathname = pathname.slice(0, pathname.length - 1);
+			}
+			return pathname;
+		} catch (e) {
+			console.error(e);
+		}
+	}
+	return null;
 }
 function getPathnameForDynamicRoute(originalPathname, paramNames, params) {
-  let pathname = originalPathname;
-  if (paramNames && params) {
-    for (const paramName of paramNames) {
-      const paramKey = `[${paramName}]`;
-      const restParamKey = `[...${paramName}]`;
-      const paramValue = params[paramName];
-      pathname = pathname.replace(restParamKey, paramValue);
-      pathname = pathname.replace(paramKey, paramValue);
-    }
-  }
-  return pathname;
+	let pathname = originalPathname;
+	if (paramNames && params) for (const paramName of paramNames) {
+		const paramKey = `[${paramName}]`;
+		const restParamKey = `[...${paramName}]`;
+		const paramValue = params[paramName];
+		pathname = pathname.replace(restParamKey, paramValue);
+		pathname = pathname.replace(paramKey, paramValue);
+	}
+	return pathname;
 }
-const PROTOCOLS = {
-  https: true,
-  http: true,
-  about: true,
-  javascript: true,
-  file: true
+var PROTOCOLS = {
+	https: true,
+	http: true,
+	about: true,
+	javascript: true,
+	file: true
 };
 function isSameOriginUrl(url) {
-  if (typeof url === "string") {
-    url = url.trim();
-    if (url !== "") {
-      const firstChar = url.charAt(0);
-      if (firstChar !== "/" && firstChar !== ".") {
-        if (firstChar === "#") {
-          return false;
-        }
-        const i = url.indexOf(":");
-        if (i > -1) {
-          const protocol = url.slice(0, i).toLowerCase();
-          return !PROTOCOLS[protocol];
-        }
-      }
-      return true;
-    }
-  }
-  return false;
+	if (typeof url === "string") {
+		url = url.trim();
+		if (url !== "") {
+			const firstChar = url.charAt(0);
+			if (firstChar !== "/" && firstChar !== ".") {
+				if (firstChar === "#") return false;
+				const i = url.indexOf(":");
+				if (i > -1) return !PROTOCOLS[url.slice(0, i).toLowerCase()];
+			}
+			return true;
+		}
+	}
+	return false;
 }
-
-export { ensureSlash as e, getPathnameForDynamicRoute as g, isSameOriginUrl as i, normalizePathname as n };
+export { normalizePathname as i, getPathnameForDynamicRoute as n, isSameOriginUrl as r, ensureSlash as t };

package/lib/chunks/request-body-limit.mjs

@@ -1,37 +1,27 @@
-import { S as ServerError } from './server-error.mjs';
-
-const DEFAULT_REQUEST_BODY_LIMIT = 10 * 1024 * 1024;
-class RequestBodyLimitError extends ServerError {
-  code = "QWIK_REQUEST_BODY_LIMIT";
-  statusCode = 413;
-  constructor(limit) {
-    super(413, `Request body exceeds ${limit} bytes`);
-  }
-}
-const validateRequestBodyLimit = (requestBodyLimit) => {
-  if (!Number.isSafeInteger(requestBodyLimit) || requestBodyLimit <= 0) {
-    throw new TypeError("requestBodyLimit must be a positive safe integer");
-  }
+import { t as ServerError } from "./server-error.mjs";
+var DEFAULT_REQUEST_BODY_LIMIT = 10485760;
+var RequestBodyLimitError = class extends ServerError {
+	code = "QWIK_REQUEST_BODY_LIMIT";
+	statusCode = 413;
+	constructor(limit) {
+		super(413, `Request body exceeds ${limit} bytes`);
+	}
 };
-const limitRequestBody = (request, requestBodyLimit = DEFAULT_REQUEST_BODY_LIMIT) => {
-  validateRequestBodyLimit(requestBodyLimit);
-  if (!request.body) {
-    return request;
-  }
-  let received = 0;
-  const body = request.body.pipeThrough(new TransformStream({
-    transform(chunk, controller) {
-      if (chunk.byteLength > requestBodyLimit - received) {
-        throw new RequestBodyLimitError(requestBodyLimit);
-      }
-      received += chunk.byteLength;
-      controller.enqueue(chunk);
-    }
-  }));
-  return new Request(request, {
-    body,
-    duplex: "half"
-  });
+var validateRequestBodyLimit = (requestBodyLimit) => {
+	if (!Number.isSafeInteger(requestBodyLimit) || requestBodyLimit <= 0) throw new TypeError("requestBodyLimit must be a positive safe integer");
 };
-
-export { DEFAULT_REQUEST_BODY_LIMIT as D, RequestBodyLimitError as R, limitRequestBody as l, validateRequestBodyLimit as v };
+var limitRequestBody = (request, requestBodyLimit = DEFAULT_REQUEST_BODY_LIMIT) => {
+	validateRequestBodyLimit(requestBodyLimit);
+	if (!request.body) return request;
+	let received = 0;
+	const body = request.body.pipeThrough(new TransformStream({ transform(chunk, controller) {
+		if (chunk.byteLength > requestBodyLimit - received) throw new RequestBodyLimitError(requestBodyLimit);
+		received += chunk.byteLength;
+		controller.enqueue(chunk);
+	} }));
+	return new Request(request, {
+		body,
+		duplex: "half"
+	});
+};
+export { validateRequestBodyLimit as i, RequestBodyLimitError as n, limitRequestBody as r, DEFAULT_REQUEST_BODY_LIMIT as t };

package/lib/chunks/request-path.mjs

@@ -1,60 +1,49 @@
-import { e as ensureSlash } from './pathname.mjs';
-
-const IsQLoader = "@isQLoader";
-const IsQAction = "@isQAction";
-const QLoaderId = "@loaderId";
-const QActionId = "@actionId";
-const LOADER_REGEX = /\/(q-loader-([^/.]+)\.([^/.]+)\.json)$/;
-const getLoaderName = (loaderId, manifestHash) => `q-loader-${loaderId}.${manifestHash}.json`;
-function recognizeRequest(pathname) {
-  if (pathname.length < 10) {
-    return null;
-  }
-  const loaderMatch = pathname.match(LOADER_REGEX);
-  if (loaderMatch) {
-    return {
-      type: IsQLoader,
-      trimLength: loaderMatch[1].length + 1,
-      data: {
-        loaderId: loaderMatch[2],
-        manifestHash: loaderMatch[3]
-      }
-    };
-  }
-  return null;
+import { t as ensureSlash } from "./pathname.mjs";
+var IsQLoader = "@isQLoader";
+var IsQAction = "@isQAction";
+var QLoaderId = "@loaderId";
+var QActionId = "@actionId";
+/** Matches the final `/q-loader-{loaderId}.{manifestHash}.json` path segment. */ var LOADER_REGEX = /\/(q-loader-([^/.]+)\.([^/.]+)\.json)$/;
+var getLoaderName = (loaderId, manifestHash) => `q-loader-${loaderId}.${manifestHash}.json`;
+/**
+* Recognize internal request types from the URL pathname.
+*
+* Returns the request type, how many characters to trim from the pathname, and any extracted data
+* (e.g. loaderId for loader requests).
+*/ function recognizeRequest(pathname) {
+	if (pathname.length < 10) return null;
+	const loaderMatch = pathname.match(LOADER_REGEX);
+	if (loaderMatch) return {
+		type: IsQLoader,
+		trimLength: loaderMatch[1].length + 1,
+		data: {
+			loaderId: loaderMatch[2],
+			manifestHash: loaderMatch[3]
+		}
+	};
+	return null;
 }
-function trimRecognizedInternalPathname(pathname, recognized) {
-  let trimmed = pathname.slice(0, pathname.length - recognized.trimLength) || "/";
-  if (!globalThis.__NO_TRAILING_SLASH__ && !trimmed.endsWith("/")) {
-    trimmed = ensureSlash(trimmed);
-  }
-  return trimmed;
+/** Trim a recognized internal URL suffix from a pathname, returning the clean route pathname. */ function trimRecognizedInternalPathname(pathname, recognized) {
+	let trimmed = pathname.slice(0, pathname.length - recognized.trimLength) || "/";
+	if (!globalThis.__NO_TRAILING_SLASH__ && !trimmed.endsWith("/")) trimmed = ensureSlash(trimmed);
+	return trimmed;
 }
-function trimInternalPathname(pathname) {
-  const recognized = recognizeRequest(pathname);
-  if (recognized) {
-    return trimRecognizedInternalPathname(pathname, recognized);
-  }
-  return pathname;
+/** Trim any recognized internal URL suffix from a pathname, returning the clean route pathname. */ function trimInternalPathname(pathname) {
+	const recognized = recognizeRequest(pathname);
+	if (recognized) return trimRecognizedInternalPathname(pathname, recognized);
+	return pathname;
 }
 function resolveValidInternalFullPathname(loaderPathname, fullPath) {
-  if (!fullPath || !fullPath.startsWith("/") || fullPath.startsWith("//")) {
-    return void 0;
-  }
-  try {
-    const pageUrl = new URL(fullPath, "http://qwik.internal");
-    if (pageUrl.origin !== "http://qwik.internal") {
-      return void 0;
-    }
-    const pagePathname = pageUrl.pathname;
-    if (pagePathname === loaderPathname) {
-      return void 0;
-    }
-    const loaderPrefix = ensureSlash(loaderPathname);
-    return pagePathname.startsWith(loaderPrefix) ? pagePathname : void 0;
-  } catch {
-    return void 0;
-  }
+	if (!fullPath || !fullPath.startsWith("/") || fullPath.startsWith("//")) return;
+	try {
+		const pageUrl = new URL(fullPath, "http://qwik.internal");
+		if (pageUrl.origin !== "http://qwik.internal") return;
+		const pagePathname = pageUrl.pathname;
+		if (pagePathname === loaderPathname) return;
+		const loaderPrefix = ensureSlash(loaderPathname);
+		return pagePathname.startsWith(loaderPrefix) ? pagePathname : void 0;
+	} catch {
+		return;
+	}
 }
-
-export { IsQLoader as I, LOADER_REGEX as L, QLoaderId as Q, resolveValidInternalFullPathname as a, trimInternalPathname as b, IsQAction as c, QActionId as d, getLoaderName as g, recognizeRequest as r, trimRecognizedInternalPathname as t };
+export { QLoaderId as a, resolveValidInternalFullPathname as c, QActionId as i, trimInternalPathname as l, IsQLoader as n, getLoaderName as o, LOADER_REGEX as r, recognizeRequest as s, IsQAction as t, trimRecognizedInternalPathname as u };

package/lib/chunks/routes.mjs

@@ -1,47 +1,26 @@
 function routeToRegExp(rule) {
-  let transformedRule;
-  if (rule === "/" || rule === "/*") {
-    transformedRule = rule;
-  } else if (rule.endsWith("/*")) {
-    transformedRule = `${rule.substring(0, rule.length - 2)}(/*)?`;
-  } else if (rule.endsWith("/")) {
-    transformedRule = `${rule.substring(0, rule.length - 1)}(/)?`;
-  } else if (rule.endsWith("*")) {
-    transformedRule = rule;
-  } else {
-    transformedRule = `${rule}(/)?`;
-  }
-  transformedRule = `^${transformedRule.replace(/\*/g, ".*")}$`;
-  return new RegExp(transformedRule);
+	let transformedRule;
+	if (rule === "/" || rule === "/*") transformedRule = rule;
+	else if (rule.endsWith("/*")) transformedRule = `${rule.substring(0, rule.length - 2)}(/*)?`;
+	else if (rule.endsWith("/")) transformedRule = `${rule.substring(0, rule.length - 1)}(/)?`;
+	else if (rule.endsWith("*")) transformedRule = rule;
+	else transformedRule = `${rule}(/)?`;
+	transformedRule = `^${transformedRule.replace(/\*/g, ".*")}$`;
+	return new RegExp(transformedRule);
 }
 function routesToRegExps(routes) {
-  if (!Array.isArray(routes)) {
-    return [];
-  }
-  return routes.filter((r) => typeof r === "string").map(routeToRegExp);
+	if (!Array.isArray(routes)) return [];
+	return routes.filter((r) => typeof r === "string").map(routeToRegExp);
 }
 function createRouteTester(basePathname, includeRoutes, excludeRoutes) {
-  const includes = routesToRegExps(includeRoutes);
-  const excludes = routesToRegExps(excludeRoutes);
-  return (pathname) => {
-    if (basePathname !== "/") {
-      pathname = pathname.slice(basePathname.length - 1);
-    }
-    for (const exclude of excludes) {
-      if (exclude.test(pathname)) {
-        return false;
-      }
-    }
-    if (pathname.endsWith("/404.html")) {
-      return true;
-    }
-    for (const include of includes) {
-      if (include.test(pathname)) {
-        return true;
-      }
-    }
-    return false;
-  };
+	const includes = routesToRegExps(includeRoutes);
+	const excludes = routesToRegExps(excludeRoutes);
+	return (pathname) => {
+		if (basePathname !== "/") pathname = pathname.slice(basePathname.length - 1);
+		for (const exclude of excludes) if (exclude.test(pathname)) return false;
+		if (pathname.endsWith("/404.html")) return true;
+		for (const include of includes) if (include.test(pathname)) return true;
+		return false;
+	};
 }
-
-export { createRouteTester as c };
+export { createRouteTester as t };

package/lib/chunks/server-error.mjs

@@ -1,19 +1,16 @@
-class AbortMessage {
-}
-class RedirectMessage extends AbortMessage {
-}
-
-class ServerError extends Error {
-  status;
-  data;
-  constructor(status, data) {
-    super(typeof data === "string" ? data : void 0), this.status = status, this.data = data;
-  }
-}
-const throwIfControlFlowSignal = (value) => {
-  if (value instanceof AbortMessage || value instanceof ServerError) {
-    throw value;
-  }
+/** @public */ var AbortMessage = class {};
+/** @public */ var RedirectMessage = class extends AbortMessage {};
+/** @public */ var ServerError = class extends Error {
+	status;
+	data;
+	constructor(status, data) {
+		super(typeof data === "string" ? data : void 0), this.status = status, this.data = data;
+	}
 };
-
-export { AbortMessage as A, RedirectMessage as R, ServerError as S, throwIfControlFlowSignal as t };
+/**
+* `ev.redirect()`, `ev.error()`, etc. return a control-flow signal meant to be thrown. Throw it for
+* the user when they return it instead, so returning and throwing behave the same.
+*/ var throwIfControlFlowSignal = (value) => {
+	if (value instanceof AbortMessage || value instanceof ServerError) throw value;
+};
+export { RedirectMessage as i, throwIfControlFlowSignal as n, AbortMessage as r, ServerError as t };