Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions packages/form-core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -452,17 +452,17 @@ export type UnwrapFieldValidateOrFn<
: undefined
: undefined
: never)
| ([TValidateOrFn] extends [FieldValidateFn<any, any, any>]
? ReturnType<TValidateOrFn>
: [TValidateOrFn] extends [StandardSchemaV1<any, any>]
? // TODO: Check if `disableErrorFlat` is enabled, if so, return StandardSchemaV1Issue[][]
StandardSchemaV1Issue[]
| ([TValidateOrFn] extends [StandardSchemaV1<any, any>]
? // TODO: Check if `disableErrorFlat` is enabled, if so, return StandardSchemaV1Issue[][]
StandardSchemaV1Issue[]
: [TValidateOrFn] extends [FieldValidateFn<any, any, any>]
? ReturnType<TValidateOrFn>
: undefined)
| ([TValidateOrFn] extends [FormGroupValidateFn<any, any, any>]
? ReturnType<TValidateOrFn>
: [TValidateOrFn] extends [StandardSchemaV1<any, any>]
? // TODO: Check if `disableErrorFlat` is enabled, if so, return StandardSchemaV1Issue[][]
StandardSchemaV1Issue[]
| ([TValidateOrFn] extends [StandardSchemaV1<any, any>]
? // TODO: Check if `disableErrorFlat` is enabled, if so, return StandardSchemaV1Issue[][]
StandardSchemaV1Issue[]
: [TValidateOrFn] extends [FormGroupValidateFn<any, any, any>]
? ReturnType<TValidateOrFn>
: undefined)

/**
Expand Down
22 changes: 22 additions & 0 deletions packages/form-core/tests/standardSchemaValidator.test-d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { describe, expectTypeOf, it } from 'vitest'
import { z } from 'zod'
import { type } from 'arktype'
import { FieldApi, FormApi, standardSchemaValidators } from '../src/index'
import type { StandardSchemaV1Issue } from '../src/index'

Expand Down Expand Up @@ -80,6 +81,27 @@ describe('standard schema validator', () => {
>()
})

it('Should infer StandardSchemaV1Issue[] for arktype field validators (issue #2221)', () => {
const schema = type({ firstName: 'string>0' })
const form = new FormApi({
defaultValues: {
firstName: '',
},
})

const field = new FieldApi({
form,
name: 'firstName',
validators: {
onChange: type('string>0'),
},
})

expectTypeOf(field.getMeta().errorMap.onChange).toEqualTypeOf<
undefined | StandardSchemaV1Issue[]
>()
})

it('Should return different Standard Schema Issue types from validateAsync based on scope', () => {
const formSourceError = standardSchemaValidators.validateAsync(
{ value: '', validationSource: 'form' },
Expand Down
Loading