@torpor/build 0.1.12 → 0.1.14

package/dist/test.js

@@ -0,0 +1,227 @@
+import {
+  HOOK_ROUTE,
+  HOOK_SERVER_ROUTE,
+  LAYOUT_ROUTE,
+  LAYOUT_SERVER_ROUTE,
+  PAGE_ROUTE,
+  PAGE_SERVER_ROUTE,
+  Router,
+  SERVER_ROUTE
+} from "./chunk-65K3R3CP.js";
+import {
+  page_default
+} from "./chunk-WMHM5RGZ.js";
+import {
+  notFound,
+  ok,
+  seeOther
+} from "./chunk-2QQN3D3K.js";
+import {
+  ServerEvent
+} from "./chunk-EVBUHZGK.js";
+import "./chunk-SJVHHGVW.js";
+
+// src/test/runTest.ts
+import path from "node:path";
+async function runTest(site, route) {
+  if (!route.startsWith("/")) route += "/";
+  const req = new Request(`http://localhost${route}`);
+  const ev = new ServerEvent(req);
+  const router = new Router();
+  router.addPages(
+    site.routes.map((r) => ({
+      path: r.path,
+      type: r.type,
+      endPoint: () => import(
+        /* @vite-ignore */
+        path.join(site.root, r.file)
+      )
+    }))
+  );
+  return await load(router, ev, "%COMPONENT_HTML%");
+}
+async function load(router, ev, template) {
+  const url = new URL(ev.request.url);
+  const path2 = url.pathname;
+  const query = url.searchParams;
+  const route = router.match(path2, query);
+  if (!route) {
+    return notFound();
+  }
+  page_default.url = url;
+  const handler = route.handler;
+  const params = route.params || {};
+  switch (handler.type) {
+    case PAGE_ROUTE:
+    case LAYOUT_ROUTE: {
+      if (ev.request.method === "GET") {
+        return await loadView(ev, url, handler, params, template);
+      } else if (ev.request.method === "POST") {
+        return await runAction(ev, url, handler, params, query);
+      }
+      break;
+    }
+    case PAGE_SERVER_ROUTE:
+    case LAYOUT_SERVER_ROUTE: {
+      if (ev.request.method === "GET") {
+        return await loadData(ev, url, handler, "load", params);
+      }
+      break;
+    }
+    case SERVER_ROUTE: {
+      const functionName = ev.request.method.toLowerCase().replace("delete", "del");
+      return await loadData(ev, url, handler, functionName, params);
+    }
+    case HOOK_ROUTE:
+    case HOOK_SERVER_ROUTE: {
+      break;
+    }
+  }
+  return notFound();
+}
+async function loadData(ev, url, handler, functionName, params) {
+  const serverEndPoint = (await handler.endPoint()).default;
+  if (serverEndPoint && serverEndPoint[functionName]) {
+    const serverParams = buildServerParams(ev, url, params);
+    if (handler.serverHook) {
+      const serverHook = (await handler.serverHook()).default;
+      if (serverHook?.handle) {
+        await serverHook.handle(serverParams);
+      }
+    }
+    const result = await serverEndPoint[functionName](serverParams);
+    return result || ok();
+  }
+  return notFound();
+}
+async function loadView(ev, url, handler, params, template) {
+  const clientEndPoint = (await handler.endPoint()).default;
+  if (!clientEndPoint?.component) {
+    return notFound();
+  }
+  const serverEndPoint = handler.serverEndPoint && (await handler.serverEndPoint())?.default;
+  const serverParams = buildServerParams(ev, url, params);
+  if (handler.serverHook) {
+    const serverHook = (await handler.serverHook()).default;
+    if (serverHook?.handle) {
+      await serverHook.handle(serverParams);
+    }
+  }
+  let data = {};
+  if (handler.layouts) {
+    for (let layout of handler.layouts) {
+      const layoutEndPoint = (await layout.endPoint())?.default;
+      const layoutServerEndPoint = layout.serverEndPoint && (await layout.serverEndPoint())?.default;
+      const layoutData = await loadClientAndServerData(
+        url,
+        params,
+        serverParams,
+        data,
+        layoutEndPoint,
+        layoutServerEndPoint
+      );
+      Object.assign(data, layoutData);
+    }
+  }
+  let endPointData = await loadClientAndServerData(
+    url,
+    params,
+    serverParams,
+    data,
+    clientEndPoint,
+    serverEndPoint
+  );
+  Object.assign(data, endPointData);
+  let $props = { data };
+  let component = clientEndPoint.component;
+  let slots = void 0;
+  if (handler.layouts) {
+    let slotFunctions = [];
+    slotFunctions[handler.layouts.length] = (_, context) => clientEndPoint.component($props, context);
+    for (let i = handler.layouts.length - 1; i >= 0; i--) {
+      const layoutEndPoint = (await handler.layouts[i].endPoint())?.default;
+      if (layoutEndPoint?.component) {
+        if (i === 0) {
+          component = layoutEndPoint.component;
+          slots = { _: slotFunctions[i + 1] };
+        } else {
+          slotFunctions[i] = (_, context) => layoutEndPoint.component($props, context, {
+            _: slotFunctions[i + 1]
+          });
+        }
+      }
+    }
+  }
+  let html;
+  try {
+    html = component($props, void 0, slots);
+    html = template.replace("%COMPONENT_HTML%", html);
+  } catch (error) {
+    html = '<span style="color: red">Script syntax error</span><p>' + error + "</p>";
+    console.log(error);
+  }
+  return new Response(html, {
+    status: 200,
+    headers: {
+      "Content-Type": "text/html"
+    }
+  });
+}
+async function runAction(ev, url, handler, params, query) {
+  const actionName = (Array.from(query.keys())[0] || "default").replace(/^\//, "");
+  const serverEndPoint = handler.serverEndPoint && (await handler.serverEndPoint()).default;
+  if (serverEndPoint?.actions) {
+    const action = serverEndPoint.actions[actionName];
+    if (action) {
+      const serverParams = buildServerParams(ev, url, params);
+      if (handler.serverHook) {
+        const serverHook = (await handler.serverHook()).default;
+        if (serverHook?.handle) {
+          await serverHook.handle(serverParams);
+        }
+      }
+      const result = await action(serverParams);
+      return result || seeOther(url.pathname);
+    }
+  }
+  return notFound();
+}
+async function loadClientAndServerData(url, params, serverParams, data, clientEndPoint, serverEndPoint) {
+  let newData = {};
+  if (clientEndPoint?.load) {
+    const clientParams = buildClientParams(url, data, params);
+    const clientData = await clientEndPoint.load(clientParams);
+    if (clientData) {
+      Object.assign(newData, clientData);
+    }
+  }
+  if (serverEndPoint?.load) {
+    const serverData = await serverEndPoint.load(serverParams);
+    if (serverData?.ok) {
+      Object.assign(newData, await serverData.json());
+    }
+  }
+  return newData;
+}
+function buildClientParams(url, params, data) {
+  return {
+    url,
+    params,
+    data
+  };
+}
+function buildServerParams(ev, url, params) {
+  return {
+    url,
+    params,
+    appData: {},
+    request: ev.request,
+    cookies: ev.cookies,
+    headers: ev.headers,
+    adapter: ev.adapter
+  };
+}
+export {
+  runTest
+};
+//# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/test/runTest.ts"],"sourcesContent":["import { type ServerComponent, type ServerSlotRender } from \"@torpor/view\";\nimport path from \"node:path\";\nimport notFound from \"../response/notFound.ts\";\nimport ok from \"../response/ok.ts\";\nimport seeOther from \"../response/seeOther.ts\";\nimport ServerEvent from \"../server/ServerEvent.ts\";\nimport Router from \"../site/Router.ts\";\nimport Site from \"../site/Site\";\nimport $page from \"../state/$page.ts\";\nimport type PageEndPoint from \"../types/PageEndPoint.ts\";\nimport type PageServerEndPoint from \"../types/PageServerEndPoint.ts\";\nimport RouteHandler from \"../types/RouteHandler.ts\";\nimport {\n\tHOOK_ROUTE,\n\tHOOK_SERVER_ROUTE,\n\tLAYOUT_ROUTE,\n\tLAYOUT_SERVER_ROUTE,\n\tPAGE_ROUTE,\n\tPAGE_SERVER_ROUTE,\n\tSERVER_ROUTE,\n} from \"../types/RouteType\";\nimport type ServerEndPoint from \"../types/ServerEndPoint.ts\";\nimport type ServerHook from \"../types/ServerHook.ts\";\nimport type ServerLoadEvent from \"../types/ServerLoadEvent.ts\";\n\nexport default async function runTest(site: Site, route: string): Promise<Response> {\n\tif (!route.startsWith(\"/\")) route += \"/\";\n\tconst req = new Request(`http://localhost${route}`);\n\tconst ev = new ServerEvent(req);\n\n\t// Build the router from the Site object created by the user\n\tconst router = new Router();\n\trouter.addPages(\n\t\tsite.routes.map((r) => ({\n\t\t\tpath: r.path,\n\t\t\ttype: r.type,\n\t\t\tendPoint: () => import(/* @vite-ignore */ path.join(site.root, r.file)),\n\t\t})),\n\t);\n\n\treturn await load(router, ev, \"%COMPONENT_HTML%\");\n}\n\n// HACK: This is a copy of serverEntry\n// TODO: Make it shared instead!\nasync function load(router: Router, ev: ServerEvent, template: string): Promise<Response> {\n\t//const url = new URL(`http://${process.env.HOST ?? \"localhost\"}${ev.request.url}`);\n\tconst url = new URL(ev.request.url);\n\tconst path = url.pathname;\n\tconst query = url.searchParams;\n\n\t//console.log(`handling ${ev.request.method} for '${path}'${query.size ? ` with ${query}` : \"\"}`);\n\n\tconst route = router.match(path, query);\n\tif (!route) {\n\t\treturn notFound();\n\t}\n\n\t// Update $page before building the components\n\t// TODO: Find somewhere better to put this\n\t$page.url = url;\n\n\tconst handler = route.handler;\n\tconst params = route.params || {};\n\n\t// TODO: Hit the server hook out here\n\t// We could maybe set data loading up as middleware on a route??????\n\n\tswitch (handler.type) {\n\t\tcase PAGE_ROUTE:\n\t\tcase LAYOUT_ROUTE: {\n\t\t\t// It's a /+page.ts or /_layout.ts endpoint\n\t\t\tif (ev.request.method === \"GET\") {\n\t\t\t\treturn await loadView(ev, url, handler, params, template);\n\t\t\t} else if (ev.request.method === \"POST\") {\n\t\t\t\treturn await runAction(ev, url, handler, params, query);\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase PAGE_SERVER_ROUTE:\n\t\tcase LAYOUT_SERVER_ROUTE: {\n\t\t\t// It's a /+page.server.ts or /_layout.server.ts endpoint\n\t\t\tif (ev.request.method === \"GET\") {\n\t\t\t\treturn await loadData(ev, url, handler, \"load\", params);\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase SERVER_ROUTE: {\n\t\t\t// It's a /+server.ts endpoint\n\t\t\tconst functionName = ev.request.method.toLowerCase().replace(\"delete\", \"del\");\n\t\t\treturn await loadData(ev, url, handler, functionName, params);\n\t\t}\n\t\tcase HOOK_ROUTE:\n\t\tcase HOOK_SERVER_ROUTE: {\n\t\t\tbreak;\n\t\t}\n\t}\n\n\treturn notFound();\n}\n\nasync function loadData(\n\tev: ServerEvent,\n\turl: URL,\n\thandler: RouteHandler,\n\tfunctionName: string,\n\tparams: Record<string, string>,\n) {\n\tconst serverEndPoint: ServerEndPoint | undefined = (await handler.endPoint()).default;\n\tif (serverEndPoint && serverEndPoint[functionName]) {\n\t\tconst serverParams = buildServerParams(ev, url, params);\n\n\t\tif (handler.serverHook) {\n\t\t\tconst serverHook: ServerHook | undefined = (await handler.serverHook()).default;\n\t\t\tif (serverHook?.handle) {\n\t\t\t\tawait serverHook.handle(serverParams);\n\t\t\t}\n\t\t}\n\n\t\tconst result = await serverEndPoint[functionName](serverParams);\n\n\t\t// If there was no response returned from load (such as errors or a\n\t\t// redirect), send an ok response\n\t\treturn result || ok();\n\t}\n\n\treturn notFound();\n}\n\nasync function loadView(\n\tev: ServerEvent,\n\turl: URL,\n\thandler: RouteHandler,\n\tparams: Record<string, string>,\n\ttemplate: string,\n) {\n\t// There must be a client endpoint with a component\n\tconst clientEndPoint: PageEndPoint | undefined = (await handler.endPoint()).default;\n\tif (!clientEndPoint?.component) {\n\t\treturn notFound();\n\t}\n\n\t// There may be a server endpoint\n\tconst serverEndPoint: PageServerEndPoint | undefined =\n\t\thandler.serverEndPoint && (await handler.serverEndPoint())?.default;\n\n\t// Maybe hit the server hook\n\tconst serverParams = buildServerParams(ev, url, params);\n\tif (handler.serverHook) {\n\t\tconst serverHook: ServerHook | undefined = (await handler.serverHook()).default;\n\t\tif (serverHook?.handle) {\n\t\t\tawait serverHook.handle(serverParams);\n\t\t}\n\t}\n\n\t// Pass the data into $props\n\t// TODO: Promise.all\n\t// NOTE: We're loading data from top to bottom, overriding as we go, and I'm not sure if this is the best way to go\n\tlet data = {};\n\tif (handler.layouts) {\n\t\tfor (let layout of handler.layouts) {\n\t\t\tconst layoutEndPoint: PageEndPoint | undefined = (await layout.endPoint())?.default;\n\t\t\tconst layoutServerEndPoint: PageServerEndPoint | undefined =\n\t\t\t\tlayout.serverEndPoint && (await layout.serverEndPoint())?.default;\n\t\t\tconst layoutData = await loadClientAndServerData(\n\t\t\t\turl,\n\t\t\t\tparams,\n\t\t\t\tserverParams,\n\t\t\t\tdata,\n\t\t\t\tlayoutEndPoint,\n\t\t\t\tlayoutServerEndPoint,\n\t\t\t);\n\t\t\tObject.assign(data, layoutData);\n\t\t}\n\t}\n\tlet endPointData = await loadClientAndServerData(\n\t\turl,\n\t\tparams,\n\t\tserverParams,\n\t\tdata,\n\t\tclientEndPoint,\n\t\tserverEndPoint,\n\t);\n\tObject.assign(data, endPointData);\n\tlet $props: Record<string, any> = { data };\n\n\t// If there are layouts, work our way upwards, pushing each component into\n\t// the default slot of its parent\n\t// TODO: Also handle layout server data\n\t// TODO: There's probably a nicer way to do this with reducers or something\n\t// TODO: Re-use parent layouts\n\tlet component = clientEndPoint.component as ServerComponent;\n\tlet slots: Record<string, ServerSlotRender> | undefined = undefined;\n\tif (handler.layouts) {\n\t\tlet slotFunctions: ServerSlotRender[] = [];\n\t\tslotFunctions[handler.layouts.length] = (_, context) =>\n\t\t\t(clientEndPoint.component as ServerComponent)($props, context);\n\t\tfor (let i = handler.layouts.length - 1; i >= 0; i--) {\n\t\t\tconst layoutEndPoint: PageEndPoint | undefined = (await handler.layouts[i].endPoint())\n\t\t\t\t?.default;\n\t\t\tif (layoutEndPoint?.component) {\n\t\t\t\tif (i === 0) {\n\t\t\t\t\tcomponent = layoutEndPoint.component as ServerComponent;\n\t\t\t\t\tslots = { _: slotFunctions[i + 1] };\n\t\t\t\t} else {\n\t\t\t\t\tslotFunctions[i] = (_, context) =>\n\t\t\t\t\t\t(layoutEndPoint.component as ServerComponent)($props, context, {\n\t\t\t\t\t\t\t_: slotFunctions[i + 1],\n\t\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\tlet html;\n\ttry {\n\t\thtml = component($props, undefined, slots);\n\t\thtml = template.replace(\"%COMPONENT_HTML%\", html);\n\t} catch (error) {\n\t\t// TODO: Show a proper Error component\n\t\thtml = '<span style=\"color: red\">Script syntax error</span><p>' + error + \"</p>\";\n\t\tconsole.log(error);\n\t}\n\n\treturn new Response(html, {\n\t\tstatus: 200,\n\t\theaders: {\n\t\t\t\"Content-Type\": \"text/html\",\n\t\t},\n\t});\n}\n\nasync function runAction(\n\tev: ServerEvent,\n\turl: URL,\n\thandler: RouteHandler,\n\tparams: Record<string, string>,\n\tquery: URLSearchParams,\n) {\n\tconst actionName = (Array.from(query.keys())[0] || \"default\").replace(/^\\//, \"\");\n\tconst serverEndPoint: PageServerEndPoint | undefined =\n\t\thandler.serverEndPoint && (await handler.serverEndPoint()).default;\n\tif (serverEndPoint?.actions) {\n\t\tconst action = serverEndPoint.actions[actionName];\n\t\tif (action) {\n\t\t\t// TODO: form.errors etc\n\t\t\tconst serverParams = buildServerParams(ev, url, params);\n\n\t\t\tif (handler.serverHook) {\n\t\t\t\tconst serverHook: ServerHook | undefined = (await handler.serverHook()).default;\n\t\t\t\tif (serverHook?.handle) {\n\t\t\t\t\tawait serverHook.handle(serverParams);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tconst result = await action(serverParams); // <--\n\n\t\t\t// If there was no response returned from the action (such as errors\n\t\t\t// or a redirect), reload the page by redirecting\n\t\t\treturn result || seeOther(url.pathname);\n\t\t}\n\t}\n\n\treturn notFound();\n}\n\nasync function loadClientAndServerData(\n\turl: URL,\n\tparams: Record<string, string>,\n\tserverParams: ServerLoadEvent,\n\tdata: Record<string, any>,\n\tclientEndPoint?: PageEndPoint,\n\tserverEndPoint?: PageServerEndPoint,\n) {\n\tlet newData = {};\n\tif (clientEndPoint?.load) {\n\t\tconst clientParams = buildClientParams(url, data, params);\n\t\tconst clientData = await clientEndPoint.load(clientParams);\n\t\tif (clientData) {\n\t\t\tObject.assign(newData, clientData);\n\t\t}\n\t}\n\tif (serverEndPoint?.load) {\n\t\tconst serverData = await serverEndPoint.load(serverParams);\n\t\tif (serverData?.ok) {\n\t\t\tObject.assign(newData, await serverData.json());\n\t\t}\n\t}\n\treturn newData;\n}\n\nfunction buildClientParams(url: URL, params: Record<string, string>, data: Record<string, any>) {\n\treturn {\n\t\turl,\n\t\tparams,\n\t\tdata,\n\t};\n}\n\nfunction buildServerParams(\n\tev: ServerEvent,\n\turl: URL,\n\tparams: Record<string, string>,\n): ServerLoadEvent {\n\treturn {\n\t\turl,\n\t\tparams,\n\t\tappData: {},\n\t\trequest: ev.request,\n\t\tcookies: ev.cookies,\n\t\theaders: ev.headers,\n\t\tadapter: ev.adapter,\n\t};\n}\n"],"mappings":"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","names":["path"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/build",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "A framework for building sites and apps with Torpor",
   "type": "module",
   "main": "dist/index.cjs",
@@ -32,6 +32,11 @@
       "import": "./dist/server.js",
       "require": "./dist/server.cjs"
     },
+    "./test": {
+      "types": "./dist/test.d.ts",
+      "import": "./dist/test.js",
+      "require": "./dist/test.cjs"
+    },
     "./manifest": {
       "types": "./src/types/manifest.d.ts"
     }
@@ -48,20 +53,20 @@
   "dependencies": {
     "cookie": "^1.0.2",
     "dotenv": "^16.5.0",
-    "vite": "^6.2.6",
+    "vite": "^6.3.5",
     "vite-tsconfig-paths": "^5.1.4",
     "@torpor/view": "^0.0.11",
-    "@torpor/unplugin": "^0.1.5"
+    "@torpor/unplugin": "^0.1.6"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
     "tsup": "^8.4.0",
-    "tsx": "^4.19.3",
+    "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.1"
+    "vitest": "^3.1.3"
   },
   "scripts": {
-    "build": "tsup",
+    "build": "tsc --noEmit && tsup",
     "build:watch": "tsup --watch",
     "check": "tsc --noEmit",
     "test": "vitest"

package/src/response/response.ts

@@ -5,7 +5,7 @@
  * header set to "application/json". Otherwise, if the body is a string, the
  * content-type header will be set to "text/plain".
  */
-export default function response(status: number, body?: object | string) {
+export default function response(status: number, body?: object | string): Response {
 	let headers: Record<string, string> | undefined = undefined;
 	if (body) {
 		if (typeof body === "object") {

package/src/server/CookieHelper.ts

@@ -18,7 +18,7 @@ export default class CookieHelper {
 		return parse(header ?? "")[name];
 	}
 
-	set(name: string, value: string, options?: SerializeOptions) {
+	set(name: string, value: string, options?: SerializeOptions): void {
 		// Set a cookie header with some default values for security
 		options ??= {};
 		options.httpOnly ??= true;
@@ -27,7 +27,7 @@ export default class CookieHelper {
 		this.cookies.set(name, serialize(name, value, options));
 	}
 
-	delete(name: string, options?: SerializeOptions) {
+	delete(name: string, options?: SerializeOptions): void {
 		// Set a cookie header with an immediate expiry date
 		options ??= {};
 		options.expires = new Date(0);

package/src/server/HeaderHelper.ts

@@ -15,11 +15,11 @@ export default class HeaderHelper {
 		return this.request.headers.get(name) ?? undefined;
 	}
 
-	set(name: string, value: string) {
+	set(name: string, value: string): void {
 		this.headers.set(name, value);
 	}
 
-	delete(name: string) {
+	delete(name: string): void {
 		this.headers.delete(name);
 	}
 }

package/src/server/Routerx.ts

@@ -6,7 +6,7 @@ import type ServerFunction from "./types/ServerFunction";
 // This is not actually used anywhere, for now at least
 
 export default class Router {
-	methods = new Map<HttpMethod, RouteHandler[]>();
+	methods: Map<HttpMethod, RouteHandler[]> = new Map<HttpMethod, RouteHandler[]>();
 	middleware: MiddlewareHandler[] = [];
 
 	constructor() {
@@ -28,7 +28,7 @@ export default class Router {
 		return this;
 	}
 
-	match(method: HttpMethod, path: string) {
+	match(method: HttpMethod, path: string): Match | undefined {
 		for (let handler of this.methods.get(method)!) {
 			let match = path.match(handler.regex);
 			if (match) {
@@ -65,3 +65,8 @@ class MiddlewareHandler {
 		this.fn = fn;
 	}
 }
+
+type Match = {
+	fn: ServerFunction;
+	params?: Record<string, string>;
+};

package/src/server/Server.ts

@@ -74,7 +74,7 @@ export default class Server {
 		return this;
 	}
 
-	match(path: string) {
+	match(path: string): Match | undefined {
 		for (let handler of this.routes) {
 			let match = path.match(handler.regex);
 			if (match) {
@@ -137,3 +137,8 @@ class RouteHandler {
 //		this.fn = fn;
 //	}
 //}
+
+type Match = {
+	fn: ServerFunction;
+	params?: Record<string, string>;
+};

package/src/server/ServerEvent.ts

@@ -23,7 +23,7 @@ export default class ServerEvent {
 		this.adapter = globalThis.adapter;
 	}
 
-	addHeaders() {
+	addHeaders(): void {
 		if (!this.response) {
 			throw new Error("Response not created yet");
 		}

package/src/server/contentType.ts

@@ -1,6 +1,6 @@
 // From https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/MIME_types/Common_types
 
-export default function contentType(extension: string) {
+export default function contentType(extension: string): string {
 	return types[extension] || "application/octet-stream";
 }
 

package/src/site/Router.ts

@@ -16,7 +16,7 @@ export default class Router {
 	//	this.addPage(route, file);
 	//}
 
-	addPages(routes: ManifestRoute[]) {
+	addPages(routes: ManifestRoute[]): this {
 		for (let r of routes) {
 			this.routes.push(
 				new Route(r.path, {
@@ -31,7 +31,7 @@ export default class Router {
 	}
 
 	// TODO: Allow calling with the endpoint itself, so that you can setup an app with no scaffold
-	addPage(path: string, type: number, endPoint: () => Promise<any>) {
+	addPage(path: string, type: number, endPoint: () => Promise<any>): this {
 		this.routes.push(
 			new Route(path, {
 				path,
@@ -53,7 +53,7 @@ export default class Router {
 	}
 	*/
 
-	match(path: string, query: URLSearchParams) {
+	match(path: string, query: URLSearchParams): Match | undefined {
 		for (let route of this.routes) {
 			let match = path.match(route.regex);
 			if (match) {
@@ -157,3 +157,9 @@ class Route {
 		this.handler = handler;
 	}
 }
+
+type Match = {
+	handler: RouteHandler;
+	params?: Record<string, string>;
+	query: URLSearchParams;
+};

package/src/site/Site.ts

@@ -33,12 +33,18 @@ export default class Site {
 	plugins: Plugin[] = [tsconfigPaths({ loose: true })];
 	// Is default adapter a bad idea?
 	adapter: Adapter = defaultAdapter;
+	/**
+	 * Extra inputs, as absolute file paths, that will be compiled with the
+	 * output. What you do with them after that is up to you. File paths ending
+	 * with server.ts/js will only be compiled with the server output
+	 */
+	inputs: string[] = [];
 
 	constructor() {
 		this.root = process.cwd();
 	}
 
-	async addRouteFolder(folder: string) {
+	async addRouteFolder(folder: string): Promise<void> {
 		const routeFolder = path.join(this.root, folder);
 		const routeFiles = await fs.readdir(routeFolder, { recursive: true });
 
@@ -63,7 +69,7 @@ export default class Site {
 		this.#sortRoutes();
 	}
 
-	addRouteFile(path: string, file: string) {
+	addRouteFile(path: string, file: string): void {
 		let type = this.#routeType(file);
 		this.routes.push({ path, file, type });
 		this.#sortRoutes();

package/src/site/prepareTemplate.ts

@@ -1,4 +1,4 @@
-export default function prepareTemplate(template: string, clientScript: string) {
+export default function prepareTemplate(template: string, clientScript: string): string {
 	let contentStart = regexIndexOf(template, /\<div\s+id=("app"|'app'|app)\s+/);
 	contentStart = template.indexOf(">", contentStart) + 1;
 	let contentEnd = template.indexOf("</div>", contentStart);

package/src/site/run.ts

@@ -6,7 +6,10 @@ import runBuild from "./runBuild";
 import runDev from "./runDev";
 import runPreview from "./runPreview";
 
-export default async function run(folder: string, mode: "dev" | "build" | "preview") {
+export default async function run(
+	folder: string,
+	mode: "dev" | "build" | "preview",
+): Promise<void> {
 	// Look for and load a site.config.js/ts file in the working directory
 	let configFile = "";
 	let deleteConfigFile = false;
@@ -19,12 +22,11 @@ export default async function run(folder: string, mode: "dev" | "build" | "previ
 		// If it's TS, we need to convert it to JS
 		// TODO: Put the generated file somewhere better (dist?)
 		configFile = path.join(folder, "site.config.temp.js");
-		let source = (
-			await transformWithEsbuild(fs.readFileSync(tsConfigFile, "utf-8"), tsConfigFile, {
-				loader: "ts",
-			})
-		).code;
-		fs.writeFileSync(configFile, source);
+		let source = fs.readFileSync(tsConfigFile, "utf-8");
+		let transformed = await transformWithEsbuild(source, tsConfigFile, {
+			loader: "ts",
+		});
+		fs.writeFileSync(configFile, transformed.code);
 		deleteConfigFile = true;
 	} else {
 		throw new Error("site.config file not found");

package/src/site/runBuild.ts

@@ -10,7 +10,7 @@ import manifest from "./manifest.ts";
 // TODO: Don't reload layouts during client routing
 // TODO: Call the correct +page and +server routes when in the same folder
 
-export default async function runBuild(site: Site) {
+export default async function runBuild(site: Site): Promise<void> {
 	// Delete the dist folder if it exists
 	const distFolder = path.resolve(site.root, "dist");
 	if (existsSync(distFolder)) {
@@ -36,12 +36,7 @@ export default async function runBuild(site: Site) {
 	// EXCLUDING anything with `server.js` in the name
 	await build(
 		defineConfig({
-			plugins: [
-				manifest(site),
-				// @ts-ignore
-				torpor(),
-				...site.plugins,
-			],
+			plugins: [manifest(site), torpor(), ...site.plugins],
 			build: {
 				outDir: clientFolder,
 				rollupOptions: {
@@ -51,6 +46,7 @@ export default async function runBuild(site: Site) {
 						...site.routes
 							.filter((r) => !/server\.(ts|js)$/.test(r.file))
 							.map((r) => path.resolve(site.root, r.file)),
+						...site.inputs.filter((f) => !/server\.(ts|js)$/.test(f)),
 					],
 				},
 				ssrManifest: true,
@@ -62,16 +58,15 @@ export default async function runBuild(site: Site) {
 	// files
 	await build(
 		defineConfig({
-			plugins: [
-				manifest(site, true),
-				// @ts-ignore
-				torpor(),
-				...site.plugins,
-			],
+			plugins: [manifest(site, true), torpor(), ...site.plugins],
 			build: {
 				outDir: serverFolder,
 				rollupOptions: {
-					input: [serverScript, ...site.routes.map((r) => path.resolve(site.root, r.file))],
+					input: [
+						serverScript,
+						...site.routes.map((r) => path.resolve(site.root, r.file)),
+						...site.inputs,
+					],
 				},
 				ssr: serverScript,
 			},

package/src/site/runDev.ts

@@ -10,7 +10,7 @@ import Site from "./Site.ts";
 import manifest from "./manifest.ts";
 import prepareTemplate from "./prepareTemplate.ts";
 
-export default async function runDev(site: Site) {
+export default async function runDev(site: Site): Promise<void> {
 	const server = new Server();
 
 	// Create the Vite server in middleware mode and configure the app type as
@@ -19,12 +19,7 @@ export default async function runDev(site: Site) {
 	const vite = await createViteServer({
 		server: { middlewareMode: true },
 		appType: "custom",
-		plugins: [
-			manifest(site, true),
-			// @ts-ignore not sure...
-			torpor(),
-			...site.plugins,
-		],
+		plugins: [manifest(site, true), torpor(), ...site.plugins],
 	});
 
 	// Read site.html
@@ -46,7 +41,7 @@ export default async function runDev(site: Site) {
 	// Prepare site.html so that we can just splice components into it
 	template = prepareTemplate(template, clientScript);
 
-	// Use vite's Connect instance as middleware. We need to wrap it with
+	// Use Vite's Connect instance as middleware. We need to wrap it with
 	// createMiddlewareHandler that converts Connect middleware to
 	// Request/Response web handlers
 	server.use(connectMiddleware(vite.middlewares));

package/src/site/runPreview.ts

@@ -8,7 +8,7 @@ import Site from "./Site";
 import prepareTemplate from "./prepareTemplate.ts";
 import runBuild from "./runBuild";
 
-export default async function runPreview(site: Site) {
+export default async function runPreview(site: Site): Promise<void> {
 	// Build the site
 	await runBuild(site);
 

package/src/site/serverEntry.ts

@@ -28,7 +28,7 @@ router.addPages(manifest.routes);
 
 //console.log(`routes:\n  ${router.routes.map((r) => r.path).join("\n  ")}`);
 
-export async function load(ev: ServerEvent, template: string) {
+export async function load(ev: ServerEvent, template: string): Promise<Response> {
 	//const url = new URL(`http://${process.env.HOST ?? "localhost"}${ev.request.url}`);
 	const url = new URL(ev.request.url);
 	const path = url.pathname;

package/src/state/$page.ts

@@ -1,6 +1,11 @@
 import { $watch } from "@torpor/view";
 
-const $page = $watch(
+type Page = {
+	status: number;
+	url: URL;
+};
+
+const $page: Page = $watch(
 	{
 		status: 404,
 		url: new URL("http://localhost"),