Merge branch 'master' into gh-pages

Author: vkarpov15

.eslintrc.js

@@ -7,7 +7,6 @@ module.exports = {
   ignorePatterns: [
     'tools',
     'dist',
-    'website.js',
     'test/files/*',
     'benchmarks',
     '*.min.js',

.github/workflows/documentation.yml

@@ -10,7 +10,7 @@ on:
       - 'website.js'
       - 'CHANGELOG.md'
   push:
-    branches:ubuntu
+    branches:
       - master
     paths:
       - '.github/workflows/documentation.yml'

.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18, 20, 22]
+        node: [16, 18, 20, 22, 24]
         os: [ubuntu-22.04, ubuntu-24.04]
         mongodb: [6.0.15, 7.0.12, 8.0.0]
         include:
@@ -87,11 +87,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
-<<<<<<< HEAD
           node-version: 22
-=======
-          node-version: 20
->>>>>>> 7.x
       - name: Load MongoDB binary cache
         id: cache-mongodb-binaries
         uses: actions/cache@v4
@@ -119,11 +115,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
-<<<<<<< HEAD
           node-version: 22
-=======
-          node-version: 20
->>>>>>> 7.x
       - run: npm install
       - name: Test
         run: npm run test-rs

.gitignore

@@ -59,6 +59,9 @@ package-lock.json
 # yarn package-lock
 yarn.lock
 
+# deno lock
+deno.lock
+
 # npm pack output
 mongoose.tgz
 mongoose-*.tgz

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
 ===================

docs/layout.pug

@@ -114,6 +114,8 @@ html(lang='en')
                           a.pure-menu-link(href=`${versions.versionedPath}/docs/typescript/query-helpers.html`, class=outputUrl === `${versions.versionedPath}/docs/typescript/query-helpers.html` ? 'selected' : '') Query Helpers
                         li.pure-menu-item.sub-item
                           a.pure-menu-link(href=`${versions.versionedPath}/docs/typescript/populate.html`, class=outputUrl === `${versions.versionedPath}/docs/typescript/populate.html` ? 'selected' : '') Populate
+                        li.pure-menu-item.sub-item
+                          a.pure-menu-link(href=`${versions.versionedPath}/docs/typescript/virtuals.html`, class=outputUrl === `${versions.versionedPath}/docs/typescript/virtuals.html` ? 'selected' : '') Virtuals
                         li.pure-menu-item.sub-item
                           a.pure-menu-link(href=`${versions.versionedPath}/docs/typescript/subdocuments.html`, class=outputUrl === `${versions.versionedPath}/docs/typescript/subdocuments.html` ? 'selected' : '') Subdocuments
               li.pure-menu-item

docs/typescript/virtuals.md

@@ -72,9 +72,9 @@ interface UserVirtuals {
   fullName: string;
 }
 
-type UserModel = Model<UserDoc, {}, UserVirtuals>; // <-- add virtuals here...
+type UserModel = Model<UserDoc, {}, {}, UserVirtuals>; // <-- add virtuals here...
 
-const schema = new Schema<UserDoc, UserModel, UserVirtuals>({ // <-- and here
+const schema = new Schema<UserDoc, UserModel, {}, {}, UserVirtuals>({ // <-- and here
   firstName: String,
   lastName: String
 });

lib/helpers/query/getEmbeddedDiscriminatorPath.js

@@ -17,7 +17,7 @@ const updatedPathsByArrayFilter = require('../update/updatedPathsByArrayFilter')
  */
 
 module.exports = function getEmbeddedDiscriminatorPath(schema, update, filter, path, options) {
-  const parts = path.split('.');
+  const parts = path.indexOf('.') === -1 ? [path] : path.split('.');
   let schematype = null;
   let type = 'adhocOrUndefined';
 
@@ -26,9 +26,10 @@ module.exports = function getEmbeddedDiscriminatorPath(schema, update, filter, p
   const arrayFilters = options != null && Array.isArray(options.arrayFilters) ?
     options.arrayFilters : [];
   const updatedPathsByFilter = updatedPathsByArrayFilter(update);
+  let startIndex = 0;
 
   for (let i = 0; i < parts.length; ++i) {
-    const originalSubpath = parts.slice(0, i + 1).join('.');
+    const originalSubpath = parts.slice(startIndex, i + 1).join('.');
     const subpath = cleanPositionalOperators(originalSubpath);
     schematype = schema.path(subpath);
     if (schematype == null) {
@@ -89,6 +90,8 @@ module.exports = function getEmbeddedDiscriminatorPath(schema, update, filter, p
 
       const rest = parts.slice(i + 1).join('.');
       schematype = discriminatorSchema.path(rest);
+      schema = discriminatorSchema;
+      startIndex = i + 1;
       if (schematype != null) {
         type = discriminatorSchema._getPathType(rest);
         break;

lib/helpers/schema/getPath.js

@@ -8,7 +8,7 @@ const numberRE = /^\d+$/;
  * @api private
  */
 
-module.exports = function getPath(schema, path) {
+module.exports = function getPath(schema, path, discriminatorValueMap) {
   let schematype = schema.path(path);
   if (schematype != null) {
     return schematype;
@@ -26,10 +26,13 @@ module.exports = function getPath(schema, path) {
     schematype = schema.path(cur);
     if (schematype != null && schematype.schema) {
       schema = schematype.schema;
-      cur = '';
       if (!isArray && schematype.$isMongooseDocumentArray) {
         isArray = true;
       }
+      if (discriminatorValueMap && discriminatorValueMap[cur]) {
+        schema = schema.discriminators[discriminatorValueMap[cur]] ?? schema;
+      }
+      cur = '';
     }
   }
 

lib/helpers/update/castArrayFilters.js

@@ -33,6 +33,10 @@ function _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilt
     return;
   }
 
+  // Map to store discriminator values for embedded documents in the array filters.
+  // This is used to handle cases where array filters target specific embedded document types.
+  const discriminatorValueMap = {};
+
   for (const filter of arrayFilters) {
     if (filter == null) {
       throw new Error(`Got null array filter in ${arrayFilters}`);
@@ -58,12 +62,13 @@ function _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilt
       updatedPathsByFilter[filterWildcardPath]
     );
 
-    const baseSchematype = getPath(schema, baseFilterPath);
+    const baseSchematype = getPath(schema, baseFilterPath, discriminatorValueMap);
     let filterBaseSchema = baseSchematype != null ? baseSchematype.schema : null;
     if (filterBaseSchema != null &&
         filterBaseSchema.discriminators != null &&
         filter[filterWildcardPath + '.' + filterBaseSchema.options.discriminatorKey]) {
       filterBaseSchema = filterBaseSchema.discriminators[filter[filterWildcardPath + '.' + filterBaseSchema.options.discriminatorKey]] || filterBaseSchema;
+      discriminatorValueMap[baseFilterPath] = filter[filterWildcardPath + '.' + filterBaseSchema.options.discriminatorKey];
     }
 
     for (const key of keys) {
@@ -83,7 +88,7 @@ function _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilt
         // If there are multiple array filters in the path being updated, make sure
         // to replace them so we can get the schema path.
         filterPathRelativeToBase = cleanPositionalOperators(filterPathRelativeToBase);
-        schematype = getPath(filterBaseSchema, filterPathRelativeToBase);
+        schematype = getPath(filterBaseSchema, filterPathRelativeToBase, discriminatorValueMap);
       }
 
       if (schematype == null) {

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 <[email protected]>",
   "keywords": [
     "mongodb",
@@ -29,8 +29,8 @@
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@babel/core": "7.26.10",
-    "@babel/preset-env": "7.26.9",
+    "@babel/core": "7.27.1",
+    "@babel/preset-env": "7.27.1",
     "@typescript-eslint/eslint-plugin": "^8.19.1",
     "@typescript-eslint/parser": "^8.19.1",
     "acquit": "1.3.0",
@@ -53,9 +53,9 @@
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
     "markdownlint-cli2": "^0.17.1",
-    "marked": "15.0.7",
+    "marked": "15.0.11",
     "mkdirp": "^3.0.1",
-    "mocha": "11.1.0",
+    "mocha": "11.2.2",
     "moment": "2.30.1",
     "mongodb-memory-server": "10.1.4",
     "ncp": "^2.0.0",
@@ -64,10 +64,10 @@
     "q": "1.5.1",
     "sinon": "20.0.0",
     "stream-browserify": "3.0.0",
-    "tsd": "0.31.2",
-    "typescript": "5.7.3",
+    "tsd": "0.32.0",
+    "typescript": "5.8.3",
     "uuid": "11.1.0",
-    "webpack": "5.98.0"
+    "webpack": "5.99.7"
   },
   "directories": {
     "lib": "./lib/mongoose"
@@ -101,7 +101,7 @@
     "mongo": "node ./tools/repl.js",
     "publish-7x": "npm publish --tag 7x",
     "test": "mocha --exit ./test/*.test.js",
-    "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.js",
+    "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.mjs",
     "test-rs": "START_REPLICA_SET=1 mocha --timeout 30000 --exit ./test/*.test.js",
     "test-tsd": "node ./test/types/check-types-filename && tsd",
     "setup-test-encryption": "bash scripts/configure-cluster-with-encryption.sh",