@torpor/build 0.4.14 → 1.0.0

package/dist/index.mjs

@@ -1,15 +1,10 @@
-import "./pathToRegex-TUAMc3zS.mjs";
-import { a as LAYOUT_SERVER_ROUTE, c as SERVER_ROUTE, i as LAYOUT_ROUTE, l as Router, n as HOOK_ROUTE, o as PAGE_ROUTE, r as HOOK_SERVER_ROUTE, s as PAGE_SERVER_ROUTE, t as ERROR_ROUTE } from "./RouteType-B6BMOyYw.mjs";
+import { t as Router } from "./Router-C4ADUfhv.mjs";
 import { promises } from "node:fs";
 import fpath from "node:path";
-import tsconfigPaths from "vite-tsconfig-paths";
-
 //#region src/site/defaultAdapter.ts
 const defaultAdapter = { serve: () => {
 	console.log("An adapter needs to be set in site.config");
 } };
-var defaultAdapter_default = defaultAdapter;
-
 //#endregion
 //#region src/site/Site.ts
 /**
@@ -19,8 +14,18 @@ var defaultAdapter_default = defaultAdapter;
 var Site = class {
 	root;
 	routes = [];
-	plugins = [tsconfigPaths({ loose: true })];
-	adapter = defaultAdapter_default;
+	/**
+	* Torpor site plugins, run when the site config is loaded (for dev and
+	* build) and when the server starts up. Use these to register extra
+	* routes (e.g. `openApi()` from `@torpor/build/openapi`) or add other
+	* framework-level functionality
+	*/
+	plugins = [];
+	/**
+	* Vite plugins to add to the client and server builds
+	*/
+	vitePlugins = [];
+	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
@@ -30,10 +35,36 @@ var Site = class {
 	/**
 	* 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
+	* should set `Site.vitePlugins` and `Site.inputs` instead. Other options may be
 	* overridden or incompatible, so experimentation may be required
 	*/
 	viteConfig;
+	/**
+	* The path to the site.config file. Set automatically by the CLI; used by
+	* the manifest plugin to import inline endpoints for server builds.
+	*/
+	configFile;
+	/**
+	* A state map for plugins to store their configuration and state on the
+	* site, so that framework internals (e.g. the manifest plugin) and other
+	* plugins can read them back:
+	*
+	* ```ts
+	* const myKey = Symbol.for("my-plugin");
+	* site.pluginState.set(myKey, options);
+	* ```
+	*
+	* Prefer `Symbol.for("...")` keys (or plain strings) over `Symbol()`,
+	* because the user's config file and framework internals can be loaded as
+	* separate module instances -- registry symbols are shared across
+	* instances, `Symbol()` ones are not.
+	*/
+	pluginState = /* @__PURE__ */ new Map();
+	/**
+	* Inline endpoints keyed by `"path:type"`. Populated by `addRoute` when
+	* the user passes an inline endpoint object instead of a file path.
+	*/
+	inlineEndPoints = {};
 	constructor() {
 		this.root = process.cwd();
 	}
@@ -88,26 +119,127 @@ var Site = class {
 	}
 	#routeType(file) {
 		let routePath = file.replace(/^\//, "").replace(/(\.ts|\.js)$/, "");
-		if (routePath.endsWith("+page")) return PAGE_ROUTE;
-		else if (routePath.endsWith("+page.server")) return PAGE_SERVER_ROUTE;
-		else if (routePath.endsWith("+server")) return SERVER_ROUTE;
-		else if (routePath.endsWith("_layout")) return LAYOUT_ROUTE;
-		else if (routePath.endsWith("_layout.server")) return LAYOUT_SERVER_ROUTE;
-		else if (routePath.endsWith("_hook")) return HOOK_ROUTE;
-		else if (routePath.endsWith("_hook.server")) return HOOK_SERVER_ROUTE;
-		else if (routePath.endsWith("_error")) return ERROR_ROUTE;
+		if (routePath.endsWith("+page")) return 0;
+		else if (routePath.endsWith("+page.server")) return 1;
+		else if (routePath.endsWith("+server")) return 3;
+		else if (routePath.endsWith("_layout")) return 4;
+		else if (routePath.endsWith("_layout.server")) return 5;
+		else if (routePath.endsWith("_hook")) return 6;
+		else if (routePath.endsWith("_hook.server")) return 7;
+		else if (routePath.endsWith("_error")) return 8;
 		return -1;
 	}
 	#routeTypeFromString(type) {
 		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;
+			case "+page": return 0;
+			case "+page.server": return 1;
+			case "+server": return 3;
+			case "_layout": return 4;
+			case "_layout.server": return 5;
+			case "_hook": return 6;
+			case "_hook.server": return 7;
+			case "_error": return 8;
+		}
+	}
+	/**
+	* Adds a route in code, without needing the standard file naming
+	* conventions (+page.ts, +page.server.ts, etc). This is useful for small
+	* sites with one or two pages.
+	*
+	* Any combination of options may be provided; each maps to the
+	* corresponding file-route type:
+	*
+	* - `page` — a `+page` (`.torp` component or `.ts`/`.js` `PageEndPoint`)
+	* - `pageServer` — a `+page.server` (`PageServerEndPoint`, file or inline)
+	* - `server` — a `+server` HTTP endpoint (`ServerEndPoint`, file or inline)
+	* - `layout` — a `_layout` (`.torp` component or `.ts`/`.js` `PageEndPoint`)
+	* - `layoutServer` — a `_layout.server` (`PageServerEndPoint`, file or inline)
+	* - `hookServer` — a `_hook.server` (`ServerHook`, file or inline)
+	* - `error` — an `_error` page (`.torp` component or `.ts`/`.js` `PageEndPoint`)
+	*
+	* Options that need a component (`page`, `layout`, `error`) must be file
+	* paths so the component is included in the client bundle. Server-only
+	* options (`pageServer`, `server`, `layoutServer`, `hookServer`) accept
+	* either a file path or an inline object; inline server code is kept out
+	* of the client bundle automatically.
+	*
+	* @example
+	* // A page with an inline server action
+	* site.addRoute("/", {
+	*   page: "./src/Counter.torp",
+	*   pageServer: { actions: { set: async ({ request }) => ok() } },
+	* });
+	* @example
+	* // A JSON API endpoint
+	* site.addRoute("/api/time", {
+	*   server: { get: async () => ok({ time: Date.now() }) },
+	* });
+	* @example
+	* // A root layout, server hook, and error page
+	* site.addRoute("/", {
+	*   layout: "./src/Layout.torp",
+	*   hookServer: { enter: async (event) => {} },
+	*   error: "./src/ErrorPage.torp",
+	* });
+	*
+	* @param path The route path, e.g. `/` or `/about`
+	* @param options File paths and/or inline endpoints for the route
+	* @param subFolder An optional subFolder for grouping routes
+	*/
+	addRoute(path, options, subFolder) {
+		let normalizedSubFolder = subFolder;
+		if (normalizedSubFolder !== void 0 && !normalizedSubFolder.startsWith("/")) normalizedSubFolder = "/" + normalizedSubFolder;
+		let base = path.replace(/\/$/, "");
+		if (options.page !== void 0) this.#pushRoute(path, 0, options.page, normalizedSubFolder);
+		if (options.pageServer !== void 0) this.#pushRoute(`${base}/~server`, 1, options.pageServer, normalizedSubFolder);
+		if (options.server !== void 0) this.#pushRoute(path, 3, options.server, normalizedSubFolder);
+		if (options.layout !== void 0) this.#pushRoute(`${base}/_layout`, 4, options.layout, normalizedSubFolder);
+		if (options.layoutServer !== void 0) this.#pushRoute(`${base}/_layout/~server`, 5, options.layoutServer, normalizedSubFolder);
+		if (options.hookServer !== void 0) this.#pushRoute(`${base}/_hook/~server`, 7, options.hookServer, normalizedSubFolder);
+		if (options.error !== void 0) this.#pushRoute(`${base}/_error`, 8, options.error, normalizedSubFolder);
+		this.#sortRoutes();
+	}
+	/**
+	* Pushes a single route entry, handling both file-path and inline-endpoint
+	* targets. File paths are resolved relative to the site root; inline
+	* endpoints are also stored in `inlineEndPoints` keyed by `"path:type"`
+	* so the manifest plugin can resolve them at build time.
+	*
+	* If a route with the same path and type was already added, it is
+	* replaced, so that running a plugin twice (config load and server
+	* startup) doesn't add duplicate routes.
+	*/
+	#pushRoute(routePath, type, target, subFolder) {
+		const index = this.routes.findIndex((r) => r.path === routePath && r.type === type);
+		if (typeof target === "string") {
+			let file = fpath.relative(this.root, fpath.resolve(this.root, target));
+			if (index >= 0) this.routes[index] = {
+				path: routePath,
+				file,
+				type,
+				subFolder
+			};
+			else this.routes.push({
+				path: routePath,
+				file,
+				type,
+				subFolder
+			});
+		} else {
+			let key = `${routePath}:${type}`;
+			this.inlineEndPoints[key] = target;
+			if (index >= 0) this.routes[index] = {
+				path: routePath,
+				endPoint: target,
+				type,
+				subFolder
+			};
+			else this.routes.push({
+				path: routePath,
+				endPoint: target,
+				type,
+				subFolder
+			});
 		}
 	}
 	#sortRoutes() {
@@ -119,7 +251,7 @@ var Site = class {
 		});
 	}
 };
-
 //#endregion
 export { Router, Site };
+
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["defaultAdapter: Adapter","defaultAdapter","fs","#routePath","#routeType","#sortRoutes","#routeTypeFromString"],"sources":["../src/site/defaultAdapter.ts","../src/site/Site.ts"],"sourcesContent":["import type Adapter from \"../types/Adapter\";\n\n// TODO: This should be an adapter-auto package that conditionally loads other packages...\n\nconst defaultAdapter: Adapter = {\n\tserve: () => {\n\t\tconsole.log(\"An adapter needs to be set in site.config\");\n\t},\n};\n\nexport default defaultAdapter;\n","import { promises as fs } from \"node:fs\";\nimport fpath from \"node:path\";\nimport { type Plugin, type UserConfig } from \"vite\";\nimport tsconfigPaths from \"vite-tsconfig-paths\";\nimport type Adapter from \"../types/Adapter\";\nimport type Route from \"../types/Route\";\nimport {\n\tERROR_ROUTE,\n\tHOOK_ROUTE,\n\tHOOK_SERVER_ROUTE,\n\tLAYOUT_ROUTE,\n\tLAYOUT_SERVER_ROUTE,\n\tPAGE_ROUTE,\n\tPAGE_SERVER_ROUTE,\n\tRouteType,\n\tSERVER_ROUTE,\n} from \"../types/RouteType\";\nimport defaultAdapter from \"./defaultAdapter\";\n\n// 1. The user sets this up\n// 2. It is passed into serverEntry and clientEntry through a Vite plugin\n//    (defined in manifest.ts)\n// 3. In those files, it is used to build a Router\n\n/**\n * The Site class contains the information necessary to setup a @torpor/build\n * site, including routes, plugins, and options.\n */\nexport default class Site {\n\troot: string;\n\troutes: Route[] = [];\n\t// Is default plugins a bad idea?\n\t// HACK: Set loose because otherwise it uses a list of allowed extensions\n\t// TODO: Should probably just do this ourselves and let the user pass in\n\t// tsconfigPaths themselves if they want to do something funky\n\tplugins: Plugin[] = [tsconfigPaths({ loose: true })];\n\t// Is default adapter a bad idea?\n\tadapter: Adapter = defaultAdapter;\n\t/**\n\t * Extra inputs, as absolute file paths, that will be compiled with the\n\t * output. What you do with them after that is up to you. File paths ending\n\t * with server.ts/js will only be compiled with the server output\n\t */\n\tinputs: string[] = [];\n\t/**\n\t * Vite config options to merge with the standard Torpor build options.\n\t * `plugins` and `build.rollupOptions.input` will be overridden, so you\n\t * should set `Site.plugins` and `Site.inputs` instead. Other options may be\n\t * overridden or incompatible, so experimentation may be required\n\t */\n\tviteConfig?: UserConfig;\n\n\tconstructor() {\n\t\tthis.root = process.cwd();\n\t}\n\n\t/**\n\t * Adds a folder of routes, based on the names of the files in the folder\n\t * @param folder The folder containing the routes\n\t * @param subFolder If a subFolder is set, all routes in the folder will be\n\t * placed under the subFolder, and only hooks, layouts etc will be used if\n\t * they have the same subFolder. This can be used to create e.g. an `api`\n\t * set of routes with their own hook for authorization from various clients\n\t */\n\tasync addRouteFolder(folder: string, subFolder?: string): Promise<void> {\n\t\tconst routeFolder = fpath.join(this.root, folder);\n\t\tconst routeFiles = await fs.readdir(routeFolder, { recursive: true });\n\t\tif (subFolder !== undefined && !subFolder.startsWith(\"/\")) {\n\t\t\tsubFolder = \"/\" + subFolder;\n\t\t}\n\t\tfor (let file of routeFiles) {\n\t\t\t// The file must start with `+` or `_` and end with `.js` or `.ts`\n\t\t\tif (/^(\\+|_).+(\\.js|\\.ts)$/.test(fpath.basename(file))) {\n\t\t\t\tlet routePath = this.#routePath(file);\n\t\t\t\tif (subFolder !== undefined) {\n\t\t\t\t\troutePath = subFolder + routePath;\n\t\t\t\t}\n\t\t\t\tlet type = this.#routeType(file);\n\t\t\t\tfile = fpath.relative(this.root, fpath.resolve(routeFolder, file));\n\t\t\t\tthis.routes.push({\n\t\t\t\t\tpath: routePath,\n\t\t\t\t\tfile,\n\t\t\t\t\ttype,\n\t\t\t\t\tsubFolder: subFolder,\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t\tthis.#sortRoutes();\n\t}\n\n\t/**\n\t * Adds a file route, which can have a standard name (e.g. +page.ts) or any\n\t * name if you pass the type\n\t * @param path The route path\n\t * @param file The file\n\t * @param type The file type (if the file name is non-standard)\n\t */\n\taddRouteFile(\n\t\tpath: string,\n\t\tfile: string,\n\t\ttype?:\n\t\t\t| \"+page\"\n\t\t\t| \"+page.server\"\n\t\t\t| \"+server\"\n\t\t\t| \"_layout\"\n\t\t\t| \"_layout.server\"\n\t\t\t| \"_hook\"\n\t\t\t| \"_hook.server\"\n\t\t\t| \"_error\",\n\t\tsubFolder?: string,\n\t): void {\n\t\tlet routePath = this.#routePath(fpath.join(path, type ?? fpath.basename(file)));\n\t\tlet routeType = type ? this.#routeTypeFromString(type) : this.#routeType(file);\n\t\tif (subFolder !== undefined && !subFolder.startsWith(\"/\")) {\n\t\t\tsubFolder = \"/\" + subFolder;\n\t\t}\n\t\tthis.routes.push({\n\t\t\tpath: routePath,\n\t\t\tfile,\n\t\t\ttype: routeType,\n\t\t\tsubFolder: subFolder,\n\t\t});\n\t\tthis.#sortRoutes();\n\t}\n\n\t#routePath(file: string): string {\n\t\tlet routePath = file\n\t\t\t.replace(/^\\//, \"\")\n\t\t\t.replace(/(\\.ts|\\.js)$/, \"\")\n\t\t\t.replace(/_hook.server$/, \"_hook/~server\")\n\t\t\t.replace(/_layout.server$/, \"_layout/~server\")\n\t\t\t.replace(/\\+page.server$/, \"~server\")\n\t\t\t.replace(/\\+server$/, \"\")\n\t\t\t.replace(/\\+page$/, \"\")\n\t\t\t.replace(/\\/$/, \"\");\n\t\treturn routePath.length > 0 ? `/${routePath}` : \"/\";\n\t}\n\n\t#routeType(file: string): RouteType {\n\t\tlet routePath = file.replace(/^\\//, \"\").replace(/(\\.ts|\\.js)$/, \"\");\n\t\tif (routePath.endsWith(\"+page\")) {\n\t\t\treturn PAGE_ROUTE;\n\t\t} else if (routePath.endsWith(\"+page.server\")) {\n\t\t\treturn PAGE_SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"+server\")) {\n\t\t\treturn SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"_layout\")) {\n\t\t\treturn LAYOUT_ROUTE;\n\t\t} else if (routePath.endsWith(\"_layout.server\")) {\n\t\t\treturn LAYOUT_SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"_hook\")) {\n\t\t\treturn HOOK_ROUTE;\n\t\t} else if (routePath.endsWith(\"_hook.server\")) {\n\t\t\treturn HOOK_SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"_error\")) {\n\t\t\treturn ERROR_ROUTE;\n\t\t}\n\t\treturn -1;\n\t}\n\n\t#routeTypeFromString(\n\t\ttype:\n\t\t\t| \"+page\"\n\t\t\t| \"+page.server\"\n\t\t\t| \"+server\"\n\t\t\t| \"_layout\"\n\t\t\t| \"_layout.server\"\n\t\t\t| \"_hook\"\n\t\t\t| \"_hook.server\"\n\t\t\t| \"_error\",\n\t) {\n\t\tswitch (type) {\n\t\t\tcase \"+page\":\n\t\t\t\treturn PAGE_ROUTE;\n\t\t\tcase \"+page.server\":\n\t\t\t\treturn PAGE_SERVER_ROUTE;\n\t\t\tcase \"+server\":\n\t\t\t\treturn SERVER_ROUTE;\n\t\t\tcase \"_layout\":\n\t\t\t\treturn LAYOUT_ROUTE;\n\t\t\tcase \"_layout.server\":\n\t\t\t\treturn LAYOUT_SERVER_ROUTE;\n\t\t\tcase \"_hook\":\n\t\t\t\treturn HOOK_ROUTE;\n\t\t\tcase \"_hook.server\":\n\t\t\t\treturn HOOK_SERVER_ROUTE;\n\t\t\tcase \"_error\":\n\t\t\t\treturn ERROR_ROUTE;\n\t\t}\n\t}\n\n\t// TODO: You could make your site in a single file, like e.g. Hono...\n\t//addPage(path: string, endPoint: PageEndPoint, serverEndPoint?: PageServerEndPoint) {}\n\t//addEndPoint(path: string, endPoint: ServerEndPoint) {}\n\n\t#sortRoutes() {\n\t\tthis.routes = this.routes.sort((a, b) => {\n\t\t\t// Sort [param]s after paths\n\t\t\t// There might be a quicker/easier way to do this\n\t\t\tfor (let i = 0; i < Math.min(a.path.length, b.path.length); i++) {\n\t\t\t\tif (a.path[i] === \"[\" && b.path[i] !== \"[\") {\n\t\t\t\t\treturn 1;\n\t\t\t\t} else if (b.path[i] === \"[\" && a.path[i] !== \"[\") {\n\t\t\t\t\treturn -1;\n\t\t\t\t} else if (a.path[i] === b.path[i]) {\n\t\t\t\t\t// Keep going...\n\t\t\t\t} else {\n\t\t\t\t\treturn a.path[i].localeCompare(b.path[i]);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn a.path.length - b.path.length;\n\t\t});\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["fs","#routePath","#routeType","#sortRoutes","#routeTypeFromString","#pushRoute"],"sources":["../src/site/defaultAdapter.ts","../src/site/Site.ts"],"sourcesContent":["import type Adapter from \"../types/Adapter\";\n\n// TODO: This should be an adapter-auto package that conditionally loads other packages...\n\nconst defaultAdapter: Adapter = {\n\tserve: () => {\n\t\tconsole.log(\"An adapter needs to be set in site.config\");\n\t},\n};\n\nexport default defaultAdapter;\n","import { promises as fs } from \"node:fs\";\nimport fpath from \"node:path\";\nimport { type Plugin, type UserConfig } from \"vite\";\nimport type Adapter from \"../types/Adapter\";\nimport type SitePlugin from \"../types/SitePlugin\";\nimport type { InlineEndPoint } from \"../types/Route\";\nimport type PageServerEndPoint from \"../types/PageServerEndPoint\";\nimport type Route from \"../types/Route\";\nimport type ServerEndPoint from \"../types/ServerEndPoint\";\nimport type ServerHook from \"../types/ServerHook\";\nimport {\n\tERROR_ROUTE,\n\tHOOK_ROUTE,\n\tHOOK_SERVER_ROUTE,\n\tLAYOUT_ROUTE,\n\tLAYOUT_SERVER_ROUTE,\n\tPAGE_ROUTE,\n\tPAGE_SERVER_ROUTE,\n\tRouteType,\n\tSERVER_ROUTE,\n} from \"../types/RouteType\";\nimport defaultAdapter from \"./defaultAdapter\";\n\n// 1. The user sets this up\n// 2. It is passed into serverEntry and clientEntry through a Vite plugin\n//    (defined in manifest.ts)\n// 3. In those files, it is used to build a Router\n\n/**\n * The Site class contains the information necessary to setup a @torpor/build\n * site, including routes, plugins, and options.\n */\nexport default class Site {\n\troot: string;\n\troutes: Route[] = [];\n\t/**\n\t * Torpor site plugins, run when the site config is loaded (for dev and\n\t * build) and when the server starts up. Use these to register extra\n\t * routes (e.g. `openApi()` from `@torpor/build/openapi`) or add other\n\t * framework-level functionality\n\t */\n\tplugins: SitePlugin[] = [];\n\t/**\n\t * Vite plugins to add to the client and server builds\n\t */\n\tvitePlugins: Plugin[] = [];\n\t// Is default adapter a bad idea?\n\tadapter: Adapter = defaultAdapter;\n\t/**\n\t * Extra inputs, as absolute file paths, that will be compiled with the\n\t * output. What you do with them after that is up to you. File paths ending\n\t * with server.ts/js will only be compiled with the server output\n\t */\n\tinputs: string[] = [];\n\t/**\n\t * Vite config options to merge with the standard Torpor build options.\n\t * `plugins` and `build.rollupOptions.input` will be overridden, so you\n\t * should set `Site.vitePlugins` and `Site.inputs` instead. Other options may be\n\t * overridden or incompatible, so experimentation may be required\n\t */\n\tviteConfig?: UserConfig;\n\t/**\n\t * The path to the site.config file. Set automatically by the CLI; used by\n\t * the manifest plugin to import inline endpoints for server builds.\n\t */\n\tconfigFile?: string;\n\t/**\n\t * A state map for plugins to store their configuration and state on the\n\t * site, so that framework internals (e.g. the manifest plugin) and other\n\t * plugins can read them back:\n\t *\n\t * ```ts\n\t * const myKey = Symbol.for(\"my-plugin\");\n\t * site.pluginState.set(myKey, options);\n\t * ```\n\t *\n\t * Prefer `Symbol.for(\"...\")` keys (or plain strings) over `Symbol()`,\n\t * because the user's config file and framework internals can be loaded as\n\t * separate module instances -- registry symbols are shared across\n\t * instances, `Symbol()` ones are not.\n\t */\n\tpluginState: Map<PropertyKey, unknown> = new Map();\n\t/**\n\t * Inline endpoints keyed by `\"path:type\"`. Populated by `addRoute` when\n\t * the user passes an inline endpoint object instead of a file path.\n\t */\n\tinlineEndPoints: Record<string, InlineEndPoint> = {};\n\n\tconstructor() {\n\t\tthis.root = process.cwd();\n\t}\n\n\t/**\n\t * Adds a folder of routes, based on the names of the files in the folder\n\t * @param folder The folder containing the routes\n\t * @param subFolder If a subFolder is set, all routes in the folder will be\n\t * placed under the subFolder, and only hooks, layouts etc will be used if\n\t * they have the same subFolder. This can be used to create e.g. an `api`\n\t * set of routes with their own hook for authorization from various clients\n\t */\n\tasync addRouteFolder(folder: string, subFolder?: string): Promise<void> {\n\t\tconst routeFolder = fpath.join(this.root, folder);\n\t\tconst routeFiles = await fs.readdir(routeFolder, { recursive: true });\n\t\tif (subFolder !== undefined && !subFolder.startsWith(\"/\")) {\n\t\t\tsubFolder = \"/\" + subFolder;\n\t\t}\n\t\tfor (let file of routeFiles) {\n\t\t\t// The file must start with `+` or `_` and end with `.js` or `.ts`\n\t\t\tif (/^(\\+|_).+(\\.js|\\.ts)$/.test(fpath.basename(file))) {\n\t\t\t\tlet routePath = this.#routePath(file);\n\t\t\t\tif (subFolder !== undefined) {\n\t\t\t\t\troutePath = subFolder + routePath;\n\t\t\t\t}\n\t\t\t\tlet type = this.#routeType(file);\n\t\t\t\tfile = fpath.relative(this.root, fpath.resolve(routeFolder, file));\n\t\t\t\tthis.routes.push({\n\t\t\t\t\tpath: routePath,\n\t\t\t\t\tfile,\n\t\t\t\t\ttype,\n\t\t\t\t\tsubFolder: subFolder,\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t\tthis.#sortRoutes();\n\t}\n\n\t/**\n\t * Adds a file route, which can have a standard name (e.g. +page.ts) or any\n\t * name if you pass the type\n\t * @param path The route path\n\t * @param file The file\n\t * @param type The file type (if the file name is non-standard)\n\t */\n\taddRouteFile(\n\t\tpath: string,\n\t\tfile: string,\n\t\ttype?:\n\t\t\t| \"+page\"\n\t\t\t| \"+page.server\"\n\t\t\t| \"+server\"\n\t\t\t| \"_layout\"\n\t\t\t| \"_layout.server\"\n\t\t\t| \"_hook\"\n\t\t\t| \"_hook.server\"\n\t\t\t| \"_error\",\n\t\tsubFolder?: string,\n\t): void {\n\t\tlet routePath = this.#routePath(fpath.join(path, type ?? fpath.basename(file)));\n\t\tlet routeType = type ? this.#routeTypeFromString(type) : this.#routeType(file);\n\t\tif (subFolder !== undefined && !subFolder.startsWith(\"/\")) {\n\t\t\tsubFolder = \"/\" + subFolder;\n\t\t}\n\t\tthis.routes.push({\n\t\t\tpath: routePath,\n\t\t\tfile,\n\t\t\ttype: routeType,\n\t\t\tsubFolder: subFolder,\n\t\t});\n\t\tthis.#sortRoutes();\n\t}\n\n\t#routePath(file: string): string {\n\t\tlet routePath = file\n\t\t\t.replace(/^\\//, \"\")\n\t\t\t.replace(/(\\.ts|\\.js)$/, \"\")\n\t\t\t.replace(/_hook.server$/, \"_hook/~server\")\n\t\t\t.replace(/_layout.server$/, \"_layout/~server\")\n\t\t\t.replace(/\\+page.server$/, \"~server\")\n\t\t\t.replace(/\\+server$/, \"\")\n\t\t\t.replace(/\\+page$/, \"\")\n\t\t\t.replace(/\\/$/, \"\");\n\t\treturn routePath.length > 0 ? `/${routePath}` : \"/\";\n\t}\n\n\t#routeType(file: string): RouteType {\n\t\tlet routePath = file.replace(/^\\//, \"\").replace(/(\\.ts|\\.js)$/, \"\");\n\t\tif (routePath.endsWith(\"+page\")) {\n\t\t\treturn PAGE_ROUTE;\n\t\t} else if (routePath.endsWith(\"+page.server\")) {\n\t\t\treturn PAGE_SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"+server\")) {\n\t\t\treturn SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"_layout\")) {\n\t\t\treturn LAYOUT_ROUTE;\n\t\t} else if (routePath.endsWith(\"_layout.server\")) {\n\t\t\treturn LAYOUT_SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"_hook\")) {\n\t\t\treturn HOOK_ROUTE;\n\t\t} else if (routePath.endsWith(\"_hook.server\")) {\n\t\t\treturn HOOK_SERVER_ROUTE;\n\t\t} else if (routePath.endsWith(\"_error\")) {\n\t\t\treturn ERROR_ROUTE;\n\t\t}\n\t\treturn -1;\n\t}\n\n\t#routeTypeFromString(\n\t\ttype:\n\t\t\t| \"+page\"\n\t\t\t| \"+page.server\"\n\t\t\t| \"+server\"\n\t\t\t| \"_layout\"\n\t\t\t| \"_layout.server\"\n\t\t\t| \"_hook\"\n\t\t\t| \"_hook.server\"\n\t\t\t| \"_error\",\n\t) {\n\t\tswitch (type) {\n\t\t\tcase \"+page\":\n\t\t\t\treturn PAGE_ROUTE;\n\t\t\tcase \"+page.server\":\n\t\t\t\treturn PAGE_SERVER_ROUTE;\n\t\t\tcase \"+server\":\n\t\t\t\treturn SERVER_ROUTE;\n\t\t\tcase \"_layout\":\n\t\t\t\treturn LAYOUT_ROUTE;\n\t\t\tcase \"_layout.server\":\n\t\t\t\treturn LAYOUT_SERVER_ROUTE;\n\t\t\tcase \"_hook\":\n\t\t\t\treturn HOOK_ROUTE;\n\t\t\tcase \"_hook.server\":\n\t\t\t\treturn HOOK_SERVER_ROUTE;\n\t\t\tcase \"_error\":\n\t\t\t\treturn ERROR_ROUTE;\n\t\t}\n\t}\n\n\t/**\n\t * Adds a route in code, without needing the standard file naming\n\t * conventions (+page.ts, +page.server.ts, etc). This is useful for small\n\t * sites with one or two pages.\n\t *\n\t * Any combination of options may be provided; each maps to the\n\t * corresponding file-route type:\n\t *\n\t * - `page` — a `+page` (`.torp` component or `.ts`/`.js` `PageEndPoint`)\n\t * - `pageServer` — a `+page.server` (`PageServerEndPoint`, file or inline)\n\t * - `server` — a `+server` HTTP endpoint (`ServerEndPoint`, file or inline)\n\t * - `layout` — a `_layout` (`.torp` component or `.ts`/`.js` `PageEndPoint`)\n\t * - `layoutServer` — a `_layout.server` (`PageServerEndPoint`, file or inline)\n\t * - `hookServer` — a `_hook.server` (`ServerHook`, file or inline)\n\t * - `error` — an `_error` page (`.torp` component or `.ts`/`.js` `PageEndPoint`)\n\t *\n\t * Options that need a component (`page`, `layout`, `error`) must be file\n\t * paths so the component is included in the client bundle. Server-only\n\t * options (`pageServer`, `server`, `layoutServer`, `hookServer`) accept\n\t * either a file path or an inline object; inline server code is kept out\n\t * of the client bundle automatically.\n\t *\n\t * @example\n\t * // A page with an inline server action\n\t * site.addRoute(\"/\", {\n\t *   page: \"./src/Counter.torp\",\n\t *   pageServer: { actions: { set: async ({ request }) => ok() } },\n\t * });\n\t * @example\n\t * // A JSON API endpoint\n\t * site.addRoute(\"/api/time\", {\n\t *   server: { get: async () => ok({ time: Date.now() }) },\n\t * });\n\t * @example\n\t * // A root layout, server hook, and error page\n\t * site.addRoute(\"/\", {\n\t *   layout: \"./src/Layout.torp\",\n\t *   hookServer: { enter: async (event) => {} },\n\t *   error: \"./src/ErrorPage.torp\",\n\t * });\n\t *\n\t * @param path The route path, e.g. `/` or `/about`\n\t * @param options File paths and/or inline endpoints for the route\n\t * @param subFolder An optional subFolder for grouping routes\n\t */\n\taddRoute(\n\t\tpath: string,\n\t\toptions: {\n\t\t\tpage?: string;\n\t\t\tpageServer?: string | PageServerEndPoint;\n\t\t\tserver?: string | ServerEndPoint;\n\t\t\tlayout?: string;\n\t\t\tlayoutServer?: string | PageServerEndPoint;\n\t\t\thookServer?: string | ServerHook;\n\t\t\terror?: string;\n\t\t},\n\t\tsubFolder?: string,\n\t): void {\n\t\tlet normalizedSubFolder = subFolder;\n\t\tif (normalizedSubFolder !== undefined && !normalizedSubFolder.startsWith(\"/\")) {\n\t\t\tnormalizedSubFolder = \"/\" + normalizedSubFolder;\n\t\t}\n\n\t\t// The base path with any trailing slash stripped, so that we can\n\t\t// append \"/_layout\", \"/~server\" etc. For the root \"/\" this is \"\".\n\t\tlet base = path.replace(/\\/$/, \"\");\n\n\t\tif (options.page !== undefined) {\n\t\t\tthis.#pushRoute(path, PAGE_ROUTE, options.page, normalizedSubFolder);\n\t\t}\n\t\tif (options.pageServer !== undefined) {\n\t\t\tthis.#pushRoute(\n\t\t\t\t`${base}/~server`,\n\t\t\t\tPAGE_SERVER_ROUTE,\n\t\t\t\toptions.pageServer,\n\t\t\t\tnormalizedSubFolder,\n\t\t\t);\n\t\t}\n\t\tif (options.server !== undefined) {\n\t\t\tthis.#pushRoute(path, SERVER_ROUTE, options.server, normalizedSubFolder);\n\t\t}\n\t\tif (options.layout !== undefined) {\n\t\t\tthis.#pushRoute(`${base}/_layout`, LAYOUT_ROUTE, options.layout, normalizedSubFolder);\n\t\t}\n\t\tif (options.layoutServer !== undefined) {\n\t\t\tthis.#pushRoute(\n\t\t\t\t`${base}/_layout/~server`,\n\t\t\t\tLAYOUT_SERVER_ROUTE,\n\t\t\t\toptions.layoutServer,\n\t\t\t\tnormalizedSubFolder,\n\t\t\t);\n\t\t}\n\t\tif (options.hookServer !== undefined) {\n\t\t\tthis.#pushRoute(\n\t\t\t\t`${base}/_hook/~server`,\n\t\t\t\tHOOK_SERVER_ROUTE,\n\t\t\t\toptions.hookServer,\n\t\t\t\tnormalizedSubFolder,\n\t\t\t);\n\t\t}\n\t\tif (options.error !== undefined) {\n\t\t\tthis.#pushRoute(`${base}/_error`, ERROR_ROUTE, options.error, normalizedSubFolder);\n\t\t}\n\n\t\tthis.#sortRoutes();\n\t}\n\n\t/**\n\t * Pushes a single route entry, handling both file-path and inline-endpoint\n\t * targets. File paths are resolved relative to the site root; inline\n\t * endpoints are also stored in `inlineEndPoints` keyed by `\"path:type\"`\n\t * so the manifest plugin can resolve them at build time.\n\t *\n\t * If a route with the same path and type was already added, it is\n\t * replaced, so that running a plugin twice (config load and server\n\t * startup) doesn't add duplicate routes.\n\t */\n\t#pushRoute(\n\t\troutePath: string,\n\t\ttype: RouteType,\n\t\ttarget: string | InlineEndPoint,\n\t\tsubFolder?: string,\n\t): void {\n\t\tconst index = this.routes.findIndex((r) => r.path === routePath && r.type === type);\n\t\tif (typeof target === \"string\") {\n\t\t\tlet file = fpath.relative(this.root, fpath.resolve(this.root, target));\n\t\t\tif (index >= 0) {\n\t\t\t\tthis.routes[index] = { path: routePath, file, type, subFolder };\n\t\t\t} else {\n\t\t\t\tthis.routes.push({ path: routePath, file, type, subFolder });\n\t\t\t}\n\t\t} else {\n\t\t\tlet key = `${routePath}:${type}`;\n\t\t\tthis.inlineEndPoints[key] = target;\n\t\t\tif (index >= 0) {\n\t\t\t\tthis.routes[index] = { path: routePath, endPoint: target, type, subFolder };\n\t\t\t} else {\n\t\t\t\tthis.routes.push({ path: routePath, endPoint: target, type, subFolder });\n\t\t\t}\n\t\t}\n\t}\n\n\t#sortRoutes() {\n\t\tthis.routes = this.routes.sort((a, b) => {\n\t\t\t// Sort [param]s after paths\n\t\t\t// There might be a quicker/easier way to do this\n\t\t\tfor (let i = 0; i < Math.min(a.path.length, b.path.length); i++) {\n\t\t\t\tif (a.path[i] === \"[\" && b.path[i] !== \"[\") {\n\t\t\t\t\treturn 1;\n\t\t\t\t} else if (b.path[i] === \"[\" && a.path[i] !== \"[\") {\n\t\t\t\t\treturn -1;\n\t\t\t\t} else if (a.path[i] === b.path[i]) {\n\t\t\t\t\t// Keep going...\n\t\t\t\t} else {\n\t\t\t\t\treturn a.path[i].localeCompare(b.path[i]);\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn a.path.length - b.path.length;\n\t\t});\n\t}\n}\n"],"mappings":"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"}

package/dist/nav.d.mts

@@ -1,14 +1,67 @@
+import { n as ParseRouteParams, t as ExactRouteParams } from "./ParseRouteParams-DBmqlmLh.mjs";
+import { t as TypedResponse } from "./TypedResponse-6lznqN4U.mjs";
+//#region src/nav/api.d.ts
+/**
+ * The value a client call resolves to: the endpoint's typed JSON body when it
+ * returns a typed response, or the raw Response when the body isn't JSON.
+ * Untyped endpoints resolve to `unknown`.
+ */
+type ApiResult<Handler> = Handler extends ((event: any) => any) ? Awaited<ReturnType<Handler>> extends TypedResponse<infer Body> ? Body | Response : unknown : never;
+/**
+ * The body a client call accepts: the endpoint event's annotated JSON body
+ * type (from `ServerLoadEvent<Route, Body>`), or a loose value when the
+ * handler doesn't annotate one.
+ */
+type ApiRequestBody<Handler> = Handler extends ((event: infer Event) => any) ? Event extends {
+  json: () => Promise<infer Body>;
+} ? unknown extends Body ? BodyInit | object : Body : BodyInit | object : BodyInit | object;
+/** The callable methods of an endpoint, one per handler it defines. */
+type ApiMethods<Endpoint extends object> = { [Method in string & keyof Endpoint as NonNullable<Endpoint[Method]> extends ((event: any) => any) ? Method : never]: (body?: ApiRequestBody<NonNullable<Endpoint[Method]>>, init?: RequestInit) => Promise<ApiResult<NonNullable<Endpoint[Method]>>>; };
+/**
+ * Creates typed client callers for a `+server` endpoint, e.g.
+ *
+ * ```ts
+ * import type endpoint from "@/routes/api/posts/[id]/+server";
+ * const post = makeApi<"/api/posts/[id]", typeof endpoint>("/api/posts/[id]");
+ * const data = await post.get(); // typed from the endpoint's responses
+ * ```
+ *
+ * Method names match the endpoint's handlers (`del` for DELETE). Params are
+ * filled in and URI-encoded from the route path, and JSON responses are
+ * parsed; non-JSON responses resolve to the raw Response. Failed requests
+ * (non-2xx) throw.
+ *
+ * @param path The endpoint's route path
+ * @param params The route params, required if the path has dynamic segments
+ * @returns An object with one caller per handler defined by the endpoint
+ */
+declare function makeApi<Route extends string, Endpoint extends object, Params extends ParseRouteParams<Route> = ParseRouteParams<Route>>(path: Route, ...args: string extends Route ? [params?: Record<string, string>] : keyof ParseRouteParams<Route> extends never ? [] : [params: Params & ExactRouteParams<Params, ParseRouteParams<Route>>]): ApiMethods<Endpoint>;
+//#endregion
 //#region src/nav/load.d.ts
 /**
-* Loads and renders the page at the supplied path.
-*/
+ * Loads and renders the page at the supplied path.
+ */
 declare function load(path: string): Promise<boolean>;
 //#endregion
 //#region src/nav/reload.d.ts
 /**
-* Reloads data for the currently loaded page and rerenders it.
-*/
+ * Reloads data for the currently loaded page and rerenders it.
+ */
 declare function reload(): Promise<boolean>;
 //#endregion
-export { load, reload };
+//#region src/nav/route.d.ts
+/**
+ * Builds a route path in a type-safe manner, filling in dynamic segments, e.g.
+ * `route("/posts/[id]", { id: 5 })` returns `/posts/5`. The params object is
+ * checked for exact keys: missing or unknown params error at compile time.
+ *
+ * NOTE: The rest args conditional must stay INLINE — routing it through a type
+ * alias defeats `Params` inference, and excess keys stop being checked
+ * @param path The route path
+ * @param params The route params, required if the path has dynamic segments
+ * @returns The path with the params filled in, URI-encoded
+ */
+declare function route<Route extends string, Params extends ParseRouteParams<Route> = ParseRouteParams<Route>>(path: Route, ...args: string extends Route ? [params?: Record<string, string>] : keyof ParseRouteParams<Route> extends never ? [] : [params: Params & ExactRouteParams<Params, ParseRouteParams<Route>>]): string;
+//#endregion
+export { load, makeApi, reload, route };
 //# sourceMappingURL=nav.d.mts.map

package/dist/nav.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"nav.d.mts","names":[],"sources":["../src/nav/load.ts","../src/nav/reload.ts"],"sourcesContent":[],"mappings":";;;;iBAK8B,IAAA,gBAAoB;;;;;;iBCApB,MAAA,CAAA,GAAU"}
+{"version":3,"file":"nav.d.mts","names":[],"sources":["../src/nav/api.ts","../src/nav/load.ts","../src/nav/reload.ts","../src/nav/route.ts"],"mappings":";;;;;;;;KASK,UAAU,WAAW,kBAAiB,sBACxC,QAAQ,WAAW,kBAAkB,oBAAoB,QACxD,OAAO;;;;;;KASN,eAAe,WAAW,kBAAiB,aAAa,iBAC1D;EAAgB,YAAY,cAAc;oBACzB,OACf,oBACA,OACD,oBACD;;KAGS,WAAW,8BACrB,yBAAyB,YAAY,YAAY,SAAS,mBAAkB,sBAC1E,kBAEF,OAAO,eAAe,YAAY,SAAS,WAC3C,OAAO,gBACH,QAAQ,UAAU,YAAY,SAAS;;;;;;;;;;;;;;;;;;;iBAuBrB,QACvB,sBACA,yBACA,eAAe,iBAAiB,SAAS,iBAAiB,QAE1D,MAAM,UAGH,qBAAqB,SACpB,SAAS,gCACJ,iBAAiB,6BAErB,QAAQ,SAAS,iBAAiB,QAAQ,iBAAiB,WAC9D,WAAW;;;;;;iBClEgB,KAAK,eAAe;;;;;;iBCApB,UAAU;;;;;;;;;;;;;;iBCQhB,MACvB,sBACA,eAAe,iBAAiB,SAAS,iBAAiB,QAE1D,MAAM,UACH,qBAAqB,SACpB,SAAS,gCACJ,iBAAiB,6BAErB,QAAQ,SAAS,iBAAiB,QAAQ,iBAAiB"}

package/dist/nav.mjs

@@ -1,6 +1,74 @@
-import { t as $page_default } from "./_page-BQs4WvCO.mjs";
-import { clearLayoutSlot, fillLayoutSlot, hydrate, mount } from "@torpor/view";
-
+import { t as $page } from "./_page-4cQKs_Dn.mjs";
+import { clearLayoutSlot, fillLayoutSlot, hydrate, mount, unmount } from "@torpor/view";
+//#region src/nav/route.ts
+/**
+* Builds a route path in a type-safe manner, filling in dynamic segments, e.g.
+* `route("/posts/[id]", { id: 5 })` returns `/posts/5`. The params object is
+* checked for exact keys: missing or unknown params error at compile time.
+*
+* NOTE: The rest args conditional must stay INLINE — routing it through a type
+* alias defeats `Params` inference, and excess keys stop being checked
+* @param path The route path
+* @param params The route params, required if the path has dynamic segments
+* @returns The path with the params filled in, URI-encoded
+*/
+function route(path, ...args) {
+	const params = args[0] ?? {};
+	return path.replace(/\[(\.\.\.)?([^\]]+)\]/g, (_, splat, name) => {
+		const value = params[name];
+		if (value === void 0) throw new Error(`Missing param '${name}' for route '${path}'`);
+		return splat ? value.split("/").map((segment) => encodeURIComponent(segment)).join("/") : encodeURIComponent(String(value));
+	});
+}
+//#endregion
+//#region src/nav/api.ts
+const METHODS = [
+	"get",
+	"post",
+	"patch",
+	"put",
+	"del",
+	"options",
+	"head"
+];
+/**
+* Creates typed client callers for a `+server` endpoint, e.g.
+*
+* ```ts
+* import type endpoint from "@/routes/api/posts/[id]/+server";
+* const post = makeApi<"/api/posts/[id]", typeof endpoint>("/api/posts/[id]");
+* const data = await post.get(); // typed from the endpoint's responses
+* ```
+*
+* Method names match the endpoint's handlers (`del` for DELETE). Params are
+* filled in and URI-encoded from the route path, and JSON responses are
+* parsed; non-JSON responses resolve to the raw Response. Failed requests
+* (non-2xx) throw.
+*
+* @param path The endpoint's route path
+* @param params The route params, required if the path has dynamic segments
+* @returns An object with one caller per handler defined by the endpoint
+*/
+function makeApi(path, ...args) {
+	const url = route(path, ...args);
+	const api = {};
+	for (const method of METHODS) api[method] = (body, init) => request(method, url, body, init);
+	return api;
+}
+async function request(method, url, body, init) {
+	const options = {
+		method: (method === "del" ? "delete" : method).toUpperCase(),
+		...init
+	};
+	if (body !== void 0 && options.body === void 0 && method !== "get" && method !== "head") if (typeof body === "object") {
+		options.headers ??= { "Content-Type": "application/json" };
+		options.body = JSON.stringify(body);
+	} else options.body = body;
+	const response = await fetch(url, options);
+	if (!response.ok) throw new Error(`API ${method.toUpperCase()} ${url} failed: ${response.status}`);
+	return (response.headers.get("Content-Type") ?? "").includes("application/json") ? await response.json() : response;
+}
+//#endregion
 //#region src/state/client.ts
 const CLIENT_SYMBOL = Symbol.for("torp.Client");
 const client = globalThis[CLIENT_SYMBOL] ??= {
@@ -8,8 +76,6 @@ const client = globalThis[CLIENT_SYMBOL] ??= {
 	layoutStack: [],
 	prefetchedData: {}
 };
-var client_default = client;
-
 //#endregion
 //#region src/nav/reload.ts
 /**
@@ -18,12 +84,11 @@ var client_default = client;
 async function reload() {
 	return await navigate(new URL(document.location.href));
 }
-
 //#endregion
 //#region src/nav/formSubmit.ts
 async function formSubmit(e) {
 	e.preventDefault();
-	$page_default.form = void 0;
+	$page.form = void 0;
 	const form = e.target;
 	const button = e.submitter;
 	let action = form.action || document.URL;
@@ -33,25 +98,30 @@ async function formSubmit(e) {
 		method: "POST",
 		mode: "cors",
 		credentials: "same-origin",
-		headers: { "x-torpor-form-submit": "" }
+		headers: { "X-Torpor-Form-Submit": "" }
 	};
 	const response = await fetch(action, options);
-	if (response.status === 200 && response.headers.has("x-torpor-form-redirect")) {
-		const redirect = response.headers.get("location");
+	if (response.status === 200 && response.headers.has("Content-Disposition") && /attachment;\s*filename="(.+?)"/.test(response.headers.get("Content-Disposition"))) {
+		const downloadFileName = response.headers.get("Content-Disposition")?.match(/attachment;\s*filename="(.+?)"/)[1] ?? "file";
+		const downloadLink = document.createElement("a");
+		downloadLink.href = window.URL.createObjectURL(await response.blob());
+		downloadLink.download = downloadFileName;
+		downloadLink.click();
+	} else if (response.status === 200 && response.headers.has("X-Torpor-Form-Redirect")) {
+		const redirect = response.headers.get("Location");
 		await load(redirect);
 		window.location.href = redirect;
 	} else if (response.status >= 200 && response.status <= 299 || response.status >= 400 && response.status <= 499) {
-		if (response.headers.get("content-type") === "application/json") $page_default.form = await response.json();
+		if (response.headers.get("Content-Type") === "application/json") $page.form = await response.json();
 		await reload();
 	}
 }
-
 //#endregion
 //#region src/nav/loadData.ts
 async function loadData(handler, params, path, query, newLayoutStack, clientEndPoint, serverEndPoint, prefetch = false) {
 	let data = {};
 	if (handler.layouts) {
-		let layoutStack = client_default.layoutStack;
+		let layoutStack = client.layoutStack;
 		for (let [i, layout] of handler.layouts.entries()) {
 			let layoutPath = layout.path;
 			for (let key in params) layoutPath = layoutPath.replace(`[${key}]`, params[key]);
@@ -78,7 +148,7 @@ async function loadData(handler, params, path, query, newLayoutStack, clientEndP
 	return data;
 }
 async function loadClientAndServerData(data, location, query, params, clientEndPoint, serverEndPoint) {
-	let prefetchedData = client_default.prefetchedData;
+	let prefetchedData = client.prefetchedData;
 	if (clientEndPoint?.load) {
 		const clientKey = location + (query.size > 0 ? `?${query}` : "");
 		if (prefetchedData[clientKey]) Object.assign(data, prefetchedData[clientKey]);
@@ -121,7 +191,6 @@ function buildClientParams(url, params, data) {
 		data
 	};
 }
-
 //#endregion
 //#region src/nav/navigate.ts
 async function navigate(url, withHydration = false) {
@@ -132,17 +201,17 @@ async function navigate(url, withHydration = false) {
 	}
 	const path = url.pathname;
 	const query = url.searchParams;
-	const route = client_default.router.match(path, query);
+	const route = client.router.match(path, query);
 	if (!route) {
 		console.log("404");
 		return false;
 	}
-	$page_default.url = url;
+	$page.url = url;
 	if (path.endsWith("/_error")) {
-		$page_default.status = parseInt(query.get("status") ?? "404");
-		$page_default.error = { message: query.get("message") ?? "" };
+		$page.status = parseInt(query.get("status") ?? "404");
+		$page.error = { message: query.get("message") ?? "" };
 		window.history.replaceState({}, "", url.toString().split("?")[0]);
-	} else $page_default.status = 200;
+	} else $page.status = 200;
 	const handler = route.handler;
 	const params = route.params || {};
 	const clientEndPoint = (await handler.endPoint()).default;
@@ -157,54 +226,63 @@ async function navigate(url, withHydration = false) {
 	let form;
 	if (formInput) {
 		form = JSON.parse(formInput.value);
-		$page_default.form = form;
+		$page.form = form;
 		formInput.remove();
 	}
 	let $props = { data };
-	$props.form = $page_default.form;
+	$props.form = $page.form;
 	const $context = { TorporBuildContext: { onformsubmit: formSubmit } };
-	client_default.layoutStack.push({
+	client.layoutStack.push({
 		path: route.handler.path,
 		data: {},
 		reuse: false,
 		slotRegion: null
 	});
-	client_default.layoutStack = newLayoutStack;
-	let layoutStack = client_default.layoutStack;
+	client.layoutStack = newLayoutStack;
+	let layoutStack = client.layoutStack;
 	let component = clientEndPoint.component;
 	let slots = void 0;
+	let reused = false;
+	let reusedIndex = -1;
 	if (handler.layouts) {
 		let slotFunctions = [];
-		slotFunctions[handler.layouts.length] = function clientComponent(parent$1, anchor) {
+		slotFunctions[handler.layouts.length] = function clientComponent(parent, anchor) {
 			let i = layoutStack.length - 1;
-			layoutStack[i].slotRegion = fillLayoutSlot(clientEndPoint.component, slotFunctions[i + 1], parent$1, anchor, $props, $context);
+			layoutStack[i].slotRegion = fillLayoutSlot(clientEndPoint.component, slotFunctions[i + 1], parent, anchor, $props, $context);
 		};
 		for (let i = handler.layouts.length - 1; i >= 0; i--) {
 			const layoutEndPoint = (await handler.layouts[i].endPoint())?.default;
 			if (layoutEndPoint?.component) if (layoutStack[i].reuse) {
-				parent = layoutStack[i].slotRegion.startNode.parentNode;
-				clearLayoutSlot(layoutStack[i].slotRegion);
 				component = slotFunctions[i + 1];
+				reusedIndex = i;
+				reused = true;
 				break;
 			} else if (i === 0) {
 				component = layoutEndPoint.component;
 				slots = { _: slotFunctions[i + 1] };
-			} else slotFunctions[i] = function layoutComponent(parent$1, anchor, _, $context$1) {
-				layoutStack[i - 1].slotRegion = fillLayoutSlot(layoutEndPoint.component, slotFunctions[i + 1], parent$1, anchor, $props, $context$1);
+			} else slotFunctions[i] = function layoutComponent(parent, anchor, _, $context) {
+				layoutStack[i - 1].slotRegion = fillLayoutSlot(layoutEndPoint.component, slotFunctions[i + 1], parent, anchor, $props, $context);
 			};
 		}
 	}
-	if (withHydration) hydrate(parent, component, $props, slots);
-	else try {
-		mount(parent, component, $props, slots);
+	try {
+		if (reused) {
+			const slotRegion = layoutStack[reusedIndex].slotRegion;
+			parent = slotRegion.startNode.parentNode;
+			clearLayoutSlot(slotRegion);
+			component(parent, null);
+		} else if (withHydration) hydrate(parent, component, $props, slots);
+		else {
+			unmount(parent);
+			mount(parent, component, $props, slots);
+		}
 	} catch (error) {
 		parent.innerHTML = "<span style=\"color: red\">Script syntax error</span><p>" + error + "</p>";
 		console.log(error);
 	}
-	client_default.prefetchedData = {};
+	client.prefetchedData = {};
 	return true;
 }
-
 //#endregion
 //#region src/nav/load.ts
 /**
@@ -213,7 +291,7 @@ async function navigate(url, withHydration = false) {
 async function load(path) {
 	return await navigate(new URL(path, document.location.href));
 }
-
 //#endregion
-export { load, reload };
+export { load, makeApi, reload, route };
+
 //# sourceMappingURL=nav.mjs.map