@sigil-dev/grimoire 0.7.5 → 0.7.7

package/test/typegen.test.ts

@@ -94,6 +94,7 @@ function makeRouteFile(
 		path: "/",
 		clientPath: "/src/routes/+page.tsx",
 		paramNames: [],
+		restParamNames: [],
 		...overrides,
 	};
 }
@@ -302,6 +303,15 @@ export async function POST() { return Response.json({}); }`,
 		join(tmpDir, "src", "routes", "about.tsx"),
 		"export default () => null;",
 	);
+
+	// Rest (catch-all) param route
+	await mkdir(join(tmpDir, "src", "routes", "files", "[...path]"), {
+		recursive: true,
+	});
+	await writeFile(
+		join(tmpDir, "src", "routes", "files", "[...path]", "+server.ts"),
+		`export async function GET() { return new Response("ok"); }`,
+	);
 });
 
 afterAll(async () => {
@@ -471,7 +481,7 @@ describe("generateTypes — route with +page.server.ts", () => {
 });
 
 describe("generateTypes — +layout.server.ts", () => {
-	test("LayoutData inferred from load() via ReturnType", async () => {
+	test("LayoutData inferred from load() via typeof import", async () => {
 		const content = await readGenerated("src/routes/blog");
 		expect(content).toMatch(/type _LS = typeof import\("/);
 		expect(content).toContain(
@@ -508,34 +518,43 @@ describe("generateTypes — +error.tsx", () => {
 	test("generates ErrorProps type", async () => {
 		const content = await readGenerated("src/routes");
 		expect(content).toContain(
-			"export type ErrorProps = { status: number; message: string };",
+			"export type ErrorProps = { status: number; message: string; error: unknown; route: string };",
 		);
 	});
 });
 
-describe("generateTypes — clears stale output", () => {
-	test("removes files from a deleted route on re-run", async () => {
-		// First run already happened in beforeAll via runGenerate()
-		// Write a stale file manually
-		const staleDir = join(
-			tmpDir,
-			".grimoire",
-			"types",
-			"src",
-			"routes",
-			"old-route",
-		);
-		await mkdir(staleDir, { recursive: true });
-		await writeFile(join(staleDir, "$types.d.ts"), "// stale");
-
-		// Re-run
-		await runGenerate();
-
-		// Stale file should be gone
-		expect(existsSync(join(staleDir, "$types.d.ts"))).toBe(false);
+describe("generateTypes — rest (catch-all) params", () => {
+	test("Params includes rest param name as string", async () => {
+		const content = await readGenerated("src/routes/files/[...path]");
+		expect(content).toContain("path: string;");
+		expect(content).toMatch(/export type Params = \{\s+path: string;\s+\};/);
 	});
 });
 
+// This behavior no lnger exists
+// describe("generateTypes — clears stale output", () => {
+// 	test("removes files from a deleted route on re-run", async () => {
+// 		// First run already happened in beforeAll via runGenerate()
+// 		// Write a stale file manually
+// 		const staleDir = join(
+// 			tmpDir,
+// 			".grimoire",
+// 			"types",
+// 			"src",
+// 			"routes",
+// 			"old-route",
+// 		);
+// 		await mkdir(staleDir, { recursive: true });
+// 		await writeFile(join(staleDir, "$types.d.ts"), "// stale");
+
+// 		// Re-run
+// 		await runGenerate();
+
+// 		// Stale file should be gone
+// 		expect(existsSync(join(staleDir, "$types.d.ts"))).toBe(false);
+// 	});
+// });
+
 // ---------------------------------------------------------------------------
 // tsc integration — proves the generated types actually type-check
 // ---------------------------------------------------------------------------
@@ -603,10 +622,19 @@ export {};`,
 	});
 
 	function runTsc(cwd: string) {
-		return Bun.spawnSync(
-			[process.execPath, "x", "tsc", "--noEmit", "--project", "tsconfig.json"],
+		const proc = Bun.spawnSync(
+			[
+				process.execPath,
+				"x",
+				"--bun",
+				"@typescript/native-preview",
+				"--noEmit",
+				"--project",
+				"tsconfig.json",
+			],
 			{ cwd },
 		);
+		return proc;
 	}
 
 	test("check.ts with correct types passes tsc", () => {

package/tsconfig.json

@@ -3,6 +3,7 @@
 		"module": "Preserve",
 		"moduleResolution": "bundler",
 		"lib": ["ESNext", "DOM"],
+		"target": "ESNext",
 		"allowImportingTsExtensions": true,
 		"noEmit": true
 	}