Merge branch 'Automattic:master' into master

Author: Vegapunk-debug

docs/compatibility.md

@@ -11,14 +11,15 @@
     }
 </style>
 
-Mongoose relies on the [MongoDB Node.js Driver](http://mongodb.github.io/node-mongodb-native/) to talk to MongoDB.
-You can refer to [this table](https://www.mongodb.com/docs/drivers/node/current/compatibility/) for up-to-date information as to which version of the MongoDB driver supports which version of MongoDB.
+Mongoose relies on the [MongoDB Node.js Driver](https://www.mongodb.com/docs/drivers/node/current/) to communicate with MongoDB.
 
-Below are the [semver](http://semver.org/) ranges representing which versions of mongoose are compatible with the listed versions of MongoDB server.
+You can refer to [this table](https://www.mongodb.com/docs/drivers/compatibility/?driver-language=javascript&javascript-driver-framework=nodejs) for up-to-date information as to which version of the MongoDB driver supports which version of the MongoDB server.
+
+Below are the [SemVer](http://semver.org/) ranges representing which versions of mongoose are compatible with the listed versions of MongoDB server.
 
 | MongoDB Server |                    Mongoose                    |
 | :------------: | :--------------------------------------------: |
-|     `8.x`      |                 `^8.7.0 | ^9.0.0`              |
+|     `8.x`      |                 `^8.7.0 \| ^9.0.0`             |
 |     `7.x`      |            `^7.4.0 \| ^8.0.0 \| ^9.0.0`        |
 |     `6.x`      |            `^7.0.0 \| ^8.0.0 \| ^9.0.0`        |
 |     `5.x`      |            `^6.0.0 \| ^7.0.0 \| ^8.0.0`        |
@@ -27,4 +28,4 @@ Below are the [semver](http://semver.org/) ranges representing which versions of
 |    `4.0.x`     |       `^6.0.0 \| ^7.0.0 \| ^8.0.0 <8.16.0`     |
 |    `3.6.x`     |       `^6.0.0 \| ^7.0.0 \| ^8.0.0 <8.8.0`      |
 
-Mongoose `^6.5.0` also works with MongoDB server 7.x. But not all new MongoDB server 7.x features are supported by Mongoose 6.x.
+Mongoose `^6.5.0` also works with MongoDB server 7.x. But not all new MongoDB server 7.x features are supported by Mongoose 6.x. To verify that your version of Mongoose is compatible based on the table above, use the [online SemVer checker](https://jubianchi.github.io/semver-check/#/).

docs/source/api.js

@@ -269,7 +269,7 @@ function processFile(props) {
     if ('constructor' in ctx && ctx.constructor === undefined) {
       ctx.constructorWasUndefined = true;
     }
-
+    if (!prop.tags) continue;
     for (const __tag of prop.tags) {
       // the following has been done, because otherwise no type could be applied for intellisense
       /** @type {TagObject} */

lib/connection.js

@@ -1782,7 +1782,7 @@ Connection.prototype.syncIndexes = async function syncIndexes(options = {}) {
 };
 
 /**
- * Switches to a different database using the same [connection pool](https://mongoosejs.com/docs/api/connectionshtml#connection_pools).
+ * Switches to a different database using the same [connection pool](https://mongoosejs.com/docs/connections.html#connection_pools).
  *
  * Returns a new connection object, with the new db.
  *

lib/helpers/model/castBulkWrite.js

@@ -118,7 +118,9 @@ module.exports.castUpdateOne = function castUpdateOne(originalModel, updateOne,
   if (model.schema.$timestamps != null && doInitTimestamps) {
     const createdAt = model.schema.$timestamps.createdAt;
     const updatedAt = model.schema.$timestamps.updatedAt;
-    applyTimestampsToUpdate(now, createdAt, updatedAt, update, {});
+    applyTimestampsToUpdate(now, createdAt, updatedAt, update, {
+      timestamps: updateOne.timestamps
+    });
   }
 
   if (doInitTimestamps) {
@@ -150,7 +152,8 @@ module.exports.castUpdateOne = function castUpdateOne(originalModel, updateOne,
     strict: strict,
     upsert: updateOne.upsert,
     arrayFilters: updateOne.arrayFilters,
-    overwriteDiscriminatorKey: updateOne.overwriteDiscriminatorKey
+    overwriteDiscriminatorKey: updateOne.overwriteDiscriminatorKey,
+    overwriteImmutable: updateOne.overwriteImmutable
   }, model, updateOne['filter']);
 
   return updateOne;
@@ -185,7 +188,9 @@ module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMan
   if (model.schema.$timestamps != null && doInitTimestamps) {
     const createdAt = model.schema.$timestamps.createdAt;
     const updatedAt = model.schema.$timestamps.updatedAt;
-    applyTimestampsToUpdate(now, createdAt, updatedAt, updateMany['update'], {});
+    applyTimestampsToUpdate(now, createdAt, updatedAt, updateMany['update'], {
+      timestamps: updateMany.timestamps
+    });
   }
   if (doInitTimestamps) {
     applyTimestampsToChildren(now, updateMany['update'], model.schema);
@@ -208,7 +213,8 @@ module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMan
     strict: strict,
     upsert: updateMany.upsert,
     arrayFilters: updateMany.arrayFilters,
-    overwriteDiscriminatorKey: updateMany.overwriteDiscriminatorKey
+    overwriteDiscriminatorKey: updateMany.overwriteDiscriminatorKey,
+    overwriteImmutable: updateMany.overwriteImmutable
   }, model, updateMany['filter']);
 };
 

lib/utils.js

@@ -190,6 +190,9 @@ exports.deepEqual = function deepEqual(a, b) {
  */
 
 exports.last = function(arr) {
+  if (arr == null) {
+    return void 0;
+  }
   if (arr.length > 0) {
     return arr[arr.length - 1];
   }
@@ -272,6 +275,10 @@ exports.clonePOJOsAndArrays = function clonePOJOsAndArrays(val) {
 exports.merge = function merge(to, from, options, path) {
   options = options || {};
 
+  if (from == null) {
+    return to;
+  }
+
   const keys = Object.keys(from);
   let i = 0;
   const len = keys.length;
@@ -690,6 +697,9 @@ exports.setValue = function(path, val, obj, map, _copying) {
 
 exports.object = {};
 exports.object.vals = function vals(o) {
+  if (o == null) {
+    return [];
+  }
   const keys = Object.keys(o);
   let i = keys.length;
   const ret = [];

scripts/generateSearch.js

@@ -63,14 +63,17 @@ function generateContents() {
       content.validateSync();
 
       const $ = cheerio.load(text);
-
       contents.push(content);
 
-      // Break up individual h3's into separate content for more fine grained search
+      // Break up h3's into additional content entries
       $('h3').each((index, el) => {
         el = $(el);
         const title = el.text();
         const html = el.nextUntil('h3').html();
+
+        // *** FIXED: Skip empty HTML blocks ***
+        if (!html || html.trim() === '') return;
+
         const id = el.prop('id');
         const baseUrl = filename.replace('.md', '.html').replace(/^docs/, '');
         const content = new Content({
@@ -82,6 +85,7 @@ function generateContents() {
         content.validateSync();
         contents.push(content);
       });
+
     } else if (file.guide) {
       let text = fs.readFileSync(filename, 'utf8');
       text = text.substring(text.indexOf('block content') + 'block content\n'.length);
@@ -96,14 +100,17 @@ function generateContents() {
       content.validateSync();
 
       const $ = cheerio.load(text);
-
       contents.push(content);
 
-      // Break up individual h3's into separate content for more fine grained search
+      // Break up h3's into additional content entries
       $('h3').each((index, el) => {
         el = $(el);
         const title = el.text();
         const html = el.nextUntil('h3').html();
+
+        // *** FIXED: Skip empty HTML blocks ***
+        if (!html || html.trim() === '') return;
+
         const id = el.prop('id');
         const baseUrl = filename.replace('.pug', '.html').replace(/^docs/, '');
         const content = new Content({
@@ -137,56 +144,47 @@ async function generateSearch(config) {
 
   const promises = [];
   let lastPrint = 0;
-
   let doneCount = 0;
+
   console.log('Search Content to save:', contents.length);
+
   for (const content of contents) {
-    if (version === '9.x') {
-      let url = content.url.startsWith('/') ? content.url : `/${content.url}`;
-      if (!url.startsWith('/docs')) {
-        url = '/docs' + url;
-      }
-      content.url = url;
-    } else {
-      let url = content.url.startsWith('/') ? content.url : `/${content.url}`;
-      if (!url.startsWith('/docs')) {
-        url = '/docs' + url;
-      }
-      content.url = `/docs/${version}${url}`;
+    let url = content.url.startsWith('/') ? content.url : `/${content.url}`;
+    if (!url.startsWith('/docs')) {
+      url = '/docs' + url;
     }
+    content.url = version === '9.x' ? url : `/docs/${version}${url}`;
+
     const promise = content.save().then(() => {
       doneCount += 1;
       const nowDate = Date.now();
-      // only print every 2 seconds, or if it is the first or last element
       if (nowDate - lastPrint > 2000 || doneCount === contents.length || doneCount === 1) {
         lastPrint = nowDate;
         console.log(`${doneCount} / ${contents.length}`);
       }
     });
+
     promises.push(promise);
   }
 
   await Promise.allSettled(promises);
 
-  const results = await Content.
-    find({ $text: { $search: 'validate' }, version }, { score: { $meta: 'textScore' } }).
-    sort({ score: { $meta: 'textScore' } }).
-    limit(10);
+  const results = await Content
+    .find({ $text: { $search: 'validate' }, version }, { score: { $meta: 'textScore' } })
+    .sort({ score: { $meta: 'textScore' } })
+    .limit(10);
 
   console.log(results.map(res => res.url));
 
   console.log(`Added ${contents.length} Search Content`);
-
-  // this likely should not be done as part of this script, but by the caller,
-  // but this script is currently the only one that connects in the website generation.
   await mongoose.disconnect();
 }
 
 function getConfig() {
   const config = require('../.config.js');
 
   if (!config || !config.uri) {
-    throw new Error('No Config or config.URI given, please create a .config.js file with those values in the root of the repository');
+    throw new Error('No Config or config.uri given, please create a .config.js file with those values in the root of the repository');
   }
 
   return config;
@@ -195,7 +193,6 @@ function getConfig() {
 module.exports.generateSearch = generateSearch;
 module.exports.getConfig = getConfig;
 
-// only run the following code if this file is the main module / entry file
 if (isMain) {
   (async function main() {
     const config = getConfig();

test/model.updateOne.test.js

@@ -2680,6 +2680,36 @@ describe('model: updateOne: ', function() {
     assert.equal(doc.age, 20);
   });
 
+  it('overwriting immutable createdAt with bulkWrite (gh-15781)', async function() {
+    const start = new Date().valueOf();
+    const schema = Schema({
+      createdAt: {
+        type: mongoose.Schema.Types.Date,
+        immutable: true
+      },
+      name: String
+    }, { timestamps: true });
+
+    const Model = db.model('Test', schema);
+
+    await Model.create({ name: 'gh-15781' });
+    let doc = await Model.collection.findOne({ name: 'gh-15781' });
+    assert.ok(doc.createdAt.valueOf() >= start);
+
+    const createdAt = new Date('2011-06-01');
+    assert.ok(createdAt.valueOf() < start.valueOf());
+    await Model.bulkWrite([{
+      updateOne: {
+        filter: { _id: doc._id },
+        update: { name: 'gh-15781 update', createdAt },
+        overwriteImmutable: true,
+        timestamps: false
+      }
+    }]);
+    doc = await Model.collection.findOne({ name: 'gh-15781 update' });
+    assert.equal(doc.createdAt.valueOf(), createdAt.valueOf());
+  });
+
   it('updates buffers with `runValidators` successfully (gh-8580)', async function() {
     const Test = db.model('Test', Schema({
       data: { type: Buffer, required: true }

test/types/connection.test.ts

@@ -167,5 +167,6 @@ async function gh15359() {
     { model: 'Test', name: 'updateOne', filter: { name: 'test4' }, update: { $set: { num: 'not a number' } } }
   ], { ordered: false });
   expectType<number>(res3.insertedCount);
+  expectError(res3.validationErrors);
   expectType<Error[] | undefined>(res3.mongoose?.validationErrors);
 }

test/types/document.test.ts

@@ -166,8 +166,6 @@ function gh11085(): void {
 
   const newUser = new UserModel();
 
-  let _id: number;
-  expectError(_id = newUser._id);
   const _id2: Types.ObjectId = newUser._id;
 }
 

test/types/queries.test.ts

@@ -826,3 +826,17 @@ function gh15671() {
     };
   };
 }
+
+async function gh15786() {
+  interface IDoc {
+    nmae: string;
+  }
+
+  interface DocStatics {
+    m1(): void;
+    m2(): void;
+  }
+
+  const schema = new Schema<IDoc, Model<IDoc>, {}, {}, {}, DocStatics>({});
+  schema.static({ m1() {} } as DocStatics);
+}