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

Author: misrasaurabh1

code_to_optimize_js/bubble_sort.js

@@ -9,17 +9,25 @@
  */
 function bubbleSort(arr) {
     const n = arr.length;
-    const result = [...arr]; // Create a copy to avoid mutation
+    // Create a copy to avoid mutation
+    const result = [...arr];
 
-    for (let i = 0; i < n - 1; i++) {
-        for (let j = 0; j < n - i - 1; j++) {
+    // Optimized bubble: shrink the inner loop to the last swap position
+    // and exit early if no swaps occur in a pass.
+    let end = n - 1;
+    while (end > 0) {
+        let lastSwap = -1;
+        for (let j = 0; j < end; j++) {
             if (result[j] > result[j + 1]) {
                 // Swap elements
                 const temp = result[j];
                 result[j] = result[j + 1];
                 result[j + 1] = temp;
+                lastSwap = j;
             }
         }
+        if (lastSwap === -1) break;
+        end = lastSwap;
     }
 
     return result;

…vascript/runtime/codeflash-comparator.js …ptimize_js/tests/codeflash-comparator.jscodeflash/languages/javascript/runtime/codeflash-comparator.js renamed to code_to_optimize_js/tests/codeflash-comparator.js codeflash/languages/javascript/runtime/codeflash-comparator.js renamed to code_to_optimize_js/tests/codeflash-comparator.js

@@ -49,6 +49,31 @@ const LOOP_INDEX = parseInt(process.env.CODEFLASH_LOOP_INDEX || '1', 10);
 const TEST_ITERATION = process.env.CODEFLASH_TEST_ITERATION || '0';
 const TEST_MODULE = process.env.CODEFLASH_TEST_MODULE || '';
 
+// Random seed for reproducible test runs
+// Both original and optimized runs use the same seed to get identical "random" values
+const RANDOM_SEED = parseInt(process.env.CODEFLASH_RANDOM_SEED || '0', 10);
+
+/**
+ * Seeded random number generator using mulberry32 algorithm.
+ * This provides reproducible "random" numbers given a fixed seed.
+ */
+function createSeededRandom(seed) {
+    let state = seed;
+    return function() {
+        state |= 0;
+        state = state + 0x6D2B79F5 | 0;
+        let t = Math.imul(state ^ state >>> 15, 1 | state);
+        t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t;
+        return ((t ^ t >>> 14) >>> 0) / 4294967296;
+    };
+}
+
+// Override Math.random with seeded version if seed is provided
+if (RANDOM_SEED !== 0) {
+    const seededRandom = createSeededRandom(RANDOM_SEED);
+    Math.random = seededRandom;
+}
+
 // Looping configuration for performance benchmarking
 const MIN_LOOPS = parseInt(process.env.CODEFLASH_MIN_LOOPS || '5', 10);
 const MAX_LOOPS = parseInt(process.env.CODEFLASH_MAX_LOOPS || '100000', 10);
@@ -301,12 +326,10 @@ 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 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
+        // 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
         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
@@ -406,11 +429,9 @@ 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 module-style path (e.g., "tests/test_foo.test.js" -> "test_foo.test")
-        // Strip leading "tests/" to match XML module path format
+        // Convert to Python module-style path (e.g., "tests/test_foo.test.js" -> "tests.test_foo.test")
         testModulePath = relativePath
             .replace(/\\/g, '/')
-            .replace(/^tests\//, '')   // Strip leading "tests/" directory
             .replace(/\.js$/, '')
             .replace(/\.test$/, '.test')
             .replace(/\//g, '.');
@@ -548,11 +569,9 @@ 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 module-style path (e.g., "tests/test_foo.test.js" -> "test_foo.test")
-        // Strip leading "tests/" to match XML module path format
+        // Convert to Python module-style path (e.g., "tests/test_foo.test.js" -> "tests.test_foo.test")
         testModulePath = relativePath
             .replace(/\\/g, '/')
-            .replace(/^tests\//, '')   // Strip leading "tests/" directory
             .replace(/\.js$/, '')
             .replace(/\.test$/, '.test')
             .replace(/\//g, '.');
@@ -638,8 +657,8 @@ function capturePerfLooped(funcName, lineId, fn, ...args) {
             break;
         }
 
-        // Stop if we've reached min loops AND exceeded a reasonable portion of time
-        if (loopCount >= MIN_LOOPS && elapsedMs >= TARGET_DURATION_MS * 0.8) {
+        // Stop if we've reached min loops AND exceeded time limit
+        if (loopCount >= MIN_LOOPS && elapsedMs >= TARGET_DURATION_MS) {
             break;
         }
 

…ipt/runtime/codeflash-compare-results.js …ze_js/tests/codeflash-compare-results.jscodeflash/languages/javascript/runtime/codeflash-compare-results.js renamed to code_to_optimize_js/tests/codeflash-compare-results.js codeflash/languages/javascript/runtime/codeflash-compare-results.js renamed to code_to_optimize_js/tests/codeflash-compare-results.js

@@ -101,10 +101,7 @@ def make_ai_service_request(
         return response
 
     def _get_valid_candidates(
-        self,
-        optimizations_json: list[dict[str, Any]],
-        source: OptimizedCandidateSource,
-        language: str = "python",
+        self, optimizations_json: list[dict[str, Any]], source: OptimizedCandidateSource, language: str = "python"
     ) -> list[OptimizedCandidate]:
         candidates: list[OptimizedCandidate] = []
         for opt in optimizations_json:
@@ -183,8 +180,8 @@ def optimize_code(  # noqa: D417
             payload["language_version"] = language_version or "ES2022"
 
         # DEBUG: Print payload language field
-        print(
-            f"[CLI DEBUG] Sending optimize request with language='{payload['language']}' (type: {type(payload['language'])})"
+        logger.debug(
+            f"Sending optimize request with language='{payload['language']}' (type: {type(payload['language'])})"
         )
         logger.debug(f"Sending optimize request: trace_id={trace_id}, n_candidates={payload['n_candidates']}")
 
@@ -685,9 +682,7 @@ def generate_regression_tests(  # noqa: D417
             payload["language_version"] = language_version or "ES2022"
 
         # DEBUG: Print payload language field
-        print(
-            f"[CLI DEBUG] Sending testgen request with language='{payload['language']}', framework='{test_framework}'"
-        )
+        logger.debug(f"Sending testgen request with language='{payload['language']}', framework='{test_framework}'")
         try:
             response = self.make_ai_service_request("/testgen", payload=payload, timeout=self.timeout)
         except requests.exceptions.RequestException as e:

…ascript/runtime/codeflash-jest-helper.js …timize_js/tests/codeflash-jest-helper.jscodeflash/languages/javascript/runtime/codeflash-jest-helper.js renamed to code_to_optimize_js/tests/codeflash-jest-helper.js codeflash/languages/javascript/runtime/codeflash-jest-helper.js renamed to code_to_optimize_js/tests/codeflash-jest-helper.js

@@ -6,8 +6,10 @@
 
 from pathlib import Path
 
-# Directory containing the JavaScript runtime files
-RUNTIME_DIR = Path(__file__).parent
+# TEMPORARY: Currently pointing to the development directory.
+# In the future, these scripts should be published as an npm package (e.g., @codeflash/runtime)
+# and this module should read from the installed package location in the user's node_modules.
+RUNTIME_DIR = Path(__file__).parent.parent.parent.parent.parent / "code_to_optimize_js"
 
 
 def get_jest_helper_path() -> Path:
@@ -51,9 +53,4 @@ def get_all_runtime_files() -> list[Path]:
 
     Returns a list of all JS files that should be copied to the user's project.
     """
-    return [
-        get_jest_helper_path(),
-        get_comparator_path(),
-        get_compare_results_path(),
-        get_serializer_path(),
-    ]
+    return [get_jest_helper_path(), get_comparator_path(), get_compare_results_path(), get_serializer_path()]

…vascript/runtime/codeflash-serializer.js …ptimize_js/tests/codeflash-serializer.jscodeflash/languages/javascript/runtime/codeflash-serializer.js renamed to code_to_optimize_js/tests/codeflash-serializer.js codeflash/languages/javascript/runtime/codeflash-serializer.js renamed to code_to_optimize_js/tests/codeflash-serializer.js

@@ -1957,11 +1957,7 @@ def process_review(
         )
 
         generated_tests = add_runtime_comments_to_generated_tests(
-            generated_tests,
-            original_runtime_by_test,
-            optimized_runtime_by_test,
-            self.test_cfg.tests_project_rootdir,
-            language=self.function_to_optimize.language,
+            generated_tests, original_runtime_by_test, optimized_runtime_by_test, self.test_cfg.tests_project_rootdir
         )
 
         generated_tests_str = ""
@@ -2447,11 +2443,9 @@ def run_optimized_candidate(
                 logger.info("h3|Test results matched ✅")
                 console.rule()
             else:
-                if not self.is_js:
-                    # TODO: get repair to work with js/ts code
-                    self.repair_if_possible(
-                        candidate, diffs, eval_ctx, code_context, len(candidate_behavior_results), exp_type
-                    )
+                self.repair_if_possible(
+                    candidate, diffs, eval_ctx, code_context, len(candidate_behavior_results), exp_type
+                )
                 return self.get_results_not_matched_error()
 
             logger.info(f"loading|Running performance tests for candidate {optimization_candidate_index}...")
@@ -2606,7 +2600,7 @@ def run_and_parse_tests(
 
         if testing_type in {TestingMode.BEHAVIOR, TestingMode.PERFORMANCE}:
             # For JavaScript behavior tests, skip SQLite cleanup - files needed for JS-native comparison
-            #TODO (ali): make sure it works fine
+            # TODO (ali): make sure it works fine
             is_js_for_original_code = self.is_js and optimization_iteration == 0
             is_js_behavior = (self.is_js and testing_type == TestingMode.BEHAVIOR) or is_js_for_original_code
 

codeflash/api/aiservice.py

@@ -9,6 +9,7 @@
 
 from codeflash.cli_cmds.console import logger
 from codeflash.code_utils.code_utils import shorten_pytest_error
+from codeflash.languages.javascript.runtime import get_compare_results_path
 from codeflash.models.models import TestDiff, TestDiffScope, TestResults, TestType, VerificationType
 from codeflash.verification.comparator import comparator
 
@@ -17,10 +18,7 @@
 
 INCREASED_RECURSION_LIMIT = 5000
 
-# Path to JavaScript comparison script (relative to codeflash package)
-JAVASCRIPT_COMPARATOR_SCRIPT = (
-    Path(__file__).parent.parent / "languages" / "javascript" / "runtime" / "codeflash-compare-results.js"
-)
+JAVASCRIPT_COMPARATOR_SCRIPT = get_compare_results_path()
 
 reprlib_repr = reprlib.Repr()
 reprlib_repr.maxstring = 1500
@@ -223,14 +221,18 @@ def compare_javascript_test_results(
                 scope = TestDiffScope.DID_PASS
 
             test_info = diff.get("test_info", {})
+            # Build a test identifier string for JavaScript tests
+            test_function_name = test_info.get("test_function_name", "unknown")
+            function_getting_tested = test_info.get("function_getting_tested", "unknown")
+            test_src_code = f"// Test: {test_function_name}\n// Testing function: {function_getting_tested}"
 
             test_diffs.append(
                 TestDiff(
                     scope=scope,
                     original_value=diff.get("original"),
                     candidate_value=diff.get("candidate"),
-                    test_src_code=None,  # JavaScript tests don't have Python source
-                    candidate_pytest_error=None,
+                    test_src_code=test_src_code,
+                    candidate_pytest_error=diff.get("candidate_error"),
                     original_pass=True,  # Assume passed if we got results
                     candidate_pass=diff.get("scope") != "missing",
                     original_pytest_error=None,

codeflash/languages/javascript/runtime/__init__.py

@@ -1,2 +1,2 @@
 # These version placeholders will be replaced by uv-dynamic-versioning during build.
-__version__ = "0.19.1.post108.dev0+3a96f0ad"
+__version__ = "0.19.1"