Merge pull request #7012 from matt-tingen/actions-type

Improve actions type

addons/actions/src/models/ActionsFunction.ts

@@ -0,0 +1,81 @@
+import { ActionOptions } from './ActionOptions';
+import { ActionsMap } from './ActionsMap';
+
+export interface ActionsFunction {
+  <T extends string>(handlerMap: Record<T, string>, options?: ActionOptions): ActionsMap<T>;
+  <T extends string>(...handlers: T[]): ActionsMap<T>;
+
+  <T extends string>(handler1: T, options?: ActionOptions): ActionsMap<T>;
+  <T extends string>(handler1: T, handler2: T, options?: ActionOptions): ActionsMap<T>;
+  <T extends string>(handler1: T, handler2: T, handler3: T, options?: ActionOptions): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    handler5: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    handler5: T,
+    handler6: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    handler5: T,
+    handler6: T,
+    handler7: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    handler5: T,
+    handler6: T,
+    handler7: T,
+    handler8: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    handler5: T,
+    handler6: T,
+    handler7: T,
+    handler8: T,
+    handler9: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+  <T extends string>(
+    handler1: T,
+    handler2: T,
+    handler3: T,
+    handler4: T,
+    handler5: T,
+    handler6: T,
+    handler7: T,
+    handler8: T,
+    handler9: T,
+    handler10: T,
+    options?: ActionOptions
+  ): ActionsMap<T>;
+}

addons/actions/src/models/ActionsMap.ts

@@ -1,5 +1,3 @@
 import { HandlerFunction } from './HandlerFunction';
 
-export interface ActionsMap {
-  [key: string]: HandlerFunction;
-}
+export type ActionsMap<T extends string = string> = Record<T, HandlerFunction>;

addons/actions/src/models/index.ts

@@ -1,4 +1,5 @@
 export * from './ActionDisplay';
+export * from './ActionsFunction';
 export * from './ActionOptions';
 export * from './ActionsMap';
 export * from './DecoratorFunction';

addons/actions/src/preview/actions.ts

@@ -1,8 +1,8 @@
 import { action } from './action';
-import { ActionOptions, ActionsMap } from '../models';
+import { ActionsFunction, ActionOptions, ActionsMap } from '../models';
 import { config } from './configureActions';
 
-export function actions(...args: any[]): ActionsMap {
+export const actions: ActionsFunction = (...args: any[]) => {
   let options: ActionOptions = config;
   const names = args;
   // last argument can be options
@@ -26,4 +26,4 @@ export function actions(...args: any[]): ActionsMap {
     actionsObject[name] = action(namesObject[name], options);
   });
   return actionsObject;
-}
+};