@ilha/router 0.4.1 → 0.4.3

package/README.md

@@ -666,6 +666,11 @@ interface HydrateOptions {
 }
 
 type HistoryMode = "history" | "hash";
+type RouterMode = "spa" | "mpa";
+
+interface RouterOptions {
+  mode?: RouterMode; // default: "spa"
+}
 
 // Helper — returns fn as-is with LayoutHandler type enforced
 function defineLayout(fn: LayoutHandler): LayoutHandler;
@@ -927,6 +932,18 @@ pageRouter.hydrate(registry);
 pages({
   dir: "src/pages", // pages directory (default: "src/pages")
   generated: ".ilha/routes.ts", // generated file output (default: ".ilha/routes.ts")
+  mode: "spa", // "spa" | "mpa" (default: "spa")
+});
+```
+
+Use `mode: "mpa"` when you want filesystem-routed pages to behave like a multi-page app: the current page can still be SSR-rendered and hydrated, but in-app links are not intercepted by the router, so navigation is handled by the browser as a full document request.
+
+```ts
+// vite.config.ts
+import { pages } from "@ilha/router/vite";
+
+export default defineConfig({
+  plugins: [pages({ mode: "mpa" })],
 });
 ```
 

package/dist/{index-CFBKeDvv.d.ts → index-CJT0h4u4.d.ts}

@@ -24,6 +24,8 @@ interface RouteRecord {
   island: Island<any, any>;
   /** Merged loader chain (layouts outer→inner, then page) — `undefined` if no loaders. */
   loader?: Loader<any>;
+  /** True when the route has a server-side loader, even if the client only has a marker. */
+  hasLoader?: boolean;
 }
 interface RouteSnapshot {
   path: string;
@@ -90,6 +92,16 @@ declare function defineLayout(layout: LayoutHandler): LayoutHandler;
 interface NavigateOptions {
   replace?: boolean;
 }
+type RouterMode = "spa" | "mpa";
+interface RouterOptions {
+  /**
+   * Client navigation mode. `spa` intercepts in-app links and renders routes
+   * in-place. `mpa` leaves links to the browser, so each page navigation is a
+   * full document request while still allowing hydration of the current route.
+   * Default: `spa`.
+   */
+  mode?: RouterMode;
+}
 interface HydratableRenderOptions extends Partial<Omit<HydratableOptions, "name">> {}
 interface HydrateOptions {
   root?: Element;
@@ -128,6 +140,12 @@ interface RouterBuilder {
    * was never registered via `.route()`.
    */
   attachLoader(pattern: string, loader: Loader<any>): RouterBuilder;
+  /**
+   * Mark an already-registered route as having a server-side loader without
+   * importing that loader into the client bundle. Used by FS-routing codegen
+   * so SPA navigation knows to call the loader endpoint.
+   */
+  markLoader(pattern: string): RouterBuilder;
   /**
    * Return a snapshot of every registered route in match order. Useful for
    * prerenderers that need to discover the filesystem routes exposed by
@@ -234,7 +252,7 @@ declare function enableLinkInterception(root?: Element | Document, options?: Lin
 declare const RouterView: Island<Record<string, unknown>, Record<never, never>>;
 declare const RouterLink: Island<Record<string, unknown>, Omit<Omit<Record<never, never>, K> & Record<"href", string>, "label"> & Record<"label", string>>;
 declare function isActive(pattern: string): boolean;
-declare function router(): RouterBuilder;
+declare function router(options?: RouterOptions): RouterBuilder;
 declare const _default: {
   router: typeof router;
   navigate: typeof navigate;
@@ -251,4 +269,4 @@ declare const _default: {
   composeLoaders: typeof composeLoaders;
 };
 //#endregion
-export { prefetch as A, wrapLayout as B, composeLoaders as C, isActive as D, error as E, routePath as F, getHistoryMode as H, routeSearch as I, router as L, redirect as M, routeHash as N, loader as O, routeParams as P, useRoute as R, _default as S, enableLinkInterception as T, setHistoryMode as U, HistoryMode as V, RouteRecord as _, InferLoader as a, RouterLink as b, LinkInterceptionOptions as c, LoaderError as d, MergeLoaders as f, RenderResponse as g, Redirect as h, HydrateOptions as i, prime as j, navigate as k, Loader as l, NavigateOptions as m, ErrorHandler as n, LOADER_ENDPOINT as o, MountOptions as p, HydratableRenderOptions as r, LayoutHandler as s, AppError as t, LoaderContext as u, RouteSnapshot as v, defineLayout as w, RouterView as x, RouterBuilder as y, wrapError as z };
+export { loader as A, useRoute as B, RouterView as C, enableLinkInterception as D, defineLayout as E, routeHash as F, setHistoryMode as G, wrapLayout as H, routeParams as I, routePath as L, prefetch as M, prime as N, error as O, redirect as P, routeSearch as R, RouterOptions as S, composeLoaders as T, HistoryMode as U, wrapError as V, getHistoryMode as W, RouteRecord as _, InferLoader as a, RouterLink as b, LinkInterceptionOptions as c, LoaderError as d, MergeLoaders as f, RenderResponse as g, Redirect as h, HydrateOptions as i, navigate as j, isActive as k, Loader as l, NavigateOptions as m, ErrorHandler as n, LOADER_ENDPOINT as o, MountOptions as p, HydratableRenderOptions as r, LayoutHandler as s, AppError as t, LoaderContext as u, RouteSnapshot as v, _default as w, RouterMode as x, RouterBuilder as y, router as z };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as prefetch, B as wrapLayout, C as composeLoaders, D as isActive, E as error, F as routePath, H as getHistoryMode, I as routeSearch, L as router, M as redirect, N as routeHash, O as loader, P as routeParams, R as useRoute, S as _default, T as enableLinkInterception, U as setHistoryMode, V as HistoryMode, _ as RouteRecord, a as InferLoader, b as RouterLink, c as LinkInterceptionOptions, d as LoaderError, f as MergeLoaders, g as RenderResponse, h as Redirect, i as HydrateOptions, j as prime, k as navigate, l as Loader, m as NavigateOptions, n as ErrorHandler, o as LOADER_ENDPOINT, p as MountOptions, r as HydratableRenderOptions, s as LayoutHandler, t as AppError, u as LoaderContext, v as RouteSnapshot, w as defineLayout, x as RouterView, y as RouterBuilder, z as wrapError } from "./index-CFBKeDvv.js";
-export { AppError, ErrorHandler, HistoryMode, HydratableRenderOptions, HydrateOptions, InferLoader, LOADER_ENDPOINT, LayoutHandler, LinkInterceptionOptions, Loader, LoaderContext, LoaderError, MergeLoaders, MountOptions, NavigateOptions, Redirect, RenderResponse, RouteRecord, RouteSnapshot, RouterBuilder, RouterLink, RouterView, composeLoaders, _default as default, defineLayout, enableLinkInterception, error, getHistoryMode, isActive, loader, navigate, prefetch, prime, redirect, routeHash, routeParams, routePath, routeSearch, router, setHistoryMode, useRoute, wrapError, wrapLayout };
+import { A as loader, B as useRoute, C as RouterView, D as enableLinkInterception, E as defineLayout, F as routeHash, G as setHistoryMode, H as wrapLayout, I as routeParams, L as routePath, M as prefetch, N as prime, O as error, P as redirect, R as routeSearch, S as RouterOptions, T as composeLoaders, U as HistoryMode, V as wrapError, W as getHistoryMode, _ as RouteRecord, a as InferLoader, b as RouterLink, c as LinkInterceptionOptions, d as LoaderError, f as MergeLoaders, g as RenderResponse, h as Redirect, i as HydrateOptions, j as navigate, k as isActive, l as Loader, m as NavigateOptions, n as ErrorHandler, o as LOADER_ENDPOINT, p as MountOptions, r as HydratableRenderOptions, s as LayoutHandler, t as AppError, u as LoaderContext, v as RouteSnapshot, w as _default, x as RouterMode, y as RouterBuilder, z as router } from "./index-CJT0h4u4.js";
+export { AppError, ErrorHandler, HistoryMode, HydratableRenderOptions, HydrateOptions, InferLoader, LOADER_ENDPOINT, LayoutHandler, LinkInterceptionOptions, Loader, LoaderContext, LoaderError, MergeLoaders, MountOptions, NavigateOptions, Redirect, RenderResponse, RouteRecord, RouteSnapshot, RouterBuilder, RouterLink, RouterMode, RouterOptions, RouterView, composeLoaders, _default as default, defineLayout, enableLinkInterception, error, getHistoryMode, isActive, loader, navigate, prefetch, prime, redirect, routeHash, routeParams, routePath, routeSearch, router, setHistoryMode, useRoute, wrapError, wrapLayout };

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-0cb8FYdn.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-BqAWh426.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/{plugin-DAk44om0.js → plugin-BMk5Ey9X.js}

@@ -138,7 +138,8 @@ function validateEntries(entries, pagesDir) {
 		else seenNames.set(entry.name, entry.file);
 	}
 }
-async function generate(pagesDir, outFile) {
+async function generate(pagesDir, outFile, options = {}) {
+	const mode = options.mode ?? "spa";
 	const entries = sortEntries(await scanPages(pagesDir));
 	validateEntries(entries, pagesDir);
 	const rel = (abs) => {
@@ -161,7 +162,7 @@ async function generate(pagesDir, outFile) {
 		const wrappedId = `_wrapped${i}`;
 		wrappedIslandLines.push(`const ${wrappedId} = ${expr};`);
 		registryLines.push(`  ${JSON.stringify(entry.name)}: ${wrappedId}` + (i < entries.length - 1 ? "," : ""));
-		routeLines.push(`  .route(${JSON.stringify(entry.pattern)}, ${wrappedId})`);
+		routeLines.push(`  .route(${JSON.stringify(entry.pattern)}, ${wrappedId})` + (entry.hasLoader || entry.loaderLayouts.length > 0 ? `.markLoader(${JSON.stringify(entry.pattern)})` : ""));
 	}
 	const code = [
 		`// @generated by @ilha/router — do not edit`,
@@ -174,7 +175,7 @@ async function generate(pagesDir, outFile) {
 		...registryLines,
 		`};`,
 		``,
-		`export const pageRouter = router()`,
+		`export const pageRouter = router(${mode === "mpa" ? `{ mode: "mpa" }` : ""})`,
 		...routeLines,
 		`  ;`
 	].join("\n");
@@ -285,7 +286,7 @@ function createPagesPluginState(options) {
 	};
 	const regen = async () => {
 		try {
-			await generate(pagesDir, outFile);
+			await generate(pagesDir, outFile, { mode: options.mode });
 		} catch (e) {
 			console.error("[ilha:pages] codegen failed:", e);
 		}

package/dist/{plugin-CnS_mBUE.d.ts → plugin-Diq1AxSa.d.ts}

@@ -1,11 +1,20 @@
 import * as _$unplugin from "unplugin";
 
+//#region src/codegen.d.ts
+type PagesMode = "spa" | "mpa";
+//#endregion
 //#region src/plugin.d.ts
 interface IlhaPagesOptions {
   /** Directory containing page files. Default: `src/pages` */
   dir?: string;
   /** Output path for the generated routes + registry file. Default: `.ilha/routes.ts` */
   generated?: string;
+  /**
+   * File-system router navigation mode. `spa` intercepts in-app links and
+   * renders routes client-side; `mpa` leaves links to the browser for full
+   * document navigations. Default: `spa`.
+   */
+  mode?: PagesMode;
 }
 declare const ilhaPages: _$unplugin.UnpluginInstance<IlhaPagesOptions | undefined, boolean>;
 //#endregion

package/dist/rolldown.d.ts

@@ -1,5 +1,5 @@
-import { B as wrapLayout, n as ErrorHandler, s as LayoutHandler, t as AppError, v as RouteSnapshot, z as wrapError } from "./index-CFBKeDvv.js";
-import { n as ilhaPages, t as IlhaPagesOptions } from "./plugin-CnS_mBUE.js";
+import { H as wrapLayout, V as wrapError, n as ErrorHandler, s as LayoutHandler, t as AppError, v as RouteSnapshot } from "./index-CJT0h4u4.js";
+import { n as ilhaPages, t as IlhaPagesOptions } from "./plugin-Diq1AxSa.js";
 import * as _$unplugin from "unplugin";
 
 //#region src/rolldown.d.ts

package/dist/rolldown.js

@@ -1,5 +1,5 @@
-import { C as wrapError, w as wrapLayout } from "./src-0cb8FYdn.js";
-import { t as ilhaPages } from "./plugin-DAk44om0.js";
+import { C as wrapError, w as wrapLayout } from "./src-BqAWh426.js";
+import { t as ilhaPages } from "./plugin-BMk5Ey9X.js";
 //#region src/rolldown.ts
 /** Rolldown plugin — use via `@ilha/router/rolldown`. */
 function pages(options = {}) {

package/dist/rspack.d.ts

@@ -1,5 +1,5 @@
-import { B as wrapLayout, n as ErrorHandler, s as LayoutHandler, t as AppError, v as RouteSnapshot, z as wrapError } from "./index-CFBKeDvv.js";
-import { n as ilhaPages, t as IlhaPagesOptions } from "./plugin-CnS_mBUE.js";
+import { H as wrapLayout, V as wrapError, n as ErrorHandler, s as LayoutHandler, t as AppError, v as RouteSnapshot } from "./index-CJT0h4u4.js";
+import { n as ilhaPages, t as IlhaPagesOptions } from "./plugin-Diq1AxSa.js";
 import * as _$unplugin from "unplugin";
 
 //#region src/rspack.d.ts

package/dist/rspack.js

@@ -1,5 +1,5 @@
-import { C as wrapError, w as wrapLayout } from "./src-0cb8FYdn.js";
-import { t as ilhaPages } from "./plugin-DAk44om0.js";
+import { C as wrapError, w as wrapLayout } from "./src-BqAWh426.js";
+import { t as ilhaPages } from "./plugin-BMk5Ey9X.js";
 //#region src/rspack.ts
 /** Rspack plugin — use via `@ilha/router/rspack`. */
 function pages(options = {}) {

package/dist/{src-0cb8FYdn.js → src-BqAWh426.js}

@@ -349,7 +349,7 @@ function prefetch(pathWithSearch) {
 	if (!isBrowser) return;
 	if (prefetchCache.has(pathWithSearch)) return;
 	const pathOnly = pathWithSearch.split("?")[0] ?? "";
-	if (!findRoute(_rou3, "GET", pathOnly)?.data?.loader) return;
+	if (!findRoute(_rou3, "GET", pathOnly)?.data?.hasLoader) return;
 	const promise = fetchLoaderData(pathWithSearch).catch((e) => {
 		return {
 			kind: "error",
@@ -369,7 +369,7 @@ async function mountRouteWithHydration(island, host, pathWithSearch, signal, reg
 		host.innerHTML = `<div data-router-empty></div>`;
 		return () => {};
 	}
-	const hasLoader = !!findRoute(_rou3, "GET", pathWithSearch.split("?")[0] ?? "")?.data?.loader;
+	const hasLoader = !!findRoute(_rou3, "GET", pathWithSearch.split("?")[0] ?? "")?.data?.hasLoader;
 	let props = {};
 	const loaderResult = hasLoader ? await fetchLoaderData(pathWithSearch, signal) : {
 		kind: "data",
@@ -577,7 +577,8 @@ async function executeLoader(loader, url, params, request, signal) {
 		};
 	}
 }
-function router() {
+function router(options = {}) {
+	const mode = options.mode ?? "spa";
 	_records = [];
 	_rou3 = createRouter();
 	_islandToPattern = /* @__PURE__ */ new Map();
@@ -586,14 +587,17 @@ function router() {
 	let _linkCleanup = null;
 	const builder = {
 		route(pattern, island, loader) {
+			const hasLoader = !!loader;
 			const data = {
 				island,
-				loader
+				loader,
+				hasLoader
 			};
 			_records.push({
 				pattern,
 				island,
-				loader
+				loader,
+				hasLoader
 			});
 			addRoute(_rou3, "GET", pattern, data);
 			_patternToData.set(pattern, data);
@@ -607,8 +611,23 @@ function router() {
 				return builder;
 			}
 			data.loader = loader;
+			data.hasLoader = true;
 			const rec = _records.find((r) => r.pattern === pattern);
-			if (rec) rec.loader = loader;
+			if (rec) {
+				rec.loader = loader;
+				rec.hasLoader = true;
+			}
+			return builder;
+		},
+		markLoader(pattern) {
+			const data = _patternToData.get(pattern);
+			if (!data) {
+				console.warn(`[ilha-router] markLoader("${pattern}"): pattern was never registered via .route(). The loader marker will be ignored.`);
+				return builder;
+			}
+			data.hasLoader = true;
+			const rec = _records.find((r) => r.pattern === pattern);
+			if (rec) rec.hasLoader = true;
 			return builder;
 		},
 		routes() {
@@ -628,7 +647,7 @@ function router() {
 			syncRouteFromLocation();
 			const popHandler = () => syncRouteFromLocation();
 			_navChangeCleanup = getAdapter().onChange(popHandler);
-			_linkCleanup = enableLinkInterception(document);
+			_linkCleanup = mode === "spa" ? enableLinkInterception(document) : null;
 			let unmountView = null;
 			let navAbort = null;
 			if (hydrate) {
@@ -692,7 +711,7 @@ function router() {
 				const viewHost = host?.querySelector("[data-router-view]");
 				if (!viewHost) return;
 				const loc = getAdapter().readLocation();
-				const result = !!findRoute(_rou3, "GET", loc.pathname)?.data?.loader ? await fetchLoaderData(loc.pathname + loc.search, signal) : {
+				const result = !!findRoute(_rou3, "GET", loc.pathname)?.data?.hasLoader ? await fetchLoaderData(loc.pathname + loc.search, signal) : {
 					kind: "data",
 					data: {}
 				};

package/dist/vite.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { B as wrapLayout, n as ErrorHandler, s as LayoutHandler, t as AppError, v as RouteSnapshot, z as wrapError } from "./index-CFBKeDvv.js";
-import { n as ilhaPages, t as IlhaPagesOptions } from "./plugin-CnS_mBUE.js";
+import { H as wrapLayout, V as wrapError, n as ErrorHandler, s as LayoutHandler, t as AppError, v as RouteSnapshot } from "./index-CJT0h4u4.js";
+import { n as ilhaPages, t as IlhaPagesOptions } from "./plugin-Diq1AxSa.js";
 import * as fs from "node:fs";
 import * as http from "node:http";
 import { Agent, ClientRequest, ClientRequestArgs, OutgoingHttpHeaders } from "node:http";

package/dist/vite.js

@@ -1,5 +1,5 @@
-import { C as wrapError, w as wrapLayout } from "./src-0cb8FYdn.js";
-import { t as ilhaPages } from "./plugin-DAk44om0.js";
+import { C as wrapError, w as wrapLayout } from "./src-BqAWh426.js";
+import { t as ilhaPages } from "./plugin-BMk5Ey9X.js";
 //#region src/vite.ts
 /** Vite plugin — use via `@ilha/router/vite`. */
 function pages(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/router",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "A tiny SPA router for Ilha",
   "license": "MIT",
   "author": "Ryuz <ryuzer@proton.me>",