package.json

@@ -1,6 +1,6 @@
 {
   "name": "error-chain",
-  "version": "0.1.2",
+  "version": "0.1.1",
   "main": "index.js",
   "repository": "git@git.cryto.net:joepie91/node-error-chain.git",
   "author": "Sven Slootweg <admin@cryto.net>",

src/packages/render/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 const chalk = require("chalk");
-const syncpipe = require("syncpipe");
 
 const { validateArguments } = require("@validatem/core");
 const required = require("@validatem/required");
@@ -13,50 +12,14 @@ const stripErrorFromStack = require("./strip-error-from-stack");
 const isInstanceOf = require("./is-instance-of");
 const getChain = require("../get-chain");
 
-function prefixExtraLines(string, prefix) {
-	return string
-		.split("\n")
-		.map((line, i) => {
-			if (i > 0) {
-				return prefix + line;
-			} else {
-				return line;
-			}
-		})
-		.join("\n");
-}
-
-function formattedErrorHeading(error, colorAll = false, indentation) {
-	let formattedMessage = syncpipe(error.message, [
-		(_) => _.trim(),
-		(_) => (indentation != null)
-			? prefixExtraLines(_, indentation)
-			: _
-	]);
-
+function formattedErrorHeading(error, colorAll = false) {
+	let formattedMessage = error.message.trim().replace(/\n/g, " \\n ");
 	let formattedName = chalk.red(`${chalk.bold(error.name)}:`);
 
 	let coloredMessage = (colorAll === true) ? chalk.red(formattedMessage) : formattedMessage;
 
 	return `${formattedName} ${coloredMessage}`;
-}
-
-function formattedError(error, indentation = "", prefix = "") {
-	let strippedStack = stripErrorFromStack(error.stack);
-
-	let formattedStack = strippedStack.split("\n").map((line) => {
-		if (line.trim().length === 0) {
-			return null;
-		} else if (line[0] === " ") {
-			return indentation + line;
-		} else {
-			return indentation + `   ${line}`;
-		}
-	}).filter(line => line != null).join("\n");
-
-	let heading = indentation + prefix + formattedErrorHeading(error);
-
-	return `${heading}\n${formattedStack}`;
+	// return chalk.red(`${chalk.bold(error.name)}: ${formattedMessage}`);
 }
 
 module.exports = function renderError(_error, _options) {
@@ -71,11 +34,6 @@ module.exports = function renderError(_error, _options) {
 	let {allStacktraces} = options;
 
 	let errors = getChain(error);
-
-	if (errors.length === 1) {
-		// Special case: there's not actually a cause chain, so we should render the error more simply
-		return formattedError(errors[0]);
-	} else {
 	let detailedErrorsToDisplay = (allStacktraces === true) ? errors : errors.slice(-1);
 
 	let summary = errors.map((error, i) => {
@@ -92,14 +50,28 @@ module.exports = function renderError(_error, _options) {
 
 		// console.log(cleanStack);
 		
-			return prefix + formattedErrorHeading(error, false, "  ");
+		return prefix + formattedErrorHeading(error);
 	}).join("\n");
 
 	let stacktraces = detailedErrorsToDisplay.map((error, i) => {
 		let causedByPrefix = (i > 0 ? "Caused by: " : "");
 		let causedByPadding = (i > 0) ? " " : "";
 
-			return formattedError(error, causedByPadding, causedByPrefix);
+		let strippedStack = stripErrorFromStack(error.stack);
+
+		let formattedStack = strippedStack.split("\n").map((line) => {
+			if (line.trim().length === 0) {
+				return null;
+			} else if (line[0] === " ") {
+				return causedByPadding + line;
+			} else {
+				return causedByPadding + `   ${line}`;
+			}
+		}).filter(line => line != null).join("\n");
+
+		let heading = causedByPadding + causedByPrefix + formattedErrorHeading(error);
+
+		return `${heading}\n${formattedStack}`;
 	}).join("\n\n");
 
 	let stacktraceSection = (allStacktraces === true)
@@ -107,5 +79,4 @@ module.exports = function renderError(_error, _options) {
 		: `${chalk.cyan("Stacktrace for original error:")}\n\n${stacktraces}`;
 
 	return `${summary}\n\n${stacktraceSection}`;
-	}
 };