mongoose 7.3.4 → 7.4.1

package/lib/query.js

@@ -24,6 +24,7 @@ const getDiscriminatorByValue = require('./helpers/discriminator/getDiscriminato
 const hasDollarKeys = require('./helpers/query/hasDollarKeys');
 const helpers = require('./queryhelpers');
 const immediate = require('./helpers/immediate');
+const internalToObjectOptions = require('./options').internalToObjectOptions;
 const isExclusive = require('./helpers/projection/isExclusive');
 const isInclusive = require('./helpers/projection/isInclusive');
 const isPathSelectedInclusive = require('./helpers/projection/isPathSelectedInclusive');
@@ -1635,6 +1636,10 @@ Query.prototype.setOptions = function(options, overwrite) {
     delete options.translateAliases;
   }
 
+  if ('rawResult' in options) {
+    printRawResultDeprecationWarning();
+  }
+
   if (options.lean == null && this.schema && 'lean' in this.schema.options) {
     this._mongooseOptions.lean = this.schema.options.lean;
   }
@@ -1669,6 +1674,15 @@ Query.prototype.setOptions = function(options, overwrite) {
   return this;
 };
 
+/*!
+ * ignore
+ */
+
+const printRawResultDeprecationWarning = util.deprecate(
+  function printRawResultDeprecationWarning() {},
+  'The `rawResult` option for Mongoose queries is deprecated. Use `includeResultMetadata: false` as a replacement for `rawResult: true`.'
+);
+
 /**
  * Sets the [`explain` option](https://www.mongodb.com/docs/manual/reference/method/cursor.explain/),
  * which makes this query return detailed execution stats instead of the actual
@@ -1954,7 +1968,6 @@ Query.prototype._optionsForExec = function(model) {
   if (!model) {
     return options;
   }
-
   // Apply schema-level `writeConcern` option
   applyWriteConcern(model.schema, options);
 
@@ -2319,8 +2332,6 @@ Query.prototype.find = function(conditions) {
 
   this.op = 'find';
 
-  conditions = utils.toObject(conditions);
-
   if (mquery.canMerge(conditions)) {
     this.merge(conditions);
 
@@ -2392,6 +2403,8 @@ Query.prototype.merge = function(source) {
     utils.merge(this._conditions, { _id: source }, opts);
 
     return this;
+  } else if (source && source.$__) {
+    source = source.toObject(internalToObjectOptions);
   }
 
   opts.omit = {};
@@ -2434,7 +2447,7 @@ Query.prototype.collation = function(value) {
  */
 
 Query.prototype._completeOne = function(doc, res, callback) {
-  if (!doc && !this.options.rawResult) {
+  if (!doc && !this.options.rawResult && !this.options.includeResultMetadata) {
     return callback(null, null);
   }
 
@@ -2560,9 +2573,6 @@ Query.prototype.findOne = function(conditions, projection, options) {
   this.op = 'findOne';
   this._validateOp();
 
-  // make sure we don't send in the whole Document to merge()
-  conditions = utils.toObject(conditions);
-
   if (options) {
     this.setOptions(options);
   }
@@ -2726,8 +2736,6 @@ Query.prototype.count = function(filter) {
   this.op = 'count';
   this._validateOp();
 
-  filter = utils.toObject(filter);
-
   if (mquery.canMerge(filter)) {
     this.merge(filter);
   }
@@ -2822,8 +2830,6 @@ Query.prototype.countDocuments = function(conditions, options) {
   this.op = 'countDocuments';
   this._validateOp();
 
-  conditions = utils.toObject(conditions);
-
   if (mquery.canMerge(conditions)) {
     this.merge(conditions);
   }
@@ -2886,7 +2892,6 @@ Query.prototype.distinct = function(field, conditions) {
 
   this.op = 'distinct';
   this._validateOp();
-  conditions = utils.toObject(conditions);
 
   if (mquery.canMerge(conditions)) {
     this.merge(conditions);
@@ -2981,8 +2986,6 @@ Query.prototype.deleteOne = function deleteOne(filter, options) {
   this.op = 'deleteOne';
   this.setOptions(options);
 
-  filter = utils.toObject(filter);
-
   if (mquery.canMerge(filter)) {
     this.merge(filter);
 
@@ -3058,8 +3061,6 @@ Query.prototype.deleteMany = function(filter, options) {
   this.setOptions(options);
   this.op = 'deleteMany';
 
-  filter = utils.toObject(filter);
-
   if (mquery.canMerge(filter)) {
     this.merge(filter);
 
@@ -3110,7 +3111,7 @@ Query.prototype._deleteMany = async function _deleteMany() {
  */
 
 function completeOne(model, doc, res, options, fields, userProvidedFields, pop, callback) {
-  if (options.rawResult && doc == null) {
+  if ((options.rawResult || options.includeResultMetadata) && doc == null) {
     _init(null);
     return null;
   }
@@ -3123,7 +3124,7 @@ function completeOne(model, doc, res, options, fields, userProvidedFields, pop,
     }
 
 
-    if (options.rawResult) {
+    if (options.rawResult || options.includeResultMetadata) {
       if (doc && casted) {
         if (options.session != null) {
           casted.$session(options.session);
@@ -3298,6 +3299,10 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
   applyGlobalMaxTimeMS(this.options, this.model);
   applyGlobalDiskUse(this.options, this.model);
 
+  if (this.options.rawResult && this.options.includeResultMetadata === false) {
+    throw new MongooseError('Cannot set `rawResult` option when `includeResultMetadata` is false');
+  }
+
   if ('strict' in this.options) {
     this._mongooseOptions.strict = this.options.strict;
   }
@@ -3348,7 +3353,7 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
   for (const fn of this._transforms) {
     res = fn(res);
   }
-  const doc = res.value;
+  const doc = options.includeResultMetadata === false ? res : res.value;
 
   return new Promise((resolve, reject) => {
     this._completeOne(doc, res, _wrapThunkCallback(this, (err, res) => {
@@ -3489,6 +3494,11 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
     throw this.error();
   }
 
+  const includeResultMetadata = this.options.includeResultMetadata;
+  if (this.options.rawResult && includeResultMetadata === false) {
+    throw new MongooseError('Cannot set `rawResult` option when `includeResultMetadata` is false');
+  }
+
   const filter = this._conditions;
   const options = this._optionsForExec(this.model);
   this._applyTranslateAliases(options);
@@ -3497,7 +3507,7 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
   for (const fn of this._transforms) {
     res = fn(res);
   }
-  const doc = res.value;
+  const doc = includeResultMetadata === false ? res : res.value;
 
   return new Promise((resolve, reject) => {
     this._completeOne(doc, res, _wrapThunkCallback(this, (err, res) => {
@@ -3624,6 +3634,11 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
   this._applyTranslateAliases(options);
   convertNewToReturnDocument(options);
 
+  const includeResultMetadata = this.options.includeResultMetadata;
+  if (this.options.rawResult && includeResultMetadata === false) {
+    throw new MongooseError('Cannot set `rawResult` option when `includeResultMetadata` is false');
+  }
+
   const modelOpts = { skipId: true };
   if ('strict' in this._mongooseOptions) {
     modelOpts.strict = this._mongooseOptions.strict;
@@ -3654,7 +3669,7 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
     res = fn(res);
   }
 
-  const doc = res.value;
+  const doc = includeResultMetadata === false ? res : res.value;
   return new Promise((resolve, reject) => {
     this._completeOne(doc, res, _wrapThunkCallback(this, (err, res) => {
       if (err) {
@@ -4168,7 +4183,6 @@ function _update(query, op, filter, doc, options, callback) {
   // make sure we don't send in the whole Document to merge()
   query.op = op;
   query._validateOp();
-  filter = utils.toObject(filter);
   doc = doc || {};
 
   // strict is an option used in the update checking, make sure it gets set

package/lib/schema/SubdocumentPath.js

@@ -165,22 +165,22 @@ SubdocumentPath.prototype.cast = function(val, doc, init, priorVal, options) {
   let subdoc;
 
   // Only pull relevant selected paths and pull out the base path
-  const parentSelected = doc && doc.$__ && doc.$__.selected || {};
+  const parentSelected = doc && doc.$__ && doc.$__.selected;
   const path = this.path;
-  const selected = Object.keys(parentSelected).reduce((obj, key) => {
+  const selected = parentSelected == null ? null : Object.keys(parentSelected).reduce((obj, key) => {
     if (key.startsWith(path + '.')) {
       obj = obj || {};
       obj[key.substring(path.length + 1)] = parentSelected[key];
     }
     return obj;
   }, null);
-  options = Object.assign({}, options, { priorDoc: priorVal });
   if (init) {
     subdoc = new Constructor(void 0, selected, doc, false, { defaults: false });
     delete subdoc.$__.defaults;
     subdoc.$init(val);
     applyDefaults(subdoc, selected);
   } else {
+    options = Object.assign({}, options, { priorDoc: priorVal });
     if (Object.keys(val).length === 0) {
       return new Constructor({}, selected, doc, undefined, options);
     }
@@ -212,11 +212,15 @@ SubdocumentPath.prototype.castForQuery = function($conditional, val, context, op
     return val;
   }
 
+  const Constructor = getConstructor(this.caster, val);
+  if (val instanceof Constructor) {
+    return val;
+  }
+
   if (this.options.runSetters) {
     val = this._applySetters(val, context);
   }
 
-  const Constructor = getConstructor(this.caster, val);
   const overrideStrict = options != null && options.strict != null ?
     options.strict :
     void 0;
@@ -347,6 +351,8 @@ SubdocumentPath.defaultOptions = {};
 
 SubdocumentPath.set = SchemaType.set;
 
+SubdocumentPath.setters = [];
+
 /**
  * Attaches a getter for all SubdocumentPath instances
  *

package/lib/schema/array.js

@@ -170,6 +170,8 @@ SchemaArray.defaultOptions = {};
  */
 SchemaArray.set = SchemaType.set;
 
+SchemaArray.setters = [];
+
 /**
  * Attaches a getter for all Array instances
  *

package/lib/schema/bigint.js

@@ -62,6 +62,8 @@ SchemaBigInt._cast = castBigInt;
 
 SchemaBigInt.set = SchemaType.set;
 
+SchemaBigInt.setters = [];
+
 /**
  * Attaches a getter for all BigInt instances
  *

package/lib/schema/boolean.js

@@ -65,6 +65,8 @@ SchemaBoolean._cast = castBoolean;
 
 SchemaBoolean.set = SchemaType.set;
 
+SchemaBoolean.setters = [];
+
 /**
  * Attaches a getter for all Boolean instances
  *

package/lib/schema/buffer.js

@@ -70,6 +70,8 @@ SchemaBuffer._checkRequired = v => !!(v && v.length);
 
 SchemaBuffer.set = SchemaType.set;
 
+SchemaBuffer.setters = [];
+
 /**
  * Attaches a getter for all Buffer instances
  *

package/lib/schema/date.js

@@ -70,6 +70,8 @@ SchemaDate._cast = castDate;
 
 SchemaDate.set = SchemaType.set;
 
+SchemaDate.setters = [];
+
 /**
  * Attaches a getter for all Date instances
  *

package/lib/schema/decimal128.js

@@ -66,6 +66,8 @@ Decimal128._cast = castDecimal128;
 
 Decimal128.set = SchemaType.set;
 
+Decimal128.setters = [];
+
 /**
  * Attaches a getter for all Decimal128 instances
  *

package/lib/schema/documentarray.js

@@ -605,6 +605,8 @@ DocumentArrayPath.defaultOptions = {};
 
 DocumentArrayPath.set = SchemaType.set;
 
+DocumentArrayPath.setters = [];
+
 /**
  * Attaches a getter for all DocumentArrayPath instances
  *

package/lib/schema/mixed.js

@@ -94,6 +94,8 @@ Mixed.get = SchemaType.get;
 
 Mixed.set = SchemaType.set;
 
+Mixed.setters = [];
+
 /**
  * Casts `val` for Mixed.
  *

package/lib/schema/number.js

@@ -67,6 +67,8 @@ SchemaNumber.get = SchemaType.get;
 
 SchemaNumber.set = SchemaType.set;
 
+SchemaNumber.setters = [];
+
 /*!
  * ignore
  */

package/lib/schema/objectid.js

@@ -94,6 +94,8 @@ ObjectId.get = SchemaType.get;
 
 ObjectId.set = SchemaType.set;
 
+ObjectId.setters = [];
+
 /**
  * Adds an auto-generated ObjectId default if turnOn is true.
  * @param {Boolean} turnOn auto generated ObjectId defaults

package/lib/schema/string.js

@@ -143,6 +143,8 @@ SchemaString.get = SchemaType.get;
 
 SchemaString.set = SchemaType.set;
 
+SchemaString.setters = [];
+
 /*!
  * ignore
  */

package/lib/schema/uuid.js

@@ -194,6 +194,8 @@ SchemaUUID.get = SchemaType.get;
 
 SchemaUUID.set = SchemaType.set;
 
+SchemaUUID.setters = [];
+
 /**
  * Get/set the function used to cast arbitrary values to UUIDs.
  *

package/lib/schema.js

@@ -80,6 +80,7 @@ let id = 0;
  * - [timestamps](https://mongoosejs.com/docs/guide.html#timestamps): object or boolean - defaults to `false`. If true, Mongoose adds `createdAt` and `updatedAt` properties to your schema and manages those properties for you.
  * - [pluginTags](https://mongoosejs.com/docs/guide.html#pluginTags): array of strings - defaults to `undefined`. If set and plugin called with `tags` option, will only apply that plugin to schemas with a matching tag.
  * - [virtuals](https://mongoosejs.com/docs/tutorials/virtuals.html#virtuals-via-schema-options): object - virtuals to define, alias for [`.virtual`](https://mongoosejs.com/docs/api/schema.html#Schema.prototype.virtual())
+ * - [collectionOptions]: object with options passed to [`createCollection()`](https://www.mongodb.com/docs/manual/reference/method/db.createCollection/) when calling `Model.createCollection()` or `autoCreate` set to true.
  *
  * #### Options for Nested Schemas:
  *
@@ -747,10 +748,10 @@ Schema.prototype.add = function add(obj, prefix) {
           childSchemaOptions.strict = this._userProvidedOptions.strict;
         }
         if (this._userProvidedOptions.toObject != null) {
-          childSchemaOptions.toObject = this._userProvidedOptions.toObject;
+          childSchemaOptions.toObject = utils.omit(this._userProvidedOptions.toObject, ['transform']);
         }
         if (this._userProvidedOptions.toJSON != null) {
-          childSchemaOptions.toJSON = this._userProvidedOptions.toJSON;
+          childSchemaOptions.toJSON = utils.omit(this._userProvidedOptions.toJSON, ['transform']);
         }
 
         const _schema = new Schema(_typeDef, childSchemaOptions);
@@ -1345,10 +1346,10 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
           childSchemaOptions.strictQuery = options.strictQuery;
         }
         if (options.hasOwnProperty('toObject')) {
-          childSchemaOptions.toObject = options.toObject;
+          childSchemaOptions.toObject = utils.omit(options.toObject, ['transform']);
         }
         if (options.hasOwnProperty('toJSON')) {
-          childSchemaOptions.toJSON = options.toJSON;
+          childSchemaOptions.toJSON = utils.omit(options.toJSON, ['transform']);
         }
 
         if (this._userProvidedOptions.hasOwnProperty('_id')) {
@@ -1585,9 +1586,6 @@ Schema.prototype.indexedPaths = function indexedPaths() {
  */
 
 Schema.prototype.pathType = function(path) {
-  // Convert to '.$' to check subpaths re: gh-6405
-  const cleanPath = _pathToPositionalSyntax(path);
-
   if (this.paths.hasOwnProperty(path)) {
     return 'real';
   }
@@ -1597,6 +1595,10 @@ Schema.prototype.pathType = function(path) {
   if (this.nested.hasOwnProperty(path)) {
     return 'nested';
   }
+
+  // Convert to '.$' to check subpaths re: gh-6405
+  const cleanPath = _pathToPositionalSyntax(path);
+
   if (this.subpaths.hasOwnProperty(cleanPath) || this.subpaths.hasOwnProperty(path)) {
     return 'real';
   }

package/lib/schematype.js

@@ -48,7 +48,9 @@ function SchemaType(path, options, instance) {
   this.getters = this.constructor.hasOwnProperty('getters') ?
     this.constructor.getters.slice() :
     [];
-  this.setters = [];
+  this.setters = this.constructor.hasOwnProperty('setters') ?
+    this.constructor.setters.slice() :
+    [];
 
   this.splitPath();
 
@@ -80,7 +82,11 @@ function SchemaType(path, options, instance) {
   const keys = Object.keys(this.options);
   for (const prop of keys) {
     if (prop === 'cast') {
-      this.castFunction(this.options[prop]);
+      if (Array.isArray(this.options[prop])) {
+        this.castFunction.apply(this, this.options[prop]);
+      } else {
+        this.castFunction(this.options[prop]);
+      }
       continue;
     }
     if (utils.hasUserDefinedProperty(this.options, prop) && typeof this[prop] === 'function') {
@@ -253,14 +259,24 @@ SchemaType.cast = function cast(caster) {
  * @api public
  */
 
-SchemaType.prototype.castFunction = function castFunction(caster) {
+SchemaType.prototype.castFunction = function castFunction(caster, message) {
   if (arguments.length === 0) {
     return this._castFunction;
   }
+
   if (caster === false) {
     caster = this.constructor._defaultCaster || (v => v);
   }
-  this._castFunction = caster;
+  if (typeof caster === 'string') {
+    this._castErrorMessage = caster;
+    return this._castFunction;
+  }
+  if (caster != null) {
+    this._castFunction = caster;
+  }
+  if (message != null) {
+    this._castErrorMessage = message;
+  }
 
   return this._castFunction;
 };

package/lib/types/ArraySubdocument.js

@@ -33,7 +33,15 @@ function ArraySubdocument(obj, parentArr, skipId, fields, index) {
   this.$setIndex(index);
   this.$__parent = this[documentArrayParent];
 
-  Subdocument.call(this, obj, fields, this[documentArrayParent], skipId, { isNew: true });
+  let options;
+  if (typeof skipId === 'object' && skipId != null) {
+    options = { isNew: true, ...skipId };
+    skipId = undefined;
+  } else {
+    options = { isNew: true };
+  }
+
+  Subdocument.call(this, obj, fields, this[documentArrayParent], skipId, options);
 }
 
 /*!

package/lib/types/DocumentArray/methods/index.js

@@ -38,7 +38,7 @@ const methods = {
    * @memberOf MongooseDocumentArray
    */
 
-  _cast(value, index) {
+  _cast(value, index, options) {
     if (this[arraySchemaSymbol] == null) {
       return value;
     }
@@ -89,7 +89,7 @@ const methods = {
     if (Constructor.$isMongooseDocumentArray) {
       return Constructor.cast(value, this, undefined, undefined, index);
     }
-    const ret = new Constructor(value, this, undefined, undefined, index);
+    const ret = new Constructor(value, this, options, undefined, index);
     ret.isNew = true;
     return ret;
   },

package/lib/types/array/methods/index.js

@@ -595,7 +595,7 @@ const methods = {
    */
 
   pull() {
-    const values = [].map.call(arguments, this._cast, this);
+    const values = [].map.call(arguments, (v, i) => this._cast(v, i, { defaults: false }), this);
     const cur = this[arrayParentSymbol].get(this[arrayPathSymbol]);
     let i = cur.length;
     let mem;

package/lib/types/subdocument.js

@@ -16,6 +16,10 @@ module.exports = Subdocument;
  */
 
 function Subdocument(value, fields, parent, skipId, options) {
+  if (typeof skipId === 'object' && skipId != null && options == null) {
+    options = skipId;
+    skipId = undefined;
+  }
   if (parent != null) {
     // If setting a nested path, should copy isNew from parent re: gh-7048
     const parentOptions = { isNew: parent.isNew };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.3.4",
+  "version": "7.4.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -19,9 +19,9 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "bson": "^5.3.0",
+    "bson": "^5.4.0",
     "kareem": "2.5.1",
-    "mongodb": "5.6.0",
+    "mongodb": "5.7.0",
     "mpath": "0.9.0",
     "mquery": "5.0.0",
     "ms": "2.1.3",

package/types/augmentations.d.ts

@@ -0,0 +1,9 @@
+// this import is required so that types get merged instead of completely overwritten
+import 'bson';
+
+declare module 'bson' {
+  interface ObjectId {
+    /** Mongoose automatically adds a conveniency "_id" getter on the base ObjectId class */
+    _id: this;
+  }
+}

package/types/index.d.ts

@@ -22,6 +22,7 @@
 /// <reference path="./validation.d.ts" />
 /// <reference path="./inferschematype.d.ts" />
 /// <reference path="./virtuals.d.ts" />
+/// <reference path="./augmentations.d.ts" />
 
 declare class NativeDate extends global.Date { }
 
@@ -377,11 +378,22 @@ declare module 'mongoose' {
     pre<T = never>(method: MongooseQueryOrDocumentMiddleware | MongooseQueryOrDocumentMiddleware[] | RegExp, options: SchemaPreOptions & { document: false, query: false }, fn: PreMiddlewareFunction<T>): this;
     pre<T = never>(method: MongooseDistinctQueryMiddleware|MongooseDistinctQueryMiddleware[], options: SchemaPreOptions & { document: boolean, query: false }, fn: PreMiddlewareFunction<T>): this;
     pre<T = never>(method: MongooseDistinctDocumentMiddleware | MongooseDistinctDocumentMiddleware[] | RegExp, options: SchemaPreOptions & { document: false, query: boolean }, fn: PreMiddlewareFunction<T>): this;
+    // this = Union of Document and Query, could be called with any of them
+    pre<T = THydratedDocumentType | Query<any, any>>(
+      method: MongooseQueryAndDocumentMiddleware | MongooseQueryAndDocumentMiddleware[] | RegExp,
+      options: SchemaPreOptions & { document: true, query: true },
+      fn: PreMiddlewareFunction<T>
+    ): this;
     // this = Document
     pre<T = THydratedDocumentType>(method: 'save', fn: PreSaveMiddlewareFunction<T>): this;
     pre<T = THydratedDocumentType>(method: 'save', options: SchemaPreOptions, fn: PreSaveMiddlewareFunction<T>): this;
     pre<T = THydratedDocumentType>(method: MongooseDistinctDocumentMiddleware|MongooseDistinctDocumentMiddleware[], fn: PreMiddlewareFunction<T>): this;
     pre<T = THydratedDocumentType>(method: MongooseDistinctDocumentMiddleware|MongooseDistinctDocumentMiddleware[], options: SchemaPreOptions, fn: PreMiddlewareFunction<T>): this;
+    pre<T = THydratedDocumentType>(
+      method: MongooseQueryAndDocumentMiddleware | MongooseQueryAndDocumentMiddleware[] | RegExp,
+      options: SchemaPreOptions & { document: true },
+      fn: PreMiddlewareFunction<T>
+    ): this;
     pre<T = THydratedDocumentType>(method: MongooseQueryOrDocumentMiddleware | MongooseQueryOrDocumentMiddleware[] | RegExp, options: SchemaPreOptions & { document: true, query: false }, fn: PreMiddlewareFunction<T>): this;
     // this = Query
     pre<T = Query<any, any>>(method: MongooseDefaultQueryMiddleware|MongooseDefaultQueryMiddleware[], fn: PreMiddlewareFunction<T>): this;

package/types/inferschematype.d.ts

@@ -218,10 +218,11 @@ type ResolvePathType<PathValueType, Options extends SchemaTypeOptions<PathValueT
                                         PathValueType extends 'uuid' | 'UUID' | typeof Schema.Types.UUID ? Buffer :
                                           IfEquals<PathValueType, Schema.Types.UUID> extends true ? Buffer :
                                             PathValueType extends MapConstructor ? Map<string, ResolvePathType<Options['of']>> :
-                                              PathValueType extends ArrayConstructor ? any[] :
-                                                PathValueType extends typeof Schema.Types.Mixed ? any:
-                                                  IfEquals<PathValueType, ObjectConstructor> extends true ? any:
-                                                    IfEquals<PathValueType, {}> extends true ? any:
-                                                      PathValueType extends typeof SchemaType ? PathValueType['prototype'] :
-                                                        PathValueType extends Record<string, any> ? ObtainDocumentType<PathValueType, any, { typeKey: TypeKey }> :
-                                                          unknown;
+                                              IfEquals<PathValueType, typeof Schema.Types.Map> extends true ? Map<string, ResolvePathType<Options['of']>> :
+                                                PathValueType extends ArrayConstructor ? any[] :
+                                                  PathValueType extends typeof Schema.Types.Mixed ? any:
+                                                    IfEquals<PathValueType, ObjectConstructor> extends true ? any:
+                                                      IfEquals<PathValueType, {}> extends true ? any:
+                                                        PathValueType extends typeof SchemaType ? PathValueType['prototype'] :
+                                                          PathValueType extends Record<string, any> ? ObtainDocumentType<PathValueType, any, { typeKey: TypeKey }> :
+                                                            unknown;

package/types/models.d.ts

@@ -123,7 +123,6 @@ declare module 'mongoose' {
     SessionOption {
     checkKeys?: boolean;
     j?: boolean;
-    ordered?: boolean;
     safe?: boolean | WriteConcern;
     timestamps?: boolean | QueryTimestampsConfig;
     validateBeforeSave?: boolean;
@@ -132,6 +131,11 @@ declare module 'mongoose' {
     wtimeout?: number;
   }
 
+  interface CreateOptions extends SaveOptions {
+    ordered?: boolean;
+    aggregateErrors?: boolean;
+  }
+
   interface RemoveOptions extends SessionOption, Omit<mongodb.DeleteOptions, 'session'> {}
 
   const Model: Model<any>;
@@ -217,7 +221,8 @@ declare module 'mongoose' {
     >;
 
     /** Creates a new document or documents */
-    create<DocContents = AnyKeys<TRawDocType>>(docs: Array<TRawDocType | DocContents>, options?: SaveOptions): Promise<THydratedDocumentType[]>;
+    create<DocContents = AnyKeys<TRawDocType>>(docs: Array<TRawDocType | DocContents>, options: CreateOptions & { aggregateErrors: true }): Promise<(THydratedDocumentType | Error)[]>;
+    create<DocContents = AnyKeys<TRawDocType>>(docs: Array<TRawDocType | DocContents>, options?: CreateOptions): Promise<THydratedDocumentType[]>;
     create<DocContents = AnyKeys<TRawDocType>>(doc: DocContents | TRawDocType): Promise<THydratedDocumentType>;
     create<DocContents = AnyKeys<TRawDocType>>(...docs: Array<TRawDocType | DocContents>): Promise<THydratedDocumentType[]>;