@sigil-dev/grimoire 0.5.0 → 0.6.1

package/test/scope.test.ts

@@ -8,8 +8,12 @@
  *      a fresh empty pool instead of recycling stale DOM nodes.
  */
 import { describe, expect, test } from "bun:test";
-import { createEffect, createSignal, withEffectScope as runtimeScope } from "@sigil-dev/runtime";
-import { withEffectScope } from "../src/scope.ts";
+import {
+	createEffect,
+	createSignal,
+	withEffectScope as runtimeScope,
+} from "@sigil-dev/runtime";
+import { withEffectScope } from "../src/client/scope.ts";
 
 describe("grimoire withEffectScope", () => {
 	test("effects inside scope stop after dispose", () => {
@@ -38,7 +42,10 @@ describe("grimoire withEffectScope", () => {
 
 		// Mount page A
 		let disposeCurrentPage = withEffectScope(() => {
-			createEffect(() => { count(); pageARuns++; });
+			createEffect(() => {
+				count();
+				pageARuns++;
+			});
 		});
 		count.set(1);
 		expect(pageARuns).toBe(2);
@@ -47,7 +54,10 @@ describe("grimoire withEffectScope", () => {
 		// Navigate to page B — dispose A first
 		disposeCurrentPage();
 		disposeCurrentPage = withEffectScope(() => {
-			createEffect(() => { count(); pageBRuns++; });
+			createEffect(() => {
+				count();
+				pageBRuns++;
+			});
 		});
 
 		count.set(2);
@@ -96,7 +106,10 @@ describe("grimoire withEffectScope", () => {
 
 		// grimoire's local withEffectScope wraps a createEffect from @sigil-dev/runtime
 		const dispose = withEffectScope(() => {
-			createEffect(() => { count(); runs++; });
+			createEffect(() => {
+				count();
+				runs++;
+			});
 		});
 
 		count.set(1);
@@ -114,7 +127,10 @@ describe("grimoire withEffectScope", () => {
 		let runs = 0;
 
 		const dispose = runtimeScope(() => {
-			createEffect(() => { count(); runs++; });
+			createEffect(() => {
+				count();
+				runs++;
+			});
 		});
 
 		count.set(1);
@@ -127,7 +143,7 @@ describe("grimoire withEffectScope", () => {
 
 describe("__nodes pool reset on SPA navigation", () => {
 	test("navigate sets __nodes to [] before calling Page()", () => {
-		// Simulate exactly what client-router.ts's navigate() does:
+		// Simulate exactly what router.ts's navigate() does:
 		//   dispose old effects → set __nodes = [] → call Page() → replaceChildren(node)
 		// We only care that Page() sees an empty pool.
 		let nodesAtCallTime: unknown = "not set";
@@ -136,9 +152,8 @@ describe("__nodes pool reset on SPA navigation", () => {
 			nodesAtCallTime = (globalThis as any).__nodes;
 			return document.createElement("div"); // satisfy replaceChildren
 		};
-
 		// Mimic the three lines in navigate() that matter
-		;(globalThis as any).__nodes = ["stale", "dom", "nodes"]; // leftover from previous page
+		(globalThis as any).__nodes = ["stale", "dom", "nodes"]; // leftover from previous page
 		(globalThis as any).__nodes = []; // the reset
 		mockPage();
 
@@ -154,7 +169,7 @@ describe("__nodes pool reset on SPA navigation", () => {
 			nodesAtCallTime = (globalThis as any).__nodes;
 		};
 
-		;(globalThis as any).__nodes = [fakeSlotChild]; // hydrate.ts sets real nodes
+		(globalThis as any).__nodes = [fakeSlotChild]; // hydrate.ts sets real nodes
 		mockPage();
 
 		expect(Array.isArray(nodesAtCallTime)).toBe(true);

package/test/server.test.ts

@@ -73,7 +73,9 @@ describe("Server — API routes (+server.ts)", () => {
 
 	test("unsupported method returns 405", async () => {
 		const server = await createServer({ port: 3004, routes: tmpDir });
-		const res = await fetch("http://localhost:3004/api/items", { method: "DELETE" });
+		const res = await fetch("http://localhost:3004/api/items", {
+			method: "DELETE",
+		});
 		expect(res.status).toBe(405);
 		server.stop();
 	});
@@ -143,15 +145,25 @@ export const websocket = {
 		return new Promise((resolve, reject) => {
 			const ws = new WebSocket(`ws://localhost:3005${path}`);
 			ws.onopen = () => resolve(ws);
-			ws.onerror = () => reject(new Error(`WebSocket connection failed: ${path}`));
+			ws.onerror = () =>
+				reject(new Error(`WebSocket connection failed: ${path}`));
 		});
 	}
 
 	function nextMessage(ws: WebSocket): Promise<string> {
 		return new Promise((resolve, reject) => {
-			const timer = setTimeout(() => reject(new Error("timeout waiting for message")), 2000);
-			ws.onmessage = (ev) => { clearTimeout(timer); resolve(String(ev.data)); };
-			ws.onerror = () => { clearTimeout(timer); reject(new Error("ws error")); };
+			const timer = setTimeout(
+				() => reject(new Error("timeout waiting for message")),
+				2000,
+			);
+			ws.onmessage = (ev) => {
+				clearTimeout(timer);
+				resolve(String(ev.data));
+			};
+			ws.onerror = () => {
+				clearTimeout(timer);
+				reject(new Error("ws error"));
+			};
 		});
 	}
 
@@ -169,8 +181,14 @@ export const websocket = {
 		// just verify connection opens cleanly (sessionId is in ws.data server-side)
 		await new Promise<void>((resolve, reject) => {
 			const t = setTimeout(() => reject(new Error("timeout")), 2000);
-			ws.onopen = () => { clearTimeout(t); resolve(); };
-			ws.onerror = () => { clearTimeout(t); reject(new Error("connect failed")); };
+			ws.onopen = () => {
+				clearTimeout(t);
+				resolve();
+			};
+			ws.onerror = () => {
+				clearTimeout(t);
+				reject(new Error("connect failed"));
+			};
 		});
 		ws.close();
 	});
@@ -185,9 +203,20 @@ export const websocket = {
 		await new Promise<void>((resolve, reject) => {
 			const ws = new WebSocket("ws://localhost:3005/reject");
 			const t = setTimeout(() => reject(new Error("timeout")), 2000);
-			ws.onopen = () => { clearTimeout(t); ws.close(); reject(new Error("should not have opened")); };
-			ws.onerror = () => { clearTimeout(t); resolve(); };
-			ws.onclose = (ev) => { clearTimeout(t); if (ev.code !== 1006) resolve(); else resolve(); };
+			ws.onopen = () => {
+				clearTimeout(t);
+				ws.close();
+				reject(new Error("should not have opened"));
+			};
+			ws.onerror = () => {
+				clearTimeout(t);
+				resolve();
+			};
+			ws.onclose = (ev) => {
+				clearTimeout(t);
+				if (ev.code !== 1006) resolve();
+				else resolve();
+			};
 		});
 	});
 

package/test/streaming.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { renderRoute } from "../src/renderer";
+import { renderRoute } from "../src/rendering";
 
 describe("Streaming SSR", () => {
 	test("returns a ReadableStream response", async () => {
@@ -7,7 +7,8 @@ describe("Streaming SSR", () => {
 			route: {
 				path: "/",
 				params: {},
-				filePath: "data:text/javascript,export default (p) => '<div>hello</div>'",
+				filePath:
+					"data:text/javascript,export default (p) => '<div>hello</div>'",
 			},
 			params: {},
 		} as any;
@@ -27,7 +28,10 @@ describe("Streaming SSR", () => {
 			params: {},
 		} as any;
 
-		const res = await renderRoute(matched, new Request("http://localhost/test"));
+		const res = await renderRoute(
+			matched,
+			new Request("http://localhost/test"),
+		);
 		const html = await res.text();
 
 		expect(html).toContain("<!DOCTYPE html>");
@@ -69,7 +73,10 @@ describe("Streaming SSR", () => {
 			params: {},
 		} as any;
 
-		const res = await renderRoute(matched, new Request("http://localhost/head-test"));
+		const res = await renderRoute(
+			matched,
+			new Request("http://localhost/head-test"),
+		);
 		const html = await res.text();
 
 		const hydrateScript = html.indexOf("hydrate.js");
@@ -90,7 +97,10 @@ describe("Streaming SSR", () => {
 			params: {},
 		} as any;
 
-		const res = await renderRoute(matched, new Request("http://localhost/chunked"));
+		const res = await renderRoute(
+			matched,
+			new Request("http://localhost/chunked"),
+		);
 		const reader = res.body!.getReader();
 		const chunks: string[] = [];
 
@@ -98,7 +108,11 @@ describe("Streaming SSR", () => {
 			const { done, value } = await reader.read();
 			if (done) break;
 			// Bun ReadableStream returns Uint8Array
-			chunks.push(typeof value === "string" ? value : new TextDecoder().decode(value.buffer));
+			chunks.push(
+				typeof value === "string"
+					? value
+					: new TextDecoder().decode(value.buffer),
+			);
 		}
 
 		// Should have multiple chunks (at least DOCTYPE + body)
@@ -114,8 +128,7 @@ describe("Streaming SSR", () => {
 			route: {
 				path: "/nav",
 				params: {},
-				filePath:
-					"data:text/javascript,export default (p) => '<div>nav</div>'",
+				filePath: "data:text/javascript,export default (p) => '<div>nav</div>'",
 			},
 			params: {},
 		} as any;

package/test/transform-routes.test.ts

@@ -2,8 +2,8 @@ import { describe, expect, test } from "bun:test";
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
-import type { RouteFile } from "../src/scanner";
-import { transformRoutes } from "../src/transform-routes";
+import type { RouteFile } from "../src/routing/scanner";
+import { transformRoutes } from "../src/routing/transform-routes";
 
 describe("transformRoutes", () => {
 	test("pre-transforms TypeScript TSX routes to unique JavaScript files", async () => {

package/test/typegen.test.ts

@@ -3,8 +3,8 @@ import { existsSync } from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join, sep } from "node:path";
-import type { RouteFile } from "../src/scanner";
-import { scanRoutes } from "../src/scanner";
+import type { RouteFile } from "../src/routing/scanner";
+import { scanRoutes } from "../src/routing/scanner";
 import {
 	buildParams,
 	generateTypes,
@@ -418,7 +418,9 @@ describe("generateTypes — route without +page.server.ts", () => {
 
 	test("PageProps contains data and params", async () => {
 		const content = await readGenerated("src/routes/blog");
-		expect(content).toContain("export type PageProps = { data: PageData; params: Params };");
+		expect(content).toContain(
+			"export type PageProps = { data: PageData; params: Params };",
+		);
 	});
 });
 

package/tsconfig.json

@@ -2,6 +2,8 @@
 	"compilerOptions": {
 		"module": "Preserve",
 		"moduleResolution": "bundler",
-		"lib": ["ESNext", "DOM"]
+		"lib": ["ESNext", "DOM"],
+		"allowImportingTsExtensions": true,
+		"noEmit": true
 	}
 }

package/.grimoire/_routes.ts

@@ -1,4 +0,0 @@
-
-export const routes: Record<string, (props: any) => any> = {
-
-};

package/public/__grimoire__/client.js

@@ -1,55 +0,0 @@
-// .grimoire/_routes.ts
-var routes = {};
-
-// src/client-router.ts
-var routeMap = {};
-async function navigate(path) {
-  const res = await fetch(path, { headers: { "x-grimoire-navigate": "1" } });
-  const json = await res.json();
-  console.log("navigate response:", json);
-  const { data, params, pattern, head } = json;
-  const Page = routeMap[pattern];
-  if (!Page) {
-    window.location.href = path;
-    return;
-  }
-  const node = Page({ ...data, params });
-  const slot = document.getElementById("grimoire-page");
-  if (!slot)
-    return;
-  slot.replaceChildren(node);
-  updateHead(head);
-  history.pushState({}, "", path);
-  window.scrollTo(0, 0);
-}
-function initRouter(routes2) {
-  routeMap = routes2;
-  document.addEventListener("click", handleClick);
-  window.addEventListener("popstate", () => navigate(location.pathname));
-}
-function updateHead(headHtml) {
-  document.querySelectorAll("[data-grimoire-head]").forEach((el) => el.remove());
-  if (!headHtml)
-    return;
-  const tmp = document.createElement("head");
-  tmp.innerHTML = headHtml;
-  for (const el of Array.from(tmp.children)) {
-    el.dataset.grimoireHead = "1";
-    document.head.appendChild(el);
-  }
-}
-function handleClick(e) {
-  const a = e.target.closest("a");
-  if (!a)
-    return;
-  const href = a.getAttribute("href");
-  if (!href)
-    return;
-  if (/^(https?:\/\/|\/\/|#|mailto:|tel:)/.test(href))
-    return;
-  e.preventDefault();
-  navigate(href);
-}
-
-// src/client.ts
-initRouter(routes);

package/public/__grimoire__/hydrate.js

@@ -1,63 +0,0 @@
-// .grimoire/_routes.ts
-var routes = {};
-
-// src/client-router.ts
-var routeMap = {};
-async function navigate(path) {
-  const res = await fetch(path, { headers: { "x-grimoire-navigate": "1" } });
-  const json = await res.json();
-  console.log("navigate response:", json);
-  const { data, params, pattern, head } = json;
-  const Page = routeMap[pattern];
-  if (!Page) {
-    window.location.href = path;
-    return;
-  }
-  const node = Page({ ...data, params });
-  const slot = document.getElementById("grimoire-page");
-  if (!slot)
-    return;
-  slot.replaceChildren(node);
-  updateHead(head);
-  history.pushState({}, "", path);
-  window.scrollTo(0, 0);
-}
-function initRouter(routes2) {
-  routeMap = routes2;
-  document.addEventListener("click", handleClick);
-  window.addEventListener("popstate", () => navigate(location.pathname));
-}
-function updateHead(headHtml) {
-  document.querySelectorAll("[data-grimoire-head]").forEach((el) => el.remove());
-  if (!headHtml)
-    return;
-  const tmp = document.createElement("head");
-  tmp.innerHTML = headHtml;
-  for (const el of Array.from(tmp.children)) {
-    el.dataset.grimoireHead = "1";
-    document.head.appendChild(el);
-  }
-}
-function handleClick(e) {
-  const a = e.target.closest("a");
-  if (!a)
-    return;
-  const href = a.getAttribute("href");
-  if (!href)
-    return;
-  if (/^(https?:\/\/|\/\/|#|mailto:|tel:)/.test(href))
-    return;
-  e.preventDefault();
-  navigate(href);
-}
-
-// src/hydrate.ts
-var stateEl = document.getElementById("__grimoire_state__");
-if (stateEl) {
-  const state = JSON.parse(stateEl.textContent);
-  const Page = routes[state.pattern];
-  if (Page) {
-    Page({ ...state.data, params: state.params });
-  }
-}
-initRouter(routes);

package/src/client.ts

@@ -1,4 +0,0 @@
-import { routes } from "#grimoire-routes";
-import { initRouter } from "./client-router.ts";
-
-initRouter(routes);

package/src/plugins.ts

@@ -1,39 +0,0 @@
-import type { BuildResult, GrimoirePlugin, LoadContext, Route, Server } from "./types";
-
-// Fire-and-forget hooks routed through runHook.
-// onRequest and onRouteRender are intentionally excluded: they have distinct
-// calling conventions (middleware chain / inline transform loop) handled in server.ts.
-// Keep HookArgs in sync with GrimoirePlugin in types.ts.
-type HookArgs = {
-	onStart:      [server: Server];
-	onStop:       [reason: "shutdown" | "restart"];
-	onBuildStart: [];
-	onBuildEnd:   [result: BuildResult];
-	onRouteLoad:  [route: Route, context: LoadContext];
-};
-type FireAndForgetHook = keyof HookArgs;
-
-export async function runHook<K extends FireAndForgetHook>(
-	plugins: GrimoirePlugin[],
-	hook: K,
-	...args: HookArgs[K]
-): Promise<void> {
-	for (const plugin of plugins) {
-		const fn = plugin[hook] as ((...a: any[]) => any) | undefined;
-		await fn?.(...args);
-	}
-}
-
-export async function runRequestHooks(
-	plugins: GrimoirePlugin[],
-	req: Request,
-	final: () => Promise<Response>,
-): Promise<Response> {
-	const chain = plugins
-		.filter((p) => p.onRequest)
-		.reduceRight(
-			(next, plugin) => async () => plugin.onRequest!(req, next),
-			final,
-		);
-	return chain();
-}

package/src/sync.ts

@@ -1,18 +0,0 @@
-#!/usr/bin/env bun
-import { mkdir } from "node:fs/promises";
-import { isAbsolute, join } from "node:path";
-import { scanRoutes } from "./scanner";
-import { generateTypes } from "./typegen";
-
-const routes = process.env.GRIMOIRE_ROUTES ?? "src/routes";
-const routesDir = isAbsolute(routes) ? routes : join(process.cwd(), routes);
-
-await mkdir(join(process.cwd(), ".grimoire"), { recursive: true });
-const tree = await scanRoutes(routesDir, process.cwd());
-await generateTypes(tree, {
-	projectRoot: process.cwd(),
-	routesDir,
-	outDir: join(process.cwd(), ".grimoire/types"),
-});
-
-console.log("Grimoire: types generated");