fix(document): skip validating array elements that aren't modified wh…

…en `validateModifiedOnly` is set Fix #9963
Automattic · Mar 2, 2021 · 9896ee2 · 9896ee2
1 parent 91581d5
commit 9896ee2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -2500,7 +2500,8 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
 
       const doValidateOptions = {
         skipSchemaValidators: skipSchemaValidators[path],
-        path: path
+        path: path,
+        validateModifiedOnly: shouldValidateModifiedOnly
       };
       schemaType.doValidate(val, function(err) {
         if (err && (!schemaType.$isMongooseDocumentArray || err.$isArrayValidatorError)) {
@@ -2626,7 +2627,8 @@ Document.prototype.validateSync = function(pathsToValidate, options) {
     const val = _this.$__getValue(path);
     const err = p.doValidateSync(val, _this, {
       skipSchemaValidators: skipSchemaValidators[path],
-      path: path
+      path: path,
+      validateModifiedOnly: shouldValidateModifiedOnly
     });
     if (err && (!p.$isMongooseDocumentArray || err.$isArrayValidatorError)) {
       if (p.$isSingleNested &&

diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -251,6 +251,11 @@ DocumentArrayPath.prototype.doValidate = function(array, fn, scope, options) {
         doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
       }
 
+      if (options.validateModifiedOnly && !doc.isModified()) {
+        --count || fn(error);
+        continue;
+      }
+
       doc.$__validate(callback);
     }
   }
@@ -267,7 +272,7 @@ DocumentArrayPath.prototype.doValidate = function(array, fn, scope, options) {
  * @api private
  */
 
-DocumentArrayPath.prototype.doValidateSync = function(array, scope) {
+DocumentArrayPath.prototype.doValidateSync = function(array, scope, options) {
   const schemaTypeError = SchemaType.prototype.doValidateSync.call(this, array, scope);
   if (schemaTypeError != null) {
     schemaTypeError.$isArrayValidatorError = true;
@@ -299,6 +304,10 @@ DocumentArrayPath.prototype.doValidateSync = function(array, scope) {
       doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
     }
 
+    if (options != null && options.validateModifiedOnly && !doc.isModified()) {
+      continue;
+    }
+
     const subdocValidateError = doc.validateSync();
 
     if (subdocValidateError && resultError == null) {