Merge pull request #11785 from Automattic/gh-11698

Gh-11698, Prevents .$* from being put into projections by avoiding drilling down into maps

lib/queryhelpers.js

@@ -226,7 +226,9 @@ exports.applyPaths = function applyPaths(fields, schema) {
  const addedPaths = [];
  schema.eachPath(function(path, type) {
  if (prefix) path = prefix + '.' + path;
-
+ if (type.$isSchemaMap || path.endsWith('.$*')) {
+ return;
+ }
  let addedPath = analyzePath(path, type);
  // arrays
  if (addedPath == null && !Array.isArray(type) && type.$isMongooseArray && !type.$isMongooseDocumentArray) {
@@ -248,7 +250,6 @@ exports.applyPaths = function applyPaths(fields, schema) {
  }
  }
  });
-
  stack.pop();
  return addedPaths;
  }

test/model.test.js

@@ -8503,6 +8503,24 @@ describe('Model', function() {
  assert.deepEqual(indexes[1].key, { name: 1 });
  assert.strictEqual(indexes[1].collation.locale, 'en');
  });
+ it('prevents .$* from being put in projections by avoiding drilling down into maps (gh-11698)', async function() {
+ const subSchema = new Schema({
+ selected: { type: Number },
+ not_selected: { type: Number, select: false }
+ });
+
+ const testSchema = new Schema({
+ subdocument_mapping: {
+ type: Map,
+ of: subSchema
+ }
+ });
+
+
+ const Test = db.model('Test', testSchema);
+
+ assert.ok(await Test.find());
+ });
 });