mongoose 9.0.1 → 9.1.0

package/lib/query.js

@@ -136,7 +136,7 @@ function Query(conditions, options, model, collection) {
 
   // this is needed because map reduce returns a model that can be queried, but
   // all of the queries on said model should be lean
-  if (this.model && this.model._mapreduce) {
+  if (this.model?._mapreduce) {
     this.lean();
   }
 
@@ -156,10 +156,7 @@ function Query(conditions, options, model, collection) {
   // versions of MongoDB
   this.$useProjection = true;
 
-  const collation = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.collation || null;
+  const collation = this?.schema?.options?.collation || null;
   if (collation != null) {
     this.options.collation = collation;
   }
@@ -169,7 +166,7 @@ function Query(conditions, options, model, collection) {
 function isEmptyFilter(obj) {
   if (obj == null) return true;
   if (typeof obj !== 'object') return true;
-  if (Object.keys(obj).length === 0) return true;
+  if (utils.hasOwnKeys(obj) === false) return true;
 
   // Check $and, $or, $nor arrays
   for (const key of ['$and', '$or', '$nor']) {
@@ -186,7 +183,7 @@ function isEmptyFilter(obj) {
 
 // Helper function to check for empty/invalid filter
 function checkRequireFilter(filter, options) {
-  if (options && options.requireFilter && isEmptyFilter(filter)) {
+  if (options?.requireFilter && isEmptyFilter(filter)) {
     throw new Error('Empty or invalid filter not allowed with requireFilter enabled');
   }
 }
@@ -457,8 +454,8 @@ Query.prototype.clone = function() {
  * @api public
  */
 
-Query.prototype.slice = function() {
-  if (arguments.length === 0) {
+Query.prototype.slice = function(...args) {
+  if (args.length === 0) {
     return this;
   }
 
@@ -467,8 +464,8 @@ Query.prototype.slice = function() {
   let path;
   let val;
 
-  if (arguments.length === 1) {
-    const arg = arguments[0];
+  if (args.length === 1) {
+    const arg = args[0];
     if (typeof arg === 'object' && !Array.isArray(arg)) {
       const keys = Object.keys(arg);
       const numKeys = keys.length;
@@ -479,19 +476,19 @@ Query.prototype.slice = function() {
     }
     this._ensurePath('slice');
     path = this._path;
-    val = arguments[0];
-  } else if (arguments.length === 2) {
-    if ('number' === typeof arguments[0]) {
+    val = args[0];
+  } else if (args.length === 2) {
+    if ('number' === typeof args[0]) {
       this._ensurePath('slice');
       path = this._path;
-      val = [arguments[0], arguments[1]];
+      val = [args[0], args[1]];
     } else {
-      path = arguments[0];
-      val = arguments[1];
+      path = args[0];
+      val = args[1];
     }
-  } else if (arguments.length === 3) {
-    path = arguments[0];
-    val = [arguments[1], arguments[2]];
+  } else if (args.length === 3) {
+    path = args[0];
+    val = [args[1], args[2]];
   }
 
   const p = {};
@@ -2006,7 +2003,7 @@ Query.prototype._fieldsForExec = function() {
   if (this._fields == null) {
     return null;
   }
-  if (Object.keys(this._fields).length === 0) {
+  if (utils.hasOwnKeys(this._fields) === false) {
     return null;
   }
   return clone(this._fields);
@@ -2104,10 +2101,7 @@ Query.prototype._optionsForExec = function(model) {
     options.session = asyncLocalStorage.session;
   }
 
-  const readPreference = model &&
-  model.schema &&
-  model.schema.options &&
-  model.schema.options.read;
+  const readPreference = model?.schema?.options?.read;
   if (!('readPreference' in options) && readPreference) {
     options.readPreference = readPreference;
   }
@@ -2413,13 +2407,15 @@ Query.prototype._find = async function _find() {
   const mongooseOptions = this._mongooseOptions;
   const userProvidedFields = this._userProvidedFields || {};
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   // Separate options to pass down to `completeMany()` in case we need to
   // set a session on the document
   const completeManyOptions = {
-    session: this && this.options && this.options.session || null,
+    session: this?.options?.session || null,
     lean: mongooseOptions.lean || null
   };
 
@@ -2440,7 +2436,7 @@ Query.prototype._find = async function _find() {
 
   if (!mongooseOptions.populate) {
     const versionKey = this.schema.options.versionKey;
-    if (mongooseOptions.lean && mongooseOptions.lean.versionKey === false && versionKey) {
+    if (mongooseOptions.lean?.versionKey === false && versionKey) {
       docs.forEach((doc) => {
         if (versionKey in doc) {
           delete doc[versionKey];
@@ -2561,7 +2557,7 @@ Query.prototype.merge = function(source) {
     utils.merge(this._conditions, { _id: source }, opts);
 
     return this;
-  } else if (source && source.$__) {
+  } else if (source?.$__) {
     source = source.toObject(internalToObjectOptions);
   }
 
@@ -2635,7 +2631,7 @@ Query.prototype._completeOne = function(doc, res, projection, callback) {
 
   if (!mongooseOptions.populate) {
     const versionKey = this.schema.options.versionKey;
-    if (mongooseOptions.lean && mongooseOptions.lean.versionKey === false && versionKey) {
+    if (mongooseOptions.lean?.versionKey === false && versionKey) {
       if (versionKey in doc) {
         delete doc[versionKey];
       }
@@ -2712,8 +2708,10 @@ Query.prototype._findOne = async function _findOne() {
     throw err;
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   const options = this._optionsForExec();
 
@@ -2808,8 +2806,10 @@ Query.prototype._countDocuments = async function _countDocuments() {
     throw this.error();
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   const options = this._optionsForExec();
 
@@ -2836,7 +2836,7 @@ Query.prototype._applyTranslateAliases = function _applyTranslateAliases() {
     return;
   }
 
-  if (this.model?.schema?.aliases && Object.keys(this.model.schema.aliases).length > 0) {
+  if (this.model?.schema?.aliases && utils.hasOwnKeys(this.model.schema.aliases)) {
     this.model.translateAliases(this._conditions, true);
     this.model.translateAliases(this._fields, true);
     this.model.translateAliases(this._update, true);
@@ -2974,8 +2974,10 @@ Query.prototype.__distinct = async function __distinct() {
     throw this.error();
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   const options = this._optionsForExec();
 
@@ -3075,7 +3077,7 @@ Query.prototype.sort = function(arg, options) {
   if (this.options.sort == null) {
     this.options.sort = {};
   }
-  if (options && options.override) {
+  if (options?.override) {
     this.options.sort = {};
   }
   const sort = this.options.sort;
@@ -3345,13 +3347,13 @@ function completeOne(model, doc, res, options, fields, userProvidedFields, pop,
  */
 
 function prepareDiscriminatorCriteria(query) {
-  if (!query || !query.model || !query.model.schema) {
+  if (!query?.model?.schema) {
     return;
   }
 
   const schema = query.model.schema;
 
-  if (schema && schema.discriminatorMapping && !schema.discriminatorMapping.isRoot) {
+  if (schema?.discriminatorMapping && !schema.discriminatorMapping.isRoot) {
     query._conditions[schema.discriminatorMapping.key] = schema.discriminatorMapping.value;
   }
 }
@@ -3492,8 +3494,10 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
     throw this.error();
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   if ('strict' in this.options) {
     this._mongooseOptions.strict = this.options.strict;
@@ -3509,7 +3513,7 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
   this._update = setDefaultsOnInsert(this._conditions, this.model.schema,
     this._update, _opts);
 
-  if (!this._update || Object.keys(this._update).length === 0) {
+  if (!this._update || utils.hasOwnKeys(this._update) === false) {
     if (options.upsert) {
       // still need to do the upsert to empty doc
       const $set = clone(this._update);
@@ -3526,7 +3530,7 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
     // In order to make MongoDB 2.6 happy (see
     // https://jira.mongodb.org/browse/SERVER-12266 and related issues)
     // if we have an actual update document but $set is empty, junk the $set.
-    if (this._update.$set && Object.keys(this._update.$set).length === 0) {
+    if (this._update.$set && utils.hasOwnKeys(this._update.$set) === false) {
       delete this._update.$set;
     }
   }
@@ -4015,7 +4019,7 @@ Query.prototype._mergeUpdate = function(update) {
     this._update = Array.isArray(update) ? [] : {};
   }
 
-  if (update == null || (typeof update === 'object' && Object.keys(update).length === 0)) {
+  if (update == null || (typeof update === 'object' && utils.hasOwnKeys(update) === false)) {
     return;
   }
 
@@ -4067,7 +4071,7 @@ async function _updateThunk(op) {
   } else {
     this._update = this._castUpdate(this._update);
 
-    if (this._update == null || Object.keys(this._update).length === 0) {
+    if (this._update == null || utils.hasOwnKeys(this._update) === false) {
       return { acknowledged: false };
     }
 
@@ -4406,7 +4410,7 @@ function _update(query, op, filter, doc, options, callback) {
   }
 
   const updatePipeline = query?.model?.base?.options?.updatePipeline;
-  if (updatePipeline != null && (options == null || options.updatePipeline == null)) {
+  if (updatePipeline != null && options?.updatePipeline == null) {
     options = options || {};
     options.updatePipeline = updatePipeline;
   }
@@ -4501,7 +4505,7 @@ Query.prototype.orFail = function(err) {
       case 'replaceOne':
       case 'updateMany':
       case 'updateOne':
-        if (res && res.matchedCount === 0) {
+        if (res?.matchedCount === 0) {
           throw _orFailError(err, this);
         }
         break;
@@ -4595,7 +4599,7 @@ Query.prototype.exec = async function exec(op) {
     throw new MongooseError('Query has invalid `op`: "' + this.op + '"');
   }
 
-  if (this.options && this.options.sort && typeof this.options.sort === 'object' && Object.hasOwn(this.options.sort, '')) {
+  if (this.options?.sort && typeof this.options.sort === 'object' && Object.hasOwn(this.options.sort, '')) {
     throw new Error('Invalid field "" passed to sort()');
   }
 
@@ -4810,7 +4814,7 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
   let schema = this.schema;
 
   const discriminatorKey = schema.options.discriminatorKey;
-  const baseSchema = schema._baseSchema ? schema._baseSchema : schema;
+  const baseSchema = schema._baseSchema || schema;
   if (this._mongooseOptions.overwriteDiscriminatorKey &&
       obj[discriminatorKey] != null &&
       baseSchema.discriminators) {
@@ -4888,8 +4892,7 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
  * @api public
  */
 
-Query.prototype.populate = function() {
-  const args = Array.from(arguments);
+Query.prototype.populate = function(...args) {
   // Bail when given no truthy arguments
   if (!args.some(Boolean)) {
     return this;
@@ -4902,7 +4905,7 @@ Query.prototype.populate = function() {
   if (opts.lean != null) {
     const lean = opts.lean;
     for (const populateOptions of res) {
-      if ((populateOptions && populateOptions.options && populateOptions.options.lean) == null) {
+      if (populateOptions?.options?.lean == null) {
         populateOptions.options = populateOptions.options || {};
         populateOptions.options.lean = lean;
       }
@@ -4917,7 +4920,7 @@ Query.prototype.populate = function() {
 
   for (const populateOptions of res) {
     const path = populateOptions.path;
-    if (pop[path] && pop[path].populate && populateOptions.populate) {
+    if (pop[path]?.populate && populateOptions.populate) {
       populateOptions.populate = pop[path].populate.concat(populateOptions.populate);
     }
 
@@ -4999,7 +5002,7 @@ Query.prototype.cast = function(model, obj) {
     model = getDiscriminatorByValue(model.discriminators, obj[discriminatorKey]) || model;
   }
 
-  const opts = { upsert: this.options && this.options.upsert };
+  const opts = { upsert: this.options?.upsert };
   if (this.options) {
     if ('strict' in this.options) {
       opts.strict = this.options.strict;
@@ -5197,7 +5200,7 @@ Query.prototype.cursor = function cursor(opts) {
 Query.prototype.tailable = function(val, opts) {
   // we need to support the tailable({ awaitData : true }) as well as the
   // tailable(true, {awaitData :true}) syntax that mquery does not support
-  if (val != null && typeof val.constructor === 'function' && val.constructor.name === 'Object') {
+  if (typeof val?.constructor === 'function' && val.constructor.name === 'Object') {
     opts = val;
     val = true;
   }
@@ -5559,11 +5562,11 @@ Query.prototype.center = Query.base.circle;
  */
 
 Query.prototype.centerSphere = function() {
-  if (arguments[0] != null && typeof arguments[0].constructor === 'function' && arguments[0].constructor.name === 'Object') {
+  if (typeof arguments[0]?.constructor === 'function' && arguments[0].constructor.name === 'Object') {
     arguments[0].spherical = true;
   }
 
-  if (arguments[1] != null && typeof arguments[1].constructor === 'function' && arguments[1].constructor.name === 'Object') {
+  if (typeof arguments[1]?.constructor === 'function' && arguments[1].constructor.name === 'Object') {
     arguments[1].spherical = true;
   }
 

package/lib/queryHelpers.js

@@ -30,11 +30,11 @@ exports.preparePopulationOptionsMQ = function preparePopulationOptionsMQ(query,
   // lean options should trickle through all queries
   if (options.lean != null) {
     pop
-      .filter(p => (p && p.options && p.options.lean) == null)
+      .filter(p => p?.options?.lean == null)
       .forEach(makeLean(options.lean));
   }
 
-  const session = query && query.options && query.options.session || null;
+  const session = query?.options?.session || null;
   if (session != null) {
     pop.forEach(path => {
       if (path.options == null) {
@@ -80,7 +80,7 @@ exports.createModel = function createModel(model, doc, fields, userProvidedField
     model.schema.discriminatorMapping :
     null;
 
-  const key = discriminatorMapping && discriminatorMapping.isRoot ?
+  const key = discriminatorMapping?.isRoot ?
     discriminatorMapping.key :
     null;
 
@@ -179,10 +179,10 @@ exports.applyPaths = function applyPaths(fields, schema, sanitizeProjection) {
       // inclusive, minus path is treated as equivalent to `key: 0`.
       // But we also allow using `-name` to remove `name` from an inclusive
       // projection if `name` has schema-level `select: true`.
-      if ((!type || !type.selected) || exclude !== false) {
+      if (!type?.selected || exclude !== false) {
         fields[path] = 0;
         exclude = true;
-      } else if (type && type.selected && exclude === false) {
+      } else if (type?.selected && exclude === false) {
         // Make a note of minus paths that are overwriting paths that are
         // included by default.
         minusPathsToSkip.add(path);
@@ -204,10 +204,7 @@ exports.applyPaths = function applyPaths(fields, schema, sanitizeProjection) {
       }
       break;
     case false:
-      if (schema &&
-          schema.paths['_id'] &&
-          schema.paths['_id'].options &&
-          schema.paths['_id'].options.select === false) {
+      if (schema?.paths['_id']?.options?.select === false) {
         fields._id = 0;
       }
 
@@ -260,7 +257,7 @@ exports.applyPaths = function applyPaths(fields, schema, sanitizeProjection) {
       if (type.$isSchemaMap || path.endsWith('.$*')) {
         const plusPath = '+' + path;
         const hasPlusPath = fields && plusPath in fields;
-        if (type.options && type.options.select === false && !hasPlusPath) {
+        if (type.options?.select === false && !hasPlusPath) {
           excluded.push(path);
         }
         return;
@@ -352,7 +349,7 @@ exports.applyPaths = function applyPaths(fields, schema, sanitizeProjection) {
     // Special case: if user has included a parent path of a discriminator key,
     // don't explicitly project in the discriminator key because that will
     // project out everything else under the parent path
-    if (!exclude && (type && type.options && type.options.$skipDiscriminatorCheck || false)) {
+    if (!exclude && (type?.options?.$skipDiscriminatorCheck || false)) {
       let cur = '';
       for (let i = 0; i < pieces.length; ++i) {
         cur += (cur.length === 0 ? '' : '.') + pieces[i];
@@ -378,7 +375,7 @@ function makeLean(val) {
   return function(option) {
     option.options || (option.options = {});
 
-    if (val != null && Array.isArray(val.virtuals)) {
+    if (Array.isArray(val?.virtuals)) {
       val = Object.assign({}, val);
       val.virtuals = val.virtuals.
         filter(path => typeof path === 'string' && path.startsWith(option.path + '.')).

package/lib/schema/array.js

@@ -47,7 +47,7 @@ function SchemaArray(key, cast, options, schemaOptions, parentSchema) {
   EmbeddedDoc || (EmbeddedDoc = require('../types').Embedded);
 
   let typeKey = 'type';
-  if (schemaOptions && schemaOptions.typeKey) {
+  if (schemaOptions?.typeKey) {
     typeKey = schemaOptions.typeKey;
   }
   this.schemaOptions = schemaOptions;
@@ -66,7 +66,7 @@ function SchemaArray(key, cast, options, schemaOptions, parentSchema) {
       }
     }
 
-    if (options != null && options.ref != null && castOptions.ref == null) {
+    if (options?.ref != null && castOptions.ref == null) {
       castOptions.ref = options.ref;
     }
 
@@ -255,9 +255,7 @@ SchemaArray.prototype.checkRequired = function checkRequired(value, doc) {
 SchemaArray.prototype.enum = function() {
   let arr = this;
   while (true) {
-    const instance = arr &&
-    arr.embeddedSchemaType &&
-    arr.embeddedSchemaType.instance;
+    const instance = arr?.embeddedSchemaType?.instance;
     if (instance === 'Array') {
       arr = arr.embeddedSchemaType;
       continue;
@@ -287,7 +285,7 @@ SchemaArray.prototype.enum = function() {
  */
 
 SchemaArray.prototype.applyGetters = function(value, scope) {
-  if (scope != null && scope.$__ != null && scope.$populated(this.path)) {
+  if (scope?.$__ != null && scope.$populated(this.path)) {
     // means the object id was populated
     return value;
   }
@@ -376,7 +374,7 @@ SchemaArray.prototype.cast = function(value, doc, init, prev, options) {
     value = MongooseArray(rawValue, path, doc, this);
     rawValue = value.__array;
 
-    if (init && doc != null && doc.$__ != null && doc.$populated(this.path)) {
+    if (init && doc?.$__ != null && doc.$populated(this.path)) {
       return value;
     }
 
@@ -411,11 +409,11 @@ SchemaArray.prototype.cast = function(value, doc, init, prev, options) {
     return value;
   }
 
-  const castNonArraysOption = this.options.castNonArrays != null ? this.options.castNonArrays : SchemaArray.options.castNonArrays;
+  const castNonArraysOption = this.options.castNonArrays ?? SchemaArray.options.castNonArrays;
   if (init || castNonArraysOption) {
     // gh-2442: if we're loading this from the db and its not an array, mark
     // the whole array as modified.
-    if (!!doc && !!init) {
+    if (doc && init) {
       doc.markModified(this.path);
     }
     return this.cast([value], doc, init);
@@ -586,12 +584,12 @@ function cast$all(val, context) {
       return v;
     }
     if (v.$elemMatch != null) {
-      return { $elemMatch: cast(this.embeddedSchemaType.schema, v.$elemMatch, null, this && this.$$context) };
+      return { $elemMatch: cast(this.embeddedSchemaType.schema, v.$elemMatch, null, this?.$$context) };
     }
 
     const o = {};
     o[this.path] = v;
-    return cast(this.embeddedSchemaType.schema, o, null, this && this.$$context)[this.path];
+    return cast(this.embeddedSchemaType.schema, o, null, this?.$$context)[this.path];
   }, this);
 
   return this.castForQuery(null, val, context);
@@ -639,7 +637,7 @@ function createLogicalQueryOperatorHandler(op) {
 
     const ret = [];
     for (const obj of val) {
-      ret.push(cast(this.embeddedSchemaType.schema ?? context.schema, obj, null, this && this.$$context));
+      ret.push(cast(this.embeddedSchemaType.schema ?? context.schema, obj, null, this?.$$context));
     }
 
     return ret;

package/lib/schema/buffer.js

@@ -50,7 +50,7 @@ SchemaBuffer.prototype.OptionsConstructor = SchemaBufferOptions;
  * ignore
  */
 
-SchemaBuffer._checkRequired = v => !!(v && v.length);
+SchemaBuffer._checkRequired = v => !!v?.length;
 
 /**
  * Sets a default option for all Buffer instances.
@@ -146,12 +146,12 @@ SchemaBuffer.prototype.checkRequired = function(value, doc) {
 SchemaBuffer.prototype.cast = function(value, doc, init, prev, options) {
   let ret;
   if (SchemaType._isRef(this, value, doc, init)) {
-    if (value && value.isMongooseBuffer) {
+    if (value?.isMongooseBuffer) {
       return value;
     }
 
     if (Buffer.isBuffer(value)) {
-      if (!value || !value.isMongooseBuffer) {
+      if (!value?.isMongooseBuffer) {
         value = new MongooseBuffer(value, [this.path, doc]);
         if (this.options.subtype != null) {
           value._subtype = this.options.subtype;
@@ -175,16 +175,16 @@ SchemaBuffer.prototype.cast = function(value, doc, init, prev, options) {
   }
 
   // documents
-  if (value && value._id) {
+  if (value?._id) {
     value = value._id;
   }
 
-  if (value && value.isMongooseBuffer) {
+  if (value?.isMongooseBuffer) {
     return value;
   }
 
   if (Buffer.isBuffer(value)) {
-    if (!value || !value.isMongooseBuffer) {
+    if (!value?.isMongooseBuffer) {
       value = new MongooseBuffer(value, [this.path, doc]);
       if (this.options.subtype != null) {
         value._subtype = this.options.subtype;

package/lib/schema/documentArray.js

@@ -41,19 +41,18 @@ let Subdocument;
  */
 
 function SchemaDocumentArray(key, schema, options, schemaOptions, parentSchema) {
-  if (schema.options && schema.options.timeseries) {
+  if (schema.options?.timeseries) {
     throw new InvalidSchemaOptionError(key, 'timeseries');
   }
-  const schemaTypeIdOption = SchemaDocumentArray.defaultOptions &&
-    SchemaDocumentArray.defaultOptions._id;
+  const schemaTypeIdOption = SchemaDocumentArray.defaultOptions?._id;
   if (schemaTypeIdOption != null) {
     schemaOptions = schemaOptions || {};
     schemaOptions._id = schemaTypeIdOption;
   }
 
-  if (schemaOptions != null && schemaOptions._id != null) {
+  if (schemaOptions?._id != null) {
     schema = handleIdOption(schema, schemaOptions);
-  } else if (options != null && options._id != null) {
+  } else if (options?._id != null) {
     schema = handleIdOption(schema, options);
   }
 
@@ -150,7 +149,7 @@ function _createConstructor(schema, options, baseClass) {
 
   schema._preCompile();
 
-  const proto = baseClass != null ? baseClass.prototype : Subdocument.prototype;
+  const proto = baseClass?.prototype ?? Subdocument.prototype;
   EmbeddedDocument.prototype = Object.create(proto);
   EmbeddedDocument.prototype.$__setSchema(schema);
   EmbeddedDocument.schema = schema;
@@ -260,7 +259,7 @@ SchemaDocumentArray.prototype.doValidate = async function doValidate(array, scop
       doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
     }
 
-    if (options != null && options.validateModifiedOnly && !doc.$isModified()) {
+    if (options?.validateModifiedOnly && !doc.$isModified()) {
       continue;
     }
 
@@ -287,7 +286,7 @@ SchemaDocumentArray.prototype.doValidateSync = function(array, scope, options) {
     return schemaTypeError;
   }
 
-  const count = array && array.length;
+  const count = array?.length;
   let resultError = null;
 
   if (!count) {
@@ -312,7 +311,7 @@ SchemaDocumentArray.prototype.doValidateSync = function(array, scope, options) {
       doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
     }
 
-    if (options != null && options.validateModifiedOnly && !doc.$isModified()) {
+    if (options?.validateModifiedOnly && !doc.$isModified()) {
       continue;
     }
 
@@ -339,7 +338,7 @@ SchemaDocumentArray.prototype.getDefault = function(scope, init, options) {
     return ret;
   }
 
-  if (options && options.skipCast) {
+  if (options?.skipCast) {
     return ret;
   }
 
@@ -386,7 +385,7 @@ SchemaDocumentArray.prototype.cast = function(value, doc, init, prev, options) {
   MongooseDocumentArray || (MongooseDocumentArray = require('../types/documentArray'));
 
   // Skip casting if `value` is the same as the previous value, no need to cast. See gh-9266
-  if (value != null && value[arrayPathSymbol] != null && value === prev) {
+  if (value?.[arrayPathSymbol] != null && value === prev) {
     return value;
   }
 
@@ -463,7 +462,7 @@ SchemaDocumentArray.prototype.cast = function(value, doc, init, prev, options) {
         subdoc = new Constructor(null, value, initDocumentOptions, selected, i);
         rawArray[i] = subdoc.$init(rawArray[i], options);
       } else {
-        if (prev && typeof prev.id === 'function') {
+        if (typeof prev?.id === 'function') {
           subdoc = prev.id(rawArray[i]._id);
         }
 
@@ -621,23 +620,16 @@ function cast$elemMatch(val, context) {
 
   // Is this an embedded discriminator and is the discriminator key set?
   // If so, use the discriminator schema. See gh-7449
-  const discriminatorKey = this &&
-    this.Constructor &&
-    this.Constructor.schema &&
-    this.Constructor.schema.options &&
-    this.Constructor.schema.options.discriminatorKey;
-  const discriminators = this &&
-  this.Constructor &&
-  this.Constructor.schema &&
-  this.Constructor.schema.discriminators || {};
+  const discriminatorKey = this?.Constructor?.schema?.options?.discriminatorKey;
+  const discriminators = this?.Constructor?.schema?.discriminators || {};
   if (discriminatorKey != null &&
       val[discriminatorKey] != null &&
       discriminators[val[discriminatorKey]] != null) {
-    return cast(discriminators[val[discriminatorKey]], val, null, this && this.$$context);
+    return cast(discriminators[val[discriminatorKey]], val, null, this?.$$context);
   }
 
   const schema = this.Constructor.schema ?? context.schema;
-  return cast(schema, val, null, this && this.$$context);
+  return cast(schema, val, null, this?.$$context);
 }
 
 /**