@ilha/router 0.8.2 → 0.8.3

package/dist/index.js

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

package/dist/{src-C_n-faIh.js → src-BFzs4FwW.js}

@@ -309,8 +309,13 @@ function injectKPageSlot(layoutHtml, slotInnerHtml, which) {
 function layoutHtmlWithEmptyKPage(wrappedLayout, props) {
 	const handler = wrappedLayout[WRAP_LAYOUT_HANDLER];
 	if (!handler) return wrappedLayout.toString(props);
-	const leaf = wrappedLayout[WRAP_LAYOUT_LEAF] ?? wrappedLayout;
-	return handler(Object.assign(leaf.key("page"), { toString: () => "" })).toString(props);
+	const rawKeyed = (wrappedLayout[WRAP_LAYOUT_LEAF] ?? wrappedLayout).key("page");
+	const shellChild = ((partial) => rawKeyed({
+		...props,
+		...partial ?? {}
+	}));
+	Object.assign(shellChild, { toString: () => "" });
+	return handler(shellChild).toString(props);
 }
 async function wrapLayoutSlotMarkup(innerWrapped, leafPage, props, opts) {
 	const pageInner = extractHydratableInnerHtml(await leafPage.hydratable(props, opts));
@@ -319,9 +324,22 @@ async function wrapLayoutSlotMarkup(innerWrapped, leafPage, props, opts) {
 function wrapLayout(layout, page) {
 	const leafPage = page[WRAP_LAYOUT_LEAF] ?? page;
 	const childWrapped = leafPage !== page ? page : null;
-	const Wrapped = layout(Object.assign(page.key("page"), { toString: page.toString.bind(page) }));
+	const rawKeyedPage = page.key("page");
+	const layoutInputRef = {};
+	const KeyedPage = ((props) => {
+		const merged = layoutInputRef.merged;
+		return rawKeyedPage(merged && typeof merged === "object" ? {
+			...merged,
+			...props ?? {}
+		} : props);
+	});
+	Object.assign(KeyedPage, { toString: page.toString.bind(page) });
+	const Wrapped = layout(KeyedPage);
 	Wrapped[WRAP_LAYOUT_LEAF] = leafPage;
 	Wrapped[WRAP_LAYOUT_HANDLER] = layout;
+	function setLayoutMergedInput(props) {
+		layoutInputRef.merged = props;
+	}
 	function pageMountHost(host) {
 		const slots = [...host.querySelectorAll("[data-ilha-slot=\"k:page\"]")].filter((slot) => {
 			const boundary = slot.closest("[data-ilha]");
@@ -378,10 +396,12 @@ function wrapLayout(layout, page) {
 		preparePageMountHost(host, pageMountHost(host));
 	}
 	Wrapped.mount = (host, props) => {
+		setLayoutMergedInput(props);
 		prepareLayoutMountHost(host);
 		return layoutMount(host, props);
 	};
 	Wrapped[ISLAND_MOUNT_INTERNAL] = (host, props) => {
+		setLayoutMergedInput(props);
 		prepareLayoutMountHost(host);
 		if (typeof layoutInternal === "function") return layoutInternal(host, props);
 		return {
@@ -392,6 +412,7 @@ function wrapLayout(layout, page) {
 	Wrapped.hydratable = async (props, opts) => {
 		if (!opts?.name) throw new Error("wrapLayout: hydratable requires options.name");
 		const resolvedProps = props ?? {};
+		setLayoutMergedInput(resolvedProps);
 		const pageBlock = await leafPage.hydratable(resolvedProps, opts);
 		const open = parseHydratableOpenTag(pageBlock);
 		if (!open) return pageBlock;

package/dist/ssr.js

@@ -1,4 +1,4 @@
-import { t as LOADER_ENDPOINT } from "./src-C_n-faIh.js";
+import { t as LOADER_ENDPOINT } from "./src-BFzs4FwW.js";
 import { pageRouter, registry } from "ilha:pages/server";
 import "ilha:loaders";
 

package/package.json

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