Changes to make these commanline options work

Author: sheetalkamat

src/compiler/builder.ts

@@ -9,6 +9,6 @@ namespace ts {
         name: string;
         writeByteOrderMark: boolean;
         text: string;
-        /* @internal */ buildInfo?: BuildInfo
+        /* @internal */ data?: WriteFileCallbackData;
     }
 }

src/compiler/builderStatePublic.ts

@@ -304,7 +304,7 @@ namespace ts {
             name: "declaration",
             shortName: "d",
             type: "boolean",
-            affectsEmit: true,
+            // Not setting affectsEmit because we calculate this flag might not affect full emit
             affectsMultiFileEmitBuildInfo: true,
             affectsBundleEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
@@ -316,7 +316,7 @@ namespace ts {
         {
             name: "declarationMap",
             type: "boolean",
-            affectsEmit: true,
+            // Not setting affectsEmit because we calculate this flag might not affect full emit
             affectsMultiFileEmitBuildInfo: true,
             affectsBundleEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
@@ -328,7 +328,7 @@ namespace ts {
         {
             name: "emitDeclarationOnly",
             type: "boolean",
-            affectsEmit: true,
+            // Not setting affectsEmit because we calculate this flag might not affect full emit
             affectsMultiFileEmitBuildInfo: true,
             affectsBundleEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
@@ -340,7 +340,7 @@ namespace ts {
         {
             name: "sourceMap",
             type: "boolean",
-            affectsEmit: true,
+            // Not setting affectsEmit because we calculate this flag might not affect full emit
             affectsMultiFileEmitBuildInfo: true,
             affectsBundleEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
@@ -351,7 +351,7 @@ namespace ts {
         {
             name: "inlineSourceMap",
             type: "boolean",
-            affectsEmit: true,
+            // Not setting affectsEmit because we calculate this flag might not affect full emit
             affectsMultiFileEmitBuildInfo: true,
             affectsBundleEmitBuildInfo: true,
             category: Diagnostics.Emit,
@@ -587,7 +587,7 @@ namespace ts {
         {
             name: "composite",
             type: "boolean",
-            affectsEmit: true,
+            // Not setting affectsEmit because we calculate this flag might not affect full emit
             affectsMultiFileEmitBuildInfo: true,
             affectsBundleEmitBuildInfo: true,
             isTSConfigOnly: true,

src/compiler/commandLineParser.ts

@@ -5430,6 +5430,10 @@
         "category": "Message",
         "code": 6405
     },
+    "Project '{0}' is out of date because buildinfo file '{1}' indicates there is change in compilerOptions": {
+        "category": "Message",
+        "code": 6406
+    },
 
     "The expected type comes from property '{0}' which is declared here on type '{1}'": {
         "category": "Message",

src/compiler/diagnosticMessages.json

@@ -838,7 +838,7 @@ namespace ts {
                             newBuildInfo.bundle!.dts!.sources = dts.sources;
                         }
                         newBuildInfo.bundle!.sourceFiles = sourceFiles;
-                        outputFiles.push({ name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark, buildInfo: newBuildInfo });
+                        outputFiles.push({ name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark, data: { buildInfo: newBuildInfo } });
                         return;
                     case declarationFilePath:
                         if (declarationText === text) return;

src/compiler/emitter.ts

@@ -20,6 +20,7 @@ namespace ts {
         OutOfDateWithSelf,
         OutOfDateWithUpstream,
         OutOfDateBuildInfo,
+        OutOfDateOptions,
         UpstreamOutOfDate,
         UpstreamBlocked,
         ComputingUpstream,
@@ -116,7 +117,7 @@ namespace ts {
          * Buildinfo indicates that build is out of date
          */
         export interface OutOfDateBuildInfo {
-            type: UpToDateStatusType.OutOfDateBuildInfo,
+            type: UpToDateStatusType.OutOfDateBuildInfo | UpToDateStatusType.OutOfDateOptions,
             buildInfoFile: string;
         }
 

src/compiler/tsbuild.ts

@@ -968,7 +968,7 @@ namespace ts {
                 reportDeclarationDiagnostics,
                 /*write*/ undefined,
                 /*reportSummary*/ undefined,
-                (name, text, writeByteOrderMark, _onError, _sourceFiles, data) => outputFiles.push({ name, text, writeByteOrderMark, buildInfo: data?.buildInfo }),
+                (name, text, writeByteOrderMark, _onError, _sourceFiles, data) => outputFiles.push({ name, text, writeByteOrderMark, data }),
                 cancellationToken,
                 /*emitOnlyDts*/ false,
                 customTransformers || state.host.getCustomTransformers?.(project)
@@ -1000,12 +1000,15 @@ namespace ts {
             const isIncremental = isIncrementalCompilation(options);
             let outputTimeStampMap: ESMap<Path, Date> | undefined;
             let now: Date | undefined;
-            outputFiles.forEach(({ name, text, writeByteOrderMark, buildInfo }) => {
+            outputFiles.forEach(({ name, text, writeByteOrderMark, data }) => {
                 const path = toPath(state, name);
                 emittedOutputs.set(toPath(state, name), name);
-                if (buildInfo) setBuildInfo(state, buildInfo, projectPath, options, resultFlags);
+                if (data?.buildInfo) setBuildInfo(state, data.buildInfo, projectPath, options, resultFlags);
+                const modifiedTime = data?.differsOnlyInMap ? ts.getModifiedTime(state.host, name) : undefined;
                 writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
-                if (!isIncremental && state.watch) {
+                // Revert the timestamp for the d.ts that is same
+                if (data?.differsOnlyInMap) state.host.setModifiedTime(name, modifiedTime!);
+                else if (!isIncremental && state.watch) {
                     (outputTimeStampMap ||= getOutputTimeStampMap(state, projectPath)!).set(path, now ||= getCurrentTime(state.host));
                 }
             });
@@ -1122,13 +1125,13 @@ namespace ts {
             const emittedOutputs = new Map<Path, string>();
             let resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
             const existingBuildInfo = state.buildInfoCache.get(projectPath)!.buildInfo || undefined;
-            outputFiles.forEach(({ name, text, writeByteOrderMark, buildInfo }) => {
+            outputFiles.forEach(({ name, text, writeByteOrderMark, data }) => {
                 emittedOutputs.set(toPath(state, name), name);
-                if (buildInfo) {
-                    if ((buildInfo.program as ProgramBundleEmitBuildInfo)?.outSignature !== (existingBuildInfo?.program as ProgramBundleEmitBuildInfo)?.outSignature) {
+                if (data?.buildInfo) {
+                    if ((data.buildInfo.program as ProgramBundleEmitBuildInfo)?.outSignature !== (existingBuildInfo?.program as ProgramBundleEmitBuildInfo)?.outSignature) {
                         resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
                     }
-                    setBuildInfo(state, buildInfo, projectPath, config.options, resultFlags);
+                    setBuildInfo(state, data.buildInfo, projectPath, config.options, resultFlags);
                 }
                 writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
@@ -1629,6 +1632,13 @@ namespace ts {
                         buildInfoFile: buildInfoPath
                     };
                 }
+
+                if (!project.options.noEmit && getPendingEmitKind(project.options, buildInfo.program.options || {})) {
+                    return {
+                        type: UpToDateStatusType.OutOfDateOptions,
+                        buildInfoFile: buildInfoPath
+                    };
+                }
                 buildInfoProgram = buildInfo.program;
             }
 
@@ -2397,6 +2407,13 @@ namespace ts {
                     relName(state, configFileName),
                     relName(state, status.buildInfoFile)
                 );
+            case UpToDateStatusType.OutOfDateOptions:
+                return reportStatus(
+                    state,
+                    Diagnostics.Project_0_is_out_of_date_because_buildinfo_file_1_indicates_there_is_change_in_compilerOptions,
+                    relName(state, configFileName),
+                    relName(state, status.buildInfoFile)
+                );
             case UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
                     return reportStatus(

src/compiler/tsbuildPublic.ts

@@ -4261,6 +4261,7 @@ namespace ts {
         /*@internal*/ sourceMapUrlPos?: number;
         /*@internal*/ buildInfo?: BuildInfo;
         /*@internal*/ diagnostics?: readonly DiagnosticWithLocation[];
+        /*@internal*/ differsOnlyInMap?: true;
     }
     export type WriteFileCallback = (
         fileName: string,

src/compiler/types.ts

@@ -198,13 +198,14 @@ interface Symbol {
     }
 
     type ReadableProgramBuildInfoDiagnostic = string | [string, readonly ReusableDiagnostic[]];
-    type ReadableProgramBuilderInfoFilePendingEmit = [original: string | [string], emitKind: "DtsOnly" | "Full"];
+    type ReadableBuilderFileEmit = string & { __readableBuilderFileEmit: any; };
+    type ReadableProgramBuilderInfoFilePendingEmit = [original: string | [string], emitKind: ReadableBuilderFileEmit];
     type ReadableProgramBuildInfoEmitSignature = string | [string, string];
     type ReadableProgramBuildInfoFileInfo = Omit<BuilderState.FileInfo, "impliedFormat"> & { impliedFormat: string | undefined; };
     type ReadableProgramMultiFileEmitBuildInfo = Omit<ProgramMultiFileEmitBuildInfo,
         "fileIdsList" | "fileInfos" |
         "referencedMap" | "exportedModulesMap" | "semanticDiagnosticsPerFile" |
-        "affectedFilesPendingEmit" | "changeFileSet" | "emitSignatures"
+        "affectedFilesPendingEmit" | "changeFileSet" | "emitSignatures" | "emitSignatureDtsMapDiffers"
     > & {
         fileNamesList: readonly (readonly string[])[] | undefined;
         fileInfos: MapLike<ReadableProgramBuildInfoFileInfo>;
@@ -214,6 +215,7 @@ interface Symbol {
         affectedFilesPendingEmit?: readonly ReadableProgramBuilderInfoFilePendingEmit[];
         changeFileSet?: readonly string[];
         emitSignatures?: readonly ReadableProgramBuildInfoEmitSignature[];
+        emitSignatureDtsMapDiffers?: readonly string[];
     };
     type ReadableProgramBundleEmitBuildInfo = Omit<ProgramBundleEmitBuildInfo, "fileInfos"> & {
         fileInfos: MapLike<string>;
@@ -240,6 +242,7 @@ interface Symbol {
             const fileInfos: ReadableProgramMultiFileEmitBuildInfo["fileInfos"] = {};
             buildInfo.program?.fileInfos?.forEach((fileInfo, index) => fileInfos[toFileName(index + 1 as ProgramBuildInfoFileId)] = toReadableFileInfo(fileInfo));
             fileNamesList = buildInfo.program.fileIdsList?.map(fileIdsListId => fileIdsListId.map(toFileName));
+            const fullEmitForOptions = buildInfo.program.affectedFilesPendingEmit ? getBuilderFileEmit(buildInfo.program.options || {}) : undefined;
             program = buildInfo.program && {
                 fileNames: buildInfo.program.fileNames,
                 fileNamesList,
@@ -252,13 +255,14 @@ interface Symbol {
                         toFileName(d) :
                         [toFileName(d[0]), d[1]]
                 ),
-                affectedFilesPendingEmit: buildInfo.program.affectedFilesPendingEmit?.map(toReadableProgramBuilderInfoFilePendingEmit),
+                affectedFilesPendingEmit: buildInfo.program.affectedFilesPendingEmit?.map(value => toReadableProgramBuilderInfoFilePendingEmit(value, fullEmitForOptions!)),
                 changeFileSet: buildInfo.program.changeFileSet?.map(toFileName),
                 emitSignatures: buildInfo.program.emitSignatures?.map(s =>
                     isNumber(s) ?
                         toFileName(s) :
                         [toFileName(s[0]), s[1]]
                 ),
+                emitSignatureDtsMapDiffers: buildInfo.program.emitSignatureDtsMapDiffers?.map(toFileName),
                 latestChangedDtsFile: buildInfo.program.latestChangedDtsFile,
             };
         }
@@ -312,15 +316,25 @@ interface Symbol {
             return result;
         }
 
-        function toReadableProgramBuilderInfoFilePendingEmit(value: ProgramBuilderInfoFilePendingEmit): ReadableProgramBuilderInfoFilePendingEmit {
-            const emitKind = toBuilderFileEmit(value);
+        function toReadableProgramBuilderInfoFilePendingEmit(value: ProgramBuilderInfoFilePendingEmit, fullEmitForOptions: BuilderFileEmit): ReadableProgramBuilderInfoFilePendingEmit {
             return [
                 isNumber(value) ? toFileName(value) : [toFileName(value[0])],
-                emitKind === BuilderFileEmit.DtsOnly ? "DtsOnly" :
-                    emitKind === BuilderFileEmit.Full ? "Full" :
-                        Debug.assertNever(emitKind),
+                toReadableBuilderFileEmit(toBuilderFileEmit(value, fullEmitForOptions)),
             ];
         }
+
+        function toReadableBuilderFileEmit(emit: BuilderFileEmit): ReadableBuilderFileEmit {
+            let result = "";
+            if (emit & BuilderFileEmit.Js) addFlags("Js");
+            if (emit & BuilderFileEmit.JsMap) addFlags("JsMap");
+            if (emit & BuilderFileEmit.JsInlineMap) addFlags("JsInlineMap");
+            if (emit & BuilderFileEmit.Dts) addFlags("Dts");
+            if (emit & BuilderFileEmit.DtsMap) addFlags("DtsMap");
+            return (result || "None") as ReadableBuilderFileEmit;
+            function addFlags(flag: string) {
+                result = result ? `${result} | ${flag}` : flag;
+            }
+        }
     }
 
     export function toPathWithSystem(sys: System, fileName: string): Path {