mongoose 9.10.3 → 9.11.0

package/lib/helpers/indexes/isIndexEqual.js

@@ -2,6 +2,9 @@
 
 const get = require('../get');
 const utils = require('../../utils');
+
+const simpleCollation = Object.freeze({ locale: 'simple' });
+
 /**
  * Given a Mongoose index definition (key + options objects) and a MongoDB server
  * index definition, determine if the two indexes are equal.
@@ -61,14 +64,13 @@ module.exports = function isIndexEqual(schemaIndexKeysObject, options, dbIndex)
       continue;
     }
     if (key === 'collation') {
-      if (options[key] == null || dbIndex[key] == null) {
-        return options[key] == null && dbIndex[key] == null;
-      }
-      const definedKeys = Object.keys(options.collation);
-      const schemaCollation = options.collation;
-      const dbCollation = dbIndex.collation;
-      for (const opt of definedKeys) {
-        if (get(schemaCollation, opt) !== get(dbCollation, opt)) {
+      // No collation is equivalent to { locale: 'simple' }. MongoDB server 9
+      // reports { locale: 'simple' } for indexes created with no collation,
+      // older versions omit it.
+      const schemaCollation = options.collation ?? simpleCollation;
+      const dbCollation = dbIndex.collation ?? simpleCollation;
+      for (const opt of Object.keys(schemaCollation)) {
+        if (schemaCollation[opt] !== dbCollation[opt]) {
           return false;
         }
       }

package/lib/helpers/query/cast$expr.js

@@ -97,7 +97,15 @@ function _castExpression(val, schema, strictQuery) {
     val.$ifNull.map(v => _castExpression(v, schema, strictQuery));
   } else if (val.$switch != null) {
     if (Array.isArray(val.$switch.branches)) {
-      val.$switch.branches = val.$switch.branches.map(v => _castExpression(v, schema, strictQuery));
+      for (const branch of val.$switch.branches) {
+        if (branch?.case != null) {
+          branch.case = _castExpression(branch.case, schema, strictQuery);
+        }
+        if (branch?.then != null) {
+          branch.then = _castExpression(branch.then, schema, strictQuery);
+        }
+        omitUndefined(branch);
+      }
     }
     if ('default' in val.$switch) {
       val.$switch.default = _castExpression(val.$switch.default, schema, strictQuery);

package/lib/model.js

@@ -4769,7 +4769,10 @@ async function _populatePath(model, docs, populateOptions) {
       // Get the assigned (filtered) children from parent docs
       const childDocsToPopulate = [];
       for (const doc of mod.docs) {
-        const childVal = doc.$__ != null ? doc.get(mod.options.path) : doc[mod.options.path];
+        // `utils.getValue()` rather than a bracket lookup, because `mod.options.path` may be
+        // a dotted path like 'children.child', which a lean result does not store as a
+        // single key.
+        const childVal = doc.$__ != null ? doc.get(mod.options.path) : utils.getValue(mod.options.path, doc);
         if (Array.isArray(childVal)) {
           childDocsToPopulate.push(...childVal);
         } else if (childVal != null) {

package/lib/query.js

@@ -2563,6 +2563,35 @@ Query.prototype.find = function(conditions) {
   return this;
 };
 
+/**
+ * Executes the query as a `find()` and also runs a `countDocuments()` query
+ * on the same filter, returning `[documents, count]`. The count ignores
+ * `skip` and `limit` so that it returns the total number of matching documents.
+ *
+ * #### Example:
+ *
+ *     const query = Adventure.find({ type: 'animal' }).sort({ name: 1 }).limit(10);
+ *     const [adventures, total] = await query.findAndCount();
+ *
+ * @return {Promise<Array>} a promise that resolves to `[documents, total]`
+ * @api public
+ */
+
+Query.prototype.findAndCount = async function findAndCount() {
+  if (this.options.sort == null) {
+    throw new MongooseError('Query.prototype.findAndCount() requires sort. Use `sort()` to set a sort order before calling `findAndCount()`.');
+  }
+  if (this.options.limit == null) {
+    throw new MongooseError('Query.prototype.findAndCount() requires limit. Use `limit()` to set a limit before calling `findAndCount()`.');
+  }
+
+  this.op = 'find';
+
+  const countQuery = this.clone().countDocuments().skip(0).limit(null);
+
+  return Promise.all([this.exec(), countQuery.exec()]);
+};
+
 /**
  * Merges another Query or conditions object into this one.
  *

package/lib/schema/documentArray.js

@@ -65,7 +65,6 @@ function SchemaDocumentArray(key, schema, options, schemaOptions, parentSchema)
     $parentSchemaType,
     Constructor
   });
-
   SchemaArray.call(this, key, embeddedSchemaType, options, null, parentSchema);
 
   this.schema = schema;
@@ -234,8 +233,16 @@ SchemaDocumentArray.prototype.doValidate = async function doValidate(array, scop
   // lazy load
   MongooseDocumentArray || (MongooseDocumentArray = require('../types/documentArray'));
 
-  await SchemaType.prototype.doValidate.call(this, array, scope);
+  let schemaTypeError;
+  try {
+    await SchemaType.prototype.doValidate.call(this, array, scope);
+  } catch (err) {
+    schemaTypeError = err;
+  }
   if (options?.updateValidator) {
+    if (schemaTypeError != null) {
+      throw schemaTypeError;
+    }
     return;
   }
   if (!utils.isMongooseDocumentArray(array)) {
@@ -258,14 +265,29 @@ SchemaDocumentArray.prototype.doValidate = async function doValidate(array, scop
       doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
     }
 
-    if (options?.validateModifiedOnly && !doc.$isModified()) {
+    if (options?.validateModifiedOnly && !doc.$isNew && !doc.$isModified()) {
       continue;
     }
 
-    promises.push(doc.validate(null, options));
+    const subdocOptions = doc.$isNew && options?.validateModifiedOnly ?
+      { ...options, validateModifiedOnly: false } :
+      options;
+    promises.push(doc.validate(null, subdocOptions));
   }
 
-  await Promise.all(promises);
+  let subdocumentError;
+  try {
+    await Promise.all(promises);
+  } catch (err) {
+    subdocumentError = err;
+  }
+
+  if (schemaTypeError != null) {
+    throw schemaTypeError;
+  }
+  if (subdocumentError != null) {
+    throw subdocumentError;
+  }
 };
 
 /**
@@ -281,15 +303,11 @@ SchemaDocumentArray.prototype.doValidate = async function doValidate(array, scop
 
 SchemaDocumentArray.prototype.doValidateSync = function(array, scope, options) {
   const schemaTypeError = SchemaType.prototype.doValidateSync.call(this, array, scope);
-  if (schemaTypeError != null) {
-    return schemaTypeError;
-  }
-
   const count = array?.length;
-  let resultError = null;
+  let resultError = schemaTypeError;
 
   if (!count) {
-    return;
+    return resultError;
   }
 
   // handle sparse arrays, do not use array.forEach which does not
@@ -310,11 +328,14 @@ SchemaDocumentArray.prototype.doValidateSync = function(array, scope, options) {
       doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
     }
 
-    if (options?.validateModifiedOnly && !doc.$isModified()) {
+    if (options?.validateModifiedOnly && !doc.$isNew && !doc.$isModified()) {
       continue;
     }
 
-    const subdocValidateError = doc.$__validateSync(options);
+    const subdocOptions = doc.$isNew && options?.validateModifiedOnly ?
+      { ...options, validateModifiedOnly: false } :
+      options;
+    const subdocValidateError = doc.$__validateSync(subdocOptions);
 
     if (subdocValidateError && resultError == null) {
       resultError = subdocValidateError;

package/lib/schema/documentArrayElement.js

@@ -108,9 +108,41 @@ SchemaDocumentArrayElement.prototype.doValidate = async function doValidate(valu
     value = new Constructor(value, scope, null, null, options?.index ?? null);
   }
 
+  // The parent document array validates each of its subdocuments, so when it
+  // already did, this element's own validators are all that is left to run.
+  if (options?.skipSubdocumentValidation) {
+    if (options.skipSchemaValidators) {
+      return;
+    }
+    return SchemaType.prototype.doValidate.call(this, value, scope, options);
+  }
+
   return SchemaSubdocument.prototype.doValidate.call(this, value, scope, options);
 };
 
+/**
+ * Synchronous validation on this individual array element
+ *
+ * @api private
+ */
+
+SchemaDocumentArrayElement.prototype.doValidateSync = function doValidateSync(value, scope, options) {
+  const Constructor = getConstructor(this.Constructor, value);
+
+  if (value && !(value instanceof Constructor)) {
+    value = new Constructor(value, scope, null, null, options?.index ?? null);
+  }
+
+  if (options?.skipSubdocumentValidation) {
+    if (options.skipSchemaValidators) {
+      return;
+    }
+    return SchemaType.prototype.doValidateSync.call(this, value, scope, options);
+  }
+
+  return SchemaSubdocument.prototype.doValidateSync.call(this, value, scope, options);
+};
+
 /**
  * Clone the current SchemaType
  *

package/lib/types/array/methods/index.js

@@ -544,11 +544,13 @@ const methods = {
     if (isBsonType(obj, 'ObjectId')) {
       obj = obj.toString();
     }
+    // Compare dates by timestamp like `addToSet()` does, so `pull()` works on date arrays
+    const isDate = obj instanceof Date;
 
     fromIndex = fromIndex == null ? 0 : fromIndex;
     const len = this.length;
     for (let i = fromIndex; i < len; ++i) {
-      if (obj == this[i]) {
+      if (obj == this[i] || (isDate && this[i] instanceof Date && +obj === +this[i])) {
         return i;
       }
     }

package/lib/types/map.js

@@ -4,6 +4,7 @@ const Mixed = require('../schema/mixed');
 const MongooseError = require('../error/mongooseError');
 const clone = require('../helpers/clone');
 const deepEqual = require('../utils').deepEqual;
+const isMongooseArray = require('../utils').isMongooseArray;
 const getConstructorName = require('../helpers/getConstructorName');
 const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
 const util = require('util');
@@ -160,6 +161,11 @@ class MongooseMap extends Map {
     if (parent?.$__ != null && !deepEqual(value, priorVal)) {
       const path = fullPath.call(this);
       parent.markModified(path);
+      // Replacing the whole array means later push(), pull() or addToSet() calls must not be sent as
+      // atomics against the array that was in the database, same as Document#$set re: gh-1126
+      if (isMongooseArray(value)) {
+        value._registerAtomic('$set', value);
+      }
       // If overwriting the full document array or subdoc, make sure to clean up any paths that were modified
       // before re: #15108
       if (this.$__schemaType.$isMongooseDocumentArray || this.$__schemaType.$isSingleNested) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "9.10.3",
+  "version": "9.11.0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -22,16 +22,16 @@
   "dependencies": {
     "@standard-schema/spec": "^1.1.0",
     "kareem": "3.4.0",
-    "mongodb": "~7.6",
+    "mongodb": "~7.7",
     "mpath": "0.9.0",
     "mquery": "6.0.0",
     "ms": "2.1.3",
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@ark/attest": "0.56.3",
+    "@ark/attest": "0.56.5",
     "@eslint/js": "^9.39.3",
-    "@mongodb-js/mongodb-downloader": "^1.0.0",
+    "@mongodb-js/mongodb-downloader": "^2.0.2",
     "@types/node": "^20.19.0",
     "acquit": "1.4.0",
     "acquit-ignore": "0.2.2",
@@ -40,7 +40,7 @@
     "c8": "12.0.0",
     "cheerio": "1.2.0",
     "dox": "1.0.0",
-    "eslint": "10.9.1",
+    "eslint": "10.11.0",
     "eslint-plugin-mocha-no-only": "1.2.0",
     "express": "5.2.1",
     "fs-extra": "~11.4.0",
@@ -50,13 +50,13 @@
     "linkinator": "8.x",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "markdownlint-cli2": "0.23.2",
-    "marked": "18.0.11",
+    "markdownlint-cli2": "0.23.3",
+    "marked": "18.0.14",
     "mkdirp": "^3.0.1",
-    "mocha": "12.0.0-rc.6",
-    "moment": "2.30.1",
+    "mocha": "12.0.2",
+    "moment": "2.31.0",
     "mongodb-client-encryption": "^7.2.0",
-    "mongodb-memory-server": "11.2.0",
+    "mongodb-memory-server": "11.3.0",
     "mongodb-runner": "^6.0.0",
     "ncp": "^2.0.0",
     "pug": "3.0.4",

package/tstyche.matrix.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://tstyche.org/schemas/config.json",
+  "checkDeclarationFiles": false,
+  "checkSuppressedErrors": false,
+  "testFileMatch": [
+    "test/types/*.test.*",
+    "test/types/**/*.test.*"
+  ]
+}

package/types/connection.d.ts

@@ -203,7 +203,7 @@ declare module 'mongoose' {
           ObtainSchemaGeneric<TSchema, 'TSchemaOptions'>
         >,
       TSchema,
-      ObtainSchemaGeneric<TSchema, 'TLeanResultType'>
+      Default__v<Require_id<ObtainSchemaGeneric<TSchema, 'TLeanResultType'>>>
     > & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
     model<T, U, TQueryHelpers = {}>(
       name: string,

package/types/document.d.ts

@@ -141,7 +141,9 @@ declare module 'mongoose' {
       this,
       TQueryHelpers,
       DocType,
-      'deleteOne'
+      'deleteOne',
+      Record<string, never>,
+      Default__v<Require_id<DocType>>
     >;
 
     /**

package/types/index.d.ts

@@ -104,7 +104,7 @@ declare module 'mongoose' {
         ObtainSchemaGeneric<TSchema, 'TSchemaOptions'>
       >,
     TSchema,
-    ObtainSchemaGeneric<TSchema, 'TLeanResultType'>
+    Default__v<Require_id<ObtainSchemaGeneric<TSchema, 'TLeanResultType'>>>
   > & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
 
   export function model<T>(name: string, schema?: Schema<T, any, any> | Schema<T & Document, any, any>, collection?: string, options?: CompileModelOptions): Model<T>;

package/types/models.d.ts

@@ -228,7 +228,7 @@ declare module 'mongoose' {
     TVirtuals = {},
     THydratedDocumentType = HydratedDocument<TRawDocType, TVirtuals & TInstanceMethods, TQueryHelpers, TVirtuals>,
     TSchema = any,
-    TLeanResultType = TRawDocType> extends
+    TLeanResultType = Default__v<Require_id<TRawDocType>>> extends
     NodeJS.EventEmitter,
     IndexManager,
     SessionStarter {
@@ -455,7 +455,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOne',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findById<ResultDoc = THydratedDocumentType>(
       id: any,
@@ -505,7 +506,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOne',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOne<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -517,7 +519,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOne',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOne<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -529,7 +532,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOne',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOne<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -541,7 +545,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOne',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOne<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
@@ -850,7 +855,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'find',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     find<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -862,7 +868,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'find',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     find<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -874,7 +881,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'find',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     find<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -886,14 +894,15 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'find',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     find<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
       projection: ProjectionType<TRawDocType> | null | undefined,
       options: QueryOptions<TRawDocType> & { lean: true } & mongodb.Abortable
     ): QueryWithHelpers<
-      GetLeanResultType<TRawDocType, TRawDocType[], 'find'>,
+      GetLeanResultType<TLeanResultType, TRawDocType[], 'find'>,
       ResultDoc,
       TQueryHelpers,
       TLeanResultType,
@@ -905,7 +914,7 @@ declare module 'mongoose' {
       projection: ProjectionType<TRawDocType> | null | undefined,
       options: QueryOptions<TRawDocType> & { lean: true } & mongodb.Abortable
     ): QueryWithHelpers<
-      GetLeanResultType<TRawDocType, TRawDocType[], 'find'>,
+      GetLeanResultType<TLeanResultType, TRawDocType[], 'find'>,
       THydratedDocumentType,
       TQueryHelpers,
       TLeanResultType,
@@ -959,7 +968,7 @@ declare module 'mongoose' {
       filter: QueryFilter<TRawDocType>,
       projection: ProjectionType<TRawDocType> | null | undefined,
       options: QueryOptions<TRawDocType> & { sort: any; limit: number; lean: true } & mongodb.Abortable
-    ): Promise<[GetLeanResultType<TRawDocType, TRawDocType[], 'find'>, number]>;
+    ): Promise<[GetLeanResultType<TLeanResultType, TRawDocType[], 'find'>, number]>;
     findAndCount<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
       projection: ProjectionType<TRawDocType> | null | undefined,
@@ -981,7 +990,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndDelete',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findByIdAndDelete<const Projection extends ProjectionType<TRawDocType>>(
       id: mongodb.ObjectId | any,
@@ -992,7 +1002,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndDelete',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findByIdAndDelete<ResultDoc = THydratedDocumentType>(
       id: mongodb.ObjectId | any,
@@ -1062,7 +1073,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndUpdate',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findByIdAndUpdate<const Projection extends ProjectionType<TRawDocType>>(
       id: mongodb.ObjectId | any,
@@ -1074,7 +1086,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndUpdate',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findByIdAndUpdate<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
@@ -1171,7 +1184,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndDelete',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndDelete<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1182,7 +1196,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndDelete',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndDelete<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1193,7 +1208,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndDelete',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndDelete<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1204,7 +1220,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndDelete',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndDelete<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
@@ -1306,7 +1323,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndReplace',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndReplace<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1318,7 +1336,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndReplace',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndReplace<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1330,7 +1349,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndReplace',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndReplace<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1342,7 +1362,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndReplace',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndReplace<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
@@ -1476,7 +1497,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndUpdate',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndUpdate<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1488,7 +1510,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndUpdate',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndUpdate<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1500,7 +1523,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndUpdate',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndUpdate<const Projection extends ProjectionType<TRawDocType>>(
       filter: QueryFilter<TRawDocType>,
@@ -1512,7 +1536,8 @@ declare module 'mongoose' {
       TQueryHelpers,
       TLeanResultType,
       'findOneAndUpdate',
-      TInstanceMethods & TVirtuals
+      TInstanceMethods & TVirtuals,
+      ApplyProjection<TLeanResultType, Projection>
     >;
     findOneAndUpdate<ResultDoc = THydratedDocumentType>(
       filter: QueryFilter<TRawDocType>,
@@ -1543,7 +1568,7 @@ declare module 'mongoose' {
       update: UpdateQuery<TRawDocType>,
       options: QueryOptions<TRawDocType> & { lean: true }
     ): QueryWithHelpers<
-      GetLeanResultType<TRawDocType, TRawDocType, 'findOneAndUpdate'> | null,
+      GetLeanResultType<TLeanResultType, TRawDocType, 'findOneAndUpdate'> | null,
       ResultDoc,
       TQueryHelpers,
       TLeanResultType,
@@ -1555,7 +1580,7 @@ declare module 'mongoose' {
       update: UpdateQuery<TRawDocType>,
       options: QueryOptions<TRawDocType> & { lean: true }
     ): QueryWithHelpers<
-      GetLeanResultType<TRawDocType, TRawDocType, 'findOneAndUpdate'> | null,
+      GetLeanResultType<TLeanResultType, TRawDocType, 'findOneAndUpdate'> | null,
       THydratedDocumentType,
       TQueryHelpers,
       TLeanResultType,