Combine forEachExpectedEmitFile and forEachEmittedFile

Andy Hanson · Andy Hanson · commit a32914f6872b · 2017-01-23T11:14:29.000-08:00
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -32,7 +32,7 @@ namespace ts {
 
     export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] {
         const declarationDiagnostics = createDiagnosticCollection();
-        forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
+        forEachEmittedFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
         return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
 
         function getDeclarationDiagnosticsFromFile({ declarationFilePath }: EmitFileNames, sources: SourceFile[], isBundledEmit: boolean) {
@@ -1788,7 +1788,7 @@ namespace ts {
             }
             else {
                 // Get the declaration file path
-                forEachExpectedEmitFile(host, getDeclFileName, referencedFile, emitOnlyDtsFiles);
+                forEachEmittedFile(host, getDeclFileName, referencedFile, emitOnlyDtsFiles);
             }
 
             if (declFileName) {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -73,7 +73,7 @@ namespace ts {
 
         // Emit each output file
         performance.mark("beforePrint");
-        forEachEmittedFile(host, transformed, emitFile, emitOnlyDtsFiles);
+        forEachEmittedFile(host, emitFile, transformed, emitOnlyDtsFiles);
         performance.measure("printTime", "beforePrint");
 
         // Clean up emit nodes on parse tree
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1707,7 +1707,7 @@ namespace ts {
             if (!options.noEmit && !options.suppressOutputPathCheck) {
                 const emitHost = getEmitHost();
                 const emitFilesSeen = createFileMap<boolean>(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined);
-                forEachExpectedEmitFile(emitHost, (emitFileNames) => {
+                forEachEmittedFile(emitHost, (emitFileNames) => {
                     verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen);
                     verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen);
                 });
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2590,27 +2590,20 @@ namespace ts {
     }
 
     /**
-     * Iterates over the source files that are expected to have an emit output. This function
-     * is used by the legacy emitter and the declaration emitter and should not be used by
-     * the tree transforming emitter.
+     * Iterates over the source files that are expected to have an emit output.
      *
      * @param host An EmitHost.
      * @param action The action to execute.
-     * @param targetSourceFile An optional target source file to emit.
+     * @param sourceFilesOrTargetSourceFile
+     *   If an array, the full list of source files to emit.
+     *   Else, calls `getSourceFilesToEmit` with the (optional) target source file to determine the list of source files to emit.
      */
-    export function forEachExpectedEmitFile(host: EmitHost,
-        action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean, emitOnlyDtsFiles: boolean) => void,
-        targetSourceFile?: SourceFile,
+    export function forEachEmittedFile(
+        host: EmitHost, action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean, emitOnlyDtsFiles: boolean) => void,
+        sourceFilesOrTargetSourceFile?: SourceFile[] | SourceFile,
         emitOnlyDtsFiles?: boolean) {
-        forEachEmittedFile(host, getSourceFilesToEmit(host, targetSourceFile), action, emitOnlyDtsFiles);
-    }
 
-    /**
-     * Iterates over each source file to emit.
-     */
-    export function forEachEmittedFile(host: EmitHost, sourceFiles: SourceFile[],
-        action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean, emitOnlyDtsFiles: boolean) => void,
-        emitOnlyDtsFiles?: boolean) {
+        const sourceFiles = isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile);
         const options = host.getCompilerOptions();
         if (options.outFile || options.out) {
             if (sourceFiles.length) {
@@ -2622,7 +2615,6 @@ namespace ts {
         }
         else {
             for (const sourceFile of sourceFiles) {
-                const options = host.getCompilerOptions();
                 const jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, getOutputExtension(sourceFile, options));
                 const sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
                 const declarationFilePath = !isSourceFileJavaScript(sourceFile) && (emitOnlyDtsFiles || options.declaration) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace ts {`
`32`	`32`
`33`	`33`	`export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] {`
`34`	`34`	`const declarationDiagnostics = createDiagnosticCollection();`
`35`		`- forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);`
	`35`	`+ forEachEmittedFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);`
`36`	`36`	`return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);`
`37`	`37`
`38`	`38`	`function getDeclarationDiagnosticsFromFile({ declarationFilePath }: EmitFileNames, sources: SourceFile[], isBundledEmit: boolean) {`
`@@ -1788,7 +1788,7 @@ namespace ts {`
`1788`	`1788`	`}`
`1789`	`1789`	`else {`
`1790`	`1790`	`// Get the declaration file path`
`1791`		`- forEachExpectedEmitFile(host, getDeclFileName, referencedFile, emitOnlyDtsFiles);`
	`1791`	`+ forEachEmittedFile(host, getDeclFileName, referencedFile, emitOnlyDtsFiles);`
`1792`	`1792`	`}`
`1793`	`1793`
`1794`	`1794`	`if (declFileName) {`