Use | undefined for process env

Part of microsoft/vscode#119046
microsoft · Mar 30, 2021 · 0588def · 0588def
1 parent 3142b11
commit 0588def
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -3,10 +3,8 @@
  * Copyright (c) 2018, Microsoft Corporation (MIT License).
  */
 
-import * as net from 'net';
-
 export interface IProcessEnv {
-  [key: string]: string;
+  [key: string]: string | undefined;
 }
 
 export interface ITerminal {
@@ -101,7 +99,7 @@ interface IBasePtyForkOptions {
   cols?: number;
   rows?: number;
   cwd?: string;
-  env?: { [key: string]: string };
+  env?: IProcessEnv;
   encoding?: string;
   handleFlowControl?: boolean;
   flowControlPause?: string;

diff --git a/src/terminal.ts b/src/terminal.ts
@@ -199,6 +199,9 @@ export abstract class Terminal implements ITerminal {
     const pairs = [];
 
     for (let i = 0; i < keys.length; i++) {
+      if (keys[i] === undefined) {
+        continue;
+      }
       pairs.push(keys[i] + '=' + env[keys[i]]);
     }
 

diff --git a/src/unixTerminal.ts b/src/unixTerminal.ts
@@ -61,7 +61,7 @@ export class UnixTerminal extends Terminal {
     this._rows = opt.rows || DEFAULT_ROWS;
     const uid = opt.uid || -1;
     const gid = opt.gid || -1;
-    const env = assign({}, opt.env);
+    const env: IProcessEnv = assign({}, opt.env);
 
     if (opt.env === process.env) {
       this._sanitizeEnv(env);

diff --git a/typings/node-pty.d.ts b/typings/node-pty.d.ts
@@ -42,7 +42,7 @@ declare module 'node-pty' {
     /**
      * Environment to be set for the child program.
      */
-    env?: { [key: string]: string };
+    env?: { [key: string]: string | undefined };
 
     /**
      * String encoding of the underlying pty.