feat: support 'default' in resolveException

medikoo · Apr 2, 2019 · e08332a · e08332a
1 parent 2a87100
commit e08332a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/resolve-exception.js b/lib/resolve-exception.js
@@ -11,7 +11,10 @@ var resolveMessage = function (message, value) {
 
 module.exports = function (value, defaultMessage, inputOptions) {
 	if (!isObject(inputOptions)) throw new TypeError(resolveMessage(defaultMessage, value));
-	if (inputOptions.isOptional && !isValue(value)) return null;
+	if (!isValue(value)) {
+		if ("default" in inputOptions) return inputOptions["default"];
+		if (inputOptions.isOptional) return null;
+	}
 	var errorMessage = stringCoerce(inputOptions.errorMessage);
 	if (!isValue(errorMessage)) errorMessage = defaultMessage;
 	throw new TypeError(resolveMessage(errorMessage, value));

diff --git a/test/lib/resolve-exception.js b/test/lib/resolve-exception.js
@@ -22,14 +22,18 @@ describe("lib/handle-exception", function () {
 		}
 	});
 	it("Should support optional values via inputOptions.isOptional", function () {
-		assert.equal(handleException(null, "%v is invalid", { isOptional: true }));
+		assert.equal(handleException(null, "%v is invalid", { isOptional: true }, null));
+	});
+	it("Should support optional values via inputOptions.default", function () {
+		// prettier-ignore
+		assert.equal(handleException(null, "%v is invalid", { "default": "bar" }), "bar");
 	});
 	it("Should support custome error message via inputOptions.errorMessage", function () {
 		try {
-			handleException(12, "%v is invalid", { errorMessage: "%v is not supported age" });
+			handleException(null, "%v is invalid", { errorMessage: "%v is not supported age" });
 			throw new Error("Unexpected");
 		} catch (error) {
-			assert.equal(error.message, "12 is not supported age");
+			assert.equal(error.message, "null is not supported age");
 		}
 	});
 });