Refactoring

ehmicky · Sep 12, 2021 · f7c2877 · f7c2877
1 parent 0c675dc
commit f7c2877
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/report/normalize/common.js b/src/report/normalize/common.js
@@ -5,7 +5,6 @@ import { normalizeTimestamp } from '../../system/timestamp.js'
 
 import { omitCombinationsProps } from './omit.js'
 import { addCombinationsTitles } from './titles_add.js'
-import { padTitles } from './titles_pad.js'
 
 // Add report-specific properties to a result that are not in `combinations` nor
 // reporter-specific
@@ -64,11 +63,10 @@ export const normalizeCombEach = function (
   { titles },
 ) {
   const resultA = addCombinationsTitles(result, titles, showTitles)
-  const resultB = padTitles({ result: resultA })
-  const resultC = omitCombinationsProps(resultB, {
+  const resultB = omitCombinationsProps(resultA, {
     showPrecision,
     showDiff,
     debugStats,
   })
-  return resultC
+  return resultB
 }
diff --git a/src/report/normalize/titles_add.js b/src/report/normalize/titles_add.js
@@ -1,12 +1,15 @@
 import { COMBINATION_DIMENSIONS } from '../../combination/dimensions.js'
 
+import { padTitles } from './titles_pad.js'
+
 // Add `result.combinations[*].taskTitle|...`
 export const addCombinationsTitles = function (result, titles, showTitles) {
   const titlesA = showTitles ? titles : {}
   const combinations = result.combinations.map((combination) =>
     addCombinationTitles(combination, titlesA),
   )
-  return { ...result, combinations }
+  const combinationsA = padTitles(combinations)
+  return { ...result, combinations: combinationsA }
 }
 
 const addCombinationTitles = function (combination, titles) {

diff --git a/src/report/normalize/titles_pad.js b/src/report/normalize/titles_pad.js
@@ -2,13 +2,10 @@
 //  - `combination.task|runner|systemTitlePadded`: like
 //     `combination.*Title` but padded so all combinations vertically align
 //  - `combination.titles`: combines all *TitlePadded
-export const padTitles = function ({ result, result: { combinations } }) {
+export const padTitles = function (combinations) {
   const propNames = getUniquePropNames(combinations)
   const paddings = getPaddings(combinations, propNames)
-  const combinationsA = combinations.map((combination) =>
-    addPadding(combination, paddings),
-  )
-  return { ...result, combinations: combinationsA }
+  return combinations.map((combination) => addPadding(combination, paddings))
 }
 
 const getUniquePropNames = function (combinations) {