From 527914c2a342d4e79bae08346b520efb5cb050e4 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 21 Jul 2017 09:41:56 -0700 Subject: [PATCH] node: Fix net.Socket definition (#18275) v0.12.x: https://nodejs.org/docs/latest-v0.12.x/api/net.html#net_new_net_socket_options v4: https://nodejs.org/dist/latest-v4.x/docs/api/net.html#net_new_net_socket_options v6: https://nodejs.org/dist/latest-v6.x/docs/api/net.html#net_new_net_socket_options v7: https://nodejs.org/dist/latest-v7.x/docs/api/net.html#net_new_net_socket_options v8: https://nodejs.org/api/net.html#net_new_net_socket_options --- types/node/index.d.ts | 3 ++- types/node/node-tests.ts | 7 ++++++- types/node/v0/index.d.ts | 2 +- types/node/v0/node-tests.ts | 18 ++++++++++++++++++ types/node/v4/index.d.ts | 2 +- types/node/v4/node-tests.ts | 12 ++++++++++++ types/node/v6/index.d.ts | 2 +- types/node/v6/node-tests.ts | 7 ++++++- types/node/v7/index.d.ts | 3 ++- types/node/v7/node-tests.ts | 7 ++++++- 10 files changed, 55 insertions(+), 8 deletions(-) diff --git a/types/node/index.d.ts b/types/node/index.d.ts index 48aa44a874..518b1d5d00 100644 --- a/types/node/index.d.ts +++ b/types/node/index.d.ts @@ -10,6 +10,7 @@ // Chigozirim C. // Flarna // Mariusz Wiktorczyk +// Daniel Imms // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.2 @@ -2426,7 +2427,7 @@ declare module "net" { } export var Socket: { - new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket; + new (options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket; }; export interface ListenOptions { diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts index defd7aa6f4..10ce35e723 100644 --- a/types/node/node-tests.ts +++ b/types/node/node-tests.ts @@ -2193,7 +2193,12 @@ namespace net_tests { * 7. lookup * 8. timeout */ - let _socket: net.Socket; + let _socket: net.Socket = new net.Socket({ + fd: 1, + allowHalfOpen: false, + readable: false, + writable: false + }); let bool: boolean; let buffer: Buffer; diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts index 5a383ce9db..fdbf9dd518 100644 --- a/types/node/v0/index.d.ts +++ b/types/node/v0/index.d.ts @@ -1027,7 +1027,7 @@ declare module "net" { } export var Socket: { - new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket; + new (options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket; }; export interface Server extends events.EventEmitter { diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts index 57019bfe86..6c94757bf7 100644 --- a/types/node/v0/node-tests.ts +++ b/types/node/v0/node-tests.ts @@ -80,6 +80,24 @@ fs.readFile('testfile', (err, data) => { }); +/////////////////////////////////////////////////// +/// Net Tests : https://nodejs.org/api/net.html /// +/////////////////////////////////////////////////// + +namespace net_tests { + { + /** + * net.Socket - events.EventEmitter + */ + let _socket: net.Socket = new net.Socket({ + fd: 1, + allowHalfOpen: false, + readable: false, + writable: false + }); + } +} + /////////////////////////////////////////////////////// /// Buffer tests : https://nodejs.org/api/buffer.html /////////////////////////////////////////////////////// diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts index 51197e1da4..4e6d0290c1 100644 --- a/types/node/v4/index.d.ts +++ b/types/node/v4/index.d.ts @@ -1406,7 +1406,7 @@ declare module "net" { } export var Socket: { - new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket; + new (options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket; }; export interface ListenOptions { diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts index 654f397b73..16a035f08e 100644 --- a/types/node/v4/node-tests.ts +++ b/types/node/v4/node-tests.ts @@ -1002,6 +1002,18 @@ namespace net_tests { // Make sure .listen() and .close() retuern a Server instance net.createServer().listen(0).close().address(); } + + { + /** + * net.Socket - events.EventEmitter + */ + let _socket: net.Socket = new net.Socket({ + fd: 1, + allowHalfOpen: false, + readable: false, + writable: false + }); + } } /////////////////////////////////////////////////// diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts index 49a6cf98a5..c85ecf68be 100644 --- a/types/node/v6/index.d.ts +++ b/types/node/v6/index.d.ts @@ -2057,7 +2057,7 @@ declare module "net" { } export var Socket: { - new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket; + new (options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket; }; export interface ListenOptions { diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts index 7be75e162b..492b9e36df 100644 --- a/types/node/v6/node-tests.ts +++ b/types/node/v6/node-tests.ts @@ -1868,7 +1868,12 @@ namespace net_tests { * 7. lookup * 8. timeout */ - let _socket: net.Socket; + let _socket: net.Socket = new net.Socket({ + fd: 1, + allowHalfOpen: false, + readable: false, + writable: false + }); let bool: boolean; let buffer: Buffer; diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts index 207843eb3d..b435b56c96 100644 --- a/types/node/v7/index.d.ts +++ b/types/node/v7/index.d.ts @@ -6,6 +6,7 @@ // Roberto Desideri // Christian Vaagland Tellnes // Wilco Bakker +// Daniel Imms // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /************************************************ @@ -2186,7 +2187,7 @@ declare module "net" { } export var Socket: { - new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket; + new (options?: { fd?: number; allowHalfOpen?: boolean; readable?: boolean; writable?: boolean; }): Socket; }; export interface ListenOptions { diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts index dad54bed49..b89adb57ae 100644 --- a/types/node/v7/node-tests.ts +++ b/types/node/v7/node-tests.ts @@ -1979,7 +1979,12 @@ namespace net_tests { * 7. lookup * 8. timeout */ - let _socket: net.Socket; + let _socket: net.Socket = new net.Socket({ + fd: 1, + allowHalfOpen: false, + readable: false, + writable: false + }); let bool: boolean; let buffer: Buffer;