mongoose 6.6.3 → 6.6.4

package/.mocharc.yml

@@ -1,2 +1,4 @@
 reporter: spec # better to identify failing / slow tests than "dot"
 ui: bdd # explicitly setting, even though it is mocha default
+require:
+  - test/mocha-fixtures.js

package/lib/helpers/projection/isPathExcluded.js

@@ -12,6 +12,10 @@ const isDefiningProjection = require('./isDefiningProjection');
  */
 
 module.exports = function isPathExcluded(projection, path) {
+  if (projection == null) {
+    return false;
+  }
+
   if (path === '_id') {
     return projection._id === 0;
   }

package/lib/model.js

@@ -51,11 +51,13 @@ const {
   getRelatedDBIndexes,
   getRelatedSchemaIndexes
 } = require('./helpers/indexes/getRelatedIndexes');
+const isPathExcluded = require('./helpers/projection/isPathExcluded');
 const decorateDiscriminatorIndexOptions = require('./helpers/indexes/decorateDiscriminatorIndexOptions');
 const isPathSelectedInclusive = require('./helpers/projection/isPathSelectedInclusive');
 const leanPopulateMap = require('./helpers/populate/leanPopulateMap');
 const modifiedPaths = require('./helpers/update/modifiedPaths');
 const parallelLimit = require('./helpers/parallelLimit');
+const parentPaths = require('./helpers/path/parentPaths');
 const prepareDiscriminatorPipeline = require('./helpers/aggregate/prepareDiscriminatorPipeline');
 const pushNestedArrayPaths = require('./helpers/model/pushNestedArrayPaths');
 const removeDeselectedForeignField = require('./helpers/populate/removeDeselectedForeignField');
@@ -760,6 +762,19 @@ Model.prototype.$__delta = function() {
       }
     }
 
+    // If this path is set to default, and either this path or one of
+    // its parents is excluded, don't treat this path as dirty.
+    if (this.$isDefault(data.path) && this.$__.selected) {
+      if (data.path.indexOf('.') === -1 && isPathExcluded(this.$__.selected, data.path)) {
+        continue;
+      }
+
+      const pathsToCheck = parentPaths(data.path);
+      if (pathsToCheck.find(path => isPathExcluded(this.$__.isSelected, path))) {
+        continue;
+      }
+    }
+
     if (divergent.length) continue;
     if (value === undefined) {
       operand(this, where, delta, data, 1, '$unset');
@@ -798,6 +813,11 @@ Model.prototype.$__delta = function() {
   if (this.$__.version) {
     this.$__version(where, delta);
   }
+
+  if (Object.keys(delta).length === 0) {
+    return [where, null];
+  }
+
   return [where, delta];
 };
 
@@ -1196,7 +1216,6 @@ Model.exists = function exists(filter, options, callback) {
  */
 
 Model.discriminator = function(name, schema, options) {
-
   let model;
   if (typeof name === 'function') {
     model = name;

package/lib/schema.js

@@ -502,25 +502,21 @@ Schema.prototype.defaultOptions = function(options) {
  *
  * #### Example:
  *
- *     const options = { discriminatorKey: 'kind' };
+ *     const eventSchema = new mongoose.Schema({ timestamp: Date }, { discriminatorKey: 'kind' });
+ *
+ *     const clickedEventSchema = new mongoose.Schema({ element: String }, { discriminatorKey: 'kind' });
+ *     const ClickedModel = eventSchema.discriminator('clicked', clickedEventSchema);
  *
- *     const eventSchema = new mongoose.Schema({ time: Date }, options);
  *     const Event = mongoose.model('Event', eventSchema);
  *
- *     // ClickedLinkEvent is a special type of Event that has
- *     // a URL.
- *     const ClickedLinkEvent = Event.discriminator('ClickedLink',
- *     new mongoose.Schema({ url: String }, options));
+ *     Event.discriminators['clicked']; // Model { clicked }
  *
- *     // When you create a generic event, it can't have a URL field...
- *     const genericEvent = new Event({ time: Date.now(), url: 'google.com' });
- *     assert.ok(!genericEvent.url);
- *     // But a ClickedLinkEvent can
- *     const clickedEvent = new ClickedLinkEvent({ time: Date.now(), url: 'google.com' });
- *     assert.ok(clickedEvent.url);
+ *     const doc = await Event.create({ kind: 'clicked', element: '#hero' });
+ *     doc.element; // '#hero'
+ *     doc instanceof ClickedModel; // true
  *
  * @param {String} name the name of the discriminator
- * @param {Schema} schema the Schema of the discriminated Schema
+ * @param {Schema} schema the discriminated Schema
  * @return {Schema} the Schema instance
  * @api public
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.6.3",
+  "version": "6.6.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -28,9 +28,9 @@
     "sift": "16.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.19.0",
-    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.36.2",
+    "@babel/core": "7.19.3",
+    "@typescript-eslint/eslint-plugin": "5.38.1",
+    "@typescript-eslint/parser": "5.38.1",
     "acquit": "1.2.1",
     "acquit-ignore": "0.2.0",
     "acquit-require": "0.1.1",
@@ -43,13 +43,13 @@
     "cheerio": "1.0.0-rc.12",
     "crypto-browserify": "3.12.0",
     "dox": "1.0.0",
-    "eslint": "8.23.0",
+    "eslint": "8.24.0",
     "eslint-plugin-mocha-no-only": "1.1.1",
     "express": "^4.18.1",
     "highlight.js": "11.6.0",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "marked": "4.1.0",
+    "marked": "4.1.1",
     "mkdirp": "^1.0.4",
     "mocha": "10.0.0",
     "moment": "2.x",
@@ -61,8 +61,8 @@
     "sinon": "14.0.0",
     "stream-browserify": "3.0.0",
     "ts-benchmark": "^1.1.10",
-    "tsd": "0.23.0",
-    "typescript": "4.8.3",
+    "tsd": "0.24.1",
+    "typescript": "4.8.4",
     "uuid": "9.0.0",
     "webpack": "5.74.0"
   },

package/types/models.d.ts

@@ -146,9 +146,9 @@ declare module 'mongoose' {
      * if you use `create()`) because with `bulkWrite()` there is only one network
      * round trip to the MongoDB server.
      */
-    bulkWrite(writes: Array<mongodb.AnyBulkWriteOperation<T extends {} ? T : any>>, options: mongodb.BulkWriteOptions & MongooseBulkWriteOptions, callback: Callback<mongodb.BulkWriteResult>): void;
-    bulkWrite(writes: Array<mongodb.AnyBulkWriteOperation<T extends {} ? T : any>>, callback: Callback<mongodb.BulkWriteResult>): void;
-    bulkWrite(writes: Array<mongodb.AnyBulkWriteOperation<T extends {} ? T : any>>, options?: mongodb.BulkWriteOptions & MongooseBulkWriteOptions): Promise<mongodb.BulkWriteResult>;
+    bulkWrite(writes: Array<mongodb.AnyBulkWriteOperation<T extends Document ? any : (T extends {} ? T : any)>>, options: mongodb.BulkWriteOptions & MongooseBulkWriteOptions, callback: Callback<mongodb.BulkWriteResult>): void;
+    bulkWrite(writes: Array<mongodb.AnyBulkWriteOperation<T extends Document ? any : (T extends {} ? T : any)>>, callback: Callback<mongodb.BulkWriteResult>): void;
+    bulkWrite(writes: Array<mongodb.AnyBulkWriteOperation<T extends Document ? any : (T extends {} ? T : any)>>, options?: mongodb.BulkWriteOptions & MongooseBulkWriteOptions): Promise<mongodb.BulkWriteResult>;
 
     /**
      * Sends multiple `save()` calls in a single `bulkWrite()`. This is faster than

package/types/query.d.ts

@@ -616,7 +616,7 @@ declare module 'mongoose' {
     then: Promise<ResultType>['then'];
 
     /** Converts this query to a customized, reusable query constructor with all arguments and options retained. */
-    toConstructor(): typeof this;
+    toConstructor(): typeof Query<ResultType, DocType, THelpers, RawDocType>;
 
     /** Declare and/or execute this query as an update() operation. */
     update(filter?: FilterQuery<DocType>, update?: UpdateQuery<DocType> | UpdateWithAggregationPipeline, options?: QueryOptions<DocType> | null, callback?: Callback<UpdateWriteOpResult>): QueryWithHelpers<UpdateWriteOpResult, DocType, THelpers, RawDocType>;

package/types/schemaoptions.d.ts

@@ -201,7 +201,7 @@ declare module 'mongoose' {
     /**
      * Query helper functions.
      */
-    query?: Record<any, <T extends QueryWithHelpers<unknown, DocType>>(this: T, ...args: any) => T> | QueryHelpers,
+    query?: Record<any, <T extends QueryWithHelpers<unknown, HydratedDocument<DocType>>>(this: T, ...args: any) => T> | QueryHelpers,
 
     /**
      * Set whether to cast non-array values to arrays.