@askrjs/askr 0.0.84 → 0.0.86

package/dist/{route-matching-IfQZmqkN.js → route-matching-DqULzZtC.js}

@@ -1,278 +1,4 @@
-import { t as enqueueRuntimeLane, v as logger } from "./access-ePqdQqkV.js";
-import { c as registerCommitOperationForInstance, d as getCurrentContextFrame, v as withAsyncResourceContext } from "./component-internal-Bw4Mf9fd.js";
-import { f as getCurrentComponentInstance } from "./component-scope-DzJEbYGE.js";
-import { p as isPromiseLike } from "./lifecycle-batch-CFI4NKpJ.js";
-import { t as brandSnapshotSource } from "./snapshot-source-BB42xgwb.js";
-import { d as SSRDataMissingError, i as getNextRenderKey, n as getActiveRenderContext, r as getCurrentRenderData, u as throwSSRDataMissing } from "./render-context-D-DFk2WN.js";
-import { t as state } from "./state-BzIMC6-i.js";
-//#region src/runtime/resource-cell.ts
-/**
-* Pure, component-agnostic ResourceCell state machine.
-* - Holds value/pending/error/generation/controller
-* - Exposes a stable `snapshot` object: { value, pending, error, refresh }
-* - Uses `withAsyncResourceContext` to bind the synchronous execution step
-*   to a captured frame. Continuations after await do not see the frame.
-*/
-var ResourceCell = class {
-	constructor(fn, deps, resourceFrame) {
-		this.value = null;
-		this.pending = true;
-		this.error = null;
-		this.generation = 0;
-		this.controller = null;
-		this.deps = null;
-		this.resourceFrame = null;
-		this.subscribers = /* @__PURE__ */ new Set();
-		this.disposed = false;
-		this.fn = fn;
-		this.deps = deps ? deps.slice() : null;
-		this.resourceFrame = resourceFrame;
-		this.snapshot = brandSnapshotSource({
-			value: null,
-			pending: true,
-			error: null,
-			refresh: () => this.refresh()
-		});
-	}
-	setLoader(fn) {
-		this.fn = fn;
-	}
-	subscribe(cb) {
-		this.subscribers.add(cb);
-		return () => this.subscribers.delete(cb);
-	}
-	notifySubscribers() {
-		this.snapshot.value = this.value;
-		this.snapshot.pending = this.pending;
-		this.snapshot.error = this.error;
-		for (const cb of this.subscribers) cb();
-	}
-	start(ssr = false, notify = true) {
-		if (this.disposed) return;
-		const generation = this.generation;
-		this.controller?.abort();
-		const controller = new AbortController();
-		this.controller = controller;
-		this.pending = true;
-		this.error = null;
-		if (notify) this.notifySubscribers();
-		let result;
-		try {
-			result = withAsyncResourceContext(this.resourceFrame, () => this.fn({ signal: controller.signal }));
-		} catch (err) {
-			this.pending = false;
-			this.error = err instanceof Error ? err : new Error(String(err));
-			if (notify) this.notifySubscribers();
-			return;
-		}
-		if (!isPromiseLike(result)) {
-			this.value = result;
-			this.pending = false;
-			this.error = null;
-			if (notify) this.notifySubscribers();
-			return;
-		}
-		if (ssr) throwSSRDataMissing();
-		Promise.resolve(result).then((val) => {
-			if (this.generation !== generation) return;
-			if (this.controller !== controller) return;
-			if (controller.signal.aborted) return;
-			this.value = val;
-			this.pending = false;
-			this.error = null;
-			this.notifySubscribers();
-		}).catch((err) => {
-			if (this.generation !== generation) return;
-			if (this.controller !== controller) return;
-			if (controller.signal.aborted || err instanceof Error && err.name === "AbortError" || typeof DOMException !== "undefined" && err instanceof DOMException && err.name === "AbortError") return;
-			this.pending = false;
-			this.error = err instanceof Error ? err : new Error(String(err));
-			try {
-				if (this.ownerName) logger.error(`[Askr] Async resource error in ${this.ownerName}:`, err);
-				else logger.error("[Askr] Async resource error:", err);
-			} catch {}
-			this.notifySubscribers();
-		});
-	}
-	refresh() {
-		if (this.disposed) return;
-		this.generation++;
-		this.controller?.abort();
-		this.start();
-	}
-	abort() {
-		this.controller?.abort();
-	}
-	dispose() {
-		if (this.disposed) return;
-		this.disposed = true;
-		this.controller?.abort();
-		this.subscribers.clear();
-	}
-};
-//#endregion
-//#region src/runtime/resource-operation.ts
-/**
-* Resource primitive — simple, deterministic async primitive
-* Usage: resource(fn, deps)
-* - fn receives { signal }
-* - captures execution context once at creation (synchronous step only)
-* - executes at most once per generation; stale async results are ignored
-* - refresh() cancels in-flight execution, increments generation and re-runs
-* - exposes { value, pending, error, refresh }
-* - during SSR, async results are disallowed and will throw synchronously
-*/
-function resource(fn, deps = []) {
-	const instance = getCurrentComponentInstance();
-	const inst = instance;
-	if (!instance) {
-		const renderData = getCurrentRenderData()?.resources;
-		if (renderData && (getActiveRenderContext()?.resourceDataProvided || Object.keys(renderData).some((key) => key.startsWith("r:")))) {
-			const key = getNextRenderKey();
-			if (!(key in renderData)) throwSSRDataMissing();
-			const val = renderData[key];
-			return brandSnapshotSource({
-				value: val,
-				pending: false,
-				error: null,
-				refresh: () => {}
-			});
-		}
-		if (getActiveRenderContext()) throwSSRDataMissing();
-		throw new Error("[Askr] resource() must be called during component render inside an app. Do not create resources at module scope or outside render.");
-	}
-	const renderData = getCurrentRenderData()?.resources;
-	if (renderData && (getActiveRenderContext()?.resourceDataProvided || Object.keys(renderData).some((key) => key.startsWith("r:")))) {
-		const key = getNextRenderKey();
-		if (!(key in renderData)) throwSSRDataMissing();
-		const val = renderData[key];
-		const h = state({
-			cell: void 0,
-			snapshot: brandSnapshotSource({
-				value: val,
-				pending: false,
-				error: null,
-				refresh: () => {}
-			})
-		})();
-		h.snapshot.value = val;
-		h.snapshot.pending = false;
-		h.snapshot.error = null;
-		return h.snapshot;
-	}
-	const holder = state({
-		cell: void 0,
-		snapshot: brandSnapshotSource({
-			value: null,
-			pending: true,
-			error: null,
-			refresh: () => {}
-		})
-	});
-	const h = holder();
-	if (!h.cell) {
-		const cell = new ResourceCell(fn, deps, getCurrentContextFrame());
-		cell.ownerName = inst.fn?.name || "<anonymous>";
-		h.cell = cell;
-		h.snapshot = cell.snapshot;
-		const unsubscribe = cell.subscribe(() => {
-			const cur = holder();
-			cur.snapshot.value = cell.snapshot.value;
-			cur.snapshot.pending = cell.snapshot.pending;
-			cur.snapshot.error = cell.snapshot.error;
-			holder.set(cur);
-			try {
-				inst.notifyUpdate?.();
-			} catch {}
-		});
-		(inst.cleanupFns ??= []).push(() => {
-			unsubscribe();
-			cell.dispose();
-		});
-		if (inst.ssr) {
-			cell.start(true, false);
-			if (!cell.pending) {
-				const cur = holder();
-				cur.snapshot.value = cell.value;
-				cur.snapshot.pending = cell.pending;
-				cur.snapshot.error = cell.error;
-			}
-		} else {
-			const scheduledGeneration = cell.generation;
-			registerCommitOperationForInstance(inst, () => {
-				enqueueRuntimeLane("post", () => {
-					if (!inst.notifyUpdate || cell.generation !== scheduledGeneration) return;
-					try {
-						cell.start(false, false);
-					} catch (err) {
-						const cur = holder();
-						cur.snapshot.value = cell.value;
-						cur.snapshot.pending = cell.pending;
-						cur.snapshot.error = err ?? null;
-						holder.set(cur);
-						inst.notifyUpdate?.();
-						return;
-					}
-					if (!cell.pending) {
-						const cur = holder();
-						cur.snapshot.value = cell.value;
-						cur.snapshot.pending = cell.pending;
-						cur.snapshot.error = cell.error;
-						holder.set(cur);
-						inst.notifyUpdate?.();
-					}
-				});
-			});
-		}
-	}
-	const cell = h.cell;
-	cell.setLoader(fn);
-	if (!cell.deps || cell.deps.length !== deps.length || cell.deps.some((d, i) => !Object.is(d, deps[i]))) {
-		cell.deps = deps.slice();
-		cell.generation++;
-		cell.pending = true;
-		cell.error = null;
-		h.snapshot.pending = true;
-		h.snapshot.error = null;
-		try {
-			if (inst.ssr) {
-				cell.start(true, false);
-				if (!cell.pending) {
-					const cur = holder();
-					cur.snapshot.value = cell.value;
-					cur.snapshot.pending = cell.pending;
-					cur.snapshot.error = cell.error;
-				}
-			} else {
-				const scheduledGeneration = cell.generation;
-				registerCommitOperationForInstance(inst, () => {
-					enqueueRuntimeLane("post", () => {
-						if (!inst.notifyUpdate || cell.generation !== scheduledGeneration) return;
-						cell.start(false, false);
-						if (!cell.pending) {
-							const cur = holder();
-							cur.snapshot.value = cell.value;
-							cur.snapshot.pending = cell.pending;
-							cur.snapshot.error = cell.error;
-							holder.set(cur);
-							inst.notifyUpdate?.();
-						}
-					});
-				});
-			}
-		} catch (err) {
-			if (err instanceof SSRDataMissingError) throw err;
-			cell.error = err;
-			cell.pending = false;
-			const cur = holder();
-			cur.snapshot.value = cell.value;
-			cur.snapshot.pending = cell.pending;
-			cur.snapshot.error = cell.error;
-		}
-	}
-	return h.snapshot;
-}
-//#endregion
+import { n as getActiveRenderContext } from "./render-context-D0Hoj9dW.js";
 //#region src/router/match.ts
 function splitPathSegments(path) {
 	const normalized = path.endsWith("/") && path !== "/" ? path.slice(0, -1) : path;
@@ -401,6 +127,7 @@ const registrationScopeStack = [];
 let registrationLocked = false;
 let defaultRouteAuthOptions;
 let activeClientRouteAuthOptions;
+let defaultRouteBasePath = "";
 function getDepth(path) {
 	const normalized = path.endsWith("/") && path !== "/" ? path.slice(0, -1) : path;
 	return normalized === "/" ? 0 : normalized.split("/").filter(Boolean).length;
@@ -448,6 +175,15 @@ function getDefaultRouteAuthOptions() {
 function setDefaultRouteAuthOptions(auth) {
 	defaultRouteAuthOptions = auth;
 }
+function getDefaultRouteBasePath() {
+	return defaultRouteBasePath;
+}
+function setDefaultRouteBasePath(basePath) {
+	defaultRouteBasePath = basePath;
+}
+function getActiveRouteBasePath() {
+	return getActiveRenderContext()?.basePath ?? defaultRouteBasePath;
+}
 function getCurrentLayoutChain() {
 	const layoutChain = [];
 	for (const scope of registrationScopeStack) if (scope.layout) layoutChain.push({ component: scope.layout });
@@ -514,6 +250,7 @@ function clearRouteState() {
 	registrationLocked = false;
 	defaultRouteAuthOptions = void 0;
 	activeClientRouteAuthOptions = void 0;
+	defaultRouteBasePath = "";
 }
 function snapshotRouteState() {
 	return {
@@ -523,6 +260,7 @@ function snapshotRouteState() {
 		registrationLocked,
 		defaultRouteAuthOptions,
 		activeClientRouteAuthOptions,
+		defaultRouteBasePath,
 		routesByDepth: [...routesByDepth.entries()].map(([depth, depthRoutes]) => [depth, [...depthRoutes]]),
 		registrationScopeStack: [...registrationScopeStack]
 	};
@@ -541,6 +279,7 @@ function restoreRouteState(snapshot) {
 	registrationLocked = snapshot.registrationLocked;
 	defaultRouteAuthOptions = snapshot.defaultRouteAuthOptions;
 	activeClientRouteAuthOptions = snapshot.activeClientRouteAuthOptions;
+	defaultRouteBasePath = snapshot.defaultRouteBasePath;
 }
 //#endregion
 //#region src/router/route-context.ts
@@ -617,6 +356,34 @@ function buildRouteContext(target, params, options) {
 	};
 }
 //#endregion
+//#region src/router/base-path.ts
+/** Normalize the public mount point used by one route registry. */
+function normalizeRouteBasePath(value) {
+	if (value === void 0 || value === "" || value === "/") return "";
+	if (!value.startsWith("/") || /\/{2,}/.test(value) || value.includes("?") || value.includes("#") || value.includes("\\")) throw new TypeError(`Route basePath must be an absolute pathname without a query or hash. Received: ${JSON.stringify(value)}`);
+	const normalized = value.endsWith("/") ? value.slice(0, -1) : value;
+	if (normalized.split("/").some((segment) => segment === "." || segment === "..")) throw new TypeError("Route basePath must not contain dot segments.");
+	return normalized;
+}
+function parsedTarget(target) {
+	return new URL(target, "http://askr.invalid");
+}
+/** Add a registry mount point to one logical root-relative route target. */
+function addRouteBasePath(target, basePath) {
+	if (!basePath || !target.startsWith("/") || target.startsWith("//")) return target;
+	const parsed = parsedTarget(target);
+	if (parsed.origin !== "http://askr.invalid" || parsed.pathname === basePath || parsed.pathname.startsWith(`${basePath}/`)) return target;
+	return `${basePath}${parsed.pathname}${parsed.search}${parsed.hash}`;
+}
+/** Remove a registry mount point and retain query/hash for logical matching. */
+function removeRouteBasePath(target, basePath) {
+	const parsed = parsedTarget(target);
+	if (!basePath) return `${parsed.pathname}${parsed.search}${parsed.hash}`;
+	if (parsed.pathname === basePath || parsed.pathname === `${basePath}/`) return `/${parsed.search}${parsed.hash}`;
+	if (!parsed.pathname.startsWith(`${basePath}/`)) return void 0;
+	return `${parsed.pathname.slice(basePath.length)}${parsed.search}${parsed.hash}`;
+}
+//#endregion
 //#region src/router/route-matching.ts
 const routeSegsCache = /* @__PURE__ */ new WeakMap();
 const routeRankCache = /* @__PURE__ */ new WeakMap();
@@ -752,7 +519,9 @@ function computeMatchesFromRouteRecords(pathname, routeRecords) {
 	}];
 }
 function computeRouteActivityMatches(pathname, options) {
-	return computeMatchesFromRouteRecords(pathname, options.registry.manifest.records);
+	const logicalPath = removeRouteBasePath(pathname, normalizeRouteBasePath(options.registry.manifest.basePath));
+	if (logicalPath === void 0) return [];
+	return computeMatchesFromRouteRecords(logicalPath, options.registry.manifest.records);
 }
 function resolveRoute(pathname) {
 	const normalized = pathname.endsWith("/") && pathname !== "/" ? pathname.slice(0, -1) : pathname;
@@ -784,4 +553,4 @@ function _resolveRouteMatchFromRoutes(pathname, routeList) {
 	return findBestResolvedRouteFromRoutes(pathname, routeList);
 }
 //#endregion
-export { insertRecordSorted as A, getCurrentPathPrefix as C, getRouteRecords as D, getRouteList as E, snapshotRouteState as F, computeRank as I, normalizeRouteSegmentName as L, pushRegistrationScope as M, restoreRouteState as N, hasActivePageScope as O, setDefaultRouteAuthOptions as P, parseSegments as R, getCurrentPageScope as S, getDefaultRouteAuthOptions as T, getCurrentInheritedAuthRequirements as _, resolveRouteFromRoutes as a, getCurrentLayoutChain as b, deepFreeze as c, _setActiveRouteAuthOptions as d, addRouteToStores as f, getActiveRoutes as g, getActiveRouteAuthOptions as h, getMatchingRouteRecord as i, lockRouteRegistration as j, hasRegisteredRoutes as k, makeQuery as l, clearRouteState as m, computeMatchesFromRoutes as n, buildRouteContext as o, assertRouteRegistrationUnlocked as p, computeRouteActivityMatches as r, buildRouteContextBase as s, _resolveRouteMatchFromRoutes as t, parseLocation as u, getCurrentInheritedMeta as v, getCurrentScopeKind as w, getCurrentPageChain as x, getCurrentInheritedPolicies as y, resource as z };
+export { getDefaultRouteBasePath as A, setDefaultRouteBasePath as B, getCurrentInheritedPolicies as C, getCurrentPathPrefix as D, getCurrentPageScope as E, insertRecordSorted as F, computeRank as H, lockRouteRegistration as I, pushRegistrationScope as L, getRouteRecords as M, hasActivePageScope as N, getCurrentScopeKind as O, hasRegisteredRoutes as P, restoreRouteState as R, getCurrentInheritedMeta as S, getCurrentPageChain as T, normalizeRouteSegmentName as U, snapshotRouteState as V, parseSegments as W, clearRouteState as _, resolveRouteFromRoutes as a, getActiveRoutes as b, removeRouteBasePath as c, deepFreeze as d, makeQuery as f, assertRouteRegistrationUnlocked as g, addRouteToStores as h, getMatchingRouteRecord as i, getRouteList as j, getDefaultRouteAuthOptions as k, buildRouteContext as l, _setActiveRouteAuthOptions as m, computeMatchesFromRoutes as n, addRouteBasePath as o, parseLocation as p, computeRouteActivityMatches as r, normalizeRouteBasePath as s, _resolveRouteMatchFromRoutes as t, buildRouteContextBase as u, getActiveRouteAuthOptions as v, getCurrentLayoutChain as w, getCurrentInheritedAuthRequirements as x, getActiveRouteBasePath as y, setDefaultRouteAuthOptions as z };

package/dist/router/index.d.ts

@@ -1,9 +1,9 @@
-import { u as RenderableChild } from "../control-Y8F73Uln.js";
+import { u as RenderableChild } from "../control-DhUZU4_V.js";
 import { r as JSXElement, s as Props } from "../jsx-Dvr2SGRG.js";
-import { A as RouteHandler, B as RouteQuery, C as Route, D as RouteContext, E as RouteComponent, F as RouteMode, G as RouteRegistryOptions, H as RouteRef, I as RouteOptions, J as RouteRequestResult, K as RouteRenderResult, L as RouteParams, M as RouteMatch, N as RouteMeta, O as RouteDefinition, P as RouteMetaSource, R as RoutePathParams, S as ParsedSegment, T as RouteAuthResolver, U as RouteRefSearch, V as RouteRecord, W as RouteRegistry, X as RouteSearchValue, Y as RouteSearch, Z as RouteSnapshot, _ as AccessRedirectStatus, b as PageHelperOptions, f as AccessAllowDecision, g as AccessRedirectDecision, h as AccessDenyStatus, j as RouteManifest, k as RouteDestination, m as AccessDenyDecision, p as AccessDecision, q as RouteRequestOptions, v as GroupHelperOptions, w as RouteAuthOptions, x as PageScopeRecord, y as LayoutScopeRecord, z as RoutePolicy } from "../index-_UN08Pg1.js";
+import { A as RouteHandler, B as RouteQuery, C as Route, D as RouteContext, E as RouteComponent, F as RouteMode, G as RouteRegistryOptions, H as RouteRef, I as RouteOptions, J as RouteRequestResult, K as RouteRenderResult, L as RouteParams, M as RouteMatch, N as RouteMeta, O as RouteDefinition, P as RouteMetaSource, R as RoutePathParams, S as ParsedSegment, T as RouteAuthResolver, U as RouteRefSearch, V as RouteRecord, W as RouteRegistry, X as RouteSearchValue, Y as RouteSearch, Z as RouteSnapshot, _ as AccessRedirectStatus, b as PageHelperOptions, f as AccessAllowDecision, g as AccessRedirectDecision, h as AccessDenyStatus, j as RouteManifest, k as RouteDestination, m as AccessDenyDecision, p as AccessDecision, q as RouteRequestOptions, v as GroupHelperOptions, w as RouteAuthOptions, x as PageScopeRecord, y as LayoutScopeRecord, z as RoutePolicy } from "../index-pIgGaXvS.js";
 import "../types-C9YcqVpk.js";
-import { a as ScrollRestorationOptions, i as NavigationScrollBehavior, n as NavigateOptions, r as HistoryScrollBehavior, t as navigate } from "../navigate-CgVIrrSs.js";
-import { i as onRouteChange, n as RouteChangeOptions, r as currentRoute, t as RouteChangeCleanup } from "../activity-pySy9t7Y.js";
+import { a as ScrollRestorationOptions, i as NavigationScrollBehavior, n as NavigateOptions, r as HistoryScrollBehavior, t as navigate } from "../navigate-NyIjQUwI.js";
+import { i as onRouteChange, n as RouteChangeOptions, r as currentRoute, t as RouteChangeCleanup } from "../activity-B1I5HJQI.js";
 import { AuthContext, AuthContext as AuthContext$1, AuthRequirement, AuthRequirement as AuthRequirement$1 } from "@askrjs/auth";
 import { ObjectSchema } from "@askrjs/schema";
 //#region src/router/route-query.d.ts
@@ -29,7 +29,7 @@ type RouteComponentParam<TComponent extends AnyRouteComponent> = Parameters<TCom
 type CompatibleAbsoluteRouteComponent<Path extends string, TComponent extends AnyRouteComponent> = Parameters<TComponent> extends [] ? TComponent : RoutePathParams<Path> extends RouteComponentParam<TComponent> ? TComponent : never;
 type CompatibleRelativeRouteComponent<Path extends string, TComponent extends AnyRouteComponent> = Parameters<TComponent> extends [] ? TComponent : RouteComponentParam<TComponent> extends Record<keyof RoutePathParams<Path>, string> ? TComponent : never;
 type CompatibleRouteComponent<Path extends string, TComponent extends AnyRouteComponent> = Path extends `/${string}` ? CompatibleAbsoluteRouteComponent<Path, TComponent> : CompatibleRelativeRouteComponent<Path, TComponent>;
-type RouteOptionsForComponent<Path extends string, TComponent extends AnyRouteComponent, TSearchSchema extends ObjectSchema<RouteSearch> | undefined = ObjectSchema<RouteSearch> | undefined> = Parameters<TComponent> extends [] ? RouteOptions<RoutePathParams<Path>, TSearchSchema> : RouteComponentParam<TComponent> extends RouteParams ? RouteOptions<RouteComponentParam<TComponent>, TSearchSchema> : RouteOptions<RoutePathParams<Path>, TSearchSchema>;
+type RouteOptionsForComponent<Path extends string, TComponent extends AnyRouteComponent, TSearchSchema extends ObjectSchema<RouteSearch> | undefined = ObjectSchema<RouteSearch> | undefined, TLoaderData = unknown, TDehydratedData = TLoaderData> = Parameters<TComponent> extends [] ? RouteOptions<RoutePathParams<Path>, TSearchSchema, TLoaderData, TDehydratedData> : RouteComponentParam<TComponent> extends RouteParams ? RouteOptions<RouteComponentParam<TComponent>, TSearchSchema, TLoaderData, TDehydratedData> : RouteOptions<RoutePathParams<Path>, TSearchSchema, TLoaderData, TDehydratedData>;
 declare function group(options: GroupHelperOptions, fn: RouteDefinition): void;
 declare function page<const TPath extends string>(path: TPath, Component: RouteComponent<RoutePathParams<TPath>>, fn: RouteDefinition): void;
 declare function page<const TPath extends string, TComponent extends AnyRouteComponent>(path: TPath, Component: CompatibleRouteComponent<TPath, TComponent>, fn: RouteDefinition): void;
@@ -37,8 +37,8 @@ declare function page<const TPath extends string>(path: TPath, Component: RouteC
 declare function page<const TPath extends string, TComponent extends AnyRouteComponent>(path: TPath, Component: CompatibleRouteComponent<TPath, TComponent>, options: PageHelperOptions, fn: RouteDefinition): void;
 declare function index(Component: RouteComponent, options?: RouteOptions): void;
 declare function fallback(Component: RouteComponent): void;
-declare function route<const TPath extends string, const TSearchSchema extends ObjectSchema<RouteSearch> | undefined = undefined>(path: TPath, Component: RouteComponent<RoutePathParams<TPath>>, options?: RouteOptions<RoutePathParams<TPath>, TSearchSchema>): RouteRef<RoutePathParams<TPath>, RouteRefSearch<TSearchSchema>>;
-declare function route<const TPath extends string, TComponent extends AnyRouteComponent, const TSearchSchema extends ObjectSchema<RouteSearch> | undefined = undefined>(path: TPath, Component: CompatibleRouteComponent<TPath, TComponent>, options?: RouteOptionsForComponent<TPath, TComponent, TSearchSchema>): RouteRef<RoutePathParams<TPath>, RouteRefSearch<TSearchSchema>>;
+declare function route<const TPath extends string, const TSearchSchema extends ObjectSchema<RouteSearch> | undefined = undefined, TLoaderData = unknown, TDehydratedData = TLoaderData>(path: TPath, Component: RouteComponent<RoutePathParams<TPath>>, options?: RouteOptions<RoutePathParams<TPath>, TSearchSchema, TLoaderData, TDehydratedData>): RouteRef<RoutePathParams<TPath>, RouteRefSearch<TSearchSchema>>;
+declare function route<const TPath extends string, TComponent extends AnyRouteComponent, const TSearchSchema extends ObjectSchema<RouteSearch> | undefined = undefined, TLoaderData = unknown, TDehydratedData = TLoaderData>(path: TPath, Component: CompatibleRouteComponent<TPath, TComponent>, options?: RouteOptionsForComponent<TPath, TComponent, TSearchSchema, TLoaderData, TDehydratedData>): RouteRef<RoutePathParams<TPath>, RouteRefSearch<TSearchSchema>>;
 //#endregion
 //#region src/router/auth.d.ts
 /** Return the identity resolved for the route currently being rendered. */
@@ -81,7 +81,7 @@ declare function resolveRouteMeta(record: RouteRecord, context: RouteContext): P
 declare function reconcileRouteMeta(meta: Readonly<RouteMeta>, target?: Document): void;
 declare function serializeRouteMeta(meta: RouteMeta): string;
 //#endregion
-//#region src/router/deferred.d.ts
+//#region src/common/deferred-value.d.ts
 declare const DEFERRED_VALUE: unique symbol;
 type DeferredState = 'pending' | 'fulfilled' | 'rejected';
 interface Deferred<T> {
@@ -91,14 +91,16 @@ interface Deferred<T> {
   readonly promise: Promise<T>;
   readonly [DEFERRED_VALUE]: true;
 }
+declare function defer<T>(promise: PromiseLike<T>): Deferred<T>;
+declare function isDeferred<T = unknown>(value: unknown): value is Deferred<T>;
+//#endregion
+//#region src/router/deferred.d.ts
 interface ResolveProps<T> {
   value: Deferred<T>;
   pending?: RenderableChild;
   rejected?: RenderableChild | ((error: unknown) => RenderableChild);
   children: (value: T) => RenderableChild;
 }
-declare function defer<T>(promise: PromiseLike<T>): Deferred<T>;
-declare function isDeferred<T = unknown>(value: unknown): value is Deferred<T>;
 declare function resolveDeferredValues<T>(input: T, signal?: AbortSignal): Promise<T>;
 declare function routeData<T>(): T;
 declare function Resolve<T>(props: ResolveProps<T>): JSXElement;

package/dist/router/index.js

@@ -1,9 +1,11 @@
-import { a as resolveDeferredValues, b as Outlet, i as isDeferred, l as createRouteRegistry, m as resolveRouteRequest, n as Resolve, r as defer, s as routeData, w as lazy, y as currentAuth } from "../deferred-oqtAJ4iH.js";
-import { a as isSafeHref } from "../csp-nonce-ZTlD_EnK.js";
+import { n as createRouteRegistry } from "../manifest-D1P9uTlz.js";
+import { a as isSafeHref } from "../csp-nonce-Bc52OIVc.js";
 import { jsx } from "../jsx-runtime.js";
-import { a as route, i as page, n as group, r as index, t as fallback } from "../authoring-DQPG0VAm.js";
-import { n as onRouteChange, t as currentRoute } from "../activity-CZiPgZy0.js";
-import { a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-Dr3cjOSz.js";
+import { o as addRouteBasePath, y as getActiveRouteBasePath } from "../route-matching-DqULzZtC.js";
+import { a as group, c as route, i as fallback, n as resolveDeferredValues, o as index, r as routeData, s as page, t as Resolve } from "../deferred-nleQtdfY.js";
+import { a as resolveRouteRequest, b as lazy, f as defer, g as Outlet, h as currentAuth, p as isDeferred } from "../resolution-YHwi4Bav.js";
+import { n as onRouteChange, t as currentRoute } from "../activity-BvgvaMZA.js";
+import { a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-BwAPbpCb.js";
 import { o as mergeProps } from "../compose-ref-Cc_YkUpM.js";
 import { t as applyInteractionPolicy } from "../interactions-DgGQyUQv.js";
 //#region src/router/route-query.ts
@@ -116,7 +118,7 @@ function formatSearchIssues(issues) {
 	return issues.map((issue) => `${issue.path.length ? issue.path.join(".") : "search"}: ${issue.message}`).join("; ");
 }
 function to(route, params, search) {
-	const path = buildPath(route, params);
+	const path = addRouteBasePath(buildPath(route, params), route.basePath ?? "");
 	const parsedSearch = route.searchSchema?.safeParse(search ?? {});
 	if (parsedSearch && !parsedSearch.success) throw new Error(`Invalid route search. ${formatSearchIssues(parsedSearch.issues)}`);
 	const values = parsedSearch?.success ? parsedSearch.data : search;
@@ -167,7 +169,8 @@ function isSameOriginNavigableHref(href) {
 * - Composable via mergeProps
 */
 function Link({ href: suppliedHref, to, class: className, children, rel, target, "aria-current": ariaCurrent, "aria-label": ariaLabel, onPress, onClick, ...rest }) {
-	const href = to?.href ?? suppliedHref;
+	const supplied = to?.href ?? suppliedHref;
+	const href = supplied ? addRouteBasePath(supplied, getActiveRouteBasePath()) : supplied;
 	if (!href) throw new Error("Link requires href or to.");
 	if (!isSafeHref(href)) throw new TypeError("Link href uses an unsafe URL scheme.");
 	const handleNavigation = (e) => {

package/dist/{selector-DJ1-N1K-.js → selector-Ck_Pp9av.js}

@@ -1,6 +1,6 @@
-import { t as enqueueRuntimeLane } from "./access-ePqdQqkV.js";
-import { c as markReadableUsage, f as syncDerivedDependencySubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, p as withDerivedReadTracking, r as clearDerivedDependencySubscriptions, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-_GQGe_St.js";
+import { t as enqueueRuntimeLane } from "./access-Dpfoi4cA.js";
 import { i as claimHookIndex, p as getCurrentInstance } from "./component-scope-DzJEbYGE.js";
+import { c as markReadableUsage, f as syncDerivedDependencySubscriptions, l as notifyReadableReaders, o as markReactivePropsDirtySource, p as withDerivedReadTracking, r as clearDerivedDependencySubscriptions, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-B5NtV7V0.js";
 //#region src/runtime/selector-store.ts
 const dirtySelectorRecords = /* @__PURE__ */ new Set();
 let hasPendingSelectorFlush = false;

package/dist/ssg/index.d.ts

@@ -1,5 +1,5 @@
-import { f as DocumentRenderArgs, m as DocumentRenderer, p as DocumentRenderContext } from "../control-Y8F73Uln.js";
-import { A as RouteHandler, I as RouteOptions, R as RoutePathParams, W as RouteRegistry, z as RoutePolicy } from "../index-_UN08Pg1.js";
+import { _ as SSRStyleRegistrationValidation, f as DocumentRenderArgs, m as DocumentRenderer, p as DocumentRenderContext } from "../control-DhUZU4_V.js";
+import { A as RouteHandler, I as RouteOptions, R as RoutePathParams, W as RouteRegistry, z as RoutePolicy } from "../index-pIgGaXvS.js";
 import { AuthRequirement } from "@askrjs/auth";
 import "node:fs/promises";
 //#region src/ssg/types.d.ts
@@ -31,6 +31,10 @@ interface RouteConfig<Path extends string = string> {
   invalidationKeys?: string[];
   /** Route loader resolved completely before static HTML is rendered. */
   loader?: RouteOptions['loader'];
+  /** Select the loader data transported for initial hydration. */
+  dehydrate?: RouteOptions['dehydrate'];
+  /** @internal Public mount point inherited from the owning registry. */
+  basePath?: string;
   /**
    * SSG entry generator for parameterized routes.
    *
@@ -54,6 +58,8 @@ interface SSGBaseOptions {
   dataOverrides?: Record<string, unknown>;
   /** Optional document wrapper for full HTML output */
   document?: DocumentRenderer;
+  /** Diagnose document renderers that omit request-local SSR style registrations. */
+  styleRegistrationValidation?: SSRStyleRegistrationValidation;
   /** Static files or directories published with the generated routes. */
   assets?: readonly SSGAssetSource[];
   /** Optional concurrency limit for rendering (default: 1) */
@@ -242,4 +248,4 @@ declare function createStaticGen(options: SSGOptions): {
   getResult(): SSGResult | null;
 };
 //#endregion
-export { type DiscoveredResources, type DocumentRenderArgs, type DocumentRenderContext, type DocumentRenderer, type RouteConfig, type RouteRenderReason, type RouteRenderResult, type RouteRenderStatus, type SSGAssetSource, type SSGGenerateOptions, type SSGMetadata, type SSGMode, type SSGOptions, type SSGResult, createStaticGen };
+export { type DiscoveredResources, type DocumentRenderArgs, type DocumentRenderContext, type DocumentRenderer, type RouteConfig, type RouteRenderReason, type RouteRenderResult, type RouteRenderStatus, type SSGAssetSource, type SSGGenerateOptions, type SSGMetadata, type SSGMode, type SSGOptions, type SSGResult, type SSRStyleRegistrationValidation, createStaticGen };

package/dist/ssg/index.js

@@ -1,8 +1,10 @@
-import "../access-ePqdQqkV.js";
-import { C as _preloadRouteHandler, S as getRenderHandler, a as resolveDeferredValues, l as createRouteRegistry, u as bindResolvedRouteData } from "../deferred-oqtAJ4iH.js";
-import { a as route } from "../authoring-DQPG0VAm.js";
-import { n as renderDocument } from "../ssr-CbQO5xd3.js";
-import { n as renderToString } from "../ssr-CtC4lChT.js";
+import "../access-Dpfoi4cA.js";
+import { n as createRouteRegistry } from "../manifest-D1P9uTlz.js";
+import { o as addRouteBasePath } from "../route-matching-DqULzZtC.js";
+import { c as route, n as resolveDeferredValues } from "../deferred-nleQtdfY.js";
+import { c as prepareRouteHydrationData, t as bindResolvedRouteData, v as getRenderHandler, y as _preloadRouteHandler } from "../resolution-YHwi4Bav.js";
+import { n as renderDocument } from "../ssr-DSHd_Q9K.js";
+import { n as renderToString } from "../ssr-B98593qJ.js";
 import * as fs from "node:fs/promises";
 import * as pathModule from "node:path";
 import * as os from "node:os";
@@ -141,17 +143,21 @@ function validateRoutes(routes) {
 * Render multiple routes in parallel with error handling
 */
 async function batchRenderRoutes(routes, options = {}) {
-	const { seed = 12345, dataMap = {}, concurrency = 1, document } = options;
+	const { seed = 12345, dataMap = {}, concurrency = 1, document, styleRegistrationValidation = "warn" } = options;
 	const workerCount = Math.max(1, Math.min(concurrency, routes.length || 1));
 	const results = [];
 	results.length = routes.length;
 	let nextIndex = 0;
-	const sharedRegistry = new Set(routes.map((route) => route.path)).size === routes.length ? createRouteRegistry(() => {
+	const hasUniquePaths = new Set(routes.map((route) => route.path)).size === routes.length;
+	const basePaths = new Set(routes.map((route) => route.basePath ?? ""));
+	const sharedBasePath = basePaths.size === 1 ? routes[0]?.basePath : void 0;
+	const sharedRegistry = hasUniquePaths && basePaths.size <= 1 ? createRouteRegistry(() => {
 		for (const route$1 of routes) route(route$1.path, route$1.handler, { namespace: route$1.namespace });
-	}) : void 0;
+	}, { basePath: sharedBasePath }) : void 0;
 	const renderOne = async (route$2) => {
 		const startTime = performance.now();
 		const url = interpolateRoutePath(route$2.path, route$2.params);
+		const publicUrl = addRouteBasePath(url, route$2.basePath ?? "");
 		const requestUrl = new URL(url, "http://localhost");
 		const resolvedData = resolveSsgRouteData(dataMap, route$2.path, url);
 		const baseData = resolvedData.hasData ? resolvedData.data : void 0;
@@ -161,6 +167,7 @@ async function batchRenderRoutes(routes, options = {}) {
 		try {
 			await _preloadRouteHandler(mergedHandler);
 			let routeData;
+			let routeHydration;
 			let hasRouteData = false;
 			if (route$2.loader) {
 				const controller = new AbortController();
@@ -179,24 +186,30 @@ async function batchRenderRoutes(routes, options = {}) {
 					},
 					signal: controller.signal
 				};
+				const request = new Request(requestUrl);
 				const loaded = await route$2.loader({
 					...loadContext,
-					request: new Request(requestUrl)
+					request
 				});
 				await resolveDeferredValues(loaded, controller.signal);
 				routeData = loaded;
+				routeHydration = prepareRouteHydrationData(loaded, route$2.dehydrate, {
+					...loadContext,
+					request
+				}, url);
 				hasRouteData = true;
 			}
-			const renderedHandler = hasRouteData ? bindResolvedRouteData(mergedHandler, routeData) : mergedHandler;
+			const renderedHandler = hasRouteData ? bindResolvedRouteData(mergedHandler, routeData, routeHydration) : mergedHandler;
 			const registry = hasRouteData || !sharedRegistry ? createRouteRegistry(() => {
 				route(route$2.path, renderedHandler, { namespace: route$2.namespace });
-			}) : sharedRegistry;
+			}, { basePath: route$2.basePath }) : sharedRegistry;
 			phase = "render";
 			const html = renderToString({
-				url,
+				url: publicUrl,
 				registry,
 				seed,
 				data: baseData,
+				styleRegistrationValidation: "off",
 				document: document === void 0 ? void 0 : ({ appHtml, context }) => renderDocument(document, {
 					appHtml,
 					context: {
@@ -215,7 +228,7 @@ async function batchRenderRoutes(routes, options = {}) {
 						cspNonce: context.cspNonce,
 						styles: context.styles
 					}
-				}, "createStaticGen()")
+				}, "createStaticGen()", styleRegistrationValidation)
 			});
 			const duration = performance.now() - startTime;
 			return {
@@ -632,7 +645,9 @@ function routeRegistryToRouteConfigs(registry) {
 			auth: options.auth,
 			policies: options.policies,
 			entries: options.entries,
-			loader: options.loader
+			loader: options.loader,
+			dehydrate: options.dehydrate,
+			basePath: registry.manifest.basePath
 		});
 	}
 	return routeConfigs;
@@ -766,7 +781,8 @@ function createStaticGen(options) {
 				seed,
 				dataMap,
 				concurrency: resolvedConcurrency,
-				document: options.document
+				document: options.document,
+				styleRegistrationValidation: options.styleRegistrationValidation
 			}) : [];
 			performance.now() - renderStartTime;
 			const renderedByRouteId = /* @__PURE__ */ new Map();