@ilha/router 0.10.2 → 0.10.4

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A as wrapLayout, C as routePath, D as useContext, E as src_default, F as getHistoryMode, I as setHistoryMode, O as useRoute, P as httpResponse, S as routeParams, T as router, _ as prefetch, a as RouterView, b as resolveRedirectTarget, c as composeLoaders, d as error, f as invalidate, g as navigating, h as navigate, i as RouterLink, k as wrapError, l as defineLayout, m as loader, n as LoaderError, o as afterNavigate, p as isActive, r as Redirect, s as beforeNavigate, t as LOADER_ENDPOINT, u as enableLinkInterception, v as prime, w as routeSearch, x as routeHash, y as redirect } from "./src-B5dHU24f.js";
+import { A as wrapLayout, C as routePath, D as useContext, E as src_default, F as getHistoryMode, I as setHistoryMode, O as useRoute, P as httpResponse, S as routeParams, T as router, _ as prefetch, a as RouterView, b as resolveRedirectTarget, c as composeLoaders, d as error, f as invalidate, g as navigating, h as navigate, i as RouterLink, k as wrapError, l as defineLayout, m as loader, n as LoaderError, o as afterNavigate, p as isActive, r as Redirect, s as beforeNavigate, t as LOADER_ENDPOINT, u as enableLinkInterception, v as prime, w as routeSearch, x as routeHash, y as redirect } from "./src-PCXNZfql.js";
 import { o as head, s as serializeHead } from "./snapshot-CsEaY6h_.js";
 
 export { LOADER_ENDPOINT, LoaderError, Redirect, RouterLink, RouterView, afterNavigate, beforeNavigate, composeLoaders, src_default as default, defineLayout, enableLinkInterception, error, getHistoryMode, head, httpResponse, invalidate, isActive, loader, navigate, navigating, prefetch, prime, redirect, resolveRedirectTarget, routeHash, routeParams, routePath, routeSearch, router, serializeHead, setHistoryMode, useContext, useRoute, wrapError, wrapLayout };

package/dist/{plugin-Bh0y5kkI.js → plugin-BQil-7B_.js}

@@ -1,4 +1,4 @@
-import { C as setLoaderGuard, T as runWithIslandRequest, b as setFrameAuth, c as frameEnvelope, m as isSafeFramePath, n as FrameError, o as authorizeFrameRequest, u as getFrameGuard, x as setFrameGuard, y as renderServerIsland } from "./ssr-CGcMUP1G.js";
+import { E as runWithIslandRequest, S as setFrameGuard, _ as parseFrameProps, b as renderServerIsland, c as frameEnvelope, m as isSafeFramePath, n as FrameError, o as authorizeFrameRequest, u as getFrameGuard, w as setLoaderGuard, x as setFrameAuth } from "./ssr-BTmqfAp9.js";
 import { existsSync, readFileSync, statSync, watch } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";
 import { createUnplugin } from "unplugin";
@@ -198,7 +198,7 @@ function generateServerIslandModule(spec, scan) {
 		if (actions.length) wiring.push(`actions: { ${actions.join(", ")} }`);
 		if (scan.clientRefs.length) wiring.push(`children: { ${scan.clientRefs.map((ref, index) => `${JSON.stringify(ref.id)}: $$child${index}`).join(", ")} }`);
 		const id = serverIslandPublicId(spec, island.name);
-		wiring.push(`frame: () => fetch("/__ilha/frame", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ id: ${JSON.stringify(id)}, path: location.pathname + location.search }) }).then((r) => { if (!r.ok) throw new Error("frame failed"); return r.json(); }).then((j) => { if (j.redirect) { location.assign(j.redirect); throw new Error("frame redirected"); } __ilhaApplyHead(j.head); return j.html; })`);
+		wiring.push(`frame: (props) => fetch("/__ilha/frame", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ id: ${JSON.stringify(id)}, path: location.pathname + location.search, props }) }).then((r) => { if (!r.ok) throw new Error("frame failed"); return r.json(); }).then((j) => { if (j.redirect) { location.assign(j.redirect); throw new Error("frame redirected"); } __ilhaApplyHead(j.head); return j.html; })`);
 		if (scan.clientLoader) wiring.push(`clientLoader: () => $$call("load", [])`);
 		const call = `__ilhaServerIsland(${JSON.stringify(id)}, ${JSON.stringify(island.as)}, { ${wiring.join(", ")} })`;
 		if (island.name === "default") lines.push(`export default ${call};`);
@@ -1046,6 +1046,7 @@ const pagesFactory = (options = {}) => {
 					}
 					try {
 						const body = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+						const incomingProps = parseFrameProps(body.props);
 						const target = serverIslands.get(body.id ?? "");
 						if (!target) throw new Error("unknown island");
 						let framePath = "/";
@@ -1068,7 +1069,7 @@ const pagesFactory = (options = {}) => {
 							headers
 						});
 						let head;
-						const html = await renderServerIsland(body.id ?? "", request, (r, fn) => runWithIslandRequest(r, fn), (entries) => head = entries);
+						const html = await renderServerIsland(body.id ?? "", request, (r, fn) => runWithIslandRequest(r, fn), (entries) => head = entries, incomingProps);
 						const env = frameEnvelope(200, {
 							html: String(html),
 							head

package/dist/rsbuild.js

@@ -1,4 +1,4 @@
-import { t as ilhaPages } from "./plugin-Bh0y5kkI.js";
+import { t as ilhaPages } from "./plugin-BQil-7B_.js";
 
 //#region src/rsbuild.ts
 /** Rsbuild plugin — use via `@ilha/router/rsbuild`. */

package/dist/server-island.d.ts

@@ -22,8 +22,8 @@ export interface ServerIslandWiring {
     /** Action key → client transport. Event payloads are not serializable;
      * handlers receive `undefined` and should read island state instead. */
     actions?: Record<string, (payload?: unknown) => unknown>;
-    /** Frame transport: re-renders the island from server-owned state. */
-    frame?: () => unknown;
+    /** Frame transport: re-renders the island with the latest parent props. */
+    frame?: (props?: Record<string, unknown>) => unknown;
     /** RPC transport for the module's `loader.client` export — invoked once
      * when the view hydrates. Side-effect loader on server pages. */
     clientLoader?: () => unknown;
@@ -51,7 +51,7 @@ interface IslandCallShape {
     key: string;
 }
 export type ServerIslandCallable = Record<symbol, unknown> & ((props?: Record<string, unknown>) => string) & {
-    mount: (host: Element) => () => void;
+    mount: (host: Element, props?: Record<string, unknown>) => () => void;
     toString: () => string;
     key: (slotKey: string) => (props?: Record<string, unknown>) => IslandCallShape;
 };

package/dist/server-island.js

@@ -48,7 +48,43 @@ function belongsToHost(host, candidate) {
 	}
 	return el === host;
 }
-function hydrateServerIsland(host, id, wiring) {
+/** Dev cold-start can race a warming `virtual:oxide/actions` graph — retry briefly. */
+async function startServerStream(fn, signal) {
+	let last;
+	for (let attempt = 0; attempt < 4; attempt++) {
+		if (signal.aborted) throw last ?? new DOMException("The operation was aborted.", "AbortError");
+		let gen;
+		try {
+			gen = await fn(signal);
+			const first = await gen.next();
+			return {
+				gen,
+				first
+			};
+		} catch (err) {
+			last = err;
+			if (gen) Promise.resolve(gen.return?.(void 0)).catch(() => {});
+			if (signal.aborted) throw err;
+			const msg = String(err);
+			if (!msg.includes("404") && !msg.includes("503")) throw err;
+			if (attempt === 3) throw err;
+			await new Promise((resolve, reject) => {
+				const timer = setTimeout(() => {
+					signal.removeEventListener("abort", onAbort);
+					resolve();
+				}, 50 * (attempt + 1));
+				const onAbort = () => {
+					clearTimeout(timer);
+					reject(err);
+				};
+				signal.addEventListener("abort", onAbort, { once: true });
+				if (signal.aborted) onAbort();
+			});
+		}
+	}
+	throw last;
+}
+function hydrateServerIsland(host, id, wiring, props) {
 	const controller = new AbortController();
 	const cleanups = [];
 	cleanups.push(() => controller.abort());
@@ -61,12 +97,14 @@ function hydrateServerIsland(host, id, wiring) {
 		}
 	}
 	const frame = wiring.frame;
+	let currentProps = props;
 	let repaintChain = Promise.resolve();
 	const scheduleRepaint = () => {
 		if (!frame || controller.signal.aborted) return;
+		const sent = currentProps;
 		repaintChain = repaintChain.then(async () => {
 			if (controller.signal.aborted || !host.isConnected) return;
-			const html = await frame();
+			const html = await frame(sent);
 			if (controller.signal.aborted || typeof html !== "string") return;
 			morph(host, html);
 			syncChildren();
@@ -157,13 +195,15 @@ function hydrateServerIsland(host, id, wiring) {
 	syncChildren();
 	for (const [key, fn] of Object.entries(wiring.streams ?? {})) (async () => {
 		try {
-			const gen = await fn(controller.signal);
+			const { gen, first } = await startServerStream(fn, controller.signal);
 			try {
+				let step = first;
 				for (;;) {
-					const { done, value } = await gen.next();
+					const { done, value } = step;
 					if (controller.signal.aborted || done) break;
 					state[key] = value;
 					scheduleRepaint();
+					step = await gen.next();
 				}
 			} catch (err) {
 				if (!controller.signal.aborted && err?.name !== "AbortError") console.error(`[ilha-router] stream "${key}" failed:`, err);
@@ -187,7 +227,10 @@ function hydrateServerIsland(host, id, wiring) {
 			for (const cleanup of cleanups) cleanup();
 			cleanups.length = 0;
 		},
-		updateProps: () => {}
+		updateProps: (next) => {
+			currentProps = next;
+			scheduleRepaint();
+		}
 	};
 }
 function __ilhaServerIsland(id, as, wiring = {}) {
@@ -208,8 +251,8 @@ function __ilhaServerIsland(id, as, wiring = {}) {
 			key: slotKey
 		});
 	};
-	island[ISLAND_MOUNT_INTERNAL] = (host) => hydrateServerIsland(host, id, wiring);
-	island.mount = (host) => hydrateServerIsland(host, id, wiring).unmount;
+	island[ISLAND_MOUNT_INTERNAL] = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps);
+	island.mount = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps).unmount;
 	return island;
 }
 

package/dist/{src-B5dHU24f.js → src-PCXNZfql.js}

@@ -1017,7 +1017,7 @@ function routePath(value) {
 	const store = activeRouteStore();
 	if (arguments.length > 0) {
 		if (store) return store.path = value;
-		return _routePathSig(value), value;
+		return _routePathSig.set(value), value;
 	}
 	return store ? store.path : _routePathSig();
 }
@@ -1026,7 +1026,7 @@ function routeParams(value) {
 	const store = activeRouteStore();
 	if (arguments.length > 0) {
 		if (store) return store.params = value;
-		return _routeParamsSig(value), value;
+		return _routeParamsSig.set(value), value;
 	}
 	return store ? store.params : _routeParamsSig();
 }
@@ -1035,7 +1035,7 @@ function routeSearch(value) {
 	const store = activeRouteStore();
 	if (arguments.length > 0) {
 		if (store) return store.search = value;
-		return _routeSearchSig(value), value;
+		return _routeSearchSig.set(value), value;
 	}
 	return store ? store.search : _routeSearchSig();
 }
@@ -1044,7 +1044,7 @@ function routeHash(value) {
 	const store = activeRouteStore();
 	if (arguments.length > 0) {
 		if (store) return store.hash = value;
-		return _routeHashSig(value), value;
+		return _routeHashSig.set(value), value;
 	}
 	return store ? store.hash : _routeHashSig();
 }
@@ -1066,13 +1066,13 @@ function invalidate() {
 /** Mark a navigation as started; returns an idempotent settle callback. */
 function beginNavigation() {
 	if (!isBrowser) return () => {};
-	_navigatingSig(_navigatingSig() + 1);
+	_navigatingSig.set(_navigatingSig() + 1);
 	document.documentElement.setAttribute("data-router-pending", "");
 	let done = false;
 	return () => {
 		if (done) return;
 		done = true;
-		_navigatingSig(Math.max(0, _navigatingSig() - 1));
+		_navigatingSig.set(Math.max(0, _navigatingSig() - 1));
 		if (_navigatingSig() === 0) document.documentElement.removeAttribute("data-router-pending");
 	};
 }
@@ -1103,8 +1103,8 @@ function activeIsland(value) {
 	if (arguments.length > 0) {
 		const next = value ?? null;
 		if (store) return store.island = next;
-		if (next === null) _activeIslandSig(null);
-		else _activeIslandSig(() => next);
+		if (next === null) _activeIslandSig.set(null);
+		else _activeIslandSig.set(next);
 		return next;
 	}
 	return store ? store.island : _activeIslandSig();

package/dist/{ssr-CGcMUP1G.js → ssr-BTmqfAp9.js}

@@ -1,4 +1,4 @@
-import { M as parsePattern, N as safeDecode, b as resolveRedirectTarget, j as matchSegments } from "./src-B5dHU24f.js";
+import { M as parsePattern, N as safeDecode, b as resolveRedirectTarget, j as matchSegments } from "./src-PCXNZfql.js";
 import "ilha";
 import { bindServerAction, setServerManifestSerializer } from "ilha/internal";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -214,10 +214,10 @@ function matchPatternParams(pattern, pathname) {
 * caller's scope. Throws `FrameError` with an HTTP status for client-facing
 * failures; loader redirects surface via `FrameError.redirect`.
 */
-async function renderServerIsland(id, request, runWithScope, onHead) {
+async function renderServerIsland(id, request, runWithScope, onHead, incomingProps) {
 	const entry = registry().get(id);
 	if (!entry) throw new FrameError(400, "unknown island");
-	let props;
+	let props = incomingProps;
 	if (entry.load) {
 		let url;
 		try {
@@ -264,6 +264,12 @@ const FRAME_ENDPOINT = "/__ilha/frame";
 const LOADER_ENDPOINT = "/__ilha/loader";
 /** Max request body size — matches the dev middleware cap. */
 const MAX_BODY = 16384;
+/** Parent-island props on a frame POST. Missing is fine; anything else is 400. */
+function parseFrameProps(value) {
+	if (value == null) return void 0;
+	if (typeof value !== "object" || Array.isArray(value)) throw new FrameError(400, "frame failed");
+	return value;
+}
 function json(status, body) {
 	const env = frameEnvelope(status, body);
 	return new Response(env.body, {
@@ -423,11 +429,13 @@ async function ssr(request) {
 	if (!authorized.ok) return json(authorized.status, { error: "frame failed" });
 	let id;
 	let path = "/";
+	let incomingProps;
 	try {
 		const text = await readBodyBounded(request, MAX_BODY);
 		if (text === null) return json(413, { error: "frame failed" });
 		const body = JSON.parse(text);
 		id = String(body.id ?? "");
+		incomingProps = parseFrameProps(body.props);
 		if (typeof body.path === "string") {
 			if (!isSafeFramePath(body.path)) return json(400, { error: "frame failed" });
 			path = body.path;
@@ -455,7 +463,7 @@ async function ssr(request) {
 		}
 		let head;
 		return json(200, {
-			html: await renderServerIsland(id, scoped, (scopedRequest, fn) => Promise.resolve(runWithIslandRequest(scopedRequest, fn)), (entries) => head = entries),
+			html: await renderServerIsland(id, scoped, (scopedRequest, fn) => Promise.resolve(runWithIslandRequest(scopedRequest, fn)), (entries) => head = entries, incomingProps),
 			head
 		});
 	} catch (error) {
@@ -472,4 +480,4 @@ async function ssr(request) {
 ssr.imports = ["ilha:pages/server", "ilha:loaders"];
 
 //#endregion
-export { setLoaderGuard as C, setFrameLoaderRunner as S, runWithIslandRequest as T, readBodyBounded as _, __ilhaServerAction as a, setFrameAuth as b, frameEnvelope as c, getFrameLoaderRunner as d, getLoaderGuard as f, json as g, isTrustedOrigin as h, MAX_BODY as i, getFrameAuth as l, isSafeFramePath as m, FrameError as n, authorizeFrameRequest as o, getServerIslandEntry as p, LOADER_ENDPOINT as r, forwardIdentityHeaders as s, FRAME_ENDPOINT as t, getFrameGuard as u, registerServerIsland as v, ssr as w, setFrameGuard as x, renderServerIsland as y };
+export { setFrameLoaderRunner as C, runWithIslandRequest as E, setFrameGuard as S, ssr as T, parseFrameProps as _, __ilhaServerAction as a, renderServerIsland as b, frameEnvelope as c, getFrameLoaderRunner as d, getLoaderGuard as f, json as g, isTrustedOrigin as h, MAX_BODY as i, getFrameAuth as l, isSafeFramePath as m, FrameError as n, authorizeFrameRequest as o, getServerIslandEntry as p, LOADER_ENDPOINT as r, forwardIdentityHeaders as s, FRAME_ENDPOINT as t, getFrameGuard as u, readBodyBounded as v, setLoaderGuard as w, setFrameAuth as x, registerServerIsland as y };

package/dist/ssr.d.ts

@@ -164,12 +164,14 @@ export declare class FrameError extends Error {
  * caller's scope. Throws `FrameError` with an HTTP status for client-facing
  * failures; loader redirects surface via `FrameError.redirect`.
  */
-export declare function renderServerIsland(id: string, request: Request, runWithScope: <T>(request: Request, fn: () => T) => T | Promise<T>, onHead?: (entries: HeadInput[]) => void): Promise<string>;
+export declare function renderServerIsland(id: string, request: Request, runWithScope: <T>(request: Request, fn: () => T) => T | Promise<T>, onHead?: (entries: HeadInput[]) => void, incomingProps?: Record<string, unknown>): Promise<string>;
 export declare const FRAME_ENDPOINT = "/__ilha/frame";
 /** Regular-page server loads: served through the loader-runner slot. */
 export declare const LOADER_ENDPOINT = "/__ilha/loader";
 /** Max request body size — matches the dev middleware cap. */
 export declare const MAX_BODY: number;
+/** Parent-island props on a frame POST. Missing is fine; anything else is 400. */
+export declare function parseFrameProps(value: unknown): Record<string, unknown> | undefined;
 export declare function json(status: number, body: Record<string, unknown>): Response;
 /**
  * Read a request body as UTF-8, streaming it with a hard byte cap. Returns

package/dist/ssr.js

@@ -1,3 +1,3 @@
-import { C as setLoaderGuard, S as setFrameLoaderRunner, _ as readBodyBounded, a as __ilhaServerAction, b as setFrameAuth, c as frameEnvelope, d as getFrameLoaderRunner, f as getLoaderGuard, g as json, h as isTrustedOrigin, i as MAX_BODY, l as getFrameAuth, m as isSafeFramePath, n as FrameError, o as authorizeFrameRequest, p as getServerIslandEntry, r as LOADER_ENDPOINT, s as forwardIdentityHeaders, t as FRAME_ENDPOINT, u as getFrameGuard, v as registerServerIsland, w as ssr, x as setFrameGuard, y as renderServerIsland } from "./ssr-CGcMUP1G.js";
+import { C as setFrameLoaderRunner, S as setFrameGuard, T as ssr, _ as parseFrameProps, a as __ilhaServerAction, b as renderServerIsland, c as frameEnvelope, d as getFrameLoaderRunner, f as getLoaderGuard, g as json, h as isTrustedOrigin, i as MAX_BODY, l as getFrameAuth, m as isSafeFramePath, n as FrameError, o as authorizeFrameRequest, p as getServerIslandEntry, r as LOADER_ENDPOINT, s as forwardIdentityHeaders, t as FRAME_ENDPOINT, u as getFrameGuard, v as readBodyBounded, w as setLoaderGuard, x as setFrameAuth, y as registerServerIsland } from "./ssr-BTmqfAp9.js";
 
-export { FRAME_ENDPOINT, FrameError, LOADER_ENDPOINT, MAX_BODY, __ilhaServerAction, authorizeFrameRequest, ssr as default, forwardIdentityHeaders, frameEnvelope, getFrameAuth, getFrameGuard, getFrameLoaderRunner, getLoaderGuard, getServerIslandEntry, isSafeFramePath, isTrustedOrigin, json, readBodyBounded, registerServerIsland, renderServerIsland, setFrameAuth, setFrameGuard, setFrameLoaderRunner, setLoaderGuard };
+export { FRAME_ENDPOINT, FrameError, LOADER_ENDPOINT, MAX_BODY, __ilhaServerAction, authorizeFrameRequest, ssr as default, forwardIdentityHeaders, frameEnvelope, getFrameAuth, getFrameGuard, getFrameLoaderRunner, getLoaderGuard, getServerIslandEntry, isSafeFramePath, isTrustedOrigin, json, parseFrameProps, readBodyBounded, registerServerIsland, renderServerIsland, setFrameAuth, setFrameGuard, setFrameLoaderRunner, setLoaderGuard };

package/dist/vite.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/router",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "A tiny SPA router for Ilha",
   "keywords": [
     "frontend",
@@ -75,10 +75,10 @@
     "unplugin": "3.3.0"
   },
   "devDependencies": {
-    "ilha": "0.12.1",
+    "ilha": "0.13.0",
     "vite": "^8.2.2"
   },
   "peerDependencies": {
-    "ilha": ">=0.12.1"
+    "ilha": ">=0.13.0"
   }
 }