form is now available as an argument in onError

Author: ciscoheat

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Exported `ClientValidationAdapter` from `sveltekit-supoerforms/adapters`.
+- `form` is now available as an argument in [onError](https://superforms.rocks/concepts/events#onerror), so it can be modified as in `onUpdate`.
 
 ### Fixed
 

src/lib/client/superForm.ts

@@ -144,6 +144,7 @@ export type FormOptions<
 	onError:
 		| 'apply'
 		| ((event: {
+				form: SuperValidated<T, M, In>;
 				result: {
 					type: 'error';
 					status?: number;
@@ -965,6 +966,34 @@ export function superForm<
 		);
 	}
 
+	function Form_capture(removeFilesfromData = true): SuperFormSnapshot<T, M, In> {
+		let data = Data.form;
+		let tainted = Data.tainted;
+
+		if (removeFilesfromData) {
+			const removed = removeFiles(Data.form);
+			data = removed.data;
+			const paths = removed.paths;
+
+			if (paths.length) {
+				tainted = clone(tainted) ?? {};
+				setPaths(tainted, paths, false);
+			}
+		}
+
+		return {
+			valid: Data.valid,
+			posted: Data.posted,
+			errors: Data.errors,
+			data,
+			constraints: Data.constraints,
+			message: Data.message,
+			id: Data.formId,
+			tainted,
+			shape: Data.shape
+		};
+	}
+
 	async function Form_updateFromValidation(form: SuperValidated<T, M, In>, successResult: boolean) {
 		if (form.valid && successResult && Form_shouldReset(form.valid, successResult)) {
 			Form_reset({ message: form.message, posted: true });
@@ -1466,9 +1495,6 @@ export function superForm<
 				if (options.applyAction && pageUpdate.form && typeof pageUpdate.form === 'object') {
 					const actionData = pageUpdate.form;
 
-					// Check if it is an error result, sent here from formEnhance
-					if (actionData.type == 'error') return;
-
 					for (const newForm of Context_findValidationForms(actionData)) {
 						const isInitial = initialForms.has(newForm);
 
@@ -1675,11 +1701,15 @@ export function superForm<
 			async function triggerOnError(
 				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				result: { type: 'error'; status?: number; error: any },
-				thrown: boolean
+				status: number
 			) {
+				const form: SuperValidated<T, M, In> = Form_capture(false);
+
+				result.status = status;
+
 				// Check if the error message should be replaced
 				if (options.onError !== 'apply') {
-					const event = { result, message: Message };
+					const event = { result, message: Message, form };
 
 					for (const onErrorEvent of formEvents.onError) {
 						if (
@@ -1698,24 +1728,18 @@ export function superForm<
 					});
 				}
 
-				// Set error http status, unless already set
-				if (!result.status || result.status < 400) {
-					result.status = thrown ? 500 : 400;
-				}
-
 				if (options.applyAction) {
 					if (options.onError == 'apply') {
 						await applyAction(result);
 					} else {
 						// Transform to failure, to avoid data loss
 						// Set the data to the error result, so it will be
 						// picked up in page.subscribe in superForm.
-						const failResult = {
+						await applyAction({
 							type: 'failure',
 							status: Form_resultStatus(result.status),
-							data: result
-						} as const;
-						await applyAction(failResult);
+							data: { form }
+						});
 					}
 				}
 			}
@@ -1748,7 +1772,7 @@ export function superForm<
 						await event(submit);
 					} catch (error) {
 						cancel();
-						triggerOnError({ type: 'error', error, status: Form_resultStatus(500) }, true);
+						triggerOnError({ type: 'error', error }, 500);
 					}
 				}
 			}
@@ -1983,7 +2007,7 @@ export function superForm<
 								await Form_updateFromActionResult(result);
 							}
 						} else {
-							await triggerOnError(result, false);
+							await triggerOnError(result, Math.max(result.status ?? 500, 500));
 						}
 					}
 				}
@@ -2091,26 +2115,7 @@ export function superForm<
 
 		options: options as T extends T ? FormOptions<T, M> : never,
 
-		capture() {
-			const { data, paths } = removeFiles(Data.form);
-			let tainted = Data.tainted;
-			if (paths.length) {
-				tainted = clone(tainted) ?? {};
-				setPaths(tainted, paths, false);
-			}
-
-			return {
-				valid: Data.valid,
-				posted: Data.posted,
-				errors: Data.errors,
-				data,
-				constraints: Data.constraints,
-				message: Data.message,
-				id: Data.formId,
-				tainted,
-				shape: Data.shape
-			};
-		},
+		capture: Form_capture,
 
 		restore: ((snapshot: SuperFormSnapshot<T, M>) => {
 			rebind({ form: snapshot, untaint: snapshot.tainted ?? true });

src/routes/(v2)/v2/Navigation.svelte

@@ -67,7 +67,8 @@
 		'spa-error',
 		'issue-470',
 		'issue-484',
-		'component-regen'
+		'component-regen',
+		'issue-485'
 	].sort();
 </script>
 

src/routes/(v2)/v2/issue-485/+page.svelte

@@ -7,23 +7,21 @@
 	import { debounce } from 'throttle-debounce';
 
 	const { form, errors, message, enhance, submit, submitting } = superForm(
-		defaults({ email: '[email protected]' }, zod(schema)),
+		defaults({ email: '[email protected]', name: 'aaa' }, zod(schema)),
 		{
-			onError(event) {
+			onError({ result, form }) {
 				console.log('=== onError ===');
 
-				/* 
-					1. It's not possible to use the SuperValidated data from onError, 
-					as it can be caught in onSubmit where it doesn't exist.
-					
-					You need to update the stores directly.
-				*/
-				$message = JSON.stringify(event, null, 2);
+				form.message = JSON.stringify(result.error, null, 2);
 
 				// Cast the error, as its type isn't unknown.
-				const error = event.result.error as Record<string, unknown>;
+				const error = result.error as unknown as {
+					status: number;
+					errors: Record<string, string[]>;
+				} & Record<string, unknown>;
 
-				$errors = error.errors as Record<string, string[]>;
+				result.status = error.status;
+				form.errors = error.errors;
 			},
 			async onUpdate({ form, result }) {
 				console.log('=== onUpdate ===');
@@ -33,7 +31,7 @@
 					return;
 				}
 
-				const isSuccess = Math.random() >= 0.5;
+				const isSuccess = false; //Math.random() >= 0.5;
 				console.log('isSuccess', isSuccess);
 
 				if (isSuccess) {
@@ -56,12 +54,11 @@
 						}
 					};
 
-					const shouldThrow = Math.random() >= 0.5;
+					const shouldThrow = false; //Math.random() >= 0.5;
 					console.log('shouldThrow', shouldThrow);
 
 					if (shouldThrow) {
 						// 3. This will update the status in the next release:
-						result.status = 422;
 						throw madeupProblemDetails;
 					}
 
@@ -75,7 +72,7 @@
 			},
 			SPA: true,
 			validators: zod(schema),
-			resetForm: true
+			resetForm: false
 		}
 	);
 
@@ -84,7 +81,7 @@
 
 <SuperDebug data={$form} />
 
-<h3>Superforms testing ground - Zod</h3>
+<h3>onError testing</h3>
 
 {#if $message}
 	<pre