mongoose 6.0.13 → 6.1.1

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

@@ -214,14 +214,11 @@ function iter(i) {
     } catch (error) {
       // Collection operation may throw because of max bson size, catch it here
       // See gh-3906
-      if (typeof callback === 'function') {
-        callback(error);
-      } else {
-        this.conn.emit('operation-end', { _id: opId, modelName: _this.modelName, collectionName: this.name, method: i, error: error });
-      }
       if (typeof lastArg === 'function') {
-        lastArg(error);
+        return lastArg(error);
       } else {
+        this.conn.emit('operation-end', { _id: opId, modelName: _this.modelName, collectionName: this.name, method: i, error: error });
+
         throw error;
       }
     }

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

@@ -146,6 +146,7 @@ NativeConnection.prototype.doClose = function(force, fn) {
   return this;
 };
 
+
 /*!
  * Module exports.
  */

package/lib/helpers/populate/assignVals.js

@@ -73,9 +73,6 @@ module.exports = function assignVals(o) {
 
       return valueFilter(val[0], options, populateOptions, _allIds);
     } else if (o.justOne === false && !Array.isArray(val)) {
-      if (val === null && o.isVirtual) {
-        return void 0;
-      }
       return valueFilter([val], options, populateOptions, _allIds);
     }
     return valueFilter(val, options, populateOptions, _allIds);
@@ -133,6 +130,9 @@ module.exports = function assignVals(o) {
       docs[i].$populated(_path, o.justOne ? originalIds[0] : originalIds, o.allOptions);
       // If virtual populate and doc is already init-ed, need to walk through
       // the actual doc to set rather than setting `_doc` directly
+      if (Array.isArray(valueToSet)) {
+        valueToSet = valueToSet.map(v => v == null ? void 0 : v);
+      }
       mpath.set(_path, valueToSet, docs[i], void 0, setValue, false);
       continue;
     }
@@ -170,7 +170,7 @@ module.exports = function assignVals(o) {
     }
     if (docs[i].$__) {
       o.allOptions.options[populateModelSymbol] = o.allOptions.model;
-      docs[i].$populated(_path, o.allIds[i], o.allOptions.options);
+      docs[i].$populated(_path, o.unpopulatedValues[i], o.allOptions.options);
 
       if (valueToSet instanceof Map && !valueToSet.$isMongooseMap) {
         valueToSet = new MongooseMap(valueToSet, _path, docs[i], docs[i].schema.path(_path).$__schemaType);

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -75,6 +75,20 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     let normalizedRefPath = null;
     let schemaOptions = null;
 
+    if (schema != null && schema.instance === 'Embedded' && schema.options.ref) {
+      const data = {
+        localField: options.path + '._id',
+        foreignField: '_id',
+        justOne: true
+      };
+      const res = _getModelNames(doc, schema, modelNameFromQuery, model);
+
+      const unpopulatedValue = mpath.get(options.path, doc);
+      const id = mpath.get('_id', unpopulatedValue);
+      addModelNamesToMap(model, map, available, res.modelNames, options, data, id, doc, schemaOptions, unpopulatedValue);
+      continue;
+    }
+
     if (Array.isArray(schema)) {
       const schemasArray = schema;
       for (const _schema of schemasArray) {
@@ -183,7 +197,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     let isRefPath = false;
     let justOne = null;
 
-    if (schema && schema.caster) {
+    if (schema && schema.instance === 'Array') {
       schema = schema.caster;
     }
     if (schema && schema.$isSchemaMap) {
@@ -305,7 +319,12 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     }
 
     if (!modelNames) {
-      return { modelNames: modelNames, justOne: justOne, isRefPath: isRefPath, refPath: refPath };
+      // `Model.populate()` on a POJO with no known local model. Default to using the `Model`
+      if (options._localModel == null) {
+        modelNames = [model.modelName];
+      } else {
+        return { modelNames: modelNames, justOne: justOne, isRefPath: isRefPath, refPath: refPath };
+      }
     }
 
     if (!Array.isArray(modelNames)) {
@@ -444,11 +463,16 @@ function _virtualPopulate(model, docs, options, _virtualRes) {
  * ignore
  */
 
-function addModelNamesToMap(model, map, available, modelNames, options, data, ret, doc, schemaOptions) {
+function addModelNamesToMap(model, map, available, modelNames, options, data, ret, doc, schemaOptions, unpopulatedValue) {
   // `PopulateOptions#connection`: if the model is passed as a string, the
   // connection matters because different connections have different models.
   const connection = options.connection != null ? options.connection : model.db;
 
+  unpopulatedValue = unpopulatedValue === void 0 ? ret : unpopulatedValue;
+  if (Array.isArray(unpopulatedValue)) {
+    unpopulatedValue = utils.cloneArrays(unpopulatedValue);
+  }
+
   if (modelNames == null) {
     return;
   }
@@ -510,6 +534,7 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
         docs: [doc],
         ids: [ids],
         allIds: [ret],
+        unpopulatedValues: [unpopulatedValue],
         localField: new Set([data.localField]),
         foreignField: new Set([data.foreignField]),
         justOne: data.justOne,
@@ -525,6 +550,7 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
       available[modelName].docs.push(doc);
       available[modelName].ids.push(ids);
       available[modelName].allIds.push(ret);
+      available[modelName].unpopulatedValues.push(unpopulatedValue);
       if (data.hasMatchFunction) {
         available[modelName].match.push(data.match);
       }
@@ -556,6 +582,8 @@ function _getLocalFieldValues(doc, localField, model, options, virtual, schema)
   const localFieldGetters = localFieldPath && localFieldPath.getters ?
     localFieldPath.getters : [];
 
+  localField = localFieldPath != null && localFieldPath.instance === 'Embedded' ? localField + '._id' : localField;
+
   const _populateOptions = get(options, 'options', {});
 
   const getters = 'getters' in _populateOptions ?

package/lib/helpers/projection/isSubpath.js

@@ -0,0 +1,13 @@
+'use strict';
+
+/*!
+ * Determines if `path2` is a subpath of or equal to `path1`
+ *
+ * @param {string} path1
+ * @param {string} path2
+ * @return {Boolean}
+ */
+
+module.exports = function isSubpath(path1, path2) {
+  return path1 === path2 || path2.startsWith(path1 + '.');
+};

package/lib/helpers/timestamps/setupTimestamps.js

@@ -46,7 +46,7 @@ module.exports = function setupTimestamps(schema, timestamps) {
 
     const defaultTimestamp = currentTime != null ?
       currentTime() :
-      (this.ownerDocument ? this.ownerDocument() : this).constructor.base.now();
+      this.ownerDocument().constructor.base.now();
     const auto_id = this._id && this._id.auto;
 
     if (!skipCreatedAt && createdAt && !this.$__getValue(createdAt) && this.$__isSelected(createdAt)) {

package/lib/helpers/update/castArrayFilters.js

@@ -10,7 +10,17 @@ module.exports = function castArrayFilters(query) {
   const update = query.getUpdate();
   const schema = query.schema;
   const updatedPathsByFilter = updatedPathsByArrayFilter(update);
-  const strictQuery = schema.options.strictQuery;
+
+  let strictQuery = schema.options.strict;
+  if (query._mongooseOptions.strict != null) {
+    strictQuery = query._mongooseOptions.strict;
+  }
+  if (schema._userProvidedOptions.strictQuery != null) {
+    strictQuery = schema._userProvidedOptions.strictQuery;
+  }
+  if (query._mongooseOptions.strictQuery != null) {
+    strictQuery = query._mongooseOptions.strictQuery;
+  }
 
   _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilter, query);
 };

package/lib/index.js

@@ -156,7 +156,7 @@ Mongoose.prototype.driver = driver;
  * - 'toObject': `{ transform: true, flattenDecimals: true }` by default. Overwrites default objects to [`toObject()`](/docs/api.html#document_Document-toObject)
  * - 'toJSON': `{ transform: true, flattenDecimals: true }` by default. Overwrites default objects to [`toJSON()`](/docs/api.html#document_Document-toJSON), for determining how Mongoose documents get serialized by `JSON.stringify()`
  * - 'strict': true by default, may be `false`, `true`, or `'throw'`. Sets the default strict mode for schemas.
- * - 'strictQuery': false by default, may be `false`, `true`, or `'throw'`. Sets the default [strictQuery](/docs/guide.html#strictQuery) mode for schemas.
+ * - 'strictQuery': same value as 'strict' by default (`true`), may be `false`, `true`, or `'throw'`. Sets the default [strictQuery](/docs/guide.html#strictQuery) mode for schemas.
  * - 'selectPopulatedPaths': true by default. Set to false to opt out of Mongoose adding all fields that you `populate()` to your `select()`. The schema-level option `selectPopulatedPaths` overwrites this one.
  * - 'maxTimeMS': If set, attaches [maxTimeMS](https://docs.mongodb.com/manual/reference/operator/meta/maxTimeMS/) to every query
  * - 'autoIndex': true by default. Set to false to disable automatic index creation for all models associated with this Mongoose instance.
@@ -984,6 +984,11 @@ Mongoose.prototype.isValidObjectId = function(v) {
   return false;
 };
 
+Mongoose.prototype.syncIndexes = function() {
+  const _mongoose = this instanceof Mongoose ? this : mongoose;
+  return _mongoose.connection.syncIndexes();
+};
+
 /**
  * The Mongoose Decimal128 [SchemaType](/docs/schematypes.html). Used for
  * declaring paths in your schema that should be

package/lib/internal.js

@@ -14,6 +14,7 @@ function InternalCache() {
 
   // embedded docs
   this.ownerDocument = undefined;
+  this.isSubDocument = undefined;
   this.fullPath = undefined;
 }
 

package/lib/model.js

@@ -343,15 +343,17 @@ Model.prototype.$__handleSave = function(options, callback) {
           where[key] = val;
         }
       }
-      this.constructor.exists(where, optionsWithCustomValues)
-        .then((documentExists) => {
+      this.constructor.exists(where, optionsWithCustomValues).
+        then((documentExists) => {
           if (!documentExists) {
-            throw new DocumentNotFoundError(this.$__where(), this.constructor.modelName);
+            const matchedCount = 0;
+            return callback(null, { $where: where, matchedCount });
           }
 
-          callback();
-        })
-        .catch(callback);
+          const matchedCount = 1;
+          callback(null, { $where: where, matchedCount });
+        }).
+        catch(callback);
       return;
     }
 
@@ -379,7 +381,7 @@ Model.prototype.$__save = function(options, callback) {
     if (get(options, 'safe.w') !== 0 && get(options, 'w') !== 0) {
       // Skip checking if write succeeded if writeConcern is set to
       // unacknowledged writes, because otherwise `numAffected` will always be 0
-      if (result) {
+      if (result != null) {
         if (Array.isArray(result)) {
           numAffected = result.length;
         } else if (result.matchedCount != null) {
@@ -916,7 +918,7 @@ Model.prototype.$__where = function _where(where) {
  *     })
  *
  *
- * As an extra measure of flow control, remove will return a Promise (bound to `fn` if passed) so it could be chained, or hooked to recieve errors
+ * As an extra measure of flow control, remove will return a Promise (bound to `fn` if passed) so it could be chained, or hooked to receive errors
  *
  * ####Example:
  *     product.remove().then(function (product) {
@@ -1336,14 +1338,18 @@ Model.createCollection = function createCollection(options, callback) {
     options = void 0;
   }
 
-  const schemaCollation = get(this, 'schema.options.collation', null);
+  const schemaCollation = get(this, ['schema', 'options', 'collation'], null);
   if (schemaCollation != null) {
     options = Object.assign({ collation: schemaCollation }, options);
   }
-  const capped = get(this, 'schema.options.capped');
+  const capped = get(this, ['schema', 'options', 'capped']);
   if (capped) {
     options = Object.assign({ capped: true }, capped, options);
   }
+  const timeseries = get(this, ['schema', 'options', 'timeseries']);
+  if (timeseries != null) {
+    options = Object.assign({ timeseries }, options);
+  }
 
   callback = this.$handleCallbackError(callback);
 
@@ -4410,7 +4416,6 @@ function _populate(model, docs, paths, cache, callback) {
   if (paths.length === 0) {
     return callback(null, docs);
   }
-
   // each path has its own query options and must be executed separately
   for (const path of paths) {
     populate(model, docs, path, next);
@@ -4434,6 +4439,11 @@ const excludeIdReg = /\s?-_id\s?/;
 const excludeIdRegGlobal = /\s?-_id\s?/g;
 
 function populate(model, docs, options, callback) {
+
+  const populateOptions = { ...options };
+  if (model.base.options.strictPopulate != null && options.strictPopulate == null) {
+    populateOptions.strictPopulate = model.base.options.strictPopulate;
+  }
   // normalize single / multiple docs passed
   if (!Array.isArray(docs)) {
     docs = [docs];
@@ -4442,7 +4452,7 @@ function populate(model, docs, options, callback) {
     return callback();
   }
 
-  const modelsMap = getModelsMapForPopulate(model, docs, options);
+  const modelsMap = getModelsMapForPopulate(model, docs, populateOptions);
   if (modelsMap instanceof MongooseError) {
     return immediate(function() {
       callback(modelsMap);
@@ -4707,6 +4717,7 @@ function _assign(model, vals, mod, assignmentOpts) {
     // If virtual, make sure to not mutate original field
     rawIds: mod.isVirtual ? allIds : mod.allIds,
     allIds: allIds,
+    unpopulatedValues: mod.unpopulatedValues,
     foreignField: mod.foreignField,
     rawDocs: rawDocs,
     rawOrder: rawOrder,

package/lib/options/SchemaTypeOptions.js

@@ -82,7 +82,7 @@ Object.defineProperty(SchemaTypeOptions.prototype, 'cast', opts);
 
 /**
  * If true, attach a required validator to this path, which ensures this path
- * path cannot be set to a nullish value. If a function, Mongoose calls the
+ * cannot be set to a nullish value. If a function, Mongoose calls the
  * function and only checks for nullish values if the function returns a truthy value.
  *
  * @api public

package/lib/plugins/clearValidating.js

@@ -9,7 +9,7 @@ module.exports = function(schema) {
   // in parallel. We need to clear `this.$__.validating` before post hooks for gh-8597
   const unshift = true;
   schema.s.hooks.post('validate', false, function() {
-    if (this.ownerDocument) {
+    if (this.$__.isSubDocument) {
       return;
     }
 
@@ -17,7 +17,7 @@ module.exports = function(schema) {
   }, unshift);
 
   schema.s.hooks.post('validate', false, function(error, res, next) {
-    if (this.ownerDocument) {
+    if (this.$__.isSubDocument) {
       next();
       return;
     }

package/lib/plugins/removeSubdocs.js

@@ -9,7 +9,7 @@ const each = require('../helpers/each');
 module.exports = function(schema) {
   const unshift = true;
   schema.s.hooks.pre('remove', false, function(next) {
-    if (this.ownerDocument) {
+    if (this.$__.isSubDocument) {
       next();
       return;
     }

package/lib/plugins/saveSubdocs.js

@@ -9,7 +9,7 @@ const each = require('../helpers/each');
 module.exports = function(schema) {
   const unshift = true;
   schema.s.hooks.pre('save', false, function(next) {
-    if (this.ownerDocument) {
+    if (this.$__.isSubDocument) {
       next();
       return;
     }
@@ -37,7 +37,7 @@ module.exports = function(schema) {
   }, null, unshift);
 
   schema.s.hooks.post('save', function(doc, next) {
-    if (this.ownerDocument) {
+    if (this.$__.isSubDocument) {
       next();
       return;
     }

package/lib/plugins/validateBeforeSave.js

@@ -9,7 +9,7 @@ module.exports = function(schema) {
   schema.pre('save', false, function validateBeforeSave(next, options) {
     const _this = this;
     // Nested docs have their own presave
-    if (this.ownerDocument) {
+    if (this.$__.isSubDocument) {
       return next();
     }
 

package/lib/query.js

@@ -25,6 +25,7 @@ const helpers = require('./queryhelpers');
 const immediate = require('./helpers/immediate');
 const isExclusive = require('./helpers/projection/isExclusive');
 const isInclusive = require('./helpers/projection/isInclusive');
+const isSubpath = require('./helpers/projection/isSubpath');
 const mquery = require('mquery');
 const parseProjection = require('./helpers/projection/parseProjection');
 const removeUnusedArrayFilters = require('./helpers/update/removeUnusedArrayFilters');
@@ -995,6 +996,10 @@ Query.prototype.projection = function(arg) {
  *     query.select({ a: 1, b: 1 });
  *     query.select({ c: 0, d: 0 });
  *
+ *     Additional calls to select can override the previous selection:
+ *     query.select({ a: 1, b: 1 }).select({ b: 0 }); // selection is now { a: 1 }
+ *     query.select({ a: 0, b: 0 }).select({ b: 1 }); // selection is now { a: 0 }
+ *
  *
  * @method select
  * @memberOf Query
@@ -1026,17 +1031,50 @@ Query.prototype.select = function select() {
     sanitizeProjection = this._mongooseOptions.sanitizeProjection;
   }
 
+  function sanitizeValue(value) {
+    return typeof value === 'string' && sanitizeProjection ? value = 1 : value;
+  }
+
   arg = parseProjection(arg);
 
   if (utils.isObject(arg)) {
-    const keys = Object.keys(arg);
-    for (let i = 0; i < keys.length; ++i) {
-      let value = arg[keys[i]];
-      if (typeof value === 'string' && sanitizeProjection) {
-        value = 1;
+    if (this.selectedInclusively()) {
+      Object.entries(arg).forEach(([key, value]) => {
+        if (value) {
+          // Add the field to the projection
+          fields[key] = userProvidedFields[key] = sanitizeValue(value);
+        } else {
+          // Remove the field from the projection
+          Object.keys(userProvidedFields).forEach(field => {
+            if (isSubpath(key, field)) {
+              delete fields[field];
+              delete userProvidedFields[field];
+            }
+          });
+        }
+      });
+    } else if (this.selectedExclusively()) {
+      Object.entries(arg).forEach(([key, value]) => {
+        if (!value) {
+          // Add the field to the projection
+          fields[key] = userProvidedFields[key] = sanitizeValue(value);
+        } else {
+          // Remove the field from the projection
+          Object.keys(userProvidedFields).forEach(field => {
+            if (isSubpath(key, field)) {
+              delete fields[field];
+              delete userProvidedFields[field];
+            }
+          });
+        }
+      });
+    } else {
+      const keys = Object.keys(arg);
+      for (let i = 0; i < keys.length; ++i) {
+        const value = arg[keys[i]];
+        fields[keys[i]] = sanitizeValue(value);
+        userProvidedFields[keys[i]] = sanitizeValue(value);
       }
-      fields[keys[i]] = value;
-      userProvidedFields[keys[i]] = value;
     }
     return this;
   }
@@ -4470,6 +4508,7 @@ Query.prototype.orFail = function(err) {
           throw _orFailError(err, this);
         }
         break;
+      case 'replaceOne':
       case 'update':
       case 'updateMany':
       case 'updateOne':

package/lib/schema.js

@@ -69,6 +69,7 @@ let id = 0;
  * - [versionKey](/docs/guide.html#versionKey): string or object - defaults to "__v"
  * - [optimisticConcurrency](/docs/guide.html#optimisticConcurrency): bool - defaults to false. Set to true to enable [optimistic concurrency](https://thecodebarbarian.com/whats-new-in-mongoose-5-10-optimistic-concurrency.html).
  * - [collation](/docs/guide.html#collation): object - defaults to null (which means use no collation)
+ * - [timeseries](/docs/guide.html#timeseries): object - defaults to null (which means this schema's collection won't be a timeseries collection)
  * - [selectPopulatedPaths](/docs/guide.html#selectPopulatedPaths): boolean - defaults to `true`
  * - [skipVersioning](/docs/guide.html#skipVersioning): object - paths to exclude from versioning
  * - [timestamps](/docs/guide.html#timestamps): object or boolean - defaults to `false`. If true, Mongoose adds `createdAt` and `updatedAt` properties to your schema and manages those properties for you.
@@ -116,7 +117,6 @@ function Schema(obj, options) {
   this.s = {
     hooks: new Kareem()
   };
-
   this.options = this.defaultOptions(options);
 
   // build paths
@@ -416,11 +416,9 @@ Schema.prototype.pick = function(paths, options) {
 
 Schema.prototype.defaultOptions = function(options) {
   this._userProvidedOptions = options == null ? {} : utils.clone(options);
-
   const baseOptions = get(this, 'base.options', {});
 
   const strict = 'strict' in baseOptions ? baseOptions.strict : true;
-
   options = utils.options({
     strict: strict,
     strictQuery: 'strict' in this._userProvidedOptions ?

package/lib/schematype.js

@@ -1398,7 +1398,7 @@ SchemaType._isRef = function(self, value, doc, init) {
     // - setting / pushing values after population
     const path = doc.$__fullPath(self.path, true);
 
-    const owner = doc.ownerDocument ? doc.ownerDocument() : doc;
+    const owner = doc.ownerDocument();
     ref = (path != null && owner.$populated(path)) || doc.$populated(self.path);
   }
 
@@ -1445,7 +1445,7 @@ SchemaType.prototype._castRef = function _castRef(value, doc, init) {
   // path to a plain object; cast to the Model used in
   // the population query.
   const path = doc.$__fullPath(this.path, true);
-  const owner = doc.ownerDocument ? doc.ownerDocument() : doc;
+  const owner = doc.ownerDocument();
   const pop = owner.$populated(path, true);
   let ret = value;
   if (!doc.$__.populated ||

package/lib/types/subdocument.js

@@ -26,6 +26,7 @@ function Subdocument(value, fields, parent, skipId, options) {
     this.$basePath = options.path;
   }
   Document.call(this, value, fields, skipId, options);
+  this.$__.isSubDocument = true;
 
   delete this.$__.priorDoc;
 }
@@ -234,7 +235,6 @@ Subdocument.prototype.ownerDocument = function() {
   }
 
   let parent = this; // eslint-disable-line consistent-this
-
   const paths = [];
   const seenDocs = new Set([parent]);
 

package/lib/utils.js

@@ -178,6 +178,18 @@ exports.clone = clone;
 
 exports.promiseOrCallback = promiseOrCallback;
 
+/*!
+ * ignore
+ */
+
+exports.cloneArrays = function cloneArrays(arr) {
+  if (!Array.isArray(arr)) {
+    return arr;
+  }
+
+  return arr.map(el => exports.cloneArrays(el));
+};
+
 /*!
  * ignore
  */

package/lib/validoptions.js

@@ -24,6 +24,7 @@ const VALID_OPTIONS = Object.freeze([
   'selectPopulatedPaths',
   'setDefaultsOnInsert',
   'strict',
+  'strictPopulate',
   'strictQuery',
   'toJSON',
   'toObject'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.0.13",
+  "version": "6.1.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -21,7 +21,7 @@
   "dependencies": {
     "bson": "^4.2.2",
     "kareem": "2.3.2",
-    "mongodb": "4.1.4",
+    "mongodb": "4.2.1",
     "mpath": "0.8.4",
     "mquery": "4.0.0",
     "ms": "2.1.2",
@@ -61,7 +61,6 @@
     "typescript": "4.4.4",
     "uuid": "2.0.3",
     "uuid-parse": "1.0.0",
-    "validator": "10.8.0",
     "webpack": "4.44.0"
   },
   "directories": {