@sigil-dev/grimoire 0.7.5 → 0.7.7

package/src/typegen/index.ts

@@ -1,4 +1,5 @@
-import { mkdir, rm, writeFile } from "node:fs/promises";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { mkdir } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative } from "node:path";
 import type { RouteFile, RouteTree } from "../routing/scanner.ts";
 
@@ -11,6 +12,7 @@ export interface TypegenConfig {
 export interface RouteGroup {
 	dir: string;
 	paramNames: string[];
+	restParamNames: string[];
 	page?: RouteFile;
 	pageServer?: RouteFile;
 	layout?: RouteFile;
@@ -45,12 +47,19 @@ export function groupByDirectory(tree: RouteTree): Map<string, RouteGroup> {
 	for (const file of files) {
 		const dir = dirname(file.filePath);
 		if (!groups.has(dir)) {
-			groups.set(dir, { dir, paramNames: file.paramNames });
+			groups.set(dir, {
+				dir,
+				paramNames: file.paramNames,
+				restParamNames: file.restParamNames,
+			});
 		}
 		const g = groups.get(dir)!;
 		if (file.paramNames.length > g.paramNames.length) {
 			g.paramNames = file.paramNames;
 		}
+		if (file.restParamNames.length > g.restParamNames.length) {
+			g.restParamNames = file.restParamNames;
+		}
 		switch (file.type) {
 			case "page":
 				g.page = file;
@@ -82,9 +91,13 @@ export function toImportPath(from: string, to: string): string {
 		.replace(/\.tsx?$/, ".js");
 }
 
-export function buildParams(paramNames: string[]): string {
-	if (paramNames.length === 0) return "{}";
-	const props = paramNames.map((p) => `  ${p}: string;`).join("\n");
+export function buildParams(
+	paramNames: string[],
+	restParamNames: string[] = [],
+): string {
+	const all = [...paramNames, ...restParamNames];
+	if (all.length === 0) return "{}";
+	const props = all.map((p) => `  ${p}: string;`).join("\n");
 	return `{\n${props}\n}`;
 }
 
@@ -94,7 +107,7 @@ function generateTypesForGroup(group: RouteGroup, outFileDir: string): string {
 		"",
 	];
 
-	const paramsType = buildParams(group.paramNames);
+	const paramsType = buildParams(group.paramNames, group.restParamNames);
 
 	// --- Params ---
 	lines.push(`export type Params = ${paramsType};`, "");
@@ -217,7 +230,7 @@ function generateTypesForGroup(group: RouteGroup, outFileDir: string): string {
 	// --- +error.tsx ---
 	if (group.error) {
 		lines.push(
-			`export type ErrorProps = { status: number; message: string };`,
+			`export type ErrorProps = { status: number; message: string; error: unknown; route: string };`,
 			"",
 		);
 	}
@@ -276,7 +289,7 @@ function generateAmbient(): string {
 		"  P extends Record<string, string> = Record<string, string>",
 		"> = { data: D; params: P; children?: unknown };",
 		"",
-		"type ErrorProps = { status: number; message: string };",
+		"type ErrorProps = { status: number; message: string; error: unknown; route: string };",
 		"",
 		"type UpgradeContext<",
 		"  P extends Record<string, string> = Record<string, string>",
@@ -311,8 +324,9 @@ export async function generateTypes(
 ): Promise<void> {
 	const { projectRoot, outDir } = config;
 
-	await rm(outDir, { recursive: true, force: true });
-	await mkdir(outDir, { recursive: true });
+	// Skip rm — on Windows, rm+mkdir in quick succession can race and leave dirs
+	// in an unusable state. Stale type files are harmless; we overwrite what we need.
+	await mkdir(outDir, { recursive: true }).catch(() => {});
 
 	const groups = groupByDirectory(tree);
 
@@ -323,16 +337,18 @@ export async function generateTypes(
 			group.dir,
 		);
 		const outFileDir = join(outDir, routeRelDir);
-		await mkdir(outFileDir, { recursive: true });
+		// Use mkdirSync — async mkdir on Windows/Bun can report success before
+		// the directory is actually visible to subsequent fs calls
+		mkdirSync(outFileDir, { recursive: true });
 
 		const content = generateTypesForGroup(group, outFileDir);
-		await writeFile(join(outFileDir, "$types.d.ts"), content, "utf-8");
+		writeFileSync(join(outFileDir, "$types.d.ts"), content, "utf-8");
 	}
 
-	await writeFile(join(outDir, "ambient.d.ts"), generateAmbient(), "utf-8");
+	writeFileSync(join(outDir, "ambient.d.ts"), generateAmbient(), "utf-8");
 
 	const grimoireDir = dirname(outDir);
-	await writeFile(
+	writeFileSync(
 		join(grimoireDir, "tsconfig.generated.json"),
 		generateTsConfig(),
 		"utf-8",

package/src/types.ts

@@ -4,8 +4,14 @@ import type { RouteFile, RouteTree } from "./routing/scanner";
 /// <reference types="bun-types">
 declare global {
 	namespace App {
-		// augment in your own project
+		// augment in your own project via src/app.d.ts
 		interface Locals {}
+		interface Error {
+			message: string;
+			status?: number;
+		}
+		interface PageData {}
+		interface Platform {}
 	}
 }
 
@@ -111,9 +117,9 @@ export interface GrimoirePlugin {
 	 * Return WorkerEnv to inject env vars or set the worker name.
 	 * ALL plugins are called and results are merged.
 	 */
-	// biome-ignore lint/suspicious/noConfusingVoidType: doesn't have to return a thing.
 	onWorkerSpawn?(
 		worker: WorkerDescriptor,
+		// biome-ignore lint/suspicious/noConfusingVoidType: doesn't have to return a thing.
 	): WorkerEnv | void | Promise<WorkerEnv | void>;
 
 	/**
@@ -168,7 +174,11 @@ export interface GrimoireConfig {
 	plugins?: GrimoirePlugin[];
 	routes?: string; // glob, default 'src/routes/**';
 	dev?: boolean;
+	devEditor?: boolean;
 	vitePort?: number;
+	alias?: Record<string, string>; // e.g. { "$lib": "src/lib" } — resolved relative to cwd
+	cspNonce?: string; // CSP nonce for <script>/<style> tags
+	bundleStrategy?: "split" | "single"; // 'split' (default) or 'single' bundle
 	_skipBuild?: boolean;
 }
 

package/test/middleware.test.ts

@@ -14,6 +14,8 @@ function fakeEvent(overrides?: Partial<RequestEvent>): RequestEvent {
 			set: () => {},
 			delete: () => {},
 		},
+		route: { id: "/" },
+		fetch: globalThis.fetch,
 		setHeaders: () => {},
 		...overrides,
 	};
@@ -71,12 +73,12 @@ describe("sequence()", () => {
 
 	test("can modify event.locals", async () => {
 		const a: Handle = async ({ event, resolve }) => {
-			event.locals.user = "alice";
+			(event.locals as any).user = "alice";
 			return resolve(event);
 		};
 
 		const b: Handle = async ({ event, resolve }) => {
-			event.locals.greet = `hello ${event.locals.user}`;
+			(event.locals as any).greet = `hello ${(event.locals as any).user}`;
 			return resolve(event);
 		};
 
@@ -89,8 +91,8 @@ describe("sequence()", () => {
 			},
 		});
 
-		expect(event.locals.user).toBe("alice");
-		expect(event.locals.greet).toBe("hello alice");
+		expect((event.locals as any).user).toBe("alice");
+		expect((event.locals as any).greet).toBe("hello alice");
 	});
 
 	test("can modify response", async () => {