Better message printing

Author: ehmicky

src/default.js

@@ -1,12 +1,17 @@
 'use strict'
 
-// Default event handler
+// Default `opts.handlerFunc`
 const defaultHandler = function({ eventName, message }) {
   const level = eventName === 'warning' ? 'warn' : 'error'
   // eslint-disable-next-line no-restricted-globals, no-console
   console[level](message)
 }
 
+const DEFAULT_OPTS = {
+  handlerFunc: defaultHandler,
+  exitOnExceptions: true,
+}
+
 module.exports = {
-  defaultHandler,
+  DEFAULT_OPTS,
 }

src/handle.js

@@ -13,6 +13,7 @@ const handleEvent = async function({
   promise,
   promiseValue,
 }) {
+  debugger
   const { promiseState, promiseValue: promiseValueA } = await parsePromise({
     eventName,
     promise,

src/main.js

@@ -2,7 +2,7 @@
 
 const process = require('process')
 
-const { defaultHandler } = require('./default')
+const { DEFAULT_OPTS } = require('./default')
 const EVENTS = require('./events')
 
 // Add event handling for all process-related errors
@@ -14,11 +14,6 @@ const setup = function(opts) {
   return removeAll
 }
 
-const DEFAULT_OPTS = {
-  handlerFunc: defaultHandler,
-  exitOnExceptions: true,
-}
-
 const addListeners = function({ opts }) {
   return Object.entries(EVENTS).map(([eventName, eventFunc]) =>
     addListener({ opts, eventName, eventFunc }),

src/message.js

@@ -7,68 +7,64 @@ const { red, yellow, bold, dim } = require('chalk')
 // Retrieve `message` which sums up all information that can be gathered about
 // the event.
 const getMessage = function({ eventName, promiseState, promiseValue, error }) {
-  const mainMessage = getMainMessage({ eventName, error })
-  const mainMessageA = prettify({ mainMessage, eventName })
+  const header = getHeader({ eventName, error })
 
-  const secondMessage = getSecondMessage({ promiseState, promiseValue, error })
-  const secondMessageA = indent(secondMessage)
+  const content = getContent({ promiseState, promiseValue, error })
 
-  const message = `${mainMessageA}\n${dim(secondMessageA)}`
+  const message = `${header}\n${dim(content)}`
   return message
 }
 
 // First line of `message`
-const getMainMessage = function({ eventName, error }) {
-  const mainMessage = MAIN_MESSAGES[eventName]
-
-  if (typeof mainMessage !== 'function') {
-    return mainMessage
-  }
-
-  return mainMessage({ error })
+const getHeader = function({ eventName, error }) {
+  const header = HEADERS[eventName]
+  const headerA = typeof header === 'function' ? header({ error }) : header
+  const headerB = prettifyHeader({ header: headerA, eventName })
+  return headerB
 }
 
 // `warning` events use `Error.name|code|detail` in `message`
-const getWarningMessage = function({ error: { code, detail } }) {
+const getWarningHeader = function({ error: { code, detail } }) {
   const codeMessage = code === undefined ? '' : ` (${code})`
   const detailMessage = detail === undefined ? '' : `: ${detail}`
 
   return `${codeMessage}${detailMessage}`
 }
 
+const HEADERS = {
+  uncaughtException: 'uncaught exception',
+  warning: getWarningHeader,
+  unhandledRejection: 'a promise was rejected but not handled',
+  rejectionHandled: 'a promise was handled after being already rejected',
+  multipleResolves: 'a promise was resolved/rejected multiple times',
+}
+
 // Start the message with an icon followed by `Error` or `Warning`
 // Also add colors
-const prettify = function({ mainMessage, eventName }) {
+const prettifyHeader = function({ header, eventName }) {
   if (eventName === 'warning') {
-    return yellow(`${bold(` ${WARN_SIGN}  Warning`)} ${mainMessage}`)
+    return yellow(`${bold(` ${WARN_SIGN}  Warning`)} ${header}`)
   }
 
-  return red(`${bold(` ${ERROR_SIGN}  Error`)}: ${mainMessage}`)
+  return red(`${bold(` ${ERROR_SIGN}  Error`)}: ${header}`)
 }
 
 const isWindows = platform === 'win32'
 const ERROR_SIGN = isWindows ? '×' : '\u2718'
 const WARN_SIGN = isWindows ? '‼' : '\u26A0'
 
-const MAIN_MESSAGES = {
-  uncaughtException: 'uncaught exception',
-  warning: getWarningMessage,
-  unhandledRejection: 'a promise was rejected but not handled',
-  rejectionHandled: 'a promise was handled after being already rejected',
-  multipleResolves: 'a promise was resolved/rejected multiple times',
-}
-
-const getSecondMessage = function({ promiseState, promiseValue, error }) {
-  if (promiseState !== undefined) {
-    return getPromiseMessage({ promiseState, promiseValue })
-  }
-
-  return printError(error)
+const getContent = function({ promiseState, promiseValue, error }) {
+  const content =
+    promiseState === undefined
+      ? printError(error)
+      : getPromiseContent({ promiseState, promiseValue })
+  const contentA = indentContent(content)
+  return contentA
 }
 
 // `unhandledRejection`, `rejectionHandled` and `multipleResolves` events show
 // the promise's resolved/rejected state and value in `message`
-const getPromiseMessage = function({ promiseState, promiseValue }) {
+const getPromiseContent = function({ promiseState, promiseValue }) {
   const value = printError(promiseValue)
   const separator = promiseValue instanceof Error ? '\n' : ' '
   return `Promise was ${promiseState} with:${separator}${value}`
@@ -90,7 +86,7 @@ const printError = function(error) {
 }
 
 // Indent each line
-const indent = function(string) {
+const indentContent = function(string) {
   return string.replace(EACH_LINE_REGEXP, `\t${VERTICAL_BAR} `)
 }