Refactoring

ehmicky · Sep 5, 2021 · e263d44 · e263d44
1 parent e5d07ea
commit e263d44
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/src/report/reporters/histogram/abscissa.js b/src/report/reporters/histogram/abscissa.js
@@ -4,29 +4,30 @@ import { TICK_MIDDLE, HORIZONTAL_LINE } from './characters.js'
 
 // Retrieve the horizontal line and the abscissa below the main content.
 // Includes the tick above the median and its label.
-export const getAbscissa = function (width, position) {
-  const bottomLine = getBottomLine(width, position)
-  const labels = getLabels(width, position)
+export const getAbscissa = function (width, median, medianIndex) {
+  const bottomLine = getBottomLine(width, medianIndex)
+  const labels = getLabels(width, median, medianIndex)
   return `${separatorColor(bottomLine)}
 ${labels}`
 }
 
-const getBottomLine = function (width, position) {
-  return addTick(width, '', position).padEnd(width, HORIZONTAL_LINE)
+const getBottomLine = function (width, medianIndex) {
+  return addTick(width, '', medianIndex).padEnd(width, HORIZONTAL_LINE)
 }
 
-const addTick = function (width, bottomLine, { index }) {
-  const lineWidth = index - bottomLine.length
+const addTick = function (width, bottomLine, medianIndex) {
+  const lineWidth = medianIndex - bottomLine.length
   return lineWidth < 0
     ? bottomLine
     : `${bottomLine}${HORIZONTAL_LINE.repeat(lineWidth)}${TICK_MIDDLE}`
 }
 
-const getLabels = function (width, position) {
+const getLabels = function (width, median, medianIndex) {
   const { labels, labelsLength } = addLabel(
     width,
     { labelsLength: 0, labels: '' },
-    position,
+    median,
+    medianIndex,
   )
   const labelsA = trimWidth(labels, labelsLength, width)
   return labelsA
@@ -38,12 +39,13 @@ const getLabels = function (width, position) {
 const addLabel = function (
   width,
   { labelsLength, labels },
-  { index, pretty, prettyColor },
+  { pretty, prettyColor },
+  medianIndex,
 ) {
   const spacesWidth =
     labelsLength === 0
-      ? Math.max(index - pretty.length + 1, 0)
-      : Math.max(index - labelsLength, 1)
+      ? Math.max(medianIndex - pretty.length + 1, 0)
+      : Math.max(medianIndex - labelsLength, 1)
   const labelsLengthA = labelsLength + spacesWidth + pretty.length
   const spaces = ' '.repeat(spacesWidth)
   const labelsA = `${labels}${spaces}${prettyColor}`

diff --git a/src/report/reporters/histogram/content.js b/src/report/reporters/histogram/content.js
@@ -3,16 +3,17 @@ import { getHistogramRows } from './rows.js'
 
 // Retrieve histogram main content
 export const getContent = function ({
-  stats,
-  stats: { histogram },
+  stats: { histogram, median, min, max },
   height,
   width,
   mini,
 }) {
-  const { position, medianIndex, medianMaxWidth } = getMedianPositions(
-    stats,
+  const { medianIndex, medianMaxWidth } = getMedianPositions({
+    median,
+    min,
+    max,
     width,
-  )
+  })
   const rows = getHistogramRows({
     histogram,
     width,
@@ -25,7 +26,7 @@ export const getContent = function ({
     return rows
   }
 
-  const abscissa = getAbscissa(width, position)
+  const abscissa = getAbscissa(width, median, medianIndex)
   return `${rows}
 ${abscissa}`
 }
@@ -34,11 +35,10 @@ ${abscissa}`
 // When `histogram` has a single item, it is in the first bucket.
 // Also compute the maximum width between the median and either the start or end
 // Also computes `medianIndex|medianMaxWidth` used for the color gradient.
-const getMedianPositions = function ({ median, min, max }, width) {
+const getMedianPositions = function ({ median, min, max, width }) {
   const medianPercentage =
     max.raw === min.raw ? 0 : (median.raw - min.raw) / (max.raw - min.raw)
   const medianIndex = Math.round((width - 1) * medianPercentage)
-  const position = { ...median, index: medianIndex }
   const medianMaxWidth = Math.max(medianIndex, width - 1 - medianIndex)
-  return { position, medianIndex, medianMaxWidth }
+  return { medianIndex, medianMaxWidth }
 }