Dont emit dts if we want to emit only js files even though options suggest emitting d.ts files as well

Author: sheetalkamat

src/compiler/builder.ts

@@ -1349,6 +1349,13 @@ namespace ts {
                         getPendingEmitKind(state.programEmitPending, emitKind) :
                         undefined;
             }
+            let emitOnly: EmitOnly | undefined;
+            if (emitKind & BuilderFileEmit.AllJs) {
+                emitOnly = EmitOnly.Js;
+            }
+            if (emitKind & BuilderFileEmit.AllDts) {
+                emitOnly = emitOnly === undefined ? EmitOnly.Dts : undefined;
+            }
             return toAffectedFileEmitResult(
                 state,
                 // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
@@ -1359,7 +1366,7 @@ namespace ts {
                         getWriteFileCallback(writeFile, customTransformers) :
                         writeFile || maybeBind(host, host.writeFile),
                     cancellationToken,
-                    emitOnlyDtsFiles || !(emitKind & BuilderFileEmit.AllJs),
+                    emitOnly,
                     customTransformers
                 ),
                 affected,

src/compiler/emitter.ts

@@ -278,7 +278,7 @@ namespace ts {
 
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile | undefined, { scriptTransformers, declarationTransformers }: EmitTransformers, emitOnlyDtsFiles?: boolean, onlyBuildInfo?: boolean, forceDtsEmit?: boolean): EmitResult {
+    export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile | undefined, { scriptTransformers, declarationTransformers }: EmitTransformers, emitOnly?: boolean | EmitOnly, onlyBuildInfo?: boolean, forceDtsEmit?: boolean): EmitResult {
         const compilerOptions = host.getCompilerOptions();
         const sourceMapDataList: SourceMapEmitResult[] | undefined = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         const emittedFilesList: string[] | undefined = compilerOptions.listEmittedFiles ? [] : undefined;
@@ -331,7 +331,7 @@ namespace ts {
             tracing?.pop();
 
             if (!emitSkipped && emittedFilesList) {
-                if (!emitOnlyDtsFiles) {
+                if (!emitOnly) {
                     if (jsFilePath) {
                         emittedFilesList.push(jsFilePath);
                     }
@@ -342,11 +342,13 @@ namespace ts {
                         emittedFilesList.push(buildInfoPath);
                     }
                 }
-                if (declarationFilePath) {
-                    emittedFilesList.push(declarationFilePath);
-                }
-                if (declarationMapPath) {
-                    emittedFilesList.push(declarationMapPath);
+                if (emitOnly !== EmitOnly.Js) {
+                    if (declarationFilePath) {
+                        emittedFilesList.push(declarationFilePath);
+                    }
+                    if (declarationMapPath) {
+                        emittedFilesList.push(declarationMapPath);
+                    }
                 }
             }
 
@@ -372,7 +374,7 @@ namespace ts {
             jsFilePath: string | undefined,
             sourceMapFilePath: string | undefined,
             relativeToBuildInfo: (path: string) => string) {
-            if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
+            if (!sourceFileOrBundle || emitOnly || !jsFilePath) {
                 return;
             }
 
@@ -422,16 +424,16 @@ namespace ts {
             declarationFilePath: string | undefined,
             declarationMapPath: string | undefined,
             relativeToBuildInfo: (path: string) => string) {
-            if (!sourceFileOrBundle) return;
+            if (!sourceFileOrBundle || emitOnly === EmitOnly.Js) return;
             if (!declarationFilePath) {
-                if (emitOnlyDtsFiles || compilerOptions.emitDeclarationOnly) emitSkipped = true;
+                if (emitOnly || compilerOptions.emitDeclarationOnly) emitSkipped = true;
                 return;
             }
             const sourceFiles = isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
             const filesForEmit = forceDtsEmit ? sourceFiles : filter(sourceFiles, isSourceFileNotJson);
             // Setup and perform the transformation to retrieve declarations from the input files
             const inputListOrBundle = outFile(compilerOptions) ? [factory.createBundle(filesForEmit, !isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit;
-            if (emitOnlyDtsFiles && !getEmitDeclarations(compilerOptions)) {
+            if (emitOnly && !getEmitDeclarations(compilerOptions)) {
                 // Checker wont collect the linked aliases since thats only done when declaration is enabled.
                 // Do that here when emitting only dts files
                 filesForEmit.forEach(collectLinkedAliases);

src/compiler/program.ts

@@ -2038,9 +2038,9 @@ namespace ts {
             return typeChecker || (typeChecker = createTypeChecker(program));
         }
 
-        function emit(sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, transformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult {
+        function emit(sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnly?: boolean | EmitOnly, transformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult {
             tracing?.push(tracing.Phase.Emit, "emit", { path: sourceFile?.path }, /*separateBeginAndEnd*/ true);
-            const result = runWithCancellationToken(() => emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers, forceDtsEmit));
+            const result = runWithCancellationToken(() => emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnly, transformers, forceDtsEmit));
             tracing?.pop();
             return result;
         }
@@ -2049,7 +2049,7 @@ namespace ts {
             return hasEmitBlockingDiagnostics.has(toPath(emitFileName));
         }
 
-        function emitWorker(program: Program, sourceFile: SourceFile | undefined, writeFileCallback: WriteFileCallback | undefined, cancellationToken: CancellationToken | undefined, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult {
+        function emitWorker(program: Program, sourceFile: SourceFile | undefined, writeFileCallback: WriteFileCallback | undefined, cancellationToken: CancellationToken | undefined, emitOnly?: boolean | EmitOnly, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult {
             if (!forceDtsEmit) {
                 const result = handleNoEmitOptions(program, sourceFile, writeFileCallback, cancellationToken);
                 if (result) return result;
@@ -2071,8 +2071,8 @@ namespace ts {
                 emitResolver,
                 getEmitHost(writeFileCallback),
                 sourceFile,
-                getTransformers(options, customTransformers, emitOnlyDtsFiles),
-                emitOnlyDtsFiles,
+                getTransformers(options, customTransformers, emitOnly),
+                emitOnly,
                 /*onlyBuildInfo*/ false,
                 forceDtsEmit
             );

src/compiler/transformer.ts

@@ -31,15 +31,15 @@ namespace ts {
 
     export const noTransformers: EmitTransformers = { scriptTransformers: emptyArray, declarationTransformers: emptyArray };
 
-    export function getTransformers(compilerOptions: CompilerOptions, customTransformers?: CustomTransformers, emitOnlyDtsFiles?: boolean): EmitTransformers {
+    export function getTransformers(compilerOptions: CompilerOptions, customTransformers?: CustomTransformers, emitOnly?: boolean | EmitOnly): EmitTransformers {
         return {
-            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnly),
             declarationTransformers: getDeclarationTransformers(customTransformers),
         };
     }
 
-    function getScriptTransformers(compilerOptions: CompilerOptions, customTransformers?: CustomTransformers, emitOnlyDtsFiles?: boolean) {
-        if (emitOnlyDtsFiles) return emptyArray;
+    function getScriptTransformers(compilerOptions: CompilerOptions, customTransformers?: CustomTransformers, emitOnly?: boolean | EmitOnly) {
+        if (emitOnly) return emptyArray;
 
         const languageVersion = getEmitScriptTarget(compilerOptions);
         const moduleKind = getEmitModuleKind(compilerOptions);

src/compiler/types.ts

@@ -4370,6 +4370,11 @@ namespace ts {
     /*@internal*/
     export type FilePreprocessingDiagnostics = FilePreprocessingReferencedDiagnostic | FilePreprocessingFileExplainingDiagnostic;
 
+    /*@internal*/
+    export const enum EmitOnly{
+        Js,
+        Dts,
+    }
     export interface Program extends ScriptReferenceHost {
         getCurrentDirectory(): string;
         /**
@@ -4405,7 +4410,7 @@ namespace ts {
          */
         emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult;
         /*@internal*/
-        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult; // eslint-disable-line @typescript-eslint/unified-signatures
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnly?: boolean | EmitOnly, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult; // eslint-disable-line @typescript-eslint/unified-signatures
 
         getOptionsDiagnostics(cancellationToken?: CancellationToken): readonly Diagnostic[];
         getGlobalDiagnostics(cancellationToken?: CancellationToken): readonly Diagnostic[];

tests/baselines/reference/tsbuild/commandLine/emitDeclarationOnly-false-on-commandline-with-declaration-and-incremental-with-outFile.js

@@ -351,9 +351,9 @@ Output::
 
 [12:00:46 AM] Building project '/src/project1/src/tsconfig.json'...
 
-[[90m12:00:53 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
+[[90m12:00:52 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
 
-[[90m12:00:54 AM[0m] Building project '/src/project2/src/tsconfig.json'...
+[[90m12:00:53 AM[0m] Building project '/src/project2/src/tsconfig.json'...
 
 src/project2/src/tsconfig.json:1:142 - error TS6306: Referenced project '/src/project1/src' must have setting "composite": true.
 
@@ -393,7 +393,6 @@ No cached semantic diagnostics in the builder::
 No shapes updated in the builder::
 
 
-//// [/src/project1/outFile.d.ts] file written with same contents
 //// [/src/project1/outFile.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -545,15 +544,15 @@ Input::
 
 Output::
 /lib/tsc --b /src/project2/src --verbose
-[[90m12:00:55 AM[0m] Projects in this build: 
+[[90m12:00:54 AM[0m] Projects in this build: 
     * src/project1/src/tsconfig.json
     * src/project2/src/tsconfig.json
 
-[[90m12:00:56 AM[0m] Project 'src/project1/src/tsconfig.json' is up to date because newest input 'src/project1/src/a.ts' is older than output 'src/project1/outFile.tsbuildinfo'
+[[90m12:00:55 AM[0m] Project 'src/project1/src/tsconfig.json' is up to date because newest input 'src/project1/src/a.ts' is older than output 'src/project1/outFile.tsbuildinfo'
 
-[[90m12:00:57 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
+[[90m12:00:56 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
 
-[[90m12:00:58 AM[0m] Building project '/src/project2/src/tsconfig.json'...
+[[90m12:00:57 AM[0m] Building project '/src/project2/src/tsconfig.json'...
 
 src/project2/src/tsconfig.json:1:142 - error TS6306: Referenced project '/src/project1/src' must have setting "composite": true.
 
@@ -587,15 +586,15 @@ Input::
 
 Output::
 /lib/tsc --b /src/project2/src --verbose --emitDeclarationOnly false
-[[90m12:00:59 AM[0m] Projects in this build: 
+[[90m12:00:58 AM[0m] Projects in this build: 
     * src/project1/src/tsconfig.json
     * src/project2/src/tsconfig.json
 
-[[90m12:01:00 AM[0m] Project 'src/project1/src/tsconfig.json' is up to date because newest input 'src/project1/src/a.ts' is older than output 'src/project1/outFile.tsbuildinfo'
+[[90m12:00:59 AM[0m] Project 'src/project1/src/tsconfig.json' is up to date because newest input 'src/project1/src/a.ts' is older than output 'src/project1/outFile.tsbuildinfo'
 
-[[90m12:01:01 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
+[[90m12:01:00 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
 
-[[90m12:01:02 AM[0m] Building project '/src/project2/src/tsconfig.json'...
+[[90m12:01:01 AM[0m] Building project '/src/project2/src/tsconfig.json'...
 
 src/project2/src/tsconfig.json:1:142 - error TS6306: Referenced project '/src/project1/src' must have setting "composite": true.
 
@@ -632,17 +631,17 @@ export const b = 10;const bLocal = 10;const blocal = 10;
 
 Output::
 /lib/tsc --b /src/project2/src --verbose --emitDeclarationOnly false
-[[90m12:01:04 AM[0m] Projects in this build: 
+[[90m12:01:03 AM[0m] Projects in this build: 
     * src/project1/src/tsconfig.json
     * src/project2/src/tsconfig.json
 
-[[90m12:01:05 AM[0m] Project 'src/project1/src/tsconfig.json' is out of date because output 'src/project1/outFile.tsbuildinfo' is older than input 'src/project1/src/b.ts'
+[[90m12:01:04 AM[0m] Project 'src/project1/src/tsconfig.json' is out of date because output 'src/project1/outFile.tsbuildinfo' is older than input 'src/project1/src/b.ts'
 
-[[90m12:01:06 AM[0m] Building project '/src/project1/src/tsconfig.json'...
+[[90m12:01:05 AM[0m] Building project '/src/project1/src/tsconfig.json'...
 
-[[90m12:01:13 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
+[[90m12:01:12 AM[0m] Project 'src/project2/src/tsconfig.json' is out of date because output file 'src/project2/outFile.tsbuildinfo' does not exist
 
-[[90m12:01:14 AM[0m] Building project '/src/project2/src/tsconfig.json'...
+[[90m12:01:13 AM[0m] Building project '/src/project2/src/tsconfig.json'...
 
 src/project2/src/tsconfig.json:1:142 - error TS6306: Referenced project '/src/project1/src' must have setting "composite": true.