Show error count, fix #138

Author: ivogabe

lib/compiler.ts

@@ -8,6 +8,7 @@ import { Output, OutputFileKind } from './output';
 import { Host } from './host';
 import { Project } from './project';
 import { Filter } from './filter';
+import { CompilationResult, emptyCompilationResult } from './reporter';
 import * as utils from './utils';
 
 export interface ICompiler {
@@ -38,7 +39,7 @@ export class ProjectCompiler implements ICompiler {
 
 	inputDone() {
 		if (!this.project.input.firstSourceFile) {
-			this.project.output.finish();
+			this.project.output.finish(emptyCompilationResult());
 			return;
 		}
 
@@ -58,6 +59,8 @@ export class ProjectCompiler implements ICompiler {
 					this.project.output.write(file.fileName + '.d.ts', file.content[OutputFileKind.Definitions]);
 				}
 			}
+			
+			this.project.output.finish(old.results);
 
 			return;
 		}
@@ -91,7 +94,7 @@ export class ProjectCompiler implements ICompiler {
 		// Creating a program to compile the sources
 		this.program = this.project.typescript.createProgram(rootFilenames, this.project.options, this.host);
 
-		const errors = tsApi.getDiagnosticsAndEmit(this.program);
+		const [errors, result] = tsApi.getDiagnosticsAndEmit(this.program);
 
 		for (let i = 0; i < errors.length; i++) {
 			this.project.output.diagnostic(errors[i]);
@@ -103,7 +106,7 @@ export class ProjectCompiler implements ICompiler {
 			this.project.output.write(fileName, this.host.output[fileName]);
 		}
 
-		this.project.output.finish();
+		this.project.output.finish(result);
 	}
 
 	private _commonBaseDiff: [number, string];

lib/output.ts

@@ -42,6 +42,7 @@ export class Output {
 	project: project.Project;
 	files: utils.Map<OutputFile> = {};
 	errors: reporter.TypeScriptError[] = [];
+	results: reporter.CompilationResult;
 	streamJs: stream.Readable;
 	streamDts: stream.Readable;
 
@@ -196,7 +197,7 @@ export class Output {
 		}
 	}
 
-	finish() {
+	finish(results: reporter.CompilationResult) {
 		if (this.project.sortOutput) {
 			let sortedEmit = (fileName: string) => {
 				let file = this.files[fileName];
@@ -215,6 +216,9 @@ export class Output {
 				sortedEmit(fileName);
 			}
 		}
+		
+		this.results = results;
+		if (this.project.reporter.finish) this.project.reporter.finish(results);
 
 		this.streamJs.push(null);
 		this.streamDts.push(null);

lib/reporter.ts

@@ -23,9 +23,48 @@ export interface TypeScriptError extends Error {
 		character: number;
     };
 }
+export interface CompilationResult {
+	syntaxErrors: number;
+	globalErrors: number;
+	semanticErrors: number;
+	emitErrors: number;
+	
+	emitSkipped: boolean;
+}
+export function emptyCompilationResult() {
+	return {
+		syntaxErrors: 0,
+		globalErrors: 0,
+		semanticErrors: 0,
+		emitErrors: 0,
+		emitSkipped: false
+	}
+}
 
 export interface Reporter {
 	error?: (error: TypeScriptError, typescript: typeof ts) => void;
+	finish?: (results: CompilationResult) => void;
+}
+
+function defaultFinishHandler(results: CompilationResult) {
+	let hasError = false;
+	const showErrorCount = (count: number, type: string) => {
+		if (count === 0) return;
+		
+		gutil.log('TypeScript:', gutil.colors.magenta(count.toString()), type + ' ' + (count === 1 ? 'error' : 'errors'));
+		hasError = true;
+	};
+	
+	showErrorCount(results.syntaxErrors, 'syntax');
+	showErrorCount(results.globalErrors, 'global');
+	showErrorCount(results.semanticErrors, 'semantic');
+	showErrorCount(results.emitErrors, 'emit');
+	
+	if (results.emitSkipped) {
+		gutil.log('TypeScript: emit', gutil.colors.red('failed'));
+	} else if (hasError) {
+		gutil.log('TypeScript: emit', gutil.colors.cyan('succeeded'), '(with errors)');
+	}
 }
 
 export function nullReporter(): Reporter {
@@ -35,7 +74,8 @@ export function defaultReporter(): Reporter {
 	return {
 		error: (error: TypeScriptError) => {
 			console.error(error.message);
-		}
+		},
+		finish: defaultFinishHandler
 	};
 }
 
@@ -63,7 +103,8 @@ export function longReporter(): Reporter {
 			} else {
 				console.error(error.message);
 			}
-		}
+		},
+		finish: defaultFinishHandler
 	}
 }
 export function fullReporter(fullFilename: boolean = false): Reporter {
@@ -95,6 +136,7 @@ export function fullReporter(fullFilename: boolean = false): Reporter {
 					);
 				}
 			}
-		}
+		},
+		finish: defaultFinishHandler
 	}
 }

lib/tsapi.ts

@@ -1,4 +1,5 @@
 import * as ts from 'typescript';
+import { CompilationResult, emptyCompilationResult } from './reporter';
 
 export interface TypeScript14 {
 	createSourceFile(filename: string, content: string, target: ts.ScriptTarget, version: string);
@@ -22,12 +23,12 @@ export interface Program15 {
 	getGlobalDiagnostics(): ts.Diagnostic[];
 	getSemanticDiagnostics(): ts.Diagnostic[];
 	getDeclarationDiagnostics(): ts.Diagnostic[];
-	emit(): { diagnostics: ts.Diagnostic[]; };
+	emit(): { diagnostics: ts.Diagnostic[]; emitSkipped: boolean; };
 }
 
 export interface TypeChecker14 {
 	getDiagnostics(sourceFile?: ts.SourceFile): ts.Diagnostic[];
-	emitFiles(): { diagnostics: ts.Diagnostic[] };
+	emitFiles(): { diagnostics: ts.Diagnostic[]; };
 }
 export interface DiagnosticMessageChain15 {
 	messageText: string;
@@ -54,9 +55,13 @@ export function getFileName(thing: { filename: string} | { fileName: string }):
 	if ((<any> thing).filename) return (<any> thing).filename; // TS 1.4
 	return (<any> thing).fileName; // TS 1.5
 }
-export function getDiagnosticsAndEmit(program: Program14 | Program15): ts.Diagnostic[] {
+export function getDiagnosticsAndEmit(program: Program14 | Program15): [ts.Diagnostic[], CompilationResult] {
+	let result = emptyCompilationResult();
+	
 	if ((<Program14> program).getDiagnostics) { // TS 1.4
 		let errors = (<Program14> program).getDiagnostics();
+		
+		result.syntaxErrors = errors.length;
 
 		if (!errors.length) {
 			// If there are no syntax errors, check types
@@ -67,21 +72,34 @@ export function getDiagnosticsAndEmit(program: Program14 | Program15): ts.Diagno
 			const emitErrors = checker.emitFiles().diagnostics;
 
 			errors = semanticErrors.concat(emitErrors);
+			result.semanticErrors = errors.length;
+		} else {
+			result.emitSkipped = true;
 		}
 
-		return errors;
+		return [errors, result];
 	} else { // TS 1.5
 		let errors = (<Program15> program).getSyntacticDiagnostics();
-		if (errors.length === 0) errors = (<Program15> program).getGlobalDiagnostics();
-		
-		// Remove error: "File '...' is not under 'rootDir' '...'. 'rootDir' is expected to contain all source files."
-		// This is handled by ICompiler#correctSourceMap, so this error can be muted.
-		errors = errors.filter((item) => item.code !== 6059);
+		result.syntaxErrors = errors.length;
+		if (errors.length === 0) {
+			errors = (<Program15> program).getGlobalDiagnostics();
+			
+			// Remove error: "File '...' is not under 'rootDir' '...'. 'rootDir' is expected to contain all source files."
+			// This is handled by ICompiler#correctSourceMap, so this error can be muted.
+			errors = errors.filter((item) => item.code !== 6059);
+			
+			result.globalErrors = errors.length;
+		}
 
-		if (errors.length === 0) errors = (<Program15> program).getSemanticDiagnostics();
+		if (errors.length === 0) {
+			errors = (<Program15> program).getSemanticDiagnostics();
+			result.semanticErrors = errors.length;
+		}
 
 		const emitOutput = (<Program15> program).emit();
-		return errors.concat(emitOutput.diagnostics);
+		result.emitErrors = emitOutput.diagnostics.length;
+		result.emitSkipped = emitOutput.emitSkipped;
+		return [errors.concat(emitOutput.diagnostics), result];
 	}
 }
 export function getLineAndCharacterOfPosition(typescript: typeof ts, file: TSFile14 | TSFile15, position: number) {