mongoose 6.3.9 → 6.4.2

package/lib/cast/date.js

@@ -38,4 +38,4 @@ module.exports = function castDate(value) {
   }
 
   assert.ok(false);
-};
+};

package/lib/cast/decimal128.js

@@ -33,4 +33,4 @@ module.exports = function castDecimal128(value) {
   }
 
   assert.ok(false);
-};
+};

package/lib/cast/objectid.js

@@ -26,4 +26,4 @@ module.exports = function castObjectId(value) {
   }
 
   return new ObjectId(value);
-};
+};

package/lib/cast.js

@@ -374,4 +374,4 @@ function _cast(val, numbertype, context) {
       }
     }
   }
-}
+}

package/lib/connection.js

@@ -697,6 +697,18 @@ Connection.prototype.openUri = function(uri, options, callback) {
       typeof callback + '"');
   }
 
+  if (this._destroyCalled) {
+    const error = 'Connection has been closed and destroyed, and cannot be used for re-opening the connection. ' +
+    'Please create a new connection with `mongoose.createConnection()` or `mongoose.connect()`.';
+    if (typeof callback === 'function') {
+      callback(error);
+      return;
+    }
+    else {
+      throw new MongooseError(error);
+    }
+  }
+
   if (this.readyState === STATES.connecting || this.readyState === STATES.connected) {
     if (this._connectionString !== uri) {
       throw new MongooseError('Can\'t call `openUri()` on an active connection with ' +
@@ -901,6 +913,23 @@ function _setClient(conn, client, options, dbName) {
   }
 }
 
+Connection.prototype.destroy = function(force, callback) {
+  if (typeof force === 'function') {
+    callback = force;
+    force = false;
+  }
+
+  if (force != null && typeof force === 'object') {
+    this.$wasForceClosed = !!force.force;
+  } else {
+    this.$wasForceClosed = !!force;
+  }
+
+  return promiseOrCallback(callback, cb => {
+    this._close(force, true, cb);
+  });
+};
+
 /**
  * Closes the connection
  *
@@ -923,7 +952,7 @@ Connection.prototype.close = function(force, callback) {
   }
 
   return promiseOrCallback(callback, cb => {
-    this._close(force, cb);
+    this._close(force, false, cb);
   });
 };
 
@@ -931,19 +960,26 @@ Connection.prototype.close = function(force, callback) {
  * Handles closing the connection
  *
  * @param {Boolean} force
+ * @param {Boolean} destroy
  * @param {Function} callback
  * @api private
  */
-Connection.prototype._close = function(force, callback) {
+Connection.prototype._close = function(force, destroy, callback) {
   const _this = this;
   const closeCalled = this._closeCalled;
   this._closeCalled = true;
+  this._destroyCalled = destroy;
   if (this.client != null) {
     this.client._closeCalled = true;
+    this.client._destroyCalled = destroy;
   }
 
+  const conn = this;
   switch (this.readyState) {
     case STATES.disconnected:
+      if (destroy && this.base.connections.indexOf(conn) !== -1) {
+        this.base.connections.splice(this.base.connections.indexOf(conn), 1);
+      }
       if (closeCalled) {
         callback();
       } else {
@@ -963,6 +999,9 @@ Connection.prototype._close = function(force, callback) {
         if (err) {
           return callback(err);
         }
+        if (destroy && _this.base.connections.indexOf(conn) !== -1) {
+          _this.base.connections.splice(_this.base.connections.indexOf(conn), 1);
+        }
         _this.onClose(force);
         callback(null);
       });
@@ -970,12 +1009,15 @@ Connection.prototype._close = function(force, callback) {
       break;
     case STATES.connecting:
       this.once('open', function() {
-        _this.close(callback);
+        destroy ? _this.destroy(force, callback) : _this.close(force, callback);
       });
       break;
 
     case STATES.disconnecting:
       this.once('close', function() {
+        if (destroy && _this.base.connections.indexOf(conn) !== -1) {
+          _this.base.connections.splice(_this.base.connections.indexOf(conn), 1);
+        }
         callback();
       });
       break;
@@ -1004,7 +1046,7 @@ Connection.prototype.onClose = function(force) {
   this.emit('close', force);
 
   for (const db of this.otherDbs) {
-    db.close({ force: force, skipCloseClient: true });
+    this._destroyCalled ? db.destroy({ force: force, skipCloseClient: true }) : db.close({ force: force, skipCloseClient: true });
   }
 };
 
@@ -1026,7 +1068,7 @@ Connection.prototype.collection = function(name, options) {
   };
   options = Object.assign({}, defaultOptions, options ? utils.clone(options) : {});
   options.$wasForceClosed = this.$wasForceClosed;
-  const Collection = driver.get().Collection;
+  const Collection = this.base && this.base.__driver && this.base.__driver.Collection || driver.get().Collection;
   if (!(name in this.collections)) {
     this.collections[name] = new Collection(name, this, options);
   }

package/lib/document.js

@@ -1035,6 +1035,7 @@ Document.prototype.overwrite = function overwrite(obj) {
  * @param {Any} val the value to set
  * @param {Schema|String|Number|Buffer|*} [type] optionally specify a type for "on-the-fly" attributes
  * @param {Object} [options] optionally specify options that modify the behavior of the set
+ * @param {Boolean} [options.merge=false] if true, setting a [nested path](/docs/subdocs.html#subdocuments-versus-nested-paths) will merge existing values rather than overwrite the whole object. So `doc.set('nested', { a: 1, b: 2 })` becomes `doc.set('nested.a', 1); doc.set('nested.b', 2);`
  * @method $set
  * @name $set
  * @memberOf Document
@@ -2486,7 +2487,7 @@ function _getPathsToValidate(doc) {
       const fullPathToSubdoc = subdoc.$__fullPathWithIndexes();
 
       for (const p of paths) {
-        if (p === null || p.startsWith(fullPathToSubdoc + '.')) {
+        if (p == null || p.startsWith(fullPathToSubdoc + '.')) {
           paths.delete(p);
         }
       }
@@ -2507,6 +2508,14 @@ function _getPathsToValidate(doc) {
       continue;
     }
 
+    if (_pathType.$isMongooseDocumentArray) {
+      for (const p of paths) {
+        if (p == null || p.startsWith(_pathType.path + '.')) {
+          paths.delete(p);
+        }
+      }
+    }
+
     // Optimization: if primitive path with no validators, or array of primitives
     // with no validators, skip validating this path entirely.
     if (!_pathType.caster && _pathType.validators.length === 0) {
@@ -3145,8 +3154,7 @@ Document.prototype.$__reset = function reset() {
       if (subdoc.$isDocumentArrayElement) {
         if (!resetArrays.has(subdoc.parentArray())) {
           const array = subdoc.parentArray();
-          // Mark path to array as init for gh-6818
-          this.$__.activePaths.init(fullPathWithIndexes.replace(/\.\d+$/, '').slice(-subdoc.$basePath - 1));
+          this.$__.activePaths.clearPath(fullPathWithIndexes.replace(/\.\d+$/, '').slice(-subdoc.$basePath - 1));
           array[arrayAtomicsBackupSymbol] = array[arrayAtomicsSymbol];
           array[arrayAtomicsSymbol] = {};
 
@@ -3154,7 +3162,7 @@ Document.prototype.$__reset = function reset() {
         }
       } else {
         if (subdoc.$parent() === this) {
-          this.$__.activePaths.init(subdoc.$basePath);
+          this.$__.activePaths.clearPath(subdoc.$basePath);
         } else if (subdoc.$parent() != null && subdoc.$parent().$isSubdocument) {
           // If map path underneath subdocument, may end up with a case where
           // map path is modified but parent still needs to be reset. See gh-10295
@@ -4262,10 +4270,10 @@ Document.prototype.$getPopulatedDocs = function $getPopulatedDocs() {
  *
  * #### Example:
  *
- *     Model.findOne().populate('author').exec(function (err, doc) {
- *       console.log(doc.author.name)         // Dr.Seuss
- *       console.log(doc.populated('author')) // '5144cf8050f071d979c118a7'
- *     })
+ *     const doc = await Model.findOne().populate('author');
+ *
+ *     console.log(doc.author.name); // Dr.Seuss
+ *     console.log(doc.populated('author')); // '5144cf8050f071d979c118a7'
  *
  * If the path was not populated, returns `undefined`.
  *
@@ -4319,6 +4327,38 @@ Document.prototype.populated = function(path, val, options) {
 
 Document.prototype.$populated = Document.prototype.populated;
 
+/**
+ * Throws an error if a given path is not populated
+ *
+ * #### Example:
+ *
+ *     const doc = await Model.findOne().populate('author');
+ *
+ *     doc.$assertPopulated('author'); // does not throw
+ *     doc.$assertPopulated('other path'); // throws an error
+ *
+ *
+ * @param {String|Array<String>} path
+ * @return {Document} this
+ * @memberOf Document
+ * @method $assertPopulated
+ * @instance
+ * @api public
+ */
+
+Document.prototype.$assertPopulated = function $assertPopulated(paths) {
+  if (Array.isArray(paths)) {
+    paths.forEach(path => this.$assertPopulated(path));
+    return this;
+  }
+
+  if (!this.$populated(paths)) {
+    throw new MongooseError(`Expected path "${paths}" to be populated`);
+  }
+
+  return this;
+};
+
 /**
  * Takes a populated field and returns it to its unpopulated state.
  *

package/lib/drivers/node-mongodb-native/index.js

@@ -9,4 +9,4 @@ exports.Collection = require('./collection');
 exports.Decimal128 = require('./decimal128');
 exports.ObjectId = require('./objectid');
 exports.ReadPreference = require('./ReadPreference');
-exports.getConnection = () => require('./connection');
+exports.getConnection = () => require('./connection');

package/lib/error/parallelValidate.js

@@ -28,4 +28,4 @@ Object.defineProperty(ParallelValidateError.prototype, 'name', {
  * exports
  */
 
-module.exports = ParallelValidateError;
+module.exports = ParallelValidateError;

package/lib/helpers/aggregate/prepareDiscriminatorPipeline.js

@@ -34,4 +34,4 @@ module.exports = function prepareDiscriminatorPipeline(pipeline, schema, prefix)
       originalPipeline.unshift({ $match: match });
     }
   }
-};
+};

package/lib/helpers/aggregate/stringifyFunctionOperators.js

@@ -47,4 +47,4 @@ function handleAccumulator(operator) {
       operator.$accumulator[key] = String(operator.$accumulator[key]);
     }
   }
-}
+}

package/lib/helpers/arrayDepth.js

@@ -30,4 +30,4 @@ function arrayDepth(arr) {
   res.max = res.max + 1;
 
   return res;
-}
+}

package/lib/helpers/cursor/eachAsync.js

@@ -189,4 +189,4 @@ function createEachAsyncMultiError(aggregatedErrors) {
   }
 
   return new EachAsyncMultiError(aggregatedErrors);
-}
+}

package/lib/helpers/discriminator/areDiscriminatorValuesEqual.js

@@ -13,4 +13,4 @@ module.exports = function areDiscriminatorValuesEqual(a, b) {
     return a.toString() === b.toString();
   }
   return false;
-};
+};

package/lib/helpers/discriminator/checkEmbeddedDiscriminatorKeyProjection.js

@@ -9,4 +9,4 @@ module.exports = function checkEmbeddedDiscriminatorKeyProjection(userProjection
       addedPaths[0] === _discriminatorKey) {
     selected.splice(selected.indexOf(_discriminatorKey), 1);
   }
-};
+};

package/lib/helpers/discriminator/getConstructor.js

@@ -22,4 +22,4 @@ module.exports = function getConstructor(Constructor, value) {
   }
 
   return Constructor;
-};
+};

package/lib/helpers/discriminator/getDiscriminatorByValue.js

@@ -24,4 +24,4 @@ module.exports = function getDiscriminatorByValue(discriminators, value) {
     }
   }
   return null;
-};
+};

package/lib/helpers/discriminator/getSchemaDiscriminatorByValue.js

@@ -23,4 +23,4 @@ module.exports = function getSchemaDiscriminatorByValue(schema, value) {
     }
   }
   return null;
-};
+};

package/lib/helpers/document/handleSpreadDoc.js

@@ -32,4 +32,4 @@ module.exports = function handleSpreadDoc(v, includeExtraKeys) {
   }
 
   return v;
-};
+};

package/lib/helpers/each.js

@@ -22,4 +22,4 @@ module.exports = function each(arr, cb, done) {
       }
     });
   }
-};
+};

package/lib/helpers/get.js

@@ -61,4 +61,4 @@ function getProperty(obj, prop) {
     return obj.get(prop);
   }
   return obj[prop];
-}
+}

package/lib/helpers/getConstructorName.js

@@ -12,4 +12,4 @@ module.exports = function getConstructorName(val) {
     return void 0;
   }
   return val.constructor.name;
-};
+};

package/lib/helpers/getDefaultBulkwriteResult.js

@@ -24,4 +24,4 @@ function getDefaultBulkwriteResult() {
   };
 }
 
-module.exports = getDefaultBulkwriteResult;
+module.exports = getDefaultBulkwriteResult;

package/lib/helpers/indexes/applySchemaCollation.js

@@ -10,4 +10,4 @@ module.exports = function applySchemaCollation(indexKeys, indexOptions, schemaOp
   if (schemaOptions.hasOwnProperty('collation') && !indexOptions.hasOwnProperty('collation')) {
     indexOptions.collation = schemaOptions.collation;
   }
-};
+};

package/lib/helpers/indexes/decorateDiscriminatorIndexOptions.js

@@ -11,4 +11,4 @@ module.exports = function decorateDiscriminatorIndexOptions(schema, indexOptions
     indexOptions.partialFilterExpression[discriminatorKey] = discriminatorName;
   }
   return indexOptions;
-};
+};

package/lib/helpers/indexes/isDefaultIdIndex.js

@@ -15,4 +15,4 @@ module.exports = function isDefaultIdIndex(index) {
 
   const key = get(index, 'key', {});
   return Object.keys(key).length === 1 && key.hasOwnProperty('_id');
-};
+};

package/lib/helpers/indexes/isTextIndex.js

@@ -13,4 +13,4 @@ module.exports = function isTextIndex(indexKeys) {
   }
 
   return isTextIndex;
-};
+};

package/lib/helpers/isMongooseObject.js

@@ -19,4 +19,4 @@ module.exports = function(v) {
       v.$isMongooseMap // Map
     )
   );
-};
+};

package/lib/helpers/isObject.js

@@ -13,4 +13,4 @@ module.exports = function(arg) {
     Buffer.isBuffer(arg) ||
     Object.prototype.toString.call(arg) === '[object Object]'
   );
-};
+};

package/lib/helpers/isPromise.js

@@ -3,4 +3,4 @@ function isPromise(val) {
   return !!val && (typeof val === 'object' || typeof val === 'function') && typeof val.then === 'function';
 }
 
-module.exports = isPromise;
+module.exports = isPromise;

package/lib/helpers/model/applyHooks.js

@@ -135,4 +135,4 @@ function applyHooks(model, schema, options) {
     objToDecorate[`$__${method}`] = middleware.
       createWrapper(method, originalMethod, null, customMethodOptions);
   }
-}
+}

package/lib/helpers/model/applyStaticHooks.js

@@ -68,4 +68,4 @@ module.exports = function applyStaticHooks(model, hooks, statics) {
       };
     }
   }
-};
+};

package/lib/helpers/once.js

@@ -9,4 +9,4 @@ module.exports = function once(fn) {
     called = true;
     return fn.apply(null, arguments);
   };
-};
+};

package/lib/helpers/path/flattenObjectWithDottedPaths.js

@@ -35,4 +35,4 @@ module.exports = function flattenObjectWithDottedPaths(obj) {
 
     flattenObjectWithDottedPaths(obj[key]);
   }
-};
+};

package/lib/helpers/path/parentPaths.js

@@ -15,4 +15,4 @@ module.exports = function parentPaths(path) {
   }
 
   return ret;
-};
+};

package/lib/helpers/path/setDottedPath.js

@@ -30,4 +30,4 @@ module.exports = function setDottedPath(obj, path, val) {
   if (!specialProperties.has(last)) {
     cur[last] = val;
   }
-};
+};

package/lib/helpers/pluralize.js

@@ -91,4 +91,4 @@ function pluralize(str) {
     }
   }
   return str;
-}
+}

package/lib/helpers/populate/SkipPopulateValue.js

@@ -7,4 +7,4 @@ module.exports = function SkipPopulateValue(val) {
 
   this.val = val;
   return this;
-};
+};

package/lib/helpers/populate/assignRawDocsToIdStructure.js

@@ -106,4 +106,4 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
       rawIds[i] = doc;
     });
   }
-}
+}

package/lib/helpers/populate/assignVals.js

@@ -320,4 +320,4 @@ function isPopulatedObject(obj) {
 
 function noop(v) {
   return v;
-}
+}

package/lib/helpers/populate/createPopulateQueryFilter.js

@@ -77,4 +77,4 @@ function _formatMatch(match) {
     return Object.assign({}, match[0]);
   }
   return Object.assign({}, match);
-}
+}

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -726,4 +726,4 @@ function _findRefPathForDiscriminators(doc, modelSchema, data, options, normaliz
   }
 
   return modelNames;
-}
+}

package/lib/helpers/populate/leanPopulateMap.js

@@ -4,4 +4,4 @@
  * ignore
  */
 
-module.exports = new WeakMap();
+module.exports = new WeakMap();

package/lib/helpers/populate/lookupLocalFields.js

@@ -37,4 +37,4 @@ module.exports = function lookupLocalFields(cur, path, val) {
   }
 
   return cur[path];
-};
+};

package/lib/helpers/populate/markArraySubdocsPopulated.js

@@ -39,4 +39,4 @@ module.exports = function markArraySubdocsPopulated(doc, populated) {
       }
     }
   }
-};
+};

package/lib/helpers/populate/modelNamesFromRefPath.js

@@ -65,4 +65,4 @@ module.exports = function modelNamesFromRefPath(refPath, doc, populatedPath, mod
   modelNames = utils.array.flatten(modelNames);
 
   return modelNames;
-};
+};

package/lib/helpers/populate/removeDeselectedForeignField.js

@@ -28,4 +28,4 @@ module.exports = function removeDeselectedForeignField(foreignFields, options, d
       }
     }
   }
-};
+};

package/lib/helpers/populate/validateRef.js

@@ -16,4 +16,4 @@ function validateRef(ref, path) {
 
   throw new MongooseError('Invalid ref at path "' + path + '". Got ' +
     util.inspect(ref, { depth: 0 }));
-}
+}

package/lib/helpers/printJestWarning.js

@@ -14,4 +14,4 @@ if (typeof jest !== 'undefined' && process.nextTick.toString().indexOf('nextTick
     'with Jest\'s mock timers enabled. Please make sure you read ' +
     'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
     'https://mongoosejs.com/docs/jest.html');
-}
+}

package/lib/helpers/processConnectionOptions.js

@@ -9,7 +9,7 @@ function processConnectionOptions(uri, options) {
     ? opts.readPreference
     : getUriReadPreference(uri);
 
-  const resolvedOpts = (readPreference && readPreference !== 'primary')
+  const resolvedOpts = (readPreference && readPreference !== 'primary' && readPreference !== 'primaryPreferred')
     ? resolveOptsConflicts(readPreference, opts)
     : opts;
 

package/lib/helpers/projection/applyProjection.js

@@ -74,4 +74,4 @@ function applyInclusiveProjection(doc, projection, hasIncludedChildren, projecti
     }
   }
   return ret;
-}
+}

package/lib/helpers/projection/hasIncludedChildren.js

@@ -33,4 +33,4 @@ module.exports = function hasIncludedChildren(fields) {
   }
 
   return hasIncludedChildren;
-};
+};

package/lib/helpers/projection/parseProjection.js

@@ -30,4 +30,4 @@ module.exports = function parseProjection(v, retainMinusPaths) {
   }
 
   return ret;
-};
+};

package/lib/helpers/query/applyGlobalOption.js

@@ -26,4 +26,4 @@ function applyGlobalOption(options, model, optionName) {
   } else if (utils.hasUserDefinedProperty(model.base.options, optionName)) {
     options[optionName] = model.base.options[optionName];
   }
-}
+}

package/lib/helpers/query/applyQueryMiddleware.js

@@ -75,4 +75,4 @@ function _getContexts(hook) {
     ret.document = hook.document;
   }
   return ret;
-}
+}

package/lib/helpers/query/cast$expr.js

@@ -279,4 +279,4 @@ function isLiteral(val) {
     return val.$literal != null;
   }
   return true;
-}
+}

package/lib/helpers/query/castFilterPath.js

@@ -51,4 +51,4 @@ module.exports = function castFilterPath(query, schematype, val) {
   }
 
   return val;
-};
+};

package/lib/helpers/query/sanitizeFilter.js

@@ -35,4 +35,4 @@ module.exports = function sanitizeFilter(filter) {
   }
 
   return filter;
-};
+};

package/lib/helpers/query/sanitizeProjection.js

@@ -11,4 +11,4 @@ module.exports = function sanitizeProjection(projection) {
       projection[keys[i]] = 1;
     }
   }
-};
+};

package/lib/helpers/query/trusted.js

@@ -10,4 +10,4 @@ exports.trusted = function trusted(obj) {
   }
   obj[trustedSymbol] = true;
   return obj;
-};
+};

package/lib/helpers/query/validOps.js

@@ -21,4 +21,4 @@ module.exports = Object.freeze([
   'findOneAndDelete',
   'findOneAndRemove',
   'remove'
-]);
+]);