mongoose 7.3.0 → 7.3.1

package/lib/query.js

@@ -3608,55 +3608,47 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
     throw this.error();
   }
 
+  if ('strict' in this.options) {
+    this._mongooseOptions.strict = this.options.strict;
+    delete this.options.strict;
+  }
+
   const filter = this._conditions;
   const options = this._optionsForExec();
   this._applyTranslateAliases(options);
   convertNewToReturnDocument(options);
 
-  const runValidators = _getOption(this, 'runValidators', false);
-  if (runValidators === false) {
-    try {
-      this._update = this._castUpdate(this._update, true);
-    } catch (err) {
-      const validationError = new ValidationError();
-      validationError.errors[err.path] = err;
-      throw validationError;
-    }
-
-    let res = await this._collection.collection.findOneAndReplace(filter, this._update || {}, options);
-
-    for (const fn of this._transforms) {
-      res = fn(res);
-    }
-
-    const doc = res.value;
-    return new Promise((resolve, reject) => {
-      this._completeOne(doc, res, _wrapThunkCallback(this, (err, res) => {
-        if (err) {
-          return reject(err);
-        }
-        resolve(res);
-      }));
-    });
+  const modelOpts = { skipId: true };
+  if ('strict' in this._mongooseOptions) {
+    modelOpts.strict = this._mongooseOptions.strict;
   }
 
+  const runValidators = _getOption(this, 'runValidators', false);
 
-  let castedDoc = new this.model(this._update, null, true);
-  this._update = castedDoc;
-  await castedDoc.validate();
-
-  if (castedDoc.toBSON) {
-    castedDoc = castedDoc.toBSON();
+  try {
+    const update = new this.model(this._update, null, modelOpts);
+    if (runValidators) {
+      await update.validate();
+    } else if (update.$__.validationError) {
+      throw update.$__.validationError;
+    }
+    this._update = update.toBSON();
+  } catch (err) {
+    if (err instanceof ValidationError) {
+      throw err;
+    }
+    const validationError = new ValidationError();
+    validationError.errors[err.path] = err;
+    throw validationError;
   }
 
-  let res = await this._collection.collection.findOneAndReplace(filter, castedDoc, options);
+  let res = await this._collection.collection.findOneAndReplace(filter, this._update, options);
 
   for (const fn of this._transforms) {
     res = fn(res);
   }
 
   const doc = res.value;
-
   return new Promise((resolve, reject) => {
     this._completeOne(doc, res, _wrapThunkCallback(this, (err, res) => {
       if (err) {

package/lib/schematype.js

@@ -810,8 +810,8 @@ SchemaType.prototype.get = function(fn) {
  *     // adding many validators at a time
  *
  *     const many = [
- *         { validator: validator, msg: 'uh oh' }
- *       , { validator: anotherValidator, msg: 'failed' }
+ *         { validator: validator, message: 'uh oh' }
+ *       , { validator: anotherValidator, message: 'failed' }
  *     ]
  *     new Schema({ name: { type: String, validate: many }});
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",