Merge branch 'main' into fix-opt-review

Author: aseembits93

codeflash/discovery/functions_to_optimize.py

@@ -216,6 +216,32 @@ def get_files_for_language(
     return files
 
 
+def _is_js_ts_function_exported(file_path: Path, function_name: str) -> tuple[bool, str | None]:
+    """Check if a JavaScript/TypeScript function is exported from its module.
+
+    For JS/TS, functions that are not exported cannot be imported by tests,
+    making them impossible to optimize.
+
+    Args:
+        file_path: Path to the source file.
+        function_name: Name of the function to check.
+
+    Returns:
+        Tuple of (is_exported, export_name). export_name may be 'default' for default exports.
+
+    """
+    from codeflash.languages.treesitter_utils import get_analyzer_for_file
+
+    try:
+        source = file_path.read_text(encoding="utf-8")
+        analyzer = get_analyzer_for_file(file_path)
+        return analyzer.is_function_exported(source, function_name)
+    except Exception as e:
+        logger.debug(f"Failed to check export status for {function_name}: {e}")
+        # Return True to avoid blocking in case of errors
+        return True, None
+
+
 def _find_all_functions_in_python_file(file_path: Path) -> dict[Path, list[FunctionToOptimize]]:
     """Find all optimizable functions in a Python file using AST parsing.
 
@@ -338,6 +364,36 @@ def get_functions_to_optimize(
                     exit_with_message(
                         f"Function {only_get_this_function} not found in file {file}\nor the function does not have a 'return' statement or is a property"
                     )
+
+                # For JavaScript/TypeScript, verify that the function (or its parent class) is exported
+                # Non-exported functions cannot be imported by tests
+                if found_function.language in ("javascript", "typescript"):
+                    # For class methods, check if the parent class is exported
+                    # For standalone functions, check if the function itself is exported
+                    if found_function.parents:
+                        # It's a class method - check if the class is exported
+                        name_to_check = found_function.top_level_parent_name
+                    else:
+                        # It's a standalone function - check if the function is exported
+                        name_to_check = found_function.function_name
+
+                    is_exported, export_name = _is_js_ts_function_exported(file, name_to_check)
+                    if not is_exported:
+                        if found_function.parents:
+                            logger.debug(
+                                f"Class '{name_to_check}' containing method '{found_function.function_name}' "
+                                f"is not exported from {file}. "
+                                f"In JavaScript/TypeScript, only exported classes/functions can be optimized "
+                                f"because tests need to import them."
+                            )
+                        else:
+                            logger.debug(
+                                f"Function '{found_function.function_name}' is not exported from {file}. "
+                                f"In JavaScript/TypeScript, only exported functions can be optimized because "
+                                f"tests need to import them."
+                            )
+                        return {}, 0, None
+
                 functions[file] = [found_function]
         else:
             logger.info("Finding all functions modified in the current git diff ...")

codeflash/languages/javascript/module_system.py

@@ -184,10 +184,18 @@ def _get_relative_import_path(target_path: Path, source_path: Path) -> str:
 
 
 def add_js_extension(module_path: str) -> str:
-    """Add .js extension to relative module paths for ESM compatibility."""
-    if module_path.startswith(("./", "../")):
-        if not module_path.endswith(".js") and not module_path.endswith(".mjs"):
-            return module_path + ".js"
+    """Process module path for ESM compatibility.
+
+    NOTE: This function intentionally does NOT add extensions because:
+    1. TypeScript projects resolve modules without explicit extensions
+    2. Adding .js to .ts imports causes "Cannot find module" errors
+    3. Modern bundlers (webpack, vite, etc.) handle extension resolution automatically
+
+    The function name is preserved for backward compatibility but the behavior
+    has been changed to NOT add extensions.
+    """
+    # Previously this function added .js extensions, but this caused module resolution
+    # errors in TypeScript projects. We now preserve paths without adding extensions.
     return module_path
 
 

codeflash/verification/verifier.py

@@ -75,7 +75,7 @@ def generate_tests(
             func_name = function_to_optimize.function_name
             qualified_name = function_to_optimize.qualified_name
 
-            # First validate and fix import styles
+            # Validate and fix import styles (default vs named exports)
             generated_test_source = validate_and_fix_import_style(generated_test_source, source_file, func_name)
 
             # Convert module system if needed (e.g., CommonJS -> ESM for ESM projects)

tests/test_javascript_function_discovery.py

@@ -346,11 +346,11 @@ def test_get_specific_function(self, tmp_path):
         """Test getting a specific function by name."""
         js_file = tmp_path / "math_utils.js"
         js_file.write_text("""
-function add(a, b) {
+export function add(a, b) {
     return a + b;
 }
 
-function subtract(a, b) {
+export function subtract(a, b) {
     return a - b;
 }
 """)
@@ -378,7 +378,7 @@ def test_get_class_method(self, tmp_path):
         """Test getting a specific class method."""
         js_file = tmp_path / "calculator.js"
         js_file.write_text("""
-class Calculator {
+export class Calculator {
     add(a, b) {
         return a + b;
     }
@@ -388,7 +388,7 @@ class Calculator {
     }
 }
 
-function standaloneFunc() {
+export function standaloneFunc() {
     return 42;
 }
 """)

tests/test_languages/test_javascript_instrumentation.py

@@ -651,4 +651,4 @@ def test_this_method_call_exact_output(self):
 
         expected = "        return codeflash.capture('Class.fibonacci', '1', this.fibonacci.bind(this), n - 1);"
         assert transformed == expected, f"Expected:\n{expected}\nGot:\n{transformed}"
-        assert counter == 1
+        assert counter == 1