Optimize

Author: owjs3901

src/analyzer.ts

@@ -184,8 +184,7 @@ function parseFileAnalysis(filePath: string, sourceText: string): FileAnalysis {
     collectLocalComponentName(statement, localComponentNames)
   }
 
-  const jsxTags: JsxTagReference[] = []
-  visitNode(sourceFile, jsxTags)
+  const jsxTags = collectJsxTags(sourceFile)
 
   return {
     imports,
@@ -321,7 +320,8 @@ function isComponentInitializer(
     return false
   }
 
-  const calleeName = initializer.expression.getText()
+  const callee = initializer.expression
+  const calleeName = ts.isIdentifier(callee) ? callee.text : callee.getText()
   if (!COMPONENT_WRAPPER_NAMES.has(calleeName)) {
     return false
   }
@@ -332,19 +332,23 @@ function isComponentInitializer(
   )
 }
 
-function visitNode(node: ts.Node, jsxTags: JsxTagReference[]): void {
-  if (
-    ts.isJsxOpeningElement(node) ||
-    ts.isJsxSelfClosingElement(node) ||
-    ts.isJsxClosingElement(node)
-  ) {
-    const jsxTag = createJsxTagReference(node, node.getSourceFile())
-    if (jsxTag) {
-      jsxTags.push(jsxTag)
+function collectJsxTags(root: ts.Node): JsxTagReference[] {
+  const jsxTags: JsxTagReference[] = []
+  const visit = (node: ts.Node): void => {
+    if (
+      ts.isJsxOpeningElement(node) ||
+      ts.isJsxSelfClosingElement(node) ||
+      ts.isJsxClosingElement(node)
+    ) {
+      const jsxTag = createJsxTagReference(node, node.getSourceFile())
+      if (jsxTag) {
+        jsxTags.push(jsxTag)
+      }
     }
+    ts.forEachChild(node, visit)
   }
-
-  ts.forEachChild(node, (childNode) => visitNode(childNode, jsxTags))
+  ts.forEachChild(root, visit)
+  return jsxTags
 }
 
 function createJsxTagReference(

src/resolver.ts

@@ -31,12 +31,24 @@ export class ImportResolver {
     string,
     CachedCompilerOptions
   >()
+  private readonly configPathCache = new Map<string, string | undefined>()
   private readonly resolutionCache = new Map<string, string | undefined>()
-
-  public constructor(private readonly host: SourceHost) {}
+  private readonly hostDirectoryExists: (directoryPath: string) => boolean
+  private readonly hostFileExists: (filePath: string) => boolean
+  private readonly hostReadFile: (filePath: string) => string | undefined
+
+  public constructor(private readonly host: SourceHost) {
+    this.hostDirectoryExists = (directoryPath) =>
+      host.fileExists(directoryPath) || ts.sys.directoryExists(directoryPath)
+    this.hostFileExists = (filePath) =>
+      host.fileExists(filePath) || ts.sys.fileExists(filePath)
+    this.hostReadFile = (filePath) =>
+      host.readFile(filePath) ?? ts.sys.readFile(filePath)
+  }
 
   public clear(): void {
     this.compilerOptionsCache.clear()
+    this.configPathCache.clear()
     this.resolutionCache.clear()
   }
 
@@ -53,15 +65,11 @@ export class ImportResolver {
 
     const compilerOptions = this.getCompilerOptions(normalizedFromFilePath)
     const resolutionHost: ts.ModuleResolutionHost = {
-      directoryExists: (directoryPath) =>
-        this.host.fileExists(directoryPath) ||
-        ts.sys.directoryExists(directoryPath),
-      fileExists: (filePath) =>
-        this.host.fileExists(filePath) || ts.sys.fileExists(filePath),
+      directoryExists: this.hostDirectoryExists,
+      fileExists: this.hostFileExists,
       getCurrentDirectory: () => path.dirname(normalizedFromFilePath),
       getDirectories: ts.sys.getDirectories,
-      readFile: (filePath) =>
-        this.host.readFile(filePath) ?? ts.sys.readFile(filePath),
+      readFile: this.hostReadFile,
       realpath: ts.sys.realpath,
       useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
     }
@@ -84,7 +92,14 @@ export class ImportResolver {
   }
 
   private getCompilerOptions(filePath: string): ts.CompilerOptions {
-    const configPath = findNearestConfigFile(path.dirname(filePath))
+    const directory = path.dirname(filePath)
+    let configPath: string | undefined
+    if (this.configPathCache.has(directory)) {
+      configPath = this.configPathCache.get(directory)
+    } else {
+      configPath = findNearestConfigFile(directory)
+      this.configPathCache.set(directory, configPath)
+    }
     if (!configPath) {
       return DEFAULT_COMPILER_OPTIONS
     }