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.

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

Typed createSelector function-solution-1 #624

Closed
Closed
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
26 changes: 15 additions & 11 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@ function getDependencies(funcs: unknown[]) {
}

export function createSelectorCreator<
/** Selectors will eventually accept some function to be memoized */
F extends (...args: unknown[]) => unknown,
/** A memoizer such as defaultMemoize that accepts a function + some possible options */
MemoizeFunction extends (func: F, ...options: any[]) => F,
MemoizeFunction extends (
func: (...args: unknown[]) => unknown,
...options: any[]
) => (...args: unknown[]) => unknown,
/** The additional options arguments to the memoizer */
MemoizeOptions extends unknown[] = DropFirst<Parameters<MemoizeFunction>>
>(
Expand Down Expand Up @@ -123,7 +124,7 @@ export function createSelectorCreator<
recomputations++
// apply arguments instead of spreading for performance.
return resultFunc!.apply(null, arguments)
} as F,
} as Parameters<MemoizeFunction>[0],
...finalMemoizeOptions
)

Expand Down Expand Up @@ -196,7 +197,7 @@ export function createSelectorCreator<
lastResult = memoizedResultFunc.apply(null, params)

return lastResult
} as F)
} as Parameters<MemoizeFunction>[0])

Object.assign(selector, {
resultFunc,
Expand All @@ -211,7 +212,7 @@ export function createSelectorCreator<
}
// @ts-ignore
return createSelector as CreateSelectorFunction<
F,
any,
MemoizeFunction,
MemoizeOptions
>
Expand All @@ -226,15 +227,18 @@ export interface CreateSelectorOptions<MemoizeOptions extends unknown[]> {
* An instance of createSelector, customized with a given memoize implementation
*/
export interface CreateSelectorFunction<
F extends (...args: unknown[]) => unknown,
MemoizeFunction extends (func: F, ...options: any[]) => F,
State,
MemoizeFunction extends (
func: (...args: unknown[]) => unknown,
...options: any[]
) => (...args: unknown[]) => unknown,
MemoizeOptions extends unknown[] = DropFirst<Parameters<MemoizeFunction>>,
Keys = Expand<
Pick<ReturnType<MemoizeFunction>, keyof ReturnType<MemoizeFunction>>
>
> {
/** Input selectors as separate inline arguments */
<Selectors extends SelectorArray, Result>(
<Selectors extends readonly Selector<State>[], Result>(
...items: [
...Selectors,
(...args: SelectorResultArray<Selectors>) => Result
Expand All @@ -249,7 +253,7 @@ export interface CreateSelectorFunction<
Keys

/** Input selectors as separate inline arguments with memoizeOptions passed */
<Selectors extends SelectorArray, Result>(
<Selectors extends readonly Selector<State>[], Result>(
...items: [
...Selectors,
(...args: SelectorResultArray<Selectors>) => Result,
Expand All @@ -265,7 +269,7 @@ export interface CreateSelectorFunction<
Keys

/** Input selectors as a separate array */
<Selectors extends SelectorArray, Result>(
<Selectors extends readonly Selector<State>[], Result>(
selectors: [...Selectors],
combiner: (...args: SelectorResultArray<Selectors>) => Result,
options?: CreateSelectorOptions<MemoizeOptions>
Expand Down
Loading