@sigil-dev/grimoire 0.8.0 → 0.8.3

package/src/rendering/ssrPlugin.ts

@@ -1,8 +1,10 @@
 import { createHash } from "node:crypto";
 import { transformSync } from "@babel/core";
 import sigilPlugin from "@sigil-dev/compiler/babel";
+import { log } from "../logger/instance";
 import type { GrimoirePlugin } from "../types";
 
+const logger = log.scope("scope");
 let registered = false;
 
 export function registerSSRPlugin(plugins: GrimoirePlugin[] = []) {
@@ -27,7 +29,7 @@ export function registerSSRPlugin(plugins: GrimoirePlugin[] = []) {
 
 			build.onLoad({ filter: /\.tsx?$/ }, async ({ path }) => {
 				if (path.includes("index.tsx"))
-					console.log("[ssr-plugin] onLoad:", path);
+					logger.debug("[ssr-plugin] onLoad:", path);
 				const source = await Bun.file(path).text();
 
 				// node_modules and .grimoire files are plain TypeScript (no sigil JSX).
@@ -40,7 +42,7 @@ export function registerSSRPlugin(plugins: GrimoirePlugin[] = []) {
 				}
 
 				if (process.env.SIGIL_VERBOSE) {
-					console.log("[sigil-ssr] XFORM:", path);
+					logger.debug("[sigil-ssr] XFORM:", path);
 				}
 				const hash = createHash("md5").update(path).digest("hex").slice(0, 8);
 				const result = transformSync(source, {

package/src/routing/router.ts

@@ -34,7 +34,7 @@ export function matchRoute(tree: RouteTree, url: URL): MatchedRoute | null {
 		const layoutMatches = (l: RouteFile) =>
 			l.path === "/" ||
 			route.path === l.path ||
-			route.path.startsWith(l.path + "/");
+			route.path.startsWith(`${l.path}/`);
 
 		const layouts = tree.layouts
 			.filter((l) => l.type === "layout" && layoutMatches(l))
@@ -64,7 +64,7 @@ export function findClosestError(
 	while (segments.length >= 0) {
 		const prefix = `/${segments.join("/")}`;
 		const error = errors.find(
-			(e) => e.path === prefix || e.path === prefix + "/",
+			(e) => e.path === prefix || e.path === `${prefix}/`,
 		);
 		if (error) return error;
 		if (segments.length === 0) break;

package/src/routing/scanner.ts

@@ -81,7 +81,7 @@ export async function scanRoutes(
 		else if (name === "+error") type = "error";
 		else type = "simple";
 
-		const clientPath = "/" + relative(viteRoot, filePath).replace(/\\/g, "/");
+		const clientPath = `/${relative(viteRoot, filePath).replace(/\\/g, "/")}`;
 
 		const routeFile: RouteFile = {
 			path: pattern,

package/src/routing/transform-routes.ts

@@ -1,6 +1,6 @@
+import { basename, dirname, join, relative, resolve } from "node:path";
 import { transformSync } from "@babel/core";
 import sigilPlugin from "@sigil-dev/compiler/babel";
-import { basename, dirname, join, relative, resolve } from "path";
 import type { GrimoirePlugin } from "../types";
 import type { RouteFile } from "./scanner";
 

package/src/server/build.ts

@@ -1,7 +1,7 @@
+import { mkdir } from "node:fs/promises";
+import { isAbsolute, join } from "node:path";
+import { cwd } from "node:process";
 import { sigil } from "@sigil-dev/compiler/bun";
-import { mkdir } from "fs/promises";
-import { isAbsolute, join } from "path";
-import { cwd } from "process";
 import { normalizePath } from "../dev/paths";
 import { generateManifest } from "../routing/manifest-gen";
 import type { RouteTree } from "../routing/scanner";

package/src/server/coordinator.ts

@@ -1,12 +1,11 @@
+import { join } from "node:path";
 import { type Subprocess, spawn } from "bun";
-import { join } from "path";
 import { matchRoute } from "../routing/router";
 import { type RouteFile, type RouteTree, scanRoutes } from "../routing/scanner";
 import type {
 	CoordinatorContext,
 	GrimoireConfig,
 	GrimoirePlugin,
-	Route,
 	WorkerDescriptor,
 	WorkerMode,
 } from "../types";
@@ -194,7 +193,7 @@ export async function startCoordinator(options: CoordinatorOptions) {
 						runHook(plugins, "onWorkerReady", descriptor);
 					}
 				},
-				onExit(proc, exitCode) {
+				onExit(_proc, exitCode) {
 					const intentional = stopping;
 					runHook(
 						plugins,
@@ -204,7 +203,7 @@ export async function startCoordinator(options: CoordinatorOptions) {
 					);
 					if (!intentional) {
 						console.error(
-							`[grimoire] worker ${descriptor.name ?? descriptor.mode + "-" + descriptor.index} crashed (exit ${exitCode}), respawning...`,
+							`[grimoire] worker ${descriptor.name ?? `${descriptor.mode}-${descriptor.index}`} crashed (exit ${exitCode}), respawning...`,
 						);
 						// respawn: same descriptor, same port
 						// (simplified — plugin-scale can override this behavior)
@@ -296,7 +295,7 @@ function defaultSerialize(locals: App.Locals, secret: string): string {
 	return Buffer.from(JSON.stringify({ payload, sig })).toString("base64");
 }
 
-function defaultDeserialize(raw: string, secret: string): App.Locals {
+function _defaultDeserialize(raw: string, secret: string): App.Locals {
 	const { payload, sig } = JSON.parse(Buffer.from(raw, "base64").toString());
 	const expected = new Bun.CryptoHasher("sha256")
 		.update(secret + payload)

package/src/server/index.ts

@@ -6,6 +6,7 @@ import { HMR_CLIENT_SOURCE } from "../dev/hmr-client.ts";
 import { HmrServer, handleChange } from "../dev/hmr-server.ts";
 import { makeDevLoader } from "../dev/loader.ts";
 import { startWatcher } from "../dev/watcher.ts";
+import { log } from "../logger/instance.ts";
 import { renderRoute } from "../rendering";
 import { registerSSRPlugin } from "../rendering/ssrPlugin";
 import { findClosestError, matchRoute } from "../routing/router";
@@ -13,7 +14,7 @@ import { isErrorResult } from "../sentinels/error.ts";
 import { isFailResult } from "../sentinels/fail.ts";
 import { isRedirectResult } from "../sentinels/redirect.ts";
 import type { GrimoireConfig, WsRouteHandler } from "../types";
-import { buildProject, rebuildForChange } from "./build";
+import { buildProject } from "./build";
 import { createCookies } from "./cookie-utils";
 import type {
 	Handle,
@@ -25,6 +26,7 @@ import type {
 } from "./hooks";
 import { runDeserializeLocals, runHook, runRequestHooks } from "./plugins";
 
+const logger = log.scope("server");
 /**
  * Try to load hooks.server.ts from the project root.
  */
@@ -226,33 +228,29 @@ export async function createServer(config: GrimoireConfig = {}) {
 
 				const depsDir = join(process.cwd(), ".grimoire/deps");
 				mkdirSync(depsDir, { recursive: true });
-				const outFile = join(depsDir, depName + ".js");
+				const outFile = join(depsDir, `${depName}.js`);
 
 				if (!(await Bun.file(outFile).exists())) {
-					console.log("[sigil hmr] bundling dep:", pkgName);
+					logger.debug("bundling dep:", pkgName);
 					try {
 						const entry = Bun.resolveSync(pkgName, process.cwd());
 						const result = await Bun.build({
 							entrypoints: [entry],
 							outdir: depsDir,
-							naming: depName + ".js",
+							naming: `${depName}.js`,
 							target: "browser",
 							format: "esm",
 							minify: false,
 							external: ["@sigil-dev/runtime"],
 						});
 						if (!result.success) {
-							console.error(
-								"[sigil hmr] dep bundle failed:",
-								pkgName,
-								result.logs,
-							);
+							logger.error("dep bundle failed:", pkgName, result.logs);
 							return new Response(
 								`throw new Error("failed to bundle dep: ${pkgName}")`,
 								{ headers: { "Content-Type": "application/javascript" } },
 							);
 						}
-						console.log("[sigil hmr] bundled dep:", pkgName);
+						logger.debug("bundled dep:", pkgName);
 					} catch (e: any) {
 						return new Response(
 							`throw new Error("dep not found: ${pkgName}: ${e.message}")`,
@@ -648,6 +646,6 @@ export async function createServer(config: GrimoireConfig = {}) {
 		hostname: server.hostname,
 		stop: () => server.stop(),
 	});
-	console.log(`Grimoire running at http://${host}:${port}`);
+	// console.log(`Grimoire running at http://${host}:${port}`);
 	return server;
 }

package/src/server/worker.ts

@@ -1,7 +1,6 @@
 import { join } from "node:path";
 import type { GrimoireConfig, GrimoirePlugin, WorkerMode } from "../types";
 import { createServer } from "./index";
-import { runDeserializeLocals } from "./plugins";
 
 export interface WorkerOptions {
 	config: GrimoireConfig;

package/test/context.test.ts

@@ -1,10 +1,10 @@
 // packages/grimoire/src/context.test.ts
-import { describe, expect, test } from "bun:test";
+import { expect, test } from "bun:test";
 import { createContext, getContext, setContext } from "@sigil-dev/runtime";
 import { runWithContext } from "../src/server/context";
 
 const UserKey = createContext<string>();
-const ThemeKey = createContext<string>();
+const _ThemeKey = createContext<string>();
 
 // 1. Basic: does it work at all
 test("getContext returns value set in same context", async () => {

package/test/hydration.test.ts

@@ -40,7 +40,7 @@ function runHydrate(routes: Record<string, (props: any) => any>) {
 
 // simulate initRouter (same logic as router.ts)
 let clickHandlerAttached = false;
-function initRouter(routes: Record<string, (props: any) => any>) {
+function initRouter(_routes: Record<string, (props: any) => any>) {
 	document.addEventListener("click", () => {});
 	clickHandlerAttached = true;
 }

package/test/middleware.test.ts

@@ -42,7 +42,7 @@ describe("sequence()", () => {
 		const handler = sequence(a, b);
 		const res = await handler({
 			event: fakeEvent(),
-			resolve: async (evt) => new Response("OK"),
+			resolve: async (_evt) => new Response("OK"),
 		});
 
 		expect(order).toEqual(["a-before", "b-before", "b-after", "a-after"]);

package/test/rendering.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { mkdir, rm, writeFile } from "fs/promises";
-import { tmpdir as osTmpDir } from "os";
-import { join } from "path";
+import { mkdir, rm, writeFile } from "node:fs/promises";
+import { tmpdir as osTmpDir } from "node:os";
+import { join } from "node:path";
 import { renderRoute } from "../src/rendering";
 import { matchRoute } from "../src/routing/router";
 import { scanRoutes } from "../src/routing/scanner";

package/test/scanning.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { mkdir, rm, writeFile } from "fs/promises";
-import { tmpdir } from "os";
-import { join } from "path";
+import { mkdir, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { filePathToRoutePath, scanRoutes } from "../src/routing/scanner";
 
 describe("File scanning", () => {

package/test/server.test.ts

@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { mkdir, writeFile } from "fs/promises";
-import { tmpdir } from "os";
-import { join } from "path";
+import { mkdir, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { createServer } from "../src/server";
 
 // ── Sandbox note ─────────────────────────────────────────────────────────────

package/test/transform-routes.test.ts

@@ -1,7 +1,7 @@
 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 { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import type { RouteFile } from "../src/routing/scanner";
 import { transformRoutes } from "../src/routing/transform-routes";