mongoose 6.1.9 → 6.2.2

package/lib/types/DocumentArray/index.js

@@ -15,7 +15,7 @@ const arrayPathSymbol = require('../../helpers/symbols').arrayPathSymbol;
 const arraySchemaSymbol = require('../../helpers/symbols').arraySchemaSymbol;
 
 const _basePush = Array.prototype.push;
-
+const numberRE = /^\d+$/;
 /**
  * DocumentArray constructor
  *
@@ -25,11 +25,11 @@ const _basePush = Array.prototype.push;
  * @api private
  * @return {MongooseDocumentArray}
  * @inherits MongooseArray
- * @see http://bit.ly/f6CnZU
+ * @see https://bit.ly/f6CnZU
  */
 
 function MongooseDocumentArray(values, path, doc) {
-  const arr = [];
+  const __array = [];
 
   const internals = {
     [arrayAtomicsSymbol]: {},
@@ -45,10 +45,11 @@ function MongooseDocumentArray(values, path, doc) {
       internals[arrayAtomicsSymbol] = Object.assign({}, values[arrayAtomicsSymbol]);
     }
     values.forEach(v => {
-      _basePush.call(arr, v);
+      _basePush.call(__array, v);
     });
   }
   internals[arrayPathSymbol] = path;
+  internals.__array = __array;
 
   // Because doc comes from the context of another function, doc === global
   // can happen if there was a null somewhere up the chain (see #3020 && #3034)
@@ -69,7 +70,7 @@ function MongooseDocumentArray(values, path, doc) {
     }
   }
 
-  const proxy = new Proxy(arr, {
+  const proxy = new Proxy(__array, {
     get: function(target, prop) {
       if (prop === 'isMongooseArray' ||
           prop === 'isMongooseArrayProxy' ||
@@ -77,12 +78,6 @@ function MongooseDocumentArray(values, path, doc) {
           prop === 'isMongooseDocumentArrayProxy') {
         return true;
       }
-      if (prop === '__array') {
-        return arr;
-      }
-      if (prop === 'set') {
-        return set;
-      }
       if (internals.hasOwnProperty(prop)) {
         return internals[prop];
       }
@@ -93,15 +88,15 @@ function MongooseDocumentArray(values, path, doc) {
         return ArrayMethods[prop];
       }
 
-      return arr[prop];
+      return __array[prop];
     },
     set: function(target, prop, value) {
-      if (typeof prop === 'string' && /^\d+$/.test(prop)) {
-        set.call(proxy, prop, value);
+      if (typeof prop === 'string' && numberRE.test(prop)) {
+        DocumentArrayMethods.set.call(proxy, prop, value, false);
       } else if (internals.hasOwnProperty(prop)) {
         internals[prop] = value;
       } else {
-        arr[prop] = value;
+        __array[prop] = value;
       }
 
       return true;
@@ -111,18 +106,6 @@ function MongooseDocumentArray(values, path, doc) {
   return proxy;
 }
 
-function set(i, val, skipModified) {
-  const arr = this.__array;
-  if (skipModified) {
-    arr[i] = val;
-    return arr;
-  }
-  const value = DocumentArrayMethods._cast.call(this, val, i);
-  arr[i] = value;
-  DocumentArrayMethods._markModified.call(this, i);
-  return arr;
-}
-
 /*!
  * Module exports.
  */

package/lib/types/DocumentArray/isMongooseDocumentArray.js

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.isMongooseDocumentArray = function(mongooseDocumentArray) {
+  return Array.isArray(mongooseDocumentArray) && mongooseDocumentArray.isMongooseDocumentArray;
+};

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

@@ -36,7 +36,7 @@ const methods = {
     }
     let Constructor = this[arraySchemaSymbol].casterConstructor;
     const isInstance = Constructor.$isMongooseDocumentArray ?
-      value && value.isMongooseDocumentArray :
+      utils.isMongooseDocumentArray(value) :
       value instanceof Constructor;
     if (isInstance ||
         // Hack re: #5001, see #5005
@@ -295,7 +295,7 @@ const methods = {
             break;
         }
 
-        if (_arr[i].isMongooseArray) {
+        if (utils.isMongooseArray(_arr[i])) {
           notify(val, _arr[i]);
         } else if (_arr[i]) {
           _arr[i].emit(event, val);
@@ -304,6 +304,18 @@ const methods = {
     };
   },
 
+  set(i, val, skipModified) {
+    const arr = this.__array;
+    if (skipModified) {
+      arr[i] = val;
+      return this;
+    }
+    const value = methods._cast.call(this, val, i);
+    arr[i] = value;
+    methods._markModified.call(this, i);
+    return this;
+  },
+
   _markModified(elem, embeddedPath) {
     const parent = this[arrayParentSymbol];
     let dirtyPath;
@@ -326,7 +338,7 @@ const methods = {
         return this;
       }
 
-      parent.markModified(dirtyPath, arguments.length > 0 ? elem : parent);
+      parent.markModified(dirtyPath, arguments.length !== 0 ? elem : parent);
     }
 
     return this;

package/lib/types/array/index.js

@@ -25,11 +25,14 @@ const arraySchemaSymbol = require('../../helpers/symbols').arraySchemaSymbol;
  * @param {Document} doc parent document
  * @api private
  * @inherits Array
- * @see http://bit.ly/f6CnZU
+ * @see https://bit.ly/f6CnZU
  */
+const _basePush = Array.prototype.push;
+const numberRE = /^\d+$/;
 
 function MongooseArray(values, path, doc, schematype) {
-  let arr;
+  let __array;
+
   if (Array.isArray(values)) {
     const len = values.length;
 
@@ -38,21 +41,21 @@ function MongooseArray(values, path, doc, schematype) {
     // modifying the array is faster. Seems small, but adds up when you have a document
     // with thousands of nested arrays.
     if (len === 0) {
-      arr = new Array();
+      __array = new Array();
     } else if (len === 1) {
-      arr = new Array(1);
-      arr[0] = values[0];
+      __array = new Array(1);
+      __array[0] = values[0];
     } else if (len < 10000) {
-      arr = new Array();
-      arr.push.apply(arr, values);
+      __array = new Array();
+      _basePush.apply(__array, values);
     } else {
-      arr = new Array();
+      __array = new Array();
       for (let i = 0; i < len; ++i) {
-        arr.push(values[i]);
+        _basePush.call(__array, values[i]);
       }
     }
   } else {
-    arr = [];
+    __array = [];
   }
 
   const internals = {
@@ -63,10 +66,10 @@ function MongooseArray(values, path, doc, schematype) {
     [arrayParentSymbol]: void 0,
     isMongooseArray: true,
     isMongooseArrayProxy: true,
-    __array: arr
+    __array: __array
   };
 
-  if (values[arrayAtomicsSymbol] != null) {
+  if (values && values[arrayAtomicsSymbol] != null) {
     internals[arrayAtomicsSymbol] = values[arrayAtomicsSymbol];
   }
 
@@ -79,7 +82,7 @@ function MongooseArray(values, path, doc, schematype) {
     internals[arraySchemaSymbol] = schematype || doc.schema.path(path);
   }
 
-  const proxy = new Proxy(arr, {
+  const proxy = new Proxy(__array, {
     get: function(target, prop) {
       if (internals.hasOwnProperty(prop)) {
         return internals[prop];
@@ -88,17 +91,15 @@ function MongooseArray(values, path, doc, schematype) {
         return mongooseArrayMethods[prop];
       }
 
-      return arr[prop];
+      return __array[prop];
     },
-    set: function(target, prop, val) {
-      if (typeof prop === 'string' && /^\d+$/.test(prop)) {
-        const value = mongooseArrayMethods._cast.call(proxy, val, prop);
-        arr[prop] = value;
-        mongooseArrayMethods._markModified.call(proxy, prop);
+    set: function(target, prop, value) {
+      if (typeof prop === 'string' && numberRE.test(prop)) {
+        mongooseArrayMethods.set.call(proxy, prop, value, false);
       } else if (internals.hasOwnProperty(prop)) {
-        internals[prop] = val;
+        internals[prop] = value;
       } else {
-        arr[prop] = val;
+        __array[prop] = value;
       }
 
       return true;

package/lib/types/array/isMongooseArray.js

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.isMongooseArray = function(mongooseArray) {
+  return Array.isArray(mongooseArray) && mongooseArray.isMongooseArray;
+};

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

@@ -5,7 +5,6 @@ const ArraySubdocument = require('../../ArraySubdocument');
 const MongooseError = require('../../../error/mongooseError');
 const ObjectId = require('../../objectid');
 const cleanModifiedSubpaths = require('../../../helpers/document/cleanModifiedSubpaths');
-const get = require('../../../helpers/get');
 const internalToObjectOptions = require('../../../options').internalToObjectOptions;
 const utils = require('../../../utils');
 
@@ -104,7 +103,7 @@ const methods = {
    * ####NOTE:
    *
    * _Calling this multiple times on an array before saving sends the same command as calling it once._
-   * _This update is implemented using the MongoDB [$pop](http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
+   * _This update is implemented using the MongoDB [$pop](https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
    *
    *      doc.array = [1,2,3];
    *
@@ -129,7 +128,7 @@ const methods = {
    * @memberOf MongooseArray
    * @instance
    * @method $shift
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
    */
 
   $shift() {
@@ -151,7 +150,7 @@ const methods = {
    * #### NOTE:
    *
    * _Calling this mulitple times on an array before saving sends the same command as calling it once._
-   * _This update is implemented using the MongoDB [$pop](http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
+   * _This update is implemented using the MongoDB [$pop](https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
    *
    *      doc.array = [1,2,3];
    *
@@ -176,7 +175,7 @@ const methods = {
    * @method $pop
    * @memberOf MongooseArray
    * @instance
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
    * @method $pop
    * @memberOf MongooseArray
    */
@@ -285,7 +284,7 @@ const methods = {
         return this;
       }
 
-      parent.markModified(dirtyPath, arguments.length > 0 ? elem : parent);
+      parent.markModified(dirtyPath, arguments.length !== 0 ? elem : parent);
     }
 
     return this;
@@ -393,8 +392,8 @@ const methods = {
       type = 'date';
     }
 
-    const rawValues = values.isMongooseArrayProxy ? values.__array : this;
-    const rawArray = this.isMongooseArrayProxy ? this.__array : this;
+    const rawValues = utils.isMongooseArray(values) ? values.__array : this;
+    const rawArray = utils.isMongooseArray(this) ? this.__array : this;
 
     rawValues.forEach(function(v) {
       let found;
@@ -520,7 +519,7 @@ const methods = {
    *
    * ####Note:
    *
-   * _marks the entire array as modified which will pass the entire thing to $set potentially overwritting any changes that happen between when you retrieved the object and when you save it._
+   * _marks the entire array as modified which will pass the entire thing to $set potentially overwriting any changes that happen between when you retrieved the object and when you save it._
    *
    * @see MongooseArray#$pop #types_array_MongooseArray-%24pop
    * @api public
@@ -538,7 +537,7 @@ const methods = {
   /**
    * Pulls items from the array atomically. Equality is determined by casting
    * the provided value to an embedded document and comparing using
-   * [the `Document.equals()` function.](./api.html#document_Document-equals)
+   * [the `Document.equals()` function.](/docs/api.html#document_Document-equals)
    *
    * ####Examples:
    *
@@ -560,7 +559,7 @@ const methods = {
    * The first pull call will result in a atomic operation on the database, if pull is called repeatedly without saving the document, a $set operation is used on the complete array instead, overwriting possible changes that happened on the database in the meantime.
    *
    * @param {any} [args...]
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
    * @api public
    * @method pull
    * @memberOf MongooseArray
@@ -638,7 +637,7 @@ const methods = {
     let atomic = values;
     const isOverwrite = values[0] != null &&
       utils.hasUserDefinedProperty(values[0], '$each');
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     if (isOverwrite) {
       atomic = values[0];
       values = values[0].$each;
@@ -660,7 +659,7 @@ const methods = {
     if (isOverwrite) {
       atomic.$each = values;
 
-      if (get(atomics, '$push.$each.length', 0) > 0 &&
+      if ((atomics.$push && atomics.$push.$each && atomics.$push.$each.length || 0) !== 0 &&
           atomics.$push.$position != atomic.$position) {
         throw new MongooseError('Cannot call `Array#push()` multiple times ' +
           'with different `$position`');
@@ -673,7 +672,7 @@ const methods = {
         ret = [].push.apply(arr, values);
       }
     } else {
-      if (get(atomics, '$push.$each.length', 0) > 0 &&
+      if ((atomics.$push && atomics.$push.$each && atomics.$push.$each.length || 0) !== 0 &&
           atomics.$push.$position != null) {
         throw new MongooseError('Cannot call `Array#push()` multiple times ' +
           'with different `$position`');
@@ -691,7 +690,7 @@ const methods = {
    * Alias of [pull](#mongoosearray_MongooseArray-pull)
    *
    * @see MongooseArray#pull #types_array_MongooseArray-pull
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
    * @api public
    * @memberOf MongooseArray
    * @instance
@@ -761,7 +760,7 @@ const methods = {
    */
 
   shift() {
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     const ret = [].shift.call(arr);
     this._registerAtomic('$set', this);
     this._markModified();
@@ -782,7 +781,7 @@ const methods = {
    */
 
   sort() {
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     const ret = [].sort.apply(arr, arguments);
     this._registerAtomic('$set', this);
     return ret;
@@ -803,7 +802,7 @@ const methods = {
 
   splice() {
     let ret;
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
 
     _checkManualPopulation(this, Array.prototype.slice.call(arguments, 2));
 
@@ -846,7 +845,7 @@ const methods = {
    */
 
   toObject(options) {
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     if (options && options.depopulate) {
       options = utils.clone(options);
       options._isNested = true;
@@ -888,7 +887,7 @@ const methods = {
       values = this[arraySchemaSymbol].applySetters(values, this[arrayParentSymbol]);
     }
 
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     [].unshift.apply(arr, values);
     this._registerAtomic('$set', this);
     this._markModified();
@@ -926,9 +925,9 @@ function _isAllSubdocs(docs, ref) {
 function _checkManualPopulation(arr, docs) {
   const ref = arr == null ?
     null :
-    get(arr[arraySchemaSymbol], 'caster.options.ref', null);
+    arr[arraySchemaSymbol] && arr[arraySchemaSymbol].caster && arr[arraySchemaSymbol].caster.options && arr[arraySchemaSymbol].caster.options.ref || null;
   if (arr.length === 0 &&
-      docs.length > 0) {
+      docs.length !== 0) {
     if (_isAllSubdocs(docs, ref)) {
       arr[arrayParentSymbol].$populated(arr[arrayPathSymbol], [], {
         [populateModelSymbol]: docs[0].constructor
@@ -950,7 +949,7 @@ for (const method of returnVanillaArrayMethods) {
   }
 
   methods[method] = function() {
-    const _arr = this.isMongooseArrayProxy ? this.__array : this;
+    const _arr = utils.isMongooseArray(this) ? this.__array : this;
     const arr = [].concat(_arr);
 
     return arr[method].apply(arr, arguments);

package/lib/types/buffer.js

@@ -17,7 +17,7 @@ const utils = require('../utils');
  * @param {Number} offset
  * @api private
  * @inherits Buffer
- * @see http://bit.ly/f6CnZU
+ * @see https://bit.ly/f6CnZU
  */
 
 function MongooseBuffer(value, encode, offset) {
@@ -173,7 +173,7 @@ MongooseBuffer.mixin = {
  *
  *   doc.buffer.toObject(bson.BSON_BINARY_SUBTYPE_USER_DEFINED);
  *
- * @see http://bsonspec.org/#/specification
+ * @see https://bsonspec.org/#/specification
  * @param {Hex} [subtype]
  * @return {Binary}
  * @api public
@@ -245,7 +245,7 @@ MongooseBuffer.mixin.equals = function(other) {
  *
  *   doc.buffer.subtype(bson.BSON_BINARY_SUBTYPE_UUID);
  *
- * @see http://bsonspec.org/#/specification
+ * @see https://bsonspec.org/#/specification
  * @param {Hex} subtype
  * @api public
  * @method subtype

package/lib/types/map.js

@@ -4,7 +4,6 @@ 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');
@@ -131,7 +130,7 @@ class MongooseMap extends Map {
   }
 
   toObject(options) {
-    if (get(options, 'flattenMaps')) {
+    if (options && options.flattenMaps) {
       const ret = {};
       const keys = this.keys();
       for (const key of keys) {
@@ -148,7 +147,7 @@ class MongooseMap extends Map {
   }
 
   toJSON(options) {
-    if (get(options, 'flattenMaps', true)) {
+    if (typeof (options && options.flattenMaps) === 'boolean' ? options.flattenMaps : true) {
       const ret = {};
       const keys = this.keys();
       for (const key of keys) {

package/lib/utils.js

@@ -12,6 +12,8 @@ const PopulateOptions = require('./options/PopulateOptions');
 const clone = require('./helpers/clone');
 const immediate = require('./helpers/immediate');
 const isObject = require('./helpers/isObject');
+const isMongooseArray = require('./types/array/isMongooseArray');
+const isMongooseDocumentArray = require('./types/DocumentArray/isMongooseDocumentArray');
 const isBsonType = require('./helpers/isBsonType');
 const getFunctionName = require('./helpers/getFunctionName');
 const isMongooseObject = require('./helpers/isMongooseObject');
@@ -24,6 +26,11 @@ let Document;
 
 exports.specialProperties = specialProperties;
 
+exports.isMongooseArray = isMongooseArray.isMongooseArray;
+exports.isMongooseDocumentArray = isMongooseDocumentArray.isMongooseDocumentArray;
+exports.registerMongooseArray = isMongooseArray.registerMongooseArray;
+exports.registerMongooseDocumentArray = isMongooseDocumentArray.registerMongooseDocumentArray;
+
 /*!
  * Produces a collection name from model `name`. By default, just returns
  * the model name
@@ -488,13 +495,9 @@ exports.expires = function expires(object) {
     return;
   }
 
-  let when;
-  if (typeof object.expires !== 'string') {
-    when = object.expires;
-  } else {
-    when = Math.round(ms(object.expires) / 1000);
-  }
-  object.expireAfterSeconds = when;
+  object.expireAfterSeconds = (typeof object.expires !== 'string')
+    ? object.expires
+    : Math.round(ms(object.expires) / 1000);
   delete object.expires;
 };