binhend 2.3.6 → 2.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "binhend",
-    "version": "2.3.6",
+    "version": "2.3.7",
     "description": "",
     "main": "index.js",
     "author": "Nguyen Duc Binh",

package/packages/validation/src/typeValidation.js

@@ -10,6 +10,17 @@ const types = require('@binhend/types');
  * @property {*=} default - The default value being used if null or undefined
  */
 
+/**
+ * Type options used in validation functions.
+ *
+ * @param {object} input - Options for validation.
+ * @returns {Options}
+ * @throws {HttpError}
+ */
+function Options(input = {}) {
+    return input;
+}
+
 /**
  * Throw error by default for invalid input.
  * A `HttpError` is thrown for `router` sending response to client.
@@ -330,7 +341,7 @@ function Enum(input, enumValues, options = {}) {
 
     return Validator(
         input, (input) => enumValues.includes(input),
-        { ...options, message: options.message || `Value {${input}} is not defined in enum` }
+        { ...options, message: options?.message || `${options?.name || 'Value'} {${input}} is not defined in ${options?.type || 'Enum'}` }
     );
 }
 
@@ -407,6 +418,8 @@ function Validator(input, validate, options = {}) {
         return input;
     }
 
+    options = { ...options }; // prevent options being null
+
     // use default value (options.default - must also be valid) if has, when input is invalid
     if (options.hasOwnProperty('default') && validate(options.default)) {
         return options.default;
@@ -449,5 +462,6 @@ module.exports = {
     NotNull,
     NotNullish,
     Validator,
-    throwError
+    throwError,
+    Options
 };