@void/svelte 1.2.1 → 1.3.0

package/dist/plugin.mjs

@@ -95,7 +95,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,
@@ -360,7 +363,10 @@ function pagesPlugin(pagesDir, options) {
 	const normalizedPagesDir = normalizePath(pagesDir);
 	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(() => {
@@ -424,14 +430,12 @@ function pagesPlugin(pagesDir, options) {
 			viteConfig = config;
 		},
 		config(_, env) {
+			isDev = env.command === "serve";
 			if (!existsSync(pagesDir)) return;
-			if (env.command === "serve") {
-				isDev = true;
-				return {
-					optimizeDeps: SVELTE_OPTIMIZE_DEPS,
-					environments: { void_worker: { optimizeDeps: { exclude: ["@void/svelte"] } } }
-				};
-			}
+			if (isDev) return {
+				optimizeDeps: SVELTE_OPTIMIZE_DEPS,
+				environments: { void_worker: { optimizeDeps: { exclude: ["@void/svelte"] } } }
+			};
 			if (!hasNonIslandPages(pagesDir)) return;
 			return { build: {
 				manifest: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/svelte",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Svelte pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -43,12 +43,12 @@
     "svelte": "^5.57.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "void": "1.2.1"
+    "void": "1.3.0"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
     "vite": "^8.0.0",
-    "void": "1.2.1"
+    "void": "1.3.0"
   },
   "scripts": {
     "build": "vp pack",

package/src/runtime/use-form.svelte.ts

@@ -1,11 +1,14 @@
-import { getContext } from 'svelte';
+import { getContext, untrack } from 'svelte';
 import {
   VoidActionError,
+  cloneFormValue,
   getValidationErrors,
   interpolateRouteParams,
   isAbortError,
   isEqualFormValue,
+  parseFormResetArgs,
   submitAction,
+  type FormResetOptions,
   type VisitOptions,
   type VoidRouter,
 } from 'void/pages-client';
@@ -26,7 +29,9 @@ type UntypedForm = {
   put(opts?: FormSubmitOptions): Promise<void>;
   patch(opts?: FormSubmitOptions): Promise<void>;
   delete(opts?: FormSubmitOptions): Promise<void>;
+  reset(options: FormResetOptions, ...fields: ReadonlyArray<string>): void;
   reset(...fields: ReadonlyArray<string>): void;
+  setError(field: string, message: string): void;
   clearErrors(...fields: ReadonlyArray<string>): void;
   clearError(): void;
 };
@@ -48,7 +53,12 @@ export function useForm<U extends ActionUrl & string>(
   put(opts?: FormSubmitOptions): Promise<void>;
   patch(opts?: FormSubmitOptions): Promise<void>;
   delete(opts?: FormSubmitOptions): Promise<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;
 };
@@ -56,32 +66,50 @@ export function useForm<U extends ActionUrl & string>(
 export function useForm(
   url: string,
   defaults: Record<string, unknown>,
-  options?: { params?: Record<string, string> },
+  options?: { params?: Record<string, string>; resetOnSuccess?: boolean },
 ): UntypedForm {
   const router = getContext<VoidRouter>('__void_router');
 
-  let data = $state({ ...defaults });
+  const initialDefaults = cloneFormValue(defaults);
+  let data = $state(cloneFormValue(initialDefaults));
   let errors: Record<string, string> = $state({});
   let error: VoidActionError | null = $state(null);
   let pending = $state(false);
   let wasSuccessful = $state(false);
   let recentlySuccessful = $state(false);
 
-  let defaults_ = { ...defaults };
+  let defaults_ = $state.raw(initialDefaults);
   let successTimeout: ReturnType<typeof setTimeout> | null = null;
+  let dataSnapshot = cloneFormValue(initialDefaults);
+
+  $effect(() => {
+    // Read nested values even after an earlier edit, without subscribing to errors.
+    const current = cloneFormValue(data);
+    untrack(() => {
+      for (const key of new Set([...Object.keys(dataSnapshot), ...Object.keys(current)])) {
+        if (!isEqualFormValue(current[key], dataSnapshot[key])) {
+          delete errors[key];
+        }
+      }
+      dataSnapshot = current;
+    });
+  });
 
   const hasChanges = $derived(
     Object.keys(defaults_).some((key) => !isEqualFormValue(data[key], defaults_[key])),
   );
 
-  function reset(...fields: ReadonlyArray<string>) {
+  function reset(...args: ReadonlyArray<string | FormResetOptions>) {
+    const { initial, fields } = parseFormResetArgs(args);
+    const source = initial ? initialDefaults : defaults_;
     if (fields.length === 0) {
-      data = { ...defaults_ };
+      data = cloneFormValue(source);
     } else {
       for (const field of fields) {
-        data[field] = defaults_[field];
+        data[field] = cloneFormValue(source[field]);
       }
     }
+    dataSnapshot = cloneFormValue(data);
   }
 
   function clearErrors(...fields: ReadonlyArray<string>) {
@@ -94,6 +122,12 @@ export function useForm(
     }
   }
 
+  function setError(field: string, message: string) {
+    // An input handler may validate its new value before the change effect runs.
+    dataSnapshot = { ...dataSnapshot, [field]: cloneFormValue(data[field]) };
+    errors = { ...errors, [field]: message };
+  }
+
   function clearError() {
     error = null;
   }
@@ -120,7 +154,9 @@ export function useForm(
       if (!result.ok) {
         const validationErrors = getValidationErrors(result.error.body);
         if (validationErrors) {
-          Object.assign(errors, validationErrors);
+          for (const [field, message] of Object.entries(validationErrors)) {
+            setError(field, message);
+          }
         } else {
           error = result.error;
         }
@@ -129,7 +165,12 @@ export function useForm(
 
       wasSuccessful = true;
       recentlySuccessful = true;
-      defaults_ = { ...data };
+      if (options?.resetOnSuccess) {
+        data = cloneFormValue(initialDefaults);
+        defaults_ = cloneFormValue(initialDefaults);
+      } else {
+        defaults_ = cloneFormValue(data);
+      }
       successTimeout = setTimeout(() => {
         recentlySuccessful = false;
       }, 2000);
@@ -166,6 +207,7 @@ export function useForm(
       return recentlySuccessful;
     },
     reset,
+    setError,
     clearErrors,
     clearError,
     post: (opts?: FormSubmitOptions) => submit('POST', opts),