@void/react 1.2.1 → 1.4.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { AnchorHTMLAttributes, ButtonHTMLAttributes, Context, FormHTMLAttributes, JSX, ReactElement, ReactNode } from "react";
-import { ActionClient, FormMethod, FormModel, NavigationState, VoidActionError, VoidRouter } from "void/pages-client";
+import { ActionClient, FormMethod, FormModel, FormResetOptions, NavigationState, VoidActionError, VoidRouter } from "void/pages-client";
 import { CloudContextVariables, InferProps } from "void";
 import { ActionFormOptions, ActionUrl, ResolveActionBody } from "void/routes";
 //#region src/runtime/form.d.ts
@@ -41,7 +41,13 @@ export declare function useParams<T extends Record<string, string> = Record<stri
 export declare function useShared<T = CloudContextVariables["shared"]>(): T;
 //#endregion
 //#region src/runtime/use-form.d.ts
-export declare function useForm<U extends ActionUrl & string>(url: U, defaults: ResolveActionBody<U>, options?: ActionFormOptions<U>): {
+type FormOptions = {
+  params?: Record<string, string>;
+  resetOnSuccess?: boolean;
+  onSuccess?: () => void | Promise<void>;
+  onError?: (error: Record<string, string> | VoidActionError) => void | Promise<void>;
+};
+export declare function useForm<U extends ActionUrl & string>(url: U, defaults: ResolveActionBody<U>, options?: ActionFormOptions<U> & Pick<FormOptions, "onSuccess" | "onError">): {
   data: ResolveActionBody<U>;
   setData: <K extends keyof ResolveActionBody<U> & string>(field: K, value: ResolveActionBody<U>[K]) => void;
   errors: Partial<Record<keyof ResolveActionBody<U> & string, string>>;
@@ -54,7 +60,9 @@ export declare function useForm<U extends ActionUrl & string>(url: U, defaults:
   put(formData: FormData): void;
   patch(formData: FormData): void;
   delete(formData: FormData): void;
+  reset(options: FormResetOptions, ...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
   reset(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
+  setError(field: keyof ResolveActionBody<U> & string, message: string): void;
   clearErrors(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
   clearError(): void;
 };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { a as RouterContext, i as ParamsContext, n as FrontmatterContext, o as SharedContext, r as NavigationContext, t as ErrorsContext } from "./context-D2ctU4yT.mjs";
 import { n as setActionRouter, t as action } from "./action-4EvQppia.mjs";
 import { useActionState, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
-import { VoidActionError, categorizeActionError, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, scheduleFormRetry, ssrProxy, submitAction } from "void/pages-client";
+import { cloneFormValue, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, scheduleFormRetry, ssrProxy, submitAction, submitIslandAction } from "void/pages-client";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/runtime/form.tsx
 function Form({ form, method = "post", renderError, children, ...props }) {
@@ -231,13 +231,14 @@ function useShared() {
 //#region src/runtime/use-form.ts
 function useForm(url, defaults, options) {
 	const router = useContext(RouterContext);
-	const [data, setDataState] = useState(() => ({ ...defaults }));
-	const [defaultsState, setDefaultsState] = useState(() => ({ ...defaults }));
+	const [data, setDataState] = useState(() => cloneFormValue(defaults));
+	const [defaultsState, setDefaultsState] = useState(() => cloneFormValue(defaults));
 	const [errors, setErrors] = useState({});
-	const [error, setError] = useState(null);
+	const [error, setActionError] = useState(null);
 	const [wasSuccessful, setWasSuccessful] = useState(false);
 	const [recentlySuccessful, setRecentlySuccessful] = useState(false);
 	const defaultsRef = useRef(defaultsState);
+	const initialRef = useRef(defaultsState);
 	const dataRef = useRef(data);
 	const successTimeoutRef = useRef(null);
 	const hasChanges = useMemo(() => {
@@ -249,12 +250,20 @@ function useForm(url, defaults, options) {
 			[field]: value
 		};
 		setDataState(dataRef.current);
+		setErrors((prev) => {
+			if (!(field in prev)) return prev;
+			const next = { ...prev };
+			delete next[field];
+			return next;
+		});
 	}, []);
-	const reset = useCallback((...fields) => {
-		if (fields.length === 0) dataRef.current = { ...defaultsRef.current };
+	const reset = useCallback((...args) => {
+		const { initial, fields } = parseFormResetArgs(args);
+		const source = initial ? initialRef.current : defaultsRef.current;
+		if (fields.length === 0) dataRef.current = cloneFormValue(source);
 		else {
 			const next = { ...dataRef.current };
-			for (const field of fields) next[field] = defaultsRef.current[field];
+			for (const field of fields) next[field] = cloneFormValue(source[field]);
 			dataRef.current = next;
 		}
 		setDataState(dataRef.current);
@@ -267,8 +276,14 @@ function useForm(url, defaults, options) {
 			return next;
 		});
 	}, []);
+	const setError = useCallback((field, message) => {
+		setErrors((prev) => ({
+			...prev,
+			[field]: message
+		}));
+	}, []);
 	const clearError = useCallback(() => {
-		setError(null);
+		setActionError(null);
 	}, []);
 	const [, dispatchAction, pending] = useActionState(async (previousSuccessVersion, payload) => {
 		if (!router) throw new Error("useForm(): requires the Void Router.");
@@ -280,7 +295,7 @@ function useForm(url, defaults, options) {
 			successTimeoutRef.current = null;
 		}
 		setErrors({});
-		setError(null);
+		setActionError(null);
 		let result;
 		try {
 			result = await submitAction(router, interpolateRouteParams(url, options?.params), {
@@ -294,11 +309,20 @@ function useForm(url, defaults, options) {
 		}
 		if (!result.ok) {
 			const validationErrors = getValidationErrors(result.error.body);
-			if (validationErrors) setErrors(validationErrors);
-			else setError(result.error);
+			if (validationErrors) {
+				setErrors(validationErrors);
+				await options?.onError?.(validationErrors);
+			} else {
+				setActionError(result.error);
+				await options?.onError?.(result.error);
+			}
 			return previousSuccessVersion;
 		}
-		const nextDefaults = { ...dataRef.current };
+		if (options?.resetOnSuccess) {
+			dataRef.current = cloneFormValue(initialRef.current);
+			setDataState(dataRef.current);
+		}
+		const nextDefaults = cloneFormValue(dataRef.current);
 		defaultsRef.current = nextDefaults;
 		setDefaultsState(nextDefaults);
 		setWasSuccessful(true);
@@ -307,6 +331,7 @@ function useForm(url, defaults, options) {
 			setRecentlySuccessful(false);
 			successTimeoutRef.current = null;
 		}, 2e3);
+		await options?.onSuccess?.();
 		return previousSuccessVersion + 1;
 	}, 0);
 	useEffect(() => {
@@ -334,6 +359,7 @@ function useForm(url, defaults, options) {
 		patch: useMemo(() => dispatchMethodAction("PATCH"), [dispatchMethodAction]),
 		delete: useMemo(() => dispatchMethodAction("DELETE"), [dispatchMethodAction]),
 		reset,
+		setError,
 		clearErrors,
 		clearError
 	};
@@ -345,15 +371,6 @@ function useNavigation() {
 }
 //#endregion
 //#region src/runtime/use-island-form.ts
-async function readActionErrorBody(response) {
-	const contentType = response.headers.get("content-type") || "";
-	try {
-		if (contentType.includes("application/json")) return await response.json();
-		return await response.text() || null;
-	} catch {
-		return null;
-	}
-}
 /**
 * Form hook for island pages. Uses fetch + page reload instead of the
 * Void Router (which is not available in island mode).
@@ -404,16 +421,12 @@ function useIslandForm(defaults) {
 		setErrors({});
 		setError(null);
 		try {
-			const response = await fetch(url, {
-				method,
-				headers: { "Content-Type": "application/json" },
-				body: JSON.stringify(data)
-			});
-			if (response.redirected) {
-				window.location.href = response.url;
+			const result = await submitIslandAction(url, method, data);
+			if (result.kind === "redirect") {
+				window.location.href = result.url;
 				return;
 			}
-			if (response.ok) {
+			if (result.kind === "success") {
 				setWasSuccessful(true);
 				setRecentlySuccessful(true);
 				const nextDefaults = { ...data };
@@ -421,22 +434,8 @@ function useIslandForm(defaults) {
 				setDefaultsState(nextDefaults);
 				successTimeoutRef.current = setTimeout(() => setRecentlySuccessful(false), 2e3);
 				window.location.reload();
-			} else {
-				const body = await readActionErrorBody(response);
-				const actionError = new VoidActionError({
-					body,
-					status: response.status,
-					statusText: response.statusText,
-					url
-				});
-				const validationErrors = response.status === 422 ? getValidationErrors(body) : null;
-				if (validationErrors) {
-					setErrors(validationErrors);
-					return;
-				}
-				if (categorizeActionError(response.status) === "boundary") throw actionError;
-				setError(actionError);
-			}
+			} else if (result.kind === "validation") setErrors(result.errors);
+			else setError(result.error);
 		} finally {
 			setPending(false);
 		}

package/dist/plugin.mjs

@@ -1,6 +1,6 @@
 import react from "@vitejs/plugin-react";
-import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { createPagesPlugin, generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, scanPages } from "void/pages";
+import { existsSync, readFileSync } from "node:fs";
 import nodePath from "node:path";
 import { normalizePath } from "vite";
 import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, findIslandImports, findStaticCssImports, hasIslandPages, islandStylesPlugin, recordIslandStyles, recordedIslandStyles, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
@@ -44,7 +44,6 @@ posix.win32 = win32.win32 = win32;
 const { basename, delimiter, dirname, extname, format, isAbsolute, join, matchesGlob, normalize, parse, relative, resolve, sep, toNamespacedPath } = isWindows ? win32 : posix;
 //#endregion
 //#region src/plugin-pages.ts
-const RENDERER_ID = "virtual:void-pages-renderer";
 const CLIENT_ENTRY_ID = "virtual:void-pages-client";
 const WORKER_ENVIRONMENT_NAME = "void_worker";
 const REACT_DEDUPE = ["react", "react-dom"];
@@ -68,112 +67,38 @@ const REACT_REFRESH_PREAMBLE = `
   window.$RefreshSig$ = () => (type) => type
   window.__vite_plugin_react_preamble_installed__ = true
 <\/script>`;
-/** Check if the pages directory has any non-island page files (.tsx/.jsx without .island.). */
-function hasNonIslandPages(dir) {
-	try {
-		for (const entry of readdirSync(dir, {
-			withFileTypes: true,
-			recursive: true
-		})) {
-			if (!entry.isFile()) continue;
-			const name = entry.name;
-			if (name.startsWith("_") || name.startsWith("layout.")) continue;
-			if (/\.(tsx|jsx)$/.test(name) && !name.includes(".island.")) return true;
-		}
-	} catch {}
-	return false;
-}
 function pagesPlugin(pagesDir, options) {
-	let pageScan = null;
-	let isDev = false;
-	let viteConfig;
 	const root = options?.root ?? dirname(pagesDir);
-	const normalizedPagesDir = normalizePath(pagesDir);
 	const pagesOptimizeEntries = `${relative(root, pagesDir)}/**/*.{js,jsx,ts,tsx}`;
-	let pendingRescan = null;
-	const rescanPages = async () => {
-		pageScan = existsSync(pagesDir) ? await scanPages(root, { pagesDir }) : null;
-	};
-	const runRescan = () => {
-		pendingRescan ??= rescanPages().finally(() => {
-			pendingRescan = null;
-		});
-		return pendingRescan;
-	};
-	const invalidatePageModules = (server) => {
-		for (const env of Object.values(server.environments)) for (const id of ["\0" + RENDERER_ID, "\0" + CLIENT_ENTRY_ID]) {
-			const mod = env.moduleGraph.getModuleById(id);
-			if (mod) env.moduleGraph.invalidateModule(mod);
-		}
-	};
-	return {
+	return createPagesPlugin(pagesDir, {
 		name: "void-react:pages",
-		async buildStart() {
-			await runRescan();
-		},
-		resolveId: {
-			filter: { id: /^virtual:void-pages-(renderer|client)$/ },
-			handler(id) {
-				return "\0" + id;
-			}
+		root,
+		generateRenderer(scan, isDev) {
+			return generateRendererModule(scan, pagesDir, isDev);
 		},
-		load: {
-			filter: { id: /^\0virtual:void-pages-(renderer|client)$/ },
-			async handler(id) {
-				if (isDev && pendingRescan) await pendingRescan;
-				if (!pageScan && existsSync(pagesDir)) await runRescan();
-				if (id === "\0" + RENDERER_ID) {
-					if (!pageScan) return "export function renderPage() { throw new Error('No pages found'); }";
-					return generateRendererModule(pageScan, pagesDir, isDev);
-				}
-				if (id === "\0" + CLIENT_ENTRY_ID) {
-					if (!pageScan) return "";
-					return generateClientEntry(pageScan, pagesDir, options?.viewTransitions, options?.prefetch, resolveStaticPageDataBuildOptions(root, { publicDir: viteConfig?.publicDir }));
-				}
-			}
+		generateClient(scan, staticPageData) {
+			return generateClientEntry(scan, pagesDir, options?.viewTransitions, options?.prefetch, staticPageData);
 		},
-		configureServer(server) {
-			const handlePagesChange = async (path, event) => {
-				const normalizedPath = normalizePath(path);
-				if (normalizedPath !== normalizedPagesDir && !normalizedPath.startsWith(normalizedPagesDir + "/")) return;
-				if (event === "change" && !normalizedPath.endsWith(".md")) return;
-				try {
-					await runRescan();
-				} catch (error) {
-					server.config.logger.error(error instanceof Error ? error.message : String(error), {
-						error: error instanceof Error ? error : void 0,
-						timestamp: true
-					});
-					return;
-				}
-				invalidatePageModules(server);
+		async config({ isDev, scan }) {
+			if (isDev) return {
+				resolve: { dedupe: REACT_DEDUPE },
+				optimizeDeps: {
+					exclude: ["@void/react"],
+					entries: clientOptimizeEntries(await scan(), pagesDir, root),
+					include: [
+						...CLIENT_OPTIMIZE_DEPS,
+						"void/pages-client",
+						"void/pages-prefetch"
+					]
+				},
+				ssr: { optimizeDeps: { include: [...CLIENT_OPTIMIZE_DEPS, "react-dom/server"] } },
+				environments: { [WORKER_ENVIRONMENT_NAME]: { optimizeDeps: {
+					exclude: ["@void/react"],
+					entries: [pagesOptimizeEntries],
+					include: WORKER_OPTIMIZE_DEPS
+				} } }
 			};
-			server.watcher.on("add", (path) => handlePagesChange(path, "add"));
-			server.watcher.on("change", (path) => handlePagesChange(path, "change"));
-			server.watcher.on("unlink", (path) => handlePagesChange(path, "unlink"));
-		},
-		configResolved(config) {
-			viteConfig = config;
-		},
-		config(_, env) {
-			if (!existsSync(pagesDir)) return;
-			if (env.command === "serve") {
-				isDev = true;
-				return {
-					resolve: { dedupe: REACT_DEDUPE },
-					optimizeDeps: {
-						exclude: ["@void/react"],
-						include: CLIENT_OPTIMIZE_DEPS
-					},
-					ssr: { optimizeDeps: { include: [...CLIENT_OPTIMIZE_DEPS, "react-dom/server"] } },
-					environments: { [WORKER_ENVIRONMENT_NAME]: { optimizeDeps: {
-						exclude: ["@void/react"],
-						entries: [pagesOptimizeEntries],
-						include: WORKER_OPTIMIZE_DEPS
-					} } }
-				};
-			}
-			if (!hasNonIslandPages(pagesDir)) return;
+			if (!(await scan())?.pages.some((page) => !page.island)) return;
 			return {
 				resolve: { dedupe: REACT_DEDUPE },
 				build: {
@@ -182,7 +107,35 @@ function pagesPlugin(pagesDir, options) {
 				}
 			};
 		}
-	};
+	});
+}
+function clientOptimizeEntries(scan, pagesDir, root) {
+	if (!scan) return [];
+	const browserFiles = /* @__PURE__ */ new Set();
+	const islandFiles = /* @__PURE__ */ new Set();
+	for (const page of scan.pages) {
+		const layouts = resolveEffectiveLayoutChain(page, scan.layouts, scan.namedLayouts);
+		if (page.island) {
+			islandFiles.add(resolve(pagesDir, page.componentPath));
+			for (const layout of layouts) if (layout.island) islandFiles.add(resolve(pagesDir, layout.filePath));
+		} else {
+			browserFiles.add(resolve(pagesDir, page.componentPath));
+			for (const layout of layouts) browserFiles.add(resolve(pagesDir, layout.filePath));
+		}
+	}
+	for (const file of islandFiles) {
+		if (!/\.island\.(tsx|jsx)$/.test(file)) continue;
+		for (const { specifier } of findIslandImports(readFileSync(file, "utf8"), file)) {
+			const component = resolveSpecifier(specifier, dirname(file), [
+				".tsx",
+				".jsx",
+				".ts",
+				".js"
+			]);
+			if (component) browserFiles.add(component);
+		}
+	}
+	return [...browserFiles].map((file) => relative(root, file).replace(/[()[\]{}*?!|]/g, "\\$&"));
 }
 function generateRendererModule(scan, pagesDir, isDev) {
 	const preambleScript = isDev ? REACT_REFRESH_PREAMBLE : "";
@@ -272,7 +225,10 @@ function islandsPlugin(pagesDir, options) {
 		},
 		async buildStart() {
 			if (existsSync(pagesDir)) {
-				pageScan = await scanPages(root, { pagesDir });
+				pageScan = await scanPages(root, {
+					pagesDir,
+					environment: isDev ? "dev" : "prod"
+				});
 				const filesToScan = [
 					...pageScan.pages.map((page) => ({
 						filePath: page.componentPath,

package/dist/runtime/pages-client.d.mts

@@ -12,7 +12,8 @@ export type ReactPagesConfig = Readonly<{
   routeMeta: Record<string, {
     island?: boolean;
   }>;
-  matchRoute(url: string): string | null;
+  /** Page id for a decoded pathname. */
+  matchRoute(path: string): string | null;
   staticPageData: boolean;
   staticPageDataFastPath: boolean;
   viewTransitions: boolean;

package/dist/runtime/pages-client.mjs

@@ -182,12 +182,11 @@ function RouteResource({ resource, onCommit }) {
 		resource,
 		result
 	]);
-	if (!result) return null;
-	const pageData = result.pageData;
-	const PageComponent = result.component;
-	const routeParams = pageData.params ?? EMPTY_PARAMS;
+	const pageData = result?.pageData;
+	const pageDataUrl = pageData?.url ?? "";
+	const routeParams = pageData?.params ?? EMPTY_PARAMS;
 	const routeRouter = useMemo(() => {
-		const pageUrl = encodedPageUrl(pageData.url);
+		const pageUrl = encodedPageUrl(pageDataUrl);
 		return createRouterFacade(outerRouter, () => {
 			const outerUrl = outerRouter.url;
 			const outerPath = outerUrl.pathname + outerUrl.search;
@@ -198,11 +197,13 @@ function RouteResource({ resource, onCommit }) {
 		}, () => routeParams);
 	}, [
 		outerRouter,
-		pageData.url,
+		pageDataUrl,
 		resource.fetchUrl,
 		resource.hash,
 		routeParams
 	]);
+	if (!result || !pageData) return null;
+	const PageComponent = result.component;
 	let element = React.createElement(PageComponent, pageData.props);
 	for (let i = result.layouts.length - 1; i >= 0; i--) {
 		const Layout = result.layouts[i];
@@ -249,6 +250,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 				prerenderedUrl = null;
 				React.startTransition(() => setHydrated(true));
 			}
+			return true;
 		},
 		dispose() {}
 	}), [engine, initialPageData]);
@@ -263,7 +265,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 	const finishNavigation = useCallback((resource, result) => {
 		if (committedResources.has(resource.id)) return;
 		committedResources.add(resource.id);
-		resource.commit().then(() => {
+		resource.commit().then((committed) => {
 			const resolveViewTransition = viewTransitionWaiters.get(resource.id);
 			if (resolveViewTransition) {
 				viewTransitionWaiters.delete(resource.id);
@@ -272,8 +274,11 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 			const visitSettler = pendingVisitSettlers.get(resource.id);
 			if (visitSettler) {
 				pendingVisitSettlers.delete(resource.id);
-				visitSettler.resolve(result.pageData);
+				if (committed) visitSettler.resolve(result.pageData);
+				else if (resource.method.toUpperCase() === "GET") visitSettler.resolve(void 0);
+				else visitSettler.reject(new DOMException("Navigation aborted", "AbortError"));
 			}
+			if (!committed) return;
 			if (activePendingNavigationId === resource.id) activePendingNavigationId = null;
 			dispatch({
 				type: "finish",
@@ -281,11 +286,22 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 				location: currentUrl()
 			});
 		}).catch((error) => {
+			const resolveViewTransition = viewTransitionWaiters.get(resource.id);
+			if (resolveViewTransition) {
+				viewTransitionWaiters.delete(resource.id);
+				resolveViewTransition();
+			}
 			const visitSettler = pendingVisitSettlers.get(resource.id);
 			if (visitSettler) {
 				pendingVisitSettlers.delete(resource.id);
 				visitSettler.reject(error);
-			}
+			} else reportError(error);
+			if (activePendingNavigationId === resource.id) activePendingNavigationId = null;
+			dispatch({
+				type: "fail",
+				resource,
+				location: currentUrl()
+			});
 		});
 	}, []);
 	const schedule = useCallback((url, options = {}) => {
@@ -334,7 +350,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 					pendingVisitSettlers.delete(prepared.id);
 					if (activePendingNavigationId === prepared.id) activePendingNavigationId = null;
 					dispatch({
-						type: NavigationFallback ? "abandon" : "finish",
+						type: "abandon",
 						resource: prepared,
 						location: currentUrl()
 					});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/react",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "React pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -44,18 +44,19 @@
     "@types/node": "^26.6.5",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
+    "happy-dom": "^21.0.4",
     "pathslash": "^0.1.0",
     "react": "^19.3.1",
     "react-dom": "^19.3.1",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "void": "1.2.1"
+    "void": "1.4.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "vite": "^8.0.0",
-    "void": "1.2.1"
+    "void": "1.4.0"
   },
   "scripts": {
     "build": "vp pack",