Merge pull request #579 from rbuckton/projectReferences

Add support for TS3.0 projectReferences

Author: ivogabe

.gitmodules

@@ -11,3 +11,7 @@
 [submodule "typescript/2.9"]
 	path = typescript/2.9
 	url = https://github.com/Microsoft/TypeScript
+[submodule "typescript/2.7"]
+	path = typescript/2.7
+	url = https://github.com/Microsoft/TypeScript.git
+	branch = release-2.7

gulpfile.js

@@ -11,6 +11,7 @@ const diff = require('gulp-diff');
 const tsVersions = {
 	dev: './typescript/dev',
 	release23: './typescript/2.3',
+	release27: './typescript/2.7',
 	release29: './typescript/2.9'
 };
 
@@ -74,7 +75,7 @@ const typecheck = gulp.parallel(typecheckDev, typecheck2_3);
 
 // We run every test on multiple typescript versions:
 const libs = [
-	['2.7', undefined],
+	['2.7', require(tsVersions.release27)],
 	['2.3', require(tsVersions.release23)],
 	['2.9', require(tsVersions.release29)],
 	['dev', require(tsVersions.dev)]
@@ -97,8 +98,11 @@ async function runTest(name) {
 	const newGulpTs = require('./release-2/main');
 	const testTask = require(`./${path.posix.join(testDir, 'gulptask.js')}`);
 
+	const matchingLibs = testTask.match ? libs.filter(([, tsLib]) => testTask.match(tsLib)) : libs;
+	if (matchingLibs.length === 0) return Promise.resolve();
+
 	fs.mkdirSync(outputDir);
-	return Promise.all(libs.map(([tsVersion, tsLib]) => {
+	return Promise.all(matchingLibs.map(([tsVersion, tsLib]) => {
 		return new Promise((resolve, reject) => {
 			const errors = [];
 			let finishInfo;

lib/compiler.ts

@@ -72,7 +72,17 @@ export class ProjectCompiler implements ICompiler {
 			this.project.options
 		);
 
-		this.program = this.project.typescript.createProgram(rootFilenames, this.project.options, this.host, this.program);
+		// Calling `createProgram` with an object is only supported in 3.0. Only call this overload
+		// if we have project references (also only supported in 3.0)
+		this.program = this.project.projectReferences
+			? this.project.typescript.createProgram({
+				rootNames: rootFilenames,
+				options: this.project.options,
+				projectReferences: this.project.projectReferences,
+				host: this.host,
+				oldProgram: this.program
+			})
+			: this.project.typescript.createProgram(rootFilenames, this.project.options, this.host, this.program);
 
 		const result = emptyCompilationResult(this.project.options.noEmit);
 		result.optionsErrors = this.reportDiagnostics(this.program.getOptionsDiagnostics());

lib/main.ts

@@ -151,6 +151,7 @@ module compile {
 		let projectDirectory = process.cwd();
 		let typescript: typeof ts;
 		let compilerOptions: ts.CompilerOptions;
+		let projectReferences: ReadonlyArray<ts.ProjectReference>;
 		let fileName: string;
 
 		let rawConfig: any;
@@ -199,11 +200,12 @@ module compile {
 				}
 
 				compilerOptions = parsed.options;
+				projectReferences = parsed.projectReferences;
 			}
 		}
 
 		normalizeCompilerOptions(compilerOptions, typescript);
-		const project = _project.setupProject(projectDirectory, tsConfigFileName, rawConfig, tsConfigContent, compilerOptions, typescript);
+		const project = _project.setupProject(projectDirectory, tsConfigFileName, rawConfig, tsConfigContent, compilerOptions, projectReferences, typescript);
 
 		return project;
 	}

lib/output.ts

@@ -29,6 +29,10 @@ export class Output {
 	private pendingIO = 0;
 
 	writeJs(base: string, fileName: string, content: string, sourceMapContent: string, cwd: string, original: input.File) {
+		this.pipeRejection(this.writeJsAsync(base, fileName, content, sourceMapContent, cwd, original), this.streamJs);
+	}
+
+	private async writeJsAsync(base: string, fileName: string, content: string, sourceMapContent: string, cwd: string, original: input.File) {
 		const file = new VinylFile({
 			path: fileName,
 			contents: Buffer.from(content),
@@ -38,7 +42,7 @@ export class Output {
 
 		this.pendingIO++;
 
-		this.applySourceMap(sourceMapContent, original, file).then(appliedSourceMap => {
+		await this.applySourceMap(sourceMapContent, original, file).then(appliedSourceMap => {
 			if (appliedSourceMap) file.sourceMap = JSON.parse(appliedSourceMap);
 			this.streamFull.push(file);
 			this.streamJs.push(file);
@@ -48,7 +52,11 @@ export class Output {
 		});
 	}
 
-	async writeDts(base: string, fileName: string, content: string, declarationMapContent: string, cwd: string, original: input.File) {
+	writeDts(base: string, fileName: string, content: string, declarationMapContent: string, cwd: string, original: input.File) {
+		this.pipeRejection(this.writeDtsAsync(base, fileName, content, declarationMapContent, cwd, original), this.streamDts);
+	}
+
+	private async writeDtsAsync(base: string, fileName: string, content: string, declarationMapContent: string, cwd: string, original: input.File) {
 		const file = new VinylFile({
 			path: fileName,
 			contents: Buffer.from(content),
@@ -58,7 +66,7 @@ export class Output {
 
 		this.pendingIO++;
 
-		this.applySourceMap(declarationMapContent, original, file).then(appliedSourceMap => {
+		await this.applySourceMap(declarationMapContent, original, file).then(appliedSourceMap => {
 			if (appliedSourceMap) file.sourceMap = JSON.parse(appliedSourceMap);
 			this.streamFull.push(file);
 			this.streamDts.push(file);
@@ -118,12 +126,20 @@ export class Output {
 		}
 	}
 
+	// Avoids UnhandledPromiseRejectionWarning in NodeJS
+	private pipeRejection<T>(promise: Promise<T>, alternateStream: stream.Readable) {
+		promise.catch(err => {
+			this.streamFull.emit("error", err);
+			alternateStream.emit("error", err);
+		});
+	}
+
 	finish(result: reporter.CompilationResult) {
 		this.result = result;
 
 		this.mightFinish();
 	}
-	
+
 	private mightFinish() {
 		if (this.result === undefined || this.pendingIO !== 0) return;
 

lib/project.ts

@@ -22,6 +22,7 @@ interface PartialProject {
 	rawConfig?: any;
 	config?: TsConfig;
 	options?: ts.CompilerOptions;
+	projectReferences?: ReadonlyArray<ts.ProjectReference>;
 }
 export interface Project {
 	(reporter?: Reporter): ICompileStream;
@@ -34,6 +35,7 @@ export interface Project {
 	readonly rawConfig: any;
 	readonly config: TsConfig;
 	readonly options: ts.CompilerOptions;
+	readonly projectReferences: ReadonlyArray<ts.ProjectReference> | undefined;
 }
 
 export interface ProjectInfo {
@@ -42,12 +44,13 @@ export interface ProjectInfo {
 	compiler: ICompiler;
 	singleOutput: boolean;
 	options: ts.CompilerOptions;
+	projectReferences: ReadonlyArray<ts.ProjectReference>;
 	typescript: typeof ts;
 	directory: string;
 	reporter: Reporter;
 }
 
-export function setupProject(projectDirectory: string, configFileName: string, rawConfig: any, config: TsConfig, options: ts.CompilerOptions, typescript: typeof ts) {
+export function setupProject(projectDirectory: string, configFileName: string, rawConfig: any, config: TsConfig, options: ts.CompilerOptions, projectReferences: ReadonlyArray<ts.ProjectReference>, typescript: typeof ts) {
 	const input = new FileCache(typescript, options);
 	const compiler: ICompiler = options.isolatedModules ? new FileCompiler() : new ProjectCompiler();
 	let running = false;
@@ -88,12 +91,14 @@ export function setupProject(projectDirectory: string, configFileName: string, r
 	project.rawConfig = rawConfig;
 	project.config = config;
 	project.options = options;
+	project.projectReferences = projectReferences;
 
 	const projectInfo: ProjectInfo = {
 		input,
 		singleOutput,
 		compiler,
 		options,
+		projectReferences,
 		typescript,
 		directory: projectDirectory,
 		// Set when `project` is called