refactor

Author: Saga4

MULTI_LANGUAGE_ARCHITECTURE.md

@@ -386,7 +386,7 @@ class JavaScriptTransformer:
 
 from pathlib import Path
 from codeflash.languages.base import LanguageSupport, FunctionInfo, CodeContext
-from codeflash.languages.treesitter_utils import TreeSitterAnalyzer
+from codeflash.languages.javascript.treesitter import TreeSitterAnalyzer
 from codeflash.languages.javascript.transformer import JavaScriptTransformer
 
 class JavaScriptSupport(LanguageSupport):
@@ -523,7 +523,7 @@ class JavaScriptSupport(LanguageSupport):
 # codeflash/languages/javascript/test_discovery.py
 
 from pathlib import Path
-from codeflash.languages.treesitter_utils import TreeSitterAnalyzer
+from codeflash.languages.javascript.treesitter import TreeSitterAnalyzer
 
 class JestTestDiscovery:
     """Static analysis-based test discovery for Jest."""

codeflash/code_utils/code_extractor.py

@@ -1772,7 +1772,7 @@ def _extract_calling_function_js(source_code: str, function_name: str, ref_line:
 
     """
     try:
-        from codeflash.languages.treesitter_utils import TreeSitterAnalyzer, TreeSitterLanguage
+        from codeflash.languages.javascript.treesitter import TreeSitterAnalyzer, TreeSitterLanguage
 
         # Try TypeScript first, fall back to JavaScript
         for lang in [TreeSitterLanguage.TYPESCRIPT, TreeSitterLanguage.TSX, TreeSitterLanguage.JAVASCRIPT]:

codeflash/code_utils/code_replacer.py

@@ -26,7 +26,7 @@
 
     from codeflash.discovery.functions_to_optimize import FunctionToOptimize
     from codeflash.languages.base import Language, LanguageSupport
-    from codeflash.languages.treesitter_utils import TreeSitterAnalyzer
+    from codeflash.languages.javascript.treesitter import TreeSitterAnalyzer
     from codeflash.models.models import CodeOptimizationContext, CodeStringsMarkdown, OptimizedCandidate, ValidCode
 
 ASTNodeT = TypeVar("ASTNodeT", bound=ast.AST)
@@ -640,7 +640,7 @@ def _add_global_declarations_for_language(
         return original_source
 
     try:
-        from codeflash.languages.treesitter_utils import get_analyzer_for_file
+        from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
         analyzer = get_analyzer_for_file(module_abspath)
 

codeflash/code_utils/normalizers/javascript.py

@@ -233,7 +233,7 @@ def normalize(self, code: str) -> str:
 
         """
         try:
-            from codeflash.languages.treesitter_utils import TreeSitterAnalyzer, TreeSitterLanguage
+            from codeflash.languages.javascript.treesitter import TreeSitterAnalyzer, TreeSitterLanguage
 
             lang_map = {"javascript": TreeSitterLanguage.JAVASCRIPT, "typescript": TreeSitterLanguage.TYPESCRIPT}
             lang = lang_map.get(self._get_tree_sitter_language(), TreeSitterLanguage.JAVASCRIPT)

codeflash/discovery/functions_to_optimize.py

@@ -201,7 +201,7 @@ def _is_js_ts_function_exported(file_path: Path, function_name: str) -> tuple[bo
         Tuple of (is_exported, export_name). export_name may be 'default' for default exports.
 
     """
-    from codeflash.languages.treesitter_utils import get_analyzer_for_file
+    from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
     try:
         source = file_path.read_text(encoding="utf-8")

codeflash/languages/javascript/find_references.py

@@ -23,7 +23,7 @@
     from tree_sitter import Node
 
     from codeflash.discovery.functions_to_optimize import FunctionToOptimize
-    from codeflash.languages.treesitter_utils import ImportInfo, TreeSitterAnalyzer
+    from codeflash.languages.javascript.treesitter import ImportInfo, TreeSitterAnalyzer
 
 logger = logging.getLogger(__name__)
 
@@ -112,7 +112,7 @@ def find_references(
             List of Reference objects describing each call site.
 
         """
-        from codeflash.languages.treesitter_utils import get_analyzer_for_file
+        from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
         function_name = function_to_optimize.function_name
         source_file = function_to_optimize.file_path
@@ -719,7 +719,7 @@ def _find_reexports_direct(
                 continue
 
             # Create a fake ImportInfo to resolve the re-export source
-            from codeflash.languages.treesitter_utils import ImportInfo
+            from codeflash.languages.javascript.treesitter import ImportInfo
 
             fake_import = ImportInfo(
                 module_path=exp.reexport_source,

codeflash/languages/javascript/import_resolver.py

@@ -14,7 +14,7 @@
 if TYPE_CHECKING:
     from codeflash.discovery.functions_to_optimize import FunctionToOptimize
     from codeflash.languages.base import HelperFunction
-    from codeflash.languages.treesitter_utils import ImportInfo, TreeSitterAnalyzer
+    from codeflash.languages.javascript.treesitter import ImportInfo, TreeSitterAnalyzer
 
 logger = logging.getLogger(__name__)
 
@@ -486,7 +486,7 @@ def _extract_helper_from_file(
 
         """
         from codeflash.languages.base import HelperFunction
-        from codeflash.languages.treesitter_utils import get_analyzer_for_file
+        from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
         try:
             source = file_path.read_text(encoding="utf-8")
@@ -559,7 +559,7 @@ def _find_helpers_recursive(
         """
         from codeflash.discovery.functions_to_optimize import FunctionToOptimize
         from codeflash.languages.registry import get_language_support
-        from codeflash.languages.treesitter_utils import get_analyzer_for_file
+        from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
         if context.current_depth >= context.max_depth:
             return {}

codeflash/languages/javascript/instrument.py

@@ -792,7 +792,7 @@ def validate_and_fix_import_style(test_code: str, source_file_path: Path, functi
         Fixed test code with correct import style.
 
     """
-    from codeflash.languages.treesitter_utils import get_analyzer_for_file
+    from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
     # Read source file to determine export style
     try:

codeflash/languages/javascript/line_profiler.py

@@ -11,7 +11,7 @@
 import logging
 from typing import TYPE_CHECKING
 
-from codeflash.languages.treesitter_utils import get_analyzer_for_file
+from codeflash.languages.javascript.treesitter import get_analyzer_for_file
 
 if TYPE_CHECKING:
     from pathlib import Path

codeflash/languages/javascript/support.py

@@ -15,14 +15,14 @@
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
 from codeflash.languages.base import CodeContext, FunctionFilterCriteria, HelperFunction, Language, TestInfo, TestResult
 from codeflash.languages.registry import register_language
-from codeflash.languages.treesitter_utils import TreeSitterAnalyzer, TreeSitterLanguage, get_analyzer_for_file
+from codeflash.languages.javascript.treesitter import TreeSitterAnalyzer, TreeSitterLanguage, get_analyzer_for_file
 from codeflash.models.models import FunctionParent
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
     from codeflash.languages.base import ReferenceInfo
-    from codeflash.languages.treesitter_utils import TypeDefinition
+    from codeflash.languages.javascript.treesitter import TypeDefinition
 
 logger = logging.getLogger(__name__)