Merge branch 'Automattic:master' into fix-findOneAndUpdate-empty-filter

Author: muazahmed-dev

CHANGELOG.md

@@ -1,7 +1,14 @@
+8.14.2 / 2025-05-08
+===================
+ * fix(query): handle casting array filter paths underneath array filter paths with embedded discriminators #15388 #15386
+ * docs(typescript): correct schema and model generic params in TS virtuals docs #15391
+ * docs+types(schema): add alternative optimisticConcurrency syntaxes to docs + types #15405 #10591
+ * chore: add Node 24 to CI matrix #15408 [stscoundrel](https://github.com/stscoundrel)
+
 7.8.7 / 2025-04-30
 ==================
- *  types(aggregate): allow calling project() with a string #15304 #15300
- *  docs: update deleteOne & deleteMany API def #15360 [Elliot67](https://github.com/Elliot67) [SethFalco](https://github.com/SethFalco)
+ * types(aggregate): allow calling project() with a string #15304 #15300
+ * docs: update deleteOne & deleteMany API def #15360 [Elliot67](https://github.com/Elliot67) [SethFalco](https://github.com/SethFalco)
 
 8.14.1 / 2025-04-29
 ===================

lib/schema.js

@@ -77,7 +77,7 @@ const numberRE = /^\d+$/;
  * - [validateBeforeSave](https://mongoosejs.com/docs/guide.html#validateBeforeSave) - bool - defaults to `true`
  * - [validateModifiedOnly](https://mongoosejs.com/docs/api/document.html#Document.prototype.validate()) - bool - defaults to `false`
  * - [versionKey](https://mongoosejs.com/docs/guide.html#versionKey): string or object - defaults to "__v"
- * - [optimisticConcurrency](https://mongoosejs.com/docs/guide.html#optimisticConcurrency): bool - defaults to false. Set to true to enable [optimistic concurrency](https://thecodebarbarian.com/whats-new-in-mongoose-5-10-optimistic-concurrency.html).
+ * - [optimisticConcurrency](https://mongoosejs.com/docs/guide.html#optimisticConcurrency): bool or string[] or { exclude: string[] } - defaults to false. Set to true to enable [optimistic concurrency](https://thecodebarbarian.com/whats-new-in-mongoose-5-10-optimistic-concurrency.html). Set to string array to enable optimistic concurrency for only certain fields, or `{ exclude: string[] }` to define a list of fields to ignore for optimistic concurrency.
  * - [collation](https://mongoosejs.com/docs/guide.html#collation): object - defaults to null (which means use no collation)
  * - [timeseries](https://mongoosejs.com/docs/guide.html#timeseries): object - defaults to null (which means this schema's collection won't be a timeseries collection)
  * - [selectPopulatedPaths](https://mongoosejs.com/docs/guide.html#selectPopulatedPaths): boolean - defaults to `true`

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.14.1",
+  "version": "8.14.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

test/types/schema.test.ts

@@ -22,7 +22,8 @@ import {
   Query,
   model,
   ValidateOpts,
-  BufferToBinary
+  BufferToBinary,
+  CallbackWithoutResultAndOptionalError
 } from 'mongoose';
 import { Binary } from 'mongodb';
 import { IsPathRequired } from '../../types/inferschematype';
@@ -1778,6 +1779,22 @@ function gh15301() {
   });
 }
 
+function gh15412() {
+  const ScheduleEntrySchema = new Schema({
+    startDate: { type: Date, required: true },
+    endDate: { type: Date, required: false }
+  });
+  const ScheduleEntry = model('ScheduleEntry', ScheduleEntrySchema);
+
+  type ScheduleEntryDoc = ReturnType<typeof ScheduleEntry['hydrate']>
+
+  ScheduleEntrySchema.post('init', function(this: ScheduleEntryDoc, _res: any, next: CallbackWithoutResultAndOptionalError) {
+    expectType<Date>(this.startDate);
+    expectType<Date | null | undefined>(this.endDate);
+    next();
+  });
+}
+
 function defaultReturnsUndefined() {
   const schema = new Schema<{ arr: number[] }>({
     arr: {

types/index.d.ts

@@ -387,6 +387,8 @@ declare module 'mongoose' {
     post<T = THydratedDocumentType>(method: MongooseDistinctDocumentMiddleware|MongooseDistinctDocumentMiddleware[], fn: PostMiddlewareFunction<T, T>): this;
     post<T = THydratedDocumentType>(method: MongooseDistinctDocumentMiddleware|MongooseDistinctDocumentMiddleware[], options: SchemaPostOptions & SchemaPostOptions, fn: PostMiddlewareFunction<T, T>): this;
     post<T = THydratedDocumentType>(method: MongooseQueryOrDocumentMiddleware | MongooseQueryOrDocumentMiddleware[] | RegExp, options: SchemaPostOptions & { document: true, query: false }, fn: PostMiddlewareFunction<T, T>): this;
+    post<T = THydratedDocumentType>(method: 'init', fn: PostMiddlewareFunction<T, T>): this;
+
     // this = Query
     post<T = Query<any, any>>(method: MongooseRawResultQueryMiddleware|MongooseRawResultQueryMiddleware[], fn: PostMiddlewareFunction<T, null | QueryResultType<T> | ModifyResult<QueryResultType<T>>>): this;
     post<T = Query<any, any>>(method: MongooseDefaultQueryMiddleware|MongooseDefaultQueryMiddleware[], fn: PostMiddlewareFunction<T, QueryResultType<T>>): this;

types/schemaoptions.d.ts

@@ -107,9 +107,10 @@ declare module 'mongoose' {
     /**
      * Optimistic concurrency is a strategy to ensure the document you're updating didn't change between when you
      * loaded it using find() or findOne(), and when you update it using save(). Set to `true` to enable
-     * optimistic concurrency.
+     * optimistic concurrency. Set to string array to enable optimistic concurrency for only certain fields,
+     * or `{ exclude: string[] }` to define a list of fields to ignore for optimistic concurrency.
      */
-    optimisticConcurrency?: boolean;
+    optimisticConcurrency?: boolean | string[] | { exclude: string[] };
     /**
      * If `plugin()` called with tags, Mongoose will only apply plugins to schemas that have
      * a matching tag in `pluginTags`

types/types.d.ts

@@ -70,7 +70,7 @@ declare module 'mongoose' {
       create(obj: any): THydratedDocumentType;
 
       /** Searches array items for the first document with a matching _id. */
-      id(id: any): THydratedDocumentType | null;
+      id(id: ObjectId | string | number | Buffer): THydratedDocumentType | null;
 
       push(...args: (AnyKeys<T> & AnyObject)[]): number;