From 8d2c064059ce156437dc8474b9a90a53083c295c Mon Sep 17 00:00:00 2001
From: ehmicky <ehmicky@gmail.com>
Date: Sun, 29 Aug 2021 17:49:28 +0200
Subject: [PATCH] Refactoring

---
 src/report/normalize/computed.js   |  4 ++--
 src/report/normalize/early.js      |  4 +---
 src/report/normalize/stats/main.js | 19 ++++++++-----------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/report/normalize/computed.js b/src/report/normalize/computed.js
index 7186f8ab1..9b84e94bf 100644
--- a/src/report/normalize/computed.js
+++ b/src/report/normalize/computed.js
@@ -7,7 +7,7 @@ import {
   mergeResultProps,
   normalizeCombEach,
 } from './common.js'
-import { prettifyTargetStats } from './stats/main.js'
+import { prettifyStats } from './stats/main.js'
 
 // Add report-specific properties to the target result, but only for
 // `combinations`. This is applied after measuring and history merging have
@@ -24,7 +24,7 @@ export const normalizeComputedResult = function (
   const resultA = normalizeCombAllUnmerged(result, sinceResult)
   const resultB = mergeHistory(resultA, mergedResult)
   const resultC = normalizeCombAllMerged(resultB)
-  const resultD = prettifyTargetStats(resultC)
+  const resultD = prettifyStats(resultC, resultC.combinations)
   const resultE = addScreenInfo(resultD)
   const reporters = config.reporters.map((reporter) =>
     normalizeComputedEach({ result: resultE, reporter, config }),
diff --git a/src/report/normalize/early.js b/src/report/normalize/early.js
index 21bb23b91..dafdbc43e 100644
--- a/src/report/normalize/early.js
+++ b/src/report/normalize/early.js
@@ -35,9 +35,7 @@ const normalizeHistory = function (history, sinceResult, config) {
     .map(normalizeHistoryAll)
     .map(normalizeNonCombAll)
     .map((result) => normalizeCombAll(result, sinceResult))
-  const historyB = historyA.map((result) =>
-    prettifyHistoryStats(result, historyA),
-  )
+  const historyB = prettifyHistoryStats(historyA)
   const reporters = config.reporters.map((reporter) =>
     normalizeHistoryEach(historyB, reporter, config),
   )
diff --git a/src/report/normalize/stats/main.js b/src/report/normalize/stats/main.js
index f7b751f6a..a82d2c8e1 100644
--- a/src/report/normalize/stats/main.js
+++ b/src/report/normalize/stats/main.js
@@ -14,27 +14,24 @@ import { addStatsPretty } from './prettify.js'
 // This is not format specific since most formats benefit from it.
 // When prettifying history results, we adjust the scale based on all history
 // results, i.e. we need to also pass those as `allCombinations`.
-export const prettifyHistoryStats = function (result, history) {
+export const prettifyHistoryStats = function (history) {
   const allCombinations = history.flatMap(getCombinations)
-  const combinations = prettifyStats(result.combinations, allCombinations)
-  return { ...result, combinations }
+  return history.map((historyResult) =>
+    prettifyStats(historyResult, allCombinations),
+  )
 }
 
 const getCombinations = function ({ combinations }) {
   return combinations
 }
 
-export const prettifyTargetStats = function (result) {
-  const combinations = prettifyStats(result.combinations, result.combinations)
-  return { ...result, combinations }
-}
-
-const prettifyStats = function (combinations, allCombinations) {
-  return STAT_KINDS.reduce(
+export const prettifyStats = function (result, allCombinations) {
+  const combinations = STAT_KINDS.reduce(
     (combinationsA, statKind) =>
       prettifyCombinationsStat(statKind, combinationsA, allCombinations),
-    combinations,
+    result.combinations,
   )
+  return { ...result, combinations }
 }
 
 const prettifyCombinationsStat = function (