mongoose 5.13.2 → 5.13.6

package/lib/helpers/document/compile.js

@@ -188,13 +188,7 @@ function getOwnPropertyDescriptors(object) {
   const result = {};
 
   Object.getOwnPropertyNames(object).forEach(function(key) {
-    result[key] = Object.getOwnPropertyDescriptor(object, key);
-    // Assume these are schema paths, ignore them re: #5470
-    if (result[key].get) {
-      delete result[key];
-      return;
-    }
-    result[key].enumerable = [
+    const skip = [
       'isNew',
       '$__',
       'errors',
@@ -205,6 +199,12 @@ function getOwnPropertyDescriptors(object) {
       '__index',
       '$isDocumentArrayElement'
     ].indexOf(key) === -1;
+    if (skip) {
+      return;
+    }
+
+    result[key] = Object.getOwnPropertyDescriptor(object, key);
+    result[key].enumerable = false;
   });
 
   return result;

package/lib/helpers/getConstructorName.js

@@ -0,0 +1,15 @@
+'use strict';
+
+/*!
+ * If `val` is an object, returns constructor name, if possible. Otherwise returns undefined.
+ */
+
+module.exports = function getConstructorName(val) {
+  if (val == null) {
+    return void 0;
+  }
+  if (typeof val.constructor !== 'function') {
+    return void 0;
+  }
+  return val.constructor.name;
+};

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -5,6 +5,7 @@ const SkipPopulateValue = require('./SkipPopulateValue');
 const get = require('../get');
 const getDiscriminatorByValue = require('../discriminator/getDiscriminatorByValue');
 const isPathExcluded = require('../projection/isPathExcluded');
+const getConstructorName = require('../getConstructorName');
 const getSchemaTypes = require('./getSchemaTypes');
 const getVirtual = require('./getVirtual');
 const lookupLocalFields = require('./lookupLocalFields');
@@ -520,8 +521,7 @@ function convertTo_id(val, schema) {
 
   // `populate('map')` may be an object if populating on a doc that hasn't
   // been hydrated yet
-  if (val != null &&
-      val.constructor.name === 'Object' &&
+  if (getConstructorName(val) === 'Object' &&
       // The intent here is we should only flatten the object if we expect
       // to get a Map in the end. Avoid doing this for mixed types.
       (schema == null || schema[schemaMixedSymbol] == null)) {

package/lib/helpers/query/castUpdate.js

@@ -6,6 +6,7 @@ const StrictModeError = require('../../error/strict');
 const ValidationError = require('../../error/validation');
 const castNumber = require('../../cast/number');
 const cast = require('../../cast');
+const getConstructorName = require('../getConstructorName');
 const getEmbeddedDiscriminatorPath = require('./getEmbeddedDiscriminatorPath');
 const handleImmutable = require('./handleImmutable');
 const moveImmutableProperties = require('../update/moveImmutableProperties');
@@ -200,7 +201,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
       }
     }
 
-    if (val && val.constructor.name === 'Object') {
+    if (getConstructorName(val) === 'Object') {
       // watch for embedded doc schemas
       schematype = schema._getSchema(prefix + key);
 

package/lib/helpers/topology/allServersUnknown.js

@@ -1,8 +1,9 @@
 'use strict';
 
+const getConstructorName = require('../getConstructorName');
+
 module.exports = function allServersUnknown(topologyDescription) {
-  if (topologyDescription == null ||
-      topologyDescription.constructor.name !== 'TopologyDescription') {
+  if (getConstructorName(topologyDescription) !== 'TopologyDescription') {
     return false;
   }
 

package/lib/helpers/topology/isAtlas.js

@@ -1,8 +1,9 @@
 'use strict';
 
+const getConstructorName = require('../getConstructorName');
+
 module.exports = function isAtlas(topologyDescription) {
-  if (topologyDescription == null ||
-    topologyDescription.constructor.name !== 'TopologyDescription') {
+  if (getConstructorName(topologyDescription) !== 'TopologyDescription') {
     return false;
   }
 

package/lib/helpers/topology/isSSLError.js

@@ -1,11 +1,12 @@
 'use strict';
 
+const getConstructorName = require('../getConstructorName');
+
 const nonSSLMessage = 'Client network socket disconnected before secure TLS ' +
   'connection was established';
 
 module.exports = function isSSLError(topologyDescription) {
-  if (topologyDescription == null ||
-    topologyDescription.constructor.name !== 'TopologyDescription') {
+  if (getConstructorName(topologyDescription) !== 'TopologyDescription') {
     return false;
   }
 

package/lib/helpers/update/applyTimestampsToChildren.js

@@ -19,34 +19,10 @@ function applyTimestampsToChildren(now, update, schema) {
 
   if (hasDollarKey) {
     if (update.$push) {
-      for (const key of Object.keys(update.$push)) {
-        const $path = schema.path(key);
-        if (update.$push[key] &&
-            $path &&
-            $path.$isMongooseDocumentArray &&
-            $path.schema.options.timestamps) {
-          const timestamps = $path.schema.options.timestamps;
-          const createdAt = handleTimestampOption(timestamps, 'createdAt');
-          const updatedAt = handleTimestampOption(timestamps, 'updatedAt');
-          if (update.$push[key].$each) {
-            update.$push[key].$each.forEach(function(subdoc) {
-              if (updatedAt != null) {
-                subdoc[updatedAt] = now;
-              }
-              if (createdAt != null) {
-                subdoc[createdAt] = now;
-              }
-            });
-          } else {
-            if (updatedAt != null) {
-              update.$push[key][updatedAt] = now;
-            }
-            if (createdAt != null) {
-              update.$push[key][createdAt] = now;
-            }
-          }
-        }
-      }
+      _applyTimestampToUpdateOperator(update.$push);
+    }
+    if (update.$addToSet) {
+      _applyTimestampToUpdateOperator(update.$addToSet);
     }
     if (update.$set != null) {
       const keys = Object.keys(update.$set);
@@ -54,12 +30,49 @@ function applyTimestampsToChildren(now, update, schema) {
         applyTimestampsToUpdateKey(schema, key, update.$set, now);
       }
     }
+    if (update.$setOnInsert != null) {
+      const keys = Object.keys(update.$setOnInsert);
+      for (const key of keys) {
+        applyTimestampsToUpdateKey(schema, key, update.$setOnInsert, now);
+      }
+    }
   }
 
   const updateKeys = Object.keys(update).filter(key => !key.startsWith('$'));
   for (const key of updateKeys) {
     applyTimestampsToUpdateKey(schema, key, update, now);
   }
+
+  function _applyTimestampToUpdateOperator(op) {
+    for (const key of Object.keys(op)) {
+      const $path = schema.path(key.replace(/\.\$\./i, '.').replace(/.\$$/, ''));
+      if (op[key] &&
+          $path &&
+          $path.$isMongooseDocumentArray &&
+          $path.schema.options.timestamps) {
+        const timestamps = $path.schema.options.timestamps;
+        const createdAt = handleTimestampOption(timestamps, 'createdAt');
+        const updatedAt = handleTimestampOption(timestamps, 'updatedAt');
+        if (op[key].$each) {
+          op[key].$each.forEach(function(subdoc) {
+            if (updatedAt != null) {
+              subdoc[updatedAt] = now;
+            }
+            if (createdAt != null) {
+              subdoc[createdAt] = now;
+            }
+          });
+        } else {
+          if (updatedAt != null) {
+            op[key][updatedAt] = now;
+          }
+          if (createdAt != null) {
+            op[key][createdAt] = now;
+          }
+        }
+      }
+    }
+  }
 }
 
 function applyTimestampsToDocumentArray(arr, schematype, now) {

package/lib/index.js

@@ -317,7 +317,7 @@ Mongoose.prototype.createConnection = function(uri, options, callback) {
  * @param {String} uri(s)
  * @param {Object} [options] passed down to the [MongoDB driver's `connect()` function](http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html), except for 4 mongoose-specific options explained below.
  * @param {Boolean} [options.bufferCommands=true] Mongoose specific option. Set to false to [disable buffering](http://mongoosejs.com/docs/faq.html#callback_never_executes) on all models associated with this connection.
- * @param {Number} [options.bufferTimeoutMS=true] Mongoose specific option. If `bufferCommands` is true, Mongoose will throw an error after `bufferTimeoutMS` if the operation is still buffered.
+ * @param {Number} [options.bufferTimeoutMS=10000] Mongoose specific option. If `bufferCommands` is true, Mongoose will throw an error after `bufferTimeoutMS` if the operation is still buffered.
  * @param {String} [options.dbName] The name of the database we want to use. If not provided, use database name from connection string.
  * @param {String} [options.user] username for authentication, equivalent to `options.auth.user`. Maintained for backwards compatibility.
  * @param {String} [options.pass] password for authentication, equivalent to `options.auth.password`. Maintained for backwards compatibility.

package/lib/model.js

@@ -35,6 +35,7 @@ const getDefaultBulkwriteResult = require('./helpers/getDefaultBulkwriteResult')
 const discriminator = require('./helpers/model/discriminator');
 const each = require('./helpers/each');
 const get = require('./helpers/get');
+const getConstructorName = require('./helpers/getConstructorName');
 const getDiscriminatorByValue = require('./helpers/discriminator/getDiscriminatorByValue');
 const getModelsMapForPopulate = require('./helpers/populate/getModelsMapForPopulate');
 const immediate = require('./helpers/immediate');
@@ -3113,8 +3114,7 @@ Model.create = function create(doc, options, callback) {
         args[0] != null &&
         args[1] != null &&
         args[0].session == null &&
-        last.session != null &&
-        last.session.constructor.name === 'ClientSession' &&
+        getConstructorName(last.session) === 'ClientSession' &&
         !this.schema.path('session')) {
       // Probably means the user is running into the common mistake of trying
       // to use a spread to specify options, see gh-7535
@@ -3728,25 +3728,34 @@ Model.buildBulkWriteOperations = function buildBulkWriteOperations(documents, op
       }
     }
 
+    const isANewDocument = document.isNew;
+    if (isANewDocument) {
+      accumulator.push({
+        insertOne: { document }
+      });
+
+      return accumulator;
+    }
+
     const delta = document.$__delta();
-    const where = document.$__where(delta[0]);
-    const changes = delta[1];
+    const isDocumentWithChanges = delta != null && !utils.isEmptyObject(delta[0]);
 
-    _applyCustomWhere(document, where);
+    if (isDocumentWithChanges) {
+      const where = document.$__where(delta[0]);
+      const changes = delta[1];
 
-    document.$__version(where, delta);
+      _applyCustomWhere(document, where);
+
+      document.$__version(where, delta);
 
-    if (document.isNew) {
-      accumulator.push({
-        insertOne: { document }
-      });
-    } else if (!utils.isEmptyObject(changes)) {
       accumulator.push({
         updateOne: {
           filter: where,
           update: changes
         }
       });
+
+      return accumulator;
     }
 
     return accumulator;

package/lib/query.js

@@ -5128,7 +5128,7 @@ Query.prototype.maxscan = Query.base.maxScan;
 Query.prototype.tailable = function(val, opts) {
   // we need to support the tailable({ awaitdata : true }) as well as the
   // tailable(true, {awaitdata :true}) syntax that mquery does not support
-  if (val && val.constructor.name === 'Object') {
+  if (val != null && typeof val.constructor === 'function' && val.constructor.name === 'Object') {
     opts = val;
     val = true;
   }
@@ -5485,11 +5485,11 @@ Query.prototype.center = Query.base.circle;
  */
 
 Query.prototype.centerSphere = function() {
-  if (arguments[0] && arguments[0].constructor.name === 'Object') {
+  if (arguments[0] != null && typeof arguments[0].constructor === 'function' && arguments[0].constructor.name === 'Object') {
     arguments[0].spherical = true;
   }
 
-  if (arguments[1] && arguments[1].constructor.name === 'Object') {
+  if (arguments[1] != null && typeof arguments[1].constructor === 'function' && arguments[1].constructor.name === 'Object') {
     arguments[1].spherical = true;
   }
 

package/lib/schema/array.js

@@ -451,7 +451,7 @@ SchemaArray.prototype._castForPopulate = function _castForPopulate(value, doc) {
  */
 
 SchemaArray.prototype.discriminator = function(name, schema) {
-  let arr = this; // eslint-disable-line consistent-this
+  let arr = this;
   while (arr.$isMongooseArray && !arr.$isMongooseDocumentArray) {
     arr = arr.casterConstructor;
     if (arr == null || typeof arr === 'function') {

package/lib/schema/date.js

@@ -8,6 +8,7 @@ const MongooseError = require('../error/index');
 const SchemaDateOptions = require('../options/SchemaDateOptions');
 const SchemaType = require('../schematype');
 const castDate = require('../cast/date');
+const getConstructorName = require('../helpers/getConstructorName');
 const utils = require('../utils');
 
 const CastError = SchemaType.CastError;
@@ -147,7 +148,7 @@ SchemaDate._defaultCaster = v => {
  */
 
 SchemaDate.prototype.expires = function(when) {
-  if (!this._index || this._index.constructor.name !== 'Object') {
+  if (getConstructorName(this._index) !== 'Object') {
     this._index = {};
   }
 

package/lib/schema/objectid.js

@@ -7,6 +7,7 @@
 const SchemaObjectIdOptions = require('../options/SchemaObjectIdOptions');
 const SchemaType = require('../schematype');
 const castObjectId = require('../cast/objectid');
+const getConstructorName = require('../helpers/getConstructorName');
 const oid = require('../types/objectid');
 const utils = require('../utils');
 
@@ -225,7 +226,7 @@ ObjectId.prototype.cast = function(value, doc, init) {
     // wait! we may need to cast this to a document
     if (value instanceof oid) {
       return value;
-    } else if (value != null && (value.constructor.name || '').toLowerCase() === 'objectid') {
+    } else if ((getConstructorName(value) || '').toLowerCase() === 'objectid') {
       return new oid(value.toHexString());
     }
 

package/lib/schema.js

@@ -14,6 +14,7 @@ const VirtualType = require('./virtualtype');
 const addAutoId = require('./helpers/schema/addAutoId');
 const arrayParentSymbol = require('./helpers/symbols').arrayParentSymbol;
 const get = require('./helpers/get');
+const getConstructorName = require('./helpers/getConstructorName');
 const getIndexes = require('./helpers/schema/getIndexes');
 const merge = require('./helpers/schema/merge');
 const mpath = require('mpath');
@@ -932,11 +933,21 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
       : type[0];
 
     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`.');
+      }
       return new MongooseTypes.DocumentArray(path, cast, obj);
     }
     if (cast &&
         cast[options.typeKey] &&
         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`.');
+      }
       return new MongooseTypes.DocumentArray(path, cast[options.typeKey], obj, cast);
     }
 
@@ -1665,8 +1676,8 @@ Object.defineProperty(Schema, 'indexTypes', {
 });
 
 /**
- * Returns a list of indexes that this schema declares, via `schema.index()`
- * or by `index: true` in a path's options.
+ * Returns a list of indexes that this schema declares, via `schema.index()` or by `index: true` in a path's options.
+ * Indexes are expressed as an array `[spec, options]`.
  *
  * ####Example:
  *
@@ -1679,6 +1690,17 @@ Object.defineProperty(Schema, 'indexTypes', {
  *     //   [ { registeredAt: 1 }, { background: true } ] ]
  *     userSchema.indexes();
  *
+ * [Plugins](/docs/plugins.html) can use the return value of this function to modify a schema's indexes.
+ * For example, the below plugin makes every index unique by default.
+ *
+ *     function myPlugin(schema) {
+ *       for (const index of schema.indexes()) {
+ *         if (index[1].unique === undefined) {
+ *           index[1].unique = true;
+ *         }
+ *       }
+ *     }
+ *
  * @api public
  * @return {Array} list of indexes defined in the schema
  */
@@ -1702,7 +1724,7 @@ Schema.prototype.indexes = function() {
  */
 
 Schema.prototype.virtual = function(name, options) {
-  if (name instanceof VirtualType || (name != null && name.constructor.name === 'VirtualType')) {
+  if (name instanceof VirtualType || getConstructorName(name) === 'VirtualType') {
     return this.virtual(name.path, name.options);
   }
 
@@ -1937,7 +1959,9 @@ Schema.prototype.loadClass = function(model, virtualsOnly) {
         return;
       }
       const prop = Object.getOwnPropertyDescriptor(model, name);
-      this.static(name, prop.value);
+      if (prop.hasOwnProperty('value')) {
+        this.static(name, prop.value);
+      }
     }, this);
   }
 
@@ -2034,7 +2058,7 @@ Schema.prototype._getSchema = function(path) {
           }
         } else if (foundschema.$isSchemaMap) {
           if (p + 1 >= parts.length) {
-            return foundschema.$__schemaType;
+            return foundschema;
           }
           const ret = search(parts.slice(p + 1), foundschema.$__schemaType.schema);
           return ret;

package/lib/types/embedded.js

@@ -397,7 +397,7 @@ EmbeddedDocument.prototype.ownerDocument = function() {
 
 EmbeddedDocument.prototype.$__fullPath = function(path) {
   if (!this.$__.fullPath) {
-    let parent = this; // eslint-disable-line consistent-this
+    let parent = this;
     if (!parent[documentArrayParent]) {
       return path;
     }

package/lib/types/map.js

@@ -2,8 +2,10 @@
 
 const Mixed = require('../schema/mixed');
 const ObjectId = require('./objectid');
+const clone = require('../helpers/clone');
 const deepEqual = require('../utils').deepEqual;
 const get = require('../helpers/get');
+const getConstructorName = require('../helpers/getConstructorName');
 const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
 const util = require('util');
 const specialProperties = require('../helpers/specialProperties');
@@ -16,7 +18,7 @@ const populateModelSymbol = require('../helpers/symbols').populateModelSymbol;
 
 class MongooseMap extends Map {
   constructor(v, path, doc, schemaType) {
-    if (v != null && v.constructor.name === 'Object') {
+    if (getConstructorName(v) === 'Object') {
       v = Object.keys(v).reduce((arr, key) => arr.concat([[key, v[key]]]), []);
     }
     super(v);
@@ -133,7 +135,7 @@ class MongooseMap extends Map {
       const ret = {};
       const keys = this.keys();
       for (const key of keys) {
-        ret[key] = this.get(key);
+        ret[key] = clone(this.get(key));
       }
       return ret;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.13.2",
+  "version": "5.13.6",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,14 +20,14 @@
   "license": "MIT",
   "dependencies": {
     "@types/mongodb": "^3.5.27",
-    "@types/node": "14.x || 15.x",
     "bson": "^1.1.4",
     "kareem": "2.3.2",
-    "mongodb": "3.6.8",
+    "mongodb": "3.6.11",
     "mongoose-legacy-pluralize": "1.0.2",
     "mpath": "0.8.3",
     "mquery": "3.2.5",
     "ms": "2.1.2",
+    "optional-require": "1.0.x",
     "regexp-clone": "1.0.0",
     "safe-buffer": "5.2.1",
     "sift": "13.5.2",
@@ -84,6 +84,7 @@
     "test-cov": "nyc --reporter=html --reporter=text npm test"
   },
   "main": "./index.js",
+  "types": "./index.d.ts",
   "engines": {
     "node": ">=4.0.0"
   },