Allow coercion of untyped CuvvaErrors to typed CuvvaErrors

cuvva · Sep 2, 2015 · e7c7c60 · e7c7c60
1 parent ce63154
commit e7c7c60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/cuvva-error.js b/lib/cuvva-error.js
@@ -4,7 +4,7 @@ function CuvvaError(code, reasons, meta) {
 	if (!(this instanceof CuvvaError))
 		return new CuvvaError(code, reasons, meta);
 
-	if (!Array.isArray(reasons)) {
+	if (!meta && !Array.isArray(reasons)) {
 		meta = reasons;
 		reasons = void 0;
 	}
@@ -24,8 +24,8 @@ function CuvvaError(code, reasons, meta) {
 	Object.defineProperty(this, 'httpStatus', { get: function () { return statusCode; } });
 
 	this.code = code;
-	this.meta = meta;
 	this.reasons = reasons;
+	this.meta = meta;
 }
 
 util.inherits(CuvvaError, Error);
@@ -41,7 +41,9 @@ CuvvaError.coerce = function (error) {
 
 	if (error instanceof Error) {
 		newError = new CuvvaError('unknown', { message: error.message });
-		Object.defineProperty(newError, 'stack', { get: function () { return error.stack; } });
+		Object.defineProperty(newError, 'stack', { get: function () { return error.stack } });
+	} else if (error.code) {
+		newError = new CuvvaError(error.code, error.reasons, error.meta);
 	} else {
 		newError = new CuvvaError('unknown', { error: error });
 	}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cuvva-log",
-	"version": "0.6.2",
+	"version": "0.6.3",
 	"description": "Super simple standardized logging used by all Cuvva systems",
 	"homepage": "https://github.com/cuvva/cuvva-log-node",
 	"bugs": "https://github.com/cuvva/cuvva-log-node/issues",