mongoose 6.3.3 → 6.3.4

package/lib/document.js

@@ -1323,6 +1323,10 @@ Document.prototype.$set = function $set(path, val, type, options) {
 
   if (!schema) {
     this.$__set(pathToMark, path, options, constructing, parts, schema, val, priorVal);
+
+    if (pathType === 'nested' && val == null) {
+      cleanModifiedSubpaths(this, path);
+    }
     return this;
   }
 

package/lib/helpers/clone.js

@@ -118,6 +118,7 @@ module.exports = clone;
 
 function cloneObject(obj, options, isArrayChild) {
   const minimize = options && options.minimize;
+  const omitUndefined = options && options.omitUndefined;
   const ret = {};
   let hasKeys;
 
@@ -138,7 +139,7 @@ function cloneObject(obj, options, isArrayChild) {
     // Don't pass `isArrayChild` down
     const val = clone(obj[key], options, false);
 
-    if (minimize === false && typeof val === 'undefined') {
+    if ((minimize === false || omitUndefined) && typeof val === 'undefined') {
       delete ret[key];
     } else if (minimize !== true || (typeof val !== 'undefined')) {
       hasKeys || (hasKeys = true);

package/lib/model.js

@@ -768,6 +768,7 @@ Model.prototype.$__delta = function() {
         transform: false,
         virtuals: false,
         getters: false,
+        omitUndefined: true,
         _isNested: true
       });
       operand(this, where, delta, data, value);
@@ -1488,61 +1489,68 @@ Model.syncIndexes = function syncIndexes(options, callback) {
  * the result of this function would be the result of
  * Model.syncIndexes().
  *
- * @param {Object} options not used at all.
+ * @param {Object} [options]
  * @param {Function} callback optional callback
- * @returns {Promise} which containts an object, {toDrop, toCreate}, which
- * are indexes that would be dropped in mongodb and indexes that would be created in mongodb.
+ * @returns {Promise} which contains an object, {toDrop, toCreate}, which
+ * are indexes that would be dropped in MongoDB and indexes that would be created in MongoDB.
  */
 
 Model.diffIndexes = function diffIndexes(options, callback) {
+  if (typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
   const toDrop = [];
   const toCreate = [];
   callback = this.$handleCallbackError(callback);
   return this.db.base._promiseOrCallback(callback, cb => {
     cb = this.$wrapCallback(cb);
-    this.listIndexes((err, indexes) => {
-      if (indexes === undefined) {
-        indexes = [];
+    this.listIndexes((err, dbIndexes) => {
+      if (dbIndexes === undefined) {
+        dbIndexes = [];
       }
-      const schemaIndexes = this.schema.indexes();
-      // Iterate through the indexes created in mongodb and
-      // compare against the indexes in the schema.
-      for (const index of indexes) {
+      dbIndexes = getRelatedDBIndexes(this, dbIndexes);
+      const schemaIndexes = getRelatedSchemaIndexes(this, this.schema.indexes());
+
+      for (const dbIndex of dbIndexes) {
         let found = false;
         // Never try to drop `_id` index, MongoDB server doesn't allow it
-        if (isDefaultIdIndex(index)) {
+        if (isDefaultIdIndex(dbIndex)) {
           continue;
         }
 
-        for (const schemaIndex of schemaIndexes) {
-          const key = schemaIndex[0];
-          const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndex[1]));
-          if (isIndexEqual(key, options, index)) {
+        for (const [schemaIndexKeysObject, schemaIndexOptions] of schemaIndexes) {
+          const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndexOptions));
+          applySchemaCollation(schemaIndexKeysObject, options, this.schema.options);
+
+          if (isIndexEqual(schemaIndexKeysObject, options, dbIndex)) {
             found = true;
           }
         }
 
         if (!found) {
-          toDrop.push(index.name);
+          toDrop.push(dbIndex.name);
         }
       }
       // Iterate through the indexes created on the schema and
       // compare against the indexes in mongodb.
-      for (const schemaIndex of schemaIndexes) {
-        let found = false;
-        const key = schemaIndex[0];
-        const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndex[1]));
-        for (const index of indexes) {
-          if (isDefaultIdIndex(index)) {
-            continue;
+      if (!options || options.toCreate !== false) {
+        for (const schemaIndex of schemaIndexes) {
+          let found = false;
+          const key = schemaIndex[0];
+          const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndex[1]));
+          for (const index of dbIndexes) {
+            if (isDefaultIdIndex(index)) {
+              continue;
+            }
+            if (isIndexEqual(key, options, index)) {
+              found = true;
+            }
           }
-          if (isIndexEqual(key, options, index)) {
-            found = true;
+          if (!found) {
+            toCreate.push(key);
           }
         }
-        if (!found) {
-          toCreate.push(key);
-        }
       }
       cb(null, { toDrop, toCreate });
     });
@@ -1568,36 +1576,12 @@ Model.cleanIndexes = function cleanIndexes(callback) {
   return this.db.base._promiseOrCallback(callback, cb => {
     const collection = this.$__collection;
 
-    this.listIndexes((err, dbIndexes) => {
+    this.diffIndexes({ toCreate: false }, (err, res) => {
       if (err != null) {
         return cb(err);
       }
 
-      dbIndexes = getRelatedDBIndexes(this, dbIndexes);
-      const schemaIndexes = getRelatedSchemaIndexes(this, this.schema.indexes());
-
-      const toDrop = [];
-
-      for (const dbIndex of dbIndexes) {
-        let found = false;
-        // Never try to drop `_id` index, MongoDB server doesn't allow it
-        if (isDefaultIdIndex(dbIndex)) {
-          continue;
-        }
-
-        for (const [schemaIndexKeysObject, schemaIndexOptions] of schemaIndexes) {
-          const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndexOptions));
-          applySchemaCollation(schemaIndexKeysObject, options, this.schema.options);
-
-          if (isIndexEqual(schemaIndexKeysObject, options, dbIndex)) {
-            found = true;
-          }
-        }
-
-        if (!found) {
-          toDrop.push(dbIndex.name);
-        }
-      }
+      const toDrop = res.toDrop;
 
       if (toDrop.length === 0) {
         return cb(null, []);

package/lib/queryhelpers.js

@@ -226,7 +226,9 @@ exports.applyPaths = function applyPaths(fields, schema) {
     const addedPaths = [];
     schema.eachPath(function(path, type) {
       if (prefix) path = prefix + '.' + path;
-
+      if (type.$isSchemaMap || path.endsWith('.$*')) {
+        return;
+      }
       let addedPath = analyzePath(path, type);
       // arrays
       if (addedPath == null && !Array.isArray(type) && type.$isMongooseArray && !type.$isMongooseDocumentArray) {
@@ -248,7 +250,6 @@ exports.applyPaths = function applyPaths(fields, schema) {
         }
       }
     });
-
     stack.pop();
     return addedPaths;
   }

package/lib/schema.js

@@ -1235,6 +1235,15 @@ function createMapNestedSchemaType(schema, schemaType, path, obj, options) {
       _mapType = { [schema.options.typeKey]: obj.of };
     }
 
+    if (_mapType[schema.options.typeKey] && _mapType[schema.options.typeKey].instanceOfSchema) {
+      const subdocumentSchema = _mapType[schema.options.typeKey];
+      subdocumentSchema.eachPath((subpath, type) => {
+        if (type.options.select === true || type.options.select === false) {
+          throw new MongooseError('Cannot use schema-level projections (`select: true` or `select: false`) within maps at path "' + path + '.' + subpath + '"');
+        }
+      });
+    }
+
     if (utils.hasUserDefinedProperty(obj, 'ref')) {
       _mapType.ref = obj.ref;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.3.3",
+  "version": "6.3.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -23,7 +23,7 @@
     "kareem": "2.3.5",
     "mongodb": "4.5.0",
     "mpath": "0.9.0",
-    "mquery": "4.0.2",
+    "mquery": "4.0.3",
     "ms": "2.1.3",
     "sift": "16.0.0"
   },
@@ -83,8 +83,8 @@
     "docs:merge:legacy": "git merge 5.x",
     "docs:test": "npm run docs:generate && npm run docs:generate:search",
     "docs:view": "node website.js && node static.js",
-    "docs:prepare:publish:stable": "npm run docs:checkout:gh-pages && docs:merge:stable && npm run docs:clean:stable && npm run docs:generate && npm run docs:generate:search",
-    "docs:prepare:publish:legacy": "npm run docs:checkout:legacy && docs:merge:legacy && npm run docs:clean:stable && npm run docs:generate && npm run docs:copy:tmp && docs:checkout:gh-pages && docs:copy:tmp:legacy",
+    "docs:prepare:publish:stable": "npm run docs:checkout:gh-pages && npm run docs:merge:stable && npm run docs:clean:stable && npm run docs:generate && npm run docs:generate:search",
+    "docs:prepare:publish:legacy": "npm run docs:checkout:legacy && npm run docs:merge:legacy && npm run docs:clean:stable && npm run docs:generate && npm run docs:copy:tmp && docs:checkout:gh-pages && docs:copy:tmp:legacy",
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js",
     "lint-ts": "eslint . --ext .ts",

package/types/connection.d.ts

@@ -72,7 +72,7 @@ declare module 'mongoose' {
        * use this function to clean up any models you created in your tests to
        * prevent OverwriteModelErrors.
        */
-    deleteModel(name: string): this;
+    deleteModel(name: string | RegExp): this;
 
     /**
        * Helper for `dropCollection()`. Will delete the given collection, including