Refactoring

Author: ehmicky

src/handle.js

@@ -26,8 +26,8 @@ const handleEvent = async function({
     secondPromiseValue,
   })
 
-  const { level, levelInfo } = getLevel({ opts, info })
-  const message = getMessage({ ...info, levelInfo })
+  const level = getLevel({ opts, info })
+  const message = getMessage({ ...info, level })
 
   handlerFunc(message, level, info)
 

src/level.js

@@ -6,15 +6,14 @@ const { red, yellow } = require('chalk')
 
 const getLevel = function({ opts, info }) {
   const level = opts.getLevel(info)
-  const levelInfo = LEVELS[level]
 
-  if (levelInfo === undefined) {
+  if (LEVELS[level] === undefined) {
     const levels = Object.keys(LEVELS).join(', ')
     // TODO: infinite recursion?
     throw new Error(`Level ${level} is invalid. Must be one of: ${levels}`)
   }
 
-  return { level, levelInfo }
+  return level
 }
 
 const isWindows = platform === 'win32'
@@ -41,4 +40,5 @@ const defaultGetLevel = function({ eventName }) {
 module.exports = {
   getLevel,
   defaultGetLevel,
+  LEVELS,
 }

src/message.js

@@ -4,6 +4,8 @@ const { inspect } = require('util')
 
 const { bold, dim, inverse } = require('chalk')
 
+const { LEVELS } = require('./level')
+
 // Retrieve `message` which sums up all information that can be gathered about
 // the event.
 const getMessage = function({
@@ -13,7 +15,7 @@ const getMessage = function({
   secondPromiseState,
   secondPromiseValue,
   error,
-  levelInfo,
+  level,
 }) {
   const message = MESSAGES[eventName]({
     promiseState,
@@ -23,7 +25,7 @@ const getMessage = function({
     error,
   })
 
-  const messageA = prettify({ message, eventName, levelInfo })
+  const messageA = prettify({ message, eventName, level })
   return messageA
 }
 
@@ -85,10 +87,11 @@ const printValue = function(value) {
   return inspect(value)
 }
 
-const prettify = function({ message, eventName, levelInfo: { COLOR, SIGN } }) {
+const prettify = function({ message, eventName, level }) {
   const [header, ...lines] = message.split('\n')
 
   // Add color, icon and `eventName` to first message line.
+  const { COLOR, SIGN } = LEVELS[level]
   const headerA = COLOR(`${bold(inverse(` ${SIGN}  ${eventName} `))} ${header}`)
   // Add gray color and indentation to other lines.
   const linesA = lines.map(line => dim(`\t${VERTICAL_BAR} ${line}`))