Merge pull request #16274 from Automattic/vkarpov15/gh-16269

BREAKING CHANGE: require passing both filter and update to Query.prototype.updateOne(), make Document.prototype.init() fully sync

Author: vkarpov15

lib/cursor/queryCursor.js

@@ -595,15 +595,15 @@ function _nextDoc(ctx, doc, pop, callback) {
   }
 
   const { model, _fields, _userProvidedFields, options } = ctx.query;
-  helpers.createModelAndInit(model, doc, _fields, _userProvidedFields, options, pop, (err, doc) => {
-    if (err != null) {
-      return callback(err);
-    }
+  try {
+    doc = helpers.createModelAndInit(model, doc, _fields, _userProvidedFields, options, pop);
     if (options.session != null) {
       doc.$session(options.session);
     }
-    ctx.model.hooks.execPost('find', ctx.query, [[doc]]).then(() => callback(null, doc), err => callback(err));
-  });
+  } catch (err) {
+    return callback(err);
+  }
+  ctx.model.hooks.execPost('find', ctx.query, [[doc]]).then(() => callback(null, doc), err => callback(err));
 }
 
 /*!

lib/document.js

@@ -639,28 +639,22 @@ Document.prototype.toBSON = function() {
  * @param {object} doc raw document returned by mongo
  * @param {object} [opts]
  * @param {boolean} [opts.hydratedPopulatedDocs=false] If true, hydrate and mark as populated any paths that are populated in the raw document
- * @param {Function} [fn]
  * @api public
  * @memberOf Document
  * @instance
  */
 
-Document.prototype.init = function(doc, opts, fn) {
-  if (typeof opts === 'function') {
-    fn = opts;
-    opts = null;
-  }
-
+Document.prototype.init = function(doc, opts) {
   if (doc == null) {
     throw new ObjectParameterError(doc, 'doc', 'init');
   }
+  if (typeof opts === 'function' ||
+      (arguments.length > 2 && typeof arguments[2] === 'function')) {
+    throw new MongooseError('Document.prototype.init() no longer accepts a callback');
+  }
 
   this.$__init(doc, opts);
 
-  if (fn) {
-    fn(null, this);
-  }
-
   return this;
 };
 

lib/model.js

@@ -3996,14 +3996,14 @@ Model.hydrate = function hydrate(obj, projection, options) {
  * @api public
  */
 
-Model.updateMany = function updateMany(conditions, update, options) {
+Model.updateMany = function updateMany(filter, update, options) {
   _checkContext(this, 'updateMany');
 
   if (update == null) {
     throw new MongooseError('updateMany `update` parameter cannot be nullish');
   }
 
-  return _update(this, 'updateMany', conditions, update, options);
+  return _update(this, 'updateMany', filter, update, options);
 };
 
 /**
@@ -4044,10 +4044,10 @@ Model.updateMany = function updateMany(conditions, update, options) {
  * @api public
  */
 
-Model.updateOne = function updateOne(conditions, doc, options) {
+Model.updateOne = function updateOne(filter, update, options) {
   _checkContext(this, 'updateOne');
 
-  return _update(this, 'updateOne', conditions, doc, options);
+  return _update(this, 'updateOne', filter, update, options);
 };
 
 /**
@@ -4067,7 +4067,7 @@ Model.updateOne = function updateOne(conditions, doc, options) {
  * - `replaceOne()`
  *
  * @param {object} filter
- * @param {object} doc
+ * @param {object} replacement
  * @param {object} [options] optional see [`Query.prototype.setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
  * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {boolean} [options.upsert=false] if true, and no documents found, insert a new document
@@ -4081,15 +4081,15 @@ Model.updateOne = function updateOne(conditions, doc, options) {
  * @api public
  */
 
-Model.replaceOne = function replaceOne(conditions, doc, options) {
+Model.replaceOne = function replaceOne(filter, replacement, options) {
   _checkContext(this, 'replaceOne');
 
   const versionKey = this?.schema?.options?.versionKey || null;
-  if (versionKey && !doc[versionKey]) {
-    doc[versionKey] = 0;
+  if (versionKey && !replacement[versionKey]) {
+    replacement[versionKey] = 0;
   }
 
-  return _update(this, 'replaceOne', conditions, doc, options);
+  return _update(this, 'replaceOne', filter, replacement, options);
 };
 
 /**