mongoose 8.15.1 → 8.15.2

package/lib/document.js

@@ -1302,7 +1302,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
   let cur = this._doc;
   let curPath = '';
   for (i = 0; i < parts.length - 1; ++i) {
-    cur = cur[parts[i]];
+    cur = cur instanceof Map ? cur.get(parts[i]) : cur[parts[i]];
     curPath += (curPath.length !== 0 ? '.' : '') + parts[i];
     if (!cur) {
       this.$set(curPath, {});
@@ -1433,9 +1433,9 @@ Document.prototype.$set = function $set(path, val, type, options) {
         setterContext = getDeepestSubdocumentForPath(this, parts, this.schema);
       }
       if (options != null && options.overwriteImmutable) {
-        val = schema.applySetters(val, setterContext, false, priorVal, { overwriteImmutable: true });
+        val = schema.applySetters(val, setterContext, false, priorVal, { path, overwriteImmutable: true });
       } else {
-        val = schema.applySetters(val, setterContext, false, priorVal);
+        val = schema.applySetters(val, setterContext, false, priorVal, { path });
       }
     }
 
@@ -2710,7 +2710,13 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
   Object.keys(doc.$__.activePaths.getStatePaths('init')).forEach(addToPaths);
   Object.keys(doc.$__.activePaths.getStatePaths('modify')).forEach(addToPaths);
   Object.keys(doc.$__.activePaths.getStatePaths('default')).forEach(addToPaths);
-  function addToPaths(p) { paths.add(p); }
+  function addToPaths(p) {
+    if (p.endsWith('.$*')) {
+      // Skip $* paths - they represent map schemas, not actual document paths
+      return;
+    }
+    paths.add(p);
+  }
 
   if (!isNestedValidate) {
     // If we're validating a subdocument, all this logic will run anyway on the top-level document, so skip for subdocuments.
@@ -2750,6 +2756,9 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
         }
 
         const subdocParent = subdoc.$parent();
+        if (subdocParent == null) {
+          throw new Error('Cannot validate subdocument that does not have a parent');
+        }
         if (doc.$isModified(fullPathToSubdoc, null, modifiedPaths) &&
               // Avoid using isDirectModified() here because that does additional checks on whether the parent path
               // is direct modified, which can cause performance issues re: gh-14897

package/lib/helpers/populate/assignVals.js

@@ -144,7 +144,24 @@ module.exports = function assignVals(o) {
       if (Array.isArray(valueToSet)) {
         valueToSet = valueToSet.map(v => v == null ? void 0 : v);
       }
-      mpath.set(_path, valueToSet, docs[i], void 0, setValue, false);
+      mpath.set(
+        _path,
+        valueToSet,
+        docs[i],
+        // Handle setting paths underneath maps using $* by converting arrays into maps of values
+        function lookup(obj, part, val) {
+          if (arguments.length >= 3) {
+            obj[part] = val;
+            return obj[part];
+          }
+          if (obj instanceof Map && part === '$*') {
+            return [...obj.values()];
+          }
+          return obj[part];
+        },
+        setValue,
+        false
+      );
       continue;
     }
 

package/lib/helpers/populate/getVirtual.js

@@ -58,6 +58,37 @@ function getVirtual(schema, name) {
       nestedSchemaPath += (nestedSchemaPath.length > 0 ? '.' : '') + cur;
       cur = '';
       continue;
+    } else if (schema.paths[cur]?.$isSchemaMap && schema.paths[cur].$__schemaType?.schema) {
+      schema = schema.paths[cur].$__schemaType.schema;
+      ++i;
+      const rest = parts.slice(i + 1).join('.');
+
+      if (schema.virtuals[rest]) {
+        if (i === parts.length - 2) {
+          return {
+            virtual: schema.virtuals[rest],
+            nestedSchemaPath: [nestedSchemaPath, cur, '$*'].filter(v => !!v).join('.')
+          };
+        }
+        continue;
+      }
+
+      if (i + 1 < parts.length && schema.discriminators) {
+        for (const key of Object.keys(schema.discriminators)) {
+          const res = getVirtual(schema.discriminators[key], rest);
+          if (res != null) {
+            const _path = [nestedSchemaPath, cur, res.nestedSchemaPath, '$*'].
+              filter(v => !!v).join('.');
+            return {
+              virtual: res.virtual,
+              nestedSchemaPath: _path
+            };
+          }
+        }
+      }
+
+      nestedSchemaPath += (nestedSchemaPath.length > 0 ? '.' : '') + '$*' + cur;
+      cur = '';
     }
 
     if (schema.discriminators) {

package/lib/helpers/updateValidators.js

@@ -147,6 +147,9 @@ module.exports = function(query, schema, castedDoc, options, callback) {
               return callback(null);
             }
           }
+          if (schemaPath.$isSingleNested) {
+            alreadyValidated.push(updates[i]);
+          }
 
           schemaPath.doValidate(v, function(err) {
             if (schemaPath.schema != null &&
@@ -246,4 +249,3 @@ module.exports = function(query, schema, castedDoc, options, callback) {
     };
   }
 };
-

package/lib/model.js

@@ -460,8 +460,8 @@ Model.prototype.$__handleSave = function(options, callback) {
     return;
   }
 
-  // store the modified paths before the document is reset
-  this.$__.modifiedPaths = this.modifiedPaths();
+  // store the modified paths before the document is reset in case we need to generate version error.
+  this.$__.modifiedPaths = this.modifiedPaths().concat(Object.keys(this.$__.activePaths.getStatePaths('default')));
   this.$__reset();
 
   _setIsNew(this, false);
@@ -562,13 +562,13 @@ Model.prototype.$__save = function(options, callback) {
  * ignore
  */
 
-function generateVersionError(doc, modifiedPaths) {
+function generateVersionError(doc, modifiedPaths, defaultPaths) {
   const key = doc.$__schema.options.versionKey;
   if (!key) {
     return null;
   }
   const version = doc.$__getValue(key) || 0;
-  return new VersionError(doc, version, modifiedPaths);
+  return new VersionError(doc, version, modifiedPaths.concat(defaultPaths));
 }
 
 /**
@@ -626,7 +626,11 @@ Model.prototype.save = async function save(options) {
   if (this.$__.timestamps != null) {
     options.timestamps = this.$__.timestamps;
   }
-  this.$__.$versionError = generateVersionError(this, this.modifiedPaths());
+  this.$__.$versionError = generateVersionError(
+    this,
+    this.modifiedPaths(),
+    Object.keys(this.$__.activePaths.getStatePaths('default'))
+  );
 
   if (parallelSave) {
     this.$__handleReject(parallelSave);

package/lib/schema.js

@@ -1482,10 +1482,24 @@ function getMapPath(schema, path) {
     return null;
   }
   for (const val of schema.mapPaths) {
-    const _path = val.path;
-    const re = new RegExp('^' + _path.replace(/\.\$\*/g, '\\.[^.]+') + '$');
-    if (re.test(path)) {
-      return schema.paths[_path];
+    const cleanPath = val.path.replace(/\.\$\*/g, '');
+    if (path === cleanPath || (path.startsWith(cleanPath + '.') && path.slice(cleanPath.length + 1).indexOf('.') === -1)) {
+      return val;
+    } else if (val.schema && path.startsWith(cleanPath + '.')) {
+      let remnant = path.slice(cleanPath.length + 1);
+      remnant = remnant.slice(remnant.indexOf('.') + 1);
+      return val.schema.paths[remnant];
+    } else if (val.$isSchemaMap && path.startsWith(cleanPath + '.')) {
+      let remnant = path.slice(cleanPath.length + 1);
+      remnant = remnant.slice(remnant.indexOf('.') + 1);
+      const presplitPath = val.$__schemaType._presplitPath;
+      if (remnant.indexOf('.') === -1 && presplitPath[presplitPath.length - 1] === '$*') {
+        // Handle map of map of primitives
+        return val.$__schemaType;
+      } else if (remnant.indexOf('.') !== -1 && val.$__schemaType.schema && presplitPath[presplitPath.length - 1] === '$*') {
+        // map of map of subdocs (recursive)
+        return val.$__schemaType.schema.path(remnant.slice(remnant.indexOf('.') + 1));
+      }
     }
   }
 
@@ -2608,6 +2622,10 @@ Schema.prototype.virtual = function(name, options) {
         const remnant = parts.slice(i + 1).join('.');
         this.paths[cur].schema.virtual(remnant, options);
         break;
+      } else if (this.paths[cur].$isSchemaMap) {
+        const remnant = parts.slice(i + 2).join('.');
+        this.paths[cur].$__schemaType.schema.virtual(remnant, options);
+        break;
       }
 
       cur += '.' + parts[i + 1];

package/lib/types/array/index.js

@@ -4,7 +4,6 @@
 
 'use strict';
 
-const Document = require('../../document');
 const mongooseArrayMethods = require('./methods');
 
 const arrayAtomicsSymbol = require('../../helpers/symbols').arrayAtomicsSymbol;
@@ -73,11 +72,7 @@ function MongooseArray(values, path, doc, schematype) {
     internals[arrayAtomicsSymbol] = values[arrayAtomicsSymbol];
   }
 
-  // Because doc comes from the context of another function, doc === global
-  // can happen if there was a null somewhere up the chain (see #3020)
-  // RB Jun 17, 2015 updated to check for presence of expected paths instead
-  // to make more proof against unusual node environments
-  if (doc != null && doc instanceof Document) {
+  if (doc != null && doc.$__) {
     internals[arrayParentSymbol] = doc;
     internals[arraySchemaSymbol] = schematype || doc.schema.path(path);
   }

package/lib/types/documentArray/index.js

@@ -6,7 +6,6 @@
 
 const ArrayMethods = require('../array/methods');
 const DocumentArrayMethods = require('./methods');
-const Document = require('../../document');
 
 const arrayAtomicsSymbol = require('../../helpers/symbols').arrayAtomicsSymbol;
 const arrayAtomicsBackupSymbol = require('../../helpers/symbols').arrayAtomicsBackupSymbol;
@@ -51,11 +50,7 @@ function MongooseDocumentArray(values, path, doc, schematype) {
   internals[arrayPathSymbol] = path;
   internals.__array = __array;
 
-  // Because doc comes from the context of another function, doc === global
-  // can happen if there was a null somewhere up the chain (see #3020 && #3034)
-  // RB Jun 17, 2015 updated to check for presence of expected paths instead
-  // to make more proof against unusual node environments
-  if (doc && doc instanceof Document) {
+  if (doc && doc.$__) {
     internals[arrayParentSymbol] = doc;
     internals[arraySchemaSymbol] = doc.$__schema.path(path);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.15.1",
+  "version": "8.15.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -29,12 +29,12 @@
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@babel/core": "7.27.1",
-    "@babel/preset-env": "7.27.1",
+    "@babel/core": "7.27.4",
+    "@babel/preset-env": "7.27.2",
     "@mongodb-js/mongodb-downloader": "^0.3.9",
     "@typescript-eslint/eslint-plugin": "^8.19.1",
     "@typescript-eslint/parser": "^8.19.1",
-    "acquit": "1.3.0",
+    "acquit": "1.4.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
     "ajv": "8.17.1",
@@ -53,10 +53,10 @@
     "highlight.js": "11.11.1",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "markdownlint-cli2": "^0.17.1",
-    "marked": "15.0.11",
+    "markdownlint-cli2": "^0.18.1",
+    "marked": "15.0.12",
     "mkdirp": "^3.0.1",
-    "mocha": "11.2.2",
+    "mocha": "11.5.0",
     "moment": "2.30.1",
     "mongodb-memory-server": "10.1.4",
     "mongodb-runner": "^5.8.2",
@@ -69,7 +69,7 @@
     "tsd": "0.32.0",
     "typescript": "5.8.3",
     "uuid": "11.1.0",
-    "webpack": "5.99.7"
+    "webpack": "5.99.9"
   },
   "directories": {
     "lib": "./lib/mongoose"
@@ -102,6 +102,7 @@
     "release-6x": "git pull origin 6.x && git push origin 6.x && git push origin 6.x --tags && npm publish --tag 6x",
     "mongo": "node ./tools/repl.js",
     "publish-7x": "npm publish --tag 7x",
+    "create-separate-require-instance": "rm -rf ./node_modules/mongoose-separate-require-instance && node ./scripts/create-tarball && tar -xzf mongoose.tgz -C ./node_modules && mv ./node_modules/package ./node_modules/mongoose-separate-require-instance",
     "test": "mocha --exit ./test/*.test.js",
     "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.mjs",
     "test-rs": "START_REPLICA_SET=1 mocha --timeout 30000 --exit ./test/*.test.js",

package/types/models.d.ts

@@ -482,7 +482,7 @@ declare module 'mongoose' {
      * Shortcut for creating a new Document from existing raw data, pre-saved in the DB.
      * The document returned has no paths marked as modified initially.
      */
-    hydrate(obj: any, projection?: AnyObject, options?: HydrateOptions): THydratedDocumentType;
+    hydrate(obj: any, projection?: ProjectionType<TRawDocType>, options?: HydrateOptions): THydratedDocumentType;
 
     /**
      * This function is responsible for building [indexes](https://www.mongodb.com/docs/manual/indexes/),