Add event listeners centrally

Author: thegecko

src/dispatcher.ts

@@ -25,25 +25,43 @@
 
 import { EventEmitter } from "events";
 
+// tslint:disable:ban-types
+
+/**
+ * @hidden
+ */
+export interface EventListeners<T> {
+    newListener: keyof T;
+    removeListener: keyof T;
+}
+
 /**
  * @hidden
  */
 export interface TypedDispatcher<T> {
     addEventListener<K extends keyof T>(type: K, listener: (this: this, event: T[K]) => void): void;
+    addEventListener<E extends keyof EventListeners<T>>(type: E, listener: (this: this, event: EventListeners<T>[E]) => void): void;
     removeEventListener<K extends keyof T>(type: K, callback: (this: this, event: T[K]) => void): void;
+    removeEventListener<E extends keyof EventListeners<T>>(type: E, callback: (this: this, event: EventListeners<T>[E]) => void): void;
     dispatchEvent<K extends keyof T>(event: T[K]): boolean;
     addListener<K extends keyof T>(event: K, listener: (data: T[K]) => void): this;
+    addListener<E extends keyof EventListeners<T>>(event: E, listener: (data: EventListeners<T>[E]) => void): this;
     on<K extends keyof T>(event: K, listener: (data: T[K]) => void): this;
+    on<E extends keyof EventListeners<T>>(event: E, listener: (data: EventListeners<T>[E]) => void): this;
     once<K extends keyof T>(event: K, listener: (data: T[K]) => void): this;
+    once<E extends keyof EventListeners<T>>(event: E, listener: (data: EventListeners<T>[E]) => void): this;
     prependListener<K extends keyof T>(event: K, listener: (data: T[K]) => void): this;
     prependOnceListener<K extends keyof T>(event: K, listener: (data: T[K]) => void): this;
     removeListener<K extends keyof T>(event: K, listener: (data: T[K]) => void): this;
+    removeListener<E extends keyof EventListeners<T>>(event: E, listener: (data: EventListeners<T>[E]) => void): this;
     removeAllListeners<K extends keyof T>(event?: K): this;
-    // tslint:disable-next-line:ban-types
+    removeAllListeners<E extends keyof EventListeners<T>>(event?: E): this;
     listeners<K extends keyof T>(event: K): Array<Function>;
+    listeners<E extends keyof EventListeners<T>>(event: EventListeners<T>[E]): Array<Function>;
     emit<K extends keyof T>(event: K, data: T[K]): boolean;
-    eventNames<K extends keyof T>(): Array<K>;
+    eventNames<K extends keyof T, E extends keyof EventListeners<T>>(): Array<K | E>;
     listenerCount<K extends keyof T>(type: K): number;
+    listenerCount<E extends keyof EventListeners<T>>(type: EventListeners<T>[E]): number;
     setMaxListeners(n: number): this;
     getMaxListeners(): number;
 }

src/interfaces.ts

@@ -36,17 +36,7 @@ export interface W3CUSBConnectionEvent extends USBConnectionEvent {}
 /**
  * @hidden
  */
-// export interface W3CUSB extends USB {}
-export interface W3CUSB {
-    onconnect: ((this: this, ev: USBConnectionEvent) => any) | null;
-    ondisconnect: ((this: this, ev: USBConnectionEvent) => any) | null;
-    getDevices(): Promise<Array<USBDevice>>;
-    requestDevice(options?: USBDeviceRequestOptions): Promise<USBDevice>;
-    addEventListener(type: "connect" | "disconnect", listener: (this: this, ev: USBConnectionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject | null, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener(type: "connect" | "disconnect", callback: (this: this, ev: USBConnectionEvent) => any, useCapture?: boolean): void;
-    removeEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: EventListenerOptions | boolean): void;
-}
+export interface W3CUSB extends USB {}
 
 /**
  * @hidden

src/usb.ts

@@ -43,14 +43,6 @@ export interface USBOptions {
  * @hidden
  */
 export interface USBEvents {
-    /**
-     * @hidden
-     */
-    newListener: keyof USBEvents;
-    /**
-     * @hidden
-     */
-    removeListener: keyof USBEvents;
     /**
      * USBDevice connected event
      */