Add project reference test, update release

rbuckton · rbuckton · commit 47febfda5e0a · 2018-06-13T16:50:57.000-07:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -98,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;
diff --git a/release/compiler.d.ts b/release/compiler.d.ts
@@ -18,11 +18,11 @@ export declare class ProjectCompiler implements ICompiler {
     prepare(project: ProjectInfo): void;
     inputFile(file: File): void;
     inputDone(): void;
-    private attachContentToFile(file, fileName, content);
-    private emit(result, callback);
-    private emitFile({file, jsFileName, dtsFileName, dtsMapFileName, jsContent, dtsContent, dtsMapContent, jsMapContent}, currentDirectory);
-    private reportDiagnostics(diagnostics);
-    private removeSourceMapComment(content);
+    private attachContentToFile;
+    private emit;
+    private emitFile;
+    private reportDiagnostics;
+    private removeSourceMapComment;
 }
 export declare class FileCompiler implements ICompiler {
     host: Host;
@@ -31,7 +31,8 @@ export declare class FileCompiler implements ICompiler {
     private previousOutput;
     private compilationResult;
     prepare(project: ProjectInfo): void;
-    private write(file, fileName, diagnostics, content, sourceMap);
+    private write;
     inputFile(file: File): void;
     inputDone(): void;
 }
+//# sourceMappingURL=compiler.d.ts.map
diff --git a/release/compiler.js b/release/compiler.js
@@ -32,7 +32,17 @@ class ProjectCompiler {
         this.project.options.sourceMap = this.hasSourceMap;
         const currentDirectory = utils.getCommonBasePathOfArray(rootFilenames.map(fileName => this.project.input.getFile(fileName).gulp.cwd));
         this.host = new host_1.Host(this.project.typescript, currentDirectory, this.project.input, 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 = reporter_1.emptyCompilationResult(this.project.options.noEmit);
         result.optionsErrors = this.reportDiagnostics(this.program.getOptionsDiagnostics());
         result.syntaxErrors = this.reportDiagnostics(this.program.getSyntacticDiagnostics());
diff --git a/release/host.d.ts b/release/host.d.ts
@@ -20,3 +20,4 @@ export declare class Host implements ts.CompilerHost {
     getDirectories: (path: string) => string[];
     directoryExists: (path: string) => boolean;
 }
+//# sourceMappingURL=host.d.ts.map
diff --git a/release/input.d.ts b/release/input.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="vinyl" />
 import * as ts from 'typescript';
 import * as utils from './utils';
 import * as VinylFile from 'vinyl';
@@ -7,11 +6,11 @@ export declare enum FileChangeState {
     Equal = 1,
     Modified = 2,
     Deleted = 3,
-    NotFound = 4,
+    NotFound = 4
 }
 export declare enum FileKind {
     Source = 0,
-    Config = 1,
+    Config = 1
 }
 export interface FileChange {
     previous: File;
@@ -39,11 +38,11 @@ export declare class FileDictionary {
     constructor(typescript: typeof ts);
     addGulp(gFile: VinylFile): File;
     addContent(fileName: string, content: string): File;
-    private addFile(file);
+    private addFile;
     getFile(name: string): File;
     initTypeScriptSourceFile: (file: File) => void;
     getFileNames(onlyGulp?: boolean): string[];
-    private getSourceFileNames(onlyGulp?);
+    private getSourceFileNames;
     commonBasePath: string;
     commonSourceDirectory: string;
 }
@@ -58,8 +57,8 @@ export declare class FileCache {
     addGulp(gFile: VinylFile): File;
     addContent(fileName: string, content: string): File;
     reset(): void;
-    private createDictionary();
-    private initTypeScriptSourceFile(file);
+    private createDictionary;
+    private initTypeScriptSourceFile;
     getFile(name: string): File;
     getFileChange(name: string): FileChange;
     getFileNames(onlyGulp?: boolean): string[];
@@ -68,3 +67,4 @@ export declare class FileCache {
     commonSourceDirectory: string;
     isChanged(onlyGulp?: boolean): boolean;
 }
+//# sourceMappingURL=input.d.ts.map
diff --git a/release/main.d.ts b/release/main.d.ts
@@ -47,3 +47,4 @@ declare module compile {
     function filter(...args: any[]): void;
 }
 export = compile;
+//# sourceMappingURL=main.d.ts.map
diff --git a/release/main.js b/release/main.js
@@ -86,6 +86,7 @@ function reportErrors(errors, typescript, ignore = []) {
         let projectDirectory = process.cwd();
         let typescript;
         let compilerOptions;
+        let projectReferences;
         let fileName;
         let rawConfig;
         if (fileNameOrSettings !== undefined) {
@@ -118,10 +119,11 @@ function reportErrors(errors, typescript, ignore = []) {
                     reportErrors(parsed.errors, typescript, [18003]);
                 }
                 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;
     }
     compile.createProject = createProject;
diff --git a/release/output.d.ts b/release/output.d.ts
@@ -13,11 +13,15 @@ export declare class Output {
     streamDts: stream.Readable;
     private pendingIO;
     writeJs(base: string, fileName: string, content: string, sourceMapContent: string, cwd: string, original: input.File): void;
-    writeDts(base: string, fileName: string, content: string, declarationMapContent: string, cwd: string, original: input.File): Promise<void>;
-    private applySourceMap(sourceMapContent, original, output);
+    private writeJsAsync;
+    writeDts(base: string, fileName: string, content: string, declarationMapContent: string, cwd: string, original: input.File): void;
+    private writeDtsAsync;
+    private applySourceMap;
+    private pipeRejection;
     finish(result: reporter.CompilationResult): void;
-    private mightFinish();
-    private getError(info);
+    private mightFinish;
+    private getError;
     diagnostic(info: ts.Diagnostic): void;
     error(error: reporter.TypeScriptError): void;
 }
+//# sourceMappingURL=output.d.ts.map
diff --git a/release/output.js b/release/output.js
@@ -23,23 +23,31 @@ class Output {
         this.streamDts = streamDts;
     }
     writeJs(base, fileName, content, sourceMapContent, cwd, original) {
-        const file = new VinylFile({
-            path: fileName,
-            contents: Buffer.from(content),
-            cwd,
-            base
-        });
-        this.pendingIO++;
-        this.applySourceMap(sourceMapContent, original, file).then(appliedSourceMap => {
-            if (appliedSourceMap)
-                file.sourceMap = JSON.parse(appliedSourceMap);
-            this.streamFull.push(file);
-            this.streamJs.push(file);
-            this.pendingIO--;
-            this.mightFinish();
+        this.pipeRejection(this.writeJsAsync(base, fileName, content, sourceMapContent, cwd, original), this.streamJs);
+    }
+    writeJsAsync(base, fileName, content, sourceMapContent, cwd, original) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const file = new VinylFile({
+                path: fileName,
+                contents: Buffer.from(content),
+                cwd,
+                base
+            });
+            this.pendingIO++;
+            yield this.applySourceMap(sourceMapContent, original, file).then(appliedSourceMap => {
+                if (appliedSourceMap)
+                    file.sourceMap = JSON.parse(appliedSourceMap);
+                this.streamFull.push(file);
+                this.streamJs.push(file);
+                this.pendingIO--;
+                this.mightFinish();
+            });
         });
     }
     writeDts(base, fileName, content, declarationMapContent, cwd, original) {
+        this.pipeRejection(this.writeDtsAsync(base, fileName, content, declarationMapContent, cwd, original), this.streamDts);
+    }
+    writeDtsAsync(base, fileName, content, declarationMapContent, cwd, original) {
         return __awaiter(this, void 0, void 0, function* () {
             const file = new VinylFile({
                 path: fileName,
@@ -48,7 +56,7 @@ class Output {
                 base
             });
             this.pendingIO++;
-            this.applySourceMap(declarationMapContent, original, file).then(appliedSourceMap => {
+            yield this.applySourceMap(declarationMapContent, original, file).then(appliedSourceMap => {
                 if (appliedSourceMap)
                     file.sourceMap = JSON.parse(appliedSourceMap);
                 this.streamFull.push(file);
@@ -102,6 +110,13 @@ class Output {
             }
         });
     }
+    // Avoids UnhandledPromiseRejectionWarning in NodeJS
+    pipeRejection(promise, alternateStream) {
+        promise.catch(err => {
+            this.streamFull.emit("error", err);
+            alternateStream.emit("error", err);
+        });
+    }
     finish(result) {
         this.result = result;
         this.mightFinish();
diff --git a/release/project.d.ts b/release/project.d.ts
@@ -15,19 +15,22 @@ export interface Project {
     readonly rawConfig: any;
     readonly config: TsConfig;
     readonly options: ts.CompilerOptions;
+    readonly projectReferences: ReadonlyArray<ts.ProjectReference> | undefined;
 }
 export interface ProjectInfo {
     input: FileCache;
     output: Output;
     compiler: ICompiler;
     singleOutput: boolean;
     options: ts.CompilerOptions;
+    projectReferences: ReadonlyArray<ts.ProjectReference>;
     typescript: typeof ts;
     directory: string;
     reporter: Reporter;
 }
-export declare function setupProject(projectDirectory: string, configFileName: string, rawConfig: any, config: TsConfig, options: ts.CompilerOptions, typescript: typeof ts): Project;
+export declare function setupProject(projectDirectory: string, configFileName: string, rawConfig: any, config: TsConfig, options: ts.CompilerOptions, projectReferences: ReadonlyArray<ts.ProjectReference>, typescript: typeof ts): Project;
 export interface ICompileStream extends NodeJS.ReadWriteStream {
     js: stream.Readable;
     dts: stream.Readable;
 }
+//# sourceMappingURL=project.d.ts.map
diff --git a/release/project.js b/release/project.js
@@ -18,7 +18,7 @@ const reporter_1 = require("./reporter");
 const input_1 = require("./input");
 const output_1 = require("./output");
 const compiler_1 = require("./compiler");
-function setupProject(projectDirectory, configFileName, rawConfig, config, options, typescript) {
+function setupProject(projectDirectory, configFileName, rawConfig, config, options, projectReferences, typescript) {
     const input = new input_1.FileCache(typescript, options);
     const compiler = options.isolatedModules ? new compiler_1.FileCompiler() : new compiler_1.ProjectCompiler();
     let running = false;
@@ -51,11 +51,13 @@ function setupProject(projectDirectory, configFileName, rawConfig, config, optio
     project.rawConfig = rawConfig;
     project.config = config;
     project.options = options;
+    project.projectReferences = projectReferences;
     const projectInfo = {
         input,
         singleOutput,
         compiler,
         options,
+        projectReferences,
         typescript,
         directory: projectDirectory,
         // Set when `project` is called
diff --git a/release/reporter.d.ts b/release/reporter.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="vinyl" />
 import * as ts from 'typescript';
 import * as VinylFile from 'vinyl';
 export interface TypeScriptError extends Error {
@@ -42,3 +41,4 @@ export declare function nullReporter(): Reporter;
 export declare function defaultReporter(): Reporter;
 export declare function longReporter(): Reporter;
 export declare function fullReporter(fullFilename?: boolean): Reporter;
+//# sourceMappingURL=reporter.d.ts.map
diff --git a/release/types.d.ts b/release/types.d.ts
@@ -4,3 +4,4 @@ export interface TsConfig {
     exclude?: string[];
     compilerOptions?: any;
 }
+//# sourceMappingURL=types.d.ts.map
diff --git a/release/utils.d.ts b/release/utils.d.ts
@@ -21,3 +21,4 @@ export declare function getCommonBasePathOfArray(paths: string[]): string;
 export declare function getError(info: ts.Diagnostic, typescript: typeof ts, file?: File): reporter.TypeScriptError;
 export declare function deprecate(title: string, alternative: string, description?: string): void;
 export declare function message(title: string, alternative: string, description?: string): void;
+//# sourceMappingURL=utils.d.ts.map
diff --git a/test/baselines/tsconfigProjectReferences/dev/dts/b.d.ts b/test/baselines/tsconfigProjectReferences/dev/dts/b.d.ts
@@ -0,0 +1,4 @@
+/* Input file C:/dev/gulp-typescript/test/tsconfigProjectReferences/a/a.d.ts was missing */
+
+declare const b = 1;
+//# sourceMappingURL=b.d.ts.map
diff --git a/test/baselines/tsconfigProjectReferences/dev/dts/b.d.ts.map b/test/baselines/tsconfigProjectReferences/dev/dts/b.d.ts.map
diff --git a/test/baselines/tsconfigProjectReferences/dev/errors.txt b/test/baselines/tsconfigProjectReferences/dev/errors.txt
@@ -0,0 +1,10 @@
+{
+    "transpileErrors": 0,
+    "optionsErrors": 0,
+    "syntaxErrors": 0,
+    "globalErrors": 0,
+    "semanticErrors": 0,
+    "declarationErrors": 0,
+    "emitErrors": 0,
+    "emitSkipped": false
+}
diff --git a/test/baselines/tsconfigProjectReferences/dev/js/b.js b/test/baselines/tsconfigProjectReferences/dev/js/b.js
diff --git a/test/baselines/tsconfigProjectReferences/dev/js/b.js.map b/test/baselines/tsconfigProjectReferences/dev/js/b.js.map
diff --git a/test/tsconfigProjectReferences/a/a.d.ts b/test/tsconfigProjectReferences/a/a.d.ts
diff --git a/test/tsconfigProjectReferences/a/a.d.ts.map b/test/tsconfigProjectReferences/a/a.d.ts.map
diff --git a/test/tsconfigProjectReferences/a/a.js b/test/tsconfigProjectReferences/a/a.js
diff --git a/test/tsconfigProjectReferences/a/a.js.map b/test/tsconfigProjectReferences/a/a.js.map
diff --git a/test/tsconfigProjectReferences/a/a.ts b/test/tsconfigProjectReferences/a/a.ts
@@ -0,0 +1 @@
+const a = 1;
diff --git a/test/tsconfigProjectReferences/a/tsconfig.json b/test/tsconfigProjectReferences/a/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "composite": true,
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true,
+        "outFile": "a.js"
+    },
+    "files": [
+        "a.ts"
+    ]
+}
diff --git a/test/tsconfigProjectReferences/b/b.ts b/test/tsconfigProjectReferences/b/b.ts
@@ -0,0 +1 @@
+const b = 1;
diff --git a/test/tsconfigProjectReferences/b/tsconfig.json b/test/tsconfigProjectReferences/b/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "composite": true,
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true,
+        "outFile": "b.js"
+    },
+    "files": [
+        "b.ts"
+    ],
+    "references": [
+        { "path": "../a", "prepend": true }
+    ]
+}
diff --git a/test/tsconfigProjectReferences/gulptask.js b/test/tsconfigProjectReferences/gulptask.js

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,4 @@ export declare class Host implements ts.CompilerHost {`
`20`	`20`	`getDirectories: (path: string) => string[];`
`21`	`21`	`directoryExists: (path: string) => boolean;`
`22`	`22`	`}`
	`23`	`+//# sourceMappingURL=host.d.ts.map`
Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,4 @@ declare module compile {`
`47`	`47`	`function filter(...args: any[]): void;`
`48`	`48`	`}`
`49`	`49`	`export = compile;`
	`50`	`+//# sourceMappingURL=main.d.ts.map`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ function reportErrors(errors, typescript, ignore = []) {`
`86`	`86`	`let projectDirectory = process.cwd();`
`87`	`87`	`let typescript;`
`88`	`88`	`let compilerOptions;`
	`89`	`+ let projectReferences;`
`89`	`90`	`let fileName;`
`90`	`91`	`let rawConfig;`
`91`	`92`	`if (fileNameOrSettings !== undefined) {`
`@@ -118,10 +119,11 @@ function reportErrors(errors, typescript, ignore = []) {`
`118`	`119`	`reportErrors(parsed.errors, typescript, [18003]);`
`119`	`120`	`}`
`120`	`121`	`compilerOptions = parsed.options;`
	`122`	`+ projectReferences = parsed.projectReferences;`
`121`	`123`	`}`
`122`	`124`	`}`
`123`	`125`	`normalizeCompilerOptions(compilerOptions, typescript);`
`124`		`- const project = _project.setupProject(projectDirectory, tsConfigFileName, rawConfig, tsConfigContent, compilerOptions, typescript);`
	`126`	`+ const project = _project.setupProject(projectDirectory, tsConfigFileName, rawConfig, tsConfigContent, compilerOptions, projectReferences, typescript);`
`125`	`127`	`return project;`
`126`	`128`	`}`
`127`	`129`	`compile.createProject = createProject;`