Skip to content
Merged
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
62 changes: 34 additions & 28 deletions packages/form-core/src/FormApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -662,16 +662,18 @@ export type DerivedFormState<
* The error array for the form itself.
*/
errors: Array<
| UnwrapFormValidateOrFn<TOnMount>
| UnwrapFormValidateOrFn<TOnChange>
| UnwrapFormAsyncValidateOrFn<TOnChangeAsync>
| UnwrapFormValidateOrFn<TOnBlur>
| UnwrapFormAsyncValidateOrFn<TOnBlurAsync>
| UnwrapFormValidateOrFn<TOnSubmit>
| UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>
| UnwrapFormValidateOrFn<TOnDynamic>
| UnwrapFormAsyncValidateOrFn<TOnDynamicAsync>
| UnwrapFormAsyncValidateOrFn<TOnServer>
NonNullable<
| UnwrapFormValidateOrFn<TOnMount>
| UnwrapFormValidateOrFn<TOnChange>
| UnwrapFormAsyncValidateOrFn<TOnChangeAsync>
| UnwrapFormValidateOrFn<TOnBlur>
| UnwrapFormAsyncValidateOrFn<TOnBlurAsync>
| UnwrapFormValidateOrFn<TOnSubmit>
| UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>
| UnwrapFormValidateOrFn<TOnDynamic>
| UnwrapFormAsyncValidateOrFn<TOnDynamicAsync>
| UnwrapFormAsyncValidateOrFn<TOnServer>
>
>
/**
* A boolean indicating if any of the form fields are currently validating.
Expand Down Expand Up @@ -1253,14 +1255,16 @@ export class FormApi<
) {
errors = Object.values(currBaseStore.errorMap).reduce<
Array<
| UnwrapFormValidateOrFn<TOnMount>
| UnwrapFormValidateOrFn<TOnChange>
| UnwrapFormAsyncValidateOrFn<TOnChangeAsync>
| UnwrapFormValidateOrFn<TOnBlur>
| UnwrapFormAsyncValidateOrFn<TOnBlurAsync>
| UnwrapFormValidateOrFn<TOnSubmit>
| UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>
| UnwrapFormAsyncValidateOrFn<TOnServer>
NonNullable<
| UnwrapFormValidateOrFn<TOnMount>
| UnwrapFormValidateOrFn<TOnChange>
| UnwrapFormAsyncValidateOrFn<TOnChangeAsync>
| UnwrapFormValidateOrFn<TOnBlur>
| UnwrapFormAsyncValidateOrFn<TOnBlurAsync>
| UnwrapFormValidateOrFn<TOnSubmit>
| UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>
| UnwrapFormAsyncValidateOrFn<TOnServer>
>
>
>((prev, curr) => {
if (curr === undefined) return prev
Expand Down Expand Up @@ -2662,16 +2666,18 @@ export class FormApi<
getAllErrors = (): {
form: {
errors: Array<
| UnwrapFormValidateOrFn<TOnMount>
| UnwrapFormValidateOrFn<TOnChange>
| UnwrapFormAsyncValidateOrFn<TOnChangeAsync>
| UnwrapFormValidateOrFn<TOnBlur>
| UnwrapFormAsyncValidateOrFn<TOnBlurAsync>
| UnwrapFormValidateOrFn<TOnSubmit>
| UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>
| UnwrapFormValidateOrFn<TOnDynamic>
| UnwrapFormAsyncValidateOrFn<TOnDynamicAsync>
| UnwrapFormAsyncValidateOrFn<TOnServer>
NonNullable<
| UnwrapFormValidateOrFn<TOnMount>
| UnwrapFormValidateOrFn<TOnChange>
| UnwrapFormAsyncValidateOrFn<TOnChangeAsync>
| UnwrapFormValidateOrFn<TOnBlur>
| UnwrapFormAsyncValidateOrFn<TOnBlurAsync>
| UnwrapFormValidateOrFn<TOnSubmit>
| UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>
| UnwrapFormValidateOrFn<TOnDynamic>
| UnwrapFormAsyncValidateOrFn<TOnDynamicAsync>
| UnwrapFormAsyncValidateOrFn<TOnServer>
>
>
errorMap: ValidationErrorMap<
UnwrapFormValidateOrFn<TOnMount>,
Expand Down
2 changes: 1 addition & 1 deletion packages/form-core/tests/FieldApi.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ it('should have the correct types returned from form validators in array', () =>
},
} as const)

expectTypeOf(form.state.errors).toEqualTypeOf<Array<'123' | undefined>>()
expectTypeOf(form.state.errors).toEqualTypeOf<Array<'123'>>()
})

it('should handle "fields" return types added to the field\'s errorMap itself', () => {
Expand Down
10 changes: 1 addition & 9 deletions packages/form-core/tests/FormApi.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ it('should return all errors matching the right type from getAllErrors', () => {
| 'onSubmitAsync'
| { onBlur: true; onBlurNumber: number }
| 'onBlurAsync'
| undefined
)[]
>()

Expand Down Expand Up @@ -365,14 +364,7 @@ it('should extract the form error type from a global form error', () => {
>()

expectTypeOf(form.state.errors).toEqualTypeOf<
(
| 'onMount'
| 'onChange'
| 'onChangeAsync'
| 'onBlur'
| 'onBlurAsync'
| undefined
)[]
('onMount' | 'onChange' | 'onChangeAsync' | 'onBlur' | 'onBlurAsync')[]
>
})

Expand Down
10 changes: 3 additions & 7 deletions packages/form-core/tests/formOptions.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,7 @@ describe('formOptions', () => {

const form = new FormApi(formOpts)

expectTypeOf(form.state.errors).toEqualTypeOf<
('I just need an error' | undefined)[]
>()
expectTypeOf(form.state.errors).toEqualTypeOf<'I just need an error'[]>()

const form2 = new FormApi({
...formOpts,
Expand All @@ -302,9 +300,7 @@ describe('formOptions', () => {
},
})

expectTypeOf(form2.state.errors).toEqualTypeOf<
(undefined | 'Too short!')[]
>()
expectTypeOf(form2.state.errors).toEqualTypeOf<'Too short!'[]>()

const form3 = new FormApi({
...formOpts,
Expand All @@ -320,7 +316,7 @@ describe('formOptions', () => {
})

expectTypeOf(form3.state.errors).toEqualTypeOf<
(undefined | 'Too short!' | 'I just need an error')[]
('Too short!' | 'I just need an error')[]
>()
})
})
Loading