From 03507a3fe6359e53f28d55eb55f0e574a47a25a0 Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:00:08 +0200 Subject: [PATCH 1/8] Feat(Node 4): Add ProcessEnv interface --- types/node/v4/index.d.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts index dab3b0c5d9..501ed87d44 100644 --- a/types/node/v4/index.d.ts +++ b/types/node/v4/index.d.ts @@ -407,6 +407,10 @@ declare namespace NodeJS { isTTY?: true; } + export interface ProcessEnv { + [key: string]: string | undefined; + } + export interface Process extends EventEmitter { stdout: Socket; stderr: Socket; @@ -418,7 +422,7 @@ declare namespace NodeJS { chdir(directory: string): void; cwd(): string; debugPort: number; - env: any; + env: ProcessEnv; exit(code?: number): void; exitCode: number; getgid(): number; From bb8dec6a26cd41092032bb609f88dfeba2754711 Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:00:25 +0200 Subject: [PATCH 2/8] Feat(Node 6): Add ProcessEnv interface --- types/node/v6/index.d.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts index 570e668c53..5f47b55f3f 100644 --- a/types/node/v6/index.d.ts +++ b/types/node/v6/index.d.ts @@ -460,6 +460,10 @@ declare namespace NodeJS { isTTY?: true; } + export interface ProcessEnv { + [key: string]: string | undefined; + } + export interface WriteStream extends Socket { columns?: number; rows?: number; From f8ff96599af4a3ba067e17ea3b30e7975a94ea80 Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:00:51 +0200 Subject: [PATCH 3/8] Feat(Node 7): Add ProcessEnv interface --- types/node/v7/index.d.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts index 055933977d..e5a7d1059c 100644 --- a/types/node/v7/index.d.ts +++ b/types/node/v7/index.d.ts @@ -456,6 +456,10 @@ declare namespace NodeJS { isTTY?: true; } + export interface ProcessEnv { + [key: string]: string | undefined; + } + export interface WriteStream extends Socket { columns?: number; rows?: number; @@ -479,7 +483,7 @@ declare namespace NodeJS { cwd(): string; debugPort: number; emitWarning(warning: string | Error, name?: string, ctor?: Function): void; - env: any; + env: ProcessEnv; exit(code?: number): never; exitCode: number; getgid(): number; From bc22dd04a076962450341c2bc383ca029544c6ed Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:47:46 +0200 Subject: [PATCH 4/8] Test(Node 4): Alter test for ProcessEnv --- types/node/v4/node-tests.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts index 6409e83e18..8de12003cf 100644 --- a/types/node/v4/node-tests.ts +++ b/types/node/v4/node-tests.ts @@ -734,19 +734,7 @@ namespace path_tests { // returns // ['foo', 'bar', 'baz'] - console.log(process.env.PATH) - // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin' - - process.env.PATH.split(path.delimiter) - // returns - // ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin'] - - console.log(process.env.PATH) - // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\' - - process.env.PATH.split(path.delimiter) - // returns - // ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\'] + process.env["PATH"]; // $ExpectType string path.parse('/home/user/dir/file.txt') // returns From c9bcd193cb673eef49dcb59213e2fc5a86e272d2 Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:48:10 +0200 Subject: [PATCH 5/8] Test(Node 6): Alter test for ProcessEnv --- types/node/v6/node-tests.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts index 4457f83492..789fc5c744 100644 --- a/types/node/v6/node-tests.ts +++ b/types/node/v6/node-tests.ts @@ -1364,19 +1364,7 @@ namespace path_tests { // returns // ['foo', 'bar', 'baz'] - console.log(process.env.PATH) - // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin' - - process.env.PATH.split(path.delimiter) - // returns - // ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin'] - - console.log(process.env.PATH) - // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\' - - process.env.PATH.split(path.delimiter) - // returns - // ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\'] + process.env["PATH"]; // $ExpectType string path.parse('/home/user/dir/file.txt') // returns From 23bf075ab3a47f1c661e1447177f01dfd8c62384 Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:48:24 +0200 Subject: [PATCH 6/8] Test(Node 7): Alter test for ProcessEnv --- types/node/v7/node-tests.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts index 0ea05066b4..8d6f0af1e3 100644 --- a/types/node/v7/node-tests.ts +++ b/types/node/v7/node-tests.ts @@ -1346,19 +1346,7 @@ namespace path_tests { // returns // ['foo', 'bar', 'baz'] - console.log(process.env.PATH) - // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin' - - process.env.PATH.split(path.delimiter) - // returns - // ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin'] - - console.log(process.env.PATH) - // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\' - - process.env.PATH.split(path.delimiter) - // returns - // ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\'] + process.env["PATH"]; // $ExpectType string path.parse('/home/user/dir/file.txt') // returns From 8b140f037c2058aab2ce232a63d4395f386d8e2f Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 13:54:51 +0200 Subject: [PATCH 7/8] Docs(name): Add my name to contributors list --- types/node/v4/index.d.ts | 1 + types/node/v6/index.d.ts | 1 + types/node/v7/index.d.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts index 501ed87d44..cd771ff805 100644 --- a/types/node/v4/index.d.ts +++ b/types/node/v4/index.d.ts @@ -3,6 +3,7 @@ // Definitions by: Microsoft TypeScript // DefinitelyTyped // Sebastian Silbermann +// Sander Koenders // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /************************************************ diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts index 5f47b55f3f..c8470c7f76 100644 --- a/types/node/v6/index.d.ts +++ b/types/node/v6/index.d.ts @@ -7,6 +7,7 @@ // Sebastian Silbermann // Alorel // Hoàng Văn Khải +// Sander Koenders // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /************************************************ diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts index e5a7d1059c..18442291a1 100644 --- a/types/node/v7/index.d.ts +++ b/types/node/v7/index.d.ts @@ -7,6 +7,7 @@ // Wilco Bakker // Sebastian Silbermann // Hoàng Văn Khải +// Sander Koenders // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /************************************************ From 09ff4cfc0a0677e498f537640dfefa7fb40fbba1 Mon Sep 17 00:00:00 2001 From: Sander Koenders Date: Fri, 8 Jun 2018 14:09:33 +0200 Subject: [PATCH 8/8] Fix(node 6): Use ProcessEnv in Process interface --- types/node/v6/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts index c8470c7f76..baf0776dcf 100644 --- a/types/node/v6/index.d.ts +++ b/types/node/v6/index.d.ts @@ -487,7 +487,7 @@ declare namespace NodeJS { cwd(): string; debugPort: number; emitWarning(warning: string | Error, name?: string, ctor?: Function): void; - env: any; + env: ProcessEnv; exit(code?: number): void; exitCode: number; getgid(): number;