Skip to content
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

Jump to bottom

fix Date, FileList, File and Blob FieldErrors mapping #8772

Merged
merged 3 commits into from
Jul 30, 2022
Merged

fix Date, FileList, File and Blob FieldErrors mapping #8772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e03106f
fix Date, FileList, File and Blob FieldErrors mapping
vemoo Jul 30, 2022
77fe51b
work around tsd limitation
vemoo Jul 30, 2022
36e46f4
run api-extractor
vemoo Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion reports/api-extractor.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export type DeepPartialSkipArrayKey<T> = T extends Date | FileList_2 | File_2 |
};

// @public (undocumented)
export type DeepRequired<T> = {
export type DeepRequired<T> = T extends Date | FileList | File | Blob ? T : {
[K in keyof T]-?: NonNullable<DeepRequired<T[K]>>;
};

Expand Down
20 changes: 20 additions & 0 deletions src/__typetest__/errors.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,24 @@ import { _ } from './__fixtures__';
>;
}>(actual);
}

/** it should not treat Date, File, FileList or Blob as record fields */
{
const actual = _ as FieldErrors<{
date: Date;
file: File;
fileList: FileList;
record: {
date: Date;
file: File;
fileList: FileList;
};
}>;
expectType<FieldError | undefined>(actual.date);
expectType<FieldError | undefined>(actual.file);
expectType<FieldError | undefined>(actual.fileList);
expectType<FieldError | undefined>(actual.record?.date);
expectType<FieldError | undefined>(actual.record?.file);
expectType<FieldError | undefined>(actual.record?.fileList);
}
}
8 changes: 5 additions & 3 deletions src/types/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ export type ErrorOption = {
types?: MultipleFieldErrors;
};

export type DeepRequired<T> = {
[K in keyof T]-?: NonNullable<DeepRequired<T[K]>>;
};
export type DeepRequired<T> = T extends Date | FileList | File | Blob
? T
: {
[K in keyof T]-?: NonNullable<DeepRequired<T[K]>>;
};

export type FieldErrorsImpl<T extends FieldValues = FieldValues> = {
[K in keyof T]?: T[K] extends Date | FileList | File | Blob
Expand Down