Merge branch 'master' into 8.10

Author: vkarpov15

lib/model.js

@@ -3540,6 +3540,7 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
  * @param {String|number} [options.w=1] The [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/). See [`Query#w()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.w()) for more information.
  * @param {number} [options.wtimeout=null] The [write concern timeout](https://www.mongodb.com/docs/manual/reference/write-concern/#wtimeout).
  * @param {Boolean} [options.j=true] If false, disable [journal acknowledgement](https://www.mongodb.com/docs/manual/reference/write-concern/#j-option)
+ * @param {Boolean} [options.validateBeforeSave=true] set to `false` to skip Mongoose validation on all documents
  * @return {BulkWriteResult} the return value from `bulkWrite()`
  */
 Model.bulkSave = async function bulkSave(documents, options) {
@@ -3559,15 +3560,13 @@ Model.bulkSave = async function bulkSave(documents, options) {
     }
   }
 
-  await Promise.all(documents.map(buildPreSavePromise));
+  await Promise.all(documents.map(doc => buildPreSavePromise(doc, options)));
 
   const writeOperations = this.buildBulkWriteOperations(documents, { skipValidation: true, timestamps: options.timestamps });
-
-  const { bulkWriteResult, bulkWriteError } = await this.bulkWrite(writeOperations, options).then(
+  const { bulkWriteResult, bulkWriteError } = await this.bulkWrite(writeOperations, { skipValidation: true, ...options }).then(
     (res) => ({ bulkWriteResult: res, bulkWriteError: null }),
     (err) => ({ bulkWriteResult: null, bulkWriteError: err })
   );
-
   // If not a MongoBulkWriteError, treat this as all documents failed to save.
   if (bulkWriteError != null && !(bulkWriteError instanceof MongoBulkWriteError)) {
     throw bulkWriteError;
@@ -3595,7 +3594,6 @@ Model.bulkSave = async function bulkSave(documents, options) {
       successfulDocuments.push(document);
     }
   }
-
   await Promise.all(successfulDocuments.map(document => handleSuccessfulWrite(document)));
 
   if (bulkWriteError && bulkWriteError.writeErrors && bulkWriteError.writeErrors.length) {
@@ -3605,9 +3603,9 @@ Model.bulkSave = async function bulkSave(documents, options) {
   return bulkWriteResult;
 };
 
-function buildPreSavePromise(document) {
+function buildPreSavePromise(document, options) {
   return new Promise((resolve, reject) => {
-    document.schema.s.hooks.execPre('save', document, (err) => {
+    document.schema.s.hooks.execPre('save', document, [options], (err) => {
       if (err) {
         reject(err);
         return;

package.json

@@ -30,8 +30,8 @@
   "devDependencies": {
     "@babel/core": "7.26.0",
     "@babel/preset-env": "7.26.0",
-    "@typescript-eslint/eslint-plugin": "8.18.0",
-    "@typescript-eslint/parser": "8.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.19.1",
+    "@typescript-eslint/parser": "^8.19.1",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
@@ -42,8 +42,8 @@
     "cheerio": "1.0.0",
     "crypto-browserify": "3.12.1",
     "dox": "1.0.0",
-    "eslint": "8.57.0",
-    "eslint-plugin-markdown": "^5.0.0",
+    "eslint": "8.57.1",
+    "eslint-plugin-markdown": "^5.1.0",
     "eslint-plugin-mocha-no-only": "1.2.0",
     "express": "^4.19.2",
     "fs-extra": "~11.2.0",

scripts/website.js

@@ -164,11 +164,11 @@ function moveDocsToTemp() {
   }
 }
 
-/** 
+/**
  * Array of array of semver numbers, sorted with highest number first
  * @example
  * [[1,2,3], [0,1,2]]
- * @type {number[][]} 
+ * @type {number[][]}
  */
 let filteredTags = [];
 
@@ -238,16 +238,16 @@ function getVersions() {
  * Stringify a semver number array
  * @param {number[]} arr The array to stringify
  * @param {boolean} dotX If "true", return "5.X" instead of "5.5.5"
- * @returns 
+ * @returns
  */
 function stringifySemverNumber(arr, dotX) {
   if (dotX) {
-    return `${arr[0]}.x`;  
+    return `${arr[0]}.x`;
   }
   return `${arr[0]}.${arr[1]}.${arr[2]}`;
 }
 
-/** 
+/**
  * Get the latest version available
  * @returns {Version}
  */
@@ -422,7 +422,7 @@ function mapURLs(block, currentUrl) {
  * @param {String} filename The documentation file path to render
  * @param {import("../docs/source/index").DocsOptions} options The options to use to render the file (api may be overwritten at reload)
  * @param {Boolean} isReload Indicate this is a reload of the file
- * @returns 
+ * @returns
  */
 async function pugify(filename, options, isReload = false) {
   /** Path for the output file */
@@ -502,7 +502,7 @@ async function pugify(filename, options, isReload = false) {
   }
 
   str = mapURLs(str, '/' + path.relative(cwd, docsPath))
-  
+
   await fs.promises.writeFile(newfile, str).catch((err) => {
     console.error('could not write', err.stack);
   }).then(() => {
@@ -624,5 +624,5 @@ function createSlug(value) {
     return '';
   }
   value = value.toLowerCase();
-  return value.replace(/[^a-z0-9-_\s]/, '').replace(/ /g, '-');
-}
+  return value.replace(/<\/?code>/g, '').replace(/[^a-z0-9-_\s]/g, '').replace(/ /g, '-');
+}

test/document.test.js

@@ -625,12 +625,12 @@ describe('document', function() {
     assert.equal(doc.val, 'test2');
   });
 
-  it('allows you to skip validation on save (gh-2981)', function() {
+  it('allows you to skip validation on save (gh-2981)', async function() {
     const schema = new Schema({ name: { type: String, required: true } });
     const MyModel = db.model('Test', schema);
 
     const doc = new MyModel();
-    return doc.save({ validateBeforeSave: false });
+    await doc.save({ validateBeforeSave: false });
   });
 
   it('doesnt use custom toObject options on save', async function() {
@@ -12752,6 +12752,16 @@ describe('document', function() {
     assert.equal(updatedPerson?._age, 61);
   });
 
+  it('bulkSave() allows skipping validation with validateBeforeSave (gh-15156)', async() => {
+    const schema = new Schema({ name: { type: String, required: true } });
+    const MyModel = db.model('Test', schema);
+
+    const doc = new MyModel();
+    await MyModel.bulkSave([doc], { validateBeforeSave: false });
+
+    assert.ok(await MyModel.exists({ _id: doc._id }));
+  });
+
   it('handles default embedded discriminator values (gh-13835)', async function() {
     const childAbstractSchema = new Schema(
       { kind: { type: Schema.Types.String, enum: ['concreteKind'], required: true, default: 'concreteKind' } },

test/types/lean.test.ts

@@ -323,3 +323,29 @@ async function gh15122() {
     testFn(parentDoc);
   }
 }
+
+async function gh15158() {
+  type FooBar = {
+    value: string;
+  };
+
+  const createSomeModelAndDoSomething = async <T extends FooBar>() => {
+    const TestSchema = new Schema<T>({
+      value: { type: String }
+    });
+
+    const FooBarModel = model<T>('test', TestSchema);
+
+    const item = await FooBarModel.findOne().lean();
+
+    if (!item) return;
+
+    doSomeThing(item);
+  };
+
+  const doSomeThing = <T extends FooBar>(item: T) => {
+    console.log(item);
+  };
+
+  createSomeModelAndDoSomething();
+}

types/index.d.ts

@@ -710,6 +710,14 @@ declare module 'mongoose' {
     [K in keyof T]: FlattenProperty<T[K]>;
   };
 
+  export type BufferToBinaryProperty<T> = T extends Buffer
+    ? mongodb.Binary
+    : T extends Types.DocumentArray<infer ItemType>
+      ? Types.DocumentArray<BufferToBinary<ItemType>>
+      : T extends Types.Subdocument<unknown, unknown, infer SubdocType>
+        ? HydratedSingleSubdocument<BufferToBinary<SubdocType>>
+        : BufferToBinary<T>;
+
   /**
    * Converts any Buffer properties into mongodb.Binary instances, which is what `lean()` returns
    */
@@ -719,15 +727,11 @@ declare module 'mongoose' {
       ? T
       : T extends TreatAsPrimitives
         ? T
-        : T extends Record<string, any> ? {
-          [K in keyof T]: T[K] extends Buffer
-            ? mongodb.Binary
-            : T[K] extends Types.DocumentArray<infer ItemType>
-              ? Types.DocumentArray<BufferToBinary<ItemType>>
-              : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
-                ? HydratedSingleSubdocument<BufferToBinary<SubdocType>>
-                : BufferToBinary<T[K]>;
-      } : T;
+        : T extends Record<string, any>
+          ? {
+              [K in keyof T]: BufferToBinaryProperty<T[K]>
+            }
+          : T;
 
   /**
    * Converts any Buffer properties into { type: 'buffer', data: [1, 2, 3] } format for JSON serialization

types/models.d.ts

@@ -35,6 +35,7 @@ declare module 'mongoose' {
   interface MongooseBulkSaveOptions extends mongodb.BulkWriteOptions {
     timestamps?: boolean;
     session?: ClientSession;
+    validateBeforeSave?: boolean;
   }
 
   /**

types/query.d.ts

@@ -223,7 +223,7 @@ declare module 'mongoose' {
   type QueryOpThatReturnsDocument = 'find' | 'findOne' | 'findOneAndUpdate' | 'findOneAndReplace' | 'findOneAndDelete';
 
   type GetLeanResultType<RawDocType, ResultType, QueryOp> = QueryOp extends QueryOpThatReturnsDocument
-    ? (ResultType extends any[] ? Default__v<Require_id<BufferToBinary<FlattenMaps<RawDocType>>>>[] : Default__v<Require_id<BufferToBinary<FlattenMaps<RawDocType>>>>)
+    ? (ResultType extends any[] ? Default__v<Require_id<FlattenMaps<BufferToBinary<RawDocType>>>>[] : Default__v<Require_id<FlattenMaps<BufferToBinary<RawDocType>>>>)
     : ResultType;
 
   type MergePopulatePaths<RawDocType, ResultType, QueryOp, Paths, TQueryHelpers, TDocOverrides = Record<string, never>> = QueryOp extends QueryOpThatReturnsDocument