feat: zod transform inference support

edmundhung · Nov 16, 2023 · 40d1404 · 40d1404
1 parent e86dc5b
commit 40d1404
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/conform-dom/form.ts b/packages/conform-dom/form.ts
@@ -116,7 +116,7 @@ export type FormOptions<Schema> = {
 		form: HTMLFormElement;
 		submitter: HTMLInputElement | HTMLButtonElement | null;
 		formData: FormData;
-	}) => Submission<Schema>;
+	}) => Submission<Schema, any>;
 };
 
 export type SubscriptionSubject = {

diff --git a/packages/conform-dom/submission.ts b/packages/conform-dom/submission.ts
@@ -16,11 +16,11 @@ export type SubmissionContext<Value> = {
 	state: SubmissionState;
 };
 
-export type Submission<Output> =
+export type Submission<Schema, Value = Schema> =
 	| {
 			type: 'submit';
 			payload: Record<string, unknown>;
-			value: Output | null;
+			value: Value | null;
 			error: Record<string, string[]>;
 			reject(options?: RejectOptions): SubmissionResult;
 			accept(options?: AcceptOptions): SubmissionResult;

diff --git a/packages/conform-zod/parse.ts b/packages/conform-zod/parse.ts
@@ -8,11 +8,12 @@ import {
 import {
 	type IssueData,
 	type SafeParseReturnType,
-	type output,
 	type RefinementCtx,
 	type ZodTypeAny,
 	type ZodError,
 	type ZodErrorMap,
+	type input,
+	type output,
 	ZodIssueCode,
 } from 'zod';
 import { enableTypeCoercion } from './coercion';
@@ -37,23 +38,25 @@ export function parse<Schema extends ZodTypeAny>(
 		async?: false;
 		errorMap?: ZodErrorMap;
 	},
-): Submission<output<Schema>>;
+): Submission<input<Schema>, output<Schema>>;
 export function parse<Schema extends ZodTypeAny>(
 	payload: FormData | URLSearchParams,
 	options: {
 		schema: Schema | ((intent: string) => Schema);
 		async: true;
 		errorMap?: ZodErrorMap;
 	},
-): Promise<Submission<output<Schema>>>;
+): Promise<Submission<input<Schema>, output<Schema>>>;
 export function parse<Schema extends ZodTypeAny>(
 	payload: FormData | URLSearchParams,
 	options: {
 		schema: Schema | ((intent: string) => Schema);
 		async?: boolean;
 		errorMap?: ZodErrorMap;
 	},
-): Submission<output<Schema>> | Promise<Submission<output<Schema>>> {
+):
+	| Submission<input<Schema>, output<Schema>>
+	| Promise<Submission<input<Schema>, output<Schema>>> {
 	return baseParse(payload, {
 		resolve(payload, intent) {
 			const errorMap = options.errorMap;