Merge branch 'master' into vkarpov15/gh-13529

Author: vkarpov15

CHANGELOG.md

@@ -1,3 +1,13 @@
+7.3.2 / 2023-07-06
+==================
+ * fix(model): avoid TypeError if insertMany() fails with error that does not have writeErrors property #13579 #13531
+ * fix(query): convert findOneAndUpdate to findOneAndReplace when overwrite set for backwards compat with Mongoose 6 #13572 #13550
+ * fix(query): throw readable error when executing a Query instance without an associated model #13571 #13570
+ * types: support mongoose.Schema.ObjectId as alias for mongoose.Schema.Types.ObjectId #13543 #13534
+ * docs(connections): clarify that socketTimeoutMS now defaults to 0 #13576 #13537
+ * docs(migrating_to_7): add mapReduce() removal to migration guide #13568 #13548
+ * docs(schemas): fix typo in schemas.md #13540 [Metehan-Altuntekin](https://github.com/Metehan-Altuntekin)
+
 7.3.1 / 2023-06-21
 ==================
  * fix(query): respect query-level strict option on findOneAndReplace() #13516 #13507

lib/model.js

@@ -3234,16 +3234,19 @@ Model.$__insertMany = function(arr, options, callback) {
         }
 
         // `insertedDocs` is a Mongoose-specific property
+        const hasWriteErrors = error && error.writeErrors;
         const erroredIndexes = new Set((error && error.writeErrors || []).map(err => err.index));
 
-        for (let i = 0; i < error.writeErrors.length; ++i) {
-          const originalIndex = validDocIndexToOriginalIndex.get(error.writeErrors[i].index);
-          error.writeErrors[i] = {
-            ...error.writeErrors[i],
-            index: originalIndex
-          };
-          if (!ordered) {
-            results[originalIndex] = error.writeErrors[i];
+        if (error.writeErrors != null) {
+          for (let i = 0; i < error.writeErrors.length; ++i) {
+            const originalIndex = validDocIndexToOriginalIndex.get(error.writeErrors[i].index);
+            error.writeErrors[i] = {
+              ...error.writeErrors[i],
+              index: originalIndex
+            };
+            if (!ordered) {
+              results[originalIndex] = error.writeErrors[i];
+            }
           }
         }
 
@@ -3260,7 +3263,7 @@ Model.$__insertMany = function(arr, options, callback) {
         let firstErroredIndex = -1;
         error.insertedDocs = docAttributes.
           filter((doc, i) => {
-            const isErrored = erroredIndexes.has(i);
+            const isErrored = !hasWriteErrors || erroredIndexes.has(i);
 
             if (ordered) {
               if (firstErroredIndex > -1) {

lib/query.js

@@ -3281,6 +3281,12 @@ Query.prototype.findOneAndUpdate = function(filter, doc, options) {
  */
 
 Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
+  // For backwards compability with Mongoose 6 re: #13550
+  if (this._mongooseOptions.overwrite) {
+    this.op = 'findOneAndReplace';
+    return this._findOneAndReplace();
+  }
+
   this._castConditions();
 
   _castArrayFilters(this);
@@ -4354,7 +4360,10 @@ Query.prototype.exec = async function exec(op) {
   }
 
   if (this.op == null) {
-    throw new Error('Query must have `op` before executing');
+    throw new MongooseError('Query must have `op` before executing');
+  }
+  if (this.model == null) {
+    throw new MongooseError('Query must have an associated model before executing');
   }
   this._validateOp();
 
@@ -4434,6 +4443,13 @@ function _executePostExecHooks(query) {
  */
 
 function _executePostHooks(query, res, error, op) {
+  if (query._queryMiddleware == null) {
+    if (error != null) {
+      throw error;
+    }
+    return res;
+  }
+
   return new Promise((resolve, reject) => {
     const opts = error ? { error } : {};
 
@@ -4467,6 +4483,10 @@ function _executePreExecHooks(query) {
  */
 
 function _executePreHooks(query, op) {
+  if (query._queryMiddleware == null) {
+    return;
+  }
+
   return new Promise((resolve, reject) => {
     query._queryMiddleware.execPre(op || query.op, query, [], (error) => {
       if (error != null) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.3.1",
+  "version": "7.3.2",
   "author": "Guillermo Rauch <[email protected]>",
   "keywords": [
     "mongodb",
@@ -30,8 +30,8 @@
   "devDependencies": {
     "@babel/core": "7.22.5",
     "@babel/preset-env": "7.22.5",
-    "@typescript-eslint/eslint-plugin": "5.60.1",
-    "@typescript-eslint/parser": "5.60.1",
+    "@typescript-eslint/eslint-plugin": "5.61.0",
+    "@typescript-eslint/parser": "5.61.0",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
@@ -56,7 +56,7 @@
     "lodash.isequalwith": "4.4.0",
     "markdownlint-cli2": "^0.8.1",
     "marked": "4.3.0",
-    "mkdirp": "^2.1.3",
+    "mkdirp": "^3.0.1",
     "mocha": "10.2.0",
     "moment": "2.x",
     "mongodb-memory-server": "8.13.0",

test/query.test.js

@@ -4094,6 +4094,7 @@ describe('Query', function() {
     await Test.findOneAndUpdate({}, { name: 'bar' });
     assert.ok(!('projection' in lastOptions));
   });
+
   it('should provide a clearer error message when sorting with empty string', async function() {
     const testSchema = new Schema({
       name: { type: String }
@@ -4104,4 +4105,40 @@ describe('Query', function() {
       await Error.find().sort('-');
     }, { message: 'Invalid field "" passed to sort()' });
   });
+
+  it('throws a readable error when executing Query instance without a model (gh-13570)', async function() {
+    const schema = new Schema({ name: String });
+    const M = db.model('Test', schema, 'Test');
+    await M.deleteMany({});
+    await M.create({ name: 'gh13570' });
+
+    const Q = new mongoose.Query();
+    await assert.rejects(
+      () => Q.collection('Test').find().lean(),
+      /Query must have an associated model before executing/
+    );
+  });
+
+  it('throws a readable error when executing Query instance without an op (gh-13570)', async function() {
+    const schema = new Schema({ name: String });
+    const M = db.model('Test', schema, 'Test');
+    await M.deleteMany({});
+    await M.create({ name: 'gh13570' });
+
+    const Q = new M.Query();
+    await assert.rejects(
+      () => Q.lean(),
+      /Query must have `op` before executing/
+    );
+  });
+  it('converts findOneAndUpdate to findOneAndReplace if overwrite set (gh-13550)', async function() {
+    const testSchema = new Schema({
+      name: { type: String }
+    });
+
+    const Test = db.model('Test', testSchema);
+    const q = Test.findOneAndUpdate({}, { name: 'bar' }, { overwrite: true });
+    await q.exec();
+    assert.equal(q.op, 'findOneAndReplace');
+  });
 });

types/index.d.ts

@@ -197,7 +197,7 @@ declare module 'mongoose' {
 
   export type DiscriminatorSchema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods, DisSchema> =
     DisSchema extends Schema<infer DisSchemaEDocType, infer DisSchemaM, infer DisSchemaInstanceMethods, infer DisSchemaQueryhelpers, infer DisSchemaVirtuals, infer DisSchemaStatics>
-      ? Schema<Omit<DocType, keyof DisSchemaEDocType> & DisSchemaEDocType, DiscriminatorModel<DisSchemaM, M>, DisSchemaInstanceMethods | TInstanceMethods, DisSchemaQueryhelpers | TQueryHelpers, DisSchemaVirtuals | TVirtuals, DisSchemaStatics & TStaticMethods>
+      ? Schema<MergeType<DocType, DisSchemaEDocType>, DiscriminatorModel<DisSchemaM, M>, DisSchemaInstanceMethods | TInstanceMethods, DisSchemaQueryhelpers | TQueryHelpers, DisSchemaVirtuals | TVirtuals, DisSchemaStatics & TStaticMethods>
       : Schema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods>;
 
   type QueryResultType<T> = T extends Query<infer ResultType, any> ? ResultType : never;