From 19c20bbea77b10b50971f8db1898a2ee9815839f Mon Sep 17 00:00:00 2001
From: paulhbarker <paul.barker@classedu.com>
Date: Wed, 8 Sep 2021 13:08:23 -0600
Subject: [PATCH 1/2] update documentation for `sometimes` rule, fix bug where
 nested properties were not running any validation with the inclusion of the
 `sometimes` rule

---
 README.md              | 12 ++++++++++++
 dist/validator.js      | 37 +++++++++++++++++++++++++++++--------
 spec/sometimes-rule.js | 16 ++++++++++++++++
 src/validator.js       | 35 ++++++++++++++++++++++++++++-------
 4 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 898c0636..21581d25 100755
--- a/README.md
+++ b/README.md
@@ -303,6 +303,18 @@ The field under validation must be present and not empty only when any of the ot
 
 The field under validation must be present and not empty only when all of the other specified fields are not present.
 
+#### sometimes
+
+In some situations, you may wish to run validation checks against a field only if that field is present in the data being validated. To quickly accomplish this, add the sometimes rule to your rule list:
+
+```js
+let rules = {
+    email: 'sometimes|required|email'    
+}
+```
+
+In the example above, the email field will only be validated if it is present in the input.
+
 #### same:attribute
 
 The given field must match the field under validation.
diff --git a/dist/validator.js b/dist/validator.js
index 250d12ca..3d559ef6 100644
--- a/dist/validator.js
+++ b/dist/validator.js
@@ -1,4 +1,4 @@
-/*! validatorjs - 2020-12-03 */
+/*! validatorjs - 2021-09-08 */
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Validator = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 function AsyncResolvers(onFailedOne, onResolvedAll) {
   this.onResolvedAll = onResolvedAll;
@@ -1574,7 +1574,7 @@ Validator.prototype = {
       var attributeRules = this.rules[attribute];
       var inputValue = this._objectPath(this.input, attribute);
 
-      if (this._hasRule(attribute, ['sometimes']) && !this._suppliedWithData(attribute)) {
+      if (this._passesOptionalCheck(attribute)) {
         continue;
       }
 
@@ -1639,7 +1639,7 @@ Validator.prototype = {
       var attributeRules = this.rules[attribute];
       var inputValue = this._objectPath(this.input, attribute);
 
-      if (this._hasRule(attribute, ['sometimes']) && !this._suppliedWithData(attribute)) {
+      if (this._passesOptionalCheck(attribute)) {
         continue;
       }
 
@@ -1740,7 +1740,6 @@ Validator.prototype = {
    * @return {object}
    */
   _parseRules: function (rules) {
-
     var parsedRules = {};
     rules = this._flattenObject(rules);
 
@@ -1751,8 +1750,6 @@ Validator.prototype = {
       this._parseRulesCheck(attribute, rulesArray, parsedRules);
     }
     return parsedRules;
-
-
   },
 
   _parseRulesCheck: function (attribute, rulesArray, parsedRules, wildCardValues) {
@@ -1804,7 +1801,6 @@ Validator.prototype = {
   },
 
   _replaceWildCards: function (path, nums) {
-
     if (!nums) {
       return path;
     }
@@ -1839,6 +1835,7 @@ Validator.prototype = {
 
     this.messages._setCustom(customMessages);
   },
+
   /**
    * Prepare rules if it comes in Array. Check for objects. Need for type validation.
    *
@@ -1864,6 +1861,16 @@ Validator.prototype = {
     return rules;
   },
 
+  /**
+   * Determine if the attribute passes any optional check.
+   *
+   * @param {string} attribute
+   * @return {boolean}
+   */
+  _passesOptionalCheck: function (attribute) {
+    return this._hasRule(attribute, ['sometimes']) && !this._suppliedWithData(attribute);
+  },
+
   /**
    * Determines if the attribute is supplied with the original data object.
    *
@@ -1871,7 +1878,21 @@ Validator.prototype = {
    * @return {boolean}
    */
   _suppliedWithData: function (attribute) {
-    return this.input.hasOwnProperty(attribute);
+    function hasNested(obj, key,  ...rest) {
+      if (obj === undefined) {
+        return false;
+      }
+
+      if (rest.length == 0 && obj.hasOwnProperty(key)) {
+        return true;
+      }
+
+      return hasNested(obj[key], ...rest);
+    }
+
+    var keys = attribute.split('.');
+
+    return hasNested(this.input, ...keys);
   },
 
   /**
diff --git a/spec/sometimes-rule.js b/spec/sometimes-rule.js
index 881fb9f8..6c4710a0 100755
--- a/spec/sometimes-rule.js
+++ b/spec/sometimes-rule.js
@@ -50,4 +50,20 @@ describe("sometimes validation pass rules", function() {
     const validator = new Validator({ username: "test" }, { username: "username", email: "email|sometimes" });
     validator.passes(done);
   });
+
+  it("should pass when the nested property is passed with data", function() {
+    const validator = new Validator(
+      { user: { firstname: "Johnny", lastname: "Appleseed" } },
+      { "user.firstname": "required", "user.lastname": "sometimes|required|string" }
+    );
+    expect(validator.passes()).to.be.true;
+  });
+
+  it("should fail validation when the nested property is passed with invalid data", function() {
+    const validator = new Validator(
+      { user: { firstname: "Johnny", lastname: '' } },
+      { "user.firstname": "required", 'user.lastname': "sometimes|required|string" }
+    );
+    expect(validator.passes()).to.be.false;
+  });
 });
diff --git a/src/validator.js b/src/validator.js
index ce5ba328..db93eeb7 100755
--- a/src/validator.js
+++ b/src/validator.js
@@ -56,7 +56,7 @@ Validator.prototype = {
       var attributeRules = this.rules[attribute];
       var inputValue = this._objectPath(this.input, attribute);
 
-      if (this._hasRule(attribute, ['sometimes']) && !this._suppliedWithData(attribute)) {
+      if (this._passesOptionalCheck(attribute)) {
         continue;
       }
 
@@ -121,7 +121,7 @@ Validator.prototype = {
       var attributeRules = this.rules[attribute];
       var inputValue = this._objectPath(this.input, attribute);
 
-      if (this._hasRule(attribute, ['sometimes']) && !this._suppliedWithData(attribute)) {
+      if (this._passesOptionalCheck(attribute)) {
         continue;
       }
 
@@ -222,7 +222,6 @@ Validator.prototype = {
    * @return {object}
    */
   _parseRules: function (rules) {
-
     var parsedRules = {};
     rules = this._flattenObject(rules);
 
@@ -233,8 +232,6 @@ Validator.prototype = {
       this._parseRulesCheck(attribute, rulesArray, parsedRules);
     }
     return parsedRules;
-
-
   },
 
   _parseRulesCheck: function (attribute, rulesArray, parsedRules, wildCardValues) {
@@ -286,7 +283,6 @@ Validator.prototype = {
   },
 
   _replaceWildCards: function (path, nums) {
-
     if (!nums) {
       return path;
     }
@@ -321,6 +317,7 @@ Validator.prototype = {
 
     this.messages._setCustom(customMessages);
   },
+
   /**
    * Prepare rules if it comes in Array. Check for objects. Need for type validation.
    *
@@ -346,6 +343,16 @@ Validator.prototype = {
     return rules;
   },
 
+  /**
+   * Determine if the attribute passes any optional check.
+   *
+   * @param {string} attribute
+   * @return {boolean}
+   */
+  _passesOptionalCheck: function (attribute) {
+    return this._hasRule(attribute, ['sometimes']) && !this._suppliedWithData(attribute);
+  },
+
   /**
    * Determines if the attribute is supplied with the original data object.
    *
@@ -353,7 +360,21 @@ Validator.prototype = {
    * @return {boolean}
    */
   _suppliedWithData: function (attribute) {
-    return this.input.hasOwnProperty(attribute);
+    function hasNested(obj, key,  ...rest) {
+      if (obj === undefined) {
+        return false;
+      }
+
+      if (rest.length == 0 && obj.hasOwnProperty(key)) {
+        return true;
+      }
+
+      return hasNested(obj[key], ...rest);
+    }
+
+    var keys = attribute.split('.');
+
+    return hasNested(this.input, ...keys);
   },
 
   /**

From a52f21c06b17eb5433625b645973313a3b304fbc Mon Sep 17 00:00:00 2001
From: paulhbarker <paul.barker@classedu.com>
Date: Wed, 8 Sep 2021 13:11:38 -0600
Subject: [PATCH 2/2] update jsdoc for _suppliedWithData()

---
 src/validator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/validator.js b/src/validator.js
index db93eeb7..517bb4e3 100755
--- a/src/validator.js
+++ b/src/validator.js
@@ -356,7 +356,7 @@ Validator.prototype = {
   /**
    * Determines if the attribute is supplied with the original data object.
    *
-   * @param  {array} attribute
+   * @param  {string} attribute
    * @return {boolean}
    */
   _suppliedWithData: function (attribute) {