Merge pull request #7197 from chrootsu/node-events

node: signatures of module "events" have been changed

eventemitter3/eventemitter3-tests.ts

@@ -35,7 +35,10 @@ class EventEmitterTest {
     constructor() {
         this.v = new EventEmitter();
         this.v = new EventEmitter3ImportedAsES6Module();
-        var n: NodeJS.EventEmitter = this.v;
+
+        // Some methods are missing or incompatible with current implementation (v4.2.x) of NodeJS.EventEmitter
+        // (e.g. getMaxListenters or listeners)
+        // var n: NodeJS.EventEmitter = this.v;
     }
 
     listeners() {

github-electron/github-electron.d.ts

@@ -70,9 +70,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): Screen;
 		removeListener(event: string, listener: Function): Screen;
 		removeAllListeners(event?: string): Screen;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): Screen;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		/**
 		 * @returns The current absolute position of the mouse pointer.
 		 */
@@ -108,9 +110,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): WebContents;
 		removeListener(event: string, listener: Function): WebContents;
 		removeAllListeners(event?: string): WebContents;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): WebContents;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		constructor(options?: BrowserWindowOptions);
 		/**
 		 * @returns All opened browser windows.
@@ -522,9 +526,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): WebContents;
 		removeListener(event: string, listener: Function): WebContents;
 		removeAllListeners(event?: string): WebContents;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): WebContents;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		/**
 		 * Loads the url in the window.
 		 * @param url Must contain the protocol prefix (e.g., the http:// or file://).
@@ -930,9 +936,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): App;
 		removeListener(event: string, listener: Function): App;
 		removeAllListeners(event?: string): App;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): App;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		/**
 		 * Try to close all windows. The before-quit event will first be emitted.
 		 * If all windows are successfully closed, the will-quit event will be emitted
@@ -1122,9 +1130,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): AutoUpdater;
 		removeListener(event: string, listener: Function): AutoUpdater;
 		removeAllListeners(event?: string): AutoUpdater;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): AutoUpdater;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		/**
 		 * Set the url and initialize the auto updater.
 		 * The url cannot be changed once it is set.
@@ -1232,9 +1242,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): Tray;
 		removeListener(event: string, listener: Function): Tray;
 		removeAllListeners(event?: string): Tray;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): Tray;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		/**
 		 * Creates a new tray icon associated with the image.
 		 */
@@ -1426,9 +1438,11 @@ declare module GitHubElectron {
 		once(event: string, listener: Function): IpcRenderer;
 		removeListener(event: string, listener: Function): IpcRenderer;
 		removeAllListeners(event?: string): IpcRenderer;
-		setMaxListeners(n: number): void;
+		setMaxListeners(n: number): IpcRenderer;
+		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
 		/**
 		 * Send ...args to the renderer via channel in asynchronous message, the main
 		 * process can handle it by listening to the channel event of ipc module.

imap/imap.d.ts

@@ -246,9 +246,11 @@ declare module IMAP {
         once(event: string, listener: Function): this;
         removeListener(event: string, listener: Function): this;
         removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
 
         // from MessageFunctions
         /** Searches the currently open mailbox for messages using given criteria. criteria is a list describing what you want to find. For criteria types that require arguments, use an array instead of just the string criteria type name (e.g. ['FROM', 'foo@bar.com']). Prefix criteria types with an "!" to negate. */

jake/jake.d.ts

@@ -231,9 +231,11 @@ declare module jake{
         once(event: string, listener: Function): NodeJS.EventEmitter;
         removeListener(event: string, listener: Function): NodeJS.EventEmitter;
         removeAllListeners(event?: string): NodeJS.EventEmitter;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): NodeJS.EventEmitter;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
         value: any;
 	}
 

mailparser/mailparser.d.ts

@@ -78,9 +78,11 @@ declare module 'mailparser' {
         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;
     }
 }
 

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" {

pty.js/pty.js.d.ts

@@ -85,9 +85,11 @@ declare module 'pty.js' {
         removeListener(event: string, listener: Function): NodeJS.EventEmitter;
         removeAllListeners(event?: string): NodeJS.EventEmitter;
         // NOTE: this method is not actually defined in pty.js
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): NodeJS.EventEmitter;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
     }
 
     /** 

steam/steam.d.ts

@@ -52,9 +52,11 @@ declare module Steam {
         once(event: string, listener: Function): NodeJS.EventEmitter;
         removeListener(event: string, listener: Function): NodeJS.EventEmitter;
         removeAllListeners(event?: string): NodeJS.EventEmitter;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): NodeJS.EventEmitter;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
     }
 }
 

stylus/stylus.d.ts

@@ -698,9 +698,11 @@ declare module Stylus {
         once(event: string, listener: Function): Renderer;
         removeListener(event: string, listener: Function): Renderer;
         removeAllListeners(event?: string): Renderer;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): Renderer;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
         //#endregion
     }
 

yeoman-generator/yeoman-generator.d.ts

@@ -51,9 +51,11 @@ declare module yo {
         once(event: string, listener: Function): NodeJS.EventEmitter;
         removeListener(event: string, listener: Function): NodeJS.EventEmitter;
         removeAllListeners(event?: string): NodeJS.EventEmitter;
-        setMaxListeners(n: number): void;
+        setMaxListeners(n: number): NodeJS.EventEmitter;
+        getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
 
         async(): any;
         prompt(opt: IPromptOptions | IPromptOptions[], callback: (answers: any) => void): void;