remove tsConfigPath option from Directory

souporserious · Nov 14, 2024 · 3f3ab2b · 3f3ab2b
1 parent b9794c8
commit 3f3ab2b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/packages/renoun/src/file-system/FileSystem.ts b/packages/renoun/src/file-system/FileSystem.ts
@@ -2,31 +2,45 @@ import { minimatch } from 'minimatch'
 
 import type { DirectoryEntry } from './types.js'
 
+interface FileSystemOptions {
+  /**
+   * Path to the tsconfig.json file to use when analyzing types and determining if a file is excluded. */
+  tsConfigPath?: string
+}
+
 export abstract class FileSystem {
+  #tsConfigPath: string
   #tsConfig?: any
 
-  constructor(tsConfigFilePath?: string) {
-    if (tsConfigFilePath) {
-      this.#tsConfig = this.#getTsConfig(tsConfigFilePath)
-    }
+  constructor(options: FileSystemOptions = {}) {
+    this.#tsConfigPath = options.tsConfigPath || 'tsconfig.json'
   }
 
+  abstract readFileSync(path: string): string
   abstract readFile(path: string): Promise<string>
   abstract readDirectory(path?: string): Promise<DirectoryEntry[]>
   abstract isFilePathGitIgnored(filePath: string): boolean
 
-  #getTsConfig = async (tsConfigFilePath: string) => {
-    const tsConfigContents = await this.readFile(tsConfigFilePath)
+  #getTsConfig() {
     try {
-      const parsedTsConfig = JSON.parse(tsConfigContents)
-      return parsedTsConfig
+      const tsConfigContents = this.readFileSync(this.#tsConfigPath)
+      try {
+        const parsedTsConfig = JSON.parse(tsConfigContents)
+        return parsedTsConfig
+      } catch (error) {
+        throw new Error('Failed to parse tsconfig.json', { cause: error })
+      }
     } catch (error) {
-      throw new Error(`Failed to parse tsconfig.json`, { cause: error })
+      return null
     }
   }
 
   isFilePathExcludedFromTsConfig(filePath: string) {
-    if (!this.#tsConfig) {
+    if (this.#tsConfig === undefined) {
+      this.#tsConfig = this.#getTsConfig()
+    }
+
+    if (this.#tsConfig === null) {
       return false
     }
 

diff --git a/packages/renoun/src/file-system/NodeFileSystem.ts b/packages/renoun/src/file-system/NodeFileSystem.ts
@@ -30,6 +30,10 @@ export class NodeFileSystem extends FileSystem {
     })
   }
 
+  readFileSync(path: string): string {
+    return readFileSync(path, 'utf-8')
+  }
+
   async readFile(path: string): Promise<string> {
     return readFile(path, 'utf-8')
   }

diff --git a/packages/renoun/src/file-system/index.test.ts b/packages/renoun/src/file-system/index.test.ts
@@ -151,7 +151,6 @@ describe('file system', () => {
   test('getRuntimeValue resolves export runtime value from getModule', async () => {
     const FileSystemDirectory = new Directory({
       path: 'src/file-system',
-      tsConfigPath: 'tsconfig.json',
       getModule: (path) => import(`./${path}`),
     })
     const file = await FileSystemDirectory.getFileOrThrow('path', 'ts')

diff --git a/packages/renoun/src/file-system/index.tsx b/packages/renoun/src/file-system/index.tsx
@@ -313,7 +313,6 @@ interface ExtensionSchemas {
 interface DirectoryOptions<Types extends ExtensionTypes = ExtensionTypes> {
   path?: string
   rootPath?: string
-  tsConfigPath?: string
   fileSystem?: FileSystem
   directory?: Directory<any, any>
   schema?: {
@@ -335,7 +334,6 @@ export class Directory<
   #directory?: Directory<any, any>
   #path: string
   #rootPath: string
-  #tsConfigPath?: string
   #schema?: DirectoryOptions<Types>['schema']
   #getModule?: (path: string) => Promise<any>
 
@@ -346,7 +344,6 @@ export class Directory<
         : join('.', options.path)
       : '.'
     this.#rootPath = options.rootPath ?? this.#path
-    this.#tsConfigPath = options.tsConfigPath
     this.#fileSystem = options.fileSystem
     this.#directory = options.directory
     this.#schema = options.schema
@@ -358,7 +355,7 @@ export class Directory<
       return this.#fileSystem
     }
     const { NodeFileSystem } = await import('./NodeFileSystem.js')
-    this.#fileSystem = new NodeFileSystem(this.#tsConfigPath)
+    this.#fileSystem = new NodeFileSystem()
     return this.#fileSystem
   }
 
@@ -470,7 +467,6 @@ export class Directory<
             path: entry.path,
             rootPath: this.#rootPath,
             schema: this.#schema,
-            tsConfigPath: this.#tsConfigPath,
             getModule: this.#getModule,
           })
         )
@@ -486,7 +482,6 @@ export class Directory<
                 absolutePath: entry.absolutePath,
                 getModule: this.#getModule,
                 schema: this.#schema,
-                tsConfigFilePath: this.#tsConfigPath,
                 isVirtualFileSystem: fileSystem instanceof VirtualFileSystem,
               })
             )
@@ -497,7 +492,6 @@ export class Directory<
                 path: entry.path,
                 absolutePath: entry.absolutePath,
                 schema: this.#schema,
-                tsConfigFilePath: this.#tsConfigPath,
                 isVirtualFileSystem: fileSystem instanceof VirtualFileSystem,
               })
             )