[ts] Fix TypeScript issues (#224)

primus · May 11, 2020 · 3786098 · 3786098
1 parent 6ffdbbc
commit 3786098
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -39,7 +39,7 @@ declare class EventEmitter<
    */
   on<T extends EventEmitter.EventNames<EventTypes>>(
     event: T,
-    fn: EventEmitter.EventListener<EventTypes, T> | ((...args: any[]) => void),
+    fn: EventEmitter.EventListener<EventTypes, T>,
     context?: Context
   ): this;
   addListener<T extends EventEmitter.EventNames<EventTypes>>(
@@ -53,7 +53,7 @@ declare class EventEmitter<
    */
   once<T extends EventEmitter.EventNames<EventTypes>>(
     event: T,
-    fn: EventEmitter.EventListener<EventTypes, T> | ((...args: any[]) => void),
+    fn: EventEmitter.EventListener<EventTypes, T>,
     context?: Context
   ): this;
 
@@ -62,13 +62,13 @@ declare class EventEmitter<
    */
   removeListener<T extends EventEmitter.EventNames<EventTypes>>(
     event: T,
-    fn?: EventEmitter.EventListener<EventTypes, T> | ((...args: any[]) => void),
+    fn?: EventEmitter.EventListener<EventTypes, T>,
     context?: Context,
     once?: boolean
   ): this;
   off<T extends EventEmitter.EventNames<EventTypes>>(
     event: T,
-    fn?: EventEmitter.EventListener<EventTypes, T> | ((...args: any[]) => void),
+    fn?: EventEmitter.EventListener<EventTypes, T>,
     context?: Context,
     once?: boolean
   ): this;
@@ -101,16 +101,20 @@ declare namespace EventEmitter {
     ? T
     : keyof T;
 
+  export type ArgumentMap<T> = {
+    [K in keyof T]: T[K] extends (...args: any[]) => void
+      ? Parameters<T[K]>
+      : T[K] extends any[]
+      ? T[K]
+      : any[];
+  };
+
   export type EventListener<
     T extends ValidEventTypes,
     K extends EventNames<T>
   > = T extends string | symbol
     ? (...args: any[]) => void
-    : T[K] extends (...args: any[]) => void
-    ? T[K]
-    : T[K] extends any[]
-    ? (...args: T[K]) => void
-    : (...args: any[]) => void;
+    : (...args: ArgumentMap<T>[K]) => void;
 
   export type EventArgs<
     T extends ValidEventTypes,