@torpor/build 0.0.1 → 0.0.2

package/src/index.ts

@@ -1,12 +1,12 @@
 import buildRoutePath from "./site/buildRoutePath";
 import defineConfig from "./site/defineConfig";
-import type PageEndPoint from "./types/PageEndPoint";
-import type PageEvent from "./types/PageEvent";
-import type PageServerEndPoint from "./types/PageServerEndPoint";
-import type ServerEndPoint from "./types/ServerEndPoint";
-import type ServerEvent from "./types/ServerEvent";
-import type ServerHook from "./types/ServerHook";
-import type UserConfig from "./types/UserConfig";
+import { type PageEndPoint } from "./types/PageEndPoint";
+import { type PageEvent } from "./types/PageEvent";
+import { type PageServerEndPoint } from "./types/PageServerEndPoint";
+import { type ServerEndPoint } from "./types/ServerEndPoint";
+import { type ServerEvent } from "./types/ServerEvent";
+import { type ServerHook } from "./types/ServerHook";
+import { type UserConfig } from "./types/UserConfig";
 
 // NOTE: Do not export anything that relies on vinxi/vite from here, or it will
 // cause problems when they are re-imported when routes are lazily loaded

package/src/response/serverError.ts

@@ -1,6 +1,8 @@
 import response from "./response";
 
 /**
+ * 500 Server Error
+ *
  * The server has encountered a situation it does not know how to handle.
  *
  * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/500

package/src/response/unauthorized.ts

@@ -1,6 +1,8 @@
 import response from "./response";
 
 /**
+ * 401 Unauthorized
+ *
  * Although the HTTP standard specifies "unauthorized", semantically this
  * response means "unauthenticated". That is, the client must authenticate
  * itself to get the requested response.

package/src/site/FileSystemRouter.ts

@@ -4,6 +4,7 @@ export default class FileSystemRouter extends BaseFileSystemRouter {
 	toPath(src: string) {
 		let routePath = cleanPath(src, this.config)
 			.replace(/^\//, "")
+			.replace(/_hook.server$/, "_hook/~server")
 			.replace(/_layout.server$/, "_layout/~server")
 			.replace(/\+page.server$/, "~server")
 			.replace(/\+page$/, "")

package/src/site/clientEntry.ts

@@ -1,9 +1,9 @@
 import { hydrate, mount } from "@torpor/view";
-import type { Component, SlotRender } from "@torpor/view";
+import { type Component, type SlotRender } from "@torpor/view";
 import "vinxi/client";
 import $page from "../state/$page";
-import type PageEndPoint from "../types/PageEndPoint";
-import type PageServerEndPoint from "../types/PageServerEndPoint";
+import { type PageEndPoint } from "../types/PageEndPoint";
+import { type PageServerEndPoint } from "../types/PageServerEndPoint";
 import routeHandlers from "./routeHandlers";
 
 // Intercept clicks on links

package/src/site/defineConfig.ts

@@ -1,5 +1,75 @@
-import type UserConfig from "../types/UserConfig";
+import torpor from "@torpor/unplugin/vite";
+import path from "node:path";
+import { type AppOptions, type RouterSchemaInput, createApp } from "vinxi";
+import { config } from "vinxi/plugins/config";
+import { type UserConfig } from "../types/UserConfig";
+import FileSystemRouter from "./FileSystemRouter";
 
-export default function defineConfig(config: UserConfig): UserConfig {
-	return config;
+export default function defineConfig(options?: UserConfig) {
+	// Set the port
+	process.env.PORT = (options?.port || 7059).toString();
+
+	// Get Vinxi to create and serve the app
+	return createApp({
+		name: "torpor",
+		routers: [
+			{
+				name: "assets",
+				type: "static",
+				dir: "./src/assets",
+			},
+			// Doesn't look like we can have two server routes?
+			// Have to put api in /routes
+			// Maybe we can support having /routes/api and routes/site and stripping /site from the start?
+			//{
+			//	name: "api",
+			//	type: "http",
+			//	target: "server",
+			//	// TODO: change this when published
+			//	handler: "node_modules/@torpor/build/src/site/serverEntry.ts",
+			//	routes: apiRoutes,
+			//	plugins: () => [config("custom", viteOptions())],
+			//},
+			{
+				name: "server",
+				type: "http",
+				target: "server",
+				// TODO: change this when published
+				handler: "./node_modules/@torpor/build/src/site/serverEntry.ts",
+				routes,
+				plugins: () => [config("custom", viteOptions()), torpor({ server: true })],
+			},
+			{
+				name: "client",
+				type: "client",
+				target: "browser",
+				// TODO: change this when published
+				handler: "./node_modules/@torpor/build/src/site/clientEntry.ts",
+				base: "/_build",
+				routes,
+				plugins: () => [config("custom", viteOptions()), torpor()],
+			},
+		],
+	});
+}
+
+function routes(router: RouterSchemaInput, app: AppOptions) {
+	return new FileSystemRouter(
+		{
+			dir: path.resolve("src/routes"),
+			extensions: ["js", "ts"],
+		},
+		router,
+		app,
+	);
+}
+
+function viteOptions() {
+	return {
+		resolve: {
+			alias: {
+				"@": path.resolve("src"),
+			},
+		},
+	};
 }

package/src/site/routeHandlers.ts

@@ -1,8 +1,8 @@
 import { getManifest } from "vinxi/manifest";
-import fileRoutes, { RouteModule } from "vinxi/routes";
-import type RouteHandler from "../types/RouteHandler";
-import type RouteHandlerCollection from "../types/RouteHandlerCollection";
-import type RouteLayoutHandler from "../types/RouteLayoutHandler";
+import fileRoutes, { type RouteModule } from "vinxi/routes";
+import { type RouteHandler } from "../types/RouteHandler";
+import { type RouteHandlerCollection } from "../types/RouteHandlerCollection";
+import { type RouteLayoutHandler } from "../types/RouteLayoutHandler";
 import lazyRoute from "./lazyRoute";
 
 const clientManifest = getManifest("client");
@@ -16,11 +16,13 @@ const routeHandlers: RouteHandlerCollection = {
 			return {
 				...route,
 				regex: pathToRegExp(route.path),
+				order: /\[([^\/]+?)\]/.test(route.path) ? 1 : 0,
 				// TODO: Implement the rest of the lazyRoute stuff from vinxi/react or vinxi/solid
 				endPoint: lazyRoute(route.$handler, clientManifest, serverManifest),
 				loaded: false,
 			};
-		}),
+		})
+		.sort((a, b) => a.order - b.order),
 	match(path, urlParams) {
 		console.log("matching", path);
 
@@ -102,7 +104,7 @@ function findServer(path: string, fileRoutes: RouteModule[]): Promise<any> | und
 
 function findServerHook(path: string, fileRoutes: RouteModule[]): Promise<any> | undefined {
 	// TODO: Should this be a collection, like layouts?
-	let hookPath = "/_hook.server";
+	let hookPath = "/_hook/~server";
 	if (path.startsWith("/api/")) {
 		hookPath = "/api" + hookPath;
 	}

package/src/site/serverEntry.ts

@@ -1,21 +1,21 @@
-import type { ServerComponent, ServerSlotRender } from "@torpor/view";
-import fs from "fs";
+import { type ServerComponent, type ServerSlotRender } from "@torpor/view";
+import fs from "node:fs";
 import { IncomingMessage } from "node:http";
-import path from "path";
+import path from "node:path";
 import { deleteCookie, eventHandler, getCookie, setCookie } from "vinxi/http";
-import type { CookieSerializeOptions, EventHandlerRequest, H3Event } from "vinxi/http";
+import { type CookieSerializeOptions, type EventHandlerRequest, H3Event } from "vinxi/http";
 import { getManifest } from "vinxi/manifest";
-import { ServerEndPoint } from "..";
 import notFound from "../response/notFound";
 import ok from "../response/ok";
 import seeOther from "../response/seeOther";
 import serverError from "../response/serverError";
 import $page from "../state/$page";
-import type PageEndPoint from "../types/PageEndPoint";
-import type PageServerEndPoint from "../types/PageServerEndPoint";
-import type RouteHandler from "../types/RouteHandler";
-import type ServerEvent from "../types/ServerEvent";
-import type ServerHook from "../types/ServerHook";
+import { type PageEndPoint } from "../types/PageEndPoint";
+import { type PageServerEndPoint } from "../types/PageServerEndPoint";
+import { type RouteHandler } from "../types/RouteHandler";
+import { type ServerEndPoint } from "../types/ServerEndPoint";
+import { type ServerEvent } from "../types/ServerEvent";
+import { type ServerHook } from "../types/ServerHook";
 import routeHandlers from "./routeHandlers";
 
 let printedRoutes = false;

package/src/types/CookieHelper.ts

@@ -1,7 +1,7 @@
-import { CookieSerializeOptions } from "vinxi/http";
+import { type CookieSerializeOptions } from "vinxi/http";
 
-export default interface CookieHelper {
+export type CookieHelper = {
 	get: (name: string) => string | undefined;
 	set: (name: string, value: string, options?: CookieSerializeOptions) => void;
 	delete: (name: string, options?: CookieSerializeOptions) => void;
-}
+};

package/src/types/PageEndPoint.ts

@@ -1,10 +1,10 @@
-import type { Component } from "@torpor/view";
-import type PageEvent from "./PageEvent";
+import { type Component } from "@torpor/view";
+import { type PageEvent } from "./PageEvent";
 
 /**
  * For +page.
  */
-export default interface PageEndPoint {
+export type PageEndPoint = {
 	/**
 	 * Builds the route path for the page in a type-safe manner.
 	 * TODO: Not sure this is actually the best way to do it...
@@ -23,7 +23,7 @@ export default interface PageEndPoint {
 	 * The head element data for the page, which may include a <title> and <meta> elements.
 	 */
 	head?: HeadElement[] | ((event: PageEvent) => HeadElement[]);
-}
+};
 
 type HeadElement = TitleElement | MetaElement;
 

package/src/types/PageEvent.ts

@@ -1,4 +1,4 @@
-export default interface PageEvent {
+export type PageEvent = {
 	/**
 	 * The URL for the server function.
 	 */
@@ -11,4 +11,4 @@ export default interface PageEvent {
 	 * Data that is (optionally) loaded from the load function and passed into the page as $props.data.
 	 */
 	data: Record<string, any>;
-}
+};

package/src/types/PageServerEndPoint.ts

@@ -1,9 +1,9 @@
-import ServerEvent from "./ServerEvent";
+import { type ServerEvent } from "./ServerEvent";
 
 /**
  * For +page.server.
  */
-export default interface PageServerEndPoint {
+export type PageServerEndPoint = {
 	/**
 	 * Loads data from the server for a page.
 	 */
@@ -12,7 +12,7 @@ export default interface PageServerEndPoint {
 	 * A map of actions that can be performed on the server for a page, generally from a form submit.
 	 */
 	actions?: Record<string, ServerAction>;
-}
+};
 
 type ServerLoad = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
 type ServerAction = (event: ServerEvent) => Response | Promise<Response | undefined> | void;

package/src/types/RouteHandler.ts

@@ -1,6 +1,6 @@
-import RouteLayoutHandler from "./RouteLayoutHandler";
+import { type RouteLayoutHandler } from "./RouteLayoutHandler";
 
-export default interface RouteHandler {
+export type RouteHandler = {
 	path: string;
 	regex: RegExp;
 	endPoint: Promise<any>;
@@ -9,4 +9,4 @@ export default interface RouteHandler {
 	layouts?: RouteLayoutHandler[];
 	serverEndPoint?: Promise<any>;
 	serverHook?: Promise<any>;
-}
+};

package/src/types/RouteHandlerCollection.ts

@@ -1,7 +1,7 @@
-import type RouteHandler from "./RouteHandler";
-import type RouteMatchResult from "./RouteMatchResult";
+import { type RouteHandler } from "./RouteHandler";
+import { type RouteMatchResult } from "./RouteMatchResult";
 
-export default interface RouteHandlerCollection {
+export type RouteHandlerCollection = {
 	handlers: RouteHandler[];
 	match(path: string, urlParams?: URLSearchParams): RouteMatchResult | undefined;
-}
+};

package/src/types/RouteLayoutHandler.ts

@@ -1,5 +1,5 @@
-export default interface RouteLayoutHandler {
+export type RouteLayoutHandler = {
 	path: string;
 	endPoint: Promise<any>;
 	serverEndPoint?: Promise<any>;
-}
+};

package/src/types/RouteMatchResult.ts

@@ -1,7 +1,7 @@
-import type RouteHandler from "./RouteHandler";
+import { type RouteHandler } from "./RouteHandler";
 
-export default interface RouteMatchResult {
+export type RouteMatchResult = {
 	handler: RouteHandler;
 	routeParams?: Record<string, string>;
 	urlParams?: Record<string, string>;
-}
+};

package/src/types/ServerEndPoint.ts

@@ -1,9 +1,9 @@
-import ServerEvent from "./ServerEvent";
+import { type ServerEvent } from "./ServerEvent";
 
 /**
  * For +server.
  */
-export default interface ServerEndPoint {
+export type ServerEndPoint = { [key: string]: ServerRequest } & {
 	/**
 	 * Performs a GET.
 	 */
@@ -32,6 +32,6 @@ export default interface ServerEndPoint {
 	 * Perfroms a HEAD request.
 	 */
 	head?: ServerRequest;
-}
+};
 
 type ServerRequest = (event: ServerEvent) => Response | Promise<Response | undefined> | void;

package/src/types/ServerEvent.ts

@@ -1,7 +1,7 @@
 import { ServerResponse } from "node:http";
-import CookieHelper from "./CookieHelper";
+import { type CookieHelper } from "./CookieHelper";
 
-export default interface ServerEvent {
+export type ServerEvent = {
 	/**
 	 * The URL for the server function.
 	 */
@@ -24,4 +24,4 @@ export default interface ServerEvent {
 	 * A helper for getting and setting cookie data.
 	 */
 	cookies: CookieHelper;
-}
+};

package/src/types/ServerHook.ts

@@ -1,13 +1,13 @@
-import ServerEvent from "./ServerEvent";
+import { type ServerEvent } from "./ServerEvent";
 
 /**
  * For _hook.server.
  */
-export default interface ServerHook {
+export type ServerHook = {
 	/**
 	 * Called on each server request.
 	 */
 	handle?: ServerLoad;
-}
+};
 
 type ServerLoad = (event: ServerEvent) => Promise<void> | void;

package/src/types/UserConfig.ts

@@ -1,3 +1,3 @@
-export default interface UserConfig {
+export type UserConfig = {
 	port?: number;
-}
+};

package/src/vite-env.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="vite/client" />
+/// <reference types="vite/types/importMeta.d.ts" />

package/tsconfig.json

@@ -1,4 +1,9 @@
 {
-	"extends": "../tsconfig",
-	"include": ["tsup.config.ts"]
+	"extends": "../../tsconfig.json",
+	"compilerOptions": {
+		// TODO: We should be using the tsconfig from the site
+		"skipLibCheck": true,
+		"verbatimModuleSyntax": false
+	},
+	"include": ["src"]
 }

package/src/site/defineSite.ts

@@ -1,74 +0,0 @@
-import torpor from "@torpor/unplugin/vite";
-import path from "path";
-import { AppOptions, RouterSchemaInput, createApp } from "vinxi";
-import { config } from "vinxi/plugins/config";
-import type UserConfig from "../types/UserConfig";
-import FileSystemRouter from "./FileSystemRouter";
-
-export default function defineSite(options?: UserConfig) {
-	// Set the port
-	process.env.PORT = (options?.port || 7059).toString();
-
-	// Get Vinxi to create and serve the app
-	return createApp({
-		routers: [
-			{
-				name: "assets",
-				type: "static",
-				dir: "./src/assets",
-			},
-			// Doesn't look like we can have two server routes?
-			// Have to put api in /routes
-			// Maybe we can support having /routes/api and routes/site and stripping /site from the start?
-			//{
-			//	name: "api",
-			//	type: "http",
-			//	target: "server",
-			//	// TODO: change this when published
-			//	handler: "node_modules/@torpor/build/src/site/serverEntry.ts",
-			//	routes: apiRoutes,
-			//	plugins: () => [config("custom", viteOptions())],
-			//},
-			{
-				name: "server",
-				type: "http",
-				target: "server",
-				// TODO: change this when published
-				handler: "node_modules/@torpor/build/src/site/serverEntry.ts",
-				routes,
-				plugins: () => [config("custom", viteOptions()), torpor({ server: true })],
-			},
-			{
-				name: "client",
-				type: "client",
-				target: "browser",
-				// TODO: change this when published
-				handler: "node_modules/@torpor/build/src/site/clientEntry.ts",
-				base: "/_build",
-				routes,
-				plugins: () => [config("custom", viteOptions()), torpor()],
-			},
-		],
-	});
-}
-
-function routes(router: RouterSchemaInput, app: AppOptions) {
-	return new FileSystemRouter(
-		{
-			dir: path.resolve("src/routes"),
-			extensions: ["js", "ts"],
-		},
-		router,
-		app,
-	);
-}
-
-function viteOptions() {
-	return {
-		resolve: {
-			alias: {
-				"@": path.resolve("src"),
-			},
-		},
-	};
-}