void 1.4.0 → 1.6.0

package/dist/{project-cmd-DBYqAIbe.mjs → project-cmd-B_bUyZ3J.mjs}

@@ -1,9 +1,9 @@
-import { n as readDeploymentPlatform } from "./project-rqDnVsJN.mjs";
-import { c as getToken, s as getSiteDomain } from "./auth-B6iOCjKI.mjs";
-import { H as outro, L as log } from "./dist-Cor9XGoz.mjs";
-import { r as PlatformClient } from "./client-B3LnB_bE.mjs";
-import { _ as tablePrefix, f as import_picocolors, i as dim, l as formatUrl, o as formatCount } from "./output-BpgYODYx.mjs";
-//#region src/cli/projects.ts
+import { n as readDeploymentPlatform } from "./project-CLwxcEdq.mjs";
+import { c as getToken, s as getSiteDomain } from "./auth-Dy8svcqQ.mjs";
+import { H as outro, L as log } from "./dist-D23AAMxT.mjs";
+import { r as PlatformClient } from "./client-CoxPEhJq.mjs";
+import { _ as tablePrefix, f as import_picocolors, i as dim, l as formatUrl, o as formatCount } from "./output-BCdLioKP.mjs";
+// src/cli/projects.ts
 async function runProjectsCommand(root) {
 	console.log();
 	const token = getToken(root);
@@ -33,84 +33,82 @@ async function runProjectsCommand(root) {
 	for (const line of lines) console.log(line);
 	outro(formatCount(projects.length, "project"));
 }
-//#endregion
-//#region src/cli/project-cmd.ts
+// src/cli/project-cmd.ts
 async function runProjectCommand(root, args) {
 	const cloudflare = readDeploymentPlatform(root) === "cloudflare";
 	if (args.subcommand === "status") {
-		const { runListCommand } = await import("./list-BYRP6am0.mjs");
+		const { runListCommand } = await import("./list-BYSOo9fm.mjs");
 		return runListCommand(root, args.name || void 0);
 	}
 	if (args.subcommand === "link") {
 		if (cloudflare) throw new Error("project: Direct Cloudflare apps are identified by cloudflare.name in void.config.ts and do not need linking.");
-		const { runLink } = await import("./link-Dllip08S.mjs");
+		const { runLink } = await import("./link-DAXOT-G_.mjs");
 		return runLink(root, args.name || void 0);
 	}
 	if (args.subcommand === "list") {
 		if (cloudflare) {
-			const { runListCommand } = await import("./list-BYRP6am0.mjs");
+			const { runListCommand } = await import("./list-BYSOo9fm.mjs");
 			return runListCommand(root);
 		}
 		return runProjectsCommand(root);
 	}
 	if (args.subcommand === "token") {
 		if (cloudflare) throw new Error("project: CI deploy credentials are available only for Void platform projects.");
-		const { runProjectTokenCommand } = await import("./project-token-BB6PwaA9.mjs");
+		const { runProjectTokenCommand } = await import("./project-token-BKHGwY3k.mjs");
 		return runProjectTokenCommand(root, args);
 	}
 	if (args.subcommand === "team") {
 		if (args.action === "") {
-			const { printHelpPage } = await import("./help-qOZr3wng.mjs");
+			const { printHelpPage } = await import("./help-Ba8Dq5-r.mjs");
 			printHelpPage(["project", "team"]);
 			return;
 		}
 		const accountInvitationAction = args.action === "pending" || args.action === "accept" || args.action === "decline";
 		if (cloudflare && !accountInvitationAction) throw new Error("project: Teams are available only for projects hosted on a Void platform, not direct Cloudflare deployments.");
-		const { runProjectTeamCommand } = await import("./project-team-BjCLgTRC.mjs");
+		const { runProjectTeamCommand } = await import("./project-team-MjT5K4rQ.mjs");
 		return runProjectTeamCommand(root, args);
 	}
 	if (args.subcommand === "zero-trust") {
 		if (cloudflare) throw new Error("project: Zero Trust overrides are available only for projects hosted on a Void platform.");
 		if (args.action === "") {
-			const { printHelpPage } = await import("./help-qOZr3wng.mjs");
+			const { printHelpPage } = await import("./help-Ba8Dq5-r.mjs");
 			printHelpPage(["project", "zero-trust"]);
 			return;
 		}
 		const action = args.action;
-		const { runProjectZeroTrustCommand } = await import("./project-zero-trust-CWDh1P_t.mjs");
+		const { runProjectZeroTrustCommand } = await import("./project-zero-trust-Bzdd05-h.mjs");
 		return runProjectZeroTrustCommand(root, {
 			...args,
 			action
 		});
 	}
 	if (args.subcommand === "logs") {
-		const { runLogsCommand } = await import("./logs-DmJTBhed.mjs");
+		const { runLogsCommand } = await import("./logs-DE0weBsR.mjs");
 		return runLogsCommand(root, args.filter, args.range, args.deployment || void 0, args.level || void 0);
 	}
 	if (args.subcommand === "requests") {
 		if (cloudflare) throw new Error("project: Historical request analytics require the Void platform. Use `void project logs` for a live Cloudflare tail.");
-		const { runRequestsCommand } = await import("./requests-D_pbzDyz.mjs");
+		const { runRequestsCommand } = await import("./requests-daJmVpjk.mjs");
 		return runRequestsCommand(root, args.range, args.status || void 0);
 	}
 	if (args.subcommand === "rollback") {
-		const { runRollbackCommand } = await import("./rollback-CjfIYsJx.mjs");
+		const { runRollbackCommand } = await import("./rollback-BgL0wY1J.mjs");
 		return runRollbackCommand(root, args.deployId || void 0, args.platform);
 	}
 	if (args.subcommand === "cancel") {
 		if (cloudflare) throw new Error("project: Direct Cloudflare deploys activate only after readiness succeeds, so there is no remote build to cancel.");
-		const { runCancelDeployCommand } = await import("./cancel-deploy-Dw0UmWKO.mjs");
+		const { runCancelDeployCommand } = await import("./cancel-deploy-_itbbvY3.mjs");
 		return runCancelDeployCommand(root, args.deployId || void 0);
 	}
 	if (args.subcommand === "delete") {
 		if (cloudflare) throw new Error("project: Refusing to delete Cloudflare resources through this command. Direct deployments are additive and existing resources may be shared.");
-		const { runDeleteCommand } = await import("./delete-lETE6Tpt.mjs");
+		const { runDeleteCommand } = await import("./delete-CY4L8fi2.mjs");
 		return runDeleteCommand(root, args.name || void 0, { force: args.force });
 	}
 	if (args.subcommand === "purge-cache") {
 		if (cloudflare) throw new Error("project: `void project purge-cache` is available only for projects hosted on a Void platform. For a direct Cloudflare deploy, redeploy or purge the configured ISR KV namespace.");
-		const { runPurgeCacheCommand } = await import("./cache-jvwLNb0h.mjs");
+		const { runPurgeCacheCommand } = await import("./cache-2khBO1MR.mjs");
 		return runPurgeCacheCommand(root, args.projectSlug || void 0);
 	}
 }
-//#endregion
 export { runProjectCommand };

package/dist/{project-paths-DGu_QZ_Q.mjs → project-paths-CdGv9Tmi.mjs}

@@ -1,8 +1,8 @@
-import { a as join, i as isAbsolute, o as normalize } from "./dist-ipQi0Q8y.mjs";
+import { a as join, i as isAbsolute, o as normalize } from "./dist-DMYe8CZJ.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { createJiti } from "jiti";
-//#region src/config-loader.ts
+// src/config-loader.ts
 const LEGACY_CONFIG_FILE = "void.json";
 const TYPED_CONFIG_FILE = "void.config.ts";
 /** Evaluate a TypeScript config without requiring Void to be installed in the target project. */
@@ -43,8 +43,7 @@ function loadVoidConfig(root) {
 		throw new Error(`config: Invalid JSON in ${LEGACY_CONFIG_FILE}.`, { cause: error });
 	}
 }
-//#endregion
-//#region src/project-paths.ts
+// src/project-paths.ts
 const SOURCE_CONVENTION_DIRECTORIES = [
 	"routes",
 	"pages",
@@ -126,5 +125,4 @@ function assertNoRootSourceConventionConflicts(paths) {
 	if (conflicts.length === 0) return;
 	throw new Error(`sourceDir: void.json sets "sourceDir": "${paths.sourceDir}", but convention path(s) also exist at the project root: ${conflicts.join(", ")}. Move them under "${paths.sourceDir}" or remove the root copy.`);
 }
-//#endregion
 export { validateSourceDir as a, loadVoidConfig as c, resolveProjectPaths as i, readProjectPaths as n, TYPED_CONFIG_FILE as o, resolvePagesDir as r, loadTypedVoidConfigFile as s, assertNoRootSourceConventionConflicts as t };

package/dist/project-slug-BUy0lmyR.mjs

@@ -0,0 +1 @@
+export { t as validateProjectSlug } from "./project-slug-CO6ci9XG.mjs";

package/dist/{project-slug-23TpquG4.mjs → project-slug-CO6ci9XG.mjs}

@@ -4,5 +4,4 @@ function validateProjectSlug(value) {
 	if (!(slug.length === 1 ? /^[a-z0-9]$/.test(slug) : /^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(slug))) return "Slug must be lowercase alphanumeric with dashes.";
 	if (slug.length > 56) return `Slug must be at most 56 characters (it forms the email sender <slug>+noreply@).`;
 }
-//#endregion
 export { validateProjectSlug as t };

package/dist/{project-team-BjCLgTRC.mjs → project-team-MjT5K4rQ.mjs}

@@ -1,10 +1,10 @@
-import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
-import { c as getToken, i as getAccountCredential } from "./auth-B6iOCjKI.mjs";
-import { H as outro, L as log } from "./dist-Cor9XGoz.mjs";
-import { c as platformErrorMessage, n as PlatformApiError, r as PlatformClient, s as parsePlatformErrorBody } from "./client-B3LnB_bE.mjs";
-import { h as sanitizeTerminalText, l as formatUrl, m as printSuccess, o as formatCount, p as note } from "./output-BpgYODYx.mjs";
-import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-Xoi6eTWY.mjs";
-//#region src/cli/project-team.ts
+import { r as readProjectConfig } from "./project-CLwxcEdq.mjs";
+import { c as getToken, i as getAccountCredential } from "./auth-Dy8svcqQ.mjs";
+import { H as outro, L as log } from "./dist-D23AAMxT.mjs";
+import { c as platformErrorMessage, n as PlatformApiError, r as PlatformClient, s as parsePlatformErrorBody } from "./client-CoxPEhJq.mjs";
+import { h as sanitizeTerminalText, l as formatUrl, m as printSuccess, o as formatCount, p as note } from "./output-BCdLioKP.mjs";
+import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-D0YNnJfm.mjs";
+// src/cli/project-team.ts
 function clean(value) {
 	return (value ?? "—").replace(/[\u0000-\u001f\u007f]/g, " ");
 }
@@ -126,5 +126,4 @@ async function runProjectTeamCommand(root, args) {
 	await client.leaveProject(projectId);
 	printSuccess("Left the project.");
 }
-//#endregion
 export { runProjectTeamCommand };

package/dist/{project-token-BB6PwaA9.mjs → project-token-BKHGwY3k.mjs}

@@ -1,10 +1,10 @@
-import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
-import { c as getToken } from "./auth-B6iOCjKI.mjs";
-import { H as outro, L as log } from "./dist-Cor9XGoz.mjs";
-import { r as PlatformClient } from "./client-B3LnB_bE.mjs";
-import { _ as tablePrefix, i as dim, m as printSuccess } from "./output-BpgYODYx.mjs";
-import { r as requireProjectBySlug } from "./resolve-project-Xoi6eTWY.mjs";
-//#region src/cli/project-token.ts
+import { r as readProjectConfig } from "./project-CLwxcEdq.mjs";
+import { c as getToken } from "./auth-Dy8svcqQ.mjs";
+import { H as outro, L as log } from "./dist-D23AAMxT.mjs";
+import { r as PlatformClient } from "./client-CoxPEhJq.mjs";
+import { _ as tablePrefix, i as dim, m as printSuccess } from "./output-BCdLioKP.mjs";
+import { r as requireProjectBySlug } from "./resolve-project-D0YNnJfm.mjs";
+// src/cli/project-token.ts
 async function resolveTarget(root, args) {
 	const humanToken = getToken(root);
 	if (!humanToken) throw new Error("project: Sign in with a human account before managing CI credentials.");
@@ -67,5 +67,4 @@ async function runProjectTokenCommand(root, args) {
 	}
 	if (!args.json) outro(`${slug} — project-scoped deploy access only`);
 }
-//#endregion
 export { runProjectTokenCommand };

package/dist/{project-tsconfig-CVvk6Z_e.mjs → project-tsconfig-Cf2NFjlM.mjs}

@@ -1,7 +1,7 @@
-import { a as join, n as dirname, s as relative } from "./dist-ipQi0Q8y.mjs";
-import { n as readProjectPaths } from "./project-paths-DGu_QZ_Q.mjs";
+import { a as join, n as dirname, s as relative } from "./dist-DMYe8CZJ.mjs";
+import { n as readProjectPaths } from "./project-paths-CdGv9Tmi.mjs";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-//#region src/codegen/write-if-changed.ts
+// src/codegen/write-if-changed.ts
 function writeFileIfChanged(path, content) {
 	let existing = null;
 	try {
@@ -14,8 +14,7 @@ function writeFileIfChanged(path, content) {
 	writeFileSync(path, content);
 	return true;
 }
-//#endregion
-//#region src/codegen/project-tsconfig.ts
+// src/codegen/project-tsconfig.ts
 /**
 * Build the generated .void/tsconfig.json contents. Lists the generated
 * declaration files so TypeScript discovers them via the `files` field
@@ -99,5 +98,4 @@ function syncAuthTypesInProjectTsconfig(root) {
 	tsconfig.files = existsSync(join(outDir, "auth.d.ts")) ? [...others, "auth.d.ts"] : others;
 	return writeFileIfChanged(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
 }
-//#endregion
 export { writeFileIfChanged as i, ensureProjectTsconfig as n, syncAuthTypesInProjectTsconfig as r, createProjectTsconfig as t };

package/dist/{project-zero-trust-CWDh1P_t.mjs → project-zero-trust-Bzdd05-h.mjs}

@@ -1,10 +1,10 @@
-import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
-import { c as getToken } from "./auth-B6iOCjKI.mjs";
-import { H as outro, L as log } from "./dist-Cor9XGoz.mjs";
-import { r as PlatformClient } from "./client-B3LnB_bE.mjs";
-import { h as sanitizeTerminalText, m as printSuccess, p as note } from "./output-BpgYODYx.mjs";
-import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-Xoi6eTWY.mjs";
-//#region src/cli/project-zero-trust.ts
+import { r as readProjectConfig } from "./project-CLwxcEdq.mjs";
+import { c as getToken } from "./auth-Dy8svcqQ.mjs";
+import { H as outro, L as log } from "./dist-D23AAMxT.mjs";
+import { r as PlatformClient } from "./client-CoxPEhJq.mjs";
+import { h as sanitizeTerminalText, m as printSuccess, p as note } from "./output-BCdLioKP.mjs";
+import { r as requireProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-D0YNnJfm.mjs";
+// src/cli/project-zero-trust.ts
 async function resolveTarget(root, args) {
 	const token = getToken(root);
 	if (!token) throw new Error("project: Not logged in. Run `void account login` first.");
@@ -61,5 +61,4 @@ async function runProjectZeroTrustCommand(root, args) {
 	}
 	printSuccess(args.action === "protect" ? `${slug} is protected by Zero Trust.` : args.action === "public" ? `${slug} is public.` : `${slug} Zero Trust reconciled (${result.project.state}).`);
 }
-//#endregion
 export { runProjectZeroTrustCommand };

package/dist/{protocol-DimNxVRr.mjs → protocol-COyySMki.mjs}

@@ -1,9 +1,9 @@
-import { n as isConvertedResponse } from "./response-Tn7rU0MV.mjs";
-import { i as searchWithoutActionKey, n as hasActionKey } from "./action-key-XZ9HkWAO.mjs";
-import { i as separateDeferred, n as DEFERRED, t as ValidationError } from "./validation-error-Dg9Recn1.mjs";
-import { i as resolveHead, n as renderHeadToString, r as renderHtmlAttrs, t as renderBodyAttrs } from "./head-D2VF4ApL.mjs";
-import { i as escapeScriptJson, r as serializePageData } from "./serialize-YHvlcG3Q.mjs";
-//#region src/pages/protocol.ts
+import { a as executeComposedHandler, i as separateDeferred, n as DEFERRED, o as getHandlerComposition, t as ValidationError } from "./validation-error-uAAjlsiW.mjs";
+import { n as isConvertedResponse } from "./response-HmNjB30w.mjs";
+import { i as searchWithoutActionKey, n as hasActionKey } from "./action-key-XtKKbbsi.mjs";
+import { i as resolveHead, n as renderHeadToString, r as renderHtmlAttrs, t as renderBodyAttrs } from "./head-5XPcnG-j.mjs";
+import { i as escapeScriptJson, r as serializePageData } from "./serialize-DUuYuaY3.mjs";
+// src/pages/protocol.ts
 const POWERED_BY = { "X-Powered-By": "Void" };
 const RENDER_ERROR_ASSET_TAGS_KEY = "__voidPageAssetTags";
 /** Escape characters that are unsafe inside inline <script> tags to prevent XSS. */
@@ -82,9 +82,9 @@ function attachRenderErrorAssetTags(error, assetTags) {
 	});
 	throw error;
 }
-async function renderWithAssetTags(renderFn, pageObj, assetTags) {
+async function renderWithAssetTags(renderFn, pageObj, assetTags, requestUrl) {
 	try {
-		return await renderFn(pageObj, assetTags);
+		return await renderFn(pageObj, assetTags, requestUrl);
 	} catch (error) {
 		attachRenderErrorAssetTags(error, assetTags);
 	}
@@ -107,7 +107,7 @@ function renderClientOnlyPage(pageObj, assetTags, renderFn) {
 async function renderPageHtml(c, pageObj, componentId, renderMode, renderFn, getAssetTags) {
 	const assetTags = prepareAssetTags(await getAssetTags(c.req.raw, c.env, componentId));
 	return {
-		html: renderMode === "client" ? renderClientOnlyPage(pageObj, assetTags, renderFn) : await renderWithAssetTags(renderFn, pageObj, assetTags),
+		html: renderMode === "client" ? renderClientOnlyPage(pageObj, assetTags, renderFn) : await renderWithAssetTags(renderFn, pageObj, assetTags, c.req.url),
 		assetTags
 	};
 }
@@ -133,8 +133,8 @@ async function extractProps(result) {
 	return result ?? {};
 }
 /**
-* Run a page loader. Responses from convertReturnValue (withValidator/middleware
-* paths) always flow through to extractProps — they wrap plain return values
+* Run a page loader and `render` its props. Responses from convertReturnValue
+* (withValidator) always flow through to extractProps — they wrap plain return values
 * (objects as 200 JSON, null/undefined as 204, strings as text/html) and must be
 * unwrapped as page props.
 *
@@ -142,13 +142,25 @@ async function extractProps(result) {
 * 200s (file downloads, streams). JSON 200s are still extracted as props for
 * backward compat with loaders using c.json().
 */
-async function runLoader(handler, c) {
-	const result = await handler(c);
-	if (result instanceof Response && !isConvertedResponse(result)) {
-		const contentType = result.headers.get("content-type") || "";
-		if (result.status >= 300 || !contentType.includes("application/json")) return result;
-	}
-	return extractProps(result);
+async function runLoader(handler, c, render) {
+	if (!handler) return render({});
+	return runPageHandler(handler, c, async (leaf) => {
+		const result = await leaf(c);
+		if (result instanceof Response && !isConvertedResponse(result)) {
+			const contentType = result.headers.get("content-type") || "";
+			if (result.status >= 300 || !contentType.includes("application/json")) return result;
+		}
+		return render(await extractProps(result));
+	});
+}
+/**
+* Per-route middleware from `defineHandler(middleware..., handler)` wraps the
+* response `endpoint` builds from the leaf handler, as it wraps a route's
+* response, so it sees and may edit the rendered page after `next()`.
+*/
+function runPageHandler(handler, c, endpoint) {
+	const composition = getHandlerComposition(handler);
+	return composition ? executeComposedHandler(c, composition.middlewares, () => endpoint(composition.leaf)) : endpoint(handler);
 }
 /** Flatten withValidator's { issues: [{ slot, issues: [{ message, path }] }] } into { field: message } */
 function flattenValidationErrors(body) {
@@ -215,79 +227,75 @@ function streamDeferredResponse(initialChunk, deferredMap, c, contentType, dev,
 /** Handle GET page request — run handler, return page object or SSR HTML */
 async function handlePageGet(handler, headFn, c, componentId, renderFn, getAssetTags, configHead, options) {
 	const renderMode = options?.renderMode ?? "server";
-	const shared = c.get("shared") ?? {};
-	let props = {};
-	if (handler) {
-		const loaded = await runLoader(handler, c);
-		if (loaded instanceof Response) return loaded;
-		props = loaded;
-	}
-	const pageHead = headFn ? headFn(c, props) : void 0;
-	const middlewareHead = c.get("headDefaults");
-	const head = resolveHead(configHead, middlewareHead, pageHead);
-	const { immediateProps, deferredMap } = separateDeferred(props);
-	const hasDeferred = Object.keys(deferredMap).length > 0;
-	const deferredKeys = {};
-	for (const [group, { keys }] of Object.entries(deferredMap)) for (const key of keys) deferredKeys[key] = group;
-	const pageObj = {
-		component: componentId,
-		props: immediateProps,
-		params: requestParams(c),
-		shared,
-		url: requestPathWithSearch(c),
-		errors: null,
-		...head && { head },
-		...hasDeferred && {
-			deferred: Object.keys(deferredMap),
-			deferredKeys
-		}
-	};
-	if (renderMode !== "island" && isPagesRequest(c)) {
-		if (c.req.header("purpose") === "prefetch" && hasDeferred) {
-			const resolvedProps = { ...immediateProps };
-			let deferredErrors;
-			await Promise.all(Object.entries(deferredMap).map(async ([group, { resolver, keys }]) => {
-				try {
-					const data = await resolver(c);
-					if (keys.length === 1) resolvedProps[keys[0]] = data ?? null;
-					else {
-						const obj = typeof data === "object" && data !== null ? data : {};
-						for (const key of keys) resolvedProps[key] = obj[key];
+	return runLoader(handler, c, async (props) => {
+		const shared = c.get("shared") ?? {};
+		const pageHead = headFn ? headFn(c, props) : void 0;
+		const middlewareHead = c.get("headDefaults");
+		const head = resolveHead(configHead, middlewareHead, pageHead);
+		const { immediateProps, deferredMap } = separateDeferred(props);
+		const hasDeferred = Object.keys(deferredMap).length > 0;
+		const deferredKeys = {};
+		for (const [group, { keys }] of Object.entries(deferredMap)) for (const key of keys) deferredKeys[key] = group;
+		const pageObj = {
+			component: componentId,
+			props: immediateProps,
+			params: requestParams(c),
+			shared,
+			url: requestPathWithSearch(c),
+			errors: null,
+			...head && { head },
+			...hasDeferred && {
+				deferred: Object.keys(deferredMap),
+				deferredKeys
+			}
+		};
+		if (renderMode !== "island" && isPagesRequest(c)) {
+			if (c.req.header("purpose") === "prefetch" && hasDeferred) {
+				const resolvedProps = { ...immediateProps };
+				let deferredErrors;
+				await Promise.all(Object.entries(deferredMap).map(async ([group, { resolver, keys }]) => {
+					try {
+						const data = await resolver(c);
+						if (keys.length === 1) resolvedProps[keys[0]] = data ?? null;
+						else {
+							const obj = typeof data === "object" && data !== null ? data : {};
+							for (const key of keys) resolvedProps[key] = obj[key];
+						}
+					} catch (err) {
+						(deferredErrors ??= {})[group] = deferredErrorMessage(err, options?.dev === true);
+						for (const key of keys) delete resolvedProps[key];
 					}
-				} catch (err) {
-					(deferredErrors ??= {})[group] = deferredErrorMessage(err, options?.dev === true);
-					for (const key of keys) delete resolvedProps[key];
-				}
-			}));
-			return pageJsonResponse(c, {
-				...pageObj,
-				props: resolvedProps,
-				deferred: void 0,
-				...deferredErrors && { deferredErrors }
-			});
+				}));
+				return pageJsonResponse(c, {
+					...pageObj,
+					props: resolvedProps,
+					deferred: void 0,
+					...deferredErrors && { deferredErrors }
+				});
+			}
+			if (!hasDeferred) return pageJsonResponse(c, pageObj);
+			c.header("X-VoidPages", "true");
+			const headers = new Headers(c.res.headers);
+			appendVary(headers, "X-VoidPages");
+			c.header("Vary", headers.get("Vary"));
+			return streamDeferredResponse(JSON.stringify(pageObj) + "\n", deferredMap, c, "application/x-ndjson", options?.dev === true, (group, data) => JSON.stringify({
+				__deferred: group,
+				data: data ?? null
+			}) + "\n", (group, error) => JSON.stringify({
+				__deferred: group,
+				error
+			}) + "\n");
 		}
-		if (!hasDeferred) return pageJsonResponse(c, pageObj);
-		c.header("X-VoidPages", "true");
-		const headers = new Headers(c.res.headers);
-		appendVary(headers, "X-VoidPages");
-		c.header("Vary", headers.get("Vary"));
-		return streamDeferredResponse(JSON.stringify(pageObj) + "\n", deferredMap, c, "application/x-ndjson", options?.dev === true, (group, data) => JSON.stringify({
-			__deferred: group,
-			data: data ?? null
-		}) + "\n", (group, error) => JSON.stringify({
-			__deferred: group,
-			error
-		}) + "\n");
-	}
-	const { html, assetTags } = await renderPageHtml(c, pageObj, componentId, renderMode, renderFn, getAssetTags);
-	if (!hasDeferred) return renderedResponse(c, html, "text/html; charset=utf-8", assetTags);
-	return streamDeferredResponse(html, deferredMap, c, "text/html; charset=utf-8", options?.dev === true, (group, data) => {
-		const g = safeJsonStringify(group);
-		return `\n<script>(function(d){window.__resolveDeferred?window.__resolveDeferred(${g},d):(window.__deferredQueue??=[]).push([${g},d])})(${safeJsonStringify(data)})<\/script>`;
-	}, (group, error) => {
-		const g = safeJsonStringify(group);
-		return `\n<script>(function(e){window.__rejectDeferred?window.__rejectDeferred(${g},e):(window.__deferredQueue??=[]).push([${g},0,e])})(${safeJsonStringify(error)})<\/script>`;
-	}, assetTags);
+		const { html, assetTags } = await renderPageHtml(c, pageObj, componentId, renderMode, renderFn, getAssetTags);
+		if (!hasDeferred) return renderedResponse(c, html, "text/html; charset=utf-8", assetTags);
+		return streamDeferredResponse(html, deferredMap, c, "text/html; charset=utf-8", options?.dev === true, (group, data) => {
+			const g = safeJsonStringify(group);
+			return `\n<script>(function(d){window.__resolveDeferred?window.__resolveDeferred(${g},d):(window.__deferredQueue??=[]).push([${g},d])})(${safeJsonStringify(data)})<\/script>`;
+		}, (group, error) => {
+			const g = safeJsonStringify(group);
+			return `\n<script>(function(e){window.__rejectDeferred?window.__rejectDeferred(${g},e):(window.__deferredQueue??=[]).push([${g},0,e])})(${safeJsonStringify(error)})<\/script>`;
+		}, assetTags);
+	});
 }
 function isSameOriginAction(request) {
 	const origin = new URL(request.url).origin;
@@ -307,9 +315,9 @@ function isSameOriginAction(request) {
 async function handlePageMutation(mutationHandler, getHandler, headFn, c, componentId, renderFn, getAssetTags, configHead, options) {
 	if (!isSameOriginAction(c.req.raw)) return new Response("Cross-origin page actions are not allowed.", { status: 403 });
 	const renderMode = options?.renderMode ?? "server";
-	const shared = c.get("shared") ?? {};
-	const middlewareHead = c.get("headDefaults");
 	function buildMutationPageObj(props, errors) {
+		const shared = c.get("shared") ?? {};
+		const middlewareHead = c.get("headDefaults");
 		const pageHead = headFn ? headFn(c, props) : void 0;
 		const head = resolveHead(configHead, middlewareHead, pageHead);
 		return {
@@ -322,38 +330,52 @@ async function handlePageMutation(mutationHandler, getHandler, headFn, c, compon
 			...head && { head }
 		};
 	}
+	const rerenderErrors = /* @__PURE__ */ new WeakSet();
 	/** Re-run the GET loader and respond with the page, optionally carrying validation errors. */
 	async function respondWithPage(errors) {
-		const loaded = getHandler ? await runLoader(getHandler, c) : {};
-		if (loaded instanceof Response) return loaded;
-		const pageObj = buildMutationPageObj(stripDeferred(loaded), errors);
-		if (isPagesRequest(c)) return pageJsonResponse(c, pageObj);
-		const { html, assetTags } = await renderPageHtml(c, pageObj, componentId, renderMode, renderFn, getAssetTags);
-		return renderedResponse(c, html, "text/html; charset=utf-8", assetTags);
+		try {
+			return await runLoader(getHandler, c, async (props) => {
+				const pageObj = buildMutationPageObj(stripDeferred(props), errors);
+				if (isPagesRequest(c)) return pageJsonResponse(c, pageObj);
+				const { html, assetTags } = await renderPageHtml(c, pageObj, componentId, renderMode, renderFn, getAssetTags);
+				return renderedResponse(c, html, "text/html; charset=utf-8", assetTags);
+			});
+		} catch (e) {
+			if (e instanceof Error) rerenderErrors.add(e);
+			throw e;
+		}
 	}
 	function respondWithErrors(errors) {
 		if (renderMode === "island") return Promise.resolve(Response.json({ errors }, { status: 422 }));
 		return respondWithPage(errors);
 	}
-	let result;
+	/** Respond to the action's result: a redirect, an error, or the re-rendered page. */
+	async function respondToAction(leaf) {
+		let result;
+		try {
+			result = await leaf(c);
+		} catch (e) {
+			if (e instanceof ValidationError) return respondWithErrors(e.errors);
+			throw e;
+		}
+		if (result instanceof Response) {
+			const status = result.status;
+			if (status >= 300 && status < 400) return result;
+			if (status === 400) {
+				const body = await result.clone().json().catch(() => null);
+				if (Array.isArray(body?.issues)) return respondWithErrors(flattenValidationErrors(body));
+				return result;
+			}
+			if (status !== 204) return result;
+		}
+		if (renderMode === "island") return Response.json({ success: true });
+		return respondWithPage(null);
+	}
 	try {
-		result = mutationHandler ? await mutationHandler(c) : void 0;
+		return await runPageHandler(mutationHandler ?? (() => void 0), c, respondToAction);
 	} catch (e) {
-		if (e instanceof ValidationError) return respondWithErrors(e.errors);
+		if (e instanceof ValidationError && !rerenderErrors.has(e) && !c.finalized) return respondWithErrors(e.errors);
 		throw e;
 	}
-	if (result instanceof Response) {
-		const status = result.status;
-		if (status >= 300 && status < 400) return result;
-		if (status === 400) {
-			const body = await result.clone().json().catch(() => null);
-			if (Array.isArray(body?.issues)) return respondWithErrors(flattenValidationErrors(body));
-			return result;
-		}
-		if (status !== 204) return result;
-	}
-	if (renderMode === "island") return Response.json({ success: true });
-	return respondWithPage(null);
 }
-//#endregion
 export { safeJsonStringify as i, handlePageGet as n, handlePageMutation as r, flattenValidationErrors as t };

package/dist/{protocol-D5XDySYu.d.mts → protocol-CkwjASep.d.mts}

@@ -1,7 +1,6 @@
-import { n as HeadDescriptor, t as HeadConfig } from "./head-C8K_iGe6.mjs";
-import { a as PageRenderMode, t as DevCssAsset } from "./types-w72dljaA.mjs";
-import { n as CloudBindings, r as CloudContext } from "./handler-BHktmuTL.mjs";
-//#region src/pages/protocol.d.ts
+import { n as HeadDescriptor, t as HeadConfig } from "./head-MeF_5M_3.mjs";
+import { a as PageRenderMode, t as DevCssAsset } from "./types-agfx0alu.mjs";
+import { n as CloudBindings, r as CloudContext } from "./handler-BR6Tvjkp.mjs";
 /** Escape characters that are unsafe inside inline <script> tags to prevent XSS. */
 declare function safeJsonStringify(value: unknown): string;
 type PageObject = {
@@ -32,7 +31,7 @@ type AssetTags = {
   devCss?: Array<DevCssAsset>;
   devCssNonce?: string;
 };
-type RenderPage = (pageObj: PageObject, assetTags: AssetTags) => Promise<PageRenderResult>;
+type RenderPage = (pageObj: PageObject, assetTags: AssetTags, requestUrl: string) => Promise<PageRenderResult>;
 type GetAssetTags = (req: Request, env: CloudBindings, componentId: string) => Promise<AssetTags>;
 /** Flatten withValidator's { issues: [{ slot, issues: [{ message, path }] }] } into { field: message } */
 declare function flattenValidationErrors(body: unknown): Record<string, string>;
@@ -40,5 +39,4 @@ declare function flattenValidationErrors(body: unknown): Record<string, string>;
 declare function handlePageGet(handler: PageHandler, headFn: PageHeadHandler, c: CloudContext, componentId: string, renderFn: RenderPage, getAssetTags: GetAssetTags, configHead?: HeadConfig, options?: PageRenderOptions): Promise<Response>;
 /** Handle POST/PUT/PATCH/DELETE page request — run mutation, then re-run GET or redirect */
 declare function handlePageMutation(mutationHandler: PageHandler, getHandler: PageHandler, headFn: PageHeadHandler, c: CloudContext, componentId: string, renderFn: RenderPage, getAssetTags: GetAssetTags, configHead?: HeadConfig, options?: PageRenderOptions): Promise<Response>;
-//#endregion
 export { handlePageMutation as a, handlePageGet as i, PageRenderResult as n, safeJsonStringify as o, flattenValidationErrors as r, PageObject as t };

package/dist/{providers-BNKRacMr.d.mts → providers-D5P8j_8D.d.mts}

@@ -1,7 +1,5 @@
-//#region src/auth/providers.d.ts
 declare const VOID_SOCIAL_AUTH_PROVIDERS: readonly ["apple", "atlassian", "cognito", "discord", "dropbox", "facebook", "figma", "github", "gitlab", "google", "huggingface", "kakao", "kick", "line", "linear", "linkedin", "microsoft", "naver", "notion", "paybin", "paypal", "polar", "railway", "reddit", "roblox", "salesforce", "slack", "spotify", "tiktok", "twitch", "twitter", "vercel", "vk", "zoom"];
 declare const VOID_EMAIL_AUTH_PROVIDER = "email";
 declare const VOID_AUTH_PROVIDERS: readonly [typeof VOID_EMAIL_AUTH_PROVIDER, ...typeof VOID_SOCIAL_AUTH_PROVIDERS];
 type VoidAuthProvider = (typeof VOID_AUTH_PROVIDERS)[number];
-//#endregion
 export { VoidAuthProvider as t };

package/dist/{providers-BUHwJlmM.mjs → providers-ZARwX2cL.mjs}

@@ -1,4 +1,4 @@
-//#region src/auth/providers.ts
+// src/auth/providers.ts
 const VOID_SOCIAL_AUTH_PROVIDERS = [
 	"apple",
 	"atlassian",
@@ -61,5 +61,4 @@ function getVoidAuthProviderEnvNames(provider) {
 		clientSecret: `AUTH_${normalized}_CLIENT_SECRET`
 	};
 }
-//#endregion
 export { isVoidAuthProvider as a, getVoidAuthProviderSettingEnvNames as i, VOID_EMAIL_AUTH_PROVIDER as n, isVoidSocialAuthProvider as o, getVoidAuthProviderEnvNames as r, VOID_AUTH_PROVIDERS as t };