binhend 2.1.16 → 2.1.17

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "binhend",
-  "version": "2.1.16",
+  "version": "2.1.17",
   "description": "",
   "main": "index.js",
+  "types": "src/types/index.d.ts",
   "author": "Nguyen Duc Binh",
   "license": "UNLICENSED",
   "bin": {

package/src/types/common.d.ts

@@ -0,0 +1,10 @@
+
+/**
+ * @typedef {Object<string, any>} ObjectType
+ */
+
+/**
+ * @typedef {(Date|string|number)} DateType
+ */
+
+export {};

package/src/types/index.d.ts

@@ -0,0 +1,2 @@
+
+export * from './common.d.ts';

package/src/utils/types.js

@@ -7,6 +7,10 @@ function isObject(input) {
     return typeOf(input) === 'Object';
 }
 
+function mustObject(input, defaultValue = {}) {
+    return isObject(input) ? input : isObject(defaultValue) ? defaultValue : {};
+}
+
 function isEmptyObject(input) {
     return isObject(input) && Object.keys(input).length === 0;
 }
@@ -17,8 +21,8 @@ function isEmptyArray(input) {
     return isArray(input) && input.length === 0;
 }
 
-function mustArray(input, defaultOutput = []) {
-    return isArray(input) ? input : isArray(defaultOutput) ? defaultOutput : [defaultOutput];
+function mustArray(input, defaultValue = []) {
+    return isArray(input) ? input : isArray(defaultValue) ? defaultValue : [];
 }
 
 function isFunction(input) {
@@ -86,6 +90,7 @@ module.exports = {
     typeOf,
     isObject,
     isEmptyObject,
+    mustObject,
     isArray,
     isEmptyArray,
     mustArray,

package/src/utils/validation.js

@@ -71,6 +71,18 @@ function Number(input, options = {}) {
     return Validator(input, types.isNumber, { ...options, type: 'number' });
 }
 
+/**
+ * Validate an input being an integer
+ *
+ * @param {*} input - Input value needs to be validated.
+ * @param {Options} options - Additional options for validation.
+ * @returns {number} - The validated input
+ * @throws {HttpError} - If validation fails
+ */
+function Integer(input, options = {}) {
+    return Validator(input, global.Number.isInteger, { ...options, type: 'integer' });
+}
+
 /**
  * Validate an input being boolean
  *
@@ -136,13 +148,38 @@ function Date(input, options = {}) {
  *
  * @param {*} input - Input value needs to be validated.
  * @param {Options} options - Additional options for validation.
- * @returns {*} - The validated input
+ * @returns {Date|string|number} - The validated input
  * @throws {HttpError} - If validation fails
  */
 function DateLike(input, options = {}) {
     return Validator(input, types.isDateLike, { ...options, type: 'date-like' });
 }
 
+/**
+ * Validate an input being one of the specified enum values
+ *
+ * @param {*} input - Input value needs to be validated.
+ * @param {Array|Object} enumValues - Array of allowed values or object whose keys are allowed values
+ * @param {Options} options - Additional options for validation.
+ * @returns {*} - The validated input
+ * @throws {HttpError} - If validation fails
+ */
+function Enum(input, enumValues, options = {}) {
+    var validArray = types.isArray(enumValues),
+        validObject = types.isObject(enumValues);
+
+    if (!(validArray || validObject)) {
+        throwError('Enum validator requires an array or object of allowed values');
+    }
+
+    var method = validArray ? 'includes' : 'hasOwnProperty';
+
+    return Validator(
+        input, (input) => enumValues[method](input),
+        { ...options, message: options.message || `${input} is not defined in enum` }
+    );
+}
+
 /**
  * Validate an input being defined (not undefined)
  *
@@ -219,12 +256,14 @@ function Validator(input, validate, options = {}) {
 module.exports = {
     String,
     Number,
+    Integer,
     Boolean,
     Array,
     Object,
     Function,
     Date,
     DateLike,
+    Enum,
     Defined,
     NotNull,
     NotNullish,