From ae2918c2c0537c563e767875239fb15928cbb222 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sun, 10 Apr 2022 18:46:35 -0400
Subject: [PATCH 1/2] Cleanup internal types in selectorFactory.ts

---
 src/connect/selectorFactory.ts | 84 ++++++++++++++++------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/src/connect/selectorFactory.ts b/src/connect/selectorFactory.ts
index 8f3c4b73d..cf39e213b 100644
--- a/src/connect/selectorFactory.ts
+++ b/src/connect/selectorFactory.ts
@@ -3,34 +3,32 @@ import verifySubselectors from './verifySubselectors'
 import type { EqualityFn } from '../types'
 
 export type SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> = (
-  dispatch: Dispatch<Action>,
+  dispatch: Dispatch<Action<unknown>>,
   factoryOptions: TFactoryOptions
 ) => Selector<S, TProps, TOwnProps>
 
-export type Selector<S, TProps, TOwnProps = null> = TOwnProps extends
-  | null
-  | undefined
+export type Selector<S, TProps, TOwnProps> = TOwnProps extends null | undefined
   ? (state: S) => TProps
   : (state: S, ownProps: TOwnProps) => TProps
 
-export type MapStateToProps<TStateProps, TOwnProps, State = unknown> = (
+export type MapStateToProps<TStateProps, TOwnProps, State> = (
   state: State,
   ownProps: TOwnProps
 ) => TStateProps
 
-export type MapStateToPropsFactory<TStateProps, TOwnProps, State = unknown> = (
+export type MapStateToPropsFactory<TStateProps, TOwnProps, State> = (
   initialState: State,
   ownProps: TOwnProps
 ) => MapStateToProps<TStateProps, TOwnProps, State>
 
-export type MapStateToPropsParam<TStateProps, TOwnProps, State = unknown> =
+export type MapStateToPropsParam<TStateProps, TOwnProps, State> =
   | MapStateToPropsFactory<TStateProps, TOwnProps, State>
   | MapStateToProps<TStateProps, TOwnProps, State>
   | null
   | undefined
 
 export type MapDispatchToPropsFunction<TDispatchProps, TOwnProps> = (
-  dispatch: Dispatch<Action>,
+  dispatch: Dispatch<Action<unknown>>,
   ownProps: TOwnProps
 ) => TDispatchProps
 
@@ -39,7 +37,7 @@ export type MapDispatchToProps<TDispatchProps, TOwnProps> =
   | TDispatchProps
 
 export type MapDispatchToPropsFactory<TDispatchProps, TOwnProps> = (
-  dispatch: Dispatch<Action>,
+  dispatch: Dispatch<Action<unknown>>,
   ownProps: TOwnProps
 ) => MapDispatchToPropsFunction<TDispatchProps, TOwnProps>
 
@@ -57,10 +55,10 @@ export type MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> = (
   ownProps: TOwnProps
 ) => TMergedProps
 
-interface PureSelectorFactoryComparisonOptions<TOwnProps, State = unknown> {
+interface PureSelectorFactoryComparisonOptions<TStateProps, TOwnProps, State> {
   areStatesEqual: EqualityFn<State>
   areOwnPropsEqual: EqualityFn<TOwnProps>
-  areStatePropsEqual: EqualityFn<unknown>
+  areStatePropsEqual: EqualityFn<TStateProps>
   displayName: string
 }
 
@@ -69,21 +67,17 @@ export function pureFinalPropsSelectorFactory<
   TOwnProps,
   TDispatchProps,
   TMergedProps,
-  State = unknown
+  State
 >(
-  mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State> & {
-    dependsOnOwnProps: boolean
-  },
-  mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps> & {
-    dependsOnOwnProps: boolean
-  },
+  mapStateToProps: WrappedMapStateToProps<TStateProps, TOwnProps, State>,
+  mapDispatchToProps: WrappedMapDispatchToProps<TDispatchProps, TOwnProps>,
   mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-  dispatch: Dispatch,
+  dispatch: Dispatch<Action<unknown>>,
   {
     areStatesEqual,
     areOwnPropsEqual,
     areStatePropsEqual,
-  }: PureSelectorFactoryComparisonOptions<TOwnProps, State>
+  }: PureSelectorFactoryComparisonOptions<TStateProps, TOwnProps, State>
 ) {
   let hasRunAtLeastOnce = false
   let state: State
@@ -95,21 +89,17 @@ export function pureFinalPropsSelectorFactory<
   function handleFirstCall(firstState: State, firstOwnProps: TOwnProps) {
     state = firstState
     ownProps = firstOwnProps
-    // @ts-ignore
-    stateProps = mapStateToProps!(state, ownProps)
-    // @ts-ignore
-    dispatchProps = mapDispatchToProps!(dispatch, ownProps)
+    stateProps = mapStateToProps(state, ownProps)
+    dispatchProps = mapDispatchToProps(dispatch, ownProps)
     mergedProps = mergeProps(stateProps, dispatchProps, ownProps)
     hasRunAtLeastOnce = true
     return mergedProps
   }
 
   function handleNewPropsAndNewState() {
-    // @ts-ignore
-    stateProps = mapStateToProps!(state, ownProps)
+    stateProps = mapStateToProps(state, ownProps)
 
-    if (mapDispatchToProps!.dependsOnOwnProps)
-      // @ts-ignore
+    if (mapDispatchToProps.dependsOnOwnProps)
       dispatchProps = mapDispatchToProps(dispatch, ownProps)
 
     mergedProps = mergeProps(stateProps, dispatchProps, ownProps)
@@ -117,12 +107,10 @@ export function pureFinalPropsSelectorFactory<
   }
 
   function handleNewProps() {
-    if (mapStateToProps!.dependsOnOwnProps)
-      // @ts-ignore
-      stateProps = mapStateToProps!(state, ownProps)
+    if (mapStateToProps.dependsOnOwnProps)
+      stateProps = mapStateToProps(state, ownProps)
 
     if (mapDispatchToProps.dependsOnOwnProps)
-      // @ts-ignore
       dispatchProps = mapDispatchToProps(dispatch, ownProps)
 
     mergedProps = mergeProps(stateProps, dispatchProps, ownProps)
@@ -132,7 +120,6 @@ export function pureFinalPropsSelectorFactory<
   function handleNewState() {
     const nextStateProps = mapStateToProps(state, ownProps)
     const statePropsChanged = !areStatePropsEqual(nextStateProps, stateProps)
-    // @ts-ignore
     stateProps = nextStateProps
 
     if (statePropsChanged)
@@ -163,24 +150,34 @@ export function pureFinalPropsSelectorFactory<
   }
 }
 
+interface WrappedMapStateToProps<TStateProps, TOwnProps, State> {
+  (state: State, ownProps: TOwnProps): TStateProps
+  readonly dependsOnOwnProps: boolean
+}
+
+interface WrappedMapDispatchToProps<TDispatchProps, TOwnProps> {
+  (dispatch: Dispatch<Action<unknown>>, ownProps: TOwnProps): TDispatchProps
+  readonly dependsOnOwnProps: boolean
+}
+
 export interface SelectorFactoryOptions<
   TStateProps,
   TOwnProps,
   TDispatchProps,
   TMergedProps,
-  State = unknown
-> extends PureSelectorFactoryComparisonOptions<TOwnProps, State> {
+  State
+> extends PureSelectorFactoryComparisonOptions<TStateProps, TOwnProps, State> {
   initMapStateToProps: (
     dispatch: Dispatch,
-    options: PureSelectorFactoryComparisonOptions<TOwnProps, State>
-  ) => MapStateToPropsParam<TStateProps, TOwnProps, State>
+    options: PureSelectorFactoryComparisonOptions<TStateProps, TOwnProps, State>
+  ) => WrappedMapStateToProps<TStateProps, TOwnProps, State>
   initMapDispatchToProps: (
     dispatch: Dispatch,
-    options: PureSelectorFactoryComparisonOptions<TOwnProps, State>
-  ) => MapDispatchToPropsParam<TDispatchProps, TOwnProps>
+    options: PureSelectorFactoryComparisonOptions<TStateProps, TOwnProps, State>
+  ) => WrappedMapDispatchToProps<TDispatchProps, TOwnProps>
   initMergeProps: (
     dispatch: Dispatch,
-    options: PureSelectorFactoryComparisonOptions<TOwnProps, State>
+    options: PureSelectorFactoryComparisonOptions<TStateProps, TOwnProps, State>
   ) => MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>
 }
 
@@ -195,9 +192,9 @@ export default function finalPropsSelectorFactory<
   TOwnProps,
   TDispatchProps,
   TMergedProps,
-  State = unknown
+  State
 >(
-  dispatch: Dispatch<Action>,
+  dispatch: Dispatch<Action<unknown>>,
   {
     initMapStateToProps,
     initMapDispatchToProps,
@@ -225,6 +222,5 @@ export default function finalPropsSelectorFactory<
     TDispatchProps,
     TMergedProps,
     State
-    // @ts-ignore
-  >(mapStateToProps!, mapDispatchToProps, mergeProps, dispatch, options)
+  >(mapStateToProps, mapDispatchToProps, mergeProps, dispatch, options)
 }

From a652da92d7752241d68e014182e423b6e5fdecc3 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sun, 10 Apr 2022 18:56:10 -0400
Subject: [PATCH 2/2] Restore optional generic for Selector type

---
 src/connect/selectorFactory.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/connect/selectorFactory.ts b/src/connect/selectorFactory.ts
index cf39e213b..fd5dea5f9 100644
--- a/src/connect/selectorFactory.ts
+++ b/src/connect/selectorFactory.ts
@@ -7,7 +7,9 @@ export type SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> = (
   factoryOptions: TFactoryOptions
 ) => Selector<S, TProps, TOwnProps>
 
-export type Selector<S, TProps, TOwnProps> = TOwnProps extends null | undefined
+export type Selector<S, TProps, TOwnProps = null> = TOwnProps extends
+  | null
+  | undefined
   ? (state: S) => TProps
   : (state: S, ownProps: TOwnProps) => TProps