Merge pull request #7197 from chrootsu/node-events

node: signatures of module "events" have been changed

node/node-tests.ts

@@ -32,6 +32,54 @@ assert.doesNotThrow(() => {
     if (false) { throw "a hammer at your face"; }
 }, undefined, "What the...*crunch*");
 
+////////////////////////////////////////////////////
+/// Events tests : http://nodejs.org/api/events.html
+////////////////////////////////////////////////////
+
+module events_tests {
+    let emitter: events.EventEmitter;
+    let event: string;
+    let listener: Function;
+    let any: any;
+
+    {
+        let result: events.EventEmitter;
+
+        result = emitter.addListener(event, listener);
+        result = emitter.on(event, listener);
+        result = emitter.once(event, listener);
+        result = emitter.removeListener(event, listener);
+        result = emitter.removeAllListeners();
+        result = emitter.removeAllListeners(event);
+        result = emitter.setMaxListeners(42);
+    }
+
+    {
+        let result: number;
+
+        result = events.EventEmitter.defaultMaxListeners;
+        result = events.EventEmitter.listenerCount(emitter, event); // deprecated
+
+        result = emitter.getMaxListeners();
+        result = emitter.listenerCount(event);
+    }
+
+    {
+        let result: Function[];
+
+        result = emitter.listeners(event);
+    }
+
+    {
+        let result: boolean;
+
+        result = emitter.emit(event);
+        result = emitter.emit(event, any);
+        result = emitter.emit(event, any, any);
+        result = emitter.emit(event, any, any, any);
+    }
+}
+
 ////////////////////////////////////////////////////
 /// File system tests : http://nodejs.org/api/fs.html
 ////////////////////////////////////////////////////

node/node.d.ts

@@ -173,9 +173,11 @@ declare module NodeJS {
         once(event: string, listener: Function): EventEmitter;
         removeListener(event: string, listener: Function): EventEmitter;
         removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): EventEmitter;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
     }
 
     export interface ReadableStream extends EventEmitter {
@@ -423,17 +425,21 @@ declare module "querystring" {
 
 declare module "events" {
     export class EventEmitter implements NodeJS.EventEmitter {
-        static listenerCount(emitter: EventEmitter, event: string): number;
+        static EventEmitter: EventEmitter;
+        static listenerCount(emitter: EventEmitter, event: string): number; // deprecated
+        static defaultMaxListeners: number;
 
         addListener(event: string, listener: Function): EventEmitter;
         on(event: string, listener: Function): EventEmitter;
         once(event: string, listener: Function): EventEmitter;
         removeListener(event: string, listener: Function): EventEmitter;
         removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): EventEmitter;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
-   }
+        listenerCount(type: string): number;
+    }
 }
 
 declare module "http" {