Refactoring

Author: ehmicky

src/error/main.js

@@ -2,21 +2,35 @@ import { inspect } from 'util'
 
 import { getMessage } from './message.js'
 import { printError } from './print.js'
-import { getEventProps } from './props.js'
 import { getStack } from './stack.js'
 
 const { custom } = inspect
 
 // Retrieve `error` which sums up all information that can be gathered about
 // the event.
 export const getError = function({ name, event }) {
-  const { stack, ...staticProps } = getEventProps(event)
   const message = getMessage({ event, name })
-  const stackA = getStack(stack)
+  const mainValue = getMainValue(event)
+  const staticProps = getEventProps(mainValue)
+  const stackA = getStack(mainValue)
   const error = buildError({ name, message, stack: stackA, staticProps })
   return { error, stack: stackA }
 }
 
+// Retrieve main thrown value, which is most likely an `Error` instance
+const getMainValue = function({ value, nextValue: mainValue = value }) {
+  return mainValue
+}
+
+// If event is an error, retrieve static properties except `name` and `message`
+const getEventProps = function(mainValue) {
+  if (mainValue instanceof Error) {
+    return { ...mainValue }
+  }
+
+  return {}
+}
+
 const buildError = function({ name, message, stack, staticProps }) {
   const error = new Error(message)
   // eslint-disable-next-line fp/no-mutating-assign

src/error/props.js

@@ -1,7 +1,7 @@
 // Retrieve `error.stack` by re-using the original error's stack trace
 // Remove first line of `Error.stack` as it contains `Error.name|message`,
 // which is already present in the upper error's `message`
-export const getStack = function(stack = '') {
+export const getStack = function({ stack = '' }) {
   return stack.replace(FIRST_LINE_REGEXP, '')
 }
 

src/error/stack.js

@@ -28,8 +28,7 @@ Generated by [AVA](https://ava.li).
       'info',
       `i  multipleResolves (a promise was  multiple times) ␊
       Initially rejected with: Error: message␊
-      Then resolved with: { success: true }␊
-          at STACK TRACE`,
+      Then resolved with: { success: true }`,
       `MultipleResolves: a promise was resolved/rejected multiple times:␊
       Initially rejected with: Error: message␊
       Then resolved with: { success: true }`,