fix: safe json file reading (#1)

esbuild-kit · May 13, 2022 · 1bda96a · 1bda96a
1 parent 3bbb1b4
commit 1bda96a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/src/esbuild/cache.ts b/src/esbuild/cache.ts
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import type { TransformResult } from 'esbuild';
-import { jsonParseSafe } from '../utils/json-parse-safe';
+import { readJsonFile } from '../utils/read-json-file';
 
 const getTime = () => Math.floor(Date.now() / 1e8);
 
@@ -52,29 +52,30 @@ class FileCache extends Map<string, TransformResult> {
 		}
 
 		const diskCacheHit = this.cacheFiles.find(cache => cache.key === key);
-		if (diskCacheHit) {
-			const cacheFilePath = path.join(this.cacheDirectory, diskCacheHit.fileName);
-			const cacheFile = fs.readFileSync(cacheFilePath, 'utf8');
-			const cachedResult: TransformResult = jsonParseSafe(cacheFile);
-
-			if (!cachedResult) {
-				// Remove broken cache file
-				fs.promises.unlink(cacheFilePath).then(
-					() => {
-						const index = this.cacheFiles.indexOf(diskCacheHit);
-						this.cacheFiles.splice(index, 1);
-					},
-					// eslint-disable-next-line @typescript-eslint/no-empty-function
-					() => {},
-				);
-				return;
-			}
+		if (!diskCacheHit) {
+			return;
+		}
 
-			// Load it into memory
-			super.set(key, cachedResult);
+		const cacheFilePath = path.join(this.cacheDirectory, diskCacheHit.fileName);
+		const cachedResult = readJsonFile<TransformResult>(cacheFilePath);
 
-			return cachedResult;
+		if (!cachedResult) {
+			// Remove broken cache file
+			fs.promises.unlink(cacheFilePath).then(
+				() => {
+					const index = this.cacheFiles.indexOf(diskCacheHit);
+					this.cacheFiles.splice(index, 1);
+				},
+				// eslint-disable-next-line @typescript-eslint/no-empty-function
+				() => {},
+			);
+			return;
 		}
+
+		// Load it into memory
+		super.set(key, cachedResult);
+
+		return cachedResult;
 	}
 
 	set(key: string, value: TransformResult) {

diff --git a/src/utils/json-parse-safe.ts b/src/utils/json-parse-safe.ts
diff --git a/src/utils/read-json-file.ts b/src/utils/read-json-file.ts
@@ -0,0 +1,8 @@
+import fs from 'fs';
+
+export function readJsonFile<JsonType>(filePath: string) {
+	try {
+		const jsonString = fs.readFileSync(filePath, 'utf8');
+		return JSON.parse(jsonString) as JsonType;
+	} catch {}
+}