feat: alter really empty behaviour

Author: bitnbytesio

lib/index.js

@@ -2,6 +2,7 @@ const messages = require('./messages/index');
 const rules = require('./rules/index');
 const Validator = require('./validator');
 const objUtil = require('./util/obj');
+const empty = require('./util/empty');
 
 /**
 * set default language
@@ -11,7 +12,7 @@ function setLang(lang) {
   messages.defaultLang = lang;
 }
 
-function extend(name, callback, isImplicit=false) {
+function extend(name, callback, isImplicit = false) {
   rules[name] = callback;
   if (isImplicit) Validator.addImplicitRule(name);
 }
@@ -132,4 +133,5 @@ module.exports = {
   bailable,
   assert,
   setStrNotationRepetition: objUtil.setStrNotationRepetition,
+  empty,
 };

lib/rules/acceptedIf.js

@@ -1,4 +1,4 @@
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 const { pathIndex } = require('../util/ObjectIndex');
 
 module.exports = function acceptedIf({ attr, value, args }, validator) {
@@ -22,7 +22,7 @@ module.exports = function acceptedIf({ attr, value, args }, validator) {
     }
 
     // field can be true if all values are presented
-    if (!reallyEmpty(pathIndex(validator.inputs, requiredField))
+    if (!empty.reallyEmptyTrimmed(pathIndex(validator.inputs, requiredField))
       && pathIndex(validator.inputs, requiredField).toString() === requiredValue) {
       canbetrue = true;
     } else {

lib/rules/acceptedNotIf.js

@@ -1,4 +1,4 @@
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 const { pathIndex } = require('../util/ObjectIndex');
 
 module.exports = function acceptedNotIf({ attr, value, args }, validator) {
@@ -22,7 +22,7 @@ module.exports = function acceptedNotIf({ attr, value, args }, validator) {
     }
 
     // field can be true if all values are presented
-    if (!reallyEmpty(pathIndex(validator.inputs, requiredField))
+    if (!empty.reallyEmptyTrimmed(pathIndex(validator.inputs, requiredField))
       && pathIndex(validator.inputs, requiredField).toString() === requiredValue) {
       canbetrue = true;
     } else {

lib/rules/required.js

@@ -1,7 +1,7 @@
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 
 module.exports = function required({ value }) {
-  if (reallyEmpty(value)) {
+  if (empty.reallyEmptyTrimmed(value)) {
     return false;
   }
   return true;

lib/rules/requiredIf.js

@@ -1,4 +1,4 @@
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 const { pathIndex } = require('../util/ObjectIndex');
 
 module.exports = function requiredIf({ attr, value, args }, v) {
@@ -20,7 +20,7 @@ module.exports = function requiredIf({ attr, value, args }, v) {
     }
 
     // field is required if all values are presented
-    if (!reallyEmpty(pathIndex(v.inputs, requiredField))
+    if (!empty.reallyEmptyTrimmed(pathIndex(v.inputs, requiredField))
       && pathIndex(v.inputs, requiredField).toString() === requiredValue) {
       required = true;
     } else {
@@ -29,7 +29,7 @@ module.exports = function requiredIf({ attr, value, args }, v) {
     }
   }
 
-  if (required && reallyEmpty(value)) {
+  if (required && empty.reallyEmptyTrimmed(value)) {
     return false;
   }
 

lib/rules/requiredWith.js

@@ -1,4 +1,4 @@
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 const { pathIndex } = require('../util/ObjectIndex');
 
 module.exports = function requiredWith({ attr, value, args }, v) {
@@ -13,13 +13,13 @@ module.exports = function requiredWith({ attr, value, args }, v) {
       continue;
     }
 
-    if (!reallyEmpty(pathIndex(v.inputs, args[i]))) {
+    if (!empty.reallyEmptyTrimmed(pathIndex(v.inputs, args[i]))) {
       required = true;
       break;
     }
   }
 
-  if (required && reallyEmpty(value)) {
+  if (required && empty.reallyEmptyTrimmed(value)) {
     return false;
   }
 

lib/rules/requiredWithout.js

@@ -1,4 +1,4 @@
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 const { pathIndex } = require('../util/ObjectIndex');
 
 module.exports = function requiredWithout({ attr, value, args }, v) {
@@ -14,13 +14,13 @@ module.exports = function requiredWithout({ attr, value, args }, v) {
     }
 
     // @ts-ignore
-    if (reallyEmpty(pathIndex(v.inputs, args[i]))) {
+    if (empty.reallyEmptyTrimmed(pathIndex(v.inputs, args[i]))) {
       required = true;
       break;
     }
   }
 
-  if (required && reallyEmpty(value)) {
+  if (required && empty.reallyEmptyTrimmed(value)) {
     return false;
   }
 

lib/rules/sometimes.js

@@ -1,13 +1,13 @@
 const _has = require('lodash.has');
-const { reallyEmpty } = require('../util/empty');
+const empty = require('../util/empty');
 
 module.exports = function sometimes({ attr, value }, v) {
   // @ts-ignore
   if (!_has(v.inputs, attr)) {
     return true;
   }
 
-  if (reallyEmpty(value)) {
+  if (empty.reallyEmptyTrimmed(value)) {
     return false;
   }
 

lib/util/empty.js

@@ -1,7 +1,24 @@
-module.exports.reallyEmpty = function reallyEmpty(value) {
+function reallyEmpty(value) {
+  if (!value && [false, 0].indexOf(value) < 0) {
+    return true;
+  }
+
+  return !value.toString();
+};
+
+function reallyEmptyTrimmed(value) {
   if (!value && [false, 0].indexOf(value) < 0) {
     return true;
   }
 
   return !value.toString().trim();
 };
+
+module.exports = {
+  reallyEmpty,
+  reallyEmptyTrimmed,
+  alter(prop, value) {
+    module.exports[prop] = value;
+  },
+};
+

lib/validator.js

@@ -3,7 +3,7 @@ const postRules = require('./postRules/index');
 // const filters = require('./filters/index');
 const messages = require('./messages/index');
 const messageParser = require('./util/messageParser');
-const { reallyEmpty } = require('./util/empty');
+const empty = require('./util/empty');
 const { strNotations } = require('./util/obj');
 
 // you can change this value with static method
@@ -348,7 +348,7 @@ class Validator {
       }
 
       // if value is really empty, skip validation
-      if (!validation.required && reallyEmpty(validation.value)) {
+      if (!validation.required && empty.reallyEmpty(validation.value)) {
         continue;
       }