From a1c7f1c20f21cf595bc954d9183000a9f5a4d428 Mon Sep 17 00:00:00 2001 From: Wonsuk Choi Date: Fri, 28 Feb 2025 17:53:30 +0900 Subject: [PATCH] refactor(middleware): rename argument names like 'a', 'f' (#3032) * refactor(middleware): rename argument name 'a' to 'arg' or 'args' * refactor(middleware): rename argument name 'f' to 'fn' * refactor(middleware/devtools.ts): rename argument name 'arg0' to 'args' --- src/middleware/combine.ts | 2 +- src/middleware/devtools.ts | 22 +++++++++++----------- src/middleware/immer.ts | 12 ++++++------ src/middleware/redux.ts | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/middleware/combine.ts b/src/middleware/combine.ts index 919fa619da..e306a818da 100644 --- a/src/middleware/combine.ts +++ b/src/middleware/combine.ts @@ -11,5 +11,5 @@ export function combine< initialState: T, create: StateCreator, ): StateCreator, Mps, Mcs> { - return (...a) => Object.assign({}, initialState, (create as any)(...a)) + return (...args) => Object.assign({}, initialState, (create as any)(...args)) } diff --git a/src/middleware/devtools.ts b/src/middleware/devtools.ts index c5cd1195c8..d7c80bdf61 100644 --- a/src/middleware/devtools.ts +++ b/src/middleware/devtools.ts @@ -30,9 +30,9 @@ type Write = Omit & U type TakeTwo = T extends { length: 0 } ? [undefined, undefined] : T extends { length: 1 } - ? [...a0: Cast, a1: undefined] + ? [...args0: Cast, arg1: undefined] : T extends { length: 0 | 1 } - ? [...a0: Cast, a1: undefined] + ? [...args0: Cast, arg1: undefined] : T extends { length: 2 } ? T : T extends { length: 1 | 2 } @@ -58,13 +58,13 @@ type Action = type StoreDevtools = S extends { setState: { // capture both overloads of setState - (...a: infer Sa1): infer Sr1 - (...a: infer Sa2): infer Sr2 + (...args: infer Sa1): infer Sr1 + (...args: infer Sa2): infer Sr2 } } ? { - setState(...a: [...a: TakeTwo, action?: Action]): Sr1 - setState(...a: [...a: TakeTwo, action?: Action]): Sr2 + setState(...args: [...args: TakeTwo, action?: Action]): Sr1 + setState(...args: [...args: TakeTwo, action?: Action]): Sr2 } : never @@ -231,10 +231,10 @@ const devtoolsImpl: DevtoolsImpl = ) { let didWarnAboutReservedActionType = false const originalDispatch = (api as any).dispatch - ;(api as any).dispatch = (...a: any[]) => { + ;(api as any).dispatch = (...args: any[]) => { if ( import.meta.env?.MODE !== 'production' && - a[0].type === '__setState' && + args[0].type === '__setState' && !didWarnAboutReservedActionType ) { console.warn( @@ -243,7 +243,7 @@ const devtoolsImpl: DevtoolsImpl = ) didWarnAboutReservedActionType = true } - ;(originalDispatch as any)(...a) + ;(originalDispatch as any)(...args) } } @@ -372,7 +372,7 @@ const devtoolsImpl: DevtoolsImpl = } export const devtools = devtoolsImpl as unknown as Devtools -const parseJsonThen = (stringified: string, f: (parsed: T) => void) => { +const parseJsonThen = (stringified: string, fn: (parsed: T) => void) => { let parsed: T | undefined try { parsed = JSON.parse(stringified) @@ -382,5 +382,5 @@ const parseJsonThen = (stringified: string, f: (parsed: T) => void) => { e, ) } - if (parsed !== undefined) f(parsed as T) + if (parsed !== undefined) fn(parsed as T) } diff --git a/src/middleware/immer.ts b/src/middleware/immer.ts index 9b79fa1660..cc0e00f61a 100644 --- a/src/middleware/immer.ts +++ b/src/middleware/immer.ts @@ -40,8 +40,8 @@ type StoreImmer = S extends { setState: infer SetState } ? SetState extends { - (...a: infer A1): infer Sr1 - (...a: infer A2): infer Sr2 + (...args: infer A1): infer Sr1 + (...args: infer A2): infer Sr2 } ? { // Ideally, we would want to infer the `nextStateOrUpdater` `T` type from the @@ -53,14 +53,14 @@ type StoreImmer = S extends { | Partial> | ((state: Draft>) => void), shouldReplace?: false, - ...a: SkipTwo + ...args: SkipTwo ): Sr1 setState( nextStateOrUpdater: | SetStateType | ((state: Draft>) => void), shouldReplace: true, - ...a: SkipTwo + ...args: SkipTwo ): Sr2 } : never @@ -73,12 +73,12 @@ type ImmerImpl = ( const immerImpl: ImmerImpl = (initializer) => (set, get, store) => { type T = ReturnType - store.setState = (updater, replace, ...a) => { + store.setState = (updater, replace, ...args) => { const nextState = ( typeof updater === 'function' ? produce(updater as any) : updater ) as ((s: T) => T) | T | Partial - return set(nextState, replace as any, ...a) + return set(nextState, replace as any, ...args) } return initializer(store.setState, get, store) diff --git a/src/middleware/redux.ts b/src/middleware/redux.ts index 008661fa64..33dbee11cb 100644 --- a/src/middleware/redux.ts +++ b/src/middleware/redux.ts @@ -45,6 +45,6 @@ const reduxImpl: ReduxImpl = (reducer, initial) => (set, _get, api) => { } ;(api as any).dispatchFromDevtools = true - return { dispatch: (...a) => (api as any).dispatch(...a), ...initial } + return { dispatch: (...args) => (api as any).dispatch(...args), ...initial } } export const redux = reduxImpl as unknown as Redux