Ensure proper JSON writing behavior of timestamps

Benjamin Lichtman · uniqueiniquity · commit ee5e8e3eee90 · 2018-01-11T12:58:21.000-08:00
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
@@ -45,7 +45,7 @@ namespace ts.server.typingsInstaller {
         entries: MapLike<number>;
     }
 
-    function loadTypeDeclarationTimestampFile(typeDeclarationTimestampFilePath: string, host: InstallTypingHost, log: Log): Map<number> {
+    function loadTypeDeclarationTimestampFile(typeDeclarationTimestampFilePath: string, host: InstallTypingHost, log: Log): MapLike<number> {
         const fileExists = host.fileExists(typeDeclarationTimestampFilePath);
         if (!fileExists) {
             if (log.isEnabled()) {
@@ -55,21 +55,21 @@ namespace ts.server.typingsInstaller {
         try {
             if (fileExists) {
                 const content = <TypeDeclarationTimestampFile>JSON.parse(host.readFile(typeDeclarationTimestampFilePath));
-                return createMapFromTemplate(content.entries);
+                return content.entries;
             }
             else {
                 host.writeFile(typeDeclarationTimestampFilePath, "{}");
                 if (log.isEnabled()) {
                     log.writeLine("Type declaration timestamp file was created.");
                 }
-                return createMap<number>();
+                return {};
             }
         }
         catch (e) {
             if (log.isEnabled()) {
                 log.writeLine(`Error when loading type declaration timestamp file '${typeDeclarationTimestampFilePath}': ${(<Error>e).message}, ${(<Error>e).stack}`);
             }
-            return createMap<number>();
+            return {};
         }
     }
 
@@ -108,7 +108,7 @@ namespace ts.server.typingsInstaller {
         private readonly projectWatchers: Map<FileWatcher[]> = createMap<FileWatcher[]>();
         private safeList: JsTyping.SafeList | undefined;
         readonly pendingRunRequests: PendingRequest[] = [];
-        private typeDeclarationTimestamps: Map<number> = createMap<number>();
+        private typeDeclarationTimestamps: MapLike<number> = {};
 
         private installRunCount = 1;
         private inFlightRequestCount = 0;
@@ -258,14 +258,14 @@ namespace ts.server.typingsInstaller {
                         if (this.log.isEnabled()) {
                             this.log.writeLine(`Adding entry into typings cache: '${packageName}' => '${typingFile}'`);
                         }
-                        if (this.typeDeclarationTimestamps.get(key) === undefined) {
+                        if (getProperty(this.typeDeclarationTimestamps, key) === undefined) {
                             // getModifiedTime is only undefined if we were to use the ChakraHost, but we never do in this scenario
                             // defaults to old behavior of never updating if we ever use a host without getModifiedTime in the future
                             const timestamp = this.installTypingHost.getModifiedTime === undefined ? Date.now() : this.installTypingHost.getModifiedTime(typingFile).getTime();
-                            this.typeDeclarationTimestamps.set(key, timestamp);
+                            this.typeDeclarationTimestamps[key] = timestamp;
                         }
                         // timestamp guaranteed to not be undefined by above check
-                        const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: this.typeDeclarationTimestamps.get(key) };
+                        const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: getProperty(this.typeDeclarationTimestamps, key) };
                         this.packageNameToTypingLocation.set(packageName, newTyping);
                     }
                 }
@@ -365,11 +365,11 @@ namespace ts.server.typingsInstaller {
                             this.missingTypingsSet.set(packageName, true);
                             continue;
                         }
-                        if (!this.packageNameToTypingLocation.has(packageName)) {
-                            const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: Date.now() };
-                            this.packageNameToTypingLocation.set(packageName, newTyping);
-                            this.typeDeclarationTimestamps.set(packageName, Date.now());
-                        }
+
+                        const newTimestamp = Date.now();
+                        const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: newTimestamp };
+                        this.packageNameToTypingLocation.set(packageName, newTyping);
+                        this.typeDeclarationTimestamps[packageName] = newTimestamp;
                         installedTypingFiles.push(typingFile);
                     }
                     if (this.log.isEnabled()) {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ namespace ts.server.typingsInstaller {`
`45`	`45`	`entries: MapLike<number>;`
`46`	`46`	`}`
`47`	`47`
`48`		`- function loadTypeDeclarationTimestampFile(typeDeclarationTimestampFilePath: string, host: InstallTypingHost, log: Log): Map<number> {`
	`48`	`+ function loadTypeDeclarationTimestampFile(typeDeclarationTimestampFilePath: string, host: InstallTypingHost, log: Log): MapLike<number> {`
`49`	`49`	`const fileExists = host.fileExists(typeDeclarationTimestampFilePath);`
`50`	`50`	`if (!fileExists) {`
`51`	`51`	`if (log.isEnabled()) {`
`@@ -55,21 +55,21 @@ namespace ts.server.typingsInstaller {`
`55`	`55`	`try {`
`56`	`56`	`if (fileExists) {`
`57`	`57`	`const content = <TypeDeclarationTimestampFile>JSON.parse(host.readFile(typeDeclarationTimestampFilePath));`
`58`		`- return createMapFromTemplate(content.entries);`
	`58`	`+ return content.entries;`
`59`	`59`	`}`
`60`	`60`	`else {`
`61`	`61`	`host.writeFile(typeDeclarationTimestampFilePath, "{}");`
`62`	`62`	`if (log.isEnabled()) {`
`63`	`63`	`log.writeLine("Type declaration timestamp file was created.");`
`64`	`64`	`}`
`65`		`- return createMap<number>();`
	`65`	`+ return {};`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`catch (e) {`
`69`	`69`	`if (log.isEnabled()) {`
`70`	`70`	log.writeLine(`Error when loading type declaration timestamp file '${typeDeclarationTimestampFilePath}': ${(<Error>e).message}, ${(<Error>e).stack}`);
`71`	`71`	`}`
`72`		`- return createMap<number>();`
	`72`	`+ return {};`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`@@ -108,7 +108,7 @@ namespace ts.server.typingsInstaller {`
`108`	`108`	`private readonly projectWatchers: Map<FileWatcher[]> = createMap<FileWatcher[]>();`
`109`	`109`	`private safeList: JsTyping.SafeList \| undefined;`
`110`	`110`	`readonly pendingRunRequests: PendingRequest[] = [];`
`111`		`- private typeDeclarationTimestamps: Map<number> = createMap<number>();`
	`111`	`+ private typeDeclarationTimestamps: MapLike<number> = {};`
`112`	`112`
`113`	`113`	`private installRunCount = 1;`
`114`	`114`	`private inFlightRequestCount = 0;`
`@@ -258,14 +258,14 @@ namespace ts.server.typingsInstaller {`
`258`	`258`	`if (this.log.isEnabled()) {`
`259`	`259`	this.log.writeLine(`Adding entry into typings cache: '${packageName}' => '${typingFile}'`);
`260`	`260`	`}`
`261`		`- if (this.typeDeclarationTimestamps.get(key) === undefined) {`
	`261`	`+ if (getProperty(this.typeDeclarationTimestamps, key) === undefined) {`
`262`	`262`	`// getModifiedTime is only undefined if we were to use the ChakraHost, but we never do in this scenario`
`263`	`263`	`// defaults to old behavior of never updating if we ever use a host without getModifiedTime in the future`
`264`	`264`	`const timestamp = this.installTypingHost.getModifiedTime === undefined ? Date.now() : this.installTypingHost.getModifiedTime(typingFile).getTime();`
`265`		`- this.typeDeclarationTimestamps.set(key, timestamp);`
	`265`	`+ this.typeDeclarationTimestamps[key] = timestamp;`
`266`	`266`	`}`
`267`	`267`	`// timestamp guaranteed to not be undefined by above check`
`268`		`- const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: this.typeDeclarationTimestamps.get(key) };`
	`268`	`+ const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: getProperty(this.typeDeclarationTimestamps, key) };`
`269`	`269`	`this.packageNameToTypingLocation.set(packageName, newTyping);`
`270`	`270`	`}`
`271`	`271`	`}`
`@@ -365,11 +365,11 @@ namespace ts.server.typingsInstaller {`
`365`	`365`	`this.missingTypingsSet.set(packageName, true);`
`366`	`366`	`continue;`
`367`	`367`	`}`
`368`		`- if (!this.packageNameToTypingLocation.has(packageName)) {`
`369`		`- const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: Date.now() };`
`370`		`- this.packageNameToTypingLocation.set(packageName, newTyping);`
`371`		`- this.typeDeclarationTimestamps.set(packageName, Date.now());`
`372`		`- }`
	`368`	`+`
	`369`	`+ const newTimestamp = Date.now();`
	`370`	`+ const newTyping: JsTyping.CachedTyping = { typingLocation: typingFile, timestamp: newTimestamp };`
	`371`	`+ this.packageNameToTypingLocation.set(packageName, newTyping);`
	`372`	`+ this.typeDeclarationTimestamps[packageName] = newTimestamp;`
`373`	`373`	`installedTypingFiles.push(typingFile);`
`374`	`374`	`}`
`375`	`375`	`if (this.log.isEnabled()) {`