Merge pull request #1497 from codeflash-ai/fix/jest30-pnpm-resolution

fix: resolve jest-runner from project's node_modules for Jest 30 compatibility

Author: mohammedahmed18

.github/workflows/js-tests.yml

@@ -527,10 +527,5 @@ def parse_jest_test_xml(
                 f"[LOOP-SUMMARY] Results loop_index: min={min_idx}, max={max_idx}, "
                 f"unique_count={len(unique_loop_indices)}, total_results={len(loop_indices)}"
             )
-            if max_idx == 1 and len(loop_indices) > 1:
-                logger.warning(
-                    f"[LOOP-WARNING] All {len(loop_indices)} results have loop_index=1. "
-                    "Perf test markers may not have been parsed correctly."
-                )
 
     return test_results

codeflash/languages/javascript/parse.py

@@ -803,8 +803,6 @@ def run_jest_behavioral_tests(
         wall_clock_ns = time.perf_counter_ns() - start_time_ns
         logger.debug(f"Jest behavioral tests completed in {wall_clock_ns / 1e9:.2f}s")
 
-    print(result.stdout)
-
     return result_file_path, result, coverage_json_path, None
 
 
@@ -1046,6 +1044,10 @@ def run_jest_benchmarking_tests(
 
         # Create result with combined stdout
         result = subprocess.CompletedProcess(args=result.args, returncode=result.returncode, stdout=stdout, stderr="")
+        if result.returncode != 0:
+            logger.info(f"Jest benchmarking failed with return code {result.returncode}")
+            logger.info(f"Jest benchmarking stdout: {result.stdout}")
+            logger.info(f"Jest benchmarking stderr: {result.stderr}")
 
     except subprocess.TimeoutExpired:
         logger.warning(f"Jest benchmarking timed out after {total_timeout}s")

codeflash/languages/javascript/test_runner.py

@@ -1,2 +1,2 @@
 # These version placeholders will be replaced by uv-dynamic-versioning during build.
-__version__ = "0.20.0.post510.dev0+b8932209"
+__version__ = "0.20.0.post634.dev0+2d73cf88"

codeflash/version.py

@@ -113,21 +113,26 @@ function checkSharedTimeLimit() {
 
 /**
  * Get the current loop index for a specific invocation.
- * The loop index represents how many times ALL test files have been run through.
- * This is the batch count from the loop-runner.
+ * When using external loop-runner (Jest), returns the batch number directly.
+ * When using internal looping (Vitest), tracks and returns the invocation count.
+ *
  * @param {string} invocationKey - Unique key for this test invocation
- * @returns {number} The current batch number (loop index)
+ * @returns {number} The loop index for timing markers (1-based)
  */
 function getInvocationLoopIndex(invocationKey) {
-    // Track local loop count for stopping logic (increments on each call)
+    // When using external loop-runner, use the batch number directly
+    // This is reliable because Jest resets module state between batches
+    const currentBatch = process.env.CODEFLASH_PERF_CURRENT_BATCH;
+    if (currentBatch !== undefined) {
+        return parseInt(currentBatch, 10);
+    }
+
+    // For internal looping (Vitest), track the count locally
     if (!sharedPerfState.invocationLoopCounts[invocationKey]) {
         sharedPerfState.invocationLoopCounts[invocationKey] = 0;
     }
     ++sharedPerfState.invocationLoopCounts[invocationKey];
-
-    // Return the batch number as the loop index for timing markers
-    // This represents how many times all test files have been run through
-    return parseInt(process.env.CODEFLASH_PERF_CURRENT_BATCH || '1', 10);
+    return sharedPerfState.invocationLoopCounts[invocationKey];
 }
 
 /**
@@ -693,11 +698,9 @@ function capturePerf(funcName, lineId, fn, ...args) {
     // If not set, we're in Vitest mode and need to do all loops internally
     const hasExternalLoopRunner = process.env.CODEFLASH_PERF_CURRENT_BATCH !== undefined;
 
-    // Batched looping: run BATCH_SIZE loops per capturePerf call when using loop-runner
+    // When using external loop-runner (Jest), execute only once per call - the loop-runner handles batching
     // For Vitest (no loop-runner), do all loops internally in a single call
-    const batchSize = shouldLoop
-        ? (hasExternalLoopRunner ? getPerfBatchSize() : getPerfLoopCount())
-        : 1;
+    const batchSize = hasExternalLoopRunner ? 1 : (shouldLoop ? getPerfLoopCount() : 1);
 
     // Initialize runtime tracking for this invocation if needed
     if (!sharedPerfState.invocationRuntimes[invocationKey]) {
@@ -719,7 +722,7 @@ function capturePerf(funcName, lineId, fn, ...args) {
             break;
         }
 
-        // Get the loop index (batch number) for timing markers
+        // Get the loop index for timing markers
         const loopIndex = getInvocationLoopIndex(invocationKey);
 
         // Check if we've exceeded max loops for this invocation