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

build intersection type instead of union type in GetStateFromSelectors #529

Merged
merged 2 commits into from
Oct 26, 2021
Merged

build intersection type instead of union type in GetStateFromSelectors #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb31d7
build intersection type instead of union type in `GetStateFromSelectors`
phryneas Oct 26, 2021
9240c41
Merge branch 'master' into intersection-GetStateFromSelectors
markerikson Oct 26, 2021
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
15 changes: 7 additions & 8 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,14 @@ type GetStateFromSelector<S> = S extends Selector<infer State> ? State : never
export type GetStateFromSelectors<S extends SelectorArray> =
// handle two elements at once so this type works for up to 30 selectors
S extends [infer C1, infer C2, ...infer Other]
? Other extends SelectorArray
?
| GetStateFromSelector<C1>
| GetStateFromSelector<C2>
| GetStateFromSelectors<Other>
: GetStateFromSelector<C1> | GetStateFromSelector<C2>
? Other extends [any]
? GetStateFromSelector<C1> &
GetStateFromSelector<C2> &
GetStateFromSelectors<Other>
: GetStateFromSelector<C1> & GetStateFromSelector<C2>
: S extends [infer Current, ...infer Other]
? Other extends SelectorArray
? GetStateFromSelector<Current> | GetStateFromSelectors<Other>
? Other extends [any]
? GetStateFromSelector<Current> & GetStateFromSelectors<Other>
: GetStateFromSelector<Current>
: S extends (infer Elem)[]
? GetStateFromSelector<Elem>
Expand Down
39 changes: 39 additions & 0 deletions typescript_test/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,8 +1060,47 @@ type SelectorArray29 = [
(_state: StateA) => 29
]

// Ensure that input functions with mismatched states raise errors
type Results = SelectorResultArray<SelectorArray29>
type State = GetStateFromSelectors<SelectorArray29>

{
const selector = createSelector(
(state: string) => 1,
(state: number) => 2,
(...args) => 0
)
// @ts-expect-error
selector('foo')
// @ts-expect-error
selector(5)
}
{
const selector = createSelector(
(state: { foo: string }) => 1,
(state: { bar: string }) => 2,
(...args) => 0
)
selector({ foo: '', bar: '' })
// @ts-expect-error
selector({ foo: '' })
// @ts-expect-error
selector({ bar: '' })
}

{
const selector = createSelector(
(state: { foo: string }) => 1,
(state: { foo: string }) => 2,
(...args) => 0
)
// @ts-expect-error
selector({ foo: '', bar: '' })
selector({ foo: '' })
// @ts-expect-error
selector({ bar: '' })
}

// Issue #526
function testInputSelectorWithUndefinedReturn() {
type Input = { field: number | undefined }
Expand Down