modestbench 0.0.3 → 0.2.0

package/src/cli/commands/init.ts

@@ -17,6 +17,11 @@ import { createInterface } from 'node:readline';
 
 import type { CliContext } from '../index.js';
 
+import {
+  InvalidArgumentError,
+  UnsupportedConfigFormatError,
+} from '../../errors/index.js';
+
 /**
  * Init command options interface
  */
@@ -566,7 +571,9 @@ export default config;
       break;
 
     default:
-      throw new Error(`Unsupported config format: ${options.configType}`);
+      throw new UnsupportedConfigFormatError(
+        `Unsupported config format: ${options.configType}`,
+      );
   }
 
   try {
@@ -575,8 +582,9 @@ export default config;
       console.log(`  ✓ ${filename}`);
     }
   } catch (error) {
-    throw new Error(
+    throw new InvalidArgumentError(
       `Failed to create config file: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error },
     );
   }
 };
@@ -600,8 +608,9 @@ const createDirectories = async (
         console.log(`  ✓ ${dir}/`);
       }
     } catch (error) {
-      throw new Error(
+      throw new InvalidArgumentError(
         `Failed to create directory ${dir}: ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error },
       );
     }
   }
@@ -626,8 +635,9 @@ const createExampleBenchmarks = async (options: InitOptions): Promise<void> => {
         console.log(`  ✓ ${example.filename}`);
       }
     } catch (error) {
-      throw new Error(
+      throw new InvalidArgumentError(
         `Failed to create example ${name}: ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error },
       );
     }
   }

package/src/cli/commands/run.ts

@@ -10,6 +10,13 @@ import { resolve } from 'node:path';
 import type { BenchmarkRun } from '../../types/index.js';
 import type { CliContext } from '../index.js';
 
+import { ErrorCodes } from '../../constants.js';
+import { resolveOutputPath } from '../../core/output-path-resolver.js';
+import {
+  InvalidArgumentError,
+  type ModestBenchError,
+  UnknownReporterError,
+} from '../../errors/index.js';
 import { ExitCodes } from '../../types/cli.js';
 
 /**
@@ -26,6 +33,7 @@ interface RunOptions {
   json?: boolean | undefined;
   noColor?: boolean | undefined;
   outputDir?: string | undefined;
+  outputFile?: string | undefined;
   pattern: string[];
   progress?: boolean | undefined;
   quiet?: boolean | undefined;
@@ -55,6 +63,18 @@ export const handleRunCommand = async (
   const showCliMessages = verbose && !options.quiet;
 
   try {
+    // Validate --output-file usage
+    if (
+      options.outputFile &&
+      options.reporters &&
+      options.reporters.length > 1
+    ) {
+      throw new InvalidArgumentError(
+        '--output-file can only be used with a single reporter. ' +
+          'Use --output <dir> for multiple reporters.',
+      );
+    }
+
     // Step 1: Load and merge configuration
     if (showCliMessages) {
       console.error('Loading configuration...');
@@ -73,6 +93,7 @@ export const handleRunCommand = async (
       showCliMessages,
       options.quiet ?? false,
       options.outputDir,
+      options.outputFile,
       options.progress,
     );
 
@@ -155,8 +176,11 @@ export const handleRunCommand = async (
 
     return handleResults(executionResult, options, shouldBeQuiet);
   } catch (error) {
-    // Re-throw FileDiscoveryError so yargs fail handler can show help
-    if (error instanceof Error && error.name === 'FileDiscoveryError') {
+    // Re-throw CLI errors so yargs fail handler can show help
+    if ((error as ModestBenchError).code === ErrorCodes.FILE_DISCOVERY_FAILED) {
+      throw error;
+    }
+    if ((error as ModestBenchError).code === ErrorCodes.CLI_INVALID_ARGUMENT) {
       throw error;
     }
 
@@ -270,8 +294,13 @@ const loadConfiguration = async (context: CliContext, options: RunOptions) => {
 
     return config;
   } catch (error) {
-    throw new Error(
+    // Re-throw our custom errors
+    if ((error as ModestBenchError).code === ErrorCodes.CONFIG_LOAD_FAILED) {
+      throw error;
+    }
+    throw new InvalidArgumentError(
       `Configuration error: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error },
     );
   }
 };
@@ -287,6 +316,7 @@ const setupReporters = async (
   showCliMessages: boolean,
   explicitQuiet: boolean,
   explicitOutputDir?: string,
+  explicitOutputFile?: string,
   progressOption?: boolean,
 ) => {
   try {
@@ -317,17 +347,27 @@ const setupReporters = async (
           verbose: isVerbose,
         });
       } else if (reporterName === 'json') {
+        const outputPath = resolveOutputPath(
+          outputDir,
+          explicitOutputFile,
+          'results.json',
+        );
         reporter = new JsonReporter({
-          ...(outputDir ? { outputPath: `${outputDir}/results.json` } : {}),
+          ...(outputPath ? { outputPath } : {}),
           prettyPrint: true,
           quiet: shouldBeQuiet, // JSON uses shouldBeQuiet to avoid polluting stdout
           verbose: isVerbose,
         });
       } else if (reporterName === 'csv') {
+        const outputPath = resolveOutputPath(
+          outputDir,
+          explicitOutputFile,
+          'results.csv',
+        );
         reporter = new CsvReporter({
           includeHeaders: true,
           includeMetadata: true,
-          ...(outputDir ? { outputPath: `${outputDir}/results.csv` } : {}),
+          ...(outputPath ? { outputPath } : {}),
           quiet: explicitQuiet, // Only applies explicit --quiet flag; CSV output can coexist with progress messages on different streams
           verbose: isVerbose,
         });
@@ -341,7 +381,7 @@ const setupReporters = async (
         reporter = context.reporterRegistry.get(reporterName);
         if (!reporter) {
           const availableReporters = ['human', 'json', 'csv', 'simple'];
-          throw new Error(
+          throw new UnknownReporterError(
             `Unknown reporter: ${reporterName}. Available: ${availableReporters.join(', ')}`,
           );
         }
@@ -356,8 +396,13 @@ const setupReporters = async (
 
     return reporters;
   } catch (error) {
-    throw new Error(
+    // Re-throw our custom errors
+    if ((error as ModestBenchError).code === ErrorCodes.REPORTER_UNKNOWN) {
+      throw error;
+    }
+    throw new InvalidArgumentError(
       `Reporter setup error: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error },
     );
   }
 };