mongoose 7.6.3 → 7.6.4

package/lib/connection.js

@@ -563,6 +563,10 @@ function _resetSessionDocuments(session) {
       doc.$__.activePaths.states.modify = {};
     }
     for (const path of state.modifiedPaths) {
+      const currentState = doc.$__.activePaths.paths[path];
+      if (currentState != null) {
+        delete doc.$__.activePaths[currentState][path];
+      }
       doc.$__.activePaths.paths[path] = 'modify';
       doc.$__.activePaths.states.modify[path] = true;
     }

package/lib/document.js

@@ -53,6 +53,7 @@ const scopeSymbol = require('./helpers/symbols').scopeSymbol;
 const schemaMixedSymbol = require('./schema/symbols').schemaMixedSymbol;
 const parentPaths = require('./helpers/path/parentPaths');
 const getDeepestSubdocumentForPath = require('./helpers/document/getDeepestSubdocumentForPath');
+const sessionNewDocuments = require('./helpers/symbols').sessionNewDocuments;
 
 let DocumentArray;
 let MongooseArray;
@@ -1474,7 +1475,16 @@ Document.prototype.$set = function $set(path, val, type, options) {
 
     this.$__set(pathToMark, path, options, constructing, parts, schema, val, priorVal);
 
-    if (savedState != null && savedState.hasOwnProperty(savedStatePath) && utils.deepEqual(val, savedState[savedStatePath])) {
+    const isInTransaction = !!this.$__.session?.transaction;
+    const isModifiedWithinTransaction = this.$__.session &&
+      this.$__.session[sessionNewDocuments] &&
+      this.$__.session[sessionNewDocuments].has(this) &&
+      this.$__.session[sessionNewDocuments].get(this).modifiedPaths &&
+      !this.$__.session[sessionNewDocuments].get(this).modifiedPaths.has(savedStatePath);
+    if (savedState != null &&
+        savedState.hasOwnProperty(savedStatePath) &&
+        (!isInTransaction || isModifiedWithinTransaction) &&
+        utils.deepEqual(val, savedState[savedStatePath])) {
       this.unmarkModified(path);
     }
   }

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -45,7 +45,8 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
   let allSchemaTypes = getSchemaTypes(model, modelSchema, null, options.path);
   allSchemaTypes = Array.isArray(allSchemaTypes) ? allSchemaTypes : [allSchemaTypes].filter(v => v != null);
 
-  if (allSchemaTypes.length === 0 && options.strictPopulate !== false && options._localModel != null) {
+  const isStrictPopulateDisabled = options.strictPopulate === false || options.options?.strictPopulate === false;
+  if (!isStrictPopulateDisabled && allSchemaTypes.length === 0 && options._localModel != null) {
     return new StrictPopulate(options._fullPath || options.path);
   }
 

package/lib/model.js

@@ -4263,9 +4263,7 @@ Model.populate = async function populate(docs, paths) {
   if (typeof paths === 'function' || typeof arguments[2] === 'function') {
     throw new MongooseError('Model.populate() no longer accepts a callback');
   }
-
   const _this = this;
-
   // normalized paths
   paths = utils.populate(paths);
   // data that should persist across subPopulate calls

package/lib/query.js

@@ -2305,7 +2305,6 @@ Query.prototype._find = async function _find() {
       _completeManyLean(_this.model.schema, docs, null, completeManyOptions) :
       completeMany(_this.model, docs, fields, userProvidedFields, completeManyOptions);
   }
-
   const pop = helpers.preparePopulationOptionsMQ(_this, mongooseOptions);
 
   if (mongooseOptions.lean) {

package/lib/schema/SubdocumentPath.js

@@ -56,7 +56,7 @@ function SubdocumentPath(schema, path, options) {
   this.base = schema.base;
   SchemaType.call(this, path, options, 'Embedded');
 
-  if (schema._applyDiscriminators != null) {
+  if (schema._applyDiscriminators != null && !options?._skipApplyDiscriminators) {
     for (const disc of schema._applyDiscriminators.keys()) {
       this.discriminator(disc, schema._applyDiscriminators.get(disc));
     }
@@ -388,8 +388,11 @@ SubdocumentPath.prototype.toJSON = function toJSON() {
  */
 
 SubdocumentPath.prototype.clone = function() {
-  const options = Object.assign({}, this.options);
-  const schematype = new this.constructor(this.schema, this.path, options);
+  const schematype = new this.constructor(
+    this.schema,
+    this.path,
+    { ...this.options, _skipApplyDiscriminators: true }
+  );
   schematype.validators = this.validators.slice();
   if (this.requiredValidator !== undefined) {
     schematype.requiredValidator = this.requiredValidator;

package/lib/schema/array.js

@@ -623,8 +623,8 @@ function cast$elemMatch(val, context) {
       discriminators[val[discriminatorKey]] != null) {
     return cast(discriminators[val[discriminatorKey]], val, null, this && this.$$context);
   }
-
-  return cast(this.casterConstructor.schema, val, null, this && this.$$context);
+  const schema = this.casterConstructor.schema ?? context.schema;
+  return cast(schema, val, null, this && this.$$context);
 }
 
 const handle = SchemaArray.prototype.$conditionalHandlers = {};

package/lib/schema.js

@@ -412,7 +412,9 @@ Schema.prototype._clone = function _clone(Constructor) {
   s.s.hooks = this.s.hooks.clone();
 
   s.tree = clone(this.tree);
-  s.paths = clone(this.paths);
+  s.paths = Object.fromEntries(
+    Object.entries(this.paths).map(([key, value]) => ([key, value.clone()]))
+  );
   s.nested = clone(this.nested);
   s.subpaths = clone(this.subpaths);
   for (const schemaType of Object.values(s.paths)) {

package/lib/schematype.js

@@ -1305,6 +1305,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
 
     const validatorProperties = isSimpleValidator(v) ? Object.assign({}, v) : clone(v);
     validatorProperties.path = options && options.path ? options.path : path;
+    validatorProperties.fullPath = this.$fullPath;
     validatorProperties.value = value;
 
     if (validator instanceof RegExp) {
@@ -1426,6 +1427,7 @@ SchemaType.prototype.doValidateSync = function(value, scope, options) {
     const validator = v.validator;
     const validatorProperties = isSimpleValidator(v) ? Object.assign({}, v) : clone(v);
     validatorProperties.path = options && options.path ? options.path : path;
+    validatorProperties.fullPath = this.$fullPath;
     validatorProperties.value = value;
     let ok = false;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.6.3",
+  "version": "7.6.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

package/types/validation.d.ts

@@ -4,6 +4,7 @@ declare module 'mongoose' {
 
   interface ValidatorProps {
     path: string;
+    fullPath: string;
     value: any;
   }