@ilha/router 0.3.6 → 0.3.7

package/dist/index.js

@@ -1,2 +1,2 @@
-import { C as wrapError, E as setHistoryMode, S as useRoute, T as getHistoryMode, _ as routeParams, a as RouterView, b as router, c as enableLinkInterception, d as loader, f as navigate, g as routeHash, h as redirect, i as RouterLink, l as error, m as prime, n as LoaderError, o as composeLoaders, p as prefetch, r as Redirect, s as defineLayout, t as LOADER_ENDPOINT, u as isActive, v as routePath, w as wrapLayout, x as src_default, y as routeSearch } from "./src-BFZ-RQw6.js";
+import { C as wrapError, E as setHistoryMode, S as useRoute, T as getHistoryMode, _ as routeParams, a as RouterView, b as router, c as enableLinkInterception, d as loader, f as navigate, g as routeHash, h as redirect, i as RouterLink, l as error, m as prime, n as LoaderError, o as composeLoaders, p as prefetch, r as Redirect, s as defineLayout, t as LOADER_ENDPOINT, u as isActive, v as routePath, w as wrapLayout, x as src_default, y as routeSearch } from "./src-DB9CdFFS.js";
 export { LOADER_ENDPOINT, LoaderError, Redirect, RouterLink, RouterView, composeLoaders, src_default as default, defineLayout, enableLinkInterception, error, getHistoryMode, isActive, loader, navigate, prefetch, prime, redirect, routeHash, routeParams, routePath, routeSearch, router, setHistoryMode, useRoute, wrapError, wrapLayout };

package/dist/{src-BFZ-RQw6.js → src-DB9CdFFS.js}

@@ -180,7 +180,45 @@ function composeLoaders(loaders) {
 	};
 }
 function wrapLayout(layout, page) {
-	return layout(page);
+	const Wrapped = layout(Object.assign(page.key("page"), { toString: page.toString.bind(page) }));
+	function pageMountHost(host) {
+		return host.querySelector("[data-ilha-slot=\"k:page\"]") ?? host;
+	}
+	function preparePageMountHost(outer, mountHost) {
+		if (mountHost.hasAttribute("data-ilha-state")) return;
+		const outerState = outer.getAttribute("data-ilha-state");
+		if (!outerState) return;
+		try {
+			const snapshot = JSON.parse(outerState);
+			delete snapshot._skipOnMount;
+			mountHost.setAttribute("data-ilha-state", JSON.stringify(snapshot));
+		} catch {}
+	}
+	Wrapped.mount = (host, props) => {
+		const mountHost = pageMountHost(host);
+		preparePageMountHost(host, mountHost);
+		return page.mount(mountHost, props);
+	};
+	Wrapped[ISLAND_MOUNT_INTERNAL] = (host, props) => {
+		const mountHost = pageMountHost(host);
+		preparePageMountHost(host, mountHost);
+		const pageInternal = page[ISLAND_MOUNT_INTERNAL];
+		if (typeof pageInternal === "function") return pageInternal(mountHost, props);
+		return {
+			unmount: page.mount(mountHost, props),
+			updateProps: () => {}
+		};
+	};
+	Wrapped.hydratable = async (props, opts) => {
+		if (!opts?.name) throw new Error("wrapLayout: hydratable requires options.name");
+		const resolvedProps = props ?? {};
+		const pageBlock = await page.hydratable(resolvedProps, opts);
+		const openTag = pageBlock.match(/^<([a-zA-Z][\w-]*)\s([^>]*)>/);
+		if (!openTag) return pageBlock;
+		const layoutInner = Wrapped.toString(resolvedProps);
+		return `<${openTag[1]} ${openTag[2]}>${layoutInner}</${openTag[1]}>`;
+	};
+	return Wrapped;
 }
 function wrapError(handler, page) {
 	const Wrapper = ilha.render(() => {
@@ -246,6 +284,10 @@ function wrapError(handler, page) {
 			};
 		}
 	};
+	Wrapper.hydratable = async (props, opts) => {
+		if (!opts?.name) throw new Error("wrapError: hydratable requires options.name");
+		return page.hydratable(props ?? {}, opts);
+	};
 	return Wrapper;
 }
 function defineLayout(layout) {

package/dist/vite.js

@@ -1,4 +1,4 @@
-import { C as wrapError, w as wrapLayout } from "./src-BFZ-RQw6.js";
+import { C as wrapError, w as wrapLayout } from "./src-DB9CdFFS.js";
 import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, join, relative, resolve } from "node:path";
 //#region src/vite.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/router",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "A tiny SPA router for Ilha",
   "license": "MIT",
   "author": "Ryuz <ryuzer@proton.me>",
@@ -30,7 +30,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "ilha": "0.6.0",
+    "ilha": "0.6.1",
     "rou3": "0.8.1"
   },
   "devDependencies": {