mongoose 8.8.1 → 8.8.3

package/lib/document.js

@@ -2711,7 +2711,7 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
 
   if (!isNestedValidate) {
     // If we're validating a subdocument, all this logic will run anyway on the top-level document, so skip for subdocuments
-    const subdocs = doc.$getAllSubdocs();
+    const subdocs = doc.$getAllSubdocs({ useCache: true });
     const modifiedPaths = doc.modifiedPaths();
     for (const subdoc of subdocs) {
       if (subdoc.$basePath) {
@@ -3482,7 +3482,7 @@ Document.prototype.$__reset = function reset() {
   let _this = this;
 
   // Skip for subdocuments
-  const subdocs = !this.$isSubdocument ? this.$getAllSubdocs() : null;
+  const subdocs = !this.$isSubdocument ? this.$getAllSubdocs({ useCache: true }) : null;
   if (subdocs && subdocs.length > 0) {
     for (const subdoc of subdocs) {
       subdoc.$__reset();
@@ -3672,6 +3672,7 @@ Document.prototype.$__getArrayPathsToValidate = function() {
 /**
  * Get all subdocs (by bfs)
  *
+ * @param {Object} [options] options. Currently for internal use.
  * @return {Array}
  * @api public
  * @method $getAllSubdocs
@@ -3679,57 +3680,50 @@ Document.prototype.$__getArrayPathsToValidate = function() {
  * @instance
  */
 
-Document.prototype.$getAllSubdocs = function() {
+Document.prototype.$getAllSubdocs = function(options) {
+  if (options?.useCache && this.$__.saveOptions?.__subdocs) {
+    return this.$__.saveOptions.__subdocs;
+  }
+
   DocumentArray || (DocumentArray = require('./types/documentArray'));
   Embedded = Embedded || require('./types/arraySubdocument');
 
-  function docReducer(doc, seed, path) {
-    let val = doc;
-    let isNested = false;
-    if (path) {
-      if (doc instanceof Document && doc[documentSchemaSymbol].paths[path]) {
-        val = doc._doc[path];
-      } else if (doc instanceof Document && doc[documentSchemaSymbol].nested[path]) {
-        val = doc._doc[path];
-        isNested = true;
-      } else {
-        val = doc[path];
+  const subDocs = [];
+  function getSubdocs(doc) {
+    const newSubdocs = [];
+    for (const { path } of doc.$__schema.childSchemas) {
+      const val = doc.$__getValue(path);
+      if (val == null) {
+        continue;
       }
-    }
-    if (val instanceof Embedded) {
-      seed.push(val);
-    } else if (val instanceof Map) {
-      seed = Array.from(val.keys()).reduce(function(seed, path) {
-        return docReducer(val.get(path), seed, null);
-      }, seed);
-    } else if (val && !Array.isArray(val) && val.$isSingleNested) {
-      seed = Object.keys(val._doc).reduce(function(seed, path) {
-        return docReducer(val, seed, path);
-      }, seed);
-      seed.push(val);
-    } else if (val && utils.isMongooseDocumentArray(val)) {
-      val.forEach(function _docReduce(doc) {
-        if (!doc || !doc._doc) {
-          return;
+      if (val.$__) {
+        newSubdocs.push(val);
+      }
+      if (Array.isArray(val)) {
+        for (const el of val) {
+          if (el != null && el.$__) {
+            newSubdocs.push(el);
+          }
         }
-        seed = Object.keys(doc._doc).reduce(function(seed, path) {
-          return docReducer(doc._doc, seed, path);
-        }, seed);
-        if (doc instanceof Embedded) {
-          seed.push(doc);
+      }
+      if (val instanceof Map) {
+        for (const el of val.values()) {
+          if (el != null && el.$__) {
+            newSubdocs.push(el);
+          }
         }
-      });
-    } else if (isNested && val != null) {
-      for (const path of Object.keys(val)) {
-        docReducer(val, seed, path);
       }
     }
-    return seed;
+    for (const subdoc of newSubdocs) {
+      getSubdocs(subdoc);
+    }
+    subDocs.push(...newSubdocs);
   }
 
-  const subDocs = [];
-  for (const path of Object.keys(this._doc)) {
-    docReducer(this, subDocs, path);
+  getSubdocs(this);
+
+  if (this.$__.saveOptions) {
+    this.$__.saveOptions.__subdocs = subDocs;
   }
 
   return subDocs;

package/lib/helpers/indexes/isTimeseriesIndex.js

@@ -0,0 +1,16 @@
+'use strict';
+
+/**
+ * Returns `true` if the given index matches the schema's `timestamps` options
+ */
+
+module.exports = function isTimeseriesIndex(dbIndex, schemaOptions) {
+  if (schemaOptions.timeseries == null) {
+    return false;
+  }
+  const { timeField, metaField } = schemaOptions.timeseries;
+  if (typeof timeField !== 'string' || typeof metaField !== 'string') {
+    return false;
+  }
+  return Object.keys(dbIndex.key).length === 2 && dbIndex.key[timeField] === 1 && dbIndex.key[metaField] === 1;
+};

package/lib/helpers/model/castBulkWrite.js

@@ -103,7 +103,9 @@ module.exports = function castBulkWrite(originalModel, op, options) {
         });
         op['updateOne']['update'] = castUpdate(model.schema, update, {
           strict: strict,
-          upsert: op['updateOne'].upsert
+          upsert: op['updateOne'].upsert,
+          arrayFilters: op['updateOne'].arrayFilters,
+          overwriteDiscriminatorKey: op['updateOne'].overwriteDiscriminatorKey
         }, model, op['updateOne']['filter']);
       } catch (error) {
         return callback(error, null);
@@ -162,7 +164,9 @@ module.exports = function castBulkWrite(originalModel, op, options) {
 
         op['updateMany']['update'] = castUpdate(model.schema, op['updateMany']['update'], {
           strict: strict,
-          upsert: op['updateMany'].upsert
+          upsert: op['updateMany'].upsert,
+          arrayFilters: op['updateMany'].arrayFilters,
+          overwriteDiscriminatorKey: op['updateMany'].overwriteDiscriminatorKey
         }, model, op['updateMany']['filter']);
       } catch (error) {
         return callback(error, null);

package/lib/helpers/populate/assignVals.js

@@ -249,7 +249,7 @@ function numDocs(v) {
 
 function valueFilter(val, assignmentOpts, populateOptions, allIds) {
   const userSpecifiedTransform = typeof populateOptions.transform === 'function';
-  const transform = userSpecifiedTransform ? populateOptions.transform : noop;
+  const transform = userSpecifiedTransform ? populateOptions.transform : v => v;
   if (Array.isArray(val)) {
     // find logic
     const ret = [];
@@ -341,7 +341,3 @@ function isPopulatedObject(obj) {
     obj.$__ != null ||
     leanPopulateMap.has(obj);
 }
-
-function noop(v) {
-  return v;
-}

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -184,6 +184,15 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     if (hasMatchFunction) {
       match = match.call(doc, doc);
     }
+    if (Array.isArray(match)) {
+      for (const item of match) {
+        if (item != null && item.$where) {
+          throw new MongooseError('Cannot use $where filter with populate() match');
+        }
+      }
+    } else if (match != null && match.$where != null) {
+      throw new MongooseError('Cannot use $where filter with populate() match');
+    }
     data.match = match;
     data.hasMatchFunction = hasMatchFunction;
     data.isRefPath = isRefPath;
@@ -447,6 +456,16 @@ function _virtualPopulate(model, docs, options, _virtualRes) {
     data.match = match;
     data.hasMatchFunction = hasMatchFunction;
 
+    if (Array.isArray(match)) {
+      for (const item of match) {
+        if (item != null && item.$where) {
+          throw new MongooseError('Cannot use $where filter with populate() match');
+        }
+      }
+    } else if (match != null && match.$where != null) {
+      throw new MongooseError('Cannot use $where filter with populate() match');
+    }
+
     // Get local fields
     const ret = _getLocalFieldValues(doc, localField, model, options, virtual);
 

package/lib/helpers/query/castUpdate.js

@@ -8,6 +8,7 @@ const ValidationError = require('../../error/validation');
 const castNumber = require('../../cast/number');
 const cast = require('../../cast');
 const getConstructorName = require('../getConstructorName');
+const getDiscriminatorByValue = require('../discriminator/getDiscriminatorByValue');
 const getEmbeddedDiscriminatorPath = require('./getEmbeddedDiscriminatorPath');
 const handleImmutable = require('./handleImmutable');
 const moveImmutableProperties = require('../update/moveImmutableProperties');
@@ -62,6 +63,27 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     return obj;
   }
 
+  if (schema != null &&
+      filter != null &&
+      utils.hasUserDefinedProperty(filter, schema.options.discriminatorKey) &&
+      typeof filter[schema.options.discriminatorKey] !== 'object' &&
+      schema.discriminators != null) {
+    const discriminatorValue = filter[schema.options.discriminatorKey];
+    const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
+    schema = schema.discriminators[discriminatorValue] ||
+      (byValue && byValue.schema) ||
+      schema;
+  } else if (schema != null &&
+      options.overwriteDiscriminatorKey &&
+      utils.hasUserDefinedProperty(obj, schema.options.discriminatorKey) &&
+      schema.discriminators != null) {
+    const discriminatorValue = obj[schema.options.discriminatorKey];
+    const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
+    schema = schema.discriminators[discriminatorValue] ||
+      (byValue && byValue.schema) ||
+      schema;
+  }
+
   if (options.upsert) {
     moveImmutableProperties(schema, obj, context);
   }

package/lib/model.js

@@ -51,6 +51,7 @@ const immediate = require('./helpers/immediate');
 const internalToObjectOptions = require('./options').internalToObjectOptions;
 const isDefaultIdIndex = require('./helpers/indexes/isDefaultIdIndex');
 const isIndexEqual = require('./helpers/indexes/isIndexEqual');
+const isTimeseriesIndex = require('./helpers/indexes/isTimeseriesIndex');
 const {
   getRelatedDBIndexes,
   getRelatedSchemaIndexes
@@ -1418,6 +1419,10 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
     if (isDefaultIdIndex(dbIndex)) {
       continue;
     }
+    // Timeseries collections have a default index on { timeField: 1, metaField: 1 }.
+    if (isTimeseriesIndex(dbIndex, schema.options)) {
+      continue;
+    }
 
     for (const [schemaIndexKeysObject, schemaIndexOptions] of schemaIndexes) {
       const options = decorateDiscriminatorIndexOptions(schema, clone(schemaIndexOptions));
@@ -1429,9 +1434,11 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
       }
     }
 
-    if (!found) {
-      toDrop.push(dbIndex.name);
+    if (found) {
+      continue;
     }
+
+    toDrop.push(dbIndex.name);
   }
 
   return toDrop;
@@ -3139,7 +3146,7 @@ function _setIsNew(doc, val) {
   doc.$emit('isNew', val);
   doc.constructor.emit('isNew', val);
 
-  const subdocs = doc.$getAllSubdocs();
+  const subdocs = doc.$getAllSubdocs({ useCache: true });
   for (const subdoc of subdocs) {
     subdoc.$isNew = val;
     subdoc.$emit('isNew', val);

package/lib/options/saveOptions.js

@@ -11,4 +11,6 @@ class SaveOptions {
   }
 }
 
+SaveOptions.prototype.__subdocs = null;
+
 module.exports = SaveOptions;

package/lib/plugins/saveSubdocs.js

@@ -15,7 +15,7 @@ module.exports = function saveSubdocs(schema) {
     }
 
     const _this = this;
-    const subdocs = this.$getAllSubdocs();
+    const subdocs = this.$getAllSubdocs({ useCache: true });
 
     if (!subdocs.length) {
       next();
@@ -27,6 +27,8 @@ module.exports = function saveSubdocs(schema) {
         cb(err);
       });
     }, function(error) {
+      // Bust subdocs cache because subdoc pre hooks can add new subdocuments
+      _this.$__.saveOptions.__subdocs = null;
       if (error) {
         return _this.$__schema.s.hooks.execPost('save:error', _this, [_this], { error: error }, function(error) {
           next(error);
@@ -64,7 +66,7 @@ module.exports = function saveSubdocs(schema) {
     }
 
     const _this = this;
-    const subdocs = this.$getAllSubdocs();
+    const subdocs = this.$getAllSubdocs({ useCache: true });
 
     if (!subdocs.length) {
       return;

package/lib/query.js

@@ -4433,10 +4433,10 @@ Query.prototype.exec = async function exec(op) {
       str = str.slice(0, 60) + '...';
     }
     const err = new MongooseError('Query was already executed: ' + str);
-    err.originalStack = this._executionStack.stack;
+    err.originalStack = this._executionStack;
     throw err;
   } else {
-    this._executionStack = new Error();
+    this._executionStack = new Error().stack;
   }
 
   let skipWrappedFunction = null;
@@ -4700,18 +4700,6 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
     upsert = this.options.upsert;
   }
 
-  const filter = this._conditions;
-  if (schema != null &&
-      utils.hasUserDefinedProperty(filter, schema.options.discriminatorKey) &&
-      typeof filter[schema.options.discriminatorKey] !== 'object' &&
-      schema.discriminators != null) {
-    const discriminatorValue = filter[schema.options.discriminatorKey];
-    const byValue = getDiscriminatorByValue(this.model.discriminators, discriminatorValue);
-    schema = schema.discriminators[discriminatorValue] ||
-      (byValue && byValue.schema) ||
-      schema;
-  }
-
   return castUpdate(schema, obj, {
     strict: this._mongooseOptions.strict,
     upsert: upsert,

package/lib/schema.js

@@ -1126,6 +1126,13 @@ Schema.prototype.path = function(path, obj) {
 
     this.paths[mapPath] = schemaType.$__schemaType;
     this.mapPaths.push(this.paths[mapPath]);
+    if (schemaType.$__schemaType.$isSingleNested) {
+      this.childSchemas.push({
+        schema: schemaType.$__schemaType.schema,
+        model: schemaType.$__schemaType.caster,
+        path: path
+      });
+    }
   }
 
   if (schemaType.$isSingleNested) {
@@ -1154,7 +1161,8 @@ Schema.prototype.path = function(path, obj) {
     schemaType.caster.base = this.base;
     this.childSchemas.push({
       schema: schemaType.schema,
-      model: schemaType.caster
+      model: schemaType.caster,
+      path: path
     });
   } else if (schemaType.$isMongooseDocumentArray) {
     Object.defineProperty(schemaType.schema, 'base', {
@@ -1167,7 +1175,8 @@ Schema.prototype.path = function(path, obj) {
     schemaType.casterConstructor.base = this.base;
     this.childSchemas.push({
       schema: schemaType.schema,
-      model: schemaType.casterConstructor
+      model: schemaType.casterConstructor,
+      path: path
     });
   }
 
@@ -1235,7 +1244,9 @@ function gatherChildSchemas(schema) {
   for (const path of Object.keys(schema.paths)) {
     const schematype = schema.paths[path];
     if (schematype.$isMongooseDocumentArray || schematype.$isSingleNested) {
-      childSchemas.push({ schema: schematype.schema, model: schematype.caster });
+      childSchemas.push({ schema: schematype.schema, model: schematype.caster, path: path });
+    } else if (schematype.$isSchemaMap && schematype.$__schemaType.$isSingleNested) {
+      childSchemas.push({ schema: schematype.$__schemaType.schema, model: schematype.$__schemaType.caster, path: path });
     }
   }
 

package/package.json

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

package/types/cursor.d.ts

@@ -11,8 +11,10 @@ declare module 'mongoose' {
     signal?: AbortSignal;
   }
 
-  class Cursor<DocType = any, Options = never> extends stream.Readable {
-    [Symbol.asyncIterator](): AsyncIterableIterator<DocType>;
+  class Cursor<DocType = any, Options = never, NextResultType = DocType | null> extends stream.Readable {
+    [Symbol.asyncIterator](): Cursor<IteratorResult<DocType>, Options, IteratorResult<DocType>>;
+
+    [Symbol.asyncDispose](): Promise<void>;
 
     /**
      * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/4.9/classes/FindCursor.html#addCursorFlag).
@@ -58,7 +60,7 @@ declare module 'mongoose' {
      * Get the next document from this cursor. Will return `null` when there are
      * no documents left.
      */
-    next(): Promise<DocType | null>;
+    next(): Promise<NextResultType>;
 
     options: Options;
   }