mongoose 7.4.1 → 7.4.2

package/lib/document.js

@@ -2216,7 +2216,7 @@ Document.prototype.isModified = function(paths, modifiedPaths) {
     }
 
     if (typeof paths === 'string') {
-      paths = [paths];
+      paths = paths.indexOf(' ') === -1 ? [paths] : paths.split(' ');
     }
 
     for (const path of paths) {
@@ -2619,7 +2619,7 @@ function _evaluateRequiredFunctions(doc) {
  */
 
 function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
-  const skipSchemaValidators = {};
+  const doValidateOptions = {};
 
   _evaluateRequiredFunctions(doc);
   // only validate required fields when necessary
@@ -2656,8 +2656,17 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
             !doc.isDirectModified(fullPathToSubdoc) &&
             !doc.$isDefault(fullPathToSubdoc)) {
         paths.add(fullPathToSubdoc);
+        if (doc.$__.pathsToScopes == null) {
+          doc.$__.pathsToScopes = {};
+        }
+        doc.$__.pathsToScopes[fullPathToSubdoc] = subdoc.$isDocumentArrayElement ?
+          subdoc.__parentArray :
+          subdoc.$parent();
 
-        skipSchemaValidators[fullPathToSubdoc] = true;
+        doValidateOptions[fullPathToSubdoc] = { skipSchemaValidators: true };
+        if (subdoc.$isDocumentArrayElement && subdoc.__index != null) {
+          doValidateOptions[fullPathToSubdoc].index = subdoc.__index;
+        }
       }
     }
   }
@@ -2791,7 +2800,7 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
   }
 
   paths = Array.from(paths);
-  return [paths, skipSchemaValidators];
+  return [paths, doValidateOptions];
 }
 
 /*!
@@ -2862,7 +2871,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
   const paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
-  const skipSchemaValidators = pathDetails[1];
+  const doValidateOptionsByPath = pathDetails[1];
   if (typeof pathsToValidate === 'string') {
     pathsToValidate = pathsToValidate.split(' ');
   }
@@ -2930,7 +2939,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
         _this;
 
       const doValidateOptions = {
-        skipSchemaValidators: skipSchemaValidators[path],
+        ...doValidateOptionsByPath[path],
         path: path,
         validateModifiedOnly: shouldValidateModifiedOnly
       };
@@ -2938,8 +2947,8 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
       schemaType.doValidate(val, function(err) {
         if (err) {
           const isSubdoc = schemaType.$isSingleNested ||
-            schemaType.$isArraySubdocument ||
-            schemaType.$isMongooseDocumentArray;
+              schemaType.$isArraySubdocument ||
+              schemaType.$isMongooseDocumentArray;
           if (isSubdoc && err instanceof ValidationError) {
             return --total || complete();
           }

package/lib/helpers/model/castBulkWrite.js

@@ -20,7 +20,6 @@ const setDefaultsOnInsert = require('../setDefaultsOnInsert');
 
 module.exports = function castBulkWrite(originalModel, op, options) {
   const now = originalModel.base.now();
-
   if (op['insertOne']) {
     return (callback) => {
       const model = decideModelByObject(originalModel, op['insertOne']['document']);
@@ -66,7 +65,9 @@ module.exports = function castBulkWrite(originalModel, op, options) {
           applyTimestampsToUpdate(now, createdAt, updatedAt, op['updateOne']['update'], {});
         }
 
-        applyTimestampsToChildren(now, op['updateOne']['update'], model.schema);
+        if (op['updateOne'].timestamps !== false) {
+          applyTimestampsToChildren(now, op['updateOne']['update'], model.schema);
+        }
 
         if (op['updateOne'].setDefaultsOnInsert !== false) {
           setDefaultsOnInsert(op['updateOne']['filter'], model.schema, op['updateOne']['update'], {
@@ -117,8 +118,9 @@ module.exports = function castBulkWrite(originalModel, op, options) {
           const updatedAt = model.schema.$timestamps.updatedAt;
           applyTimestampsToUpdate(now, createdAt, updatedAt, op['updateMany']['update'], {});
         }
-
-        applyTimestampsToChildren(now, op['updateMany']['update'], model.schema);
+        if (op['updateMany'].timestamps !== false) {
+          applyTimestampsToChildren(now, op['updateMany']['update'], model.schema);
+        }
 
         _addDiscriminatorToObject(schema, op['updateMany']['filter']);
 

package/lib/helpers/schema/idGetter.js

@@ -12,6 +12,9 @@ module.exports = function addIdGetter(schema) {
   if (!autoIdGetter) {
     return schema;
   }
+  if (schema.aliases && schema.aliases.id) {
+    return schema;
+  }
   schema.virtual('id').get(idGetter);
   schema.virtual('id').set(idSetter);
 

package/lib/model.js

@@ -77,7 +77,8 @@ const modelSymbol = require('./helpers/symbols').modelSymbol;
 const subclassedSymbol = Symbol('mongoose#Model#subclassed');
 
 const saveToObjectOptions = Object.assign({}, internalToObjectOptions, {
-  bson: true
+  bson: true,
+  flattenObjectIds: false
 });
 
 /**
@@ -3471,18 +3472,22 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
     let validOps = [];
     let validationErrors = [];
     const results = [];
-    for (let i = 0; i < validations.length; ++i) {
-      validations[i]((err) => {
-        if (err == null) {
-          validOps.push(i);
-        } else {
-          validationErrors.push({ index: i, error: err });
-          results[i] = err;
-        }
-        if (--remaining <= 0) {
-          completeUnorderedValidation.call(this);
-        }
-      });
+    if (remaining === 0) {
+      completeUnorderedValidation.call(this);
+    } else {
+      for (let i = 0; i < validations.length; ++i) {
+        validations[i]((err) => {
+          if (err == null) {
+            validOps.push(i);
+          } else {
+            validationErrors.push({ index: i, error: err });
+            results[i] = err;
+          }
+          if (--remaining <= 0) {
+            completeUnorderedValidation.call(this);
+          }
+        });
+      }
     }
 
     validationErrors = validationErrors.

package/lib/schema.js

@@ -413,7 +413,25 @@ Schema.prototype._clone = function _clone(Constructor) {
   s.paths = clone(this.paths);
   s.nested = clone(this.nested);
   s.subpaths = clone(this.subpaths);
-  s.singleNestedPaths = clone(this.singleNestedPaths);
+  for (const schemaType of Object.values(s.paths)) {
+    if (schemaType.$isSingleNested) {
+      const path = schemaType.path;
+      for (const key of Object.keys(schemaType.schema.paths)) {
+        s.singleNestedPaths[path + '.' + key] = schemaType.schema.paths[key];
+      }
+      for (const key of Object.keys(schemaType.schema.singleNestedPaths)) {
+        s.singleNestedPaths[path + '.' + key] =
+          schemaType.schema.singleNestedPaths[key];
+      }
+      for (const key of Object.keys(schemaType.schema.subpaths)) {
+        s.singleNestedPaths[path + '.' + key] =
+          schemaType.schema.subpaths[key];
+      }
+      for (const key of Object.keys(schemaType.schema.nested)) {
+        s.singleNestedPaths[path + '.' + key] = 'nested';
+      }
+    }
+  }
   s.childSchemas = gatherChildSchemas(s);
 
   s.virtuals = clone(this.virtuals);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.4.1",
+  "version": "7.4.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -28,10 +28,10 @@
     "sift": "16.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.22.5",
-    "@babel/preset-env": "7.22.5",
+    "@babel/core": "7.22.9",
+    "@babel/preset-env": "7.22.9",
     "@typescript-eslint/eslint-plugin": "5.61.0",
-    "@typescript-eslint/parser": "5.61.0",
+    "@typescript-eslint/parser": "5.62.0",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
@@ -46,7 +46,7 @@
     "crypto-browserify": "3.12.0",
     "dotenv": "16.3.1",
     "dox": "1.0.0",
-    "eslint": "8.44.0",
+    "eslint": "8.46.0",
     "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-mocha-no-only": "1.1.1",
     "express": "^4.18.1",
@@ -69,7 +69,7 @@
     "tsd": "0.28.1",
     "typescript": "5.1.6",
     "uuid": "9.0.0",
-    "webpack": "5.88.1"
+    "webpack": "5.88.2"
   },
   "directories": {
     "lib": "./lib/mongoose"