@void/react 1.2.0 → 1.3.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
@@ -54,7 +54,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 { VoidActionError, categorizeActionError, cloneFormValue, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, scheduleFormRetry, ssrProxy, submitAction } 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), {
@@ -295,10 +310,14 @@ function useForm(url, defaults, options) {
 		if (!result.ok) {
 			const validationErrors = getValidationErrors(result.error.body);
 			if (validationErrors) setErrors(validationErrors);
-			else setError(result.error);
+			else setActionError(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);
@@ -334,6 +353,7 @@ function useForm(url, defaults, options) {
 		patch: useMemo(() => dispatchMethodAction("PATCH"), [dispatchMethodAction]),
 		delete: useMemo(() => dispatchMethodAction("DELETE"), [dispatchMethodAction]),
 		reset,
+		setError,
 		clearErrors,
 		clearError
 	};

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 { 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";
@@ -68,21 +68,6 @@ 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;
@@ -92,7 +77,10 @@ function pagesPlugin(pagesDir, options) {
 	const pagesOptimizeEntries = `${relative(root, pagesDir)}/**/*.{js,jsx,ts,tsx}`;
 	let pendingRescan = null;
 	const rescanPages = async () => {
-		pageScan = existsSync(pagesDir) ? await scanPages(root, { pagesDir }) : null;
+		pageScan = existsSync(pagesDir) ? await scanPages(root, {
+			pagesDir,
+			environment: isDev ? "dev" : "prod"
+		}) : null;
 	};
 	const runRescan = () => {
 		pendingRescan ??= rescanPages().finally(() => {
@@ -155,25 +143,24 @@ function pagesPlugin(pagesDir, options) {
 		configResolved(config) {
 			viteConfig = config;
 		},
-		config(_, env) {
+		async config(_, env) {
+			isDev = env.command === "serve";
 			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 (isDev) 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
+				} } }
+			};
+			await runRescan();
+			if (!pageScan?.pages.some((page) => !page.island)) return;
 			return {
 				resolve: { dedupe: REACT_DEDUPE },
 				build: {
@@ -272,7 +259,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

@@ -2,7 +2,7 @@ import { a as RouterContext, i as ParamsContext, o as SharedContext, r as Naviga
 import { n as setActionRouter } from "../action-4EvQppia.mjs";
 import { n as DEFERRED_SHELL_END_ID } from "../deferred-shell-DOuP2YAo.mjs";
 import React, { Suspense, startTransition, use, useCallback, useEffect, useInsertionEffect, useLayoutEffect, useMemo, useReducer, useState, useTransition } from "react";
-import { createPageNavigationEngine, createRouterFacade, idleNavigationState, isAbortError, isCallSiteActionError } from "void/pages-client";
+import { createPageNavigationEngine, createRouterFacade, idleNavigationState, isAbortError, isCallSiteActionError, refreshPage } from "void/pages-client";
 import { createRoot, hydrateRoot } from "react-dom/client";
 //#region src/runtime/pages-client.ts
 const deferredState = /* @__PURE__ */ new WeakMap();
@@ -158,11 +158,7 @@ function createRouter(engine) {
 			return scheduleVisit(normalizeUrl(url), options);
 		},
 		refresh(options = {}) {
-			return router.visit(window.location.pathname + window.location.search, {
-				preserveState: true,
-				preserveScroll: true,
-				...options
-			});
+			return refreshPage(router, options);
 		},
 		prefetch(url, options = {}) {
 			return engine.prefetch(normalizeUrl(url), options);
@@ -253,6 +249,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 				prerenderedUrl = null;
 				React.startTransition(() => setHydrated(true));
 			}
+			return true;
 		},
 		dispose() {}
 	}), [engine, initialPageData]);
@@ -267,7 +264,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);
@@ -276,8 +273,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",
@@ -285,11 +285,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 = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/react",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "React pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -49,13 +49,13 @@
     "react-dom": "^19.3.1",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "void": "1.2.0"
+    "void": "1.3.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "vite": "^8.0.0",
-    "void": "1.2.0"
+    "void": "1.3.0"
   },
   "scripts": {
     "build": "vp pack",