From 34cc2ed80a7fe9f75c36d0f89c336234991fe320 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Fri, 16 Sep 2016 02:15:14 +0800 Subject: [PATCH 01/12] Create pug-test.ts --- pug/pug-test.ts | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 pug/pug-test.ts diff --git a/pug/pug-test.ts b/pug/pug-test.ts new file mode 100644 index 0000000000..5ba7d9ad06 --- /dev/null +++ b/pug/pug-test.ts @@ -0,0 +1,103 @@ +/// +import * as pug from 'pug'; + + +//////////////////////////////////////////////////////////// +/// Options https://pugjs.org/api/reference.html#options /// +//////////////////////////////////////////////////////////// +namespace options_tests { + let opts: pug.Options; + let str = 'string' + let bool = false; + let strArray = ['string']; + + opts.filename = str; + + opts.basedir = str; + + opts.doctype = str; + + opts.pretty = str; + opts.pretty = bool; + + opts.filters = {}; + + opts.self = bool; + + opts.debug = bool; + opts.compileDebug = bool; + + opts.globals = strArray; + + opts.cache = bool; + + opts.inlineRuntimeFunctions = bool; + + opts.name = str; +} + +//////////////////////////////////////////////////////////// +/// Methods https://pugjs.org/api/reference.html#methods /// +//////////////////////////////////////////////////////////// +namespace methods_tests { + let source = `p #{ name } 's Pug source code!`; + let path = "foo.pug"; + let compileTemplate: pug.compileTemplate; + let template: string; + let clientFunctionString: pug.ClientFunctionString; + let str: string; + + { + /// pug.compile(source, ?options) https://pugjs.org/api/reference.html#pugcompilesource-options + compileTemplate = pug.compile(source); + template = compileTemplate(); + } + + { + /// pug.compileFile(path, ?options) https://pugjs.org/api/reference.html#pugcompilefilepath-options + compileTemplate = pug.compileFile(path); + template = compileTemplate(); + } + + { + /// pug.compileClient(source, ?options) https://pugjs.org/api/reference.html#pugcompileclientsource-options + clientFunctionString = pug.compileClient(path); + str = pug.compileClient(path); + } + + { + /// pug.compileClientWithDependenciesTracked(source, ?options) https://pugjs.org/api/reference.html#pugcompileclientwithdependenciestrackedsource-options + let obj = pug.compileClientWithDependenciesTracked(source); + clientFunctionString = obj.body; + str = obj.body; + let strArray: string[] = obj.dependencies; + } + + { + /// pug.compileFileClient(path, ?options) https://pugjs.org/api/reference.html#pugcompilefileclientpath-options + clientFunctionString = pug.compileFileClient(path); + str = pug.compileFileClient(path); + } + + { + /// pug.render(source, ?options, ?callback) https://pugjs.org/api/reference.html#pugrendersource-options-callback + str = pug.render(source); + + // test type for callback paraments + pug.render(source, {}, (err, html) => { + let e: Error = err; + str = html; + }); + } + + { + /// pug.renderFile(path, ?options, ?callback) https://pugjs.org/api/reference.html#pugrenderfilepath-options-callback + str = pug.renderFile(path); + + // test type for callback paraments + pug.renderFile(path, {}, (err, html) => { + let e: Error = err; + str = html; + }); + } +} From bb69a3320f934d39d1ce65a024b9b3464283fe02 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Sat, 17 Sep 2016 13:28:12 +0800 Subject: [PATCH 02/12] Delete pug-test.ts --- pug/pug-test.ts | 103 ------------------------------------------------ 1 file changed, 103 deletions(-) delete mode 100644 pug/pug-test.ts diff --git a/pug/pug-test.ts b/pug/pug-test.ts deleted file mode 100644 index 5ba7d9ad06..0000000000 --- a/pug/pug-test.ts +++ /dev/null @@ -1,103 +0,0 @@ -/// -import * as pug from 'pug'; - - -//////////////////////////////////////////////////////////// -/// Options https://pugjs.org/api/reference.html#options /// -//////////////////////////////////////////////////////////// -namespace options_tests { - let opts: pug.Options; - let str = 'string' - let bool = false; - let strArray = ['string']; - - opts.filename = str; - - opts.basedir = str; - - opts.doctype = str; - - opts.pretty = str; - opts.pretty = bool; - - opts.filters = {}; - - opts.self = bool; - - opts.debug = bool; - opts.compileDebug = bool; - - opts.globals = strArray; - - opts.cache = bool; - - opts.inlineRuntimeFunctions = bool; - - opts.name = str; -} - -//////////////////////////////////////////////////////////// -/// Methods https://pugjs.org/api/reference.html#methods /// -//////////////////////////////////////////////////////////// -namespace methods_tests { - let source = `p #{ name } 's Pug source code!`; - let path = "foo.pug"; - let compileTemplate: pug.compileTemplate; - let template: string; - let clientFunctionString: pug.ClientFunctionString; - let str: string; - - { - /// pug.compile(source, ?options) https://pugjs.org/api/reference.html#pugcompilesource-options - compileTemplate = pug.compile(source); - template = compileTemplate(); - } - - { - /// pug.compileFile(path, ?options) https://pugjs.org/api/reference.html#pugcompilefilepath-options - compileTemplate = pug.compileFile(path); - template = compileTemplate(); - } - - { - /// pug.compileClient(source, ?options) https://pugjs.org/api/reference.html#pugcompileclientsource-options - clientFunctionString = pug.compileClient(path); - str = pug.compileClient(path); - } - - { - /// pug.compileClientWithDependenciesTracked(source, ?options) https://pugjs.org/api/reference.html#pugcompileclientwithdependenciestrackedsource-options - let obj = pug.compileClientWithDependenciesTracked(source); - clientFunctionString = obj.body; - str = obj.body; - let strArray: string[] = obj.dependencies; - } - - { - /// pug.compileFileClient(path, ?options) https://pugjs.org/api/reference.html#pugcompilefileclientpath-options - clientFunctionString = pug.compileFileClient(path); - str = pug.compileFileClient(path); - } - - { - /// pug.render(source, ?options, ?callback) https://pugjs.org/api/reference.html#pugrendersource-options-callback - str = pug.render(source); - - // test type for callback paraments - pug.render(source, {}, (err, html) => { - let e: Error = err; - str = html; - }); - } - - { - /// pug.renderFile(path, ?options, ?callback) https://pugjs.org/api/reference.html#pugrenderfilepath-options-callback - str = pug.renderFile(path); - - // test type for callback paraments - pug.renderFile(path, {}, (err, html) => { - let e: Error = err; - str = html; - }); - } -} From 3dfb3e13537205444c8dc5d58349ce0853584119 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Wed, 21 Sep 2016 17:04:44 +0800 Subject: [PATCH 03/12] Fix net events --- node/node.d.ts | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/node/node.d.ts b/node/node.d.ts index 7f228e1765..f578aef6a1 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1666,6 +1666,78 @@ declare module "net" { end(str: string, cb?: Function): void; end(str: string, encoding?: string, cb?: Function): void; end(data?: any, encoding?: string): void; + + /** + * events.EventEmitter + * 1. close + * 2. connect + * 3. data + * 4. drain + * 5. end + * 6. error + * 7. lookup + * 8. timeout + */ + + addListener(event: string, listener: Function): this; + addListener(event: "close", listener: (had_error: Boolean) => void): this; + addListener(event: "connect", listener: () => void): this; + addListener(event: "data", listener: (data: Buffer) => void): this; + addListener(event: "drain", listener: () => void): this; + addListener(event: "end", listener: () => void): this; + addListener(event: "error", listener: (err: Error) => void): this; + addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; + addListener(event: "timeout", listener: () => void): this; + + emit(event: string): this; + emit(event: "close", had_error: Boolean): this; + emit(event: "connect"): this; + emit(event: "data", data: Buffer): this; + emit(event: "drain"): this; + emit(event: "end"): this; + emit(event: "error", err: Error): this; + emit(event: "lookup", err: Error, address: string, family: string | number, host: string): this; + emit(event: "timeout") => void): this; + + on(event: string, listener: Function): this; + on(event: "close", listener: (had_error: Boolean) => void): this; + on(event: "connect", listener: () => void): this; + on(event: "data", listener: (data: Buffer) => void): this; + on(event: "drain", listener: () => void): this; + on(event: "end", listener: () => void): this; + on(event: "error", listener: (err: Error) => void): this; + on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; + on(event: "timeout", listener: () => void): this; + + once(event: string, listener: Function): this; + once(event: "close", listener: (had_error: Boolean) => void): this; + once(event: "connect", listener: () => void): this; + once(event: "data", listener: (data: Buffer) => void): this; + once(event: "drain", listener: () => void): this; + once(event: "end", listener: () => void): this; + once(event: "error", listener: (err: Error) => void): this; + once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; + once(event: "timeout", listener: () => void): this; + + prependListener(event: string, listener: Function): this; + prependListener(event: "close", listener: (had_error: Boolean) => void): this; + prependListener(event: "connect", listener: () => void): this; + prependListener(event: "data", listener: (data: Buffer) => void): this; + prependListener(event: "drain", listener: () => void): this; + prependListener(event: "end", listener: () => void): this; + prependListener(event: "error", listener: (err: Error) => void): this; + prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; + prependListener(event: "timeout", listener: () => void): this; + + prependOnceListener(event: string, listener: Function): this; + prependOnceListener(event: "close", listener: (had_error: Boolean) => void): this; + prependOnceListener(event: "connect", listener: () => void): this; + prependOnceListener(event: "data", listener: (data: Buffer) => void): this; + prependOnceListener(event: "drain", listener: () => void): this; + prependOnceListener(event: "end", listener: () => void): this; + prependOnceListener(event: "error", listener: (err: Error) => void): this; + prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; + prependOnceListener(event: "timeout", listener: () => void): this; } export var Socket: { @@ -1697,6 +1769,49 @@ declare module "net" { unref(): Server; maxConnections: number; connections: number; + + /** + * events.EventEmitter + * 1. close + * 2. connection + * 3. error + * 4. listening + */ + addListener(event: string, listener: Function): this; + addListener(event: "close", listener: () => void): this; + addListener(event: "connection", listener: (socket: Socket) => void): this; + addListener(event: "error", listener: (err: Error) => void): this; + addListener(event: "listening", listener: () => void): this; + + emit(event: string): this; + emit(event: "close"): this; + emit(event: "connection", socket: Socket): this; + emit(event: "error", err: Error): this; + emit(event: "listening"): this; + + on(event: string, listener: Function): this; + on(event: "close", listener: () => void): this; + on(event: "connection", listener: (socket: Socket) => void): this; + on(event: "error", listener: (err: Error) => void): this; + on(event: "listening", listener: () => void): this; + + once(event: string, listener: Function): this; + once(event: "close", listener: () => void): this; + once(event: "connection", listener: (socket: Socket) => void): this; + once(event: "error", listener: (err: Error) => void): this; + once(event: "listening", listener: () => void): this; + + prependListener(event: string, listener: Function): this; + prependListener(event: "close", listener: () => void): this; + prependListener(event: "connection", listener: (socket: Socket) => void): this; + prependListener(event: "error", listener: (err: Error) => void): this; + prependListener(event: "listening", listener: () => void): this; + + prependOnceListener(event: string, listener: Function): this; + prependOnceListener(event: "close", listener: () => void): this; + prependOnceListener(event: "connection", listener: (socket: Socket) => void): this; + prependOnceListener(event: "error", listener: (err: Error) => void): this; + prependOnceListener(event: "listening", listener: () => void): this; } export function createServer(connectionListener?: (socket: Socket) => void): Server; export function createServer(options?: { allowHalfOpen?: boolean; }, connectionListener?: (socket: Socket) => void): Server; From 47929560ea690a21162a602ef2005a46d92f62c1 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Wed, 21 Sep 2016 17:20:12 +0800 Subject: [PATCH 04/12] Fix syntax --- node/node.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/node.d.ts b/node/node.d.ts index f578aef6a1..df546c5816 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1697,7 +1697,7 @@ declare module "net" { emit(event: "end"): this; emit(event: "error", err: Error): this; emit(event: "lookup", err: Error, address: string, family: string | number, host: string): this; - emit(event: "timeout") => void): this; + emit(event: "timeout"): this; on(event: string, listener: Function): this; on(event: "close", listener: (had_error: Boolean) => void): this; From b7c965e8171f4e15003a36ee2565be1988e13459 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Wed, 21 Sep 2016 17:30:04 +0800 Subject: [PATCH 05/12] Add test for net.Socket events --- node/node-tests.ts | 162 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/node/node-tests.ts b/node/node-tests.ts index da3721c3aa..d82e5b2356 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -1151,6 +1151,168 @@ namespace net_tests { // Make sure .listen() and .close() retuern a Server instance net.createServer().listen(0).close().address(); } + + { + /** + * net.Socket - events.EventEmitter + * 1. close + * 2. connect + * 3. data + * 4. drain + * 5. end + * 6. error + * 7. lookup + * 8. timeout + */ + let socket = net.Socket; + + let bool: Boolean; + let buffer: Buffer; + let error: Error; + let str: string; + let num: number; + + /// addListener + socket = socket.addListener("close", had_error => { + bool = had_error; + }) + socket = socket.addListener("connect", () => { }) + socket = socket.addListener("data", data => { + buffer = data; + }) + socket = socket.addListener("drain", () => { }) + socket = socket.addListener("end", () => { }) + socket = socket.addListener("error", err => { + error = err; + }) + socket = socket.addListener("lookup", (err, address: string, family: string | number, host: string) => { + error = err; + + if (typeof family === 'string') { + str = family; + } else if (typeof family === 'number') { + num = family; + } + + str = host; + }) + socket = socket.addListener("timeout", () => { }) + + /// emit + socket = socket.emit("close", bool); + socket = socket.emit("connect"); + socket = socket.emit("data", buffer); + socket = socket.emit("drain"); + socket = socket.emit("end"); + socket = socket.emit("error", error); + socket = socket.emit("lookup", error, str, str, str); + socket = socket.emit("lookup", error, str, num, str); + socket = socket.emit("timeout"); + + /// on + socket = socket.on("close", had_error => { + bool = had_error; + }) + socket = socket.on("connect", () => { }) + socket = socket.on("data", data => { + buffer = data; + }) + socket = socket.on("drain", () => { }) + socket = socket.on("end", () => { }) + socket = socket.on("error", err => { + error = err; + }) + socket = socket.on("lookup", (err, address: string, family: string | number, host: string) => { + error = err; + + if (typeof family === 'string') { + str = family; + } else if (typeof family === 'number') { + num = family; + } + + str = host; + }) + socket = socket.on("timeout", () => { }) + + /// once + socket = socket.once("close", had_error => { + bool = had_error; + }) + socket = socket.once("connect", () => { }) + socket = socket.once("data", data => { + buffer = data; + }) + socket = socket.once("drain", () => { }) + socket = socket.once("end", () => { }) + socket = socket.once("error", err => { + error = err; + }) + socket = socket.once("lookup", (err, address: string, family: string | number, host: string) => { + error = err; + + if (typeof family === 'string') { + str = family; + } else if (typeof family === 'number') { + num = family; + } + + str = host; + }) + socket = socket.once("timeout", () => { }) + + /// prependListener + socket = socket.prependListener("close", had_error => { + bool = had_error; + }) + socket = socket.prependListener("connect", () => { }) + socket = socket.prependListener("data", data => { + buffer = data; + }) + socket = socket.prependListener("drain", () => { }) + socket = socket.prependListener("end", () => { }) + socket = socket.prependListener("error", err => { + error = err; + }) + socket = socket.prependListener("lookup", (err, address: string, family: string | number, host: string) => { + error = err; + + if (typeof family === 'string') { + str = family; + } else if (typeof family === 'number') { + num = family; + } + + str = host; + }) + socket = socket.prependListener("timeout", () => { }) + + /// prependOnceListener + socket = socket.prependOnceListener("close", had_error => { + bool = had_error; + }) + socket = socket.prependOnceListener("connect", () => { }) + socket = socket.prependOnceListener("data", data => { + buffer = data; + }) + socket = socket.prependOnceListener("drain", () => { }) + socket = socket.prependOnceListener("end", () => { }) + socket = socket.prependOnceListener("error", err => { + error = err; + }) + socket = socket.prependOnceListener("lookup", (err, address: string, family: string | number, host: string) => { + error = err; + + if (typeof family === 'string') { + str = family; + } else if (typeof family === 'number') { + num = family; + } + + str = host; + }) + socket = socket.prependOnceListener("timeout", () => { }) + } } /***************************************************************************** From 9b72a0efa7243e95e2036f67cba15d0aac6f89e1 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Wed, 21 Sep 2016 17:41:16 +0800 Subject: [PATCH 06/12] Add test for net.Server events --- node/node-tests.ts | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/node/node-tests.ts b/node/node-tests.ts index d82e5b2356..7fa971b63f 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -1313,6 +1313,66 @@ namespace net_tests { }) socket = socket.prependOnceListener("timeout", () => { }) } + + { + /** + * net.Server - events.EventEmitter + * 1. close + * 2. connection + * 3. error + * 4. listening + */ + let _server = net.Server; + + let _socket = net.Socket; + let _err: Error; + + /// addListener + _server = _server.addListener("close", () => { }) + _server = _server.addListener("connection", socket => { + _socket = socket + }) + _server = _server.addListener("error", err => { + _err = Error; + }) + _server = _server.addListener("listening", () => { }) + + /// emit + _server = _server.emit("close") + _server = _server.emit("connection", _socket) + _server = _server.emit("error", _err) + _server = _server.emit("listening") + + /// once + _server = _server.once("close", () => { }) + _server = _server.once("connection", socket => { + _socket = socket + }) + _server = _server.once("error", err => { + _err = Error; + }) + _server = _server.once("listening", () => { }) + + /// prependListener + _server = _server.prependListener("close", () => { }) + _server = _server.prependListener("connection", socket => { + _socket = socket + }) + _server = _server.prependListener("error", err => { + _err = Error; + }) + _server = _server.prependListener("listening", () => { }) + + /// prependOnceListener + _server = _server.prependOnceListener("close", () => { }) + _server = _server.prependOnceListener("connection", socket => { + _socket = socket + }) + _server = _server.prependOnceListener("error", err => { + _err = Error; + }) + _server = _server.prependOnceListener("listening", () => { }) + } } /***************************************************************************** From 3f858dadfb3351652ff4f9e3c940577475c28750 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 22 Sep 2016 00:37:10 +0800 Subject: [PATCH 07/12] Correct test for net.Socket and net.Server events --- node/node-tests.ts | 166 +++++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 81 deletions(-) diff --git a/node/node-tests.ts b/node/node-tests.ts index 7fa971b63f..4db30a35d4 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -70,7 +70,7 @@ namespace assert_tests { namespace events_tests { let emitter: events.EventEmitter; - let event: string|symbol; + let event: string | symbol; let listener: Function; let any: any; @@ -114,7 +114,7 @@ namespace events_tests { } { - let result: (string|symbol)[]; + let result: (string | symbol)[]; result = emitter.eventNames(); } @@ -969,7 +969,7 @@ namespace child_process_tests { /// cluster tests: https://nodejs.org/api/cluster.html /// ////////////////////////////////////////////////////////////////////// -namespace cluster_tests  { +namespace cluster_tests { { cluster.fork(); Object.keys(cluster.workers).forEach(key => { @@ -1151,9 +1151,9 @@ namespace net_tests { // Make sure .listen() and .close() retuern a Server instance net.createServer().listen(0).close().address(); } - + { - /** + /** * net.Socket - events.EventEmitter * 1. close * 2. connect @@ -1164,91 +1164,92 @@ namespace net_tests { * 7. lookup * 8. timeout */ - let socket = net.Socket; + let _socket: net.Socket; let bool: Boolean; let buffer: Buffer; let error: Error; let str: string; let num: number; - - /// addListener - socket = socket.addListener("close", had_error => { + + /// addListener + + _socket = _socket.addListener("close", had_error => { bool = had_error; }) - socket = socket.addListener("connect", () => { }) - socket = socket.addListener("data", data => { + _socket = _socket.addListener("connect", () => { }) + _socket = _socket.addListener("data", data => { buffer = data; }) - socket = socket.addListener("drain", () => { }) - socket = socket.addListener("end", () => { }) - socket = socket.addListener("error", err => { + _socket = _socket.addListener("drain", () => { }) + _socket = _socket.addListener("end", () => { }) + _socket = _socket.addListener("error", err => { error = err; }) - socket = socket.addListener("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.addListener("lookup", (err, address: string, family: string | number, host: string) => { error = err; - + if (typeof family === 'string') { str = family; } else if (typeof family === 'number') { num = family; } - + str = host; }) - socket = socket.addListener("timeout", () => { }) - + _socket = _socket.addListener("timeout", () => { }) + /// emit - socket = socket.emit("close", bool); - socket = socket.emit("connect"); - socket = socket.emit("data", buffer); - socket = socket.emit("drain"); - socket = socket.emit("end"); - socket = socket.emit("error", error); - socket = socket.emit("lookup", error, str, str, str); - socket = socket.emit("lookup", error, str, num, str); - socket = socket.emit("timeout"); + _socket = _socket.emit("close", bool); + _socket = _socket.emit("connect"); + _socket = _socket.emit("data", buffer); + _socket = _socket.emit("drain"); + _socket = _socket.emit("end"); + _socket = _socket.emit("error", error); + _socket = _socket.emit("lookup", error, str, str, str); + _socket = _socket.emit("lookup", error, str, num, str); + _socket = _socket.emit("timeout"); /// on - socket = socket.on("close", had_error => { + _socket = _socket.on("close", had_error => { bool = had_error; }) - socket = socket.on("connect", () => { }) - socket = socket.on("data", data => { + _socket = _socket.on("connect", () => { }) + _socket = _socket.on("data", data => { buffer = data; }) - socket = socket.on("drain", () => { }) - socket = socket.on("end", () => { }) - socket = socket.on("error", err => { + _socket = _socket.on("drain", () => { }) + _socket = _socket.on("end", () => { }) + _socket = _socket.on("error", err => { error = err; }) - socket = socket.on("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.on("lookup", (err, address: string, family: string | number, host: string) => { error = err; - + if (typeof family === 'string') { str = family; } else if (typeof family === 'number') { num = family; } - + str = host; }) - socket = socket.on("timeout", () => { }) + _socket = _socket.on("timeout", () => { }) /// once - socket = socket.once("close", had_error => { + _socket = _socket.once("close", had_error => { bool = had_error; }) - socket = socket.once("connect", () => { }) - socket = socket.once("data", data => { + _socket = _socket.once("connect", () => { }) + _socket = _socket.once("data", data => { buffer = data; }) - socket = socket.once("drain", () => { }) - socket = socket.once("end", () => { }) - socket = socket.once("error", err => { + _socket = _socket.once("drain", () => { }) + _socket = _socket.once("end", () => { }) + _socket = _socket.once("error", err => { error = err; }) - socket = socket.once("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.once("lookup", (err, address: string, family: string | number, host: string) => { error = err; if (typeof family === 'string') { @@ -1259,61 +1260,62 @@ namespace net_tests { str = host; }) - socket = socket.once("timeout", () => { }) - + _socket = _socket.once("timeout", () => { }) + /// prependListener - socket = socket.prependListener("close", had_error => { + _socket = _socket.prependListener("close", had_error => { bool = had_error; }) - socket = socket.prependListener("connect", () => { }) - socket = socket.prependListener("data", data => { + _socket = _socket.prependListener("connect", () => { }) + _socket = _socket.prependListener("data", data => { buffer = data; }) - socket = socket.prependListener("drain", () => { }) - socket = socket.prependListener("end", () => { }) - socket = socket.prependListener("error", err => { + _socket = _socket.prependListener("drain", () => { }) + _socket = _socket.prependListener("end", () => { }) + _socket = _socket.prependListener("error", err => { error = err; }) - socket = socket.prependListener("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.prependListener("lookup", (err, address: string, family: string | number, host: string) => { error = err; - + if (typeof family === 'string') { str = family; } else if (typeof family === 'number') { num = family; } - + str = host; }) - socket = socket.prependListener("timeout", () => { }) + _socket = _socket.prependListener("timeout", () => { }) /// prependOnceListener - socket = socket.prependOnceListener("close", had_error => { + _socket = _socket.prependOnceListener("close", had_error => { bool = had_error; }) - socket = socket.prependOnceListener("connect", () => { }) - socket = socket.prependOnceListener("data", data => { + _socket = _socket.prependOnceListener("connect", () => { }) + _socket = _socket.prependOnceListener("data", data => { buffer = data; }) - socket = socket.prependOnceListener("drain", () => { }) - socket = socket.prependOnceListener("end", () => { }) - socket = socket.prependOnceListener("error", err => { + _socket = _socket.prependOnceListener("drain", () => { }) + _socket = _socket.prependOnceListener("end", () => { }) + _socket = _socket.prependOnceListener("error", err => { error = err; }) - socket = socket.prependOnceListener("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.prependOnceListener("lookup", (err, address: string, family: string | number, host: string) => { error = err; - + if (typeof family === 'string') { str = family; } else if (typeof family === 'number') { num = family; } - + str = host; }) - socket = socket.prependOnceListener("timeout", () => { }) + _socket = _socket.prependOnceListener("timeout", () => { }) } - + + { /** * net.Server - events.EventEmitter @@ -1322,57 +1324,59 @@ namespace net_tests { * 3. error * 4. listening */ - let _server = net.Server; + let _server: net.Server; + + let _socket: net.Socket; + let error: Error; - let _socket = net.Socket; - let _err: Error; - /// addListener _server = _server.addListener("close", () => { }) _server = _server.addListener("connection", socket => { _socket = socket }) _server = _server.addListener("error", err => { - _err = Error; + error = err; }) _server = _server.addListener("listening", () => { }) - + /// emit _server = _server.emit("close") _server = _server.emit("connection", _socket) - _server = _server.emit("error", _err) + _server = _server.emit("error", error) _server = _server.emit("listening") - + /// once _server = _server.once("close", () => { }) _server = _server.once("connection", socket => { _socket = socket }) _server = _server.once("error", err => { - _err = Error; + error = err; }) _server = _server.once("listening", () => { }) - + /// prependListener _server = _server.prependListener("close", () => { }) _server = _server.prependListener("connection", socket => { _socket = socket }) _server = _server.prependListener("error", err => { - _err = Error; + error = err; }) _server = _server.prependListener("listening", () => { }) - + /// prependOnceListener _server = _server.prependOnceListener("close", () => { }) _server = _server.prependOnceListener("connection", socket => { _socket = socket }) _server = _server.prependOnceListener("error", err => { - _err = Error; + error = err; }) _server = _server.prependOnceListener("listening", () => { }) + } + } /***************************************************************************** From 2502bbdc116592e65dbc29f2f4d541729264cee0 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 22 Sep 2016 00:37:30 +0800 Subject: [PATCH 08/12] Correct type for net.Socket and net.Server events --- node/node.d.ts | 113 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index df546c5816..0a1f6167f1 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -241,20 +241,20 @@ declare namespace NodeJS { } export class EventEmitter { - addListener(event: string|symbol, listener: Function): this; - on(event: string|symbol, listener: Function): this; - once(event: string|symbol, listener: Function): this; - removeListener(event: string|symbol, listener: Function): this; - removeAllListeners(event?: string|symbol): this; + addListener(event: string | symbol, listener: Function): this; + on(event: string | symbol, listener: Function): this; + once(event: string | symbol, listener: Function): this; + removeListener(event: string | symbol, listener: Function): this; + removeAllListeners(event?: string | symbol): this; setMaxListeners(n: number): this; getMaxListeners(): number; - listeners(event: string|symbol): Function[]; - emit(event: string|symbol, ...args: any[]): boolean; - listenerCount(type: string|symbol): number; + listeners(event: string | symbol): Function[]; + emit(event: string | symbol, ...args: any[]): boolean; + listenerCount(type: string | symbol): number; // Added in Node 6... - prependListener(event: string|symbol, listener: Function): this; - prependOnceListener(event: string|symbol, listener: Function): this; - eventNames(): (string|symbol)[]; + prependListener(event: string | symbol, listener: Function): this; + prependOnceListener(event: string | symbol, listener: Function): this; + eventNames(): (string | symbol)[]; } export interface ReadableStream extends EventEmitter { @@ -464,7 +464,7 @@ interface IterableIterator { } interface NodeBuffer extends Uint8Array { write(string: string, offset?: number, length?: number, encoding?: string): number; toString(encoding?: string, start?: number, end?: number): string; - toJSON(): {type: 'Buffer', data: any[]}; + toJSON(): { type: 'Buffer', data: any[] }; equals(otherBuffer: Buffer): boolean; compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number; copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number; @@ -549,22 +549,22 @@ declare module "querystring" { declare module "events" { export class EventEmitter extends NodeJS.EventEmitter { static EventEmitter: EventEmitter; - static listenerCount(emitter: EventEmitter, event: string|symbol): number; // deprecated + static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated static defaultMaxListeners: number; - addListener(event: string|symbol, listener: Function): this; - on(event: string|symbol, listener: Function): this; - once(event: string|symbol, listener: Function): this; - prependListener(event: string|symbol, listener: Function): this; - prependOnceListener(event: string|symbol, listener: Function): this; - removeListener(event: string|symbol, listener: Function): this; - removeAllListeners(event?: string|symbol): this; + addListener(event: string | symbol, listener: Function): this; + on(event: string | symbol, listener: Function): this; + once(event: string | symbol, listener: Function): this; + prependListener(event: string | symbol, listener: Function): this; + prependOnceListener(event: string | symbol, listener: Function): this; + removeListener(event: string | symbol, listener: Function): this; + removeAllListeners(event?: string | symbol): this; setMaxListeners(n: number): this; getMaxListeners(): number; - listeners(event: string|symbol): Function[]; - emit(event: string|symbol, ...args: any[]): boolean; - eventNames(): (string|symbol)[]; - listenerCount(type: string|symbol): number; + listeners(event: string | symbol): Function[]; + emit(event: string | symbol, ...args: any[]): boolean; + eventNames(): (string | symbol)[]; + listenerCount(type: string | symbol): number; } } @@ -779,7 +779,7 @@ declare module "cluster" { isConnected(): boolean; isDead(): boolean; exitedAfterDisconnect: boolean; - + /** * events.EventEmitter * 1. disconnect @@ -796,7 +796,7 @@ declare module "cluster" { addListener(event: "listening", listener: (address: Address) => void): this; addListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined. addListener(event: "online", listener: () => void): this; - + on(event: string, listener: Function): this; on(event: "disconnect", listener: () => void): this; on(event: "error", listener: (code: number, signal: string) => void): this; @@ -804,7 +804,7 @@ declare module "cluster" { on(event: "listening", listener: (address: Address) => void): this; on(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined. on(event: "online", listener: () => void): this; - + once(event: string, listener: Function): this; once(event: "disconnect", listener: () => void): this; once(event: "error", listener: (code: number, signal: string) => void): this; @@ -812,7 +812,7 @@ declare module "cluster" { once(event: "listening", listener: (address: Address) => void): this; once(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined. once(event: "online", listener: () => void): this; - + prependListener(event: string, listener: Function): this; prependListener(event: "disconnect", listener: () => void): this; prependListener(event: "error", listener: (code: number, signal: string) => void): this; @@ -820,7 +820,7 @@ declare module "cluster" { prependListener(event: "listening", listener: (address: Address) => void): this; prependListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this; // the handle is a net.Socket or net.Server object, or undefined. prependListener(event: "online", listener: () => void): this; - + prependOnceListener(event: string, listener: Function): this; prependOnceListener(event: "disconnect", listener: () => void): this; prependOnceListener(event: "error", listener: (code: number, signal: string) => void): this; @@ -901,7 +901,7 @@ declare module "cluster" { } - export function disconnect(callback ?: Function): void; + export function disconnect(callback?: Function): void; export function fork(env?: any): Worker; export var isMaster: boolean; export var isWorker: boolean; @@ -1591,7 +1591,7 @@ declare module "dns" { export function resolve(domain: string, callback: (err: Error, addresses: string[]) => void): string[]; export function resolve4(domain: string, callback: (err: Error, addresses: string[]) => void): string[]; export function resolve6(domain: string, callback: (err: Error, addresses: string[]) => void): string[]; - export function resolveMx(domain: string, callback: (err: Error, addresses: MxRecord[]) =>void ): string[]; + export function resolveMx(domain: string, callback: (err: Error, addresses: MxRecord[]) => void): string[]; export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) => void): string[]; export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) => void): string[]; export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) => void): string[]; @@ -1678,7 +1678,6 @@ declare module "net" { * 7. lookup * 8. timeout */ - addListener(event: string, listener: Function): this; addListener(event: "close", listener: (had_error: Boolean) => void): this; addListener(event: "connect", listener: () => void): this; @@ -1688,8 +1687,8 @@ declare module "net" { addListener(event: "error", listener: (err: Error) => void): this; addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; addListener(event: "timeout", listener: () => void): this; - - emit(event: string): this; + + emit(event: string, ...args: any[]); emit(event: "close", had_error: Boolean): this; emit(event: "connect"): this; emit(event: "data", data: Buffer): this; @@ -1698,7 +1697,7 @@ declare module "net" { emit(event: "error", err: Error): this; emit(event: "lookup", err: Error, address: string, family: string | number, host: string): this; emit(event: "timeout"): this; - + on(event: string, listener: Function): this; on(event: "close", listener: (had_error: Boolean) => void): this; on(event: "connect", listener: () => void): this; @@ -1708,7 +1707,7 @@ declare module "net" { on(event: "error", listener: (err: Error) => void): this; on(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; on(event: "timeout", listener: () => void): this; - + once(event: string, listener: Function): this; once(event: "close", listener: (had_error: Boolean) => void): this; once(event: "connect", listener: () => void): this; @@ -1718,7 +1717,7 @@ declare module "net" { once(event: "error", listener: (err: Error) => void): this; once(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; once(event: "timeout", listener: () => void): this; - + prependListener(event: string, listener: Function): this; prependListener(event: "close", listener: (had_error: Boolean) => void): this; prependListener(event: "connect", listener: () => void): this; @@ -1728,7 +1727,7 @@ declare module "net" { prependListener(event: "error", listener: (err: Error) => void): this; prependListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; prependListener(event: "timeout", listener: () => void): this; - + prependOnceListener(event: string, listener: Function): this; prependOnceListener(event: "close", listener: (had_error: Boolean) => void): this; prependOnceListener(event: "connect", listener: () => void): this; @@ -1783,7 +1782,7 @@ declare module "net" { addListener(event: "error", listener: (err: Error) => void): this; addListener(event: "listening", listener: () => void): this; - emit(event: string): this; + emit(event: string, ...args: any[]); emit(event: "close"): this; emit(event: "connection", socket: Socket): this; emit(event: "error", err: Error): this; @@ -1794,19 +1793,19 @@ declare module "net" { on(event: "connection", listener: (socket: Socket) => void): this; on(event: "error", listener: (err: Error) => void): this; on(event: "listening", listener: () => void): this; - + once(event: string, listener: Function): this; once(event: "close", listener: () => void): this; once(event: "connection", listener: (socket: Socket) => void): this; once(event: "error", listener: (err: Error) => void): this; once(event: "listening", listener: () => void): this; - + prependListener(event: string, listener: Function): this; prependListener(event: "close", listener: () => void): this; prependListener(event: "connection", listener: (socket: Socket) => void): this; prependListener(event: "error", listener: (err: Error) => void): this; prependListener(event: "listening", listener: () => void): this; - + prependOnceListener(event: string, listener: Function): this; prependOnceListener(event: "close", listener: () => void): this; prependOnceListener(event: "connection", listener: (socket: Socket) => void): this; @@ -1903,7 +1902,7 @@ declare module "fs" { interface FSWatcher extends events.EventEmitter { close(): void; - + /** * events.EventEmitter * 1. change @@ -1912,19 +1911,19 @@ declare module "fs" { addListener(event: string, listener: Function): this; addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this; addListener(event: "error", listener: (code: number, signal: string) => void): this; - + on(event: string, listener: Function): this; on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this; on(event: "error", listener: (code: number, signal: string) => void): this; - + once(event: string, listener: Function): this; once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this; once(event: "error", listener: (code: number, signal: string) => void): this; - + prependListener(event: string, listener: Function): this; prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this; prependListener(event: "error", listener: (code: number, signal: string) => void): this; - + prependOnceListener(event: string, listener: Function): this; prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this; prependOnceListener(event: "error", listener: (code: number, signal: string) => void): this; @@ -1933,7 +1932,7 @@ declare module "fs" { export interface ReadStream extends stream.Readable { close(): void; destroy(): void; - + /** * events.EventEmitter * 1. open @@ -1942,19 +1941,19 @@ declare module "fs" { addListener(event: string, listener: Function): this; addListener(event: "open", listener: (fd: number) => void): this; addListener(event: "close", listener: () => void): this; - + on(event: string, listener: Function): this; on(event: "open", listener: (fd: number) => void): this; on(event: "close", listener: () => void): this; - + once(event: string, listener: Function): this; once(event: "open", listener: (fd: number) => void): this; once(event: "close", listener: () => void): this; - + prependListener(event: string, listener: Function): this; prependListener(event: "open", listener: (fd: number) => void): this; prependListener(event: "close", listener: () => void): this; - + prependOnceListener(event: string, listener: Function): this; prependOnceListener(event: "open", listener: (fd: number) => void): this; prependOnceListener(event: "close", listener: () => void): this; @@ -1964,7 +1963,7 @@ declare module "fs" { close(): void; bytesWritten: number; path: string | Buffer; - + /** * events.EventEmitter * 1. open @@ -1973,19 +1972,19 @@ declare module "fs" { addListener(event: string, listener: Function): this; addListener(event: "open", listener: (fd: number) => void): this; addListener(event: "close", listener: () => void): this; - + on(event: string, listener: Function): this; on(event: "open", listener: (fd: number) => void): this; on(event: "close", listener: () => void): this; - + once(event: string, listener: Function): this; once(event: "open", listener: (fd: number) => void): this; once(event: "close", listener: () => void): this; - + prependListener(event: string, listener: Function): this; prependListener(event: "open", listener: (fd: number) => void): this; prependListener(event: "close", listener: () => void): this; - + prependOnceListener(event: string, listener: Function): this; prependOnceListener(event: "open", listener: (fd: number) => void): this; prependOnceListener(event: "close", listener: () => void): this; From f4bea67bcea793c0002182235c25e0df7ef4a7d9 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 22 Sep 2016 01:51:58 +0800 Subject: [PATCH 09/12] Add return-type for emit --- node/node.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index 0a1f6167f1..6b56e36880 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1688,7 +1688,7 @@ declare module "net" { addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; addListener(event: "timeout", listener: () => void): this; - emit(event: string, ...args: any[]); + emit(event: string, ...args: any[]): this; emit(event: "close", had_error: Boolean): this; emit(event: "connect"): this; emit(event: "data", data: Buffer): this; @@ -1782,7 +1782,7 @@ declare module "net" { addListener(event: "error", listener: (err: Error) => void): this; addListener(event: "listening", listener: () => void): this; - emit(event: string, ...args: any[]); + emit(event: string, ...args: any[]): this; emit(event: "close"): this; emit(event: "connection", socket: Socket): this; emit(event: "error", err: Error): this; From df76aa9c4380e365f9629dfce8cd7d0a8ba94d83 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 22 Sep 2016 02:08:52 +0800 Subject: [PATCH 10/12] It should use boolean, not Boolean --- node/node.d.ts | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index 6b56e36880..a3456370e3 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1679,7 +1679,7 @@ declare module "net" { * 8. timeout */ addListener(event: string, listener: Function): this; - addListener(event: "close", listener: (had_error: Boolean) => void): this; + addListener(event: "close", listener: (had_error: boolean) => void): this; addListener(event: "connect", listener: () => void): this; addListener(event: "data", listener: (data: Buffer) => void): this; addListener(event: "drain", listener: () => void): this; @@ -1688,18 +1688,18 @@ declare module "net" { addListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this; addListener(event: "timeout", listener: () => void): this; - emit(event: string, ...args: any[]): this; - emit(event: "close", had_error: Boolean): this; - emit(event: "connect"): this; - emit(event: "data", data: Buffer): this; - emit(event: "drain"): this; - emit(event: "end"): this; - emit(event: "error", err: Error): this; - emit(event: "lookup", err: Error, address: string, family: string | number, host: string): this; - emit(event: "timeout"): this; + emit(event: string, ...args: any[]): boolean; + emit(event: "close", had_error: boolean): boolean; + emit(event: "connect"): boolean; + emit(event: "data", data: Buffer): boolean; + emit(event: "drain"): boolean; + emit(event: "end"): boolean; + emit(event: "error", err: Error): boolean; + emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean; + emit(event: "timeout"): boolean; on(event: string, listener: Function): this; - on(event: "close", listener: (had_error: Boolean) => void): this; + on(event: "close", listener: (had_error: boolean) => void): this; on(event: "connect", listener: () => void): this; on(event: "data", listener: (data: Buffer) => void): this; on(event: "drain", listener: () => void): this; @@ -1709,7 +1709,7 @@ declare module "net" { on(event: "timeout", listener: () => void): this; once(event: string, listener: Function): this; - once(event: "close", listener: (had_error: Boolean) => void): this; + once(event: "close", listener: (had_error: boolean) => void): this; once(event: "connect", listener: () => void): this; once(event: "data", listener: (data: Buffer) => void): this; once(event: "drain", listener: () => void): this; @@ -1719,7 +1719,7 @@ declare module "net" { once(event: "timeout", listener: () => void): this; prependListener(event: string, listener: Function): this; - prependListener(event: "close", listener: (had_error: Boolean) => void): this; + prependListener(event: "close", listener: (had_error: boolean) => void): this; prependListener(event: "connect", listener: () => void): this; prependListener(event: "data", listener: (data: Buffer) => void): this; prependListener(event: "drain", listener: () => void): this; @@ -1729,7 +1729,7 @@ declare module "net" { prependListener(event: "timeout", listener: () => void): this; prependOnceListener(event: string, listener: Function): this; - prependOnceListener(event: "close", listener: (had_error: Boolean) => void): this; + prependOnceListener(event: "close", listener: (had_error: boolean) => void): this; prependOnceListener(event: "connect", listener: () => void): this; prependOnceListener(event: "data", listener: (data: Buffer) => void): this; prependOnceListener(event: "drain", listener: () => void): this; @@ -1782,11 +1782,11 @@ declare module "net" { addListener(event: "error", listener: (err: Error) => void): this; addListener(event: "listening", listener: () => void): this; - emit(event: string, ...args: any[]): this; - emit(event: "close"): this; - emit(event: "connection", socket: Socket): this; - emit(event: "error", err: Error): this; - emit(event: "listening"): this; + emit(event: string, ...args: any[]): boolean; + emit(event: "close"): boolean; + emit(event: "connection", socket: Socket): boolean; + emit(event: "error", err: Error): boolean; + emit(event: "listening"): boolean; on(event: string, listener: Function): this; on(event: "close", listener: () => void): this; From 2698325c4bca171b4b7edb3f4c6ce8c1eccb40e5 Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 22 Sep 2016 02:09:16 +0800 Subject: [PATCH 11/12] It should use boolean, not Boolean --- node/node-tests.ts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/node/node-tests.ts b/node/node-tests.ts index 4db30a35d4..f8f1666177 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -1166,7 +1166,7 @@ namespace net_tests { */ let _socket: net.Socket; - let bool: Boolean; + let bool: boolean; let buffer: Buffer; let error: Error; let str: string; @@ -1200,15 +1200,15 @@ namespace net_tests { _socket = _socket.addListener("timeout", () => { }) /// emit - _socket = _socket.emit("close", bool); - _socket = _socket.emit("connect"); - _socket = _socket.emit("data", buffer); - _socket = _socket.emit("drain"); - _socket = _socket.emit("end"); - _socket = _socket.emit("error", error); - _socket = _socket.emit("lookup", error, str, str, str); - _socket = _socket.emit("lookup", error, str, num, str); - _socket = _socket.emit("timeout"); + bool = _socket.emit("close", bool); + bool = _socket.emit("connect"); + bool = _socket.emit("data", buffer); + bool = _socket.emit("drain"); + bool = _socket.emit("end"); + bool = _socket.emit("error", error); + bool = _socket.emit("lookup", error, str, str, str); + bool = _socket.emit("lookup", error, str, num, str); + bool = _socket.emit("timeout"); /// on _socket = _socket.on("close", had_error => { @@ -1327,6 +1327,7 @@ namespace net_tests { let _server: net.Server; let _socket: net.Socket; + let bool: boolean; let error: Error; /// addListener @@ -1340,10 +1341,10 @@ namespace net_tests { _server = _server.addListener("listening", () => { }) /// emit - _server = _server.emit("close") - _server = _server.emit("connection", _socket) - _server = _server.emit("error", error) - _server = _server.emit("listening") + bool = _server.emit("close") + bool = _server.emit("connection", _socket) + bool = _server.emit("error", error) + bool = _server.emit("listening") /// once _server = _server.once("close", () => { }) From c61446be23c865b621b9d82dc941bcc825634dea Mon Sep 17 00:00:00 2001 From: TonyYang Date: Thu, 22 Sep 2016 02:45:06 +0800 Subject: [PATCH 12/12] Cancel type annotation on function --- node/node-tests.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/node/node-tests.ts b/node/node-tests.ts index f8f1666177..4fea9ff750 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -1186,7 +1186,7 @@ namespace net_tests { _socket = _socket.addListener("error", err => { error = err; }) - _socket = _socket.addListener("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.addListener("lookup", (err, address, family, host) => { error = err; if (typeof family === 'string') { @@ -1223,7 +1223,7 @@ namespace net_tests { _socket = _socket.on("error", err => { error = err; }) - _socket = _socket.on("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.on("lookup", (err, address, family, host) => { error = err; if (typeof family === 'string') { @@ -1249,7 +1249,7 @@ namespace net_tests { _socket = _socket.once("error", err => { error = err; }) - _socket = _socket.once("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.once("lookup", (err, address, family, host) => { error = err; if (typeof family === 'string') { @@ -1275,7 +1275,7 @@ namespace net_tests { _socket = _socket.prependListener("error", err => { error = err; }) - _socket = _socket.prependListener("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.prependListener("lookup", (err, address, family, host) => { error = err; if (typeof family === 'string') { @@ -1301,7 +1301,7 @@ namespace net_tests { _socket = _socket.prependOnceListener("error", err => { error = err; }) - _socket = _socket.prependOnceListener("lookup", (err, address: string, family: string | number, host: string) => { + _socket = _socket.prependOnceListener("lookup", (err, address, family, host) => { error = err; if (typeof family === 'string') { @@ -1315,7 +1315,6 @@ namespace net_tests { _socket = _socket.prependOnceListener("timeout", () => { }) } - { /** * net.Server - events.EventEmitter