Merge pull request #169 from NativeScript/iiivanov/terminate-session-on-ts-error

Stop debugger on TypeScript compile error

Author: ivanovit

src/debug-adapter/webKitDebugAdapter.ts

@@ -170,6 +170,9 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
 
             if (cliCommand.tnsProcess) {
                 this._tnsProcess = cliCommand.tnsProcess;
+                cliCommand.tnsOutputEventEmitter.on("tsCompilationError", () => {
+                    this.fireEvent(new TerminatedEvent());
+                });
                 cliCommand.tnsProcess.stdout.on('data', data => { Services.logger().log(data.toString(), Tags.FrontendMessage); });
                 cliCommand.tnsProcess.stderr.on('data', data => { Services.logger().error(data.toString(), Tags.FrontendMessage); });
                 cliCommand.tnsProcess.on('close', (code, signal) => {

src/project/androidProject.ts

@@ -40,7 +40,9 @@ export class AndroidProject extends Project {
         return { tnsProcess: debugProcess, tnsOutputEventEmitter: tnsOutputEventEmitter };
     }
 
-    private configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter, attach: boolean): void {
+    protected configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter, attach?: boolean): void {
+        super.configureReadyEvent(readableStream, eventEmitter);
+
         let debugPort = null;
         new scanner.StringMatchingScanner(readableStream).onEveryMatch(new RegExp("device: .* debug port: [0-9]+"), (match: scanner.MatchFound) => {
             //device: {device-name} debug port: {debug-port}

src/project/iosProject.ts

@@ -44,7 +44,9 @@ export class IosProject extends Project {
         return { tnsProcess: debugProcess, tnsOutputEventEmitter: tnsOutputEventEmitter };
     }
 
-    private configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter): void {
+    protected configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter): void {
+        super.configureReadyEvent(readableStream, eventEmitter);
+
         let socketPathPrefix = 'socket-file-location: ';
         let streamScanner = new scanner.StringMatchingScanner(readableStream);
         streamScanner.onEveryMatch(new RegExp(socketPathPrefix + '.*\.sock'), (match: scanner.MatchFound) => {

src/project/project.ts

@@ -2,6 +2,8 @@ import {ChildProcess} from 'child_process';
 import {EventEmitter} from 'events';
 import {Version} from '../common/version';
 import {NativeScriptCli} from './nativeScriptCli';
+import * as stream from 'stream';
+import * as scanner from './streamScanner';
 
 export type DebugResult = { tnsProcess: ChildProcess, tnsOutputEventEmitter: EventEmitter };
 
@@ -28,6 +30,12 @@ export abstract class Project {
 
     public abstract debug(options: { stopOnEntry: boolean, watch: boolean }, tnsArgs?: string[]): DebugResult;
 
+    protected configureReadyEvent(readableStream: stream.Readable, eventEmitter: EventEmitter): void {
+        new scanner.StringMatchingScanner(readableStream).onEveryMatch("TypeScript compiler failed", () => {
+            eventEmitter.emit('tsCompilationError');
+        });
+    }
+
     protected executeRunCommand(args: string[]): ChildProcess {
         return this.cli.execute(["run", this.platformName()].concat(args), this._appRoot);
     }