@ilha/router 0.1.1 → 0.2.1

package/dist/vite.js

@@ -4,14 +4,35 @@ import { basename, dirname, extname, join, relative, resolve } from "node:path";
 //#region src/vite.ts
 /** Files that should never be treated as pages even if they match the ts/tsx extension. */
 const EXCLUDED_RE = /\.(test|spec|d)\.(ts|tsx)$/;
+/**
+* Match a top-of-statement `export const load`, `export let load`,
+* `export function load`, or `export async function load`. Intentionally
+* conservative: `export { load } from "./x"` re-exports are NOT detected
+* in v1. Declare `load` directly in the file to be picked up.
+*/
+const LOADER_EXPORT_RE = /^\s*export\s+(?:const|let|var|async\s+function|function)\s+load\b/m;
+async function hasLoaderExport(file) {
+	try {
+		const stripped = (await readFile(file, "utf8")).replace(/^\s*\/\/.*$/gm, "");
+		return LOADER_EXPORT_RE.test(stripped);
+	} catch {
+		return false;
+	}
+}
 function fileToSegment(name) {
 	if (name.startsWith("[...") && name.endsWith("]")) return `**:${name.slice(4, -1)}`;
 	if (name.startsWith("[") && name.endsWith("]")) return `:${name.slice(1, -1)}`;
 	return name;
 }
+/** Route-group directories like "(auth)" are transparent to the URL. */
+function dirToSegment(name) {
+	if (name.startsWith("(") && name.endsWith(")")) return "";
+	return fileToSegment(name);
+}
 function fileToPattern(pagesDir, file) {
 	const rel = relative(pagesDir, file);
-	const segments = rel.slice(0, -extname(rel).length).split("/").map(fileToSegment);
+	const parts = rel.slice(0, -extname(rel).length).split("/");
+	const segments = [...parts.slice(0, -1).map(dirToSegment), fileToSegment(parts.at(-1))];
 	if (segments.at(-1) === "index") segments.pop();
 	return "/" + segments.filter(Boolean).join("/") || "/";
 }
@@ -57,16 +78,32 @@ async function collectFiles(dir, depth = 0) {
 async function scanPages(pagesDir) {
 	const all = await collectFiles(pagesDir);
 	const allSet = new Set(all);
-	return all.filter((f) => !basename(f).startsWith("+")).map((file) => {
+	const pages = all.filter((f) => !basename(f).startsWith("+"));
+	const layoutLoaderCache = /* @__PURE__ */ new Map();
+	const getLayoutHasLoader = (file) => {
+		let cached = layoutLoaderCache.get(file);
+		if (!cached) {
+			cached = hasLoaderExport(file);
+			layoutLoaderCache.set(file, cached);
+		}
+		return cached;
+	};
+	return Promise.all(pages.map(async (file) => {
 		const pattern = fileToPattern(pagesDir, file);
+		const layouts = chainForFile(pagesDir, file, allSet, "+layout.ts");
+		const errors = chainForFile(pagesDir, file, allSet, "+error.ts");
+		const [pageHasLoader, ...layoutFlags] = await Promise.all([hasLoaderExport(file), ...layouts.map(getLayoutHasLoader)]);
+		const loaderLayouts = layouts.filter((_, i) => layoutFlags[i]);
 		return {
 			file,
 			pattern,
 			name: patternToName(pattern),
-			layouts: chainForFile(pagesDir, file, allSet, "+layout.ts"),
-			errors: chainForFile(pagesDir, file, allSet, "+error.ts")
+			layouts,
+			errors,
+			hasLoader: pageHasLoader,
+			loaderLayouts
 		};
-	});
+	}));
 }
 function validateEntries(entries, pagesDir) {
 	if (entries.length === 0) {
@@ -91,15 +128,16 @@ async function generate(pagesDir, outFile) {
 		const r = relative(dirname(outFile), abs);
 		return r.startsWith(".") ? r : `./${r}`;
 	};
-	const imports = [`import { router, wrapLayout, wrapError } from "@ilha/router";`, `import type { Island }                    from "ilha";`];
+	const imports = [`import { router, wrapLayout, wrapError } from "@ilha/router";`, `import type { Island } from "ilha";`];
 	const wrappedIslandLines = [];
 	const registryLines = [];
 	const routeLines = [];
+	const clientImport = (abs) => `${rel(abs)}?client`;
 	for (const [i, entry] of entries.entries()) {
 		const pageId = `_page${i}`;
-		imports.push(`import { default as ${pageId} } from ${JSON.stringify(rel(entry.file))};`);
-		for (const [j, l] of entry.layouts.entries()) imports.push(`import { default as _layout${i}_${j} } from ${JSON.stringify(rel(l))};`);
-		for (const [j, e] of entry.errors.entries()) imports.push(`import { default as _error${i}_${j} } from ${JSON.stringify(rel(e))};`);
+		imports.push(`import { default as ${pageId} } from ${JSON.stringify(clientImport(entry.file))};`);
+		for (const [j, l] of entry.layouts.entries()) imports.push(`import { default as _layout${i}_${j} } from ${JSON.stringify(clientImport(l))};`);
+		for (const [j, e] of entry.errors.entries()) imports.push(`import { default as _error${i}_${j} } from ${JSON.stringify(clientImport(e))};`);
 		let expr = pageId;
 		for (let j = entry.errors.length - 1; j >= 0; j--) expr = `wrapError(_error${i}_${j}, ${expr})`;
 		for (let j = entry.layouts.length - 1; j >= 0; j--) expr = `wrapLayout(_layout${i}_${j}, ${expr})`;
@@ -124,7 +162,56 @@ async function generate(pagesDir, outFile) {
 		`  ;`
 	].join("\n");
 	await mkdir(dirname(outFile), { recursive: true });
-	if (await writeIfChanged(outFile, code)) await generateTypes(outFile);
+	const routesChanged = await writeIfChanged(outFile, code);
+	const loadersFile = join(dirname(outFile), "loaders.ts");
+	const loadersChanged = await writeIfChanged(loadersFile, buildLoadersFile(entries, loadersFile, outFile));
+	if (routesChanged || loadersChanged) await generateTypes(outFile);
+}
+function buildLoadersFile(entries, loadersFile, routesFile) {
+	const relFromLoaders = (abs) => {
+		const r = relative(dirname(loadersFile), abs);
+		return r.startsWith(".") ? r : `./${r}`;
+	};
+	const withLoaders = entries.filter((e) => e.hasLoader || e.loaderLayouts.length > 0);
+	if (withLoaders.length === 0) return [
+		`// @generated by @ilha/router — do not edit`,
+		`// This project has no loader exports; this file is intentionally empty.`,
+		``,
+		`export {};`,
+		``
+	].join("\n");
+	const routesRel = relFromLoaders(routesFile).replace(/\.ts$/, "");
+	const imports = [`import { pageRouter } from ${JSON.stringify(routesRel)};`];
+	let needsComposeLoaders = false;
+	const attachLines = [];
+	for (const [i, entry] of withLoaders.entries()) {
+		const loaderIds = [];
+		for (const [j, layout] of entry.loaderLayouts.entries()) {
+			const id = `_p${i}_l${j}`;
+			imports.push(`import { load as ${id} } from ${JSON.stringify(relFromLoaders(layout))};`);
+			loaderIds.push(id);
+		}
+		if (entry.hasLoader) {
+			const id = `_p${i}`;
+			imports.push(`import { load as ${id} } from ${JSON.stringify(relFromLoaders(entry.file))};`);
+			loaderIds.push(id);
+		}
+		const loadersExpr = loaderIds.length === 1 ? loaderIds[0] : `composeLoaders([${loaderIds.join(", ")}])`;
+		if (loaderIds.length > 1) needsComposeLoaders = true;
+		attachLines.push(`pageRouter.attachLoader(${JSON.stringify(entry.pattern)}, ${loadersExpr});`);
+	}
+	if (needsComposeLoaders) imports.unshift(`import { composeLoaders } from "@ilha/router";`);
+	return [
+		`// @generated by @ilha/router — do not edit`,
+		`// Server-only. Import this module from your SSR entry to wire loaders`,
+		`// onto pageRouter. Importing it from the client is a no-op but wastes`,
+		`// bundle size — rely on the default build pipeline to keep it out.`,
+		``,
+		...imports,
+		``,
+		...attachLines,
+		``
+	].join("\n");
 }
 async function writeIfChanged(file, content) {
 	try {
@@ -146,16 +233,25 @@ async function generateTypes(outFile) {
 		`  import type { Island } from "ilha";`,
 		`  export const registry: Record<string, Island<any, any>>;`,
 		`}`,
+		``,
+		`declare module "ilha:loaders" {`,
+		`  // Side-effect-only module. Importing it attaches loaders to pageRouter.`,
+		`}`,
 		``
 	].join("\n"));
 }
 const VIRTUAL_PAGES = "ilha:pages";
 const VIRTUAL_REGISTRY = "ilha:registry";
+const VIRTUAL_LOADERS = "ilha:loaders";
 const RESOLVED_PAGES = "\0ilha:pages";
 const RESOLVED_REGISTRY = "\0ilha:registry";
+const RESOLVED_LOADERS = "\0ilha:loaders";
+/** Query suffix used on page/layout imports in the client-safe routes file. */
+const CLIENT_QUERY = "?client";
 function pages(options = {}) {
 	let pagesDir;
 	let outFile;
+	let loadersFile;
 	async function regen() {
 		try {
 			await generate(pagesDir, outFile);
@@ -168,6 +264,7 @@ function pages(options = {}) {
 		configResolved(config) {
 			pagesDir = resolve(config.root, options.dir ?? "src/pages");
 			outFile = resolve(config.root, options.generated ?? ".ilha/routes.ts");
+			loadersFile = join(dirname(outFile), "loaders.ts");
 		},
 		async buildStart() {
 			await regen();
@@ -177,7 +274,11 @@ function pages(options = {}) {
 			const structuralInvalidate = async (file) => {
 				if (!file.startsWith(pagesDir)) return;
 				await regen();
-				for (const id of [RESOLVED_PAGES, RESOLVED_REGISTRY]) {
+				for (const id of [
+					RESOLVED_PAGES,
+					RESOLVED_REGISTRY,
+					RESOLVED_LOADERS
+				]) {
 					const mod = server.moduleGraph.getModuleById(id);
 					if (mod) server.moduleGraph.invalidateModule(mod);
 				}
@@ -188,16 +289,27 @@ function pages(options = {}) {
 			server.watcher.on("unlink", structuralInvalidate);
 			server.watcher.on("change", async (file) => {
 				if (!file.startsWith(pagesDir)) return;
-				if (basename(file).startsWith("+")) await structuralInvalidate(file);
+				const base = basename(file);
+				if (base.startsWith("+") || /\.(ts|tsx)$/.test(base)) await structuralInvalidate(file);
 			});
 		},
-		resolveId(id) {
+		resolveId(id, importer) {
 			if (id === VIRTUAL_PAGES) return RESOLVED_PAGES;
 			if (id === VIRTUAL_REGISTRY) return RESOLVED_REGISTRY;
+			if (id === VIRTUAL_LOADERS) return RESOLVED_LOADERS;
+			if (id.endsWith(CLIENT_QUERY)) {
+				const bare = id.slice(0, -7);
+				return (importer ? resolve(dirname(importer.replace(/\?.*$/, "")), bare) : resolve(bare)) + CLIENT_QUERY;
+			}
 		},
 		load(id) {
 			if (id === RESOLVED_PAGES) return `export { pageRouter } from ${JSON.stringify(outFile)};`;
 			if (id === RESOLVED_REGISTRY) return `export { registry } from ${JSON.stringify(outFile)};`;
+			if (id === RESOLVED_LOADERS) return `import ${JSON.stringify(loadersFile)};`;
+			if (id.endsWith(CLIENT_QUERY)) {
+				const bare = id.slice(0, -7);
+				return `export { default } from ${JSON.stringify(bare)};`;
+			}
 		}
 	};
 }

package/package.json

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