fs: stat() throws if file does not exist

Signed-off-by: nkomonen <[email protected]>

Author: nkomonen-amazon

src/amazonqFeatureDev/util/files.ts

@@ -133,6 +133,5 @@ export async function prepareRepoData(
 
 export async function getSourceCodePath(workspaceRoot: string, projectRoot: string) {
     const srcRoot = path.join(workspaceRoot, projectRoot)
-    const srcFound = await fsCommon.stat(srcRoot)
-    return srcFound !== undefined ? srcRoot : workspaceRoot
+    return (await fsCommon.directoryExists(srcRoot)) ? srcRoot : workspaceRoot
 }

src/auth/providers/sharedCredentialsProviderFactory.ts

@@ -81,11 +81,6 @@ export class SharedCredentialsProviderFactory extends BaseCredentialsProviderFac
     private async getLastModifiedMillis(filepath: string): Promise<number | undefined> {
         try {
             const stat = await fsCommon.stat(filepath)
-
-            if (stat === undefined) {
-                throw new Error(`Cannot get stat() of ${filepath}`)
-            }
-
             return stat.mtime
         } catch (err) {
             return undefined

src/shared/filesystemUtilities.ts

@@ -42,7 +42,7 @@ export async function getDirSize(
             return getDirSize(filePath, startTime, duration, fileExt)
         }
         if (type === vscode.FileType.File && fileName.endsWith(fileExt)) {
-            const stat = (await fsCommon.stat(filePath))!
+            const stat = await fsCommon.stat(filePath)
             return stat.size
         }
 

src/shared/logger/util.ts

@@ -31,7 +31,7 @@ export async function cleanLogFiles(logDir: string, params = defaultCleanupParam
         const logFullPath = path.join(logDir, log)
         let logSize: number = 0
         try {
-            logSize = (await fsCommon.stat(logFullPath))!.size
+            logSize = (await fsCommon.stat(logFullPath)).size
         } catch (e) {
             getLogger().error('cleanLogFiles: fs.stat() failed on file "%s": %s', logFullPath, (e as Error).message)
         }

src/srcShared/fs.ts

@@ -84,15 +84,13 @@ export class FileSystemCommon {
 
     async exists(path: Uri | string, fileType?: vscode.FileType): Promise<boolean> {
         path = FileSystemCommon.getUri(path)
-        const stat = await this.stat(path)
-
-        // No specific filetype, so only check if anything exists
-        if (fileType === undefined) {
-            return stat !== undefined
+        try {
+            const stat = await this.stat(path)
+            // check filetype if it was given
+            return fileType === undefined ? true : stat.type === fileType
+        } catch (e) {
+            return false
         }
-
-        // Check if file exists and is expected filetype
-        return stat === undefined ? false : stat.type === fileType
     }
 
     async fileExists(path: Uri | string): Promise<boolean> {
@@ -111,16 +109,9 @@ export class FileSystemCommon {
     /**
      * The stat of the file, undefined if the file does not exist, otherwise an error is thrown.
      */
-    async stat(uri: vscode.Uri | string): Promise<vscode.FileStat | undefined> {
+    async stat(uri: vscode.Uri | string): Promise<vscode.FileStat> {
         const path = FileSystemCommon.getUri(uri)
-        try {
-            return await fs.stat(path)
-        } catch (err) {
-            if (err instanceof vscode.FileSystemError && err.code === 'FileNotFound') {
-                return undefined
-            }
-            throw err
-        }
+        return await fs.stat(path)
     }
 
     async delete(uri: vscode.Uri | string): Promise<void> {

src/test/srcShared/fs.test.ts

@@ -219,10 +219,9 @@ describe('FileSystem', function () {
             assert.strictEqual(stat.type, vscode.FileType.File)
         })
 
-        it('return undefined if no file exists', async function () {
+        it('throws if no file exists', async function () {
             const filePath = createTestPath('thisDoesNotExist.txt')
-            const stat = await fsCommon.stat(filePath)
-            assert.strictEqual(stat, undefined)
+            await assert.rejects(() => fsCommon.stat(filePath))
         })
     })