@torpor/build 0.4.13 → 1.0.0

package/README.md

@@ -4,8 +4,6 @@ A framework for building sites and apps with Torpor.
 
 Built on top of [Vite](https://vite.dev).
 
-🚧 WARNING: WORK IN PROGRESS 🚧
-
 ## Installation
 
 Use `npm` (or your preferred package manager) to create a starter project:
@@ -17,6 +15,26 @@ npm install
 npm run dev
 ```
 
+## Features
+
+- Configure the `Site` class in your `site.config.ts` with routes and adapters
+- Setup code-based routing (with `site.addRoute`)
+- Or file-based routing (with `site.addRouteFolder`)
+- Pages and API endpoints, with layouts and error pages
+- A `tb` command line interface:
+  - `tb --dev` -- start the dev server
+  - `tb --build` -- create a production build
+  - `tb --preview` -- preview the production build
+  - `tb --openapi [outFile]` -- generate an OpenAPI document
+- Adapters for deployment targets -- see
+  [@torpor/adapter-node](../adapters/adapter-node) and
+  [@torpor/adapter-cloudflare](../adapters/adapter-cloudflare)
+- Schema validation for endpoints (`@torpor/build/schema`)
+- Form helpers (`@torpor/build/form`) and client side navigation helpers
+  (`@torpor/build/nav`)
+- `$page` state for pages (`@torpor/build/state`) and response helpers
+  (`@torpor/build/response`)
+
 ## Folder structure
 
 - /src

package/dist/Jsonify-Dg6gChd3.d.mts

@@ -0,0 +1,10 @@
+//#region src/types/Jsonify.d.ts
+/**
+ * The JSON-serialized form of a type: what a value looks like after a
+ * JSON.stringify / JSON.parse round trip. Dates become strings, functions and
+ * undefined properties are dropped.
+ */
+type Jsonify<T> = T extends string | number | boolean | null ? T : T extends undefined | ((...args: any[]) => any) ? never : T extends Date ? string : T extends Array<infer Item> ? Array<Jsonify<Item>> : T extends object ? { [Key in keyof T as T[Key] extends undefined | ((...args: any[]) => any) ? never : Key]: Jsonify<T[Key]>; } : T;
+//#endregion
+export { Jsonify as t };
+//# sourceMappingURL=Jsonify-Dg6gChd3.d.mts.map

package/dist/Jsonify-Dg6gChd3.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Jsonify-Dg6gChd3.d.mts","names":[],"sources":["../src/types/Jsonify.ts"],"mappings":";;;;;;KAKY,QAAQ,KAAK,6CACtB,IACA,2BAA2B,+BAE1B,UAAU,gBAET,UAAU,YAAY,QACrB,MAAM,QAAQ,SACd,sBAEE,aAAa,KAAK,EAAE,8BAA8B,+BAEhD,MAAM,QAAQ,EAAE,WAEnB"}

package/dist/ParseRouteParams-DBmqlmLh.d.mts

@@ -0,0 +1,42 @@
+//#region src/types/ParseRouteParams.d.ts
+/**
+ * Extracts the params object from a route path string.
+ *
+ * Dynamic segments (`[id]`) and splat segments (`[...path]`) become string
+ * properties; static segments are ignored. For example:
+ *
+ * ```ts
+ * type Params = ParseRouteParams<"/posts/[id]/comments/[commentId]">;
+ * // { id: string; commentId: string }
+ * ```
+ */
+type ParseRouteParams<Route extends string> = ParseSegments<Route, unknown>;
+type ParseSegments<Route extends string, Params> = Route extends `${infer Head}/${infer Rest}` ? ParseSegments<Rest, ParseSegment<Head, Params>> : ParseSegment<Route, Params>;
+type ParseSegment<Segment extends string, Params> = Segment extends `[...${infer Name}]` ? Params & { [Key in Name]: string; } : Segment extends `[${infer Name}]` ? Params & { [Key in Name]: string; } : Params;
+/**
+ * Resolves the params for a route annotation: the parsed params for a literal
+ * route path, or a loose record when no route (or a non-literal string) is
+ * given.
+ */
+type RouteParamsOf<Route extends string | undefined> = string extends Route ? Record<string, string> : Route extends string ? ParseRouteParams<Route> : Record<string, string>;
+/**
+ * Validates an inferred params object against a route's params shape:
+ * resolves to the params type when its keys are exactly the route's keys, and
+ * `never` when keys are missing or extra — so wrong keys error at the call
+ * site (excess property checks are skipped for deferred conditional rest
+ * tuples, but assignability to `never` can't be).
+ */
+type ExactRouteParams<Params, Shape> = Params extends Shape ? [Exclude<keyof Params, keyof Shape>] extends [never] ? Params : never : never;
+/**
+ * The arguments for building a route path: nothing for static routes, or the
+ * route's params object for dynamic routes.
+ */
+type RouteArgs<Route extends string> = string extends Route ? [params?: Record<string, string>] : keyof ParseRouteParams<Route> extends never ? [] : [params: ParseRouteParams<Route>];
+/**
+ * RouteArgs for an optional route annotation, defaulting to a single optional
+ * loose params object.
+ */
+type RouteArgsOf<Route extends string | undefined> = Route extends string ? RouteArgs<Route> : [params?: Record<string, string>];
+//#endregion
+export { RouteParamsOf as a, RouteArgsOf as i, ParseRouteParams as n, RouteArgs as r, ExactRouteParams as t };
+//# sourceMappingURL=ParseRouteParams-DBmqlmLh.d.mts.map

package/dist/ParseRouteParams-DBmqlmLh.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ParseRouteParams-DBmqlmLh.d.mts","names":[],"sources":["../src/types/ParseRouteParams.ts"],"mappings":";;;;;;;;;;;;KAWY,iBAAiB,wBAAwB,cAAc;KAE9D,cAAc,sBAAsB,UAAU,uBAAuB,cAAc,SACrF,cAAc,MAAM,aAAa,MAAM,WACvC,aAAa,OAAO;KAElB,aAAa,wBAAwB,UAAU,6BAA6B,UAC9E,YAAY,OAAO,mBACnB,0BAA0B,UACzB,YAAY,OAAO,mBACnB;;;;;;KAOQ,cAAc,mDAAmD,QAC1E,yBACA,uBACC,iBAAiB,SACjB;;;;;;;;KASQ,iBAAiB,QAAQ,SAAS,eAAe,SACzD,cAAc,cAAc,0BAC5B;;;;;KAQQ,UAAU,uCAAuC,SACzD,SAAS,gCACJ,iBAAiB,6BAErB,QAAQ,iBAAiB;;;;;KAMlB,YAAY,oCAAoC,uBACzD,UAAU,UACT,SAAS"}

package/dist/{RouteType-B6BMOyYw.mjs → Router-C4ADUfhv.mjs}

@@ -1,49 +1,44 @@
-import { t as pathToRegex } from "./pathToRegex-TUAMc3zS.mjs";
-
+import { t as PathTrie } from "./pathTrie-D4Ax2Mu9.mjs";
 //#region src/site/Router.ts
 /**
 * A router that handles file routes with layouts, hooks, etc.
 */
 var Router = class {
 	routes = [];
+	#trie = new PathTrie();
 	constructor() {}
 	addPages(routes) {
-		for (let r of routes) this.routes.push(new Route(r.path, {
-			path: r.path,
-			type: r.type,
-			endPoint: r.endPoint,
-			subFolder: r.subFolder
-		}));
-		this.#sortRoutes();
+		for (let r of routes) this.addPage(r.path, r.type, r.endPoint, r.subFolder);
 		return this;
 	}
 	addPage(path, type, endPoint, subFolder) {
-		this.routes.push(new Route(path, {
+		let route = new Route(path, {
 			path,
 			type,
 			endPoint,
 			subFolder
-		}));
+		});
+		this.routes.push(route);
+		this.#trie.insert(path, route);
 		this.#sortRoutes();
 		return this;
 	}
 	match(path, query) {
-		for (let route of this.routes) {
-			let match = path.match(route.regex);
-			if (match) {
-				if (!route.handler.loaded) this.#loadHandler(route.handler, route.path);
-				return {
-					handler: route.handler,
-					params: match.groups,
-					query
-				};
-			}
+		let found = this.#trie.match(path);
+		if (found) {
+			let route = found.value;
+			if (!route.handler.loaded) this.#loadHandler(route.handler, route.path);
+			return {
+				handler: route.handler,
+				params: found.params,
+				query
+			};
 		}
 	}
 	#loadHandler(handler, path) {
 		handler.layouts = this.#findLayouts(path, handler);
 		handler.serverEndPoint = this.#findServer(path);
-		handler.serverHook = this.#findServerHook(handler);
+		handler.serverHooks = this.#findServerHooks(handler);
 	}
 	#findLayouts(path, handler) {
 		let layouts = [];
@@ -66,11 +61,17 @@ var Router = class {
 		const serverRoute = this.routes.find((r) => r.path === serverPath);
 		return serverRoute && serverRoute.handler.endPoint;
 	}
-	#findServerHook(handler) {
-		let serverHookPath = "/_hook/~server";
-		if (handler.subFolder !== void 0) serverHookPath = handler.subFolder + serverHookPath;
-		const serverHookRoute = this.routes.find((r) => r.path === serverHookPath);
-		return serverHookRoute && serverHookRoute.handler.endPoint;
+	#findServerHooks(handler) {
+		const hooks = [];
+		let parts = handler.path.replace(/\/~server$/, "").split("/");
+		let basePath = "";
+		for (let i = 0; i < parts.length; i++) {
+			if (i > 0) basePath += "/" + parts[i];
+			const hookPath = basePath + "/_hook/~server";
+			const hookRoute = this.routes.find((r) => r.path === hookPath);
+			if (hookRoute && hookRoute.handler.subFolder === handler.subFolder) hooks.push(hookRoute.handler.endPoint);
+		}
+		return hooks.length ? hooks : void 0;
 	}
 	#sortRoutes() {
 		this.routes = this.routes.sort((a, b) => {
@@ -83,26 +84,13 @@ var Router = class {
 };
 var Route = class {
 	path;
-	regex;
 	handler;
 	constructor(path, handler) {
 		this.path = path;
-		this.regex = pathToRegex(path);
 		this.handler = handler;
 	}
 };
-
 //#endregion
-//#region src/types/RouteType.ts
-const PAGE_ROUTE = 0;
-const PAGE_SERVER_ROUTE = 1;
-const SERVER_ROUTE = 3;
-const LAYOUT_ROUTE = 4;
-const LAYOUT_SERVER_ROUTE = 5;
-const HOOK_ROUTE = 6;
-const HOOK_SERVER_ROUTE = 7;
-const ERROR_ROUTE = 8;
+export { Router as t };
 
-//#endregion
-export { LAYOUT_SERVER_ROUTE as a, SERVER_ROUTE as c, LAYOUT_ROUTE as i, Router as l, HOOK_ROUTE as n, PAGE_ROUTE as o, HOOK_SERVER_ROUTE as r, PAGE_SERVER_ROUTE as s, ERROR_ROUTE as t };
-//# sourceMappingURL=RouteType-B6BMOyYw.mjs.map
+//# sourceMappingURL=Router-C4ADUfhv.mjs.map

package/dist/Router-C4ADUfhv.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Router-C4ADUfhv.mjs","names":["#trie","#sortRoutes","#loadHandler","#findLayouts","#findServer","#findServerHooks"],"sources":["../src/site/Router.ts"],"sourcesContent":["import type LayoutHandler from \"../types/LayoutHandler\";\nimport type ManifestRoute from \"../types/ManifestRoute\";\nimport type RouteHandler from \"../types/RouteHandler\";\nimport PathTrie from \"../utils/pathTrie\";\n\n/**\n * A router that handles file routes with layouts, hooks, etc.\n */\nexport default class Router {\n\troutes: Route[] = [];\n\t// Match index for the routes above. The routes list is kept for\n\t// introspection (layouts/hooks lookup, client nav, tests); the trie is\n\t// what `match` walks.\n\t#trie = new PathTrie<Route>();\n\n\tconstructor() {}\n\n\t//add(path: string, file: string) {\n\t//\t// TODO: Call the specific addX method based on the file path\n\t//\tthis.addPage(route, file);\n\t//}\n\n\taddPages(routes: ManifestRoute[]): this {\n\t\tfor (let r of routes) {\n\t\t\tthis.addPage(r.path, r.type, r.endPoint, r.subFolder);\n\t\t}\n\t\treturn this;\n\t}\n\n\t// TODO: Allow calling with the endpoint itself, so that you can setup an app with no scaffold\n\taddPage(path: string, type: number, endPoint: () => Promise<any>, subFolder?: string): this {\n\t\tlet route = new Route(path, {\n\t\t\tpath,\n\t\t\ttype,\n\t\t\tendPoint,\n\t\t\tsubFolder,\n\t\t});\n\t\tthis.routes.push(route);\n\t\tthis.#trie.insert(path, route);\n\t\tthis.#sortRoutes();\n\t\treturn this;\n\t}\n\n\t/*\n\tloadPage(ev: ServerEvent, file: string): Response {\n\t\tlet page = this.pages.get(file);\n\t\tif (!page) {\n\t\t\tpage = {};\n\t\t\tthis.pages.set(file, page);\n\t\t}\n\t}\n\t*/\n\n\tmatch(path: string, query: URLSearchParams): RouteMatch | undefined {\n\t\tlet found = this.#trie.match(path);\n\t\tif (found) {\n\t\t\tlet route = found.value;\n\t\t\t// Lazy load server endpoints and layouts\n\t\t\tif (!route.handler.loaded) {\n\t\t\t\tthis.#loadHandler(route.handler, route.path);\n\t\t\t}\n\n\t\t\treturn {\n\t\t\t\thandler: route.handler,\n\t\t\t\tparams: found.params,\n\t\t\t\tquery,\n\t\t\t};\n\t\t}\n\t}\n\n\t#loadHandler(handler: RouteHandler, path: string) {\n\t\thandler.layouts = this.#findLayouts(path, handler);\n\t\thandler.serverEndPoint = this.#findServer(path);\n\t\thandler.serverHooks = this.#findServerHooks(handler);\n\t}\n\n\t#findLayouts(path: string, handler: RouteHandler): LayoutHandler[] | undefined {\n\t\tlet layouts: LayoutHandler[] = [];\n\t\tlet parts = path\n\t\t\t// Strip the trailing`~/server` (so we don't look for `~/server/_layout`\n\t\t\t// which will never exist)\n\t\t\t.replace(/\\/~server$/, \"\")\n\t\t\t// The path will always start with / so splitting e.g. `/first/second`\n\t\t\t// will result in ['', 'first', 'second'] and checks for `/_layout`,\n\t\t\t// `/first/_layout` and `/second/_layout`\n\t\t\t.split(\"/\");\n\t\tlet basePath = \"\";\n\t\tfor (let i = 0; i < parts.length; i++) {\n\t\t\tif (i > 0) {\n\t\t\t\tbasePath += \"/\" + parts[i];\n\t\t\t}\n\t\t\tconst layoutPath = basePath + \"/_layout\";\n\t\t\tconst layoutRoute = this.routes.find((r) => r.path === layoutPath);\n\t\t\tif (layoutRoute && layoutRoute.handler.subFolder === handler.subFolder) {\n\t\t\t\tlayouts.push({\n\t\t\t\t\tpath: layoutPath,\n\t\t\t\t\tendPoint: layoutRoute.handler.endPoint,\n\t\t\t\t\tserverEndPoint: this.#findServer(layoutPath),\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t\treturn layouts.length ? layouts : undefined;\n\t}\n\n\t#findServer(path: string): (() => Promise<any>) | undefined {\n\t\tconst serverPath = path.replace(/\\/$/, \"\") + \"/~server\";\n\t\tconst serverRoute = this.routes.find((r) => r.path === serverPath);\n\t\treturn serverRoute && serverRoute.handler.endPoint;\n\t}\n\n\t#findServerHooks(handler: RouteHandler): (() => Promise<any>)[] | undefined {\n\t\t// Collect the hooks from the root down to the route path, like\n\t\t// layouts. Only hooks with the same subFolder are included, so that\n\t\t// e.g. an `api` set of routes can have its own hooks\n\t\tconst hooks: (() => Promise<any>)[] = [];\n\t\tlet parts = handler.path\n\t\t\t// Strip the trailing `~server` (so we don't look for\n\t\t\t// `~server/_hook/~server` which will never exist)\n\t\t\t.replace(/\\/~server$/, \"\")\n\t\t\t// The path will always start with / so splitting e.g.\n\t\t\t// `/first/second` will result in ['', 'first', 'second'] and\n\t\t\t// checks for `/_hook/~server`, `/first/_hook/~server` and\n\t\t\t// `/second/_hook/~server`\n\t\t\t.split(\"/\");\n\t\tlet basePath = \"\";\n\t\tfor (let i = 0; i < parts.length; i++) {\n\t\t\tif (i > 0) {\n\t\t\t\tbasePath += \"/\" + parts[i];\n\t\t\t}\n\t\t\tconst hookPath = basePath + \"/_hook/~server\";\n\t\t\tconst hookRoute = this.routes.find((r) => r.path === hookPath);\n\t\t\tif (hookRoute && hookRoute.handler.subFolder === handler.subFolder) {\n\t\t\t\thooks.push(hookRoute.handler.endPoint);\n\t\t\t}\n\t\t}\n\t\treturn hooks.length ? hooks : undefined;\n\t}\n\n\t// HACK: We're doing this here as well as in Site, so that you can use the\n\t// Router externally without Site\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\nclass Route {\n\tpath: string;\n\thandler: RouteHandler;\n\n\tconstructor(path: string, handler: RouteHandler) {\n\t\tthis.path = path;\n\t\tthis.handler = handler;\n\t}\n}\n\ninterface RouteMatch {\n\thandler: RouteHandler;\n\tparams?: Record<string, string>;\n\tquery: URLSearchParams;\n}\n"],"mappings":"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"}

package/dist/{Server-CF5wDJp6.d.mts → Server-C_IKav_e.d.mts}

@@ -1,5 +1,4 @@
 import { SerializeOptions } from "cookie";
-
 //#region src/server/CookieHelper.d.ts
 declare class CookieHelper {
   request: Request;
@@ -22,50 +21,79 @@ declare class HeaderHelper {
 //#endregion
 //#region src/server/ServerEvent.d.ts
 declare class ServerEvent {
+  #private;
   request: Request;
   response: Response | undefined | void;
+  /**
+   * Set when the route handler (or a middleware enter hook) threw an
+   * error. Exit hooks can return a Response to handle it; if none does,
+   * the error is rethrown to the caller.
+   */
+  error: unknown;
   params?: Record<string, string>;
   adapter: any;
   cookies: CookieHelper;
   headers: HeaderHelper;
-  constructor(request: Request, params?: Record<string, string>);
+  /** The request URL, parsed lazily. */
+  get url(): URL;
+  constructor(request: Request, params?: Record<string, string>, url?: URL);
   addHeaders(): void;
+  /**
+   * Reads the request body as JSON.
+   */
+  json(): Promise<unknown>;
 }
 //#endregion
 //#region src/server/types/MiddlewareFunction.d.ts
-type MiddlewareFunction = (ev: ServerEvent, next: () => void | Promise<void>) => void | Promise<void>;
+type MiddlewareFunction = {
+  /**
+   * Called before the route handler. Middleware are run in the order they
+   * were added. Return a Response to short-circuit the request; the
+   * remaining middleware and the route handler are then skipped.
+   */
+  enter?: (ev: ServerEvent) => Response | void | Promise<Response | void>;
+  /**
+   * Called after the route handler (even if it threw), in reverse order.
+   * Return a Response to replace the response. Middleware that were skipped
+   * by a short-circuit don't get their exit hook run.
+   *
+   * If the route handler (or a later enter hook) threw, the error is
+   * available as `ev.error`; returning a Response handles the error and
+   * stops it from propagating.
+   */
+  exit?: (ev: ServerEvent) => Response | void | Promise<Response | void>;
+};
 //#endregion
 //#region src/server/types/ServerFunction.d.ts
 type ServerFunction = (e: ServerEvent) => Response | undefined | void | Promise<Response | undefined | void>;
 //#endregion
 //#region src/server/Server.d.ts
 /**
-* A Fetch API Request/Response server.
-*/
+ * 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
-  */
+   * 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
-  */
+   * 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);
 }
@@ -75,4 +103,4 @@ interface Match {
 }
 //#endregion
 export { CookieHelper as a, HeaderHelper as i, MiddlewareFunction as n, ServerEvent as r, Server as t };
-//# sourceMappingURL=Server-CF5wDJp6.d.mts.map
+//# sourceMappingURL=Server-C_IKav_e.d.mts.map

package/dist/Server-C_IKav_e.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Server-C_IKav_e.d.mts","names":[],"sources":["../src/server/CookieHelper.ts","../src/server/HeaderHelper.ts","../src/server/ServerEvent.ts","../src/server/types/MiddlewareFunction.ts","../src/server/types/ServerFunction.ts","../src/server/Server.ts"],"mappings":";;cAEqB;EACpB,SAAS;EACT,SAAS;EAET,YAAY,SAAS;EAIrB,IAAI;EAaJ,IAAI,cAAc,eAAe,UAAU;EAU3C,OAAO,cAAc,UAAU;;;;cCjCX;EACpB,SAAS;EACT,SAAS;EAET,YAAY,SAAS;EAIrB,IAAI;EASJ,IAAI,cAAc;EAIlB,OAAO;;;;cClBa;;EACpB,SAAS;EACT,UAAU;;;;;;EAMV;EAEA,SAAS;EAET;EAEA,SAAS;EACT,SAAS;;MAOL,OAAO;EAIX,YAAY,SAAS,SAAS,SAAS,wBAAwB,MAAM;EAYrE;;;;EAiBA,QAAQ;;;;KCxDJ;;;;;;EAMJ,SAAS,IAAI,gBAAgB,kBAAkB,QAAQ;;;;;;;;;;EAUvD,QAAQ,IAAI,gBAAgB,kBAAkB,QAAQ;;;;KChBlD,kBACJ,GAAG,gBACC,8BAA8B,QAAQ;;;;;;cCItB;;EAEpB,QAAQ;EAIR,YAAY;EAEZ;;;;;;EAUA,QAAe,OAAO,cAAc,KAAK,OAAO,gBAAc,QAAQ;;;;;;;EAsEtE,IAAI,cAAc,IAAI,iBAAiB;EAQvC,MAAM,eAAe;EAarB,OAAO,IAAI,uBAAuB;;cAyB7B;EACL;EACA,IAAI;EAEJ,YAAY,cAAc,IAAI;;UAkBrB;EACT,IAAI;EACJ,SAAS"}

package/dist/{ServerEvent-CxPwA4lH.mjs → ServerEvent-Dljn5i7A.mjs}

@@ -1,5 +1,4 @@
-import { parse, serialize } from "cookie";
-
+import { parseCookie, stringifySetCookie } from "cookie";
 //#region src/server/CookieHelper.ts
 var CookieHelper = class {
 	request;
@@ -8,23 +7,33 @@ var CookieHelper = class {
 		this.request = request;
 	}
 	get(name) {
-		if (this.cookies.has(name)) return parse(this.cookies.get(name))[name];
-		return parse(this.request.headers.get("cookie") ?? "")[name];
+		if (this.cookies.has(name)) return parseCookie(this.cookies.get(name))[name];
+		return parseCookie(this.request.headers.get("Cookie") ?? "")[name];
 	}
 	set(name, value, options) {
 		options ??= {};
 		options.httpOnly ??= true;
 		options.secure ??= true;
 		options.sameSite ??= "lax";
-		this.cookies.set(name, serialize(name, value, options));
+		this.cookies.set(name, stringifySetCookie({
+			name,
+			value,
+			...options
+		}));
 	}
 	delete(name, options) {
 		options ??= {};
+		options.httpOnly ??= true;
+		options.secure ??= true;
+		options.sameSite ??= "lax";
 		options.expires = /* @__PURE__ */ new Date(0);
-		this.cookies.set(name, serialize(name, "", options));
+		this.cookies.set(name, stringifySetCookie({
+			name,
+			value: "",
+			...options
+		}));
 	}
 };
-
 //#endregion
 //#region src/server/HeaderHelper.ts
 var HeaderHelper = class {
@@ -44,19 +53,30 @@ var HeaderHelper = class {
 		this.headers.delete(name);
 	}
 };
-
 //#endregion
 //#region src/server/ServerEvent.ts
 var ServerEvent = class {
 	request;
 	response;
+	/**
+	* Set when the route handler (or a middleware enter hook) threw an
+	* error. Exit hooks can return a Response to handle it; if none does,
+	* the error is rethrown to the caller.
+	*/
+	error;
 	params;
 	adapter;
 	cookies;
 	headers;
-	constructor(request, params) {
+	#url;
+	/** The request URL, parsed lazily. */
+	get url() {
+		return this.#url ??= new URL(this.request.url);
+	}
+	constructor(request, params, url) {
 		this.request = request;
 		this.params = params;
+		this.#url = url;
 		this.cookies = new CookieHelper(request);
 		this.headers = new HeaderHelper(request);
 		this.adapter = globalThis.adapter;
@@ -66,8 +86,14 @@ var ServerEvent = class {
 		for (let cookie of this.cookies.cookies.values()) this.response.headers.append("set-cookie", cookie);
 		for (let header of this.headers.headers.entries()) this.response.headers.append(header[0], header[1]);
 	}
+	/**
+	* Reads the request body as JSON.
+	*/
+	json() {
+		return this.request.json();
+	}
 };
-
 //#endregion
 export { HeaderHelper as n, CookieHelper as r, ServerEvent as t };
-//# sourceMappingURL=ServerEvent-CxPwA4lH.mjs.map
+
+//# sourceMappingURL=ServerEvent-Dljn5i7A.mjs.map

package/dist/ServerEvent-Dljn5i7A.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServerEvent-Dljn5i7A.mjs","names":["#url"],"sources":["../src/server/CookieHelper.ts","../src/server/HeaderHelper.ts","../src/server/ServerEvent.ts"],"sourcesContent":["import { type SerializeOptions, parseCookie, stringifySetCookie } from \"cookie\";\n\nexport default class CookieHelper {\n\trequest: Request;\n\tcookies: Map<string, string> = new Map();\n\n\tconstructor(request: Request) {\n\t\tthis.request = request;\n\t}\n\n\tget(name: string): string | undefined {\n\t\t// If it's been set, return the value from the map\n\t\tif (this.cookies.has(name)) {\n\t\t\t// The stored value is a serialized Set-Cookie header; pull the\n\t\t\t// \"name=value\" prefix off and re-parse to get just the value\n\t\t\treturn parseCookie(this.cookies.get(name)!)[name];\n\t\t}\n\n\t\t// Otherwise, return the value from the `cookie` header\n\t\tconst header = this.request.headers.get(\"Cookie\");\n\t\treturn parseCookie(header ?? \"\")[name];\n\t}\n\n\tset(name: string, value: string, options?: SerializeOptions): void {\n\t\t// Set a cookie header with some default values for security\n\t\toptions ??= {};\n\t\toptions.httpOnly ??= true;\n\t\toptions.secure ??= true;\n\t\toptions.sameSite ??= \"lax\";\n\n\t\tthis.cookies.set(name, stringifySetCookie({ name, value, ...options }));\n\t}\n\n\tdelete(name: string, options?: SerializeOptions): void {\n\t\t// Set a cookie header with an empty value and an immediate expiry date.\n\t\t// Apply the same secure defaults as `set` so a previously-set Secure\n\t\t// cookie is actually overridden by the deletion.\n\t\toptions ??= {};\n\t\toptions.httpOnly ??= true;\n\t\toptions.secure ??= true;\n\t\toptions.sameSite ??= \"lax\";\n\t\toptions.expires = new Date(0);\n\n\t\tthis.cookies.set(name, stringifySetCookie({ name, value: \"\", ...options }));\n\t}\n}\n","export default class HeaderHelper {\n\trequest: Request;\n\theaders: Map<string, string> = new Map();\n\n\tconstructor(request: Request) {\n\t\tthis.request = request;\n\t}\n\n\tget(name: string): string | undefined {\n\t\t// If it's been set, return the updated value\n\t\tif (this.headers.has(name)) {\n\t\t\treturn this.headers.get(name);\n\t\t}\n\t\t// Otherwise, return the value from the header\n\t\treturn this.request.headers.get(name) ?? undefined;\n\t}\n\n\tset(name: string, value: string): void {\n\t\tthis.headers.set(name, value);\n\t}\n\n\tdelete(name: string): void {\n\t\tthis.headers.delete(name);\n\t}\n}\n","import CookieHelper from \"./CookieHelper\";\nimport HeaderHelper from \"./HeaderHelper\";\n\nexport default class ServerEvent {\n\trequest: Request;\n\tresponse: Response | undefined | void;\n\t/**\n\t * Set when the route handler (or a middleware enter hook) threw an\n\t * error. Exit hooks can return a Response to handle it; if none does,\n\t * the error is rethrown to the caller.\n\t */\n\terror: unknown;\n\t// TODO: Should we cast types??\n\tparams?: Record<string, string>;\n\n\tadapter: any;\n\n\tcookies: CookieHelper;\n\theaders: HeaderHelper;\n\n\t// Parsed once per request; Server.fetch passes the URL it already needed\n\t// for matching so it isn't parsed twice\n\t#url: URL | undefined;\n\n\t/** The request URL, parsed lazily. */\n\tget url(): URL {\n\t\treturn (this.#url ??= new URL(this.request.url));\n\t}\n\n\tconstructor(request: Request, params?: Record<string, string>, url?: URL) {\n\t\tthis.request = request;\n\t\tthis.params = params;\n\t\tthis.#url = url;\n\t\tthis.cookies = new CookieHelper(request);\n\t\tthis.headers = new HeaderHelper(request);\n\n\t\t// Adapters may have added the `adapter` property to globalThis\n\t\t// @ts-ignore\n\t\tthis.adapter = globalThis.adapter;\n\t}\n\n\taddHeaders(): void {\n\t\tif (!this.response) {\n\t\t\tthrow new Error(\"Response not created yet\");\n\t\t}\n\n\t\tfor (let cookie of this.cookies.cookies.values()) {\n\t\t\tthis.response.headers.append(\"set-cookie\", cookie);\n\t\t}\n\n\t\tfor (let header of this.headers.headers.entries()) {\n\t\t\tthis.response.headers.append(header[0], header[1]);\n\t\t}\n\t}\n\n\t/**\n\t * Reads the request body as JSON.\n\t */\n\tjson(): Promise<unknown> {\n\t\treturn this.request.json();\n\t}\n}\n"],"mappings":";;AAEA,IAAqB,eAArB,MAAkC;CACjC;CACA,0BAA+B,IAAI,IAAI;CAEvC,YAAY,SAAkB;EAC7B,KAAK,UAAU;CAChB;CAEA,IAAI,MAAkC;EAErC,IAAI,KAAK,QAAQ,IAAI,IAAI,GAGxB,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAI,CAAE,CAAC,CAAC;EAK7C,OAAO,YADQ,KAAK,QAAQ,QAAQ,IAAI,QAChB,KAAK,EAAE,CAAC,CAAC;CAClC;CAEA,IAAI,MAAc,OAAe,SAAkC;EAElE,YAAY,CAAC;EACb,QAAQ,aAAa;EACrB,QAAQ,WAAW;EACnB,QAAQ,aAAa;EAErB,KAAK,QAAQ,IAAI,MAAM,mBAAmB;GAAE;GAAM;GAAO,GAAG;EAAQ,CAAC,CAAC;CACvE;CAEA,OAAO,MAAc,SAAkC;EAItD,YAAY,CAAC;EACb,QAAQ,aAAa;EACrB,QAAQ,WAAW;EACnB,QAAQ,aAAa;EACrB,QAAQ,0BAAU,IAAI,KAAK,CAAC;EAE5B,KAAK,QAAQ,IAAI,MAAM,mBAAmB;GAAE;GAAM,OAAO;GAAI,GAAG;EAAQ,CAAC,CAAC;CAC3E;AACD;;;AC7CA,IAAqB,eAArB,MAAkC;CACjC;CACA,0BAA+B,IAAI,IAAI;CAEvC,YAAY,SAAkB;EAC7B,KAAK,UAAU;CAChB;CAEA,IAAI,MAAkC;EAErC,IAAI,KAAK,QAAQ,IAAI,IAAI,GACxB,OAAO,KAAK,QAAQ,IAAI,IAAI;EAG7B,OAAO,KAAK,QAAQ,QAAQ,IAAI,IAAI,KAAK,KAAA;CAC1C;CAEA,IAAI,MAAc,OAAqB;EACtC,KAAK,QAAQ,IAAI,MAAM,KAAK;CAC7B;CAEA,OAAO,MAAoB;EAC1B,KAAK,QAAQ,OAAO,IAAI;CACzB;AACD;;;ACrBA,IAAqB,cAArB,MAAiC;CAChC;CACA;;;;;;CAMA;CAEA;CAEA;CAEA;CACA;CAIA;;CAGA,IAAI,MAAW;EACd,OAAQ,KAAKA,SAAS,IAAI,IAAI,KAAK,QAAQ,GAAG;CAC/C;CAEA,YAAY,SAAkB,QAAiC,KAAW;EACzE,KAAK,UAAU;EACf,KAAK,SAAS;EACd,KAAKA,OAAO;EACZ,KAAK,UAAU,IAAI,aAAa,OAAO;EACvC,KAAK,UAAU,IAAI,aAAa,OAAO;EAIvC,KAAK,UAAU,WAAW;CAC3B;CAEA,aAAmB;EAClB,IAAI,CAAC,KAAK,UACT,MAAM,IAAI,MAAM,0BAA0B;EAG3C,KAAK,IAAI,UAAU,KAAK,QAAQ,QAAQ,OAAO,GAC9C,KAAK,SAAS,QAAQ,OAAO,cAAc,MAAM;EAGlD,KAAK,IAAI,UAAU,KAAK,QAAQ,QAAQ,QAAQ,GAC/C,KAAK,SAAS,QAAQ,OAAO,OAAO,IAAI,OAAO,EAAE;CAEnD;;;;CAKA,OAAyB;EACxB,OAAO,KAAK,QAAQ,KAAK;CAC1B;AACD"}