@torpor/build 0.1.34 → 0.3.0

package/src/test/runTest.ts

@@ -9,7 +9,7 @@ import Site from "../site/Site";
 import $page from "../state/$page.ts";
 import type PageEndPoint from "../types/PageEndPoint.ts";
 import type PageServerEndPoint from "../types/PageServerEndPoint.ts";
-import RouteHandler from "../types/RouteHandler.ts";
+import type RouteHandler from "../types/RouteHandler.ts";
 import {
 	HOOK_ROUTE,
 	HOOK_SERVER_ROUTE,
@@ -51,7 +51,7 @@ export default async function runTest(
 		})),
 	);
 
-	return await load(router, ev, "%COMPONENT_HTML%");
+	return await load(router, ev, "%COMPONENT_BODY%");
 }
 
 // HACK: This is a copy of serverEntry
@@ -231,8 +231,8 @@ async function loadView(
 
 	let html;
 	try {
-		html = component($props, undefined, slots);
-		html = template.replace("%COMPONENT_HTML%", html);
+		let { body, head } = component($props, undefined, slots);
+		html = template.replace("%COMPONENT_BODY%", body).replace("%COMPONENT_HEAD", head);
 	} catch (error) {
 		// TODO: Show a proper Error component
 		html = '<span style="color: red">Script syntax error</span><p>' + error + "</p>";

package/src/types/Adapter.ts

@@ -1,10 +1,8 @@
 import Server from "../server/Server";
 import Site from "../site/Site";
 
-type Adapter = {
+export default interface Adapter {
 	prebuild?: (site: Site) => Promise<void> | void;
 	postbuild?: (site: Site) => Promise<void> | void;
 	serve: (server: Server, site: Site) => void;
-};
-
-export default Adapter;
+}

package/src/types/ClientState.ts

@@ -0,0 +1,8 @@
+import Router from "../site/Router";
+import type LayoutPath from "./LayoutPath";
+
+export default interface ClientState {
+	router: Router;
+	layoutStack: LayoutPath[];
+	prefetchedData: Record<string, any>;
+}

package/src/types/InternalState.ts

@@ -0,0 +1,7 @@
+import type ClientState from "./ClientState";
+import type PageState from "./PageState";
+
+export default interface InternalState {
+	$page: PageState;
+	client: ClientState;
+}

package/src/types/LayoutHandler.ts

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

package/src/types/LayoutPath.ts

@@ -0,0 +1,10 @@
+// Store the current layout stack, so that we can re-use parts of it as necessary
+export default interface LayoutPath {
+	path: string;
+	/** Whether to re-use this layout */
+	reuse: boolean;
+	/** Data loaded from endpoints that should be re-used */
+	data: any;
+	/** The range of the UI in this layout's slot */
+	slotRange: any;
+}

package/src/types/ManifestRoute.ts

@@ -1,7 +1,5 @@
-type ManifestRoute = {
+export default interface ManifestRoute {
 	path: string;
 	type: number;
 	endPoint: () => Promise<any>;
-};
-
-export default ManifestRoute;
+}

package/src/types/PageEndPoint.ts

@@ -4,7 +4,7 @@ import type PageLoadEvent from "./PageLoadEvent";
 /**
  * For +page.
  */
-type PageEndPoint = {
+export default interface 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...
@@ -13,7 +13,9 @@ type PageEndPoint = {
 	/**
 	 * Loads data for the page.
 	 */
-	load?: (event: PageLoadEvent) => Response | Promise<Response | undefined> | Promise<void> | void;
+	load?: (
+		event: PageLoadEvent,
+	) => Response | undefined | void | Promise<Response | undefined | void>;
 	/**
 	 * The component that is displayed for the page.
 	 */
@@ -23,9 +25,7 @@ type PageEndPoint = {
 	 * The head element data for the page, which may include a <title> and <meta> elements.
 	 */
 	head?: HeadElement[] | ((event: PageLoadEvent) => HeadElement[]);
-};
-
-export default PageEndPoint;
+}
 
 type HeadElement = TitleElement | MetaElement;
 

package/src/types/PageLoadEvent.ts

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

package/src/types/PageServerAction.ts

@@ -2,6 +2,6 @@ import type ServerLoadEvent from "./ServerLoadEvent";
 
 type PageServerAction = (
 	event: ServerLoadEvent,
-) => Response | Promise<Response | undefined> | Promise<void> | void;
+) => Response | undefined | void | Promise<Response | undefined | void>;
 
 export default PageServerAction;

package/src/types/PageServerEndPoint.ts

@@ -4,7 +4,7 @@ import type PageServerLoad from "./PageServerLoad";
 /**
  * For +page.server.
  */
-type PageServerEndPoint = {
+export default interface PageServerEndPoint {
 	/**
 	 * Loads data from the server for a page.
 	 */
@@ -13,6 +13,4 @@ type PageServerEndPoint = {
 	 * A map of actions that can be performed on the server for a page, generally from a form submit.
 	 */
 	actions?: Record<string, PageServerAction>;
-};
-
-export default PageServerEndPoint;
+}

package/src/types/PageServerLoad.ts

@@ -2,6 +2,6 @@ import type ServerLoadEvent from "./ServerLoadEvent";
 
 type PageServerLoad = (
 	event: ServerLoadEvent,
-) => Response | Promise<Response | undefined> | Promise<void> | void;
+) => Response | undefined | void | Promise<Response | undefined | void>;
 
 export default PageServerLoad;

package/src/types/PageState.ts

@@ -0,0 +1,8 @@
+export default interface PageState {
+	status: number;
+	url: URL;
+	form?: Record<string, string>;
+	error?: {
+		message: string;
+	};
+}

package/src/types/RouteHandler.ts

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

package/src/types/RouteLayoutHandler.ts

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

package/src/types/RouteMatchResult.ts

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

package/src/types/ServerHook.ts

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

package/src/types/ServerLoadEvent.ts

@@ -1,7 +1,7 @@
 import CookieHelper from "../server/CookieHelper";
 import HeaderHelper from "../server/HeaderHelper";
 
-type ServerLoadEvent = {
+export default interface ServerLoadEvent {
 	/**
 	 * The URL for the server function.
 	 */
@@ -34,6 +34,4 @@ type ServerLoadEvent = {
 	 * An optional adapter object, containing adapter-specific functionality.
 	 */
 	adapter: Record<PropertyKey, any>;
-};
-
-export default ServerLoadEvent;
+}

package/src/types/ServerRequest.ts

@@ -2,6 +2,6 @@ import type ServerLoadEvent from "./ServerLoadEvent";
 
 type ServerRequest = (
 	event: ServerLoadEvent,
-) => Response | Promise<Response | undefined> | Promise<void> | void;
+) => Response | undefined | void | Promise<Response | undefined | void>;
 
 export default ServerRequest;

package/src/{site → utils}/pathToRegex.ts

@@ -4,7 +4,7 @@ export default function pathToRegex(path: string): RegExp {
 			.split("/")
 			// Replace `[slug]` with a grouped match so we can pull out params
 			.map((p) => {
-				return p.replace(/\[([^\/]+?)\]/, "(?<$1>[^\\/]+?)");
+				return p.replace(/\[([^/]+?)\]/, "(?<$1>[^\\/]+?)");
 			})
 			.join("\\/")
 			// Replace globs with regex syntax

package/{tsup.config.ts → tsdown.config.ts}

@@ -1,4 +1,4 @@
-import { type Options, defineConfig } from "tsup";
+import { type Options, defineConfig } from "tsdown";
 
 type Config =
 	| Options
@@ -8,6 +8,7 @@ type Config =
 export default defineConfig({
 	entry: [
 		"src/index.ts",
+		"src/nav.ts",
 		"src/response.ts",
 		"src/run.ts",
 		"src/server.ts",
@@ -15,10 +16,8 @@ export default defineConfig({
 		"src/test.ts",
 		"src/bin/index.ts",
 	],
-	format: ["esm", "cjs"],
+	format: "esm",
 	dts: true,
-	clean: true,
-	metafile: true,
 	sourcemap: true,
 	// Put this in here to stop issues with bundling Vite from bin/index.ts
 	// I'm not sure if this will cause further issues down the line?

package/dist/Server-BC_dixZQ.d.cts

@@ -1,71 +0,0 @@
-import { SerializeOptions } from 'cookie';
-
-declare class CookieHelper {
-    request: Request;
-    cookies: Map<string, string>;
-    constructor(request: Request);
-    get(name: string): string | undefined;
-    set(name: string, value: string, options?: SerializeOptions): void;
-    delete(name: string, options?: SerializeOptions): void;
-}
-
-declare class HeaderHelper {
-    request: Request;
-    headers: Map<string, string>;
-    constructor(request: Request);
-    get(name: string): string | undefined;
-    set(name: string, value: string): void;
-    delete(name: string): void;
-}
-
-declare class ServerEvent {
-    request: Request;
-    response?: Response;
-    params?: Record<string, string>;
-    adapter: any;
-    cookies: CookieHelper;
-    headers: HeaderHelper;
-    constructor(request: Request, params?: Record<string, string>);
-    addHeaders(): void;
-}
-
-type MiddlewareFunction = (ev: ServerEvent, next: () => void | Promise<void>) => void | Promise<void>;
-
-type ServerFunction = (e: ServerEvent) => Response | Promise<Response | undefined> | undefined;
-
-/**
- * A Fetch API Request/Response server.
- */
-declare class Server {
-    #private;
-    routes: RouteHandler[];
-    middleware: MiddlewareFunction[];
-    constructor();
-    /**
-     * The standard Fetch API method that should work in any runtime (including
-     * Node with polyfills).
-     * @returns
-     */
-    fetch: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
-    /**
-     * Adds a server function at a route path.
-     * @param path The route path pattern.
-     * @param fn The function to call when the pattern is matched.
-     * @returns
-     */
-    add(path: string, fn: ServerFunction): Server;
-    match(path: string): Match | undefined;
-    use(...fn: MiddlewareFunction[]): Server;
-}
-declare class RouteHandler {
-    path: string;
-    regex: RegExp;
-    fn: ServerFunction;
-    constructor(path: string, fn: ServerFunction);
-}
-type Match = {
-    fn: ServerFunction;
-    params?: Record<string, string>;
-};
-
-export { CookieHelper as C, HeaderHelper as H, type MiddlewareFunction as M, Server as S, ServerEvent as a };

package/dist/Server-BC_dixZQ.d.ts

@@ -1,71 +0,0 @@
-import { SerializeOptions } from 'cookie';
-
-declare class CookieHelper {
-    request: Request;
-    cookies: Map<string, string>;
-    constructor(request: Request);
-    get(name: string): string | undefined;
-    set(name: string, value: string, options?: SerializeOptions): void;
-    delete(name: string, options?: SerializeOptions): void;
-}
-
-declare class HeaderHelper {
-    request: Request;
-    headers: Map<string, string>;
-    constructor(request: Request);
-    get(name: string): string | undefined;
-    set(name: string, value: string): void;
-    delete(name: string): void;
-}
-
-declare class ServerEvent {
-    request: Request;
-    response?: Response;
-    params?: Record<string, string>;
-    adapter: any;
-    cookies: CookieHelper;
-    headers: HeaderHelper;
-    constructor(request: Request, params?: Record<string, string>);
-    addHeaders(): void;
-}
-
-type MiddlewareFunction = (ev: ServerEvent, next: () => void | Promise<void>) => void | Promise<void>;
-
-type ServerFunction = (e: ServerEvent) => Response | Promise<Response | undefined> | undefined;
-
-/**
- * A Fetch API Request/Response server.
- */
-declare class Server {
-    #private;
-    routes: RouteHandler[];
-    middleware: MiddlewareFunction[];
-    constructor();
-    /**
-     * The standard Fetch API method that should work in any runtime (including
-     * Node with polyfills).
-     * @returns
-     */
-    fetch: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
-    /**
-     * Adds a server function at a route path.
-     * @param path The route path pattern.
-     * @param fn The function to call when the pattern is matched.
-     * @returns
-     */
-    add(path: string, fn: ServerFunction): Server;
-    match(path: string): Match | undefined;
-    use(...fn: MiddlewareFunction[]): Server;
-}
-declare class RouteHandler {
-    path: string;
-    regex: RegExp;
-    fn: ServerFunction;
-    constructor(path: string, fn: ServerFunction);
-}
-type Match = {
-    fn: ServerFunction;
-    params?: Record<string, string>;
-};
-
-export { CookieHelper as C, HeaderHelper as H, type MiddlewareFunction as M, Server as S, ServerEvent as a };

package/dist/Site-4tGiw2-I.d.ts

@@ -1,63 +0,0 @@
-import { Plugin, UserConfig } from 'vite';
-import { S as Server } from './Server-BC_dixZQ.js';
-
-type Adapter = {
-    prebuild?: (site: Site) => Promise<void> | void;
-    postbuild?: (site: Site) => Promise<void> | void;
-    serve: (server: Server, site: Site) => void;
-};
-
-declare const PAGE_ROUTE = 0;
-declare const PAGE_SERVER_ROUTE = 1;
-declare const SERVER_ROUTE = 3;
-declare const LAYOUT_ROUTE = 4;
-declare const LAYOUT_SERVER_ROUTE = 5;
-declare const HOOK_ROUTE = 6;
-declare const HOOK_SERVER_ROUTE = 7;
-declare const ERROR_ROUTE = 8;
-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;
-
-/**
- * The Site class contains the information necessary to setup a @torpor/build
- * site, including routes, plugins, and options.
- */
-declare class Site {
-    #private;
-    root: string;
-    routes: {
-        path: string;
-        file: string;
-        type: RouteType;
-    }[];
-    plugins: Plugin[];
-    adapter: Adapter;
-    /**
-     * 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[];
-    /**
-     * Vite config options to merge with the standard Torpor build options.
-     * `plugins` and `build.rollupOptions.input` will be overridden, so you
-     * should set `Site.plugins` and `Site.inputs` instead. Other options may be
-     * overridden or incompatible, so experimentation may be required
-     */
-    viteConfig?: UserConfig;
-    constructor();
-    /**
-     * Adds a folder of routes, based on the names of the files in the folder
-     * @param folder The folder containing the routes
-     */
-    addRouteFolder(folder: string): Promise<void>;
-    /**
-     * 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;
-}
-
-export { type Adapter as A, Site as S };

package/dist/Site-BXX-S541.d.cts

@@ -1,63 +0,0 @@
-import { Plugin, UserConfig } from 'vite';
-import { S as Server } from './Server-BC_dixZQ.cjs';
-
-type Adapter = {
-    prebuild?: (site: Site) => Promise<void> | void;
-    postbuild?: (site: Site) => Promise<void> | void;
-    serve: (server: Server, site: Site) => void;
-};
-
-declare const PAGE_ROUTE = 0;
-declare const PAGE_SERVER_ROUTE = 1;
-declare const SERVER_ROUTE = 3;
-declare const LAYOUT_ROUTE = 4;
-declare const LAYOUT_SERVER_ROUTE = 5;
-declare const HOOK_ROUTE = 6;
-declare const HOOK_SERVER_ROUTE = 7;
-declare const ERROR_ROUTE = 8;
-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;
-
-/**
- * The Site class contains the information necessary to setup a @torpor/build
- * site, including routes, plugins, and options.
- */
-declare class Site {
-    #private;
-    root: string;
-    routes: {
-        path: string;
-        file: string;
-        type: RouteType;
-    }[];
-    plugins: Plugin[];
-    adapter: Adapter;
-    /**
-     * 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[];
-    /**
-     * Vite config options to merge with the standard Torpor build options.
-     * `plugins` and `build.rollupOptions.input` will be overridden, so you
-     * should set `Site.plugins` and `Site.inputs` instead. Other options may be
-     * overridden or incompatible, so experimentation may be required
-     */
-    viteConfig?: UserConfig;
-    constructor();
-    /**
-     * Adds a folder of routes, based on the names of the files in the folder
-     * @param folder The folder containing the routes
-     */
-    addRouteFolder(folder: string): Promise<void>;
-    /**
-     * 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;
-}
-
-export { type Adapter as A, Site as S };