@qwik.dev/router 2.0.0-beta.43 → 2.0.0-beta.47

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

@@ -4,13 +4,14 @@ 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);
+/** 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 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; }
@@ -19,9 +20,9 @@ var DisplayHttpStatus = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(() =
 	`;
 	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("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");
+		/*#__PURE__*/ _jsxSorted("span", null, null, _fnSignal(_hf1, [httpStatus], _hf1_str), 3, null)
+	], 1, "Ds_0");
 }, "DisplayHttpStatus_component_PJf4K4PL7Oc"));
 export { cacheKey, DisplayHttpStatus as default };

package/lib/chunks/pathname.mjs

@@ -1,4 +1,5 @@
-/** Ensures the pathname ends with a slash */ var 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();
@@ -32,13 +33,6 @@ function getPathnameForDynamicRoute(originalPathname, paramNames, params) {
 	}
 	return pathname;
 }
-var PROTOCOLS = {
-	https: true,
-	http: true,
-	about: true,
-	javascript: true,
-	file: true
-};
 function isSameOriginUrl(url) {
 	if (typeof url === "string") {
 		url = url.trim();
@@ -54,4 +48,11 @@ function isSameOriginUrl(url) {
 	}
 	return false;
 }
+var PROTOCOLS = {
+	https: true,
+	http: true,
+	about: true,
+	javascript: true,
+	file: true
+};
 export { normalizePathname as i, getPathnameForDynamicRoute as n, isSameOriginUrl as r, ensureSlash as t };

package/lib/chunks/request-path.mjs

@@ -3,14 +3,16 @@ 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)$/;
+/** 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) {
+*/
+function recognizeRequest(pathname) {
 	if (pathname.length < 10) return null;
 	const loaderMatch = pathname.match(LOADER_REGEX);
 	if (loaderMatch) return {
@@ -23,12 +25,14 @@ var getLoaderName = (loaderId, manifestHash) => `q-loader-${loaderId}.${manifest
 	};
 	return null;
 }
-/** Trim a recognized internal URL suffix from a pathname, returning the clean route pathname. */ function trimRecognizedInternalPathname(pathname, recognized) {
+/** 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;
 }
-/** Trim any recognized internal URL suffix from a pathname, returning the clean route pathname. */ function trimInternalPathname(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;

package/lib/chunks/route-trie-key.mjs

@@ -0,0 +1,10 @@
+/**
+* Route trie metadata keys start with `_` (`_4`, `_W`, …), so static segments that start with `_`
+* are stored with an extra `_` to keep the two apart.
+*/
+var escapeStaticTrieKey = (segment) => segment.startsWith("_") ? "_" + segment : segment;
+/** The URL segment for a static trie key. */
+var unescapeStaticTrieKey = (key) => key.startsWith("_") ? key.slice(1) : key;
+/** Whether a trie key is a static segment rather than metadata. */
+var isStaticTrieKey = (key) => !key.startsWith("_") || key.startsWith("__");
+export { isStaticTrieKey as n, unescapeStaticTrieKey as r, escapeStaticTrieKey as t };

package/lib/chunks/routes.mjs

@@ -1,17 +1,3 @@
-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);
-}
-function routesToRegExps(routes) {
-	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);
@@ -23,4 +9,18 @@ function createRouteTester(basePathname, includeRoutes, excludeRoutes) {
 		return false;
 	};
 }
+function routesToRegExps(routes) {
+	if (!Array.isArray(routes)) return [];
+	return routes.filter((r) => typeof r === "string").map(routeToRegExp);
+}
+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);
+}
 export { createRouteTester as t };

package/lib/chunks/server-error.mjs

@@ -1,16 +1,38 @@
-/** @public */ var AbortMessage = class {};
-/** @public */ var RedirectMessage = class extends AbortMessage {};
-/** @public */ var ServerError = class extends Error {
+import { _qwikSymbol } from "@qwik.dev/core/internal";
+/**
+* Makes `instanceof cls` also match instances made by another copy of the router, such as the one a
+* Qwik library kept external on the server evaluates. Subclasses need their own call.
+*/
+var shareClassIdentity = (cls, name) => {
+	const tag = _qwikSymbol(`router.${name}`);
+	cls.prototype[tag] = true;
+	Object.defineProperty(cls, Symbol.hasInstance, { value(value) {
+		if (this !== cls) return Function.prototype[Symbol.hasInstance].call(this, value);
+		return value != null && typeof value === "object" && tag in value;
+	} });
+};
+/** @public */
+var AbortMessage = class {};
+shareClassIdentity(AbortMessage, "AbortMessage");
+/** @public */
+var RedirectMessage = class extends AbortMessage {};
+shareClassIdentity(RedirectMessage, "RedirectMessage");
+/** @public */
+var ServerError = class extends Error {
 	status;
 	data;
 	constructor(status, data) {
-		super(typeof data === "string" ? data : void 0), this.status = status, this.data = data;
+		super(typeof data === "string" ? data : void 0);
+		this.status = status;
+		this.data = data;
 	}
 };
+shareClassIdentity(ServerError, "ServerError");
 /**
 * `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) => {
+*/
+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 };
+export { shareClassIdentity as a, RedirectMessage as i, throwIfControlFlowSignal as n, AbortMessage as r, ServerError as t };

package/lib/chunks/{url.mjs → static-file.mjs}

@@ -1,4 +1,6 @@
-/** Common mime types mapped to Content-Type headers */ var MIME_TYPES = {
+import { t as ensureSlash } from "./pathname.mjs";
+/** Common mime types mapped to Content-Type headers */
+var MIME_TYPES = {
 	"3gp": "video/3gpp",
 	"3gpp": "video/3gpp",
 	asf: "video/x-ms-asf",
@@ -57,4 +59,12 @@ function normalizeRequestUrl(url, base) {
 	const suffix = queryOrHashIndex === -1 ? "" : url.slice(queryOrHashIndex);
 	return new URL(`${path.replace(LEADING_DOUBLE_SLASH_REG, "/").replace(DOUBLE_SLASH_REG, "/")}${suffix}`, base);
 }
-export { MIME_TYPES as n, normalizeRequestUrl as t };
+function getStaticFilePath(pathname) {
+	const basePathname = globalThis.__QWIK_ROUTER_BASE_PATHNAME__ || "/";
+	if (pathname === basePathname.slice(0, -1)) return "/index.html";
+	if (!pathname.startsWith(basePathname)) return;
+	const relativePathname = pathname.slice(basePathname.length - 1);
+	if (relativePathname.slice(relativePathname.lastIndexOf("/") + 1).includes(".")) return relativePathname;
+	return ensureSlash(relativePathname) + "index.html";
+}
+export { normalizeRequestUrl as n, MIME_TYPES as r, getStaticFilePath as t };

package/lib/chunks/system.mjs

@@ -5,11 +5,6 @@ import fs from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { cpus } from "node:os";
 import { Worker } from "node:worker_threads";
-function ssgWorkerCompare(a, b) {
-	if (a.activeTasks < b.activeTasks) return -1;
-	if (a.activeTasks > b.activeTasks) return 1;
-	return a.totalTasks < b.totalTasks ? -1 : 1;
-}
 async function createWorkerPool(sys, opts) {
 	const log = await sys.createLogger();
 	const ssgWorkers = [];
@@ -36,6 +31,10 @@ async function createWorkerPool(sys, opts) {
 		let terminateResolve = null;
 		const mainTasks = /* @__PURE__ */ new Map();
 		let terminateTimeout = null;
+		let markWorkerReady;
+		const workerReady = new Promise((resolve) => {
+			markWorkerReady = resolve;
+		});
 		const nodeWorker = new Worker(workerFilePath, { workerData });
 		nodeWorker.unref();
 		const ssgWorker = {
@@ -43,16 +42,14 @@ async function createWorkerPool(sys, opts) {
 			totalTasks: 0,
 			render: (staticRoute) => {
 				return new Promise((resolve, reject) => {
-					try {
-						ssgWorker.activeTasks++;
-						ssgWorker.totalTasks++;
-						mainTasks.set(staticRoute.pathname, resolve);
-						nodeWorker.postMessage(staticRoute);
-					} catch (e) {
+					ssgWorker.activeTasks++;
+					ssgWorker.totalTasks++;
+					mainTasks.set(staticRoute.pathname, resolve);
+					workerReady.then(() => nodeWorker.postMessage(staticRoute)).catch((e) => {
 						ssgWorker.activeTasks--;
 						mainTasks.delete(staticRoute.pathname);
 						reject(e);
-					}
+					});
 				});
 			},
 			terminate: async () => {
@@ -68,7 +65,7 @@ async function createWorkerPool(sys, opts) {
 						await nodeWorker.terminate();
 						resolve();
 					}, 1e3);
-					nodeWorker.postMessage(msg);
+					workerReady.then(() => nodeWorker.postMessage(msg));
 				});
 				if (terminateTimeout) {
 					clearTimeout(terminateTimeout);
@@ -78,6 +75,9 @@ async function createWorkerPool(sys, opts) {
 		};
 		nodeWorker.on("message", (msg) => {
 			switch (msg.type) {
+				case "ready":
+					markWorkerReady();
+					break;
 				case "render": {
 					const mainTask = mainTasks.get(msg.pathname);
 					if (mainTask) {
@@ -186,18 +186,13 @@ async function createWorkerPool(sys, opts) {
 		close
 	};
 }
-var ensureDir = async (filePath) => {
-	await fs.promises.mkdir(dirname(filePath), { recursive: true });
-};
-var access = async (path) => {
-	try {
-		await fs.promises.access(path);
-		return true;
-	} catch {
-		return false;
-	}
-};
-/** @public */ async function createSystem(opts, threadId) {
+function ssgWorkerCompare(a, b) {
+	if (a.activeTasks < b.activeTasks) return -1;
+	if (a.activeTasks > b.activeTasks) return 1;
+	return a.totalTasks < b.totalTasks ? -1 : 1;
+}
+/** @public */
+async function createSystem(opts, threadId) {
 	const createWriteStream = (filePath) => {
 		return fs.createWriteStream(filePath, { flags: "w" });
 	};
@@ -262,4 +257,15 @@ var access = async (path) => {
 	sys.createMainProcess = () => createWorkerPool(sys, opts);
 	return sys;
 }
+var ensureDir = async (filePath) => {
+	await fs.promises.mkdir(dirname(filePath), { recursive: true });
+};
+var access = async (path) => {
+	try {
+		await fs.promises.access(path);
+		return true;
+	} catch {
+		return false;
+	}
+};
 export { createSystem };