chore: adopt isolatedDeclarations and upgrade to TypeScript 7.0.2

Author: veksa

package.json

@@ -119,7 +119,7 @@
     "rolldown": "^1.2.3",
     "tsdown": "^0.23.0-beta.2",
     "tsx": "^4.23.10",
-    "typescript": "^6.0.3",
+    "typescript": "^7.0.2",
     "unrun": "^0.3.1",
     "vitest": "^4.1.10"
   },

src/components/Context.ts

@@ -45,6 +45,9 @@ function getContext(): Context<ReactReduxContextValue | null> {
   return realContext
 }
 
-export const ReactReduxContext = /*#__PURE__*/ getContext()
+export const ReactReduxContext: Context<ReactReduxContextValue<
+  any,
+  UnknownAction
+> | null> = /*#__PURE__*/ getContext()
 
 export type ReactReduxContextInstance = typeof ReactReduxContext

src/components/Provider.tsx

@@ -56,7 +56,7 @@ export interface ProviderProps<
 
 export function Provider<A extends Action<string> = UnknownAction, S = unknown>(
   providerProps: ProviderProps<A, S>,
-) {
+): React.JSX.Element {
   if (process.env.NODE_ENV !== 'production') {
     // React Server Components do not provide the effect hooks that `<Provider>`
     // relies on, so `useIsomorphicLayoutEffect` (which resolves to

src/connect/invalidArgFactory.ts

@@ -1,6 +1,12 @@
 import type { Action, Dispatch } from 'redux'
 
-export function createInvalidArgFactory(arg: unknown, name: string) {
+export function createInvalidArgFactory(
+  arg: unknown,
+  name: string,
+): (
+  dispatch: Dispatch<Action<string>>,
+  options: { readonly wrappedComponentName: string },
+) => never {
   return (
     dispatch: Dispatch<Action<string>>,
     options: { readonly wrappedComponentName: string },

src/connect/mapDispatchToProps.ts

@@ -2,13 +2,17 @@ import type { Action, Dispatch } from 'redux'
 import { bindActionCreators } from '../utils/bindActionCreators'
 import { createInvalidArgFactory } from './invalidArgFactory'
 import type { MapDispatchToPropsParam } from './selectorFactory'
+import type { InitProxyOptions, WrappedMapToProps } from './wrapMapToProps'
 import { wrapMapToPropsConstant, wrapMapToPropsFunc } from './wrapMapToProps'
 
 export function mapDispatchToPropsFactory<TDispatchProps, TOwnProps>(
   mapDispatchToProps:
     | MapDispatchToPropsParam<TDispatchProps, TOwnProps>
     | undefined,
-) {
+): (
+  dispatch: Dispatch<Action<string>>,
+  options: InitProxyOptions,
+) => WrappedMapToProps {
   return mapDispatchToProps && typeof mapDispatchToProps === 'object'
     ? wrapMapToPropsConstant((dispatch: Dispatch<Action<string>>) =>
         // @ts-ignore

src/connect/mapStateToProps.ts

@@ -1,10 +1,15 @@
+import type { Action, Dispatch } from 'redux'
 import { createInvalidArgFactory } from './invalidArgFactory'
 import type { MapStateToPropsParam } from './selectorFactory'
+import type { InitProxyOptions, WrappedMapToProps } from './wrapMapToProps'
 import { wrapMapToPropsConstant, wrapMapToPropsFunc } from './wrapMapToProps'
 
 export function mapStateToPropsFactory<TStateProps, TOwnProps, State>(
   mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
-) {
+): (
+  dispatch: Dispatch<Action<string>>,
+  options: InitProxyOptions,
+) => WrappedMapToProps {
   return !mapStateToProps
     ? wrapMapToPropsConstant(() => ({}))
     : typeof mapStateToProps === 'function'

src/connect/mergeProps.ts

@@ -69,7 +69,14 @@ export function mergePropsFactory<
   TMergedProps,
 >(
   mergeProps?: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-) {
+): (
+  dispatch: Dispatch<Action<string>>,
+  options: {
+    readonly displayName: string
+    readonly wrappedComponentName: string
+    readonly areMergedPropsEqual: EqualityFn<TMergedProps>
+  },
+) => MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
   return !mergeProps
     ? () => defaultMergeProps
     : typeof mergeProps === 'function'

src/connect/selectorFactory.ts

@@ -227,7 +227,7 @@ export function finalPropsSelectorFactory<
     TMergedProps,
     State
   >,
-) {
+): (nextState: State, nextOwnProps: TOwnProps) => TMergedProps {
   const mapStateToProps = initMapStateToProps(dispatch, options)
   const mapDispatchToProps = initMapDispatchToProps(dispatch, options)
   const mergeProps = initMergeProps(dispatch, options)

src/connect/wrapMapToProps.ts

@@ -13,6 +13,26 @@ export type MapToProps<P extends AnyProps = AnyProps> = {
   dependsOnOwnProps?: boolean
 }
 
+/**
+ * What the `init*` factories below hand back to `selectorFactory`: the same
+ * call signature as {@linkcode MapToProps}, but with `dependsOnOwnProps`
+ * always present — `selectorFactory` reads it unconditionally.
+ */
+export type WrappedMapToProps<P extends AnyProps = AnyProps> = {
+  (stateOrDispatch: StateOrDispatch, ownProps?: P): FixTypeLater
+  dependsOnOwnProps: boolean
+}
+
+/**
+ * The fields of `selectorFactory`'s `InitOptions` that the `init*` factories
+ * actually read. Kept structural (rather than importing `InitOptions`) so the
+ * two modules don't have to agree on its type parameters.
+ */
+export type InitProxyOptions = {
+  readonly displayName: string
+  readonly wrappedComponentName: string
+}
+
 export function wrapMapToPropsConstant(
   // * Note:
   //  It seems that the dispatch argument
@@ -26,7 +46,7 @@ export function wrapMapToPropsConstant(
       }
     | ActionCreatorsMapObject
     | ActionCreator<any>,
-) {
+): (dispatch: Dispatch) => WrappedMapToProps {
   return function initConstantSelector(dispatch: Dispatch) {
     const constant = getConstant(dispatch)
 
@@ -67,7 +87,10 @@ function getDependsOnOwnProps(mapToProps: MapToProps) {
 export function wrapMapToPropsFunc<P extends AnyProps = AnyProps>(
   mapToProps: MapToProps,
   methodName: string,
-) {
+): (
+  dispatch: Dispatch,
+  factoryOptions: { displayName: string },
+) => WrappedMapToProps<P> {
   return function initProxySelector(
     dispatch: Dispatch,
     { displayName }: { displayName: string },

src/hooks/useDispatch.ts

@@ -100,4 +100,5 @@ export function createDispatchHook<
  *   )
  * }
  */
-export const useDispatch = /*#__PURE__*/ createDispatchHook()
+export const useDispatch: UseDispatch<Dispatch<UnknownAction>> =
+  /*#__PURE__*/ createDispatchHook()