Replace all {} types with AnyNonNullishValue

Author: aryaemami59

packages/toolkit/src/combineSlices.ts

@@ -2,6 +2,7 @@ import type { Reducer, StateFromReducersMapObject, UnknownAction } from 'redux'
 import { combineReducers } from 'redux'
 import { nanoid } from './nanoid'
 import type {
+  AnyNonNullishValue,
   Id,
   NonUndefined,
   Tail,
@@ -79,7 +80,7 @@ export interface CombinedSliceReducer<
    * const withCustom = rootReducer.inject({ reducerPath: "customName", reducer: customSlice.reducer })
    * ```
    */
-  withLazyLoadedSlices<Lazy = {}>(): CombinedSliceReducer<
+  withLazyLoadedSlices<Lazy = AnyNonNullishValue>(): CombinedSliceReducer<
     InitialState,
     Id<DeclaredState & Partial<Lazy>>
   >
@@ -121,7 +122,7 @@ export interface CombinedSliceReducer<
     config?: InjectConfig,
   ): CombinedSliceReducer<
     InitialState,
-    Id<DeclaredState & WithSlice<SliceLike<ReducerPath, State>>>
+    Id<DeclaredState & WithSlice<SliceLike<ReducerPath, string>>>
   >
 
   /**

packages/toolkit/src/configureStore.ts

@@ -16,21 +16,21 @@ import {
 } from 'redux'
 import type { DevToolsEnhancerOptions as DevToolsOptions } from './devtoolsExtension'
 import { composeWithDevTools } from './devtoolsExtension'
-
+import type { GetDefaultEnhancers } from './getDefaultEnhancers'
+import { buildGetDefaultEnhancers } from './getDefaultEnhancers'
 import type {
   GetDefaultMiddleware,
   ThunkMiddlewareFor,
 } from './getDefaultMiddleware'
 import { buildGetDefaultMiddleware } from './getDefaultMiddleware'
 import type {
+  AnyNonNullishValue,
   ExtractDispatchExtensions,
   ExtractStateExtensions,
   ExtractStoreExtensions,
   UnknownIfNonSpecific,
 } from './tsHelpers'
 import type { Tuple } from './utils'
-import type { GetDefaultEnhancers } from './getDefaultEnhancers'
-import { buildGetDefaultEnhancers } from './getDefaultEnhancers'
 
 /**
  * Options for `configureStore()`.
@@ -88,7 +88,7 @@ export interface ConfigureStoreOptions<
   enhancers?: (getDefaultEnhancers: GetDefaultEnhancers<M>) => E
 }
 
-export type Middlewares<S> = ReadonlyArray<Middleware<{}, S>>
+export type Middlewares<S> = ReadonlyArray<Middleware<AnyNonNullishValue, S>>
 
 type Enhancers = ReadonlyArray<StoreEnhancer>
 

packages/toolkit/src/createAction.ts

@@ -1,6 +1,6 @@
 import { isAction } from 'redux'
 import type {
-  AnyFunction,
+  AnyNonNullishValue,
   IfMaybeUndefined,
   IfVoid,
   IsAny,
@@ -28,12 +28,12 @@ export type PayloadAction<
   payload: P
   type: T
 } & ([M] extends [never]
-  ? {}
+  ? AnyNonNullishValue
   : {
       meta: M
     }) &
   ([E] extends [never]
-    ? {}
+    ? AnyNonNullishValue
     : {
         error: E
       })

packages/toolkit/src/createAsyncThunk.ts

@@ -1,17 +1,24 @@
 import type { Dispatch, UnknownAction } from 'redux'
 import type { ThunkDispatch } from 'redux-thunk'
-import type { ActionCreatorWithPreparedPayload } from './createAction'
+import type {
+  ActionCreatorWithPreparedPayload,
+  PayloadAction,
+} from './createAction'
 import { createAction } from './createAction'
 import { isAnyOf } from './matchers'
 import { nanoid } from './nanoid'
 import type {
+  AnyNonNullishValue,
   FallbackIfUnknown,
   Id,
   IsAny,
   IsUnknown,
   SafePromise,
 } from './tsHelpers'
 
+// @ts-ignore we need the import of these types due to a bundling issue.
+type _Keep = PayloadAction | ActionCreatorWithPreparedPayload<any, unknown>
+
 export type BaseThunkAPI<
   S,
   E,
@@ -213,7 +220,7 @@ export type AsyncThunkPayloadCreatorReturnValue<
 export type AsyncThunkPayloadCreator<
   Returned,
   ThunkArg = void,
-  ThunkApiConfig extends AsyncThunkConfig = {},
+  ThunkApiConfig extends AsyncThunkConfig = AnyNonNullishValue,
 > = (
   arg: ThunkArg,
   thunkAPI: GetThunkAPI<ThunkApiConfig>,
@@ -286,7 +293,7 @@ type AsyncThunkActionCreator<
  */
 export type AsyncThunkOptions<
   ThunkArg = void,
-  ThunkApiConfig extends AsyncThunkConfig = {},
+  ThunkApiConfig extends AsyncThunkConfig = AnyNonNullishValue,
 > = {
   /**
    * A method to control whether the asyncThunk should be executed. Has access to the
@@ -348,7 +355,7 @@ export type AsyncThunkOptions<
 
 export type AsyncThunkPendingActionCreator<
   ThunkArg,
-  ThunkApiConfig = {},
+  ThunkApiConfig = AnyNonNullishValue,
 > = ActionCreatorWithPreparedPayload<
   [string, ThunkArg, GetPendingMeta<ThunkApiConfig>?],
   undefined,
@@ -363,7 +370,7 @@ export type AsyncThunkPendingActionCreator<
 
 export type AsyncThunkRejectedActionCreator<
   ThunkArg,
-  ThunkApiConfig = {},
+  ThunkApiConfig = AnyNonNullishValue,
 > = ActionCreatorWithPreparedPayload<
   [
     Error | null,
@@ -392,7 +399,7 @@ export type AsyncThunkRejectedActionCreator<
 export type AsyncThunkFulfilledActionCreator<
   Returned,
   ThunkArg,
-  ThunkApiConfig = {},
+  ThunkApiConfig = AnyNonNullishValue,
 > = ActionCreatorWithPreparedPayload<
   [Returned, string, ThunkArg, GetFulfilledMeta<ThunkApiConfig>?],
   Returned,

packages/toolkit/src/createSlice.ts

@@ -304,7 +304,7 @@ type AsyncThunkSliceReducerConfig<
   State,
   ThunkArg,
   Returned = unknown,
-  ThunkApiConfig extends AsyncThunkConfig = {},
+  ThunkApiConfig extends AsyncThunkConfig = AnyNonNullishValue,
 > = {
   pending?: CaseReducer<
     State,
@@ -331,7 +331,7 @@ type AsyncThunkSliceReducerDefinition<
   State,
   ThunkArg,
   Returned = unknown,
-  ThunkApiConfig extends AsyncThunkConfig = {},
+  ThunkApiConfig extends AsyncThunkConfig = AnyNonNullishValue,
 > = AsyncThunkSliceReducerConfig<State, ThunkArg, Returned, ThunkApiConfig> &
   ReducerDefinition<ReducerType.asyncThunk> & {
     payloadCreator: AsyncThunkPayloadCreator<Returned, ThunkArg, ThunkApiConfig>
@@ -372,7 +372,8 @@ interface AsyncThunkCreator<
   <
     Returned,
     ThunkArg,
-    ThunkApiConfig extends PreventCircular<AsyncThunkConfig> = {},
+    ThunkApiConfig extends
+      PreventCircular<AsyncThunkConfig> = AnyNonNullishValue,
   >(
     payloadCreator: AsyncThunkPayloadCreator<
       Returned,
@@ -569,7 +570,7 @@ export type ValidateSliceCaseReducers<
     ? {
         prepare(...a: never[]): Omit<A, 'type'>
       }
-    : {}
+    : AnyNonNullishValue
 }
 
 function getType(slice: string, actionKey: string): string {

packages/toolkit/src/devtoolsExtension.ts

@@ -1,6 +1,6 @@
 import type { Action, ActionCreator, StoreEnhancer } from 'redux'
 import { compose } from 'redux'
-import type { AnyFunction, AnyNonNullishValue } from './tsHelpers'
+import type { AnyNonNullishValue } from './tsHelpers'
 
 /**
  * @public
@@ -209,7 +209,7 @@ type Compose = typeof compose
 
 interface ComposeWithDevTools {
   (options: DevToolsEnhancerOptions): Compose
-  <StoreExt extends {}>(
+  <StoreExt extends AnyNonNullishValue>(
     ...funcs: StoreEnhancer<StoreExt>[]
   ): StoreEnhancer<StoreExt>
 }

packages/toolkit/src/dynamicMiddleware/index.ts

@@ -3,6 +3,7 @@ import { compose } from 'redux'
 import { createAction } from '../createAction'
 import { isAllOf } from '../matchers'
 import { nanoid } from '../nanoid'
+import type { AnyNonNullishValue } from '../tsHelpers'
 import { emplace, find } from '../utils'
 import type {
   AddMiddleware,
@@ -11,11 +12,6 @@ import type {
   MiddlewareEntry,
   WithMiddleware,
 } from './types'
-export type {
-  DynamicMiddlewareInstance,
-  GetDispatchType as GetDispatch,
-  MiddlewareApiConfig,
-} from './types'
 
 const createMiddlewareEntry = <
   State = any,
@@ -71,7 +67,9 @@ export const createDynamicMiddleware = <
     { withTypes: () => addMiddleware },
   ) as AddMiddleware<State, DispatchType>
 
-  const getFinalMiddleware: Middleware<{}, State, DispatchType> = (api) => {
+  const getFinalMiddleware: Middleware<AnyNonNullishValue, State, Dispatch> = (
+    api,
+  ) => {
     const appliedMiddleware = Array.from(middlewareMap.values()).map((entry) =>
       emplace(entry.applied, api, { insert: () => entry.middleware(api) }),
     )

packages/toolkit/src/dynamicMiddleware/tests/index.test-d.ts

@@ -1,6 +1,7 @@
 import type { Action, Middleware, UnknownAction } from 'redux'
 import type { ThunkDispatch } from 'redux-thunk'
 import { configureStore } from '../../configureStore'
+import type { AnyNonNullishValue } from '../../tsHelpers'
 import { createDynamicMiddleware } from '../index'
 
 const untypedInstance = createDynamicMiddleware()
@@ -19,8 +20,16 @@ const store = configureStore({
     gDM().prepend(typedInstance.middleware).concat(staticMiddleware),
 })
 
-declare const compatibleMiddleware: Middleware<{}, number, AppDispatch>
-declare const incompatibleMiddleware: Middleware<{}, string, AppDispatch>
+declare const compatibleMiddleware: Middleware<
+  AnyNonNullishValue,
+  number,
+  AppDispatch
+>
+declare const incompatibleMiddleware: Middleware<
+  AnyNonNullishValue,
+  string,
+  AppDispatch
+>
 
 declare const addedMiddleware: Middleware<(n: 2) => 2>
 

packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts

@@ -2,6 +2,7 @@ import type { Context } from 'react'
 import type { ReactReduxContextValue } from 'react-redux'
 import type { Action, Middleware, UnknownAction } from 'redux'
 import type { ThunkDispatch } from 'redux-thunk'
+import type { AnyNonNullishValue } from '../../tsHelpers'
 import { createDynamicMiddleware } from '../react'
 
 interface AppDispatch extends ThunkDispatch<number, undefined, UnknownAction> {
@@ -12,8 +13,16 @@ const untypedInstance = createDynamicMiddleware()
 
 const typedInstance = createDynamicMiddleware<number, AppDispatch>()
 
-declare const compatibleMiddleware: Middleware<{}, number, AppDispatch>
-declare const incompatibleMiddleware: Middleware<{}, string, AppDispatch>
+declare const compatibleMiddleware: Middleware<
+  AnyNonNullishValue,
+  number,
+  AppDispatch
+>
+declare const incompatibleMiddleware: Middleware<
+  AnyNonNullishValue,
+  string,
+  AppDispatch
+>
 
 declare const customContext: Context<ReactReduxContextValue | null>
 

packages/toolkit/src/getDefaultMiddleware.ts

@@ -10,7 +10,7 @@ import { createImmutableStateInvariantMiddleware } from './immutableStateInvaria
 
 import type { SerializableStateInvariantMiddlewareOptions } from './serializableStateInvariantMiddleware'
 import { createSerializableStateInvariantMiddleware } from './serializableStateInvariantMiddleware'
-import type { ExcludeFromTuple } from './tsHelpers'
+import type { AnyNonNullishValue, ExcludeFromTuple } from './tsHelpers'
 import { Tuple } from './utils'
 
 function isBoolean(x: any): x is boolean {
@@ -30,7 +30,7 @@ interface GetDefaultMiddlewareOptions {
 
 export type ThunkMiddlewareFor<
   S,
-  O extends GetDefaultMiddlewareOptions = {},
+  O extends GetDefaultMiddlewareOptions = AnyNonNullishValue,
 > = O extends {
   thunk: false
 }