bosia 0.2.2 → 0.3.0

package/src/core/routeFile.ts

@@ -8,106 +8,115 @@ import type { RouteManifest } from "./types.ts";
 //   apiRoutes     — used by API handler
 
 function routePriority(pattern: string): number {
-    if (!pattern.includes("[")) return 0;       // exact
-    if (!pattern.includes("[...")) return 1;    // dynamic
-    return 2;                                   // catch-all
+	if (!pattern.includes("[")) return 0; // exact
+	if (!pattern.includes("[...")) return 1; // dynamic
+	return 2; // catch-all
 }
 
 function sortRoutes<T extends { pattern: string }>(routes: T[]): T[] {
-    return [...routes].sort((a, b) => {
-        const pa = routePriority(a.pattern);
-        const pb = routePriority(b.pattern);
-        if (pa !== pb) return pa - pb;
-        // same tier: more segments first, then alphabetical
-        const sa = a.pattern.split("/").length;
-        const sb = b.pattern.split("/").length;
-        if (sa !== sb) return sb - sa;
-        return a.pattern.localeCompare(b.pattern);
-    });
+	return [...routes].sort((a, b) => {
+		const pa = routePriority(a.pattern);
+		const pb = routePriority(b.pattern);
+		if (pa !== pb) return pa - pb;
+		// same tier: more segments first, then alphabetical
+		const sa = a.pattern.split("/").length;
+		const sb = b.pattern.split("/").length;
+		if (sa !== sb) return sb - sa;
+		return a.pattern.localeCompare(b.pattern);
+	});
 }
 
 export function generateRoutesFile(manifest: RouteManifest): void {
-    const lines: string[] = [
-        "// AUTO-GENERATED by bosia build — do not edit\n",
-    ];
-
-    const pages = sortRoutes(manifest.pages);
-    const apis = sortRoutes(manifest.apis);
-
-    // clientRoutes
-    lines.push("export const clientRoutes: Array<{");
-    lines.push("  pattern: string;");
-    lines.push("  page: () => Promise<any>;");
-    lines.push("  layouts: (() => Promise<any>)[];");
-    lines.push("  hasServerData: boolean;");
-    lines.push("}> = [");
-    for (const r of pages) {
-        const layoutImports = r.layouts
-            .map(l => `() => import(${JSON.stringify(toImportPath(l))})`)
-            .join(", ");
-        const hasServerData = !!(r.pageServer || r.layoutServers.length > 0);
-        lines.push("  {");
-        lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
-        lines.push(`    page: () => import(${JSON.stringify(toImportPath(r.page))}),`);
-        lines.push(`    layouts: [${layoutImports}],`);
-        lines.push(`    hasServerData: ${hasServerData},`);
-        lines.push("  },");
-    }
-    lines.push("];\n");
-
-    // serverRoutes
-    lines.push("export const serverRoutes: Array<{");
-    lines.push("  pattern: string;");
-    lines.push("  pageModule: () => Promise<any>;");
-    lines.push("  layoutModules: (() => Promise<any>)[];");
-    lines.push("  pageServer: (() => Promise<any>) | null;");
-    lines.push("  layoutServers: { loader: () => Promise<any>; depth: number }[];");
-    lines.push("}> = [");
-    for (const r of pages) {
-        const layoutImports = r.layouts
-            .map(l => `() => import(${JSON.stringify(toImportPath(l))})`)
-            .join(", ");
-        const layoutServerImports = r.layoutServers
-            .map(ls => `{ loader: () => import(${JSON.stringify(toImportPath(ls.path))}), depth: ${ls.depth} }`)
-            .join(", ");
-        lines.push("  {");
-        lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
-        lines.push(`    pageModule: () => import(${JSON.stringify(toImportPath(r.page))}),`);
-        lines.push(`    layoutModules: [${layoutImports}],`);
-        lines.push(`    pageServer: ${r.pageServer ? `() => import(${JSON.stringify(toImportPath(r.pageServer))})` : "null"},`);
-        lines.push(`    layoutServers: [${layoutServerImports}],`);
-        lines.push("  },");
-    }
-    lines.push("];\n");
-
-    // apiRoutes
-    lines.push("export const apiRoutes: Array<{");
-    lines.push("  pattern: string;");
-    lines.push("  module: () => Promise<any>;");
-    lines.push("}> = [");
-    for (const r of apis) {
-        lines.push("  {");
-        lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
-        lines.push(`    module: () => import(${JSON.stringify(toImportPath(r.server))}),`);
-        lines.push("  },");
-    }
-    lines.push("];\n");
-
-    // errorPage
-    const ep = manifest.errorPage;
-    lines.push(`export const errorPage: (() => Promise<any>) | null = ${
-        ep ? `() => import(${JSON.stringify(toImportPath(ep))})` : "null"
-    };\n`);
-
-    mkdirSync(".bosia", { recursive: true });
-    writeFileSync(".bosia/routes.ts", lines.join("\n"));
-
-    // Generate client-only routes file (no server imports that could pull in Node builtins)
-    generateClientRoutesFile(pages, manifest.errorPage);
-
-    const pagePatterns = pages.map(p => p.pattern).join(", ") || "(none)";
-    console.log(`✅ Routes generated: .bosia/routes.ts`);
-    console.log(`   Found ${pages.length} page route(s): ${pagePatterns}`);
+	const lines: string[] = ["// AUTO-GENERATED by bosia build — do not edit\n"];
+
+	const pages = sortRoutes(manifest.pages);
+	const apis = sortRoutes(manifest.apis);
+
+	// clientRoutes
+	lines.push("export const clientRoutes: Array<{");
+	lines.push("  pattern: string;");
+	lines.push("  page: () => Promise<any>;");
+	lines.push("  layouts: (() => Promise<any>)[];");
+	lines.push("  hasServerData: boolean;");
+	lines.push('  trailingSlash: "never" | "always" | "ignore";');
+	lines.push("}> = [");
+	for (const r of pages) {
+		const layoutImports = r.layouts
+			.map((l) => `() => import(${JSON.stringify(toImportPath(l))})`)
+			.join(", ");
+		const hasServerData = !!(r.pageServer || r.layoutServers.length > 0);
+		lines.push("  {");
+		lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
+		lines.push(`    page: () => import(${JSON.stringify(toImportPath(r.page))}),`);
+		lines.push(`    layouts: [${layoutImports}],`);
+		lines.push(`    hasServerData: ${hasServerData},`);
+		lines.push(`    trailingSlash: ${JSON.stringify(r.trailingSlash)},`);
+		lines.push("  },");
+	}
+	lines.push("];\n");
+
+	// serverRoutes
+	lines.push("export const serverRoutes: Array<{");
+	lines.push("  pattern: string;");
+	lines.push("  pageModule: () => Promise<any>;");
+	lines.push("  layoutModules: (() => Promise<any>)[];");
+	lines.push("  pageServer: (() => Promise<any>) | null;");
+	lines.push("  layoutServers: { loader: () => Promise<any>; depth: number }[];");
+	lines.push('  trailingSlash: "never" | "always" | "ignore";');
+	lines.push("}> = [");
+	for (const r of pages) {
+		const layoutImports = r.layouts
+			.map((l) => `() => import(${JSON.stringify(toImportPath(l))})`)
+			.join(", ");
+		const layoutServerImports = r.layoutServers
+			.map(
+				(ls) =>
+					`{ loader: () => import(${JSON.stringify(toImportPath(ls.path))}), depth: ${ls.depth} }`,
+			)
+			.join(", ");
+		lines.push("  {");
+		lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
+		lines.push(`    pageModule: () => import(${JSON.stringify(toImportPath(r.page))}),`);
+		lines.push(`    layoutModules: [${layoutImports}],`);
+		lines.push(
+			`    pageServer: ${r.pageServer ? `() => import(${JSON.stringify(toImportPath(r.pageServer))})` : "null"},`,
+		);
+		lines.push(`    layoutServers: [${layoutServerImports}],`);
+		lines.push(`    trailingSlash: ${JSON.stringify(r.trailingSlash)},`);
+		lines.push("  },");
+	}
+	lines.push("];\n");
+
+	// apiRoutes
+	lines.push("export const apiRoutes: Array<{");
+	lines.push("  pattern: string;");
+	lines.push("  module: () => Promise<any>;");
+	lines.push("}> = [");
+	for (const r of apis) {
+		lines.push("  {");
+		lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
+		lines.push(`    module: () => import(${JSON.stringify(toImportPath(r.server))}),`);
+		lines.push("  },");
+	}
+	lines.push("];\n");
+
+	// errorPage
+	const ep = manifest.errorPage;
+	lines.push(
+		`export const errorPage: (() => Promise<any>) | null = ${
+			ep ? `() => import(${JSON.stringify(toImportPath(ep))})` : "null"
+		};\n`,
+	);
+
+	mkdirSync(".bosia", { recursive: true });
+	writeFileSync(".bosia/routes.ts", lines.join("\n"));
+
+	// Generate client-only routes file (no server imports that could pull in Node builtins)
+	generateClientRoutesFile(pages, manifest.errorPage);
+
+	const pagePatterns = pages.map((p) => p.pattern).join(", ") || "(none)";
+	console.log(`✅ Routes generated: .bosia/routes.ts`);
+	console.log(`   Found ${pages.length} page route(s): ${pagePatterns}`);
 }
 
 // ─── Client-only routes file ─────────────────────────────
@@ -116,42 +125,46 @@ export function generateRoutesFile(manifest: RouteManifest): void {
 // (e.g. +page.server.ts → drizzle-orm → postgres → Node builtins).
 
 function generateClientRoutesFile(
-    pages: RouteManifest["pages"],
-    errorPage: RouteManifest["errorPage"],
+	pages: RouteManifest["pages"],
+	errorPage: RouteManifest["errorPage"],
 ): void {
-    const lines: string[] = [
-        "// AUTO-GENERATED by bosia build — client-only routes (no server imports)\n",
-    ];
-
-    lines.push("export const clientRoutes: Array<{");
-    lines.push("  pattern: string;");
-    lines.push("  page: () => Promise<any>;");
-    lines.push("  layouts: (() => Promise<any>)[];");
-    lines.push("  hasServerData: boolean;");
-    lines.push("}> = [");
-    for (const r of pages) {
-        const layoutImports = r.layouts
-            .map(l => `() => import(${JSON.stringify(toImportPath(l))})`)
-            .join(", ");
-        const hasServerData = !!(r.pageServer || r.layoutServers.length > 0);
-        lines.push("  {");
-        lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
-        lines.push(`    page: () => import(${JSON.stringify(toImportPath(r.page))}),`);
-        lines.push(`    layouts: [${layoutImports}],`);
-        lines.push(`    hasServerData: ${hasServerData},`);
-        lines.push("  },");
-    }
-    lines.push("];\n");
-
-    const ep = errorPage;
-    lines.push(`export const errorPage: (() => Promise<any>) | null = ${
-        ep ? `() => import(${JSON.stringify(toImportPath(ep))})` : "null"
-    };\n`);
-
-    writeFileSync(".bosia/routes.client.ts", lines.join("\n"));
+	const lines: string[] = [
+		"// AUTO-GENERATED by bosia build — client-only routes (no server imports)\n",
+	];
+
+	lines.push("export const clientRoutes: Array<{");
+	lines.push("  pattern: string;");
+	lines.push("  page: () => Promise<any>;");
+	lines.push("  layouts: (() => Promise<any>)[];");
+	lines.push("  hasServerData: boolean;");
+	lines.push('  trailingSlash: "never" | "always" | "ignore";');
+	lines.push("}> = [");
+	for (const r of pages) {
+		const layoutImports = r.layouts
+			.map((l) => `() => import(${JSON.stringify(toImportPath(l))})`)
+			.join(", ");
+		const hasServerData = !!(r.pageServer || r.layoutServers.length > 0);
+		lines.push("  {");
+		lines.push(`    pattern: ${JSON.stringify(r.pattern)},`);
+		lines.push(`    page: () => import(${JSON.stringify(toImportPath(r.page))}),`);
+		lines.push(`    layouts: [${layoutImports}],`);
+		lines.push(`    hasServerData: ${hasServerData},`);
+		lines.push(`    trailingSlash: ${JSON.stringify(r.trailingSlash)},`);
+		lines.push("  },");
+	}
+	lines.push("];\n");
+
+	const ep = errorPage;
+	lines.push(
+		`export const errorPage: (() => Promise<any>) | null = ${
+			ep ? `() => import(${JSON.stringify(toImportPath(ep))})` : "null"
+		};\n`,
+	);
+
+	writeFileSync(".bosia/routes.client.ts", lines.join("\n"));
 }
 
 // Import path from .bosia/routes.ts to src/routes/<routePath>
 function toImportPath(routePath: string): string {
-    return "../src/routes/" + routePath.replace(/\\/g, "/");
+	return "../src/routes/" + routePath.replace(/\\/g, "/");
 }

package/src/core/routeTypes.ts

@@ -9,71 +9,127 @@ import type { RouteManifest } from "./types.ts";
 // work in +page.svelte files — identical to SvelteKit's API.
 
 function routeDirOf(filePath: string): string {
-    const parts = filePath.replace(/\\/g, "/").split("/");
-    parts.pop();
-    return parts.join("/") || ".";
+	const parts = filePath.replace(/\\/g, "/").split("/");
+	parts.pop();
+	return parts.join("/") || ".";
+}
+
+function paramsForDir(dir: string): string[] {
+	if (dir === ".") return [];
+	const segs = dir
+		.split("/")
+		.filter(Boolean)
+		.filter((s) => !/^\(.*\)$/.test(s));
+	const out: string[] = [];
+	for (const seg of segs) {
+		const catchAll = seg.match(/^\[\.\.\.(\w+)\]$/);
+		if (catchAll) {
+			out.push(catchAll[1]!);
+			continue;
+		}
+		const dyn = seg.match(/^\[(\w+)\]$/);
+		if (dyn) out.push(dyn[1]!);
+	}
+	return out;
 }
 
 export function generateRouteTypes(manifest: RouteManifest): void {
-    // Collect { dir → { pageServer?, layoutServer? } }
-    const dirs = new Map<string, { pageServer?: string; layoutServer?: string }>();
-
-    for (const route of manifest.pages) {
-        const pageDir = routeDirOf(route.page);
-        if (!dirs.has(pageDir)) dirs.set(pageDir, {});
-        if (route.pageServer) {
-            dirs.get(pageDir)!.pageServer = route.pageServer;
-        }
-        for (const ls of route.layoutServers) {
-            const lsDir = routeDirOf(ls.path);
-            if (!dirs.has(lsDir)) dirs.set(lsDir, {});
-            dirs.get(lsDir)!.layoutServer = ls.path;
-        }
-    }
-
-    for (const [dir, info] of dirs) {
-        // Path segments of the route dir (empty array for root ".")
-        const segments = dir === "." ? [] : dir.split("/").filter(Boolean);
-
-        // Depth of the generated file from project root:
-        // .bosia/ + types/ + src/ + routes/ + ...segments
-        const depth = 4 + segments.length;
-        const up = "../".repeat(depth);
-        const srcBase = `${up}src/routes/${segments.length ? segments.join("/") + "/" : ""}`;
-
-        const lines: string[] = ["// AUTO-GENERATED by bosia — do not edit\n"];
-
-        if (info.pageServer) {
-            lines.push(`import type { load as _pageLoad } from '${srcBase}+page.server.ts';`);
-            lines.push(`export type PageData = Awaited<ReturnType<typeof _pageLoad>> & { params: Record<string, string> };`);
-        } else {
-            lines.push(`export type PageData = { params: Record<string, string> };`);
-        }
-        lines.push(`export type PageProps = { data: PageData };`);
-
-        // ActionData — union of all action return types, unwrapping ActionFailure
-        if (info.pageServer) {
-            lines.push(``);
-            lines.push(`import type { actions as _actions } from '${srcBase}+page.server.ts';`);
-            lines.push(`type _ActionReturn<T> = T extends (...args: any[]) => infer R ? Awaited<R> : never;`);
-            lines.push(`type _UnwrapFailure<T> = T extends { status: number; data: infer D } ? D : T;`);
-            lines.push(`export type ActionData = _actions extends Record<string, (...args: any[]) => any>`);
-            lines.push(`  ? _UnwrapFailure<_ActionReturn<_actions[keyof _actions]>> | null`);
-            lines.push(`  : null;`);
-        }
-
-        if (info.layoutServer) {
-            lines.push(`\nimport type { load as _layoutLoad } from '${srcBase}+layout.server.ts';`);
-            lines.push(`export type LayoutData = Awaited<ReturnType<typeof _layoutLoad>> & { params: Record<string, string> };`);
-            lines.push(`export type LayoutProps = { data: LayoutData; children: any };`);
-        }
-
-        const outDir = join(process.cwd(), ".bosia", "types", "src", "routes", ...segments);
-        mkdirSync(outDir, { recursive: true });
-        writeFileSync(join(outDir, "$types.d.ts"), lines.join("\n") + "\n");
-    }
-
-    console.log(`✅ Route types generated: .bosia/types/ (${dirs.size} route director${dirs.size === 1 ? "y" : "ies"})`);
+	// Collect { dir → { pageServer?, layoutServer? } }
+	const dirs = new Map<string, { pageServer?: string; layoutServer?: string }>();
+
+	for (const route of manifest.pages) {
+		const pageDir = routeDirOf(route.page);
+		if (!dirs.has(pageDir)) dirs.set(pageDir, {});
+		if (route.pageServer) {
+			dirs.get(pageDir)!.pageServer = route.pageServer;
+		}
+		for (const ls of route.layoutServers) {
+			const lsDir = routeDirOf(ls.path);
+			if (!dirs.has(lsDir)) dirs.set(lsDir, {});
+			dirs.get(lsDir)!.layoutServer = ls.path;
+		}
+	}
+
+	for (const [dir, info] of dirs) {
+		// Path segments of the route dir (empty array for root ".")
+		const segments = dir === "." ? [] : dir.split("/").filter(Boolean);
+
+		// Depth of the generated file from project root:
+		// .bosia/ + types/ + src/ + routes/ + ...segments
+		const depth = 4 + segments.length;
+		const up = "../".repeat(depth);
+		const srcBase = `${up}src/routes/${segments.length ? segments.join("/") + "/" : ""}`;
+
+		const params = paramsForDir(dir);
+		const paramsType =
+			params.length === 0 ? `{}` : `{ ${params.map((p) => `${p}: string`).join("; ")} }`;
+
+		const lines: string[] = ["// AUTO-GENERATED by bosia — do not edit\n"];
+		lines.push(
+			`import type { LoadEvent, MetadataEvent, RequestEvent, Metadata } from 'bosia';`,
+		);
+		lines.push(``);
+		lines.push(`export type Params = ${paramsType};`);
+		lines.push(``);
+		lines.push(`type _LoadEvent = Omit<LoadEvent, 'params'> & { params: Params };`);
+		lines.push(`type _MetadataEvent = Omit<MetadataEvent, 'params'> & { params: Params };`);
+		lines.push(`type _RequestEvent = Omit<RequestEvent, 'params'> & { params: Params };`);
+
+		if (info.pageServer) {
+			lines.push(``);
+			lines.push(`import type { load as _pageLoad } from '${srcBase}+page.server.ts';`);
+			lines.push(`export type PageServerLoad = (event: _LoadEvent) => any;`);
+			lines.push(
+				`export type PageMetadataLoad = (event: _MetadataEvent) => Metadata | Promise<Metadata>;`,
+			);
+			lines.push(`export type Action = (event: _RequestEvent) => any;`);
+			lines.push(
+				`export type PageData = Awaited<ReturnType<typeof _pageLoad>> & { params: Params };`,
+			);
+		} else {
+			lines.push(``);
+			lines.push(
+				`export type PageMetadataLoad = (event: _MetadataEvent) => Metadata | Promise<Metadata>;`,
+			);
+			lines.push(`export type Action = (event: _RequestEvent) => any;`);
+			lines.push(`export type PageData = { params: Params };`);
+		}
+		lines.push(`export type PageProps = { data: PageData };`);
+
+		// ActionData — union of all action return types, unwrapping ActionFailure
+		if (info.pageServer) {
+			lines.push(``);
+			lines.push(`import type { actions as _actions } from '${srcBase}+page.server.ts';`);
+			lines.push(
+				`type _ActionReturn<T> = T extends (...args: any[]) => infer R ? Awaited<R> : never;`,
+			);
+			lines.push(
+				`type _UnwrapFailure<T> = T extends { status: number; data: infer D } ? D : T;`,
+			);
+			lines.push(
+				`export type ActionData = _actions extends Record<string, (...args: any[]) => any>`,
+			);
+			lines.push(`  ? _UnwrapFailure<_ActionReturn<_actions[keyof _actions]>> | null`);
+			lines.push(`  : null;`);
+		}
+
+		if (info.layoutServer) {
+			lines.push(`\nimport type { load as _layoutLoad } from '${srcBase}+layout.server.ts';`);
+			lines.push(`export type LayoutServerLoad = (event: _LoadEvent) => any;`);
+			lines.push(
+				`export type LayoutData = Awaited<ReturnType<typeof _layoutLoad>> & { params: Params };`,
+			);
+			lines.push(`export type LayoutProps = { data: LayoutData; children: any };`);
+		}
+
+		const outDir = join(process.cwd(), ".bosia", "types", "src", "routes", ...segments);
+		mkdirSync(outDir, { recursive: true });
+		writeFileSync(join(outDir, "$types.d.ts"), lines.join("\n") + "\n");
+	}
+
+	console.log(
+		`✅ Route types generated: .bosia/types/ (${dirs.size} route director${dirs.size === 1 ? "y" : "ies"})`,
+	);
 }
 
 // ─── Ensure tsconfig rootDirs ─────────────────────────────
@@ -82,25 +138,30 @@ export function generateRouteTypes(manifest: RouteManifest): void {
 // Only patches the file if rootDirs is not already set.
 
 export function ensureRootDirs(): void {
-    const tsconfigPath = join(process.cwd(), "tsconfig.json");
-    if (!existsSync(tsconfigPath)) return;
-
-    let tsconfig: any;
-    try {
-        tsconfig = JSON.parse(readFileSync(tsconfigPath, "utf-8"));
-    } catch {
-        console.warn("⚠️  Could not parse tsconfig.json — add rootDirs manually:\n" +
-            '   "rootDirs": [".", ".bosia/types"]');
-        return;
-    }
-
-    const rootDirs: string[] = tsconfig.compilerOptions?.rootDirs ?? [];
-    if (rootDirs.includes(".bosia/types")) return;
-
-    tsconfig.compilerOptions ??= {};
-    tsconfig.compilerOptions.rootDirs = [".", ".bosia/types",
-        ...rootDirs.filter((d: string) => d !== ".")];
-
-    writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
-    console.log("✅ tsconfig.json: added .bosia/types to rootDirs");
+	const tsconfigPath = join(process.cwd(), "tsconfig.json");
+	if (!existsSync(tsconfigPath)) return;
+
+	let tsconfig: any;
+	try {
+		tsconfig = JSON.parse(readFileSync(tsconfigPath, "utf-8"));
+	} catch {
+		console.warn(
+			"⚠️  Could not parse tsconfig.json — add rootDirs manually:\n" +
+				'   "rootDirs": [".", ".bosia/types"]',
+		);
+		return;
+	}
+
+	const rootDirs: string[] = tsconfig.compilerOptions?.rootDirs ?? [];
+	if (rootDirs.includes(".bosia/types")) return;
+
+	tsconfig.compilerOptions ??= {};
+	tsconfig.compilerOptions.rootDirs = [
+		".",
+		".bosia/types",
+		...rootDirs.filter((d: string) => d !== "."),
+	];
+
+	writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
+	console.log("✅ tsconfig.json: added .bosia/types to rootDirs");
 }