@qwik.dev/router 2.0.0-beta.42 → 2.0.0-beta.45

package/lib/chunks/worker-thread.mjs

@@ -1,4 +1,4 @@
-import { C as getRouteLoaderValues, d as loadRoute, w as getRouteLoaders } from "./head.qwik.mjs";
+import { D as getRouteLoaders, E as getRouteLoaderValues, d as loadRoute } from "./head.qwik.mjs";
 import { l as trimInternalPathname } from "./request-path.mjs";
 import { i as resolveRequestHandlers, r as renderQwikMiddleware, t as runQwikRouter } from "./user-response.mjs";
 import { _serialize } from "@qwik.dev/core/internal";
@@ -10,28 +10,71 @@ var staticWorkerThreadDeps = {
 	trimInternalPathname,
 	runQwikRouter
 };
-/** Create a fresh no-op WritableStream (must be a real instance for pipeTo checks). */ var createNoopWritableStream = () => new WritableStream();
-function isRedirectMessage(value) {
-	return typeof value === "object" && value !== null && value.constructor?.name === "RedirectMessage";
-}
-async function requestHandlerForSsg(serverRequestEv, opts, deps) {
-	const { render, checkOrigin, qwikRouterConfig } = opts;
-	if (!qwikRouterConfig) throw new Error("qwikRouterConfig is required.");
-	const pathname = deps.trimInternalPathname(serverRequestEv.url.pathname);
-	if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) return null;
-	const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
-	const loadedRoute = await deps.loadRoute(routes, cacheModules, pathname);
-	const requestHandlers = deps.resolveRequestHandlers(serverPlugins, loadedRoute, serverRequestEv.request.method, checkOrigin ?? true, deps.renderQwikMiddleware(render));
-	if (qwikRouterConfig.fallthrough && loadedRoute.$notFound$ && !pathname.endsWith("/404.html")) return null;
-	const rebuildRouteInfo = async (url) => {
-		const cleanPathname = deps.trimInternalPathname(url.pathname);
-		const loadedRoute = await deps.loadRoute(routes, cacheModules, cleanPathname);
-		return {
-			loadedRoute,
-			requestHandlers: deps.resolveRequestHandlers(serverPlugins, loadedRoute, serverRequestEv.request.method, checkOrigin ?? true, deps.renderQwikMiddleware(render))
-		};
+async function workerThread(sys) {
+	const opts = sys.getOptions();
+	const pendingPromises = /* @__PURE__ */ new Set();
+	const deps = {
+		...staticWorkerThreadDeps,
+		serialize: _serialize
 	};
-	return deps.runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, qwikRouterConfig.basePathname);
+	process.on("uncaughtException", (e) => {
+		console.error("Worker uncaught exception (suppressed):", e.message);
+	});
+	process.on("unhandledRejection", (e) => {
+		console.error("Worker unhandled rejection (suppressed):", e instanceof Error ? e.message : e);
+	});
+	const onMessage = async (msg) => {
+		switch (msg.type) {
+			case "render": return new Promise((resolve) => {
+				workerRender(sys, opts, msg, pendingPromises, resolve, deps).catch((e) => {
+					console.error("Error during render", msg.pathname, e);
+					resolve({
+						type: "render",
+						pathname: msg.pathname,
+						url: "",
+						ok: false,
+						error: {
+							message: e instanceof Error ? e.message : String(e),
+							stack: e instanceof Error ? e.stack : void 0
+						},
+						filePath: null,
+						contentType: null,
+						resourceType: null
+					});
+				});
+			});
+			case "close":
+				if (pendingPromises.size) {
+					const promises = Array.from(pendingPromises);
+					pendingPromises.clear();
+					await Promise.all(promises);
+				}
+				return { type: "close" };
+		}
+	};
+	parentPort?.on("message", async (msg) => {
+		try {
+			parentPort?.postMessage(await onMessage(msg));
+		} catch (e) {
+			if (msg.type === "render") {
+				const error = e instanceof Error ? e : new Error(String(e));
+				parentPort?.postMessage({
+					type: "render",
+					pathname: msg.pathname,
+					url: "",
+					ok: false,
+					error: {
+						message: error.message,
+						stack: error.stack
+					},
+					filePath: null,
+					contentType: null,
+					resourceType: null
+				});
+			} else console.error("Worker message handler error", e);
+		}
+		if (msg.type === "close") parentPort?.close();
+	});
 }
 async function workerRender(sys, opts, staticRoute, pendingPromises, callback, deps) {
 	const url = new URL(staticRoute.pathname, opts.origin);
@@ -155,8 +198,16 @@ async function workerRender(sys, opts, staticRoute, pendingPromises, callback, d
 			}
 		}, opts, deps).then((rsp) => {
 			if (rsp != null) return rsp.completion.then((r) => {
-				if (routeWriter) return closePromise.then(() => r);
-				return r;
+				const failRouteOnCaughtBoundary = (completion) => {
+					if (completion === void 0 && rsp.requestEv.sharedMap.get("@errorBoundaryCaught")) {
+						result.ok = false;
+						result.filePath = null;
+						return /* @__PURE__ */ new Error(`An <ErrorBoundary> caught an error while rendering ${staticRoute.pathname}`);
+					}
+					return completion;
+				};
+				if (routeWriter) return closePromise.then(() => failRouteOnCaughtBoundary(r));
+				return failRouteOnCaughtBoundary(r);
 			});
 		}).then((e) => {
 			if (e !== void 0) {
@@ -195,70 +246,28 @@ async function workerRender(sys, opts, staticRoute, pendingPromises, callback, d
 		callback(result);
 	}
 }
-async function workerThread(sys) {
-	const opts = sys.getOptions();
-	const pendingPromises = /* @__PURE__ */ new Set();
-	const deps = {
-		...staticWorkerThreadDeps,
-		serialize: _serialize
-	};
-	process.on("uncaughtException", (e) => {
-		console.error("Worker uncaught exception (suppressed):", e.message);
-	});
-	process.on("unhandledRejection", (e) => {
-		console.error("Worker unhandled rejection (suppressed):", e instanceof Error ? e.message : e);
-	});
-	const onMessage = async (msg) => {
-		switch (msg.type) {
-			case "render": return new Promise((resolve) => {
-				workerRender(sys, opts, msg, pendingPromises, resolve, deps).catch((e) => {
-					console.error("Error during render", msg.pathname, e);
-					resolve({
-						type: "render",
-						pathname: msg.pathname,
-						url: "",
-						ok: false,
-						error: {
-							message: e instanceof Error ? e.message : String(e),
-							stack: e instanceof Error ? e.stack : void 0
-						},
-						filePath: null,
-						contentType: null,
-						resourceType: null
-					});
-				});
-			});
-			case "close":
-				if (pendingPromises.size) {
-					const promises = Array.from(pendingPromises);
-					pendingPromises.clear();
-					await Promise.all(promises);
-				}
-				return { type: "close" };
-		}
+/** Create a fresh no-op WritableStream (must be a real instance for pipeTo checks). */
+var createNoopWritableStream = () => new WritableStream();
+function isRedirectMessage(value) {
+	return typeof value === "object" && value !== null && value.constructor?.name === "RedirectMessage";
+}
+async function requestHandlerForSsg(serverRequestEv, opts, deps) {
+	const { render, checkOrigin, qwikRouterConfig } = opts;
+	if (!qwikRouterConfig) throw new Error("qwikRouterConfig is required.");
+	const pathname = deps.trimInternalPathname(serverRequestEv.url.pathname);
+	if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) return null;
+	const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
+	const loadedRoute = await deps.loadRoute(routes, cacheModules, pathname);
+	const requestHandlers = deps.resolveRequestHandlers(serverPlugins, loadedRoute, serverRequestEv.request.method, checkOrigin ?? true, deps.renderQwikMiddleware(render));
+	if (qwikRouterConfig.fallthrough && loadedRoute.$notFound$ && !pathname.endsWith("/404.html")) return null;
+	const rebuildRouteInfo = async (url) => {
+		const cleanPathname = deps.trimInternalPathname(url.pathname);
+		const loadedRoute = await deps.loadRoute(routes, cacheModules, cleanPathname);
+		return {
+			loadedRoute,
+			requestHandlers: deps.resolveRequestHandlers(serverPlugins, loadedRoute, serverRequestEv.request.method, checkOrigin ?? true, deps.renderQwikMiddleware(render))
+		};
 	};
-	parentPort?.on("message", async (msg) => {
-		try {
-			parentPort?.postMessage(await onMessage(msg));
-		} catch (e) {
-			if (msg.type === "render") {
-				const error = e instanceof Error ? e : new Error(String(e));
-				parentPort?.postMessage({
-					type: "render",
-					pathname: msg.pathname,
-					url: "",
-					ok: false,
-					error: {
-						message: error.message,
-						stack: error.stack
-					},
-					filePath: null,
-					contentType: null,
-					resourceType: null
-				});
-			} else console.error("Worker message handler error", e);
-		}
-		if (msg.type === "close") parentPort?.close();
-	});
+	return deps.runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, qwikRouterConfig.basePathname);
 }
 export { workerThread };

package/lib/index.d.ts

@@ -28,11 +28,11 @@ import type { ResolveSyncValue } from '@qwik.dev/router/middleware/request-handl
 import type { SerializationStrategy } from '@qwik.dev/core/internal';
 import type { ServerError } from '@qwik.dev/router/middleware/request-handler';
 import type { Signal } from '@qwik.dev/core';
-import type * as v from 'valibot';
-import type { ValueOrPromise } from '@qwik.dev/core';
+import * as v from 'valibot';
+import { ValueOrPromise } from '@qwik.dev/core';
 import { ValueOrPromise as ValueOrPromise_2 } from '@qwik.dev/core/internal';
 import { z } from 'zod';
-import type * as z_2 from 'zod';
+import * as z_2 from 'zod';
 
 /** @public */
 export declare type Action<RETURN, INPUT = Record<string, unknown>, OPTIONAL extends boolean = true> = {
@@ -61,23 +61,6 @@ export declare type ActionConstructor = {
     <OBJ>(actionQrl: (form: JSONObject, event: RequestEventAction) => ValueOrPromise<OBJ>, options?: ActionOptions): Action<StrictUnion<OBJ>>;
 };
 
-/** @public */
-declare type ActionConstructorQRL = {
-    <OBJ extends Record<string, any> | void | null, VALIDATOR extends TypedDataValidator, REST extends [DataValidator, ...DataValidator[]]>(actionQrl: QRL<(data: GetValidatorOutputType<VALIDATOR>, event: RequestEventAction) => ValueOrPromise<OBJ>>, options: ActionOptions & {
-        readonly validation: [VALIDATOR, ...REST];
-    }): Action<StrictUnion<OBJ | FailReturn<ValidatorErrorType<GetValidatorInputType<VALIDATOR>>> | FailReturn<FailOfRest<REST>>>, GetValidatorInputType<VALIDATOR>, false>;
-    <OBJ extends Record<string, any> | void | null, VALIDATOR extends TypedDataValidator>(actionQrl: QRL<(data: GetValidatorOutputType<VALIDATOR>, event: RequestEventAction) => ValueOrPromise<OBJ>>, options: ActionOptions & {
-        readonly validation: [VALIDATOR];
-    }): Action<StrictUnion<OBJ | FailReturn<ValidatorErrorType<GetValidatorInputType<VALIDATOR>>>>, GetValidatorInputType<VALIDATOR>, false>;
-    <OBJ extends Record<string, any> | void | null, REST extends [DataValidator, ...DataValidator[]]>(actionQrl: QRL<(data: JSONObject, event: RequestEventAction) => ValueOrPromise<OBJ>>, options: ActionOptions & {
-        readonly validation: REST;
-    }): Action<StrictUnion<OBJ | FailReturn<FailOfRest<REST>>>>;
-    <OBJ extends Record<string, any> | void | null, VALIDATOR extends TypedDataValidator, REST extends [DataValidator, ...DataValidator[]]>(actionQrl: QRL<(data: GetValidatorOutputType<VALIDATOR>, event: RequestEventAction) => ValueOrPromise<OBJ>>, options: VALIDATOR, ...rest: REST): Action<StrictUnion<OBJ | FailReturn<ValidatorErrorType<GetValidatorInputType<VALIDATOR>>> | FailReturn<FailOfRest<REST>>>, GetValidatorInputType<VALIDATOR>, false>;
-    <OBJ extends Record<string, any> | void | null, VALIDATOR extends TypedDataValidator>(actionQrl: QRL<(data: GetValidatorOutputType<VALIDATOR>, event: RequestEventAction) => ValueOrPromise<OBJ>>, options: VALIDATOR): Action<StrictUnion<OBJ | FailReturn<ValidatorErrorType<GetValidatorInputType<VALIDATOR>>>>, GetValidatorInputType<VALIDATOR>, false>;
-    <OBJ extends Record<string, any> | void | null, REST extends [DataValidator, ...DataValidator[]]>(actionQrl: QRL<(form: JSONObject, event: RequestEventAction) => ValueOrPromise<OBJ>>, ...rest: REST): Action<StrictUnion<OBJ | FailReturn<FailOfRest<REST>>>>;
-    <OBJ>(actionQrl: QRL<(form: JSONObject, event: RequestEventAction) => ValueOrPromise<OBJ>>, options?: ActionOptions): Action<StrictUnion<OBJ>>;
-};
-
 /** @public */
 export declare type ActionOptions = {
     readonly id?: string;
@@ -380,6 +363,11 @@ export declare type DocumentStyle = Readonly<((Omit<QwikIntrinsicElements['style
     style?: never;
 })>;
 
+/** @public */
+export declare type Editable<T> = {
+    -readonly [P in keyof T]: T[P];
+};
+
 declare type EndpointModuleLoader = () => ValueOrPromise<RouteModule>;
 
 declare interface EndpointResponse {
@@ -571,11 +559,19 @@ declare type LoaderConstructor = {
     <OBJ extends Record<string, any> | void | null, REST extends readonly DataValidator[]>(loaderFn: (event: RequestEventLoader) => ValueOrPromise<OBJ>, ...rest: REST): Loader_2<StrictUnion<OBJ | FailReturn<FailOfRest<REST>>>>;
 };
 
-/** @public */
-declare type LoaderConstructorQRL = {
-    <OBJ>(loaderQrl: QRL<(event: RequestEventLoader) => ValueOrPromise<OBJ>>, options?: LoaderOptions): Loader_2<[Extract<OBJ, Failed>] extends [never] ? OBJ : StrictUnion<OBJ>>;
-    <OBJ extends Record<string, any> | void | null, REST extends readonly DataValidator[]>(loaderQrl: QRL<(event: RequestEventLoader) => ValueOrPromise<OBJ>>, ...rest: REST): Loader_2<StrictUnion<OBJ | FailReturn<FailOfRest<REST>>>>;
-};
+declare interface LoaderInternal extends Loader_2<any> {
+    readonly __brand?: 'server_loader';
+    __qrl: QRL<(event: RequestEventLoader) => ValueOrPromise<unknown>>;
+    __id: string;
+    __validators: DataValidator[] | undefined;
+    __serializationStrategy: SerializationStrategy;
+    __cacheControl: CacheControl | ((ev: RequestEvent) => CacheControl | null) | undefined;
+    __eTag: string | ((ev: RequestEvent) => string | null) | undefined;
+    __cacheKey: CacheKeyFn | undefined;
+    __search: string[] | undefined;
+    __blockSSR: boolean;
+    (): LoaderSignal<unknown>;
+}
 
 /** @public */
 declare type LoaderOptions = {
@@ -663,7 +659,7 @@ declare type LoaderOptions = {
 };
 
 /** @public */
-export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? Signal<ValueOrPromise<VALIDATOR>> : Signal<TYPE>) & Pick<ComputedSignal<any>, 'promise' | 'pending' | 'error' | 'loading'>;
+export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? Signal<ValueOrPromise<VALIDATOR>> : Signal<TYPE>) & Pick<ComputedSignal<any>, 'promise'>;
 
 declare interface MenuModule {
     readonly default: ContentMenu;
@@ -784,6 +780,12 @@ export declare interface QwikRouterConfig {
     readonly cacheModules?: boolean;
     /** When true, return null instead of rendering the 404 page, letting the adapter handle it */
     readonly fallthrough?: boolean;
+    /**
+     * Imports the modules containing `server$` functions so their registration side effects run.
+     * Called by the request handler before serving; deliberately async so the config module itself
+     * evaluates without touching the runtime (see the import-cycle notes in `route-loaders.ts`).
+     */
+    readonly importEagerModules?: () => Promise<unknown>;
 }
 
 /** @public */
@@ -927,8 +929,21 @@ export declare type ResolvedDocumentHead<FrontMatter extends Record<string, any>
  */
 export declare const routeAction$: ActionConstructor;
 
-/** @public */
-export declare const routeActionQrl: ActionConstructorQRL;
+/**
+ * Hoisted function declarations (not consts) on purpose, like `routeLoaderQrl`: generated route
+ * modules call these factories back during their own evaluation via the `@qwik-router-config`
+ * cycle, where a `const` binding would throw a TDZ ReferenceError.
+ *
+ * @public
+ */
+export declare function routeActionQrl(actionQrl: QRL<(form: JSONObject, event: RequestEventAction) => unknown>, ...rest: (ActionOptions | DataValidator)[]): {
+    (): Editable<ActionStore<unknown, unknown>>;
+    __brand: "server_action";
+    __validators: DataValidator[];
+    __qrl: QRL<(form: JSONObject, event: RequestEventAction) => unknown>;
+    __id: string;
+    __invalidate: string[] | undefined;
+};
 
 declare type RouteActionResolver = {
     status: number;
@@ -1002,8 +1017,10 @@ export declare interface RouteData {
     _M?: RouteData[];
     /** Menu loader for this subtree (from menu.md). Runtime uses nearest ancestor during traversal. */
     _N?: MenuModuleLoader;
-    /** Array of routeLoader$ hashes for this node's loaders */
+    /** Inherited layout and server plugin routeLoader$ hashes. */
     _R?: string[];
+    /** Page loader hashes; override pages include their selected layouts and plugins. */
+    _D?: string[];
     /** Child route segments (any key not starting with `_`) */
     [part: string]: RouteData | RouteData[] | ModuleLoader[] | ContentModuleLoader | MenuModuleLoader | string[] | string | undefined;
 }
@@ -1037,24 +1054,13 @@ export declare interface RouteData {
  */
 export declare const routeLoader$: LoaderConstructor;
 
-/**
- * Reactive context for route loaders. On the server this is stored in sharedMap, on the client it's
- * a store that gets updated on navigation.
- *
- * - `loaderPaths`: loader ID → fetch path (the longest route path for that loader)
- * - `pagePathname` / `pageSearch`: client-only navigation state used for loader invalidation and
- *   q-loader fetches. They are intentionally omitted from SSR state and fall back to `location`
- *   until the first SPA navigation.
- */
+/** Shared SSR paths and client-only loader navigation state. */
 declare type RouteLoaderCtx = {
     loaderPaths: Record<string, string | undefined>;
-    pagePathname?: string;
-    pageSearch?: string;
     /** SPA navigation function. Client-only and intentionally omitted from SSR state. */
     goto?: NoSerialize<RouteNavigate>;
     /** Client manifest hash for q-loader fetch URLs. */
     manifestHash?: string;
-    routeLoaderCandidates?: Record<string, string>;
 };
 
 /* Excluded from this release type: routeLoaderQrl */
@@ -1246,12 +1252,6 @@ declare type ValibotConstructor = {
     <T extends v.GenericSchema | v.GenericSchemaAsync>(schema: (ev: RequestEvent) => T): ValibotDataValidator<T>;
 };
 
-/** @beta */
-declare type ValibotConstructorQRL = {
-    <T extends v.GenericSchema | v.GenericSchemaAsync>(schema: QRL<T>): ValibotDataValidator<T>;
-    <T extends v.GenericSchema | v.GenericSchemaAsync>(schema: QRL<(ev: RequestEvent) => T>): ValibotDataValidator<T>;
-};
-
 /** @beta */
 declare type ValibotDataValidator<T extends v.GenericSchema | v.GenericSchemaAsync = v.GenericSchema | v.GenericSchemaAsync> = {
     readonly __brand: 'valibot';
@@ -1267,10 +1267,6 @@ declare type ValidatorConstructor = {
     <T extends ValidatorReturn>(validator: (ev: RequestEvent, data: unknown) => ValueOrPromise<T>): T extends ValidatorReturnFail<infer ERROR> ? DataValidator<ERROR> : DataValidator<never>;
 };
 
-declare type ValidatorConstructorQRL = {
-    <T extends ValidatorReturn>(validator: QRL<(ev: RequestEvent, data: unknown) => ValueOrPromise<T>>): T extends ValidatorReturnFail<infer ERROR> ? DataValidator<ERROR> : DataValidator<never>;
-};
-
 /** @public */
 export declare type ValidatorErrorKeyDotNotation<T, Prefix extends string = ''> = IsAny<T> extends true ? never : T extends object ? {
     [K in keyof T & string]: IsAny<T[K]> extends true ? never : T[K] extends (infer U)[] ? IsAny<U> extends true ? never : U extends object ? `${Prefix}${K}[]` | ValidatorErrorKeyDotNotation<U, `${Prefix}${K}[].`> : `${Prefix}${K}[]` : T[K] extends object ? ValidatorErrorKeyDotNotation<T[K], `${Prefix}${K}.`> : `${Prefix}${K}`;
@@ -1313,14 +1309,6 @@ export declare type ZodConstructor = {
     <T extends z_2.ZodType>(schema: (zod: typeof z_2.z, ev: RequestEvent) => T): ZodDataValidator<T>;
 };
 
-/** @public */
-declare type ZodConstructorQRL = {
-    <T extends z_2.ZodRawShape>(schema: QRL<T>): ZodDataValidator<z_2.ZodObject<T>>;
-    <T extends z_2.ZodRawShape>(schema: QRL<(zod: typeof z_2.z, ev: RequestEvent) => T>): ZodDataValidator<z_2.ZodObject<T>>;
-    <T extends z_2.ZodType>(schema: QRL<T>): ZodDataValidator<T>;
-    <T extends z_2.ZodType>(schema: QRL<(zod: typeof z_2.z, ev: RequestEvent) => T>): ZodDataValidator<T>;
-};
-
 /** @public */
 declare type ZodDataValidator<T extends z_2.ZodType = z_2.ZodType> = {
     readonly __brand: 'zod';