binhend 2.3.6 → 2.3.8

package/package.json

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

package/packages/utils/src/defaultErrorRepsonse.js

@@ -1,7 +1,17 @@
 
-const HttpError = require('./HttpError');
+function StatusCode(code = 500) {
+    /**
+     * Range of HTTP codes are from 100 to 599.
+     * HTTP code 500 is `Internal Server Error`.
+     */
+    return Number.isInteger(code) && code >= 100 && code <= 599 ? code : 500;
+}
 
 module.exports = function (error, response, next) {
-    if (!(error instanceof HttpError)) return next(error);
-    response.status(error.httpCode || 500).json({ error: error.message || 'Internal Server Error' });
+    if (Object.prototype.hasOwnProperty.call(error, 'httpCode')) {
+        response.status(StatusCode(error.httpCode)).json({ error: error.message || 'Internal Server Error' });
+    }
+    else {
+        next(error);
+    }
 };

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.
@@ -263,6 +274,44 @@ function Prop(key, object, validator, options) {
     });
 }
 
+/**
+ * Return an object with all properties defined in the validator, using non-strict validation.
+ * Instead of throwing errors, invalid values are set to `null` by enforcing `{ default: null, required: false }` across all validations.
+ *
+ * @template V
+ * @param {((...args: any[]) => V)} [validator] - Validation function
+ * @returns {V} - An object with keys bypass requirement
+ * @throws {HttpError} - If validation fails
+ */
+function DefaultObject(validator) {
+    OptionControl.default = null;
+    OptionControl.required = false;
+
+    try {
+        var value = validator();
+        return value;
+    }
+    catch (error) {
+        // TODO app log error for debug
+        throw new HttpError(HttpCodes.INTERNAL_SERVER_ERROR, `Type validation failed`);
+    }
+    finally {
+        delete OptionControl.default;
+        delete OptionControl.required;
+    }
+}
+
+/**
+ * Returns an empty object as the validator output without performing any validation.
+ *
+ * @template V
+ * @param {((...args: any[]) => V)} [validator] - Validation function
+ * @returns {V} - An empty object with no property
+ */
+function EmptyObject(validator) {
+    return /** @type {V} */ ({});
+}
+
 /**
  * Validate an input being a function
  *
@@ -330,7 +379,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'}` }
     );
 }
 
@@ -396,10 +445,12 @@ function NotNullish(input, options = {}) {
 /**
  * Generic validator that accepts a validation function
  *
- * @param {*} input - Input value needs to be validated.
+ * @template T
+ * 
+ * @param {T} input - Input value needs to be validated.
  * @param {Function} validate - Validation function that returns boolean
  * @param {Options} options - Additional options for validation.
- * @returns {*} - The validated input
+ * @returns {T} - The validated input
  * @throws {HttpError} - If validation fails
  */
 function Validator(input, validate, options = {}) {
@@ -407,12 +458,22 @@ function Validator(input, validate, options = {}) {
         return input;
     }
 
+    options = { ...options, ...OptionControl }; // 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;
+    if (options.hasOwnProperty('default')) {
+        var defaultValue = options.default;
+
+        if (validate(defaultValue)) {
+            return defaultValue;
+        }
+
+        if (!options.required && types.isNullish(defaultValue)) {
+            return defaultValue;
+        }
     }
 
-    // allow null or undefined by default, set `options.required=true` for not allowing
+    // accept `null` or `undefined` by default, set `options.required=true` for not accepting nullish values
     if (!options.required && types.isNullish(input)) {
         return input;
     }
@@ -430,6 +491,8 @@ function Validator(input, validate, options = {}) {
     }
 }
 
+const OptionControl = {};
+
 module.exports = {
     String,
     Number,
@@ -440,6 +503,7 @@ module.exports = {
     PropIf, Prop,
     AssignIf, Assign,
     Value, Optional,
+    DefaultObject, EmptyObject,
     Function,
     AsyncFunction,
     Date,
@@ -449,5 +513,6 @@ module.exports = {
     NotNull,
     NotNullish,
     Validator,
-    throwError
+    throwError,
+    Options
 };