@ilha/router 0.9.0 → 0.9.1

package/dist/index.js

@@ -601,7 +601,7 @@ async function withViewSwap(mutate) {
 * shape, so all client mount paths handle both sources identically. Loader
 * `head` contributions are dropped, matching the endpoint fetch path.
 */
-async function runLocalLoader(loader, matchParams, pathWithSearch, signal, isClientLoader = false) {
+async function runLocalLoader(loader, matchParams, pathWithSearch, signal) {
 	const url = new URL(pathWithSearch, location.origin);
 	const params = extractParams(matchParams);
 	const headEntries = [];
@@ -624,14 +624,7 @@ async function runLocalLoader(loader, matchParams, pathWithSearch, signal, isCli
 		};
 	}
 	if (result.kind === "data") {
-		const data = isClientLoader ? {
-			...result.data,
-			load: {
-				loading: false,
-				value: result.data ?? {},
-				error: void 0
-			}
-		} : result.data;
+		const data = envelopLoad(result.data);
 		return headEntries.length > 0 ? {
 			kind: "data",
 			data,
@@ -659,7 +652,7 @@ async function fetchLoaderData(pathWithSearch, signal) {
 	const pathOnly = pathWithSearch.split("?")[0] ?? "";
 	const localMatch = matchRoute(_routes, pathOnly);
 	const localLoader = localMatch?.data?.clientLoader ?? localMatch?.data?.loader;
-	if (localLoader) return runLocalLoader(localLoader, localMatch?.params, pathWithSearch, signal, !!localMatch?.data?.clientLoader);
+	if (localLoader) return runLocalLoader(localLoader, localMatch?.params, pathWithSearch, signal);
 	const url = `${LOADER_ENDPOINT}?path=${encodeURIComponent(pathWithSearch)}`;
 	try {
 		const res = await fetch(url, {
@@ -677,7 +670,12 @@ async function fetchLoaderData(pathWithSearch, signal) {
 				message: res.statusText
 			};
 		}
-		return await res.json();
+		const parsed = await res.json();
+		if (parsed.kind === "data" && !localMatch?.data?.clientLoader && parsed.data && typeof parsed.data === "object" && !("load" in parsed.data)) return {
+			...parsed,
+			data: envelopLoad(parsed.data)
+		};
+		return parsed;
 	} catch (e) {
 		if (e?.name === "AbortError") throw e;
 		return {
@@ -983,6 +981,14 @@ function activeIsland(value) {
 	return store ? store.island : _activeIslandSig();
 }
 let _routes = createRouteRegistry();
+/** Wrap loader data in the load envelope (plain, serializable). */
+function envelopLoad(data) {
+	return { load: {
+		loading: false,
+		value: data ?? {},
+		error: void 0
+	} };
+}
 function createRouteRegistry() {
 	return [];
 }
@@ -1553,8 +1559,10 @@ function loaderAbort(request, timeout) {
 	const ctrl = new AbortController();
 	const abort = () => ctrl.abort();
 	const reqSignal = request?.signal;
-	if (reqSignal) if (reqSignal.aborted) abort();
-	else reqSignal.addEventListener("abort", abort, { once: true });
+	if (reqSignal) {
+		if (reqSignal.aborted) abort();
+		else reqSignal.addEventListener("abort", abort, { once: true });
+	}
 	let timer;
 	if (timeout && timeout > 0) timer = setTimeout(abort, timeout);
 	return {
@@ -2068,9 +2076,17 @@ function router(options = {}) {
 					};
 				}
 				if (result.kind !== "data") return result;
-				if (headStore.entries.length === 0) return result;
-				return {
+				const enveloped = {
 					...result,
+					data: { load: {
+						loading: false,
+						value: result.data ?? {},
+						error: void 0
+					} }
+				};
+				if (headStore.entries.length === 0) return enveloped;
+				return {
+					...enveloped,
 					head: serializeHead(headStore.entries),
 					headEntries: headStore.entries
 				};
@@ -2179,7 +2195,7 @@ function router(options = {}) {
 					head: serializeHead(headStore.entries)
 				};
 			}
-			props = result.data;
+			props = envelopLoad(result.data);
 		}
 		const name = buildReverseRegistry(registry).get(island);
 		if (!name) {

package/dist/{plugin-DPGzrIVj.js → plugin-DogkskcY.js}

@@ -1,4 +1,4 @@
-import { t as runWithIslandRequest } from "./request-scope-D6_4rqMb.js";
+import { t as runWithIslandRequest } from "./request-scope-C4reU4v0.js";
 import { FrameError, getFrameGuard, renderServerIsland, setFrameGuard } from "./server-island-registry.js";
 import { existsSync, readFileSync, statSync, watch } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";

package/dist/{request-scope-D6_4rqMb.js → request-scope-C4reU4v0.js}

@@ -8,7 +8,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
 * page SSR through the router, or streamed frames through the plugin's
 * `/__ilha/frame` endpoint. Both seed this scope with the originating
 * `Request`, so render functions can read request data (URL, headers,
-* cookies) without depending on Oxide's action-only `useRequest()`.
+* cookies) through `useContext().request` or a host integration such as Oxide's `useRequest()`.
 *
 * The storage lives on `globalThis` under `ilha.requestAls` so every module
 * copy (plugin bundle, SSR graph) shares one instance. The public accessor
@@ -17,10 +17,17 @@ import { AsyncLocalStorage } from "node:async_hooks";
 * sole place that constructs it.
 */
 const REQUEST_ALS_KEY = Symbol.for("ilha.requestAls");
-/** Run `fn` with `request` available to `useContext().request`. */
+/** Installed by oxidejs when its module loads. Lets `useRequest()` resolve
+* inside island renders and frames, not just `/__oxide/action`. */
+const OXIDE_RUN_WITH_REQUEST = Symbol.for("oxidejs.runWithRequest");
+/** Run `fn` with `request` available to `useContext().request`. When oxidejs
+* is loaded, its action scope is entered too, so `useRequest()` works in
+* island renders and streamed frames. */
 function runWithIslandRequest(request, fn) {
 	const g = globalThis;
-	return (g[REQUEST_ALS_KEY] ??= new AsyncLocalStorage()).run(request, fn);
+	const als = g[REQUEST_ALS_KEY] ??= new AsyncLocalStorage();
+	const oxide = g[OXIDE_RUN_WITH_REQUEST];
+	return als.run(request, () => oxide ? oxide(request, fn) : fn());
 }
 
 //#endregion

package/dist/request-scope.d.ts

@@ -5,7 +5,7 @@
  * page SSR through the router, or streamed frames through the plugin's
  * `/__ilha/frame` endpoint. Both seed this scope with the originating
  * `Request`, so render functions can read request data (URL, headers,
- * cookies) without depending on Oxide's action-only `useRequest()`.
+ * cookies) through `useContext().request` or a host integration such as Oxide's `useRequest()`.
  *
  * The storage lives on `globalThis` under `ilha.requestAls` so every module
  * copy (plugin bundle, SSR graph) shares one instance. The public accessor
@@ -15,6 +15,8 @@
  */
 import type { IslandContext } from "./index";
 export declare const REQUEST_ALS_KEY: unique symbol;
-/** Run `fn` with `request` available to `useContext().request`. */
+/** Run `fn` with `request` available to `useContext().request`. When oxidejs
+ * is loaded, its action scope is entered too, so `useRequest()` works in
+ * island renders and streamed frames. */
 export declare function runWithIslandRequest<T>(request: Request, fn: () => T): T;
 export type { IslandContext };

package/dist/rolldown.d.ts

@@ -2,5 +2,5 @@ export type { LayoutHandler, ErrorHandler, RouteSnapshot, AppError } from "./ind
 export { ilhaPages, type IlhaPagesOptions } from "./plugin";
 import { type IlhaPagesOptions } from "./plugin";
 /** Rolldown plugin — use via `@ilha/router/rolldown`. */
-export declare function pages(options?: IlhaPagesOptions): import("unplugin").RolldownPlugin<any> | import("unplugin").RolldownPlugin<any>[];
+export declare function pages(options?: IlhaPagesOptions): import("rolldown").Plugin<any> | import("rolldown").Plugin<any>[];
 export default pages;

package/dist/rolldown.js

@@ -1,4 +1,4 @@
-import { t as ilhaPages } from "./plugin-DPGzrIVj.js";
+import { t as ilhaPages } from "./plugin-DogkskcY.js";
 
 //#region src/rolldown.ts
 /** Rolldown plugin — use via `@ilha/router/rolldown`. */

package/dist/rspack.js

@@ -1,4 +1,4 @@
-import { t as ilhaPages } from "./plugin-DPGzrIVj.js";
+import { t as ilhaPages } from "./plugin-DogkskcY.js";
 
 //#region src/rspack.ts
 /** Rspack plugin — use via `@ilha/router/rspack`. */

package/dist/server-island-registry.js

@@ -104,12 +104,16 @@ async function renderServerIsland(id, request, runWithScope) {
 		const params = entry.pattern ? matchPatternParams(entry.pattern, url.pathname) : {};
 		if (!params) throw new FrameError(400, "frame failed");
 		try {
-			props = await entry.load({
-				params,
-				request,
-				url,
-				signal: request.signal
-			});
+			props = { load: {
+				loading: false,
+				value: await entry.load({
+					params,
+					request,
+					url,
+					signal: request.signal
+				}) ?? {},
+				error: void 0
+			} };
 		} catch (error) {
 			const marker = error;
 			if (marker.__ilhaRedirect === true) {

package/dist/ssr.js

@@ -1,4 +1,4 @@
-import { t as runWithIslandRequest } from "./request-scope-D6_4rqMb.js";
+import { t as runWithIslandRequest } from "./request-scope-C4reU4v0.js";
 import { FrameError, getFrameGuard, getFrameLoaderRunner, renderServerIsland } from "./server-island-registry.js";
 
 //#region src/ssr.ts
@@ -136,6 +136,12 @@ async function ssr(request) {
 			method: "POST",
 			headers
 		});
+		for (const sym of Object.getOwnPropertySymbols(request)) {
+			if (Symbol.keyFor(sym) === void 0) continue;
+			try {
+				scoped[sym] = request[sym];
+			} catch {}
+		}
 		return json(200, { html: await renderServerIsland(id, scoped, (scopedRequest, fn) => Promise.resolve(runWithIslandRequest(scopedRequest, fn))) });
 	} catch (error) {
 		if (error instanceof FrameError) {

package/dist/vite.js

@@ -1,4 +1,4 @@
-import { t as ilhaPages } from "./plugin-DPGzrIVj.js";
+import { t as ilhaPages } from "./plugin-DogkskcY.js";
 
 //#region src/vite.ts
 /** Vite plugin — use via `@ilha/router/vite`. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/router",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A tiny SPA router for Ilha",
   "keywords": [
     "frontend",