Skip to content

Fix FormPath types #422

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

Merged
merged 2 commits into from
May 5, 2024
Merged

Fix FormPath types #422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
addd03c
Extend DictOrArray type
sillvva May 5, 2024
1076f1e
Remove unnecessary BuiltInObjects type
sillvva May 5, 2024
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
14 changes: 6 additions & 8 deletions src/lib/stringPath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function mergePath(path: (string | number | symbol)[]) {
}, '');
}

type BuiltInObjects = Date | Set<unknown> | File;
type DictOrArray = Record<PropertyKey, unknown> | unknown[];

/**
* Lists all paths in an object as string accessors.
Expand Down Expand Up @@ -82,13 +82,11 @@ type StringPath<
path: '';
type: never;
}
> = T extends BuiltInObjects
? If<Options, 'filter', 'leaves' | 'all', Options['path'], never, T>
: T extends (infer U)[]
> = T extends (infer U)[]
?
| If<Options, 'objAppend', string, Concat<Options['path'], Options['objAppend']>, never, T>
| If<Options, 'filter', 'arrays' | 'all', Options['path'], never, T>
| (NonNullable<U> extends object
| (NonNullable<U> extends DictOrArray
? StringPath<
NonNullable<U>,
{
Expand All @@ -100,7 +98,7 @@ type StringPath<
>
: If<Options, 'filter', 'leaves' | 'all', `${Options['path']}[${number}]`, never, T>)
: {
[K in Extract<AllKeys<T>, string>]: NonNullable<T[K]> extends object
[K in Extract<AllKeys<T>, string>]: NonNullable<T[K]> extends DictOrArray
?
| If<
Options,
Expand All @@ -122,7 +120,7 @@ type StringPath<
never,
T[K]
>
: NonNullable<U> extends object
: NonNullable<U> extends DictOrArray
? IsAny<T[K]> extends true
? Concat<Options['path'], `${K}[${number}]`>
: If<
Expand All @@ -141,7 +139,7 @@ type StringPath<
never,
U
>)
| (NonNullable<U> extends object
| (NonNullable<U> extends DictOrArray
? StringPath<
NonNullable<U>,
{
Expand Down