Merge remote-tracking branch 'origin/multi-language' into multi-language

Author: misrasaurabh1

codeflash/discovery/discover_unit_tests.py

@@ -554,9 +554,7 @@ def filter_test_files_by_imports(
     return filtered_map
 
 
-def _detect_language_from_functions(
-    file_to_funcs: dict[Path, list[FunctionToOptimize]] | None,
-) -> str | None:
+def _detect_language_from_functions(file_to_funcs: dict[Path, list[FunctionToOptimize]] | None) -> str | None:
     """Detect language from the functions to optimize.
 
     Args:
@@ -576,9 +574,7 @@ def _detect_language_from_functions(
 
 
 def discover_tests_for_language(
-    cfg: TestConfig,
-    language: str,
-    file_to_funcs_to_optimize: dict[Path, list[FunctionToOptimize]] | None,
+    cfg: TestConfig, language: str, file_to_funcs_to_optimize: dict[Path, list[FunctionToOptimize]] | None
 ) -> tuple[dict[str, set[FunctionCalledInTest]], int, int]:
     """Discover tests using language-specific support.
 
@@ -656,6 +652,10 @@ def discover_unit_tests(
 
     # Route to language-specific test discovery for non-Python languages
     if language and language != "python":
+        # For JavaScript/TypeScript, tests_project_rootdir should be tests_root itself
+        # The Jest helper will be configured to NOT include "tests." prefix to match
+        if language in ("javascript", "typescript"):
+            cfg.tests_project_rootdir = cfg.tests_root
         return discover_tests_for_language(cfg, language, file_to_funcs_to_optimize)
 
     # Existing Python logic

codeflash/languages/javascript/runtime/codeflash-jest-helper.js

@@ -301,10 +301,12 @@ function capture(funcName, lineId, fn, ...args) {
         // Get relative path from cwd and convert to module-style path
         const path = require('path');
         const relativePath = path.relative(process.cwd(), currentTestPath);
-        // Convert to Python module-style path (e.g., "tests/test_foo.test.js" -> "tests.test_foo.test")
-        // This matches what Jest's junit XML produces
+        // Convert to module-style path (e.g., "tests/test_foo.test.js" -> "test_foo.test")
+        // Strip the leading "tests/" directory to match what Jest's junit XML produces
+        // and what module_name_from_file_path(test_file, tests_root) generates
         testModulePath = relativePath
             .replace(/\\/g, '/')       // Handle Windows paths
+            .replace(/^tests\//, '')   // Strip leading "tests/" directory
             .replace(/\.js$/, '')       // Remove .js extension
             .replace(/\.test$/, '.test') // Keep .test suffix
             .replace(/\//g, '.');       // Convert path separators to dots
@@ -404,9 +406,11 @@ function capturePerf(funcName, lineId, fn, ...args) {
         // Get relative path from cwd and convert to module-style path
         const path = require('path');
         const relativePath = path.relative(process.cwd(), currentTestPath);
-        // Convert to Python module-style path (e.g., "tests/test_foo.test.js" -> "tests.test_foo.test")
+        // Convert to module-style path (e.g., "tests/test_foo.test.js" -> "test_foo.test")
+        // Strip leading "tests/" to match XML module path format
         testModulePath = relativePath
             .replace(/\\/g, '/')
+            .replace(/^tests\//, '')   // Strip leading "tests/" directory
             .replace(/\.js$/, '')
             .replace(/\.test$/, '.test')
             .replace(/\//g, '.');
@@ -544,9 +548,11 @@ function capturePerfLooped(funcName, lineId, fn, ...args) {
         // Get relative path from cwd and convert to module-style path
         const path = require('path');
         const relativePath = path.relative(process.cwd(), currentTestPath);
-        // Convert to Python module-style path (e.g., "tests/test_foo.test.js" -> "tests.test_foo.test")
+        // Convert to module-style path (e.g., "tests/test_foo.test.js" -> "test_foo.test")
+        // Strip leading "tests/" to match XML module path format
         testModulePath = relativePath
             .replace(/\\/g, '/')
+            .replace(/^tests\//, '')   // Strip leading "tests/" directory
             .replace(/\.js$/, '')
             .replace(/\.test$/, '.test')
             .replace(/\//g, '.');

codeflash/optimization/function_optimizer.py

@@ -487,8 +487,7 @@ def __init__(
                 rel_path = os.path.relpath(str(source_file_abs), str(tests_root_abs))
                 self.original_module_path = rel_path
                 logger.debug(
-                    f"!lsp|JS module path: source={source_file_abs}, "
-                    f"tests_root={tests_root_abs}, rel_path={rel_path}"
+                    f"!lsp|JS module path: source={source_file_abs}, tests_root={tests_root_abs}, rel_path={rel_path}"
                 )
             except ValueError:
                 # Fallback if paths are on different drives (Windows)
@@ -600,6 +599,24 @@ def generate_and_instrument_tests(
             for test_index in range(n_tests)
         ]
 
+        # For JavaScript/TypeScript, copy all runtime files to tests directory
+        if language in ("javascript", "typescript"):
+            import shutil
+
+            from codeflash.languages.javascript.runtime import get_all_runtime_files
+
+            # Copy all runtime files (helper, serializer, comparator, etc.)
+            for runtime_file_source in get_all_runtime_files():
+                runtime_file_dest = self.test_cfg.tests_root / runtime_file_source.name
+
+                # Copy file if it doesn't exist or is outdated
+                if (
+                    not runtime_file_dest.exists()
+                    or runtime_file_source.stat().st_mtime > runtime_file_dest.stat().st_mtime
+                ):
+                    shutil.copy2(runtime_file_source, runtime_file_dest)
+                    logger.debug(f"Copied {runtime_file_source.name} to {runtime_file_dest}")
+
         test_results = self.generate_tests(
             testgen_context=code_context.testgen_context,
             helper_functions=code_context.helper_functions,
@@ -854,7 +871,9 @@ def handle_successful_candidate(
         else:
             with progress_bar("Running line-by-line profiling"):
                 line_profile_test_results = self.line_profiler_step(
-                    code_context=code_context, original_helper_code=original_helper_code, candidate_index=candidate_index
+                    code_context=code_context,
+                    original_helper_code=original_helper_code,
+                    candidate_index=candidate_index,
                 )
 
         eval_ctx.record_line_profiler_result(candidate.optimization_id, line_profile_test_results["str_out"])
@@ -2231,6 +2250,7 @@ def establish_original_code_baseline(
             for result in behavioral_results
             if (result.test_type == TestType.GENERATED_REGRESSION and not result.did_pass)
         ]
+
         if total_timing == 0:
             logger.warning("The overall summed benchmark runtime of the original function is 0, couldn't run tests.")
             console.rule()
@@ -2414,7 +2434,9 @@ def run_optimized_candidate(
                         logger.error(f"Candidate SQLite database not found: {candidate_sqlite}")
                     logger.debug("No diffs found, skipping repair")
                     # Use Python-style comparison on TestResults as fallback
-                    match, diffs = compare_test_results(baseline_results.behavior_test_results, candidate_behavior_results)
+                    match, diffs = compare_test_results(
+                        baseline_results.behavior_test_results, candidate_behavior_results
+                    )
             else:
                 # Python: Compare using Python comparator
                 match, diffs = compare_test_results(baseline_results.behavior_test_results, candidate_behavior_results)

codeflash/verification/parse_test_output.py

@@ -140,10 +140,7 @@ def resolve_test_file_from_class_path(test_class_path: str, base_dir: Path) -> P
 
 
 def parse_jest_json_results(
-    file_location: Path,
-    test_files: TestFiles,
-    test_config: TestConfig,
-    function_name: str | None = None,
+    file_location: Path, test_files: TestFiles, test_config: TestConfig, function_name: str | None = None
 ) -> TestResults:
     """Parse Jest test results from JSON format written by codeflash-jest-helper.
 
@@ -362,7 +359,7 @@ def parse_sqlite_test_results(sqlite_file_path: Path, test_files: TestFiles, tes
                     else:
                         # Python uses pickle serialization
                         ret_val = (pickle.loads(val[7]),)
-                except Exception as e:  # noqa: S112
+                except Exception as e:
                     # If deserialization fails, skip this result
                     logger.debug(f"Failed to deserialize return value for {test_function_name}: {e}")
                     continue
@@ -405,6 +402,7 @@ def _extract_jest_console_output(suite_elem) -> str:
 
     Returns:
         Concatenated message content from all log entries
+
     """
     import json
 
@@ -455,6 +453,7 @@ def parse_jest_test_xml(
 
     Returns:
         TestResults containing parsed test invocations
+
     """
     test_results = TestResults()
 
@@ -1028,6 +1027,7 @@ def parse_test_results(
     # (comparison happens in JavaScript land via compare_javascript_test_results)
     if not skip_sqlite_cleanup:
         get_run_tmp_file(Path(f"test_return_values_{optimization_iteration}.sqlite")).unlink(missing_ok=True)
+
     results = merge_test_results(test_results_xml, test_results_data, test_config.test_framework)
 
     all_args = False
@@ -1060,6 +1060,7 @@ def parse_test_results(
 
     # Cleanup Jest coverage directory after coverage is parsed
     import shutil
+
     jest_coverage_dir = get_run_tmp_file(Path("jest_coverage"))
     if jest_coverage_dir.exists():
         shutil.rmtree(jest_coverage_dir, ignore_errors=True)

codeflash/verification/verifier.py

@@ -27,7 +27,7 @@ def generate_tests(
     test_index: int,
     test_path: Path,
     test_perf_path: Path,
-) -> tuple[str, str, Path] | None:
+) -> tuple[str, str, str, Path, Path] | None:
     # TODO: Sometimes this recreates the original Class definition. This overrides and messes up the original
     #  class import. Remove the recreation of the class definition
     start_time = time.perf_counter()