mongoose 5.4.0 → 5.4.4

package/lib/schema/map.js

@@ -11,7 +11,7 @@ const SchemaType = require('../schematype');
  * ignore
  */
 
-class SchemaMap extends SchemaType {
+class Map extends SchemaType {
   constructor(key, options) {
     super(key, options, 'Map');
     this.$isSchemaMap = true;
@@ -26,7 +26,7 @@ class SchemaMap extends SchemaType {
       const map = new MongooseMap({}, this.path, doc, this.$__schemaType);
 
       for (const key of Object.keys(val)) {
-        map.$__set(key, this.$__schemaType.cast(val[key], doc, true));
+        map.$init(key, this.$__schemaType.cast(val[key], doc, true));
       }
 
       return map;
@@ -36,4 +36,4 @@ class SchemaMap extends SchemaType {
   }
 }
 
-module.exports = SchemaMap;
+module.exports = Map;

package/lib/schema/string.js

@@ -48,19 +48,20 @@ SchemaString.prototype.constructor = SchemaString;
 SchemaString._cast = castString;
 
 /**
- * Get/set the function used to cast arbitrary values to objectids.
+ * Get/set the function used to cast arbitrary values to strings.
  *
  * ####Example:
  *
- *     // Make Mongoose only try to cast strings
- *     const original = mongoose.ObjectId.cast();
- *     mongoose.ObjectId.cast(v => {
- *       assert.ok(v == null || typeof v === 'string');
+ *     // Throw an error if you pass in an object. Normally, Mongoose allows
+ *     // objects with custom `toString()` functions.
+ *     const original = mongoose.Schema.Types.String.cast();
+ *     mongoose.Schema.Types.String.cast(v => {
+ *       assert.ok(v == null || typeof v !== 'object');
  *       return original(v);
  *     });
  *
  *     // Or disable casting entirely
- *     mongoose.ObjectId.cast(false);
+ *     mongoose.Schema.Types.String.cast(false);
  *
  * @param {Function} caster
  * @return {Function}

package/lib/schema/symbols.js

@@ -1,3 +1,5 @@
 'use strict';
 
-exports.schemaMixedSymbol = Symbol.for('mongoose:schema_mixed');
+exports.schemaMixedSymbol = Symbol.for('mongoose:schema_mixed');
+
+exports.builtInMiddleware = Symbol.for('mongoose:built-in-middleware');

package/lib/schema.js

@@ -16,6 +16,7 @@ const handleTimestampOption = require('./helpers/schema/handleTimestampOption');
 const merge = require('./helpers/schema/merge');
 const mpath = require('mpath');
 const readPref = require('./driver').get().ReadPreference;
+const symbols = require('./schema/symbols');
 const util = require('util');
 const utils = require('./utils');
 const validateRef = require('./helpers/populate/validateRef');
@@ -272,6 +273,7 @@ Schema.prototype.tree;
 
 Schema.prototype.clone = function() {
   const s = new Schema({}, this._userProvidedOptions);
+  s.base = this.base;
   s.obj = this.obj;
   s.options = utils.clone(this.options);
   s.callQueue = this.callQueue.map(function(f) { return f; });
@@ -463,6 +465,7 @@ reserved.schema =
 reserved.toObject =
 reserved.validate =
 reserved.remove =
+reserved.populated =
 // hooks.js
 reserved._pres = reserved._posts = 1;
 
@@ -492,13 +495,13 @@ warnings.increment = '`increment` should not be used as a schema path name ' +
 
 Schema.prototype.path = function(path, obj) {
   if (obj === undefined) {
-    if (this.paths[path]) {
+    if (this.paths.hasOwnProperty(path)) {
       return this.paths[path];
     }
-    if (this.subpaths[path]) {
+    if (this.subpaths.hasOwnProperty(path)) {
       return this.subpaths[path];
     }
-    if (this.singleNestedPaths[path]) {
+    if (this.singleNestedPaths.hasOwnProperty(path)) {
       return this.singleNestedPaths[path];
     }
 
@@ -576,11 +579,27 @@ Schema.prototype.path = function(path, obj) {
         schemaType.schema.singleNestedPaths[key];
     }
 
+    Object.defineProperty(schemaType.schema, 'base', {
+      configurable: true,
+      enumerable: false,
+      writable: false,
+      value: this.base
+    });
+
+    schemaType.caster.base = this.base;
     this.childSchemas.push({
       schema: schemaType.schema,
       model: schemaType.caster
     });
   } else if (schemaType.$isMongooseDocumentArray) {
+    Object.defineProperty(schemaType.schema, 'base', {
+      configurable: true,
+      enumerable: false,
+      writable: false,
+      value: this.base
+    });
+
+    schemaType.casterConstructor.base = this.base;
     this.childSchemas.push({
       schema: schemaType.schema,
       model: schemaType.casterConstructor
@@ -590,6 +609,20 @@ Schema.prototype.path = function(path, obj) {
   return this;
 };
 
+/**
+ * The Mongoose instance this schema is associated with
+ *
+ * @property base
+ * @api private
+ */
+
+Object.defineProperty(Schema.prototype, 'base', {
+  configurable: true,
+  enumerable: false,
+  writable: true,
+  value: null
+});
+
 /**
  * Converts type arguments into Mongoose Types.
  *
@@ -682,8 +715,9 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
         : type.schemaName || utils.getFunctionName(type);
 
       if (!(name in MongooseTypes)) {
-        throw new TypeError('Undefined type `' + name + '` at array `' + path +
-          '`');
+        throw new TypeError('Invalid schema configuration: ' +
+          `\`${name}\` is not a valid type within the array \`${path}\`.` +
+          'See http://bit.ly/mongoose-schematypes for a list of valid schema types.');
       }
     }
 
@@ -696,12 +730,10 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
 
   if (Buffer.isBuffer(type)) {
     name = 'Buffer';
+  } else if (typeof type === 'function' || typeof type === 'object') {
+    name = type.schemaName || utils.getFunctionName(type);
   } else {
-    name = typeof type === 'string'
-      ? type
-      // If not string, `type` is a function. Outside of IE, function.name
-      // gives you the function name. In IE, you need to compute it
-      : type.schemaName || utils.getFunctionName(type);
+    name = type == null ? '' + type : type.toString();
   }
 
   if (name) {
@@ -713,10 +745,10 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
     name = 'ObjectId';
   }
 
-  if (undefined == MongooseTypes[name]) {
-    throw new TypeError('Undefined type `' + name + '` at `' + path +
-        '`\n  Did you try nesting Schemas? ' +
-        'You can only nest using refs or arrays.');
+  if (MongooseTypes[name] == null) {
+    throw new TypeError(`Invalid schema configuration: \`${name}\` is not ` +
+      `a valid type at path \`${path}\`. See ` +
+      'http://bit.ly/mongoose-schematypes for a list of valid schema types.');
   }
 
   return new MongooseTypes[name](path, obj);
@@ -862,7 +894,7 @@ Schema.prototype.setupTimestamp = function(timestamps) {
 
   function withTimestamp(s) {
     const ts = s.schema.options.timestamps;
-    return ts == true || ts == null;
+    return !!ts;
   }
 
   if (!timestamps && !childHasTimestamp) {
@@ -886,6 +918,10 @@ Schema.prototype.setupTimestamp = function(timestamps) {
   this.add(schemaAdditions);
 
   this.pre('save', function(next) {
+    if (get(this, '$__.saveOptions.timestamps') === false) {
+      return next();
+    }
+
     const defaultTimestamp = (this.ownerDocument ? this.ownerDocument() : this).
       constructor.base.now();
     const auto_id = this._id && this._id.auto;
@@ -919,6 +955,8 @@ Schema.prototype.setupTimestamp = function(timestamps) {
     return this;
   };
 
+  _setTimestampsOnUpdate[symbols.builtInMiddleware] = true;
+
   this.pre('findOneAndUpdate', _setTimestampsOnUpdate);
   this.pre('replaceOne', _setTimestampsOnUpdate);
   this.pre('update', _setTimestampsOnUpdate);
@@ -941,7 +979,7 @@ Schema.prototype.setupTimestamp = function(timestamps) {
 function getPositionalPathType(self, path) {
   const subpaths = path.split(/\.(\d+)\.|\.(\d+)$/).filter(Boolean);
   if (subpaths.length < 2) {
-    return self.paths[subpaths[0]];
+    return self.paths.hasOwnProperty(subpaths[0]) ? self.paths[subpath[0]] : null;
   }
 
   let val = self.path(subpaths[0]);
@@ -1462,7 +1500,7 @@ Schema.prototype.virtual = function(name, options) {
  */
 
 Schema.prototype.virtualpath = function(name) {
-  return this.virtuals[name];
+  return this.virtuals.hasOwnProperty(name) ? this.virtuals[name] : null;
 };
 
 /**

package/lib/schematype.js

@@ -70,6 +70,38 @@ function SchemaType(path, options, instance) {
   });
 }
 
+/**
+ * Get/set the function used to cast arbitrary values to this type.
+ *
+ * ####Example:
+ *
+ *     // Disallow `null` for numbers, and don't try to cast any values to
+ *     // numbers, so even strings like '123' will cause a CastError.
+ *     mongoose.Number.cast(function(v) {
+ *       assert.ok(v === undefined || typeof v === 'number');
+ *       return v;
+ *     });
+ *
+ * @param {Function|false} caster Function that casts arbitrary values to this type, or throws an error if casting failed
+ * @return {Function}
+ * @static
+ * @receiver SchemaType
+ * @function cast
+ * @api public
+ */
+
+SchemaType.cast = function cast(caster) {
+  if (arguments.length === 0) {
+    return this._cast;
+  }
+  if (caster === false) {
+    caster = v => v;
+  }
+  this._cast = caster;
+
+  return this._cast;
+};
+
 /**
  * Attaches a getter for all instances of this schema type.
  *
@@ -80,8 +112,9 @@ function SchemaType(path, options, instance) {
  *
  * @param {Function} getter
  * @return {this}
- * @function get
  * @static
+ * @receiver SchemaType
+ * @function get
  * @api public
  */
 
@@ -1221,8 +1254,9 @@ SchemaType.prototype._castForQuery = function(val) {
  *
  * @param {Function} fn
  * @return {Function}
- * @function checkRequired
  * @static
+ * @receiver SchemaType
+ * @function checkRequired
  * @api public
  */
 

package/lib/types/documentarray.js

@@ -44,7 +44,11 @@ function MongooseDocumentArray(values, path, doc) {
   // TODO: replace this with `new CoreMongooseArray().concat()` when we remove
   // support for node 4.x and 5.x, see https://i.imgur.com/UAAHk4S.png
   const arr = new CoreMongooseArray();
-  if (Array.isArray(values)) values.forEach(v => arr.push(v));
+  if (Array.isArray(values)) {
+    values.forEach(v => {
+      arr.push(v);
+    });
+  }
   arr._path = path;
 
   const props = {

package/lib/types/objectid.js

@@ -11,6 +11,7 @@
 'use strict';
 
 const ObjectId = require('../driver').get().ObjectId;
+const objectIdSymbol = require('../helpers/symbols').objectIdSymbol;
 
 /*!
  * Getter for convenience with populate, see gh-6115
@@ -24,4 +25,6 @@ Object.defineProperty(ObjectId.prototype, '_id', {
   }
 });
 
+ObjectId.prototype[objectIdSymbol] = true;
+
 module.exports = ObjectId;

package/lib/utils.js

@@ -261,7 +261,7 @@ exports.promiseOrCallback = function promiseOrCallback(callback, fn, ee) {
   return new Promise((resolve, reject) => {
     fn(function(error, res) {
       if (error != null) {
-        if (ee.listeners('error').length > 0 && !error[emittedSymbol]) {
+        if (ee != null && ee.listeners('error').length > 0 && !error[emittedSymbol]) {
           error[emittedSymbol] = true;
           ee.emit('error', error);
         }
@@ -382,9 +382,14 @@ exports.merge = function merge(to, from, options, path) {
       if (!exports.isObject(to[key])) {
         to[key] = {};
       }
-      if (from[key] != null && from[key].instanceOfSchema) {
-        to[key] = from[key].clone();
-        continue;
+      if (from[key] != null) {
+        if (from[key].instanceOfSchema) {
+          to[key] = from[key].clone();
+          continue;
+        } else if (from[key] instanceof ObjectId) {
+          to[key] = new ObjectId(from[key]);
+          continue;
+        }
       }
       merge(to[key], from[key], options, path ? path + '.' + key : key);
     } else if (options.overwrite) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.4.0",
+  "version": "5.4.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -22,7 +22,6 @@
     "async": "2.6.1",
     "bson": "~1.1.0",
     "kareem": "2.3.0",
-    "lodash.get": "4.4.2",
     "mongodb": "3.1.10",
     "mongodb-core": "3.1.9",
     "mongoose-legacy-pluralize": "1.0.2",
@@ -35,7 +34,7 @@
   },
   "devDependencies": {
     "acorn": "5.7.3",
-    "acquit": "1.0.0",
+    "acquit": "1.0.2",
     "acquit-ignore": "0.1.0",
     "acquit-require": "0.1.1",
     "babel-loader": "7.1.4",