fix(cli): correct --format parsing so the default invocation works

src/__tests__/cli.test.ts

@@ -0,0 +1,40 @@
+import { describe, it, expect } from 'vitest';
+import { parseArgs } from '../cli.js';
+
+describe('parseArgs', () => {
+  it('defaults to text format when no flag is given', () => {
+    const { positional, format } = parseArgs(['old.json', 'new.json']);
+    expect(positional).toEqual(['old.json', 'new.json']);
+    expect(format).toBe('text');
+  });
+
+  it('parses --format=json', () => {
+    const { positional, format } = parseArgs(['old.json', 'new.json', '--format=json']);
+    expect(positional).toEqual(['old.json', 'new.json']);
+    expect(format).toBe('json');
+  });
+
+  it('parses space-separated --format markdown', () => {
+    const { positional, format } = parseArgs(['old.json', 'new.json', '--format', 'markdown']);
+    expect(positional).toEqual(['old.json', 'new.json']);
+    expect(format).toBe('markdown');
+  });
+
+  it('handles the flag appearing before positional paths', () => {
+    const { positional, format } = parseArgs(['--format', 'json', 'old.json', 'new.json']);
+    expect(positional).toEqual(['old.json', 'new.json']);
+    expect(format).toBe('json');
+  });
+
+  it('throws on an unsupported format value', () => {
+    expect(() => parseArgs(['old.json', 'new.json', '--format=yaml'])).toThrow(/Invalid --format/);
+  });
+
+  it('throws when --format is given without a value', () => {
+    expect(() => parseArgs(['old.json', 'new.json', '--format'])).toThrow(/Invalid --format/);
+  });
+
+  it('throws on an unknown option', () => {
+    expect(() => parseArgs(['old.json', 'new.json', '--bogus'])).toThrow(/Unknown option/);
+  });
+});

src/cli.ts

@@ -7,24 +7,66 @@
  */
 
 import { readFile } from 'node:fs/promises';
+import { pathToFileURL } from 'node:url';
 import { parse } from './parser.js';
 import { diff } from './diff.js';
 import { renderReport } from './reporter.js';
 import type { ReportFormat } from './types.js';
 
+const USAGE = 'Usage: sbom-diff <old.json> <new.json> [--format text|json|markdown]';
+const VALID_FORMATS: ReportFormat[] = ['text', 'json', 'markdown'];
+
+export interface ParsedArgs {
+  positional: string[];
+  format: ReportFormat;
+}
+
+/**
+ * Parse CLI arguments into positional paths and the requested output format.
+ *
+ * Supports `--format text`, `--format=text`, and flags appearing in any
+ * position relative to the positional file paths. Defaults to `text`.
+ *
+ * @throws if an unknown flag or unsupported format value is supplied.
+ */
+export function parseArgs(argv: string[]): ParsedArgs {
+  const positional: string[] = [];
+  let format: ReportFormat = 'text';
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === '--format') {
+      format = assertFormat(argv[++i]);
+    } else if (arg.startsWith('--format=')) {
+      format = assertFormat(arg.slice('--format='.length));
+    } else if (arg.startsWith('-')) {
+      throw new Error(`Unknown option: ${arg}\n${USAGE}`);
+    } else {
+      positional.push(arg);
+    }
+  }
+
+  return { positional, format };
+}
+
+function assertFormat(value: string | undefined): ReportFormat {
+  if (value !== undefined && (VALID_FORMATS as string[]).includes(value)) {
+    return value as ReportFormat;
+  }
+  throw new Error(
+    `Invalid --format value: ${value ?? '(none)'}. Expected one of: ${VALID_FORMATS.join(', ')}`,
+  );
+}
+
 async function main(): Promise<void> {
-  const args = process.argv.slice(2);
+  const { positional, format } = parseArgs(process.argv.slice(2));
 
-  const positional = args.filter(a => !a.startsWith('--'));
   if (positional.length < 2) {
-    console.error('Usage: sbom-diff <old.json> <new.json> [--format text|json|markdown]');
+    console.error(USAGE);
     process.exit(1);
   }
 
   const [oldPath, newPath] = positional;
-  const formatArg = args.find(a => a.startsWith('--format='))?.split('=')[1]
-    ?? args[args.indexOf('--format') + 1];
-  const format: ReportFormat = (formatArg as ReportFormat) ?? 'text';
 
   const [oldRaw, newRaw] = await Promise.all([
     readFile(oldPath, 'utf-8'),
@@ -38,7 +80,11 @@ async function main(): Promise<void> {
   console.log(renderReport(report, format));
 }
 
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});
+// Only run when invoked directly (not when imported by tests).
+const invokedPath = process.argv[1];
+if (invokedPath && import.meta.url === pathToFileURL(invokedPath).href) {
+  main().catch(err => {
+    console.error(err instanceof Error ? err.message : err);
+    process.exit(1);
+  });
+}