@torpor/build 0.1.25 → 0.1.26

package/src/site/Site.ts

@@ -1,5 +1,5 @@
 import { promises as fs } from "node:fs";
-import path from "node:path";
+import fpath from "node:path";
 import { type Plugin, type UserConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 import type Adapter from "../types/Adapter";
@@ -11,6 +11,7 @@ import {
 	LAYOUT_SERVER_ROUTE,
 	PAGE_ROUTE,
 	PAGE_SERVER_ROUTE,
+	RouteType,
 	SERVER_ROUTE,
 } from "../types/RouteType";
 import defaultAdapter from "./defaultAdapter";
@@ -26,7 +27,7 @@ import defaultAdapter from "./defaultAdapter";
  */
 export default class Site {
 	root: string;
-	routes: { path: string; file: string; type: number }[] = [];
+	routes: { path: string; file: string; type: RouteType }[] = [];
 	// Is default plugins a bad idea?
 	// HACK: Set loose because otherwise it uses a list of allowed extensions
 	// TODO: Should probably just do this ourselves and let the user pass in
@@ -52,38 +53,65 @@ export default class Site {
 		this.root = process.cwd();
 	}
 
+	/**
+	 * Adds a folder of routes, based on the names of the files in the folder
+	 * @param folder The folder containing the routes
+	 */
 	async addRouteFolder(folder: string): Promise<void> {
-		const routeFolder = path.join(this.root, folder);
+		const routeFolder = fpath.join(this.root, folder);
 		const routeFiles = await fs.readdir(routeFolder, { recursive: true });
-
 		for (let file of routeFiles) {
 			// The file must start with `+` or `_` and end with `.js` or `.ts`
-			if (/^(\+|_).+(\.js|\.ts)$/.test(path.basename(file))) {
-				let routePath = file
-					.replace(/^\//, "")
-					.replace(/(\.ts|\.js)$/, "")
-					.replace(/_hook.server$/, "_hook/~server")
-					.replace(/_layout.server$/, "_layout/~server")
-					.replace(/\+page.server$/, "~server")
-					.replace(/\+server$/, "")
-					.replace(/\+page$/, "")
-					.replace(/\/$/, "");
-				routePath = routePath.length > 0 ? `/${routePath}` : "/";
+			if (/^(\+|_).+(\.js|\.ts)$/.test(fpath.basename(file))) {
+				let routePath = this.#routePath(file);
 				let type = this.#routeType(file);
-				file = path.relative(this.root, path.resolve(routeFolder, file));
+				file = fpath.relative(this.root, fpath.resolve(routeFolder, file));
 				this.routes.push({ path: routePath, file, type });
 			}
 		}
 		this.#sortRoutes();
 	}
 
-	addRouteFile(path: string, file: string): void {
-		let type = this.#routeType(file);
-		this.routes.push({ path, file, type });
+	/**
+	 * Adds a file route, which can have a standard name (e.g. +page.ts) or any
+	 * name if you pass the type
+	 * @param path The route path
+	 * @param file The file
+	 * @param type The file type (if the file name is non-standard)
+	 */
+	addRouteFile(
+		path: string,
+		file: string,
+		type?:
+			| "+page"
+			| "+page.server"
+			| "+server"
+			| "_layout"
+			| "_layout.server"
+			| "_hook"
+			| "_hook.server"
+			| "_error",
+	): void {
+		let routePath = this.#routePath(fpath.join(path, type ?? fpath.basename(file)));
+		let routeType = type ? this.#routeTypeFromString(type) : this.#routeType(file);
+		this.routes.push({ path: routePath, file, type: routeType });
 		this.#sortRoutes();
 	}
 
-	#routeType(file: string): number {
+	#routePath(file: string): string {
+		let routePath = file
+			.replace(/^\//, "")
+			.replace(/(\.ts|\.js)$/, "")
+			.replace(/_hook.server$/, "_hook/~server")
+			.replace(/_layout.server$/, "_layout/~server")
+			.replace(/\+page.server$/, "~server")
+			.replace(/\+server$/, "")
+			.replace(/\+page$/, "")
+			.replace(/\/$/, "");
+		return routePath.length > 0 ? `/${routePath}` : "/";
+	}
+
+	#routeType(file: string): RouteType {
 		let routePath = file.replace(/^\//, "").replace(/(\.ts|\.js)$/, "");
 		if (routePath.endsWith("+page")) {
 			return PAGE_ROUTE;
@@ -105,6 +133,37 @@ export default class Site {
 		return -1;
 	}
 
+	#routeTypeFromString(
+		type:
+			| "+page"
+			| "+page.server"
+			| "+server"
+			| "_layout"
+			| "_layout.server"
+			| "_hook"
+			| "_hook.server"
+			| "_error",
+	) {
+		switch (type) {
+			case "+page":
+				return PAGE_ROUTE;
+			case "+page.server":
+				return PAGE_SERVER_ROUTE;
+			case "+server":
+				return SERVER_ROUTE;
+			case "_layout":
+				return LAYOUT_ROUTE;
+			case "_layout.server":
+				return LAYOUT_SERVER_ROUTE;
+			case "_hook":
+				return HOOK_ROUTE;
+			case "_hook.server":
+				return HOOK_SERVER_ROUTE;
+			case "_error":
+				return ERROR_ROUTE;
+		}
+	}
+
 	// TODO: You could make your site in a single file, like e.g. Hono...
 	//addPage(path: string, endPoint: PageEndPoint, serverEndPoint?: PageServerEndPoint) {}
 	//addEndPoint(path: string, endPoint: ServerEndPoint) {}

package/src/types/RouteType.ts

@@ -6,3 +6,14 @@ export const LAYOUT_SERVER_ROUTE = 5;
 export const HOOK_ROUTE = 6;
 export const HOOK_SERVER_ROUTE = 7;
 export const ERROR_ROUTE = 8;
+
+export type RouteType =
+	| typeof PAGE_ROUTE
+	| typeof PAGE_SERVER_ROUTE
+	| typeof SERVER_ROUTE
+	| typeof LAYOUT_ROUTE
+	| typeof LAYOUT_SERVER_ROUTE
+	| typeof HOOK_ROUTE
+	| typeof HOOK_SERVER_ROUTE
+	| typeof ERROR_ROUTE
+	| -1;