mongoose 6.2.9 → 6.3.0

package/lib/helpers/query/applyGlobalOption.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const utils = require('../../utils');
+
+function applyGlobalMaxTimeMS(options, model) {
+  applyGlobalOption(options, model, 'maxTimeMS');
+}
+
+function applyGlobalDiskUse(options, model) {
+  applyGlobalOption(options, model, 'allowDiskUse');
+}
+
+module.exports = {
+  applyGlobalMaxTimeMS,
+  applyGlobalDiskUse
+};
+
+
+function applyGlobalOption(options, model, optionName) {
+  if (utils.hasUserDefinedProperty(options, optionName)) {
+    return;
+  }
+
+  if (utils.hasUserDefinedProperty(model.db.options, optionName)) {
+    options[optionName] = model.db.options[optionName];
+  } else if (utils.hasUserDefinedProperty(model.base.options, optionName)) {
+    options[optionName] = model.base.options[optionName];
+  }
+}

package/lib/helpers/query/castUpdate.js

@@ -47,7 +47,7 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
   } else if (!options.overwriteDiscriminatorKey) {
     delete obj[schema.options.discriminatorKey];
   }
-  if (options.upsert) {
+  if (options.upsert && !options.overwrite) {
     moveImmutableProperties(schema, obj, context);
   }
 
@@ -217,6 +217,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
       }
 
       if (op !== '$setOnInsert' &&
+          !options.overwrite &&
           handleImmutable(schematype, strict, obj, key, prefix + key, context)) {
         continue;
       }
@@ -311,6 +312,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
 
       // You can use `$setOnInsert` with immutable keys
       if (op !== '$setOnInsert' &&
+          !options.overwrite &&
           handleImmutable(schematype, strict, obj, key, prefix + key, context)) {
         continue;
       }

package/lib/helpers/update/applyTimestampsToChildren.js

@@ -15,7 +15,7 @@ function applyTimestampsToChildren(now, update, schema) {
   }
 
   const keys = Object.keys(update);
-  const hasDollarKey = keys.some(key => key.startsWith('$'));
+  const hasDollarKey = keys.some(key => key[0] === '$');
 
   if (hasDollarKey) {
     if (update.$push) {
@@ -38,7 +38,7 @@ function applyTimestampsToChildren(now, update, schema) {
     }
   }
 
-  const updateKeys = Object.keys(update).filter(key => !key.startsWith('$'));
+  const updateKeys = Object.keys(update).filter(key => key[0] !== '$');
   for (const key of updateKeys) {
     applyTimestampsToUpdateKey(schema, key, update, now);
   }

package/lib/helpers/update/applyTimestampsToUpdate.js

@@ -80,7 +80,6 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
   }
 
   if (!skipCreatedAt && createdAt) {
-
     if (currentUpdate[createdAt]) {
       delete currentUpdate[createdAt];
     }

package/lib/index.js

@@ -47,7 +47,7 @@ const objectIdHexRegexp = /^[0-9A-Fa-f]{24}$/;
  * The exports object of the `mongoose` module is an instance of this class.
  * Most apps will only use this one instance.
  *
- * ####Example:
+ * #### Example:
  *     const mongoose = require('mongoose');
  *     mongoose instanceof mongoose.Mongoose; // true
  *
@@ -144,7 +144,7 @@ Mongoose.prototype.driver = driver;
 /**
  * Sets mongoose options
  *
- * ####Example:
+ * #### Example:
  *
  *     mongoose.set('test', value) // sets the 'test' option to `value`
  *
@@ -179,7 +179,9 @@ Mongoose.prototype.driver = driver;
 Mongoose.prototype.set = function(key, value) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
-  if (VALID_OPTIONS.indexOf(key) === -1) throw new Error(`\`${key}\` is an invalid option.`);
+  if (VALID_OPTIONS.indexOf(key) === -1) {
+    throw new Error(`\`${key}\` is an invalid option.`);
+  }
 
   if (arguments.length === 1) {
     return _mongoose.options[key];
@@ -207,7 +209,7 @@ Mongoose.prototype.set = function(key, value) {
 /**
  * Gets mongoose options
  *
- * ####Example:
+ * #### Example:
  *
  *     mongoose.get('test') // returns the 'test' value
  *
@@ -226,7 +228,7 @@ Mongoose.prototype.get = Mongoose.prototype.set;
  *
  * _Options passed take precedence over options included in connection strings._
  *
- * ####Example:
+ * #### Example:
  *
  *     // with mongodb:// URI
  *     db = mongoose.createConnection('mongodb://user:pass@localhost:port/database');
@@ -290,7 +292,7 @@ Mongoose.prototype.createConnection = function(uri, options, callback) {
 /**
  * Opens the default mongoose connection.
  *
- * ####Example:
+ * #### Example:
  *
  *     mongoose.connect('mongodb://user:pass@localhost:port/database');
  *
@@ -424,7 +426,7 @@ Mongoose.prototype.pluralize = function(fn) {
  * you will get an `OverwriteModelError`. If you call `mongoose.model()` with
  * the same name and same schema, you'll get the same schema back.
  *
- * ####Example:
+ * #### Example:
  *
  *     const mongoose = require('mongoose');
  *
@@ -446,7 +448,7 @@ Mongoose.prototype.pluralize = function(fn) {
  *
  * _When no `collection` argument is passed, Mongoose uses the model name. If you don't like this behavior, either pass a collection name, use `mongoose.pluralize()`, or set your schemas collection name option._
  *
- * ####Example:
+ * #### Example:
  *
  *     const schema = new Schema({ name: String }, { collection: 'actor' });
  *
@@ -467,6 +469,7 @@ Mongoose.prototype.pluralize = function(fn) {
  */
 
 Mongoose.prototype.model = function(name, schema, collection, options) {
+
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   if (typeof schema === 'string') {
@@ -519,7 +522,6 @@ Mongoose.prototype.model = function(name, schema, collection, options) {
   }
 
   const model = _mongoose._model(name, schema, collection, options);
-
   _mongoose.connection.models[name] = model;
   _mongoose.models[name] = model;
 
@@ -561,12 +563,17 @@ Mongoose.prototype._model = function(name, schema, collection, options) {
 
   const connection = options.connection || _mongoose.connection;
   model = _mongoose.Model.compile(model || name, schema, collection, connection, _mongoose);
-
   // Errors handled internally, so safe to ignore error
   model.init(function $modelInitNoop() {});
 
   connection.emit('model', model);
 
+  if (schema._applyDiscriminators != null) {
+    for (const disc of Object.keys(schema._applyDiscriminators)) {
+      model.discriminator(disc, schema._applyDiscriminators[disc]);
+    }
+  }
+
   return model;
 };
 
@@ -577,7 +584,7 @@ Mongoose.prototype._model = function(name, schema, collection, options) {
  *
  * Equivalent to `mongoose.connection.deleteModel(name)`.
  *
- * ####Example:
+ * #### Example:
  *
  *     mongoose.model('User', new Schema({ name: String }));
  *     console.log(mongoose.model('User')); // Model object
@@ -605,7 +612,7 @@ Mongoose.prototype.deleteModel = function(name) {
 /**
  * Returns an array of model names created on this instance of Mongoose.
  *
- * ####Note:
+ * #### Note:
  *
  * _Does not include names of models created using `connection.model()`._
  *
@@ -658,7 +665,7 @@ Mongoose.prototype.plugin = function(fn, opts) {
 /**
  * The Mongoose module's default connection. Equivalent to `mongoose.connections[0]`, see [`connections`](#mongoose_Mongoose-connections).
  *
- * ####Example:
+ * #### Example:
  *
  *     const mongoose = require('mongoose');
  *     mongoose.connect(...);
@@ -691,7 +698,7 @@ Mongoose.prototype.__defineSetter__('connection', function(v) {
  * [`createConnection()`](#mongoose_Mongoose-createConnection) adds a connection
  * to this array.
  *
- * ####Example:
+ * #### Example:
  *
  *     const mongoose = require('mongoose');
  *     mongoose.connections.length; // 1, just the default connection
@@ -767,7 +774,7 @@ Mongoose.prototype.version = pkg.version;
  *
  * The exports of the mongoose module is an instance of this class.
  *
- * ####Example:
+ * #### Example:
  *
  *     const mongoose = require('mongoose');
  *     const mongoose2 = new mongoose.Mongoose();
@@ -781,7 +788,7 @@ Mongoose.prototype.Mongoose = Mongoose;
 /**
  * The Mongoose [Schema](#schema_Schema) constructor
  *
- * ####Example:
+ * #### Example:
  *
  *     const mongoose = require('mongoose');
  *     const Schema = mongoose.Schema;
@@ -805,7 +812,7 @@ Mongoose.prototype.SchemaType = SchemaType;
 /**
  * The various Mongoose SchemaTypes.
  *
- * ####Note:
+ * #### Note:
  *
  * _Alias of mongoose.Schema.Types for backwards compatibility._
  *
@@ -828,12 +835,12 @@ Mongoose.prototype.VirtualType = VirtualType;
 /**
  * The various Mongoose Types.
  *
- * ####Example:
+ * #### Example:
  *
  *     const mongoose = require('mongoose');
  *     const array = mongoose.Types.Array;
  *
- * ####Types:
+ * #### Types:
  *
  * - [Array](/docs/schematypes.html#arrays)
  * - [Buffer](/docs/schematypes.html#buffers)
@@ -926,7 +933,7 @@ Mongoose.prototype.DocumentProvider = require('./document_provider');
  * Do not use this to create a new ObjectId instance, use `mongoose.Types.ObjectId`
  * instead.
  *
- * ####Example:
+ * #### Example:
  *
  *     const childSchema = new Schema({ parentId: mongoose.ObjectId });
  *
@@ -940,7 +947,7 @@ Mongoose.prototype.ObjectId = SchemaTypes.ObjectId;
  * Returns true if Mongoose can cast the given value to an ObjectId, or
  * false otherwise.
  *
- * ####Example:
+ * #### Example:
  *
  *     mongoose.isValidObjectId(new mongoose.Types.ObjectId()); // true
  *     mongoose.isValidObjectId('0123456789ab'); // true
@@ -971,7 +978,7 @@ Mongoose.prototype.isValidObjectId = function(v) {
  * `isObjectIdOrHexString()` returns true only for `ObjectId` instances or 24 character hex
  * strings, and will return false for numbers, documents, and strings of length 12.
  *
- * ####Example:
+ * #### Example:
  *
  *     mongoose.isObjectIdOrHexString(new mongoose.Types.ObjectId()); // true
  *     mongoose.isObjectIdOrHexString('62261a65d66c6be0a63c051f'); // true
@@ -1012,7 +1019,7 @@ Mongoose.prototype.syncIndexes = function(options) {
  * Do not use this to create a new Decimal128 instance, use `mongoose.Types.Decimal128`
  * instead.
  *
- * ####Example:
+ * #### Example:
  *
  *     const vehicleSchema = new Schema({ fuelLevel: mongoose.Decimal128 });
  *
@@ -1027,7 +1034,7 @@ Mongoose.prototype.Decimal128 = SchemaTypes.Decimal128;
  * declaring paths in your schema that Mongoose's change tracking, casting,
  * and validation should ignore.
  *
- * ####Example:
+ * #### Example:
  *
  *     const schema = new Schema({ arbitrary: mongoose.Mixed });
  *
@@ -1040,7 +1047,7 @@ Mongoose.prototype.Mixed = SchemaTypes.Mixed;
 /**
  * The Mongoose Date [SchemaType](/docs/schematypes.html).
  *
- * ####Example:
+ * #### Example:
  *
  *     const schema = new Schema({ test: Date });
  *     schema.path('test') instanceof mongoose.Date; // true
@@ -1055,7 +1062,7 @@ Mongoose.prototype.Date = SchemaTypes.Date;
  * The Mongoose Number [SchemaType](/docs/schematypes.html). Used for
  * declaring paths in your schema that Mongoose should cast to numbers.
  *
- * ####Example:
+ * #### Example:
  *
  *     const schema = new Schema({ num: mongoose.Number });
  *     // Equivalent to: