Merge pull request #24 from laiso/copilot/fix-eea916c3-79c8-454f-b335-042737f9e898

Unify benchmarkVersion with package.json version field

Author: laiso

package-lock.json

@@ -1,5 +1,6 @@
 {
   "name": "ts-bench",
+  "version": "1.0.0",
   "module": "index.ts",
   "type": "module",
   "private": true,

package.json

@@ -88,9 +88,9 @@ describe('BenchmarkReporter', () => {
     });
 
     describe('exportToJSON', () => {
-        it('generates basic JSON data structure', () => {
+        it('generates basic JSON data structure', async () => {
             const privateReporter = reporter as any;
-            const jsonData = privateReporter.generateBasicJSONData(mockResults, mockConfig);
+            const jsonData = await privateReporter.generateBasicJSONData(mockResults, mockConfig);
 
             expect(jsonData.metadata.agent).toBe('claude');
             expect(jsonData.metadata.model).toBe('sonnet-3.5');

src/benchmark/__tests__/reporter.test.ts

@@ -1,5 +1,6 @@
 import type { TestResult, BenchmarkConfig } from '../config/types';
 import { formatDuration } from '../utils/duration';
+import { getPackageVersion } from '../utils/package-version';
 import { writeFile, mkdir } from 'fs/promises';
 import { join, dirname } from 'path';
 
@@ -57,7 +58,7 @@ export class BenchmarkReporter {
 
     // JSON export functionality
     async exportToJSON(results: TestResult[], config: BenchmarkConfig, outputPath: string): Promise<void> {
-        const data = this.generateBasicJSONData(results, config);
+        const data = await this.generateBasicJSONData(results, config);
         await this.ensureDirectoryExists(outputPath);
         await writeFile(outputPath, JSON.stringify(data, null, 2), 'utf-8');
         console.log(`📄 Results exported to: ${outputPath}`);
@@ -85,7 +86,7 @@ export class BenchmarkReporter {
     }
 
 
-    private generateBasicJSONData(results: TestResult[], config: BenchmarkConfig) {
+    private async generateBasicJSONData(results: TestResult[], config: BenchmarkConfig) {
         const successCount = results.filter(r => r.overallSuccess).length;
         const totalCount = results.length;
         const successRate = (successCount / totalCount) * 100;
@@ -95,6 +96,8 @@ export class BenchmarkReporter {
         const testSuccessCount = results.filter(r => r.testSuccess).length;
         const testFailedCount = totalCount - testSuccessCount;
 
+        const benchmarkVersion = await getPackageVersion();
+
         return {
             metadata: {
                 timestamp: new Date().toISOString(),
@@ -103,7 +106,7 @@ export class BenchmarkReporter {
                 provider: config.provider,
                 version: config.version,
                 totalExercises: totalCount,
-                benchmarkVersion: "1.0.0"
+                benchmarkVersion
             },
             summary: {
                 successRate: Number(successRate.toFixed(1)),
@@ -127,6 +130,8 @@ export class BenchmarkReporter {
         const fileName = resultName || `${config.agent}-${config.model}-${config.provider}-${timestamp.replace(/[:.]/g, '-').slice(0, -5)}`;
         const fullPath = join(outputPath, `${fileName}.json`);
 
+        const benchmarkVersion = await getPackageVersion();
+        
         const data = {
             metadata: {
                 agent: config.agent,
@@ -135,7 +140,7 @@ export class BenchmarkReporter {
                 version: config.version,
                 timestamp,
                 exerciseCount: results.length,
-                benchmarkVersion: "1.0.0",
+                benchmarkVersion,
                 generatedBy: "ts-bench"
             },
             summary: this.generateSummaryData(results),

src/benchmark/reporter.ts

@@ -1,6 +1,7 @@
 import type { TestResult, BenchmarkConfig } from '../config/types';
 import type { AgentType } from '../config/types';
 import { VersionDetector } from './version-detector';
+import { getPackageVersion } from './package-version';
 import { readdir, readFile, writeFile, mkdir } from 'fs/promises';
 import { join, dirname } from 'path';
 import { existsSync } from 'fs';
@@ -242,11 +243,13 @@ export class LeaderboardGenerator {
         // Generate exercise breakdown
         const exerciseBreakdown = this.generateExerciseBreakdown(results);
 
+        const benchmarkVersion = await getPackageVersion();
+        
         return {
             metadata: {
                 timestamp: new Date().toISOString(),
                 totalExercises: results.length > 0 ? results[0]!.summary.totalCount : 0,
-                benchmarkVersion: "1.0.0",
+                benchmarkVersion,
                 generatedBy: "ts-bench"
             },
             leaderboard: leaderboardEntries,

src/utils/leaderboard-generator.ts

@@ -0,0 +1,39 @@
+import { readFile } from 'fs/promises';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+/**
+ * Get the version from package.json
+ */
+export async function getPackageVersion(): Promise<string> {
+    try {
+        // Get the path to the project root from the current module
+        const currentDir = dirname(fileURLToPath(import.meta.url));
+        // Navigate up to find package.json, checking multiple possible locations
+        const possiblePaths = [
+            join(currentDir, '../../package.json'),  // From dist/utils/
+            join(currentDir, '../../../package.json'), // From src/utils/
+            join(process.cwd(), 'package.json')       // From project root
+        ];
+        
+        for (const packageJsonPath of possiblePaths) {
+            try {
+                const packageJsonContent = await readFile(packageJsonPath, 'utf-8');
+                const packageJson = JSON.parse(packageJsonContent);
+                
+                if (packageJson.version) {
+                    return packageJson.version;
+                }
+            } catch {
+                // Try next path
+                continue;
+            }
+        }
+        
+        // If no package.json found, return fallback
+        return '1.0.0';
+    } catch (error) {
+        console.warn('Failed to read package.json version, using fallback 1.0.0:', error);
+        return '1.0.0';
+    }
+}