mongoose 6.2.7 → 6.2.10

package/lib/document.js

@@ -156,9 +156,9 @@ function Document(obj, fields, skipId, options) {
   if (obj) {
     // Skip set hooks
     if (this.$__original_set) {
-      this.$__original_set(obj, undefined, true);
+      this.$__original_set(obj, undefined, true, options);
     } else {
-      this.$set(obj, undefined, true);
+      this.$set(obj, undefined, true, options);
     }
 
     if (obj instanceof Document) {
@@ -268,7 +268,7 @@ Document.prototype.schema;
  * is handy for passing data to middleware without conflicting with Mongoose
  * internals.
  *
- * ####Example:
+ * #### Example:
  *
  *     schema.pre('save', function() {
  *       // Mongoose will set `isNew` to `false` if `save()` succeeds
@@ -326,7 +326,7 @@ Document.prototype.isNew;
 /**
  * Set this property to add additional query filters when Mongoose saves this document and `isNew` is false.
  *
- * ####Example:
+ * #### Example:
  *
  *     // Make sure `save()` never updates a soft deleted document.
  *     schema.pre('save', function() {
@@ -348,7 +348,7 @@ Object.defineProperty(Document.prototype, '$where', {
 /**
  * The string version of this documents _id.
  *
- * ####Note:
+ * #### Note:
  *
  * This getter exists on all documents by default. The getter can be disabled by setting the `id` [option](/docs/guide.html#id) of its `Schema` to false at construction time.
  *
@@ -389,7 +389,7 @@ Document.prototype.errors;
  * A string containing the current operation that Mongoose is executing
  * on this document. May be `null`, `'save'`, `'validate'`, or `'remove'`.
  *
- * ####Example:
+ * #### Example:
  *
  *     const doc = new Model({ name: 'test' });
  *     doc.$op; // null
@@ -801,7 +801,7 @@ function init(self, obj, doc, opts, prefix) {
       init(self, obj[i], doc[i], opts, path + '.');
     } else if (!schemaType) {
       doc[i] = obj[i];
-      if (!strict) {
+      if (!strict && !prefix) {
         self[i] = obj[i];
       }
     } else {
@@ -841,11 +841,11 @@ function init(self, obj, doc, opts, prefix) {
 /**
  * Sends an update command with this document `_id` as the query selector.
  *
- * ####Example:
+ * #### Example:
  *
  *     weirdCar.update({$inc: {wheels:1}}, { w: 1 }, callback);
  *
- * ####Valid options:
+ * #### Valid options:
  *
  *  - same as in [Model.update](#model_Model.update)
  *
@@ -876,11 +876,11 @@ Document.prototype.update = function update() {
 /**
  * Sends an updateOne command with this document `_id` as the query selector.
  *
- * ####Example:
+ * #### Example:
  *
  *     weirdCar.updateOne({$inc: {wheels:1}}, { w: 1 }, callback);
  *
- * ####Valid options:
+ * #### Valid options:
  *
  *  - same as in [Model.updateOne](#model_Model.updateOne)
  *
@@ -922,7 +922,7 @@ Document.prototype.updateOne = function updateOne(doc, options, callback) {
 /**
  * Sends a replaceOne command with this document `_id` as the query selector.
  *
- * ####Valid options:
+ * #### Valid options:
  *
  *  - same as in [Model.replaceOne](https://mongoosejs.com/docs/api/model.html#model_Model.replaceOne)
  *
@@ -947,7 +947,7 @@ Document.prototype.replaceOne = function replaceOne() {
  * automatically set `session` if you `save()` a doc that you got from a
  * query with an associated session.
  *
- * ####Example:
+ * #### Example:
  *
  *     const session = MyModel.startSession();
  *     const doc = await MyModel.findOne().session(session);
@@ -1514,7 +1514,7 @@ function _isManuallyPopulatedArray(val, ref) {
 /**
  * Sets the value of a path, or many paths.
  *
- * ####Example:
+ * #### Example:
  *
  *     // path, value
  *     doc.set(path, value)
@@ -1718,7 +1718,7 @@ Document.prototype.$__setValue = function(path, val) {
 /**
  * Returns the value of a path.
  *
- * ####Example
+ * #### Example
  *
  *     // path
  *     doc.get('age') // 47
@@ -1824,7 +1824,7 @@ Document.prototype.$__path = function(path) {
  *
  * _Very helpful when using [Mixed](https://mongoosejs.com/docs/schematypes.html#mixed) types._
  *
- * ####Example:
+ * #### Example:
  *
  *     doc.mixed.type = 'changed';
  *     doc.markModified('mixed.type');
@@ -1836,6 +1836,7 @@ Document.prototype.$__path = function(path) {
  */
 
 Document.prototype.markModified = function(path, scope) {
+  // console.log('MarkModified', path, new Error().stack);
   this.$__.activePaths.modify(path);
   if (scope != null && !this.$isSubdocument) {
     this.$__.pathsToScopes = this.$__pathsToScopes || {};
@@ -1846,7 +1847,7 @@ Document.prototype.markModified = function(path, scope) {
 /**
  * Clears the modified state on the specified path.
  *
- * ####Example:
+ * #### Example:
  *
  *     doc.foo = 'bar';
  *     doc.unmarkModified('foo');
@@ -1866,7 +1867,7 @@ Document.prototype.unmarkModified = function(path) {
 /**
  * Don't run validation on this path or persist changes to this path.
  *
- * ####Example:
+ * #### Example:
  *
  *     doc.foo = null;
  *     doc.$ignore('foo');
@@ -1891,7 +1892,7 @@ Document.prototype.$ignore = function(path) {
  * A path `a` may be in `modifiedPaths()` but not in `directModifiedPaths()`
  * because a child of `a` was directly modified.
  *
- * ####Example
+ * #### Example
  *     const schema = new Schema({ foo: String, nested: { bar: String } });
  *     const Model = mongoose.model('Test', schema);
  *     await Model.create({ foo: 'original', nested: { bar: 'original' } });
@@ -1914,7 +1915,7 @@ Document.prototype.directModifiedPaths = function() {
  * Useful for determining whether this subdoc will get stripped out by the
  * [minimize option](/docs/guide.html#minimize).
  *
- * ####Example:
+ * #### Example:
  *     const schema = new Schema({ nested: { foo: String } });
  *     const Model = mongoose.model('Test', schema);
  *     const doc = new Model({});
@@ -2047,7 +2048,7 @@ Document.prototype[documentModifiedPaths] = Document.prototype.modifiedPaths;
  *
  * If `path` is given, checks if a path or any full path containing `path` as part of its path chain has been modified.
  *
- * ####Example
+ * #### Example
  *
  *     doc.set('documents.0.title', 'changed');
  *     doc.isModified()                      // true
@@ -2093,7 +2094,7 @@ Document.prototype[documentIsModified] = Document.prototype.isModified;
 /**
  * Checks if a path is set to its default.
  *
- * ####Example
+ * #### Example
  *
  *     MyModel = mongoose.model('test', { name: { type: String, default: 'Val '} });
  *     const m = new MyModel();
@@ -2127,7 +2128,7 @@ Document.prototype.$isDefault = function(path) {
 /**
  * Getter/setter, determines whether the document was removed or not.
  *
- * ####Example:
+ * #### Example:
  *     const product = await product.remove();
  *     product.$isDeleted(); // true
  *     product.remove(); // no-op, doesn't send anything to the db
@@ -2157,7 +2158,7 @@ Document.prototype.$isDeleted = function(val) {
 /**
  * Returns true if `path` was directly set and modified, else false.
  *
- * ####Example
+ * #### Example
  *
  *     doc.set('documents.0.title', 'changed');
  *     doc.isDirectModified('documents.0.title') // true
@@ -2213,7 +2214,7 @@ Document.prototype.isInit = function(path) {
 /**
  * Checks if `path` was selected in the source query which initialized this document.
  *
- * ####Example
+ * #### Example
  *
  *     const doc = await Thing.findOne().select('name');
  *     doc.isSelected('name') // true
@@ -2294,7 +2295,7 @@ Document.prototype.$__isSelected = Document.prototype.isSelected;
  * Checks if `path` was explicitly selected. If no projection, always returns
  * true.
  *
- * ####Example
+ * #### Example
  *
  *     Thing.findOne().select('nested.name').exec(function (err, doc) {
  *        doc.isDirectSelected('nested.name') // true
@@ -2356,11 +2357,11 @@ Document.prototype.isDirectSelected = function isDirectSelected(path) {
 /**
  * Executes registered validation rules for this document.
  *
- * ####Note:
+ * #### Note:
  *
  * This method is called `pre` save and if a validation rule is violated, [save](#model_Model-save) is aborted and the error is returned to your `callback`.
  *
- * ####Example:
+ * #### Example:
  *
  *     doc.validate(function (err) {
  *       if (err) handleError(err);
@@ -2422,6 +2423,7 @@ Document.prototype.validate = function(pathsToValidate, options, callback) {
 
     this.$__validate(pathsToValidate, options, (error) => {
       this.$op = null;
+      this.$__.validating = null;
       cb(error);
     });
   }, this.constructor.events);
@@ -2472,7 +2474,6 @@ function _getPathsToValidate(doc) {
     return true;
   }));
 
-
   Object.keys(doc.$__.activePaths.states.init).forEach(addToPaths);
   Object.keys(doc.$__.activePaths.states.modify).forEach(addToPaths);
   Object.keys(doc.$__.activePaths.states.default).forEach(addToPaths);
@@ -2484,28 +2485,53 @@ function _getPathsToValidate(doc) {
     if (subdoc.$basePath) {
       // Remove child paths for now, because we'll be validating the whole
       // subdoc
+      if (!subdoc.$__.fullPath) {
+        subdoc.ownerDocument();
+      }
+      const fullPathToSubdoc = subdoc.$__.fullPath;
+
       for (const p of paths) {
-        if (p === null || p.startsWith(subdoc.$basePath + '.')) {
+        if (p === null || p.startsWith(fullPathToSubdoc + '.')) {
           paths.delete(p);
         }
       }
 
-      if (doc.$isModified(subdoc.$basePath, modifiedPaths) &&
-            !doc.isDirectModified(subdoc.$basePath) &&
-            !doc.$isDefault(subdoc.$basePath)) {
-        paths.add(subdoc.$basePath);
+      if (doc.$isModified(fullPathToSubdoc, modifiedPaths) &&
+            !doc.isDirectModified(fullPathToSubdoc) &&
+            !doc.$isDefault(fullPathToSubdoc)) {
+        paths.add(fullPathToSubdoc);
 
-        skipSchemaValidators[subdoc.$basePath] = true;
+        skipSchemaValidators[fullPathToSubdoc] = true;
       }
     }
   }
 
+  for (const path of paths) {
+    const _pathType = doc.$__schema.path(path);
+    if (!_pathType) {
+      continue;
+    }
+
+    // Optimization: if primitive path with no validators, or array of primitives
+    // with no validators, skip validating this path entirely.
+    if (!_pathType.caster && _pathType.validators.length === 0) {
+      paths.delete(path);
+    } else if (_pathType.$isMongooseArray &&
+      !_pathType.$isMongooseDocumentArray && // Skip document arrays...
+      !_pathType.$embeddedSchemaType.$isMongooseArray && // and arrays of arrays
+      _pathType.validators.length === 0 && // and arrays with top-level validators
+      _pathType.$embeddedSchemaType.validators.length === 0) {
+      paths.delete(path);
+    }
+  }
+
   // from here on we're not removing items from paths
 
   // gh-661: if a whole array is modified, make sure to run validation on all
   // the children as well
   for (const path of paths) {
     const _pathType = doc.$__schema.path(path);
+
     if (!_pathType ||
         !_pathType.$isMongooseArray ||
         // To avoid potential performance issues, skip doc arrays whose children
@@ -2612,7 +2638,8 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
   const _this = this;
   const _complete = () => {
     let validationError = this.$__.validationError;
-    this.$__.validationError = undefined;
+    this.$__.validationError = null;
+    this.$__.validating = null;
 
     if (shouldValidateModifiedOnly && validationError != null) {
       // Remove any validation errors that aren't from modified paths
@@ -2658,6 +2685,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
   } else if (pathsToSkip) {
     paths = _handlePathsToSkip(paths, pathsToSkip);
   }
+
   if (paths.length === 0) {
     return immediate(function() {
       const error = _complete();
@@ -2798,11 +2826,11 @@ function _handlePathsToSkip(paths, pathsToSkip) {
 /**
  * Executes registered validation rules (skipping asynchronous validators) for this document.
  *
- * ####Note:
+ * #### Note:
  *
  * This method is useful if you need synchronous validation.
  *
- * ####Example:
+ * #### Example:
  *
  *     const err = doc.validateSync();
  *     if (err) {
@@ -3037,7 +3065,7 @@ function _checkImmutableSubpaths(subdoc, schematype, priorVal) {
  * Saves this document by inserting a new document into the database if [document.isNew](/docs/api.html#document_Document-isNew) is `true`,
  * or sends an [updateOne](/docs/api.html#document_Document-updateOne) operation **only** with the modifications to the database, it does not replace the whole document in the latter case.
  *
- * ####Example:
+ * #### Example:
  *
  *     product.sold = Date.now();
  *     product = await product.save();
@@ -3045,7 +3073,7 @@ function _checkImmutableSubpaths(subdoc, schematype, priorVal) {
  * If save is successful, the returned promise will fulfill with the document
  * saved.
  *
- * ####Example:
+ * #### Example:
  *
  *     const newProduct = await product.save();
  *     newProduct === product; // true
@@ -3573,7 +3601,7 @@ Document.prototype.$toObject = function(options, json) {
  *
  * Buffers are converted to instances of [mongodb.Binary](https://mongodb.github.com/node-mongodb-native/api-bson-generated/binary.html) for proper storage.
  *
- * ####Options:
+ * #### Options:
  *
  * - `getters` apply all getters (path and virtual getters), defaults to false
  * - `aliases` apply all aliases if `virtuals=true`, defaults to true
@@ -3585,7 +3613,7 @@ Document.prototype.$toObject = function(options, json) {
  * - `flattenMaps` convert Maps to POJOs. Useful if you want to JSON.stringify() the result of toObject(), defaults to false
  * - `useProjection` set to `true` to omit fields that are excluded in this document's projection. Unless you specified a projection, this will omit any field that has `select: false` in the schema.
  *
- * ####Getters/Virtuals
+ * #### Getters/Virtuals
  *
  * Example of only applying path getters
  *
@@ -3603,7 +3631,7 @@ Document.prototype.$toObject = function(options, json) {
  *
  *     schema.set('toObject', { virtuals: true })
  *
- * ####Transform
+ * #### Transform
  *
  * We may need to perform a transformation of the resulting object based on some criteria, say to remove some sensitive information or return a custom object. In this case we set the optional `transform` function.
  *
@@ -3615,7 +3643,7 @@ Document.prototype.$toObject = function(options, json) {
  * - `ret` The plain object representation which has been converted
  * - `options` The options in use (either schema options or the options passed inline)
  *
- * ####Example
+ * #### Example
  *
  *     // specify the transform schema option
  *     if (!schema.options.toObject) schema.options.toObject = {};
@@ -4109,7 +4137,7 @@ Document.prototype.equals = function(doc) {
 /**
  * Populates paths on an existing document.
  *
- * ####Example:
+ * #### Example:
  *
  *     await doc.populate([
  *       'stories',
@@ -4226,7 +4254,7 @@ Document.prototype.$getPopulatedDocs = function $getPopulatedDocs() {
 /**
  * Gets _id(s) used during population of the given `path`.
  *
- * ####Example:
+ * #### Example:
  *
  *     Model.findOne().populate('author').exec(function (err, doc) {
  *       console.log(doc.author.name)         // Dr.Seuss
@@ -4288,7 +4316,7 @@ Document.prototype.$populated = Document.prototype.populated;
 /**
  * Takes a populated field and returns it to its unpopulated state.
  *
- * ####Example:
+ * #### Example:
  *
  *     Model.findOne().populate('author').exec(function (err, doc) {
  *       console.log(doc.author.name); // Dr.Seuss

package/lib/error/index.js

@@ -4,7 +4,7 @@
  * MongooseError constructor. MongooseError is the base class for all
  * Mongoose-specific errors.
  *
- * ####Example:
+ * #### Example:
  *     const Model = mongoose.model('Test', new Schema({ answer: Number }));
  *     const doc = new Model({ answer: 'not a number' });
  *     const err = doc.validateSync();
@@ -105,7 +105,7 @@ MongooseError.ValidationError = require('./validation');
  * A `ValidationError` has a hash of `errors` that contain individual
  * `ValidatorError` instances.
  *
- * ####Example:
+ * #### Example:
  *
  *     const schema = Schema({ name: { type: String, required: true } });
  *     const Model = mongoose.model('Test', schema);

package/lib/helpers/document/handleSpreadDoc.js

@@ -2,14 +2,32 @@
 
 const utils = require('../../utils');
 
+const keysToSkip = new Set(['__index', '__parentArray', '_doc']);
+
 /**
  * Using spread operator on a Mongoose document gives you a
  * POJO that has a tendency to cause infinite recursion. So
  * we use this function on `set()` to prevent that.
  */
 
-module.exports = function handleSpreadDoc(v) {
+module.exports = function handleSpreadDoc(v, includeExtraKeys) {
   if (utils.isPOJO(v) && v.$__ != null && v._doc != null) {
+    if (includeExtraKeys) {
+      const extraKeys = {};
+      for (const key of Object.keys(v)) {
+        if (typeof key === 'symbol') {
+          continue;
+        }
+        if (key[0] === '$') {
+          continue;
+        }
+        if (keysToSkip.has(key)) {
+          continue;
+        }
+        extraKeys[key] = v[key];
+      }
+      return { ...v._doc, ...extraKeys };
+    }
     return v._doc;
   }
 

package/lib/helpers/populate/markArraySubdocsPopulated.js

@@ -6,7 +6,7 @@ const utils = require('../../utils');
  * If populating a path within a document array, make sure each
  * subdoc within the array knows its subpaths are populated.
  *
- * ####Example:
+ * #### Example:
  *     const doc = await Article.findOne().populate('comments.author');
  *     doc.comments[0].populated('author'); // Should be set
  */

package/lib/helpers/projection/hasIncludedChildren.js

@@ -4,7 +4,7 @@
  * Creates an object that precomputes whether a given path has child fields in
  * the projection.
  *
- * ####Example:
+ * #### Example:
  *     const res = hasIncludedChildren({ 'a.b.c': 0 });
  *     res.a; // 1
  *     res['a.b']; // 1

package/lib/helpers/query/castFilterPath.js

@@ -41,7 +41,6 @@ module.exports = function castFilterPath(query, schematype, val) {
         }
         continue;
       }
-      // cast(schematype.caster ? schematype.caster.schema : schema, nested, options, context);
     } else {
       val[$cond] = schematype.castForQueryWrapper({
         $conditional: $cond,