Skip to content

Make errors object typed #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeit-ninja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make errors object typed #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/lib/validated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ type MaybePromise<T> = T | Promise<T>
type InferSchemaOutput<T> = T extends StandardSchemaV1<unknown, infer O> ? O : never
type FormFunction = <T>(fn: (data: FormData) => MaybePromise<T>) => RemoteForm<T>

export type ValidationError = {
export type ValidationError<T extends StandardSchemaV1, O = InferSchemaOutput<T>> = {
success: false
errors: Record<string, string[]>
data: unknown
errors: Partial<Record<keyof O, string[]>>
data: O
}

/**
Expand All @@ -28,10 +28,9 @@ export function createValidated(form: FormFunction) {
return function validated<Schema extends StandardSchemaV1, Result = unknown>(
schema: Schema,
handler: (data: InferSchemaOutput<Schema>) => MaybePromise<Result>
): RemoteForm<Result | ValidationError> {
return form<Result | ValidationError>(async (formData) => {
): RemoteForm<Result | ValidationError<Schema>> {
return form<Result | ValidationError<Schema>>(async (formData) => {
const data = Object.fromEntries(formData.entries())

const result = await schema['~standard'].validate(data)

if (result.issues) {
Expand All @@ -55,7 +54,7 @@ export function createValidated(form: FormFunction) {
success: false,
errors,
data
} as ValidationError
} as ValidationError<Schema>
}

return handler(result.value as InferSchemaOutput<Schema>)
Expand Down