Merge branch 'master' into 8.11

Author: vkarpov15

CHANGELOG.md

@@ -123,8 +123,6 @@
  * fix: disallow using $where in match
  * perf: cache results from getAllSubdocs() on saveOptions, only loop through known subdoc properties #15055 #15029
  * fix(model+query): support overwriteDiscriminatorKey for bulkWrite updateOne and updateMany, allow inferring discriminator key from update #15046 #15040
-=======
->>>>>>> 7.x
 
 7.8.3 / 2024-11-26
 ==================

docs/typescript/subdocuments.md

@@ -38,9 +38,11 @@ Define a separate `THydratedDocumentType` and pass it as the 5th generic param t
 `THydratedDocumentType` controls what type Mongoose uses for "hydrated documents", that is, what `await UserModel.findOne()`, `UserModel.hydrate()`, and `new UserModel()` return.
 
 ```ts
+import { HydratedSingleSubdocument } from 'mongoose';
+
 // Define property overrides for hydrated documents
 type THydratedUserDocument = {
-  names?: mongoose.Types.Subdocument<Names>
+  names?: HydratedSingleSubdocument<Names>
 }
 type UserModelType = mongoose.Model<User, {}, {}, {}, THydratedUserDocument>;
 
@@ -51,6 +53,7 @@ const UserModel = mongoose.model<User, UserModelType>('User', userSchema);
 
 const doc = new UserModel({ names: { _id: '0'.repeat(24), firstName: 'foo' } });
 doc.names!.ownerDocument(); // Works, `names` is a subdocument!
+doc.names!.firstName; // 'foo'
 ```
 
 ## Subdocument Arrays
@@ -81,4 +84,5 @@ const UserModel = model<User, UserModelType>('User', new Schema<User, UserModelT
 
 const doc = new UserModel({});
 doc.names[0].ownerDocument(); // Works!
+doc.names[0].firstName; // string
 ```

lib/helpers/query/castUpdate.js

@@ -82,6 +82,16 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     schema = schema.discriminators[discriminatorValue] ||
       (byValue && byValue.schema) ||
       schema;
+  } else if (schema != null &&
+      options.overwriteDiscriminatorKey &&
+      obj.$set != null &&
+      utils.hasUserDefinedProperty(obj.$set, schema.options.discriminatorKey) &&
+      schema.discriminators != null) {
+    const discriminatorValue = obj.$set[schema.options.discriminatorKey];
+    const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
+    schema = schema.discriminators[discriminatorValue] ||
+      (byValue && byValue.schema) ||
+      schema;
   }
 
   if (options.upsert) {

test/model.test.js

@@ -4174,7 +4174,7 @@ describe('Model', function() {
         assert.strictEqual(r2.testArray[0].nonexistentProp, undefined);
       });
 
-      it('handles overwriteDiscriminatorKey (gh-15040)', async function() {
+      it('handles overwriteDiscriminatorKey (gh-15218) (gh-15040)', async function() {
         const dSchema1 = new mongoose.Schema({
           field1: String
         });
@@ -4202,7 +4202,7 @@ describe('Model', function() {
         assert.equal(r1.field1, 'field1');
         assert.equal(r1.key, type1Key);
 
-        const field2 = 'field2';
+        let field2 = 'field2';
         await TestModel.bulkWrite([{
           updateOne: {
             filter: { _id: r1._id },
@@ -4214,7 +4214,13 @@ describe('Model', function() {
           }
         }]);
 
-        const r2 = await TestModel.findById(r1._id);
+        let r2 = await TestModel.findById(r1._id);
+        assert.equal(r2.key, type2Key);
+        assert.equal(r2.field2, field2);
+
+        field2 = 'field2 updated again';
+        await TestModel.updateOne({ _id: r1._id }, { $set: { key: type2Key, field2 } }, { overwriteDiscriminatorKey: true });
+        r2 = await TestModel.findById(r1._id);
         assert.equal(r2.key, type2Key);
         assert.equal(r2.field2, field2);
       });

test/schema.number.test.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const assert = require('assert');
 const start = require('./common');
 
 const mongoose = start.mongoose;
@@ -18,4 +19,26 @@ describe('SchemaNumber', function() {
       });
     });
   });
+
+  it('allows calling `min()` with no message arg (gh-15236)', async function() {
+    const schema = new Schema({ x: { type: Number } });
+    schema.path('x').min(0);
+
+    const err = await new Promise((resolve) => {
+      schema.path('x').doValidate(-1, err => {
+        resolve(err);
+      });
+    });
+    assert.ok(err);
+    assert.equal(err.message, 'Path `x` (-1) is less than minimum allowed value (0).');
+
+    schema.path('x').min(0, 'Invalid value!');
+
+    const err2 = await new Promise((resolve) => {
+      schema.path('x').doValidate(-1, err => {
+        resolve(err);
+      });
+    });
+    assert.equal(err2.message, 'Invalid value!');
+  });
 });

test/types/schema.test.ts

@@ -1725,3 +1725,11 @@ async function gh12959() {
   const leanDoc = await TestModel.findOne().lean().orFail();
   expectType<number>(leanDoc.__v);
 }
+
+async function gh15236() {
+  const schema = new Schema({
+    myNum: { type: Number }
+  });
+
+  schema.path<Schema.Types.Number>('myNum').min(0);
+}

types/schematypes.d.ts

@@ -389,10 +389,10 @@ declare module 'mongoose' {
         expires(when: number | string): this;
 
         /** Sets a maximum date validator. */
-        max(value: NativeDate, message: string): this;
+        max(value: NativeDate, message?: string): this;
 
         /** Sets a minimum date validator. */
-        min(value: NativeDate, message: string): this;
+        min(value: NativeDate, message?: string): this;
 
         /** Default options for this SchemaType */
         defaultOptions: Record<string, any>;
@@ -457,10 +457,10 @@ declare module 'mongoose' {
         enum(vals: number[]): this;
 
         /** Sets a maximum number validator. */
-        max(value: number, message: string): this;
+        max(value: number, message?: string): this;
 
         /** Sets a minimum number validator. */
-        min(value: number, message: string): this;
+        min(value: number, message?: string): this;
 
         /** Default options for this SchemaType */
         defaultOptions: Record<string, any>;