mongoose 8.14.0 → 8.14.1

package/lib/helpers/populate/assignRawDocsToIdStructure.js

@@ -81,6 +81,8 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
     if (id?.constructor?.name === 'Binary' && id.sub_type === 4 && typeof id.toUUID === 'function') {
       // Workaround for gh-15315 because Mongoose UUIDs don't use BSON UUIDs yet.
       sid = String(id.toUUID());
+    } else if (id?.constructor?.name === 'Buffer' && id._subtype === 4 && typeof id.toUUID === 'function') {
+      sid = String(id.toUUID());
     } else {
       sid = String(id);
     }

package/lib/model.js

@@ -4688,7 +4688,14 @@ function _assign(model, vals, mod, assignmentOpts) {
           if (__val instanceof Document) {
             __val = __val._doc._id;
           }
-          key = String(__val);
+          if (__val?.constructor?.name === 'Binary' && __val.sub_type === 4 && typeof __val.toUUID === 'function') {
+            // Workaround for gh-15315 because Mongoose UUIDs don't use BSON UUIDs yet.
+            key = String(__val.toUUID());
+          } else if (__val?.constructor?.name === 'Buffer' && __val._subtype === 4 && typeof __val.toUUID === 'function') {
+            key = String(__val.toUUID());
+          } else {
+            key = String(__val);
+          }
           if (rawDocs[key]) {
             if (Array.isArray(rawDocs[key])) {
               rawDocs[key].push(val);
@@ -4711,7 +4718,14 @@ function _assign(model, vals, mod, assignmentOpts) {
         if (_val instanceof Document) {
           _val = _val._doc._id;
         }
-        key = String(_val);
+        if (_val?.constructor?.name === 'Binary' && _val.sub_type === 4 && typeof _val.toUUID === 'function') {
+          // Workaround for gh-15315 because Mongoose UUIDs don't use BSON UUIDs yet.
+          key = String(_val.toUUID());
+        } else if (_val?.constructor?.name === 'Buffer' && _val._subtype === 4 && typeof _val.toUUID === 'function') {
+          key = String(_val.toUUID());
+        } else {
+          key = String(_val);
+        }
         if (rawDocs[key]) {
           if (Array.isArray(rawDocs[key])) {
             rawDocs[key].push(val);

package/lib/schema/map.js

@@ -23,12 +23,12 @@ class SchemaMap extends SchemaType {
     return SchemaType.set(option, value);
   }
 
-  cast(val, doc, init) {
+  cast(val, doc, init, prev, options) {
     if (val instanceof MongooseMap) {
       return val;
     }
 
-    const path = this.path;
+    const path = options?.path ?? this.path;
 
     if (init) {
       const map = new MongooseMap({}, path, doc, this.$__schemaType);

package/lib/types/buffer.js

@@ -5,6 +5,7 @@
 'use strict';
 
 const Binary = require('bson').Binary;
+const UUID = require('bson').UUID;
 const utils = require('../utils');
 
 /**
@@ -207,6 +208,22 @@ MongooseBuffer.mixin.toBSON = function() {
   return new Binary(this, this._subtype || 0);
 };
 
+/**
+ * Converts this buffer to a UUID. Throws an error if subtype is not 4.
+ *
+ * @return {UUID}
+ * @api public
+ * @method toUUID
+ * @memberOf MongooseBuffer
+ */
+
+MongooseBuffer.mixin.toUUID = function() {
+  if (this._subtype !== 4) {
+    throw new Error('Cannot convert a Buffer with subtype ' + this._subtype + ' to a UUID');
+  }
+  return new UUID(this);
+};
+
 /**
  * Determines if this buffer is equals to `other` buffer
  *

package/lib/types/map.js

@@ -136,7 +136,7 @@ class MongooseMap extends Map {
       }
     } else {
       try {
-        const options = this.$__schemaType.$isMongooseDocumentArray || this.$__schemaType.$isSingleNested ?
+        const options = this.$__schemaType.$isMongooseDocumentArray || this.$__schemaType.$isSingleNested || this.$__schemaType.$isMongooseArray || this.$__schemaType.$isSchemaMap ?
           { path: fullPath.call(this) } :
           null;
         value = this.$__schemaType.applySetters(

package/package.json

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