@torpor/build 0.1.23 → 0.1.25

package/src/site/serverEntry.ts

@@ -10,6 +10,7 @@ import type PageEndPoint from "../types/PageEndPoint.ts";
 import type PageServerEndPoint from "../types/PageServerEndPoint.ts";
 import RouteHandler from "../types/RouteHandler.ts";
 import {
+	ERROR_ROUTE,
 	HOOK_ROUTE,
 	HOOK_SERVER_ROUTE,
 	LAYOUT_ROUTE,
@@ -29,6 +30,33 @@ router.addPages(manifest.routes);
 
 //console.log(`routes:\n  ${router.routes.map((r) => r.path).join("\n  ")}`);
 
+async function handleResponse(response: Response): Promise<Response> {
+	$page.status = response.status;
+
+	// Success codes and redirect codes are acceptable
+	if (response.status >= 200 && response.status <= 399) {
+		return response;
+	}
+
+	// It's an error, so redirect to the error page
+	// We're just pushing the status and message in the URL, but maybe there's a
+	// more sophisticated way to do this?
+	// TODO: Should be returning loadView rather than redirecting
+	// TODO: Should be returning the NEAREST error page to this path, including layouts
+	let params = new URLSearchParams();
+	params.append("status", $page.status.toString());
+	let message = await response.text();
+	if (response.headers.get("Content-Type")?.includes("application/json")) {
+		const data = JSON.parse(message);
+		message = data.message ?? message;
+	}
+	if (message) {
+		$page.error.message = message;
+		params.append("message", message);
+	}
+	return seeOther(`/_error?${params.toString()}`);
+}
+
 export async function load(ev: ServerEvent, template: string): Promise<Response> {
 	//const url = new URL(`http://${process.env.HOST ?? "localhost"}${ev.request.url}`);
 	const url = new URL(ev.request.url);
@@ -39,12 +67,17 @@ export async function load(ev: ServerEvent, template: string): Promise<Response>
 
 	const route = router.match(path, query);
 	if (!route) {
-		return notFound();
+		return handleResponse(notFound());
 	}
 
 	// Update $page before building the components
-	// TODO: Find somewhere better to put this
 	$page.url = url;
+	if (path.endsWith("/_error")) {
+		$page.status = parseInt(query.get("status") ?? "404");
+		$page.error.message = query.get("message") ?? "";
+	} else {
+		$page.status = 200;
+	}
 
 	const handler = route.handler;
 	const params = route.params || {};
@@ -57,9 +90,9 @@ export async function load(ev: ServerEvent, template: string): Promise<Response>
 		case LAYOUT_ROUTE: {
 			// It's a /+page.ts or /_layout.ts endpoint
 			if (ev.request.method === "GET") {
-				return await loadView(ev, url, handler, params, template);
+				return handleResponse(await loadView(ev, url, handler, params, template));
 			} else if (ev.request.method === "POST") {
-				return await runAction(ev, url, handler, params, query);
+				return handleResponse(await runAction(ev, url, handler, params, query));
 			}
 			break;
 		}
@@ -80,6 +113,9 @@ export async function load(ev: ServerEvent, template: string): Promise<Response>
 		case HOOK_SERVER_ROUTE: {
 			break;
 		}
+		case ERROR_ROUTE: {
+			return await loadView(ev, url, handler, params, template);
+		}
 	}
 
 	return notFound();
@@ -141,14 +177,15 @@ async function loadView(
 
 	// Pass the data into $props
 	// TODO: Promise.all
-	// NOTE: We're loading data from top to bottom, overriding as we go, and I'm not sure if this is the best way to go
+	// NOTE: We're loading data from top to bottom, overriding as we go, and I'm
+	// not sure if this is the best way to go
 	let data = {};
 	if (handler.layouts) {
 		for (let layout of handler.layouts) {
 			const layoutEndPoint: PageEndPoint | undefined = (await layout.endPoint())?.default;
 			const layoutServerEndPoint: PageServerEndPoint | undefined =
 				layout.serverEndPoint && (await layout.serverEndPoint())?.default;
-			const layoutData = await loadClientAndServerData(
+			const layoutResponse = await loadClientAndServerData(
 				url,
 				params,
 				serverParams,
@@ -156,10 +193,12 @@ async function loadView(
 				layoutEndPoint,
 				layoutServerEndPoint,
 			);
-			Object.assign(data, layoutData);
+			if (layoutResponse?.ok === false) {
+				return layoutResponse;
+			}
 		}
 	}
-	let endPointData = await loadClientAndServerData(
+	let endPointResponse = await loadClientAndServerData(
 		url,
 		params,
 		serverParams,
@@ -167,7 +206,9 @@ async function loadView(
 		clientEndPoint,
 		serverEndPoint,
 	);
-	Object.assign(data, endPointData);
+	if (endPointResponse?.ok === false) {
+		return endPointResponse;
+	}
 	let $props: Record<string, any> = { data };
 
 	// If there are layouts, work our way upwards, pushing each component into
@@ -258,21 +299,31 @@ async function loadClientAndServerData(
 	clientEndPoint?: PageEndPoint,
 	serverEndPoint?: PageServerEndPoint,
 ) {
-	let newData = {};
 	if (clientEndPoint?.load) {
 		const clientParams = buildClientParams(url, data, params);
-		const clientData = await clientEndPoint.load(clientParams);
-		if (clientData) {
-			Object.assign(newData, clientData);
+		const clientResponse = await clientEndPoint.load(clientParams);
+		if (clientResponse) {
+			if (clientResponse.ok) {
+				if (clientResponse.headers.get("Content-Type")?.includes("application/json")) {
+					Object.assign(data, await clientResponse.json());
+				}
+			} else {
+				return clientResponse;
+			}
 		}
 	}
 	if (serverEndPoint?.load) {
-		const serverData = await serverEndPoint.load(serverParams);
-		if (serverData?.ok) {
-			Object.assign(newData, await serverData.json());
+		const serverResponse = await serverEndPoint.load(serverParams);
+		if (serverResponse) {
+			if (serverResponse.ok) {
+				if (serverResponse.headers.get("Content-Type")?.includes("application/json")) {
+					Object.assign(data, await serverResponse.json());
+				}
+			} else {
+				return serverResponse;
+			}
 		}
 	}
-	return newData;
 }
 
 function buildClientParams(url: URL, params: Record<string, string>, data: Record<string, any>) {

package/src/state/$page.ts

@@ -1,14 +1,13 @@
 import { $watch } from "@torpor/view";
-
-type Page = {
-	status: number;
-	url: URL;
-};
+import Page from "./Page";
 
 const $page: Page = $watch(
 	{
 		status: 404,
 		url: new URL("http://localhost"),
+		error: {
+			message: "",
+		},
 	},
 	{ shallow: true },
 );

package/src/state/Page.ts

@@ -0,0 +1,8 @@
+type Page = {
+	status: number;
+	url: URL;
+	error: {
+		message: string;
+	};
+};
+export default Page;

package/src/test/runTest.ts

@@ -175,7 +175,7 @@ async function loadView(
 			const layoutEndPoint: PageEndPoint | undefined = (await layout.endPoint())?.default;
 			const layoutServerEndPoint: PageServerEndPoint | undefined =
 				layout.serverEndPoint && (await layout.serverEndPoint())?.default;
-			const layoutData = await loadClientAndServerData(
+			const layoutResponse = await loadClientAndServerData(
 				url,
 				params,
 				serverParams,
@@ -183,10 +183,12 @@ async function loadView(
 				layoutEndPoint,
 				layoutServerEndPoint,
 			);
-			Object.assign(data, layoutData);
+			if (layoutResponse?.ok === false) {
+				return layoutResponse;
+			}
 		}
 	}
-	let endPointData = await loadClientAndServerData(
+	let endPointResponse = await loadClientAndServerData(
 		url,
 		params,
 		serverParams,
@@ -194,7 +196,9 @@ async function loadView(
 		clientEndPoint,
 		serverEndPoint,
 	);
-	Object.assign(data, endPointData);
+	if (endPointResponse?.ok === false) {
+		return endPointResponse;
+	}
 	let $props: Record<string, any> = { data };
 
 	// If there are layouts, work our way upwards, pushing each component into
@@ -285,21 +289,31 @@ async function loadClientAndServerData(
 	clientEndPoint?: PageEndPoint,
 	serverEndPoint?: PageServerEndPoint,
 ) {
-	let newData = {};
 	if (clientEndPoint?.load) {
 		const clientParams = buildClientParams(url, data, params);
-		const clientData = await clientEndPoint.load(clientParams);
-		if (clientData) {
-			Object.assign(newData, clientData);
+		const clientResponse = await clientEndPoint.load(clientParams);
+		if (clientResponse) {
+			if (clientResponse.ok) {
+				if (clientResponse.headers.get("Content-Type")?.includes("application/json")) {
+					Object.assign(data, await clientResponse.json());
+				}
+			} else {
+				return clientResponse;
+			}
 		}
 	}
 	if (serverEndPoint?.load) {
-		const serverData = await serverEndPoint.load(serverParams);
-		if (serverData?.ok) {
-			Object.assign(newData, await serverData.json());
+		const serverResponse = await serverEndPoint.load(serverParams);
+		if (serverResponse) {
+			if (serverResponse.ok) {
+				if (serverResponse.headers.get("Content-Type")?.includes("application/json")) {
+					Object.assign(data, await serverResponse.json());
+				}
+			} else {
+				return serverResponse;
+			}
 		}
 	}
-	return newData;
 }
 
 function buildClientParams(url: URL, params: Record<string, string>, data: Record<string, any>) {

package/src/types/RouteType.ts

@@ -5,3 +5,4 @@ export const LAYOUT_ROUTE = 4;
 export const LAYOUT_SERVER_ROUTE = 5;
 export const HOOK_ROUTE = 6;
 export const HOOK_SERVER_ROUTE = 7;
+export const ERROR_ROUTE = 8;

package/dist/chunk-D6LHMH2C.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/response/badRequest.ts","../src/response/created.ts","../src/response/forbidden.ts","../src/response/methodNotAllowed.ts","../src/response/moved.ts","../src/response/notModified.ts","../src/response/redirect.ts","../src/response/serverError.ts","../src/response/unauthorized.ts","../src/response/unprocessable.ts"],"sourcesContent":["import response from \"./response\";\n\n/**\n * 400 Bad Request\n *\n * The server cannot or will not process the request due to something that is\n * perceived to be a client error (e.g., malformed request syntax, invalid\n * request message framing, or deceptive request routing).\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/400\n */\nexport default function badRequest(body?: object | string): Response {\n\treturn response(400, body);\n}\n","import response from \"./response\";\n\n/**\n * 201 Created\n *\n * The request succeeded, and a new resource was created as a result. This is\n * typically the response sent after POST requests, or some PUT requests.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/201\n */\nexport default function created(body?: object | string): Response {\n\treturn response(201, body);\n}\n","import response from \"./response\";\n\n/**\n * 403 Forbidden\n *\n * The client does not have access rights to the content; that is, it is\n * unauthorized, so the server is refusing to give the requested resource.\n * Unlike 401 Unauthorized, the client's identity is known to the server.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/403\n */\nexport default function forbidden(body?: object | string): Response {\n\treturn response(403, body);\n}\n","import response from \"./response\";\n\n/**\n * 405 Method Not Allowed\n *\n * The request method is known by the server but is not supported by the target\n * resource. For example, an API may not allow calling DELETE to remove a\n * resource.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/405\n */\nexport default function methodNotAllowed(body?: object | string): Response {\n\treturn response(405, body);\n}\n","import transfer from \"./transfer\";\n\n/**\n * 308 Permanent Redirect\n *\n * This means that the resource is now permanently located at another URI,\n * specified by the Location: HTTP Response header. This has the same semantics\n * as the 301 Moved Permanently HTTP response code, with the exception that the\n * user agent must not change the HTTP method used: if a POST was used in the\n * first request, a POST must be used in the second request.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/308\n */\nexport default function moved(location: string): Response {\n\treturn transfer(308, location);\n}\n","import transfer from \"./transfer\";\n\n/**\n * 304 Not Modified\n *\n * This is used for caching purposes. It tells the client that the response has\n * not been modified, so the client can continue to use the same cached version\n * of the response.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/304\n */\nexport default function notModified(location: string): Response {\n\treturn transfer(304, location);\n}\n","import transfer from \"./transfer\";\n\n/**\n * 307 Temporary Redirect\n *\n * The server sends this response to direct the client to get the requested\n * resource at another URI with the same method that was used in the prior\n * request. This has the same semantics as the 302 Found HTTP response code,\n * with the exception that the user agent must not change the HTTP method used:\n * if a POST was used in the first request, a POST must be used in the second\n * request.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/307\n */\nexport default function redirect(location: string): Response {\n\treturn transfer(307, location);\n}\n","import response from \"./response\";\n\n/**\n * 500 Server Error\n *\n * The server has encountered a situation it does not know how to handle.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/500\n */\nexport default function serverError(body?: object | string): Response {\n\treturn response(500, body);\n}\n","import response from \"./response\";\n\n/**\n * 401 Unauthorized\n *\n * Although the HTTP standard specifies \"unauthorized\", semantically this\n * response means \"unauthenticated\". That is, the client must authenticate\n * itself to get the requested response.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401\n */\nexport default function unauthorized(body?: object | string): Response {\n\treturn response(401, body);\n}\n","import response from \"./response\";\n\n/**\n * 422 Unprocessable Content\n *\n * The request was well-formed but was unable to be followed due to semantic errors.\n *\n * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422\n */\nexport default function unprocessable(body?: object | string): Response {\n\treturn response(422, body);\n}\n"],"mappings":";;;;;;AAWe,SAAR,WAA4B,MAAkC;AACpE,SAAO,SAAS,KAAK,IAAI;AAC1B;;;ACHe,SAAR,QAAyB,MAAkC;AACjE,SAAO,SAAS,KAAK,IAAI;AAC1B;;;ACDe,SAAR,UAA2B,MAAkC;AACnE,SAAO,SAAS,KAAK,IAAI;AAC1B;;;ACFe,SAAR,iBAAkC,MAAkC;AAC1E,SAAO,SAAS,KAAK,IAAI;AAC1B;;;ACAe,SAAR,MAAuB,UAA4B;AACzD,SAAO,SAAS,KAAK,QAAQ;AAC9B;;;ACJe,SAAR,YAA6B,UAA4B;AAC/D,SAAO,SAAS,KAAK,QAAQ;AAC9B;;;ACCe,SAAR,SAA0B,UAA4B;AAC5D,SAAO,SAAS,KAAK,QAAQ;AAC9B;;;ACPe,SAAR,YAA6B,MAAkC;AACrE,SAAO,SAAS,KAAK,IAAI;AAC1B;;;ACAe,SAAR,aAA8B,MAAkC;AACtE,SAAO,SAAS,KAAK,IAAI;AAC1B;;;ACJe,SAAR,cAA+B,MAAkC;AACvE,SAAO,SAAS,KAAK,IAAI;AAC1B;","names":[]}

package/dist/chunk-WMHM5RGZ.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/state/$page.ts"],"sourcesContent":["import { $watch } from \"@torpor/view\";\n\ntype Page = {\n\tstatus: number;\n\turl: URL;\n};\n\nconst $page: Page = $watch(\n\t{\n\t\tstatus: 404,\n\t\turl: new URL(\"http://localhost\"),\n\t},\n\t{ shallow: true },\n);\n\nexport default $page;\n"],"mappings":";AAAA,SAAS,cAAc;AAOvB,IAAM,QAAc;AAAA,EACnB;AAAA,IACC,QAAQ;AAAA,IACR,KAAK,IAAI,IAAI,kBAAkB;AAAA,EAChC;AAAA,EACA,EAAE,SAAS,KAAK;AACjB;AAEA,IAAO,eAAQ;","names":[]}