fixup! feat(tinybench-plugin): bump tinybench and add walltime support

Author: GuillaumeLagrange

packages/tinybench-plugin/src/index.ts

@@ -11,13 +11,11 @@ import { get as getStackTrace } from "stack-trace";
 import { Bench } from "tinybench";
 import { fileURLToPath } from "url";
 import { runInstrumentedBench } from "./instrumented";
+import { getOrCreateUriMap } from "./uri";
 import { runWalltimeBench } from "./walltime";
 
 tryIntrospect();
 
-// Store URI mapping externally since fnOpts is private
-export const taskUriMap = new WeakMap<Bench, Map<string, string>>();
-
 export function withCodSpeed(bench: Bench): Bench {
   // Check if CODSPEED_ENV is defined
   if (!process.env.CODSPEED_ENV) {
@@ -27,18 +25,12 @@ export function withCodSpeed(bench: Bench): Bench {
 
   const rootCallingFile = getCallingFile();
 
-  // Initialize URI mapping for this bench instance
-  if (!taskUriMap.has(bench)) {
-    taskUriMap.set(bench, new Map());
-  }
-  const uriMap = taskUriMap.get(bench)!;
-
-  // Setup URI generation for tasks
+  // Compute and register URI for bench
+  const uriMap = getOrCreateUriMap(bench);
   const rawAdd = bench.add;
   bench.add = (name, fn, opts?) => {
     const callingFile = getCallingFile();
     const uri = `${callingFile}::${name}`;
-    // Store URI mapping
     uriMap.set(name, uri);
     return rawAdd.bind(bench)(name, fn, opts);
   };

packages/tinybench-plugin/src/instrumented.ts

@@ -6,19 +6,10 @@ import {
   teardownCore,
 } from "@codspeed/core";
 import { Bench } from "tinybench";
-import { taskUriMap } from "./index";
+import { getTaskUri } from "./uri";
 
 declare const __VERSION__: string;
 
-function getTaskUri(
-  bench: Bench,
-  taskName: string,
-  rootCallingFile: string
-): string {
-  const uriMap = taskUriMap.get(bench);
-  return uriMap?.get(taskName) || `${rootCallingFile}::${taskName}`;
-}
-
 export function runInstrumentedBench(
   bench: Bench,
   rootCallingFile: string

packages/tinybench-plugin/src/uri.ts

@@ -0,0 +1,20 @@
+import { Bench } from "tinybench";
+
+// Store URI mapping externally since fnOpts is private
+export const taskUriMap = new WeakMap<Bench, Map<string, string>>();
+
+export function getTaskUri(
+  bench: Bench,
+  taskName: string,
+  rootCallingFile: string
+): string {
+  const uriMap = taskUriMap.get(bench);
+  return uriMap?.get(taskName) || `${rootCallingFile}::${taskName}`;
+}
+
+export function getOrCreateUriMap(bench: Bench) {
+  if (!taskUriMap.has(bench)) {
+    taskUriMap.set(bench, new Map());
+  }
+  return taskUriMap.get(bench)!;
+}

packages/tinybench-plugin/src/walltime.ts

@@ -6,53 +6,10 @@ import {
   type BenchmarkStats,
 } from "@codspeed/core";
 import { Bench, TaskResult } from "tinybench";
-import { taskUriMap } from "./index";
+import { getTaskUri } from "./uri";
 
 declare const __VERSION__: string;
 
-function getTaskUri(
-  bench: Bench,
-  taskName: string,
-  rootCallingFile: string
-): string {
-  const uriMap = taskUriMap.get(bench);
-  return uriMap?.get(taskName) || `${rootCallingFile}::${taskName}`;
-}
-
-function convertTinybenchResultToBenchmarkStats(
-  result: TaskResult,
-  warmupIterations: number
-): BenchmarkStats {
-  // All tinybench times are in milliseconds, convert to nanoseconds
-  const ms_to_ns = (ms: number) => ms * 1_000_000;
-
-  const { min, max, mean, sd, samples } = result.latency;
-
-  // Get individual sample times in nanoseconds and sort them
-  const sortedTimesNs = samples.map(ms_to_ns).sort((a, b) => a - b);
-  const meanNs = ms_to_ns(mean);
-  const stdevNs = ms_to_ns(sd);
-
-  const { q1_ns, q3_ns, median_ns, iqr_outlier_rounds, stdev_outlier_rounds } =
-    calculateQuantiles({ meanNs, stdevNs, sortedTimesNs });
-
-  return {
-    min_ns: ms_to_ns(min),
-    max_ns: ms_to_ns(max),
-    mean_ns: meanNs,
-    stdev_ns: stdevNs,
-    q1_ns,
-    median_ns,
-    q3_ns,
-    total_time: result.totalTime / 1_000, // convert from ms to seconds
-    iter_per_round: sortedTimesNs.length,
-    rounds: 1, // Tinybench only runs one round
-    iqr_outlier_rounds,
-    stdev_outlier_rounds,
-    warmup_iters: warmupIterations,
-  };
-}
-
 export function runWalltimeBench(bench: Bench, rootCallingFile: string): void {
   bench.run = async () => {
     console.log(
@@ -125,3 +82,37 @@ export function runWalltimeBench(bench: Bench, rootCallingFile: string): void {
     return results;
   };
 }
+
+function convertTinybenchResultToBenchmarkStats(
+  result: TaskResult,
+  warmupIterations: number
+): BenchmarkStats {
+  // All tinybench times are in milliseconds, convert to nanoseconds
+  const ms_to_ns = (ms: number) => ms * 1_000_000;
+
+  const { min, max, mean, sd, samples } = result.latency;
+
+  // Get individual sample times in nanoseconds and sort them
+  const sortedTimesNs = samples.map(ms_to_ns).sort((a, b) => a - b);
+  const meanNs = ms_to_ns(mean);
+  const stdevNs = ms_to_ns(sd);
+
+  const { q1_ns, q3_ns, median_ns, iqr_outlier_rounds, stdev_outlier_rounds } =
+    calculateQuantiles({ meanNs, stdevNs, sortedTimesNs });
+
+  return {
+    min_ns: ms_to_ns(min),
+    max_ns: ms_to_ns(max),
+    mean_ns: meanNs,
+    stdev_ns: stdevNs,
+    q1_ns,
+    median_ns,
+    q3_ns,
+    total_time: result.totalTime / 1_000, // convert from ms to seconds
+    iter_per_round: sortedTimesNs.length,
+    rounds: 1, // Tinybench only runs one round
+    iqr_outlier_rounds,
+    stdev_outlier_rounds,
+    warmup_iters: warmupIterations,
+  };
+}