Merge pull request #15960 from Automattic/fix/gh-15957-nested-map-validation

fix(map): validate map subdocument when loaded with init

Author: vkarpov15

lib/document.js

@@ -2824,7 +2824,13 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
 
     // Optimization: if primitive path with no validators, or array of primitives
     // with no validators, skip validating this path entirely.
-    if (!_pathType.schema && !_pathType.embeddedSchemaType && _pathType.validators.length === 0 && !_pathType.$parentSchemaDocArray) {
+    if (!_pathType.schema &&
+      !_pathType.embeddedSchemaType &&
+      _pathType.validators.length === 0 &&
+      !_pathType.$parentSchemaDocArray &&
+      // gh-15957: skip this optimization for SchemaMap as maps can contain subdocuments
+      // that need validation even if the map itself has no validators
+      !_pathType.$isSchemaMap) {
       paths.delete(path);
     } else if (_pathType.$isMongooseArray &&
       !_pathType.$isMongooseDocumentArray && // Skip document arrays...

test/types.map.test.js

@@ -1818,4 +1818,68 @@ describe('Map', function() {
       $inc: { __v: 1 }
     });
   });
+
+  describe('validates nested map subdocuments loaded via init() (gh-15957)', function() {
+    it('fails validation for invalid data', async function() {
+      // Arrange
+      const { company } = createTestContext({ employeeNameMinLength: 2, employeeName: 'X' });
+
+      // Act
+      const error = await company.validate().then(() => null, err => err);
+
+      // Assert
+      assert.ok(error);
+      assert.ok(error.errors['teams.engineering.employees.john.name']);
+    });
+
+    it('passes validation for valid data', async function() {
+      // Arrange
+      const { company } = createTestContext({ employeeNameMinLength: 2, employeeName: 'John' });
+
+      // Act
+      const error = await company.validate().then(() => null, err => err);
+
+      // Assert
+      assert.strictEqual(error, null);
+    });
+
+    it('works with validateSync()', function() {
+      // Arrange
+      const { company } = createTestContext({ employeeNameMinLength: 2, employeeName: 'X' });
+
+      // Act
+      const error = company.validateSync();
+
+      // Assert
+      assert.ok(error);
+      assert.ok(error.errors['teams.engineering.employees.john.name']);
+    });
+
+    function createTestContext({ employeeNameMinLength, employeeName }) {
+      const employeeSchema = new Schema({
+        name: { type: String, minlength: employeeNameMinLength }
+      });
+      const teamSchema = new Schema({
+        employees: { type: Map, of: employeeSchema }
+      });
+      const companySchema = new Schema({
+        teams: { type: Map, of: teamSchema }
+      });
+      const Company = db.model('Company', companySchema);
+
+      const company = new Company();
+      company.init({
+        _id: new mongoose.Types.ObjectId(),
+        teams: {
+          engineering: {
+            employees: {
+              john: { name: employeeName }
+            }
+          }
+        }
+      });
+
+      return { company };
+    }
+  });
 });