mongoose 6.7.4 → 6.7.5

package/lib/helpers/schema/merge.js

@@ -23,5 +23,6 @@ module.exports = function merge(s1, s2, skipConflictingPaths) {
     s1.virtuals[virtual] = s2.virtuals[virtual].clone();
   }
 
+  s1._indexes = s1._indexes.concat(s2._indexes || []);
   s1.s.hooks.merge(s2.s.hooks, false);
 };

package/lib/queryhelpers.js

@@ -163,6 +163,11 @@ exports.applyPaths = function applyPaths(fields, schema) {
       if (!isDefiningProjection(field)) {
         continue;
       }
+      // `_id: 1, name: 0` is a mixed inclusive/exclusive projection in
+      // MongoDB 4.0 and earlier, but not in later versions.
+      if (keys[keyIndex] === '_id' && keys.length > 1) {
+        continue;
+      }
       exclude = !field;
       break;
     }

package/package.json

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

package/types/index.d.ts

@@ -496,7 +496,12 @@ declare module 'mongoose' {
     $pullAll?: AnyKeys<TSchema> & AnyObject;
 
     /** @see https://docs.mongodb.com/manual/reference/operator/update-bitwise/ */
-    $bit?: Record<string, mongodb.NumericType>;
+    // Needs to be `AnyKeys` for now, because anything stricter makes us incompatible
+    // with the MongoDB Node driver's `UpdateFilter` interface (see gh-12595, gh-11911)
+    // and using the Node driver's `$bit` definition breaks because their `OnlyFieldsOfType`
+    // interface breaks on Mongoose Document class due to circular references.
+    // Re-evaluate this when we drop `extends Document` support in document interfaces.
+    $bit?: AnyKeys<TSchema>;
   };
 
   export type UpdateWithAggregationPipeline = UpdateAggregationStage[];