mongoose 6.2.5 → 6.2.8

package/lib/browserDocument.js

@@ -17,6 +17,7 @@ const isObject = require('./helpers/isObject');
  * Document constructor.
  *
  * @param {Object} obj the values to set
+ * @param {Object} schema
  * @param {Object} [fields] optional object containing the fields which were selected in the query returning this document and any populated paths data
  * @param {Boolean} [skipId] bool, should we auto create an ObjectId _id
  * @inherits NodeJS EventEmitter https://nodejs.org/api/events.html#events_class_events_eventemitter

package/lib/connection.js

@@ -788,10 +788,6 @@ Connection.prototype.openUri = function(uri, options, callback) {
     }
     _this.client = client;
 
-    for (const db of this.otherDbs) {
-      _setClient(db, client, {}, db.name);
-    }
-
     client.setMaxListeners(0);
     client.connect((error) => {
       if (error) {
@@ -800,6 +796,10 @@ Connection.prototype.openUri = function(uri, options, callback) {
 
       _setClient(_this, client, options, dbName);
 
+      for (const db of this.otherDbs) {
+        _setClient(db, client, {}, db.name);
+      }
+
       resolve(_this);
     });
   });

package/lib/cursor/AggregationCursor.js

@@ -26,7 +26,6 @@ const util = require('util');
  * Use [`Aggregate#cursor()`](/docs/api.html#aggregate_Aggregate-cursor) instead.
  *
  * @param {Aggregate} agg
- * @param {Object} options
  * @inherits Readable
  * @event `cursor`: Emitted when the cursor is created
  * @event `error`: Emitted when an error occurred

package/lib/cursor/QueryCursor.js

@@ -472,7 +472,8 @@ function _nextDoc(ctx, doc, pop, callback) {
     });
   }
 
-  ctx.query._completeOne(doc, null, (err, doc) => {
+  const { model, _fields, _userProvidedFields, options } = ctx.query;
+  helpers.createModelAndInit(model, doc, _fields, _userProvidedFields, options, pop, (err, doc) => {
     if (err != null) {
       return callback(err);
     }

package/lib/document.js

@@ -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 {
@@ -2472,7 +2472,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,18 +2483,23 @@ 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;
       }
     }
   }
@@ -2517,6 +2521,16 @@ function _getPathsToValidate(doc) {
       continue;
     }
 
+    // gh-11380: optimization. If the array isn't a document array and there's no validators
+    // on the array type, there's no need to run validation on the individual array elements.
+    if (_pathType &&
+        _pathType.$isMongooseArray &&
+        !_pathType.$isMongooseDocumentArray && // Skip document arrays...
+        !_pathType.$embeddedSchemaType.$isMongooseArray && // and arrays of arrays
+        _pathType.$embeddedSchemaType.validators.length === 0) {
+      continue;
+    }
+
     const val = doc.$__getValue(path);
     _pushNestedArrayPaths(val, paths, path);
   }
@@ -2648,6 +2662,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();

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/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,

package/lib/model.js

@@ -1375,6 +1375,16 @@ Model.createCollection = function createCollection(options, callback) {
   this.schema.options.timeseries;
   if (timeseries != null) {
     options = Object.assign({ timeseries }, options);
+    if (options.expireAfterSeconds != null) {
+      // do nothing
+    } else if (options.expires != null) {
+      utils.expires(options);
+    } else if (this.schema.options.expireAfterSeconds != null) {
+      options.expireAfterSeconds = this.schema.options.expireAfterSeconds;
+    } else if (this.schema.options.expires != null) {
+      options.expires = this.schema.options.expires;
+      utils.expires(options);
+    }
   }
 
   callback = this.$handleCallbackError(callback);
@@ -1875,7 +1885,7 @@ Model.discriminators;
  * ####Note:
  * Only translate arguments of object type anything else is returned raw
  *
- * @param {Object} raw fields/conditions that may contain aliased keys
+ * @param {Object} fields fields/conditions that may contain aliased keys
  * @return {Object} the translated 'pure' fields/conditions
  */
 Model.translateAliases = function translateAliases(fields) {
@@ -2836,11 +2846,11 @@ Model.findByIdAndDelete = function(id, options, callback) {
  *
  * ####Examples:
  *
- *     A.findOneAndReplace(conditions, options, callback) // executes
- *     A.findOneAndReplace(conditions, options)  // return Query
- *     A.findOneAndReplace(conditions, callback) // executes
- *     A.findOneAndReplace(conditions) // returns Query
- *     A.findOneAndReplace()           // returns Query
+ *     A.findOneAndReplace(filter, replacement, options, callback) // executes
+ *     A.findOneAndReplace(filter, replacement, options)  // return Query
+ *     A.findOneAndReplace(filter, replacement, callback) // executes
+ *     A.findOneAndReplace(filter, replacement) // returns Query
+ *     A.findOneAndReplace()                    // returns Query
  *
  * @param {Object} filter Replace the first document that matches this filter
  * @param {Object} [replacement] Replace with this document
@@ -2861,8 +2871,10 @@ Model.findOneAndReplace = function(filter, replacement, options, callback) {
 
   if (arguments.length === 1 && typeof filter === 'function') {
     const msg = 'Model.findOneAndReplace(): First argument must not be a function.\n\n'
-        + '  ' + this.modelName + '.findOneAndReplace(conditions, callback)\n'
-        + '  ' + this.modelName + '.findOneAndReplace(conditions)\n'
+        + '  ' + this.modelName + '.findOneAndReplace(filter, replacement, options, callback)\n'
+        + '  ' + this.modelName + '.findOneAndReplace(filter, replacement, callback)\n'
+        + '  ' + this.modelName + '.findOneAndReplace(filter, replacement)\n'
+        + '  ' + this.modelName + '.findOneAndReplace(filter, callback)\n'
         + '  ' + this.modelName + '.findOneAndReplace()\n';
     throw new TypeError(msg);
   }

package/lib/query.js

@@ -3168,23 +3168,14 @@ Query.prototype._deleteMany = wrapThunk(function(callback) {
  */
 
 function completeOne(model, doc, res, options, fields, userProvidedFields, pop, callback) {
-  const opts = pop ?
-    { populated: pop }
-    : undefined;
-
   if (options.rawResult && doc == null) {
     _init(null);
     return null;
   }
 
-  const casted = helpers.createModel(model, doc, fields, userProvidedFields, options);
-  try {
-    casted.$init(doc, opts, _init);
-  } catch (error) {
-    _init(error);
-  }
+  helpers.createModelAndInit(model, doc, fields, userProvidedFields, options, pop, _init);
 
-  function _init(err) {
+  function _init(err, casted) {
     if (err) {
       return immediate(() => callback(err));
     }

package/lib/queryhelpers.js

@@ -123,6 +123,23 @@ exports.createModel = function createModel(model, doc, fields, userProvidedField
   return new model(undefined, fields, _opts);
 };
 
+/*!
+ * ignore
+ */
+
+exports.createModelAndInit = function createModelAndInit(model, doc, fields, userProvidedFields, options, populatedIds, callback) {
+  const initOpts = populatedIds ?
+    { populated: populatedIds } :
+    undefined;
+
+  const casted = exports.createModel(model, doc, fields, userProvidedFields, options);
+  try {
+    casted.$init(doc, initOpts, callback);
+  } catch (error) {
+    callback(error, casted);
+  }
+};
+
 /*!
  * ignore
  */

package/lib/schema/SubdocumentPath.js

@@ -26,7 +26,7 @@ module.exports = SubdocumentPath;
  * Single nested subdocument SchemaType constructor.
  *
  * @param {Schema} schema
- * @param {String} key
+ * @param {String} path
  * @param {Object} options
  * @inherits SchemaType
  * @api public
@@ -243,6 +243,9 @@ SubdocumentPath.prototype.doValidate = function(value, fn, scope, options) {
   }
 
   if (options && options.skipSchemaValidators) {
+    if (!value) {
+      return fn(null);
+    }
     return value.validate(fn);
   }
 

package/lib/schema/array.js

@@ -32,6 +32,7 @@ const emptyOpts = Object.freeze({});
  * @param {String} key
  * @param {SchemaType} cast
  * @param {Object} options
+ * @param {Object} schemaOptions
  * @inherits SchemaType
  * @api public
  */

package/lib/schema/documentarray.js

@@ -12,6 +12,7 @@ const SchemaDocumentArrayOptions =
 const SchemaType = require('../schematype');
 const discriminator = require('../helpers/model/discriminator');
 const handleIdOption = require('../helpers/schema/handleIdOption');
+const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
 const util = require('util');
 const utils = require('../utils');
 const getConstructor = require('../helpers/discriminator/getConstructor');
@@ -29,6 +30,7 @@ let Subdocument;
  * @param {String} key
  * @param {Schema} schema
  * @param {Object} options
+ * @param {Object} schemaOptions
  * @inherits SchemaArray
  * @api public
  */
@@ -427,13 +429,18 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
     const Constructor = getConstructor(this.casterConstructor, rawArray[i]);
 
     // Check if the document has a different schema (re gh-3701)
-    if (rawArray[i].$__ && !(rawArray[i] instanceof Constructor)) {
-      rawArray[i] = rawArray[i].toObject({
-        transform: false,
-        // Special case: if different model, but same schema, apply virtuals
-        // re: gh-7898
-        virtuals: rawArray[i].schema === Constructor.schema
-      });
+    if (rawArray[i].$__ != null && !(rawArray[i] instanceof Constructor)) {
+      const spreadDoc = handleSpreadDoc(rawArray[i], true);
+      if (rawArray[i] !== spreadDoc) {
+        rawArray[i] = spreadDoc;
+      } else {
+        rawArray[i] = rawArray[i].toObject({
+          transform: false,
+          // Special case: if different model, but same schema, apply virtuals
+          // re: gh-7898
+          virtuals: rawArray[i].schema === Constructor.schema
+        });
+      }
     }
 
     if (rawArray[i] instanceof Subdocument) {

package/lib/schema.js

@@ -329,6 +329,10 @@ Schema.prototype.clone = function() {
   return s;
 };
 
+/*!
+ * ignore
+ */
+
 Schema.prototype._clone = function _clone(Constructor) {
   Constructor = Constructor || (this.base == null ? Schema : this.base.Schema);
 
@@ -961,8 +965,11 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
     if (cast && cast.instanceOfSchema) {
       if (!(cast instanceof Schema)) {
         throw new TypeError('Schema for array path `' + path +
-          '` is from a different copy of the Mongoose module. Please make sure you\'re using the same version ' +
-          'of Mongoose everywhere with `npm list mongoose`.');
+          '` is from a different copy of the Mongoose module. ' +
+          'Please make sure you\'re using the same version ' +
+          'of Mongoose everywhere with `npm list mongoose`. If you are still ' +
+          'getting this error, please add `new Schema()` around the path: ' +
+          `${path}: new Schema(...)`);
       }
       return new MongooseTypes.DocumentArray(path, cast, obj);
     }
@@ -971,8 +978,11 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
         cast[options.typeKey].instanceOfSchema) {
       if (!(cast[options.typeKey] instanceof Schema)) {
         throw new TypeError('Schema for array path `' + path +
-          '` is from a different copy of the Mongoose module. Please make sure you\'re using the same version ' +
-          'of Mongoose everywhere with `npm list mongoose`.');
+          '` is from a different copy of the Mongoose module. ' +
+          'Please make sure you\'re using the same version ' +
+          'of Mongoose everywhere with `npm list mongoose`. If you are still ' +
+          'getting this error, please add `new Schema()` around the path: ' +
+          `${path}: new Schema(...)`);
       }
       return new MongooseTypes.DocumentArray(path, cast[options.typeKey], obj, cast);
     }

package/lib/types/array/methods/index.js

@@ -445,6 +445,7 @@ const methods = {
    * Return whether or not the `obj` is included in the array.
    *
    * @param {Object} obj the item to check
+   * @param {Number} fromIndex
    * @return {Boolean}
    * @api public
    * @method includes
@@ -460,6 +461,7 @@ const methods = {
    * Return the index of `obj` or `-1` if not found.
    *
    * @param {Object} obj the item to look for
+   * @param {Number} fromIndex
    * @return {Number}
    * @api public
    * @method indexOf

package/lib/virtualtype.js

@@ -24,6 +24,7 @@ const utils = require('./utils');
  * @param {Number} [options.skip=null] add a default `skip` to the `populate()` query
  * @param {Number} [options.perDocumentLimit=null] For legacy reasons, `limit` with `populate()` may give incorrect results because it only executes a single query for every document being populated. If you set `perDocumentLimit`, Mongoose will ensure correct `limit` per document by executing a separate query for each document to `populate()`. For example, `.find().populate({ path: 'test', perDocumentLimit: 2 })` will execute 2 additional queries if `.find()` returns 2 documents.
  * @param {Object} [options.options=null] Additional options like `limit` and `lean`.
+ * @param {string} name
  * @api public
  */
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.2.5",
+  "version": "6.2.8",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -35,6 +35,7 @@
     "acquit": "1.x",
     "acquit-ignore": "0.2.x",
     "acquit-require": "0.1.x",
+    "axios": "0.26.1",
     "babel-loader": "8.2.3",
     "benchmark": "2.1.4",
     "bluebird": "3.7.2",
@@ -116,4 +117,4 @@
       "target": "ES2017"
     }
   }
-}
+}