@optave/codegraph 3.5.0 → 3.7.0

package/src/presentation/audit.ts

@@ -15,6 +15,77 @@ interface AuditOpts {
   config?: unknown;
 }
 
+/** Render health metrics for a single audit function. */
+function renderHealthMetrics(fn: any): void {
+  if (fn.health.cognitive == null) return;
+  console.log(`\n  Health:`);
+  console.log(
+    `    Cognitive: ${fn.health.cognitive}  Cyclomatic: ${fn.health.cyclomatic}  Nesting: ${fn.health.maxNesting}`,
+  );
+  console.log(`    MI: ${fn.health.maintainabilityIndex}`);
+  if (fn.health.halstead.volume) {
+    console.log(
+      `    Halstead: vol=${fn.health.halstead.volume} diff=${fn.health.halstead.difficulty} effort=${fn.health.halstead.effort} bugs=${fn.health.halstead.bugs}`,
+    );
+  }
+  if (fn.health.loc) {
+    console.log(
+      `    LOC: ${fn.health.loc}  SLOC: ${fn.health.sloc}  Comments: ${fn.health.commentLines}`,
+    );
+  }
+}
+
+/** Render a single audited function with all its sections. */
+function renderAuditFunction(fn: any): void {
+  const lineRange = fn.endLine ? `${fn.line}-${fn.endLine}` : `${fn.line}`;
+  const roleTag = fn.role ? ` [${fn.role}]` : '';
+  console.log(`## ${kindIcon(fn.kind)} ${fn.name} (${fn.kind})${roleTag}`);
+  console.log(`  ${fn.file}:${lineRange}${fn.lineCount ? ` (${fn.lineCount} lines)` : ''}`);
+  if (fn.summary) console.log(`  ${fn.summary}`);
+  if (fn.signature) {
+    if (fn.signature.params != null) console.log(`  Parameters: (${fn.signature.params})`);
+    if (fn.signature.returnType) console.log(`  Returns: ${fn.signature.returnType}`);
+  }
+
+  renderHealthMetrics(fn);
+
+  if (fn.health.thresholdBreaches.length > 0) {
+    console.log(`\n  Threshold Breaches:`);
+    for (const b of fn.health.thresholdBreaches) {
+      const icon = b.level === 'fail' ? 'FAIL' : 'WARN';
+      console.log(`    [${icon}] ${b.metric}: ${b.value} >= ${b.threshold}`);
+    }
+  }
+
+  console.log(`\n  Impact: ${fn.impact.totalDependents} transitive dependent(s)`);
+  for (const [level, nodes] of Object.entries(fn.impact.levels)) {
+    console.log(
+      `    Level ${level}: ${(nodes as Array<{ name: string }>).map((n) => n.name).join(', ')}`,
+    );
+  }
+
+  if (fn.callees.length > 0) {
+    console.log(`\n  Calls (${fn.callees.length}):`);
+    for (const c of fn.callees) {
+      console.log(`    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
+    }
+  }
+  if (fn.callers.length > 0) {
+    console.log(`\n  Called by (${fn.callers.length}):`);
+    for (const c of fn.callers) {
+      console.log(`    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
+    }
+  }
+  if (fn.relatedTests.length > 0) {
+    console.log(`\n  Tests (${fn.relatedTests.length}):`);
+    for (const t of fn.relatedTests) {
+      console.log(`    ${t.file}`);
+    }
+  }
+
+  console.log();
+}
+
 export function audit(
   target: string,
   customDbPath: string | undefined,
@@ -33,72 +104,6 @@ export function audit(
   console.log(`  ${data.functions.length} function(s) analyzed\n`);
 
   for (const fn of data.functions) {
-    const lineRange = fn.endLine ? `${fn.line}-${fn.endLine}` : `${fn.line}`;
-    const roleTag = fn.role ? ` [${fn.role}]` : '';
-    console.log(`## ${kindIcon(fn.kind)} ${fn.name} (${fn.kind})${roleTag}`);
-    console.log(`  ${fn.file}:${lineRange}${fn.lineCount ? ` (${fn.lineCount} lines)` : ''}`);
-    if (fn.summary) console.log(`  ${fn.summary}`);
-    if (fn.signature) {
-      if (fn.signature.params != null) console.log(`  Parameters: (${fn.signature.params})`);
-      if (fn.signature.returnType) console.log(`  Returns: ${fn.signature.returnType}`);
-    }
-
-    // Health metrics
-    if (fn.health.cognitive != null) {
-      console.log(`\n  Health:`);
-      console.log(
-        `    Cognitive: ${fn.health.cognitive}  Cyclomatic: ${fn.health.cyclomatic}  Nesting: ${fn.health.maxNesting}`,
-      );
-      console.log(`    MI: ${fn.health.maintainabilityIndex}`);
-      if (fn.health.halstead.volume) {
-        console.log(
-          `    Halstead: vol=${fn.health.halstead.volume} diff=${fn.health.halstead.difficulty} effort=${fn.health.halstead.effort} bugs=${fn.health.halstead.bugs}`,
-        );
-      }
-      if (fn.health.loc) {
-        console.log(
-          `    LOC: ${fn.health.loc}  SLOC: ${fn.health.sloc}  Comments: ${fn.health.commentLines}`,
-        );
-      }
-    }
-
-    // Threshold breaches
-    if (fn.health.thresholdBreaches.length > 0) {
-      console.log(`\n  Threshold Breaches:`);
-      for (const b of fn.health.thresholdBreaches) {
-        const icon = b.level === 'fail' ? 'FAIL' : 'WARN';
-        console.log(`    [${icon}] ${b.metric}: ${b.value} >= ${b.threshold}`);
-      }
-    }
-
-    // Impact
-    console.log(`\n  Impact: ${fn.impact.totalDependents} transitive dependent(s)`);
-    for (const [level, nodes] of Object.entries(fn.impact.levels)) {
-      console.log(
-        `    Level ${level}: ${(nodes as Array<{ name: string }>).map((n) => n.name).join(', ')}`,
-      );
-    }
-
-    // Call edges
-    if (fn.callees.length > 0) {
-      console.log(`\n  Calls (${fn.callees.length}):`);
-      for (const c of fn.callees) {
-        console.log(`    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
-      }
-    }
-    if (fn.callers.length > 0) {
-      console.log(`\n  Called by (${fn.callers.length}):`);
-      for (const c of fn.callers) {
-        console.log(`    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
-      }
-    }
-    if (fn.relatedTests.length > 0) {
-      console.log(`\n  Tests (${fn.relatedTests.length}):`);
-      for (const t of fn.relatedTests) {
-        console.log(`    ${t.file}`);
-      }
-    }
-
-    console.log();
+    renderAuditFunction(fn);
   }
 }

package/src/presentation/branch-compare.ts

@@ -36,6 +36,57 @@ interface BranchCompareFormatData {
   summary: BranchCompareSummary;
 }
 
+/** Format impact annotation for a symbol. */
+function formatImpactLine(impact: unknown[] | undefined): string | null {
+  if (!impact || impact.length === 0) return null;
+  return `      ^ ${impact.length} transitive caller${impact.length !== 1 ? 's' : ''} affected`;
+}
+
+/** Format added symbols section. */
+function formatAddedSection(added: BranchCompareSymbol[]): string[] {
+  if (added.length === 0) return [];
+  const lines = ['', `  + Added (${added.length} symbol${added.length !== 1 ? 's' : ''}):`];
+  for (const sym of added) {
+    lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.line}`);
+  }
+  return lines;
+}
+
+/** Format removed symbols section. */
+function formatRemovedSection(removed: BranchCompareSymbol[]): string[] {
+  if (removed.length === 0) return [];
+  const lines = ['', `  - Removed (${removed.length} symbol${removed.length !== 1 ? 's' : ''}):`];
+  for (const sym of removed) {
+    lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.line}`);
+    const impact = formatImpactLine(sym.impact);
+    if (impact) lines.push(impact);
+  }
+  return lines;
+}
+
+/** Format changed symbols section with delta details. */
+function formatChangedSection(changed: BranchCompareSymbol[]): string[] {
+  if (changed.length === 0) return [];
+  const lines = ['', `  ~ Changed (${changed.length} symbol${changed.length !== 1 ? 's' : ''}):`];
+  for (const sym of changed) {
+    const parts: string[] = [];
+    if (sym.changes?.lineCount !== 0) {
+      parts.push(`lines: ${sym.base?.lineCount} -> ${sym.target?.lineCount}`);
+    }
+    if (sym.changes?.fanIn !== 0) {
+      parts.push(`fan_in: ${sym.base?.fanIn} -> ${sym.target?.fanIn}`);
+    }
+    if (sym.changes?.fanOut !== 0) {
+      parts.push(`fan_out: ${sym.base?.fanOut} -> ${sym.target?.fanOut}`);
+    }
+    const detail = parts.length > 0 ? `  (${parts.join(', ')})` : '';
+    lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.base?.line}${detail}`);
+    const impact = formatImpactLine(sym.impact);
+    if (impact) lines.push(impact);
+  }
+  return lines;
+}
+
 function formatText(data: BranchCompareFormatData): string {
   if (data.error) return `Error: ${data.error}`;
 
@@ -48,56 +99,9 @@ function formatText(data: BranchCompareFormatData): string {
   lines.push(`  Target: ${data.targetRef} (${shortTarget})`);
   lines.push(`  Files changed: ${data.changedFiles.length}`);
 
-  if (data.added.length > 0) {
-    lines.push('');
-    lines.push(`  + Added (${data.added.length} symbol${data.added.length !== 1 ? 's' : ''}):`);
-    for (const sym of data.added) {
-      lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.line}`);
-    }
-  }
-
-  if (data.removed.length > 0) {
-    lines.push('');
-    lines.push(
-      `  - Removed (${data.removed.length} symbol${data.removed.length !== 1 ? 's' : ''}):`,
-    );
-    for (const sym of data.removed) {
-      lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.line}`);
-      if (sym.impact && sym.impact.length > 0) {
-        lines.push(
-          `      ^ ${sym.impact.length} transitive caller${sym.impact.length !== 1 ? 's' : ''} affected`,
-        );
-      }
-    }
-  }
-
-  if (data.changed.length > 0) {
-    lines.push('');
-    lines.push(
-      `  ~ Changed (${data.changed.length} symbol${data.changed.length !== 1 ? 's' : ''}):`,
-    );
-    for (const sym of data.changed) {
-      const parts: string[] = [];
-      if (sym.changes?.lineCount !== 0) {
-        parts.push(`lines: ${sym.base?.lineCount} -> ${sym.target?.lineCount}`);
-      }
-      if (sym.changes?.fanIn !== 0) {
-        parts.push(`fan_in: ${sym.base?.fanIn} -> ${sym.target?.fanIn}`);
-      }
-      if (sym.changes?.fanOut !== 0) {
-        parts.push(`fan_out: ${sym.base?.fanOut} -> ${sym.target?.fanOut}`);
-      }
-      const detail = parts.length > 0 ? `  (${parts.join(', ')})` : '';
-      lines.push(
-        `    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.base?.line}${detail}`,
-      );
-      if (sym.impact && sym.impact.length > 0) {
-        lines.push(
-          `      ^ ${sym.impact.length} transitive caller${sym.impact.length !== 1 ? 's' : ''} affected`,
-        );
-      }
-    }
-  }
+  lines.push(...formatAddedSection(data.added));
+  lines.push(...formatRemovedSection(data.removed));
+  lines.push(...formatChangedSection(data.changed));
 
   const s = data.summary;
   lines.push('');

package/src/presentation/check.ts

@@ -52,6 +52,39 @@ interface CheckDataResult {
   };
 }
 
+/** Print violation details for a failed predicate (max 10 items). */
+function formatPredicateViolations(pred: CheckPredicate): void {
+  const MAX_SHOWN = 10;
+
+  if (pred.name === 'cycles' && pred.cycles) {
+    for (const cycle of pred.cycles.slice(0, MAX_SHOWN)) {
+      console.log(`         ${cycle.join(' -> ')}`);
+    }
+    if (pred.cycles.length > MAX_SHOWN) {
+      console.log(`         ... and ${pred.cycles.length - MAX_SHOWN} more`);
+    }
+  }
+
+  if (!pred.violations) return;
+
+  const formatViolation = (v: CheckViolation): string => {
+    if (pred.name === 'blast-radius') {
+      return `${v.name} (${v.kind}) at ${v.file}:${v.line} — ${v.transitiveCallers} callers (max: ${pred.threshold})`;
+    }
+    if (pred.name === 'boundaries') {
+      return `${v.from} -> ${v.to} (${v.edgeKind})`;
+    }
+    return `${v.name} (${v.kind}) at ${v.file}:${v.line}`;
+  };
+
+  for (const v of pred.violations.slice(0, MAX_SHOWN)) {
+    console.log(`         ${formatViolation(v)}`);
+  }
+  if (pred.violations.length > MAX_SHOWN) {
+    console.log(`         ... and ${pred.violations.length - MAX_SHOWN} more`);
+  }
+}
+
 export function check(customDbPath: string | undefined, opts: CheckCliOpts = {}): void {
   const data = checkData(customDbPath, {
     ref: opts.ref,
@@ -89,40 +122,7 @@ export function check(customDbPath: string | undefined, opts: CheckCliOpts = {})
     console.log(`  [${icon}] ${pred.name}`);
 
     if (!pred.passed) {
-      if (pred.name === 'cycles' && pred.cycles) {
-        for (const cycle of pred.cycles.slice(0, 10)) {
-          console.log(`         ${cycle.join(' -> ')}`);
-        }
-        if (pred.cycles.length > 10) {
-          console.log(`         ... and ${pred.cycles.length - 10} more`);
-        }
-      }
-      if (pred.name === 'blast-radius' && pred.violations) {
-        for (const v of pred.violations.slice(0, 10)) {
-          console.log(
-            `         ${v.name} (${v.kind}) at ${v.file}:${v.line} — ${v.transitiveCallers} callers (max: ${pred.threshold})`,
-          );
-        }
-        if (pred.violations.length > 10) {
-          console.log(`         ... and ${pred.violations.length - 10} more`);
-        }
-      }
-      if (pred.name === 'signatures' && pred.violations) {
-        for (const v of pred.violations.slice(0, 10)) {
-          console.log(`         ${v.name} (${v.kind}) at ${v.file}:${v.line}`);
-        }
-        if (pred.violations.length > 10) {
-          console.log(`         ... and ${pred.violations.length - 10} more`);
-        }
-      }
-      if (pred.name === 'boundaries' && pred.violations) {
-        for (const v of pred.violations.slice(0, 10)) {
-          console.log(`         ${v.from} -> ${v.to} (${v.edgeKind})`);
-        }
-        if (pred.violations.length > 10) {
-          console.log(`         ... and ${pred.violations.length - 10} more`);
-        }
-      }
+      formatPredicateViolations(pred);
     }
     if (pred.note) {
       console.log(`         ${pred.note}`);

package/src/presentation/colors.ts

@@ -23,6 +23,8 @@ export const DEFAULT_NODE_COLORS: Record<AnyNodeKind, string> = {
   parameter: '#B0BEC5',
   property: '#B0BEC5',
   constant: '#B0BEC5',
+  namespace: '#78909C',
+  variable: '#B0BEC5',
 };
 
 export const DEFAULT_ROLE_COLORS: Partial<Record<CoreRole, string>> = {

package/src/presentation/complexity.ts

@@ -48,6 +48,43 @@ interface ComplexityResult {
   hasGraph: boolean;
 }
 
+/** Render health-focused table with Halstead + MI columns. */
+function renderHealthTable(functions: ComplexityFunction[]): void {
+  console.log(
+    `  ${'Function'.padEnd(35)} ${'File'.padEnd(25)} ${'MI'.padStart(5)} ${'Vol'.padStart(7)} ${'Diff'.padStart(6)} ${'Effort'.padStart(9)} ${'Bugs'.padStart(6)} ${'LOC'.padStart(5)} ${'SLOC'.padStart(5)}`,
+  );
+  console.log(
+    `  ${'─'.repeat(35)} ${'─'.repeat(25)} ${'─'.repeat(5)} ${'─'.repeat(7)} ${'─'.repeat(6)} ${'─'.repeat(9)} ${'─'.repeat(6)} ${'─'.repeat(5)} ${'─'.repeat(5)}`,
+  );
+  for (const fn of functions) {
+    const name = fn.name.length > 33 ? `${fn.name.slice(0, 32)}…` : fn.name;
+    const file = fn.file.length > 23 ? `…${fn.file.slice(-22)}` : fn.file;
+    const miWarn = fn.exceeds?.includes('maintainabilityIndex') ? '!' : ' ';
+    console.log(
+      `  ${name.padEnd(35)} ${file.padEnd(25)} ${String(fn.maintainabilityIndex).padStart(5)}${miWarn}${String(fn.halstead.volume).padStart(7)} ${String(fn.halstead.difficulty).padStart(6)} ${String(fn.halstead.effort).padStart(9)} ${String(fn.halstead.bugs).padStart(6)} ${String(fn.loc).padStart(5)} ${String(fn.sloc).padStart(5)}`,
+    );
+  }
+}
+
+/** Render default complexity table with MI column. */
+function renderDefaultTable(functions: ComplexityFunction[]): void {
+  console.log(
+    `  ${'Function'.padEnd(40)} ${'File'.padEnd(30)} ${'Cog'.padStart(4)} ${'Cyc'.padStart(4)} ${'Nest'.padStart(5)} ${'MI'.padStart(5)}`,
+  );
+  console.log(
+    `  ${'─'.repeat(40)} ${'─'.repeat(30)} ${'─'.repeat(4)} ${'─'.repeat(4)} ${'─'.repeat(5)} ${'─'.repeat(5)}`,
+  );
+  for (const fn of functions) {
+    const name = fn.name.length > 38 ? `${fn.name.slice(0, 37)}…` : fn.name;
+    const file = fn.file.length > 28 ? `…${fn.file.slice(-27)}` : fn.file;
+    const warn = fn.exceeds ? ' !' : '';
+    const mi = fn.maintainabilityIndex > 0 ? String(fn.maintainabilityIndex) : '-';
+    console.log(
+      `  ${name.padEnd(40)} ${file.padEnd(30)} ${String(fn.cognitive).padStart(4)} ${String(fn.cyclomatic).padStart(4)} ${String(fn.maxNesting).padStart(5)} ${mi.padStart(5)}${warn}`,
+    );
+  }
+}
+
 export function complexity(customDbPath: string | undefined, opts: ComplexityCliOpts = {}): void {
   const data = complexityData(customDbPath, opts as any) as unknown as ComplexityResult;
 
@@ -74,40 +111,9 @@ export function complexity(customDbPath: string | undefined, opts: ComplexityCli
   console.log(`\n# ${header}\n`);
 
   if (opts.health) {
-    // Health-focused view with Halstead + MI columns
-    console.log(
-      `  ${'Function'.padEnd(35)} ${'File'.padEnd(25)} ${'MI'.padStart(5)} ${'Vol'.padStart(7)} ${'Diff'.padStart(6)} ${'Effort'.padStart(9)} ${'Bugs'.padStart(6)} ${'LOC'.padStart(5)} ${'SLOC'.padStart(5)}`,
-    );
-    console.log(
-      `  ${'─'.repeat(35)} ${'─'.repeat(25)} ${'─'.repeat(5)} ${'─'.repeat(7)} ${'─'.repeat(6)} ${'─'.repeat(9)} ${'─'.repeat(6)} ${'─'.repeat(5)} ${'─'.repeat(5)}`,
-    );
-
-    for (const fn of data.functions) {
-      const name = fn.name.length > 33 ? `${fn.name.slice(0, 32)}…` : fn.name;
-      const file = fn.file.length > 23 ? `…${fn.file.slice(-22)}` : fn.file;
-      const miWarn = fn.exceeds?.includes('maintainabilityIndex') ? '!' : ' ';
-      console.log(
-        `  ${name.padEnd(35)} ${file.padEnd(25)} ${String(fn.maintainabilityIndex).padStart(5)}${miWarn}${String(fn.halstead.volume).padStart(7)} ${String(fn.halstead.difficulty).padStart(6)} ${String(fn.halstead.effort).padStart(9)} ${String(fn.halstead.bugs).padStart(6)} ${String(fn.loc).padStart(5)} ${String(fn.sloc).padStart(5)}`,
-      );
-    }
+    renderHealthTable(data.functions);
   } else {
-    // Default view with MI column appended
-    console.log(
-      `  ${'Function'.padEnd(40)} ${'File'.padEnd(30)} ${'Cog'.padStart(4)} ${'Cyc'.padStart(4)} ${'Nest'.padStart(5)} ${'MI'.padStart(5)}`,
-    );
-    console.log(
-      `  ${'─'.repeat(40)} ${'─'.repeat(30)} ${'─'.repeat(4)} ${'─'.repeat(4)} ${'─'.repeat(5)} ${'─'.repeat(5)}`,
-    );
-
-    for (const fn of data.functions) {
-      const name = fn.name.length > 38 ? `${fn.name.slice(0, 37)}…` : fn.name;
-      const file = fn.file.length > 28 ? `…${fn.file.slice(-27)}` : fn.file;
-      const warn = fn.exceeds ? ' !' : '';
-      const mi = fn.maintainabilityIndex > 0 ? String(fn.maintainabilityIndex) : '-';
-      console.log(
-        `  ${name.padEnd(40)} ${file.padEnd(30)} ${String(fn.cognitive).padStart(4)} ${String(fn.cyclomatic).padStart(4)} ${String(fn.maxNesting).padStart(5)} ${mi.padStart(5)}${warn}`,
-      );
-    }
+    renderDefaultTable(data.functions);
   }
 
   if (data.summary) {

package/src/presentation/queries-cli/exports.ts

@@ -97,6 +97,22 @@ function printReexportedSymbols(reexportedSymbols: ReexportedSymbol[]): void {
   }
 }
 
+function printReexportedSection(data: ExportsDataResult, opts: ExportsOpts): void {
+  const totalReexported = opts.unused
+    ? (data.totalReexportedUnused ?? data.reexportedSymbols.length)
+    : (data.totalReexported ?? data.reexportedSymbols.length);
+  const plural = totalReexported !== 1 ? 's' : '';
+  if (data.results.length === 0) {
+    const label = opts.unused ? 'unused re-exported' : 're-exported';
+    console.log(
+      `\n# ${data.file} — barrel file (${totalReexported} ${label} symbol${plural} from sub-modules)\n`,
+    );
+  } else {
+    console.log(`\n  Re-exported symbols (${totalReexported} from sub-modules):`);
+  }
+  printReexportedSymbols(data.reexportedSymbols);
+}
+
 export function fileExports(file: string, customDbPath: string, opts: ExportsOpts = {}): void {
   const data = exportsData(file, customDbPath, opts) as ExportsDataResult;
   if (outputResult(data as unknown as Record<string, unknown>, 'results', opts)) return;
@@ -118,23 +134,7 @@ export function fileExports(file: string, customDbPath: string, opts: ExportsOpt
   }
 
   if (hasReexported) {
-    const totalReexported = opts.unused
-      ? (data.totalReexportedUnused ?? data.reexportedSymbols.length)
-      : (data.totalReexported ?? data.reexportedSymbols.length);
-    if (data.results.length === 0) {
-      if (opts.unused) {
-        console.log(
-          `\n# ${data.file} — barrel file (${totalReexported} unused re-exported symbol${totalReexported !== 1 ? 's' : ''} from sub-modules)\n`,
-        );
-      } else {
-        console.log(
-          `\n# ${data.file} — barrel file (${totalReexported} re-exported symbol${totalReexported !== 1 ? 's' : ''} from sub-modules)\n`,
-        );
-      }
-    } else {
-      console.log(`\n  Re-exported symbols (${totalReexported} from sub-modules):`);
-    }
-    printReexportedSymbols(data.reexportedSymbols);
+    printReexportedSection(data, opts);
   }
 
   if (data.reexports.length > 0) {

package/src/presentation/queries-cli/impact.ts

@@ -151,6 +151,33 @@ export function fileDeps(file: string, customDbPath: string, opts: OutputOpts =
   }
 }
 
+function printFnDepsCallees(callees: SymbolRef[]): void {
+  if (callees.length === 0) return;
+  console.log(`  -> Calls (${callees.length}):`);
+  for (const c of callees) console.log(`    -> ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
+}
+
+function printFnDepsCallers(callers: CallerRef[]): void {
+  if (callers.length === 0) return;
+  console.log(`\n  <- Called by (${callers.length}):`);
+  for (const c of callers) {
+    const via = c.viaHierarchy ? ` (via ${c.viaHierarchy})` : '';
+    console.log(`    <- ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}${via}`);
+  }
+}
+
+function printFnDepsTransitive(transitiveCallers: Record<string, SymbolRef[]>): void {
+  for (const [d, fns] of Object.entries(transitiveCallers)) {
+    const depth = parseInt(d, 10);
+    console.log(`\n  ${'<-'.repeat(depth)} Transitive callers (depth ${d}, ${fns.length}):`);
+    for (const n of fns.slice(0, 20))
+      console.log(
+        `    ${'  '.repeat(depth - 1)}<- ${kindIcon(n.kind)} ${n.name}  ${n.file}:${n.line}`,
+      );
+    if (fns.length > 20) console.log(`    ... and ${fns.length - 20} more`);
+  }
+}
+
 export function fnDeps(name: string, customDbPath: string, opts: OutputOpts = {}): void {
   const data = fnDepsData(name, customDbPath, opts) as unknown as FnDepsData;
   if (outputResult(data as unknown as Record<string, unknown>, 'results', opts)) return;
@@ -162,28 +189,9 @@ export function fnDeps(name: string, customDbPath: string, opts: OutputOpts = {}
 
   for (const r of data.results) {
     console.log(`\n${kindIcon(r.kind)} ${r.name} (${r.kind}) -- ${r.file}:${r.line}\n`);
-    if (r.callees.length > 0) {
-      console.log(`  -> Calls (${r.callees.length}):`);
-      for (const c of r.callees)
-        console.log(`    -> ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
-    }
-    if (r.callers.length > 0) {
-      console.log(`\n  <- Called by (${r.callers.length}):`);
-      for (const c of r.callers) {
-        const via = c.viaHierarchy ? ` (via ${c.viaHierarchy})` : '';
-        console.log(`    <- ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}${via}`);
-      }
-    }
-    for (const [d, fns] of Object.entries(r.transitiveCallers)) {
-      console.log(
-        `\n  ${'<-'.repeat(parseInt(d, 10))} Transitive callers (depth ${d}, ${fns.length}):`,
-      );
-      for (const n of fns.slice(0, 20))
-        console.log(
-          `    ${'  '.repeat(parseInt(d, 10) - 1)}<- ${kindIcon(n.kind)} ${n.name}  ${n.file}:${n.line}`,
-        );
-      if (fns.length > 20) console.log(`    ... and ${fns.length - 20} more`);
-    }
+    printFnDepsCallees(r.callees);
+    printFnDepsCallers(r.callers);
+    printFnDepsTransitive(r.transitiveCallers);
     if (r.callees.length === 0 && r.callers.length === 0) {
       console.log(`  (no call edges found -- may be invoked dynamically or via re-exports)`);
     }