mongoose 5.4.23 → 5.5.3

package/lib/types/array.js

@@ -13,6 +13,7 @@ const internalToObjectOptions = require('../options').internalToObjectOptions;
 const utils = require('../utils');
 const util = require('util');
 
+const arrayParentSymbol = require('../helpers/symbols').arrayParentSymbol;
 const isMongooseObject = utils.isMongooseObject;
 
 /**
@@ -53,7 +54,7 @@ function MongooseArray(values, path, doc) {
   // RB Jun 17, 2015 updated to check for presence of expected paths instead
   // to make more proof against unusual node environments
   if (doc && doc instanceof Document) {
-    arr._parent = doc;
+    arr[arrayParentSymbol] = doc;
     arr._schema = doc.schema.path(path);
   }
 
@@ -77,15 +78,13 @@ MongooseArray.mixin = {
 
   _atomics: undefined,
 
-  /**
-   * Parent owner document
-   *
-   * @property _parent
-   * @api private
-   * @memberOf MongooseArray
+  /*!
+   * ignore
    */
 
-  _parent: undefined,
+  $parent: function() {
+    return this[arrayParentSymbol];
+  },
 
   /**
    * Casts a member based on this arrays schema.
@@ -101,8 +100,8 @@ MongooseArray.mixin = {
     let populated = false;
     let Model;
 
-    if (this._parent) {
-      populated = this._parent.populated(this._path, true);
+    if (this[arrayParentSymbol]) {
+      populated = this[arrayParentSymbol].populated(this._path, true);
     }
 
     if (populated && value !== null && value !== undefined) {
@@ -123,10 +122,10 @@ MongooseArray.mixin = {
       if (!isDisc) {
         value = new Model(value);
       }
-      return this._schema.caster.applySetters(value, this._parent, true);
+      return this._schema.caster.applySetters(value, this[arrayParentSymbol], true);
     }
 
-    return this._schema.caster.applySetters(value, this._parent, false);
+    return this._schema.caster.applySetters(value, this[arrayParentSymbol], false);
   },
 
   /**
@@ -142,7 +141,7 @@ MongooseArray.mixin = {
    */
 
   _markModified: function(elem, embeddedPath) {
-    const parent = this._parent;
+    const parent = this[arrayParentSymbol];
     let dirtyPath;
 
     if (parent) {
@@ -179,7 +178,7 @@ MongooseArray.mixin = {
       // $set takes precedence over all other ops.
       // mark entire array modified.
       this._atomics = {$set: val};
-      cleanModifiedSubpaths(this._parent, this._path);
+      cleanModifiedSubpaths(this[arrayParentSymbol], this._path);
       this._markModified();
       return this;
     }
@@ -189,7 +188,7 @@ MongooseArray.mixin = {
     // reset pop/shift after save
     if (op === '$pop' && !('$pop' in atomics)) {
       const _this = this;
-      this._parent.once('save', function() {
+      this[arrayParentSymbol].once('save', function() {
         _this._popped = _this._shifted = null;
       });
     }
@@ -322,7 +321,7 @@ MongooseArray.mixin = {
   push: function() {
     _checkManualPopulation(this, arguments);
     let values = [].map.call(arguments, this._mapCast, this);
-    values = this._schema.applySetters(values, this._parent, undefined,
+    values = this._schema.applySetters(values, this[arrayParentSymbol], undefined,
       undefined, { skipDocumentArrayCast: true });
     const ret = [].push.apply(this, values);
 
@@ -527,7 +526,7 @@ MongooseArray.mixin = {
 
   pull: function() {
     const values = [].map.call(arguments, this._cast, this);
-    const cur = this._parent.get(this._path);
+    const cur = this[arrayParentSymbol].get(this._path);
     let i = cur.length;
     let mem;
 
@@ -559,7 +558,7 @@ MongooseArray.mixin = {
     // `doc.children[1].name = 'test';` followed by
     // `doc.children.remove(doc.children[0]);`. In this case we fall back
     // to a `$set` on the whole array. See #3511
-    if (cleanModifiedSubpaths(this._parent, this._path) > 0) {
+    if (cleanModifiedSubpaths(this[arrayParentSymbol], this._path) > 0) {
       this._registerAtomic('$set', this);
     }
 
@@ -613,7 +612,7 @@ MongooseArray.mixin = {
     _checkManualPopulation(this, arguments);
 
     let values = [].map.call(arguments, this._cast, this);
-    values = this._schema.applySetters(values, this._parent);
+    values = this._schema.applySetters(values, this[arrayParentSymbol]);
     [].unshift.apply(this, values);
     this._registerAtomic('$set', this);
     this._markModified();
@@ -659,7 +658,7 @@ MongooseArray.mixin = {
     _checkManualPopulation(this, arguments);
 
     let values = [].map.call(arguments, this._mapCast, this);
-    values = this._schema.applySetters(values, this._parent);
+    values = this._schema.applySetters(values, this[arrayParentSymbol]);
     const added = [];
     let type = '';
     if (values[0] instanceof EmbeddedDocument) {
@@ -835,7 +834,7 @@ function _checkManualPopulation(arr, docs) {
   if (arr.length === 0 &&
       docs.length > 0) {
     if (_isAllSubdocs(docs, ref)) {
-      arr._parent.populated(arr._path, [], { model: docs[0].constructor });
+      arr[arrayParentSymbol].populated(arr._path, [], { model: docs[0].constructor });
     }
   }
 }

package/lib/types/buffer.js

@@ -56,49 +56,23 @@ function MongooseBuffer(value, encode, offset) {
   buf.isMongooseBuffer = true;
 
   // make sure these internal props don't show up in Object.keys()
-  Object.defineProperties(buf, {
-    validators: {
-      value: [],
-      enumerable: false
-    },
-    _path: {
-      value: path,
-      enumerable: false
-    },
-    _parent: {
-      value: doc,
-      enumerable: false
-    }
-  });
-
-  if (doc && typeof path === 'string') {
-    Object.defineProperty(buf, '_schema', {
-      value: doc.schema.path(path)
-    });
-  }
+  buf[MongooseBuffer.pathSymbol] = path;
+  buf[parentSymbol] = doc;
 
   buf._subtype = 0;
   return buf;
 }
 
+const pathSymbol = Symbol.for('mongoose#Buffer#_path');
+const parentSymbol = Symbol.for('mongoose#Buffer#_parent');
+MongooseBuffer.pathSymbol = pathSymbol;
+
 /*!
  * Inherit from Buffer.
  */
 
-// MongooseBuffer.prototype = Buffer.alloc(0);
-
 MongooseBuffer.mixin = {
 
-  /**
-   * Parent owner document
-   *
-   * @api private
-   * @property _parent
-   * @receiver MongooseBuffer
-   */
-
-  _parent: undefined,
-
   /**
    * Default subtype for the Binary representing this Buffer
    *
@@ -118,10 +92,10 @@ MongooseBuffer.mixin = {
    */
 
   _markModified: function() {
-    const parent = this._parent;
+    const parent = this[parentSymbol];
 
     if (parent) {
-      parent.markModified(this._path);
+      parent.markModified(this[MongooseBuffer.pathSymbol]);
     }
     return this;
   },

package/lib/types/documentarray.js

@@ -14,6 +14,7 @@ const internalToObjectOptions = require('../options').internalToObjectOptions;
 const util = require('util');
 const utils = require('../utils');
 
+const arrayParentSymbol = require('../helpers/symbols').arrayParentSymbol;
 const documentArrayParent = require('../helpers/symbols').documentArrayParent;
 
 /*!
@@ -56,7 +57,7 @@ function MongooseDocumentArray(values, path, doc) {
   if (Array.isArray(values)) {
     if (values instanceof CoreMongooseArray &&
         values._path === path &&
-        values._parent === doc) {
+        values[arrayParentSymbol] === doc) {
       props._atomics = Object.assign({}, values._atomics);
     }
     values.forEach(v => {
@@ -93,7 +94,7 @@ function MongooseDocumentArray(values, path, doc) {
   // RB Jun 17, 2015 updated to check for presence of expected paths instead
   // to make more proof against unusual node environments
   if (doc && doc instanceof Document) {
-    arr._parent = doc;
+    arr[arrayParentSymbol] = doc;
     arr._schema = doc.schema.path(path);
 
     // `schema.path()` doesn't drill into nested arrays properly yet, see
@@ -153,7 +154,7 @@ MongooseDocumentArray.mixin = {
         (value && value.constructor && value.constructor.baseCasterConstructor === Constructor)) {
       if (!(value[documentArrayParent] && value.__parentArray)) {
         // value may have been created using array.create()
-        value[documentArrayParent] = this._parent;
+        value[documentArrayParent] = this[arrayParentSymbol];
         value.__parentArray = this;
       }
       value.$setIndex(index);

package/lib/types/embedded.js

@@ -30,7 +30,7 @@ const validatorErrorSymbol = require('../helpers/symbols').validatorErrorSymbol;
 function EmbeddedDocument(obj, parentArr, skipId, fields, index) {
   if (parentArr) {
     this.__parentArray = parentArr;
-    this[documentArrayParent] = parentArr._parent;
+    this[documentArrayParent] = parentArr.$parent();
   } else {
     this.__parentArray = undefined;
     this[documentArrayParent] = undefined;

package/lib/types/subdocument.js

@@ -18,13 +18,30 @@ module.exports = Subdocument;
 
 function Subdocument(value, fields, parent, skipId, options) {
   this.$isSingleNested = true;
+
+  const hasPriorDoc = options != null && options.priorDoc;
+  let initedPaths = null;
+  if (hasPriorDoc) {
+    this._doc = Object.assign({}, options.priorDoc._doc);
+    delete this._doc[this.schema.options.discriminatorKey];
+    initedPaths = Object.keys(options.priorDoc._doc || {}).
+      filter(key => key !== this.schema.options.discriminatorKey);
+  }
   if (parent != null) {
     // If setting a nested path, should copy isNew from parent re: gh-7048
     options = Object.assign({}, options, { isNew: parent.isNew });
   }
   Document.call(this, value, fields, skipId, options);
 
-  delete this.$__.$options.priorDoc;
+  if (hasPriorDoc) {
+    for (const key of initedPaths) {
+      if (!this.$__.activePaths.states.modify[key] &&
+          !this.$__.activePaths.states.default[key] &&
+          !this.$__.$setCalled.has(key)) {
+        delete this._doc[key];
+      }
+    }
+  }
 }
 
 Subdocument.prototype = Object.create(Document.prototype);
@@ -98,6 +115,15 @@ Subdocument.prototype.markModified = function(path) {
   }
 };
 
+/**
+ * Marks a path as valid, removing existing validation errors.
+ *
+ * @param {String} path the field to mark as valid
+ * @api private
+ * @method $markValid
+ * @receiver EmbeddedDocument
+ */
+
 Subdocument.prototype.$markValid = function(path) {
   Document.prototype.$markValid.call(this, path);
   if (this.$parent && this.$basePath) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.4.23",
+  "version": "5.5.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,17 +20,18 @@
   "license": "MIT",
   "dependencies": {
     "async": "2.6.1",
-    "bson": "~1.1.0",
+    "bson": "~1.1.1",
     "kareem": "2.3.0",
-    "mongodb": "3.1.13",
-    "mongodb-core": "3.1.11",
+    "mongodb": "3.2.2",
+    "mongodb-core": "3.2.2",
     "mongoose-legacy-pluralize": "1.0.2",
     "mpath": "0.5.1",
     "mquery": "3.2.0",
     "ms": "2.1.1",
     "regexp-clone": "0.0.1",
     "safe-buffer": "5.1.2",
-    "sliced": "1.0.1"
+    "sliced": "1.0.1",
+    "sift": "7.0.1"
   },
   "devDependencies": {
     "acorn": "5.7.3",