Refactored metric calculation and updated chart generation

Author: AvrAlexandra

__tests__/history-metrics.integration.test.ts

@@ -3,14 +3,12 @@ import { runMetrics } from "../src/commands/history-metrics/metrics-command";
 describe('test version change metric generation', () => {
   it('should generate the version-changes metric', async () => {
     await runMetrics('/Users/avram/OutputReportsOfHistory', {
-      results: 'results-charts-version-changes',
+      results: 'results-version-changes',
       metric: 'version-changes',
       chart: true,
       chartType: ['line', 'bar', 'stacked', 'stacked-area'],
-      inputFiles: [
-        'dependency-history-java-2025-04-21T19-40-53-470Z'
-      ],
-      plugin: 'java'
+      inputFiles: ['dependency-history-2025-05-03T20-57-12-360Z',
+      'commit-dependency-history-2025-05-03T20-57-12-360Z']
     });
 
     console.log('✅ Done generating version-changes metric.');

src/commands/history-metrics/chart-generator.ts

@@ -118,8 +118,16 @@ export function generateGrowthPatternChartData(
 
     const traceTotalChanges = {
       x: xValues,
-      y: sorted.map(r => r.totalChanges ?? 0),
-      name: 'Total Changes',
+      y: (() => {
+        const totals: number[] = [];
+        let runningTotal = 0;
+        for (const r of sorted) {
+          runningTotal += r.totalChanges ?? 0;
+          totals.push(runningTotal);
+        }
+        return totals;
+      })(),
+      name: 'Total Changes (Cumulative)',
       type: 'scatter',
       mode: 'lines+markers',
       line: { width: 2, dash: 'dot', color: '#a63603' },
@@ -152,7 +160,7 @@ export function generateGrowthPatternChartData(
         side: 'left'
       },
       yaxis2: {
-        title: 'Total',
+        title: 'Total (Cumulative)',
         overlaying: 'y',
         side: 'right',
         showgrid: false
@@ -173,96 +181,63 @@ export function generateGrowthPatternChartData(
 }
 
 export function generateVersionChangeChartData(
-  results: Record<string, Record<string, {
-    upgrades: { from: string; to: string; date: string }[];
-    downgrades: { from: string; to: string; date: string }[];
-  }>>,
+  results: Record<string, { upgrades: number; downgrades: number }>,
   options: MetricOptions
 ): { data: any[]; layout: any }[] {
-  const charts: { data: any[]; layout: any }[] = [];
-
-  // Prepare project-based daily counts
-  const projectChartData: {
-    [project: string]: { [date: string]: { upgrades: number; downgrades: number } }
-  } = {};
-
-  for (const [project, deps] of Object.entries(results)) {
-    if (!projectChartData[project]) projectChartData[project] = {};
-
-    for (const dep of Object.values(deps)) {
-      for (const { date } of dep.upgrades) {
-        const day = new Date(date).toISOString().split('T')[0];
-        projectChartData[project][day] ??= { upgrades: 0, downgrades: 0 };
-        projectChartData[project][day].upgrades += 1;
-      }
-      for (const { date } of dep.downgrades) {
-        const day = new Date(date).toISOString().split('T')[0];
-        projectChartData[project][day] ??= { upgrades: 0, downgrades: 0 };
-        projectChartData[project][day].downgrades += 1;
-      }
-    }
-  }
-
-  // Generate chart for each chartType
-  for (const chartType of options.chartType) {
-    const isLine = chartType === 'line';
-    const isStacked = chartType === 'stacked';
-    const isArea = chartType === 'stacked-area';
+  const sortedDates = Object.keys(results).sort();
+  const upgrades = sortedDates.map(date => results[date].upgrades);
+  const downgrades = sortedDates.map(date => results[date].downgrades);
 
-    for (const [project, dateCounts] of Object.entries(projectChartData)) {
-      const sortedDates = Object.keys(dateCounts).sort();
-      const x = sortedDates;
-      const upgrades = sortedDates.map(date => dateCounts[date].upgrades);
-      const downgrades = sortedDates.map(date => dateCounts[date].downgrades);
-
-      const baseType = isLine || isArea ? 'scatter' : 'bar';
+  return options.chartType.map(type => {
+    const isLine = type === 'line';
+    const isStacked = type === 'stacked';
+    const isArea = type === 'stacked-area';
 
-      const commonTraceProps: Partial<any> = {
-        type: baseType,
-        mode: isLine || isArea ? 'lines+markers' : undefined,
-        fill: isArea ? 'tonexty' : undefined,
-        stackgroup: isArea ? 'one' : undefined
-      };
+    const traceType = isLine || isArea ? 'scatter' : 'bar';
+    const commonTraceProps = {
+      type: traceType,
+      mode: isLine ? 'lines+markers' : undefined,
+      fill: isArea ? 'tonexty' : undefined,
+      stackgroup: isArea ? 'one' : undefined
+    };
 
-      const data = [
-        {
-          x,
-          y: upgrades,
-          name: 'Upgrades',
-          marker: { color: 'green' },
-          ...commonTraceProps
-        },
-        {
-          x,
-          y: downgrades,
-          name: 'Downgrades',
-          marker: { color: 'red' },
-          ...commonTraceProps
-        }
-      ];
+    const upgradeTrace = {
+      x: sortedDates,
+      y: upgrades,
+      name: 'Upgrades',
+      ...commonTraceProps
+    };
 
-      const layout = {
-        title: `📦 Version Changes in "${project}" (${chartType})`,
-        barmode: isStacked ? 'stack' : 'group',
-        xaxis: {
-          title: 'Date',
-          tickangle: -45
-        },
-        yaxis: {
-          title: 'Change Count'
-        },
-        margin: {
-          l: 50,
-          r: 50,
-          t: 60,
-          b: 100
-        }
-      };
+    const downgradeTrace = {
+      x: sortedDates,
+      y: downgrades,
+      name: 'Downgrades',
+      ...commonTraceProps
+    };
 
-      charts.push({ data, layout });
-    }
-  }
+    const layout = {
+      title: `🔄 Version Changes Over Time (${type})`,
+      barmode: isStacked ? 'stack' : (traceType === 'bar' ? 'group' : undefined),
+      xaxis: {
+        title: 'Date',
+        tickangle: -45,
+        automargin: true
+      },
+      yaxis: {
+        title: 'Change Count'
+      },
+      margin: {
+        l: 50,
+        r: 30,
+        t: 60,
+        b: 120
+      }
+    };
 
-  return charts;
+    return {
+      data: [upgradeTrace, downgradeTrace],
+      layout
+    };
+  });
 }
 

src/commands/history-metrics/metrics-command.ts

@@ -13,7 +13,6 @@ export const runMetricsCommand = new Command()
   .option('--chart', 'Generate chart visualization', false)
   .option('--chartType <chartType>', 'Chart type (bar | line | stacked)', 'bar')
   .option('--inputFiles <inputFiles...>', 'List of input files to use (without .json)')
-  .option('--plugin <plugin>', 'Plugin name to resolve input file prefixes')
   .action(runMetrics);
 
 export interface MetricOptions {
@@ -22,7 +21,6 @@ export interface MetricOptions {
   chart: boolean;
   chartType: ('line' | 'bar' | 'stacked' | 'stacked-area')[];
   inputFiles: string[];
-  plugin: string;
 }
 
 export async function runMetrics(folder: string, options: MetricOptions): Promise<void> {
@@ -32,39 +30,49 @@ export async function runMetrics(folder: string, options: MetricOptions): Promis
     return;
   }
 
+  const requiredPrefixes = getRequiredInputFilesForMetric(options.metric);
   if (!options.inputFiles || options.inputFiles.length === 0) {
     console.error('❌ No input files provided.');
     return;
   }
 
-  const basePrefixes = getRequiredInputFilesForMetric(options.metric);
-  const requiredPrefixes = getFilePrefixesForPlugin(basePrefixes, options.plugin);
-  const validInputFiles = filterValidInputFiles(options.inputFiles, requiredPrefixes);
+  const validInputFiles = options.inputFiles.filter(file =>
+    requiredPrefixes.some(prefix => file.startsWith(prefix))
+  );
 
   if (validInputFiles.length === 0) {
-    console.warn(`⚠️  No input files matched the required pattern for metric '${options.metric}'`);
+    console.warn(`⚠️ No input files match the required prefixes: ${requiredPrefixes.join(', ')}`);
     return;
   }
 
+  console.log(validInputFiles);
+  console.log(metricProcessor);
+
   for (const relativePath of validInputFiles) {
     const fileName = relativePath.endsWith('.json') ? relativePath : `${relativePath}.json`;
     const filePath = path.join(folder, fileName);
+
+    if (!fs.existsSync(filePath)) {
+      console.warn(`⚠️ File not found: ${filePath}`);
+      continue;
+    }
+
     const fileContents = fs.readFileSync(filePath, 'utf-8');
     const data = JSON.parse(fileContents);
     const results = metricProcessor(data);
 
-    const resultsFolder = path.join(path.dirname(filePath), options.results);
+    const resultsFolder = path.join(folder, options.results);
     fs.mkdirSync(resultsFolder, { recursive: true });
 
-    const outputFile = path.join(resultsFolder, `${path.parse(filePath).name}-${options.metric}-metric.json`);
+    const outputFile = path.join(resultsFolder, `${path.parse(fileName).name}-${options.metric}-metric.json`);
     fs.writeFileSync(outputFile, JSON.stringify(results, null, 2));
 
     if (options.chart) {
       const chartConfigs = getChartDataForMetric(options.metric, results, options);
       if (chartConfigs?.length) {
         await generateHtmlChart(outputFile, chartConfigs);
       } else {
-        console.warn(`⚠️  No chart generator defined for metric '${options.metric}'. Skipping chart.`);
+        console.warn(`⚠️ No chart generator defined for metric '${options.metric}'. Skipping chart.`);
       }
     }
 
@@ -109,12 +117,3 @@ function getChartDataForMetric(
   }
 }
 
-function getFilePrefixesForPlugin(basePrefixes: string[], plugin?: string): string[] {
-  return basePrefixes.map(base => (plugin ? `${base}-${plugin}` : base));
-}
-
-function filterValidInputFiles(inputFiles: string[], requiredPrefixes: string[]): string[] {
-  return inputFiles.filter(file =>
-    requiredPrefixes.some(prefix => file.startsWith(prefix))
-  );
-}

src/commands/history-metrics/metrics-generator.ts

@@ -43,36 +43,38 @@ export function GrowthPatternMetric(data: CommitDependencyHistory): any {
   return Object.values(summary);
 }
 
+export function VersionChangeMetric(dependencies: Record<string, { history: any[] }>): any {
+  const results: Record<
+    string,
+    {
+      upgrades: number;
+      downgrades: number;
+    }
+  > = {};
 
-export function VersionChangeMetric(data: Record<string, { history: any[] }>) {
-  const result: Record<string, Record<string, {
-    upgrades: { from: string, to: string, date: string }[],
-    downgrades: { from: string, to: string, date: string }[]
-  }>> = {};
-
-  for (const [depName, depInfo] of Object.entries(data)) {
-    for (const entry of depInfo.history) {
-      if (entry.action === 'MODIFIED') {
-        const { fromVersion, toVersion, project, date } = entry;
+  for (const { history } of Object.values(dependencies)) {
+    for (const entry of history) {
+      if (
+        entry.action !== 'MODIFIED' ||
+        !entry.fromVersion ||
+        !entry.toVersion ||
+        !semver.valid(entry.fromVersion) ||
+        !semver.valid(entry.toVersion) ||
+        !entry.date
+      ) {
+        continue;
+      }
 
-        if (!result[project]) {
-          result[project] = {};
-        }
-        if (!result[project][depName]) {
-          result[project][depName] = { upgrades: [], downgrades: [] };
-        }
+      const dateKey = new Date(entry.date).toISOString().split('T')[0];
+      const changeType = semver.gt(entry.toVersion, entry.fromVersion) ? 'upgrades' : 'downgrades';
 
-        if (semver.valid(fromVersion) && semver.valid(toVersion)) {
-          if (semver.gt(toVersion, fromVersion)) {
-            result[project][depName].upgrades.push({ from: fromVersion, to: toVersion, date });
-          } else if (semver.lt(toVersion, fromVersion)) {
-            result[project][depName].downgrades.push({ from: fromVersion, to: toVersion, date });
-          }
-        }
+      if (!results[dateKey]) {
+        results[dateKey] = { upgrades: 0, downgrades: 0 };
       }
+
+      results[dateKey][changeType]++;
     }
   }
 
-  return result;
+  return results;
 }
-