Merge pull request #25680 from a-tarasyuk/bug/25667-getmodifiedtime-has-wrong-return-type

mhegazy · web-flow · commit 00a64172afcd · 2018-07-20T16:35:43.000-07:00
25667 - getModifiedTime has wrong return type
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -135,7 +135,7 @@ namespace ts {
 
             sys.writeFile(fileName, data, writeByteOrderMark);
 
-            const mtimeAfter = sys.getModifiedTime!(fileName); // TODO: GH#18217
+            const mtimeAfter = sys.getModifiedTime!(fileName) || missingFileModifiedTime; // TODO: GH#18217
 
             outputFingerprints.set(fileName, {
                 hash,
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -482,7 +482,7 @@ namespace ts {
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
         readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
-        getModifiedTime?(path: string): Date;
+        getModifiedTime?(path: string): Date | undefined;
         setModifiedTime?(path: string, time: Date): void;
         deleteFile?(path: string): void;
         /**
diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
@@ -843,14 +843,18 @@ namespace ts {
                 return buildHost.message(Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath!);
             }
 
-            if (context.options.verbose) buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);
+            if (context.options.verbose) {
+                buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);
+            }
+
             const now = new Date();
             const outputs = getAllProjectOutputs(proj);
             let priorNewestUpdateTime = minimumDate;
             for (const file of outputs) {
                 if (isDeclarationFile(file)) {
-                    priorNewestUpdateTime = newer(priorNewestUpdateTime, compilerHost.getModifiedTime!(file));
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, compilerHost.getModifiedTime!(file) || missingFileModifiedTime);
                 }
+
                 compilerHost.setModifiedTime!(file, now);
             }
 
@@ -1057,7 +1061,7 @@ namespace ts {
                 };
             }
 
-            const inputTime = host.getModifiedTime(inputFile);
+            const inputTime = host.getModifiedTime(inputFile) || missingFileModifiedTime;
             if (inputTime > newestInputFileTime) {
                 newestInputFileName = inputFile;
                 newestInputFileTime = inputTime;
@@ -1089,7 +1093,7 @@ namespace ts {
                 break;
             }
 
-            const outputTime = host.getModifiedTime(output);
+            const outputTime = host.getModifiedTime(output) || missingFileModifiedTime;
             if (outputTime < oldestOutputFileTime) {
                 oldestOutputFileTime = outputTime;
                 oldestOutputFileName = output;
@@ -1117,7 +1121,8 @@ namespace ts {
                     newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
                 }
                 else {
-                    newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, host.getModifiedTime(output));
+                    const outputModifiedTime = host.getModifiedTime(output) || missingFileModifiedTime;
+                    newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
                 }
             }
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -4684,7 +4684,7 @@ namespace ts {
 
     export interface UpToDateHost {
         fileExists(fileName: string): boolean;
-        getModifiedTime(fileName: string): Date;
+        getModifiedTime(fileName: string): Date | undefined;
         getUnchangedTime?(fileName: string): Date | undefined;
         getLastStatus?(fileName: string): UpToDateStatus | undefined;
         setLastStatus?(fileName: string, status: UpToDateStatus): void;
@@ -4822,7 +4822,7 @@ namespace ts {
         /* @internal */ hasChangedAutomaticTypeDirectiveNames?: boolean;
         createHash?(data: string): string;
 
-        getModifiedTime?(fileName: string): Date;
+        getModifiedTime?(fileName: string): Date | undefined;
         setModifiedTime?(fileName: string, date: Date): void;
         deleteFile?(fileName: string): void;
     }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2584,7 +2584,7 @@ declare namespace ts {
     }
     interface UpToDateHost {
         fileExists(fileName: string): boolean;
-        getModifiedTime(fileName: string): Date;
+        getModifiedTime(fileName: string): Date | undefined;
         getUnchangedTime?(fileName: string): Date | undefined;
         getLastStatus?(fileName: string): UpToDateStatus | undefined;
         setLastStatus?(fileName: string, status: UpToDateStatus): void;
@@ -2688,7 +2688,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
-        getModifiedTime?(fileName: string): Date;
+        getModifiedTime?(fileName: string): Date | undefined;
         setModifiedTime?(fileName: string, date: Date): void;
         deleteFile?(fileName: string): void;
     }
@@ -3025,7 +3025,7 @@ declare namespace ts {
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
         readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
-        getModifiedTime?(path: string): Date;
+        getModifiedTime?(path: string): Date | undefined;
         setModifiedTime?(path: string, time: Date): void;
         deleteFile?(path: string): void;
         /**
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -2584,7 +2584,7 @@ declare namespace ts {
     }
     interface UpToDateHost {
         fileExists(fileName: string): boolean;
-        getModifiedTime(fileName: string): Date;
+        getModifiedTime(fileName: string): Date | undefined;
         getUnchangedTime?(fileName: string): Date | undefined;
         getLastStatus?(fileName: string): UpToDateStatus | undefined;
         setLastStatus?(fileName: string, status: UpToDateStatus): void;
@@ -2688,7 +2688,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
-        getModifiedTime?(fileName: string): Date;
+        getModifiedTime?(fileName: string): Date | undefined;
         setModifiedTime?(fileName: string, date: Date): void;
         deleteFile?(fileName: string): void;
     }
@@ -3025,7 +3025,7 @@ declare namespace ts {
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
         readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
-        getModifiedTime?(path: string): Date;
+        getModifiedTime?(path: string): Date | undefined;
         setModifiedTime?(path: string, time: Date): void;
         deleteFile?(path: string): void;
         /**

Original file line number	Diff line number	Diff line change
`@@ -843,14 +843,18 @@ namespace ts {`
`843`	`843`	`return buildHost.message(Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath!);`
`844`	`844`	`}`
`845`	`845`
`846`		`- if (context.options.verbose) buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);`
	`846`	`+ if (context.options.verbose) {`
	`847`	`+ buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);`
	`848`	`+ }`
	`849`	`+`
`847`	`850`	`const now = new Date();`
`848`	`851`	`const outputs = getAllProjectOutputs(proj);`
`849`	`852`	`let priorNewestUpdateTime = minimumDate;`
`850`	`853`	`for (const file of outputs) {`
`851`	`854`	`if (isDeclarationFile(file)) {`
`852`		`- priorNewestUpdateTime = newer(priorNewestUpdateTime, compilerHost.getModifiedTime!(file));`
	`855`	`+ priorNewestUpdateTime = newer(priorNewestUpdateTime, compilerHost.getModifiedTime!(file) \|\| missingFileModifiedTime);`
`853`	`856`	`}`
	`857`	`+`
`854`	`858`	`compilerHost.setModifiedTime!(file, now);`
`855`	`859`	`}`
`856`	`860`
`@@ -1057,7 +1061,7 @@ namespace ts {`
`1057`	`1061`	`};`
`1058`	`1062`	`}`
`1059`	`1063`
`1060`		`- const inputTime = host.getModifiedTime(inputFile);`
	`1064`	`+ const inputTime = host.getModifiedTime(inputFile) \|\| missingFileModifiedTime;`
`1061`	`1065`	`if (inputTime > newestInputFileTime) {`
`1062`	`1066`	`newestInputFileName = inputFile;`
`1063`	`1067`	`newestInputFileTime = inputTime;`
`@@ -1089,7 +1093,7 @@ namespace ts {`
`1089`	`1093`	`break;`
`1090`	`1094`	`}`
`1091`	`1095`
`1092`		`- const outputTime = host.getModifiedTime(output);`
	`1096`	`+ const outputTime = host.getModifiedTime(output) \|\| missingFileModifiedTime;`
`1093`	`1097`	`if (outputTime < oldestOutputFileTime) {`
`1094`	`1098`	`oldestOutputFileTime = outputTime;`
`1095`	`1099`	`oldestOutputFileName = output;`
`@@ -1117,7 +1121,8 @@ namespace ts {`
`1117`	`1121`	`newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);`
`1118`	`1122`	`}`
`1119`	`1123`	`else {`
`1120`		`- newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, host.getModifiedTime(output));`
	`1124`	`+ const outputModifiedTime = host.getModifiedTime(output) \|\| missingFileModifiedTime;`
	`1125`	`+ newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);`
`1121`	`1126`	`}`
`1122`	`1127`	`}`
`1123`	`1128`	`}`