chore(deps): update dependency typescript to v4 (#464)

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Felix Becker <[email protected]>

Author: 3 people

package-lock.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "file-url": "^2.0.2",
-    "iconv-lite": "^0.4.15",
+    "iconv-lite": "^0.6.2",
     "minimatch": "^3.0.4",
     "moment": "^2.29.1",
     "url-relative": "^1.0.0",
@@ -50,7 +50,7 @@
     "@types/file-url": "^2.0.0",
     "@types/minimatch": "^3.0.3",
     "@types/mocha": "^2.2.44",
-    "@types/node": "7.0.32",
+    "@types/node": "^14.14.14",
     "@types/semver": "^5.5.0",
     "@types/xmldom": "^0.1.29",
     "chai": "^4.0.2",
@@ -64,7 +64,7 @@
     "semver": "^5.7.1",
     "tslint": "^5.4.3",
     "tslint-config-prettier": "^1.6.0",
-    "typescript": "^2.1.4",
+    "typescript": "^4.1.3",
     "validate-commit-msg": "^2.14.0",
     "vsce": "^1.28.0",
     "vscode-debugadapter-testsupport": "^1.43.0"

package.json

@@ -204,7 +204,7 @@ class PhpDebugSession extends vscode.DebugSession {
         /** launches the script as CLI */
         const launchScript = async () => {
             // check if program exists
-            await new Promise((resolve, reject) =>
+            await new Promise<void>((resolve, reject) =>
                 fs.access(args.program!, fs.constants.F_OK, err => (err ? reject(err) : resolve()))
             )
             const runtimeArgs = args.runtimeArgs || []
@@ -219,10 +219,12 @@ class PhpDebugSession extends vscode.DebugSession {
                     [runtimeExecutable, ...runtimeArgs, args.program!, ...programArgs],
                     env
                 )
-                // we only do this for CLI mode. In normal listen mode, only a thread exited event is send.
-                script.on('exit', () => {
-                    this.sendEvent(new vscode.TerminatedEvent())
-                })
+                if (script) {
+                    // we only do this for CLI mode. In normal listen mode, only a thread exited event is send.
+                    script.on('exit', () => {
+                        this.sendEvent(new vscode.TerminatedEvent())
+                    })
+                }
             } else {
                 const script = childProcess.spawn(runtimeExecutable, [...runtimeArgs, args.program!, ...programArgs], {
                     cwd,
@@ -247,7 +249,7 @@ class PhpDebugSession extends vscode.DebugSession {
         }
         /** sets up a TCP server to listen for XDebug connections */
         const createServer = () =>
-            new Promise((resolve, reject) => {
+            new Promise<void>((resolve, reject) => {
                 const server = (this._server = net.createServer())
                 server.on('connection', async (socket: net.Socket) => {
                     try {
@@ -316,7 +318,7 @@ class PhpDebugSession extends vscode.DebugSession {
                 server.listen(
                     args.port || 9000,
                     args.hostname,
-                    (error: NodeJS.ErrnoException) => (error ? reject(error) : resolve())
+                    () => resolve()
                 )
             })
         try {

src/phpDebug.ts

@@ -13,8 +13,8 @@ export class Terminal {
     public static launchInTerminal(
         dir: string,
         args: string[],
-        envVars: { [key: string]: string }
-    ): Promise<CP.ChildProcess> {
+        envVars: { [key: string]: string | undefined }
+    ): Promise<CP.ChildProcess | undefined> {
         return this.terminalService().launchInTerminal(dir, args, envVars)
     }
 
@@ -46,29 +46,29 @@ export class Terminal {
 }
 
 interface ITerminalService {
-    launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess>
+    launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string | undefined }): Promise<CP.ChildProcess | undefined>
     killTree(pid: number): Promise<any>
     isOnPath(program: string): boolean
 }
 
 class DefaultTerminalService implements ITerminalService {
     protected static TERMINAL_TITLE = 'VS Code Console'
 
-    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess> {
+    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess | undefined> {
         throw new Error('launchInTerminal not implemented')
     }
 
     public killTree(pid: number): Promise<any> {
         // on linux and OS X we kill all direct and indirect child processes as well
 
-        return new Promise<any>((resolve, reject) => {
+        return new Promise<any | void>((resolve, reject) => {
             try {
                 const cmd = Path.join(__dirname, './terminateProcess.sh')
                 const result = (<any>CP).spawnSync(cmd, [pid.toString()])
                 if (result.error) {
                     reject(result.error)
                 } else {
-                    resolve()
+                    resolve(undefined)
                 }
             } catch (err) {
                 reject(err)
@@ -100,8 +100,8 @@ class DefaultTerminalService implements ITerminalService {
 class WindowsTerminalService extends DefaultTerminalService {
     private static CMD = 'cmd.exe'
 
-    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess> {
-        return new Promise<CP.ChildProcess>((resolve, reject) => {
+    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess | undefined> {
+        return new Promise<CP.ChildProcess | undefined>((resolve, reject) => {
             const title = `"${dir} - ${WindowsTerminalService.TERMINAL_TITLE}"`
             const command = `""${args.join('" "')}" & pause"` // use '|' to only pause on non-zero exit code
 
@@ -127,11 +127,11 @@ class WindowsTerminalService extends DefaultTerminalService {
         // when killing a process in Windows its child processes are *not* killed but become root processes.
         // Therefore we use TASKKILL.EXE
 
-        return new Promise<any>((resolve, reject) => {
+        return new Promise<any | void>((resolve, reject) => {
             const cmd = `taskkill /F /T /PID ${pid}`
             try {
                 CP.execSync(cmd)
-                resolve()
+                resolve(undefined)
             } catch (err) {
                 reject(err)
             }
@@ -143,8 +143,8 @@ class LinuxTerminalService extends DefaultTerminalService {
     private static LINUX_TERM = '/usr/bin/gnome-terminal' // private const string LINUX_TERM = "/usr/bin/x-terminal-emulator";
     private static WAIT_MESSAGE = 'Press any key to continue...'
 
-    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess> {
-        return new Promise<CP.ChildProcess>((resolve, reject) => {
+    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess | undefined> {
+        return new Promise<CP.ChildProcess | undefined>((resolve, reject) => {
             if (!FS.existsSync(LinuxTerminalService.LINUX_TERM)) {
                 reject(
                     new Error(
@@ -181,7 +181,7 @@ class LinuxTerminalService extends DefaultTerminalService {
             cmd.on('exit', (code: number) => {
                 if (code === 0) {
                     // OK
-                    resolve() // since cmd is not the terminal process but just a launcher, we do not pass it in the resolve to the caller
+                    resolve(undefined) // since cmd is not the terminal process but just a launcher, we do not pass it in the resolve to the caller
                 } else {
                     reject(new Error('exit code: ' + code))
                 }
@@ -193,8 +193,8 @@ class LinuxTerminalService extends DefaultTerminalService {
 class MacTerminalService extends DefaultTerminalService {
     private static OSASCRIPT = '/usr/bin/osascript' // osascript is the AppleScript interpreter on OS X
 
-    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess> {
-        return new Promise<CP.ChildProcess>((resolve, reject) => {
+    public launchInTerminal(dir: string, args: string[], envVars: { [key: string]: string }): Promise<CP.ChildProcess | undefined> {
+        return new Promise<CP.ChildProcess | undefined>((resolve, reject) => {
             // first fix the PATH so that 'runtimePath' can be found if installed with 'brew'
             // Utilities.FixPathOnOSX();
 
@@ -230,7 +230,7 @@ class MacTerminalService extends DefaultTerminalService {
             osa.on('exit', (code: number) => {
                 if (code === 0) {
                     // OK
-                    resolve() // since cmd is not the terminal process but just the osa tool, we do not pass it in the resolve to the caller
+                    resolve(undefined) // since cmd is not the terminal process but just the osa tool, we do not pass it in the resolve to the caller
                 } else {
                     if (stderr) {
                         reject(new Error(stderr))
@@ -247,7 +247,7 @@ class MacTerminalService extends DefaultTerminalService {
 
 function extendObject<T>(objectCopy: T, object: T): T {
     for (let key in object) {
-        if (object.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(object, key)) {
             ;(<any>objectCopy)[key] = (<any>object)[key]
         }
     }

src/terminal.ts

@@ -79,7 +79,7 @@ describe('DbgpConnection', () => {
     })
 
     it('should error on invalid XML', () =>
-        new Promise((resolve, reject) => {
+        new Promise<void>((resolve, reject) => {
             conn.on('error', (error: Error) => {
                 assert.isDefined(error)
                 assert.instanceOf(error, Error)