From 10db7f68abdaebbb708197eda804e3353cd47ee8 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 14 Nov 2023 07:46:42 -0500 Subject: [PATCH] Changing AnyFn to Function in places up until the runloop public API --- .../-internals/glimmer/lib/helpers/action.ts | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts index 0c15c5e504c..23baf94c971 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts @@ -351,14 +351,6 @@ function makeArgsProcessor(valuePathRef: Reference | false, actionArgsRef: Refer } } -function isClosureAction(action: unknown): asserts action is string | AnyFn { - assert( - 'action(ref) must be a string or function', - typeof action === 'string' || typeof action === 'function' - ); - return; -} - function makeDynamicClosureAction( context: object, targetRef: Reference, @@ -366,9 +358,12 @@ function makeDynamicClosureAction( processArgs: (args: unknown[]) => unknown[], debugKey: string ) { - let action = valueForRef(actionRef); + const action = valueForRef(actionRef); - isClosureAction(action); + assert( + 'action(ref) must be a string or function', + typeof action === 'string' || typeof action === 'function' + ); // We don't allow undefined/null values, so this creates a throw-away action to trigger the assertions if (DEBUG) { @@ -376,8 +371,6 @@ function makeDynamicClosureAction( } return (...args: any[]) => { - isClosureAction(action); - return makeClosureAction( context, valueForRef(targetRef), @@ -389,18 +382,18 @@ function makeDynamicClosureAction( } interface MaybeActionHandler { - actions?: Record; + actions?: Record; } function makeClosureAction( context: object, target: MaybeActionHandler, - action: string | AnyFn, + action: string | Function, processArgs: (args: unknown[]) => unknown[], debugKey: string ) { let self: object; - let fn: AnyFn; + let fn: Function; assert( `Action passed is null or undefined in (action) from ${target}.`, @@ -429,7 +422,7 @@ function makeClosureAction( return (...args: any[]) => { let payload = { target: self, args, label: '@glimmer/closure-action' }; return flaggedInstrument('interaction.ember-action', payload, () => { - return join(self, fn, ...processArgs(args)); + return join(self, fn as AnyFn, ...processArgs(args)); }); }; }