mongoose 9.10.4 → 9.11.1

package/lib/cast.js

@@ -11,6 +11,7 @@ const cast$expr = require('./helpers/query/cast$expr');
 const castString = require('./cast/string');
 const castTextSearch = require('./schema/operators/text');
 const get = require('./helpers/get');
+const getDiscriminatorValueFromFilter = require('./helpers/discriminator/getDiscriminatorValueFromFilter');
 const getSchemaDiscriminatorByValue = require('./helpers/discriminator/getSchemaDiscriminatorByValue');
 const isOperator = require('./helpers/query/isOperator');
 const util = require('util');
@@ -43,7 +44,8 @@ module.exports = function cast(schema, obj, options, context) {
   }
 
   if (schema?.discriminators != null && obj[schema.options.discriminatorKey] != null) {
-    schema = getSchemaDiscriminatorByValue(schema, obj[schema.options.discriminatorKey]) || schema;
+    const discriminatorValue = getDiscriminatorValueFromFilter(obj[schema.options.discriminatorKey]);
+    schema = getSchemaDiscriminatorByValue(schema, discriminatorValue) || schema;
   }
 
   const paths = Object.keys(obj);
@@ -134,18 +136,10 @@ module.exports = function cast(schema, obj, options, context) {
           if (_schematype?.schema?.discriminators != null &&
             discriminatorKey != null &&
             pathLastHalf !== discriminatorKey) {
-            const discriminatorVal = get(obj, pathFirstHalf + '.' + discriminatorKey);
+            const discriminatorVal = getDiscriminatorValueFromFilter(get(obj, pathFirstHalf + '.' + discriminatorKey));
             const discriminators = _schematype.schema.discriminators;
             if (typeof discriminatorVal === 'string' && discriminators[discriminatorVal] != null) {
-
               schematype = discriminators[discriminatorVal].path(pathLastHalf);
-            } else if (discriminatorVal != null &&
-              Object.keys(discriminatorVal).length === 1 &&
-              Array.isArray(discriminatorVal.$in) &&
-              discriminatorVal.$in.length === 1 &&
-              typeof discriminatorVal.$in[0] === 'string' &&
-              discriminators[discriminatorVal.$in[0]] != null) {
-              schematype = discriminators[discriminatorVal.$in[0]].path(pathLastHalf);
             }
           }
         }
@@ -329,15 +323,11 @@ module.exports = function cast(schema, obj, options, context) {
               if (nested && schematype?.schema != null) {
                 cast(schematype.schema, nested, options, context);
               } else if (nested && schematype?.$isMongooseArray) {
-                if (utils.isPOJO(nested) && nested.$not != null) {
-                  cast(schema, nested, options, context);
-                } else {
-                  val[$cond] = schematype.castForQuery(
-                    $cond,
-                    nested,
-                    context
-                  );
-                }
+                val[$cond] = schematype.castForQuery(
+                  $cond,
+                  nested,
+                  context
+                );
               }
             } else if ($cond === '$not') {
               if (nested && schematype) {

package/lib/cursor/queryCursor.js

@@ -170,6 +170,9 @@ QueryCursor.prototype.getDriverCursor = async function getDriverCursor() {
   if (this.cursor) {
     return this.cursor;
   }
+  if (this._error) {
+    throw this._error;
+  }
 
   await once(this, 'cursor');
   return this.cursor;
@@ -278,7 +281,7 @@ QueryCursor.prototype._destroy = function _destroy(_err, callback) {
 
   waitForCursor
     .then(() => {
-      this.cursor.close();
+      return this.cursor.close();
     })
     .then(() => {
       this._closed = true;