@sigil-dev/grimoire 0.4.0 → 0.6.0

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,
@@ -416,9 +416,11 @@ describe("generateTypes — route without +page.server.ts", () => {
 		expect(content).toContain("export type Actions = Record<string, never>;");
 	});
 
-	test("PageProps contains params", async () => {
+	test("PageProps contains data and params", async () => {
 		const content = await readGenerated("src/routes/blog");
-		expect(content).toContain("export type PageProps = { params: Params };");
+		expect(content).toContain(
+			"export type PageProps = { data: PageData; params: Params };",
+		);
 	});
 });
 
@@ -448,10 +450,10 @@ describe("generateTypes — route with +page.server.ts", () => {
 		expect(content).toContain('Awaited<ReturnType<_PS["load"]>>');
 	});
 
-	test("PageProps = PageData & { params: Params }", async () => {
+	test("PageProps = { data: PageData; params: Params }", async () => {
 		const content = await readGenerated("src/routes/blog/[slug]");
 		expect(content).toContain(
-			"export type PageProps = PageData & { params: Params };",
+			"export type PageProps = { data: PageData; params: Params };",
 		);
 	});
 
@@ -559,8 +561,8 @@ describe("tsc integration", () => {
 			join(routeDir, "check.ts"),
 			`import type { PageProps } from "./$types";
 declare const props: PageProps;
-const _title: string = props.post.title;
-const _views: number = props.post.views;
+const _title: string = props.data.post.title;
+const _views: number = props.data.post.views;
 const _slug: string = props.params.slug;
 export {};`,
 		);

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.dom.js

@@ -1,4 +0,0 @@
-
-export const routes = {
-
-};

package/.grimoire/_routes.hydrate.js

@@ -1,4 +0,0 @@
-
-export const routes = {
-
-};

package/.grimoire/_routes.ts

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

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503001657_protected__page.dom.js

@@ -1,9 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function P() {
-  return (() => {
-    const _el0 = document.createElement("div");
-    _el0.classList.add("9i0yqs");
-    _el0.append(document.createTextNode("secret"));
-    return _el0;
-  })();
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503001657_protected__page.hydrate.js

@@ -1,11 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function P() {
-  return (() => {
-    const _el0 = claim(__nodes, "div");
-    const _el1 = Array.from(_el0.childNodes);
-    _el0.classList.add("9i0yqs");
-    if (_el1.length === 0)
-      _el0.append(document.createTextNode("secret"));
-    return _el0;
-  })();
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503161592_protected__page.dom.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function P() {
-  return "<div>secret</div>";
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503161592_protected__page.hydrate.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function P() {
-  return "<div>secret</div>";
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503395872_login.dom.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return "<form></form>";
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503395872_login.hydrate.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return "<form></form>";
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503614350_login.dom.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return "<form></form>";
-}

package/.grimoire/compiled/0-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503614350_login.hydrate.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return "<form></form>";
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503001657_login__page.dom.js

@@ -1,8 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return (() => {
-    const _el0 = document.createElement("form");
-    _el0.classList.add("6ulz94");
-    return _el0;
-  })();
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503001657_login__page.hydrate.js

@@ -1,9 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return (() => {
-    const _el0 = claim(__nodes, "form");
-    const _el1 = Array.from(_el0.childNodes);
-    _el0.classList.add("6ulz94");
-    return _el0;
-  })();
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503161592_login__page.dom.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return "<form></form>";
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503161592_login__page.hydrate.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Login() {
-  return "<form></form>";
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503395872_protected.dom.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Protected() {
-  return "<div>secret</div>";
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503395872_protected.hydrate.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Protected() {
-  return "<div>secret</div>";
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503614350_protected.dom.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Protected() {
-  return "<div>secret</div>";
-}

package/.grimoire/compiled/1-C__Users_Cane1712_AppData_Local_Temp_grimoire-actions-1780503614350_protected.hydrate.js

@@ -1,4 +0,0 @@
-import { createSignal, createEffect, createMemo, reconcile, claim, claimText, claimComment, hydrateKeyedList, insert } from "@sigil-dev/runtime";
-export default function Protected() {
-  return "<div>secret</div>";
-}

package/.grimoire/tsconfig.generated.json

@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "rootDirs": [
-      "..",
-      "./types"
-    ]
-  },
-  "include": [
-    "types/**/*.d.ts"
-  ]
-}

package/.grimoire/types/ambient.d.ts

@@ -1,6 +0,0 @@
-// Auto-generated by @sigil-dev/grimoire — do not edit
-
-declare namespace App {
-  // Extend this interface in your app's src/app.d.ts to add typed locals
-  interface Locals extends Record<string, unknown> {}
-}

package/.grimoire/types/api/hello/$types.d.ts

@@ -1,29 +0,0 @@
-// Auto-generated by @sigil-dev/grimoire — do not edit
-
-export type Params = {};
-
-export type PageData = Record<string, never>;
-export type PageProps = { params: Params };
-export type PageServerLoad = never;
-export type Actions = Record<string, never>;
-
-export type LayoutData = Record<string, never>;
-export type LayoutProps = LayoutData & { params: Params; children?: unknown };
-export type LayoutServerLoad = (ctx: {
-  params: Params;
-  request: Request;
-  url: URL;
-  locals: App.Locals;
-}) => Record<string, unknown> | Promise<Record<string, unknown>>;
-
-type _SRV = typeof import("C:/Users/Cane1712/AppData/Local/Temp/grimoire-server-1780504083027/api/hello/+server.js");
-type _HttpMethods = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS";
-type _ServerKeys = Extract<keyof _SRV, _HttpMethods>;
-export type ServerHandlers = {
-  [K in _ServerKeys]: (ctx: {
-    params: Params;
-    request: Request;
-    url: URL;
-    locals: App.Locals;
-  }) => Response | Promise<Response>;
-};

package/.grimoire/types/api/items/$types.d.ts

@@ -1,29 +0,0 @@
-// Auto-generated by @sigil-dev/grimoire — do not edit
-
-export type Params = {};
-
-export type PageData = Record<string, never>;
-export type PageProps = { params: Params };
-export type PageServerLoad = never;
-export type Actions = Record<string, never>;
-
-export type LayoutData = Record<string, never>;
-export type LayoutProps = LayoutData & { params: Params; children?: unknown };
-export type LayoutServerLoad = (ctx: {
-  params: Params;
-  request: Request;
-  url: URL;
-  locals: App.Locals;
-}) => Record<string, unknown> | Promise<Record<string, unknown>>;
-
-type _SRV = typeof import("C:/Users/Cane1712/AppData/Local/Temp/grimoire-server-1780504083027/api/items/+server.js");
-type _HttpMethods = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS";
-type _ServerKeys = Extract<keyof _SRV, _HttpMethods>;
-export type ServerHandlers = {
-  [K in _ServerKeys]: (ctx: {
-    params: Params;
-    request: Request;
-    url: URL;
-    locals: App.Locals;
-  }) => Response | Promise<Response>;
-};

package/public/__grimoire__/client.js

@@ -1,86 +0,0 @@
-// .grimoire/_routes.dom.js
-var routes = {};
-
-// src/scope.ts
-function withEffectScope(fn) {
-  const prev = globalThis.__sigilEffectScope;
-  const disposers = [];
-  globalThis.__sigilEffectScope = disposers;
-  try {
-    fn();
-  } finally {
-    globalThis.__sigilEffectScope = prev;
-  }
-  return () => {
-    for (const d of disposers)
-      d();
-    disposers.length = 0;
-  };
-}
-
-// src/client-router.ts
-var routeMap = {};
-var disposeCurrentPage = null;
-async function navigate(path) {
-  const res = await fetch(path, { headers: { "x-grimoire-navigate": "1" } });
-  const json = await res.json();
-  const { data, params, pattern, head } = json;
-  const Page = routeMap[pattern];
-  if (!Page) {
-    window.location.href = path;
-    return;
-  }
-  disposeCurrentPage?.();
-  disposeCurrentPage = null;
-  globalThis.__nodes = [];
-  let node;
-  disposeCurrentPage = withEffectScope(() => {
-    node = Page({ data, params });
-  });
-  const slot = document.getElementById("grimoire-page");
-  if (!slot)
-    return;
-  slot.replaceChildren(node);
-  updateHead(head);
-  history.pushState({}, "", path);
-  currentPath = path;
-  window.scrollTo(0, 0);
-}
-var currentPath = location.pathname;
-function initRouter(routes2, initialDispose) {
-  routeMap = routes2;
-  disposeCurrentPage = initialDispose ?? null;
-  document.addEventListener("click", handleClick);
-  window.addEventListener("popstate", () => {
-    if (location.pathname !== currentPath) {
-      currentPath = location.pathname;
-      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,101 +0,0 @@
-// .grimoire/_routes.hydrate.js
-var routes = {};
-
-// src/scope.ts
-function withEffectScope(fn) {
-  const prev = globalThis.__sigilEffectScope;
-  const disposers = [];
-  globalThis.__sigilEffectScope = disposers;
-  try {
-    fn();
-  } finally {
-    globalThis.__sigilEffectScope = prev;
-  }
-  return () => {
-    for (const d of disposers)
-      d();
-    disposers.length = 0;
-  };
-}
-
-// src/client-router.ts
-var routeMap = {};
-var disposeCurrentPage = null;
-async function navigate(path) {
-  const res = await fetch(path, { headers: { "x-grimoire-navigate": "1" } });
-  const json = await res.json();
-  const { data, params, pattern, head } = json;
-  const Page = routeMap[pattern];
-  if (!Page) {
-    window.location.href = path;
-    return;
-  }
-  disposeCurrentPage?.();
-  disposeCurrentPage = null;
-  globalThis.__nodes = [];
-  let node;
-  disposeCurrentPage = withEffectScope(() => {
-    node = Page({ data, params });
-  });
-  const slot = document.getElementById("grimoire-page");
-  if (!slot)
-    return;
-  slot.replaceChildren(node);
-  updateHead(head);
-  history.pushState({}, "", path);
-  currentPath = path;
-  window.scrollTo(0, 0);
-}
-var currentPath = location.pathname;
-function initRouter(routes2, initialDispose) {
-  routeMap = routes2;
-  disposeCurrentPage = initialDispose ?? null;
-  document.addEventListener("click", handleClick);
-  window.addEventListener("popstate", () => {
-    if (location.pathname !== currentPath) {
-      currentPath = location.pathname;
-      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__");
-var initialDispose;
-if (stateEl) {
-  const state = JSON.parse(stateEl.textContent);
-  const Page = routes[state.pattern];
-  if (Page) {
-    const slot = document.getElementById("grimoire-page");
-    if (slot) {
-      globalThis.__nodes = Array.from(slot.childNodes);
-      initialDispose = withEffectScope(() => {
-        Page({ data: state.data, params: state.params });
-      });
-    }
-  }
-}
-initRouter(routes, initialDispose);

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,25 +0,0 @@
-import type { GrimoirePlugin } from "./types";
-
-export async function runHook(
-	plugins: GrimoirePlugin[],
-	hook: keyof GrimoirePlugin,
-	...args: any
-): Promise<void> {
-	for (const plugin of plugins) {
-		await (plugin[hook] as any)?.(...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");