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

Author: muazahmed-dev

.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:

docs/layout.pug

@@ -111,6 +111,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) {

package.json

@@ -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"

scripts/website.js

@@ -612,7 +612,7 @@ if (isMain) {
       const config = generateSearch.getConfig();
       generateSearchPromise = generateSearch.generateSearch(config);
     } catch (err) {
-      console.error("Generating Search failed:", err);
+      console.error('Generating Search failed:', err);
     }
     await deleteAllHtmlFiles();
     await pugifyAllFiles();
@@ -621,7 +621,7 @@ if (isMain) {
       await moveDocsToTemp();
     }
 
-    if (!!generateSearchPromise) {
+    if (generateSearchPromise) {
       await generateSearchPromise;
     }
 

test/document.test.js

@@ -1716,13 +1716,13 @@ describe('document', function() {
         }
       }));
       const doc = new Model({ name: 'test', profile: { age: 29 } });
-      assert.deepEqual(names, [null]);
-      assert.deepEqual(profiles, [null]);
+      assert.deepEqual(names, [undefined]);
+      assert.deepEqual(profiles, [undefined]);
 
       doc.name = 'test2';
       doc.profile = { age: 30 };
-      assert.deepEqual(names, [null, 'test']);
-      assert.deepEqual(profiles, [null, { age: 29 }]);
+      assert.deepEqual(names, [undefined, 'test']);
+      assert.deepEqual(profiles, [undefined, { age: 29 }]);
     });
 
     describe('on nested paths', function() {

test/helpers/update.castArrayFilters.test.js

@@ -349,4 +349,52 @@ describe('castArrayFilters', function() {
 
     assert.strictEqual(q.getUpdate().$set['groups.$[group].tags.$[tag]'], '42');
   });
+
+  it('casts paths underneath embedded discriminators (gh-15386)', async function() {
+    const eventSchema = new Schema({ message: String }, { discriminatorKey: 'kind', _id: false });
+    const batchSchema = new Schema({ events: [eventSchema] });
+
+    const docArray = batchSchema.path('events');
+    docArray.discriminator('Clicked', new Schema({ element: { type: String, required: true } }, { _id: false }));
+
+    const productSchema = new Schema({
+      name: String,
+      price: Number
+    });
+
+    docArray.discriminator(
+      'Purchased',
+      new Schema({
+        products: {
+          type: [productSchema],
+          required: true
+        }
+      })
+    );
+
+    const q = new Query();
+    q.schema = batchSchema;
+
+    const filter = {};
+    const update = {
+      $set: {
+        'events.$[event].products.$[product].price': '20'
+      }
+    };
+    const purchasedId = new Types.ObjectId();
+    const productId = new Types.ObjectId();
+    const opts = {
+      arrayFilters: [
+        { 'event._id': purchasedId, 'event.kind': 'Purchased' },
+        { 'product._id': productId.toString() }
+      ]
+    };
+
+    q.updateOne(filter, update, opts);
+    castArrayFilters(q);
+    q._update = q._castUpdate(q._update, false);
+
+    assert.strictEqual(q.getOptions().arrayFilters[1]['product._id'].toHexString(), productId.toHexString());
+    assert.strictEqual(q.getUpdate().$set['events.$[event].products.$[product].price'], 20);
+  });
 });