mongoose 9.0.2 → 9.1.0

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -22,10 +22,11 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
   let doc;
   const len = docs.length;
   const map = [];
-  const modelNameFromQuery = options.model && options.model.modelName || options.model;
+  const modelNameFromQuery = options.model?.modelName || options.model;
   let schema;
   let refPath;
   let modelNames;
+  let modelNamesSet;
   const available = {};
 
   const modelSchema = model.schema;
@@ -55,13 +56,13 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     let justOne = null;
 
     if (doc.$__ != null && doc.populated(options.path)) {
-      const forceRepopulate = options.forceRepopulate != null ? options.forceRepopulate : doc.constructor.base.options.forceRepopulate;
+      const forceRepopulate = options.forceRepopulate ?? doc.constructor.base.options.forceRepopulate;
       if (forceRepopulate === false) {
         continue;
       }
     }
 
-    const docSchema = doc != null && doc.$__ != null ? doc.$__schema : modelSchema;
+    const docSchema = doc?.$__ != null ? doc.$__schema : modelSchema;
     schema = getSchemaTypes(model, docSchema, doc, options.path);
 
     // Special case: populating a path that's a DocumentArray unless
@@ -72,7 +73,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
         schema.options.refPath == null) {
       continue;
     }
-    const isUnderneathDocArray = schema && schema.$parentSchemaDocArray;
+    const isUnderneathDocArray = schema?.$parentSchemaDocArray;
     if (isUnderneathDocArray && get(options, 'options.sort') != null) {
       return new MongooseError('Cannot populate with `sort` on path ' + options.path +
         ' because it is a subproperty of a document array');
@@ -84,7 +85,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     let schemaOptions = null;
     let modelNamesInOrder = null;
 
-    if (schema != null && schema.instance === 'Embedded') {
+    if (schema?.instance === 'Embedded') {
       if (schema.options.ref) {
         const data = {
           localField: options.path + '._id',
@@ -123,8 +124,10 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
           continue;
         }
         modelNames = modelNames || [];
+        modelNamesSet = modelNamesSet || new Set();
         for (const modelName of _modelNames) {
-          if (modelNames.indexOf(modelName) === -1) {
+          if (modelNamesSet.has(modelName) === false) {
+            modelNamesSet.add(modelName);
             modelNames.push(modelName);
           }
         }
@@ -218,15 +221,15 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     let justOne = null;
 
     const originalSchema = schema;
-    if (schema && schema.instance === 'Array') {
+    if (schema?.instance === 'Array') {
       schema = schema.embeddedSchemaType;
     }
-    if (schema && schema.$isSchemaMap) {
+    if (schema?.$isSchemaMap) {
       schema = schema.$__schemaType;
     }
 
-    const ref = schema && schema.options && schema.options.ref;
-    refPath = schema && schema.options && schema.options.refPath;
+    const ref = schema?.options?.ref;
+    refPath = schema?.options?.refPath;
     if (schema != null &&
         schema[schemaMixedSymbol] &&
         !ref &&
@@ -281,7 +284,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
 
         schemaForCurrentDoc = modelForCurrentDoc.schema._getSchema(options.path);
 
-        if (schemaForCurrentDoc && schemaForCurrentDoc.embeddedSchemaType) {
+        if (schemaForCurrentDoc?.embeddedSchemaType) {
           schemaForCurrentDoc = schemaForCurrentDoc.embeddedSchemaType;
         }
       } else {
@@ -485,7 +488,7 @@ function _virtualPopulate(model, docs, options, _virtualRes) {
 function addModelNamesToMap(model, map, available, modelNames, options, data, ret, doc, schemaOptions, unpopulatedValue) {
   // `PopulateOptions#connection`: if the model is passed as a string, the
   // connection matters because different connections have different models.
-  const connection = options.connection != null ? options.connection : model.db;
+  const connection = options.connection ?? model.db;
 
   unpopulatedValue = unpopulatedValue === void 0 ? ret : unpopulatedValue;
   if (Array.isArray(unpopulatedValue)) {
@@ -523,7 +526,7 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
 
     let ids = ret;
 
-    const modelNamesForRefPath = data.modelNamesInOrder ? data.modelNamesInOrder : modelNames;
+    const modelNamesForRefPath = data.modelNamesInOrder || modelNames;
     if (data.isRefPath && Array.isArray(ret) && ret.length === modelNamesForRefPath.length) {
       ids = matchIdsToRefPaths(ret, modelNamesForRefPath, modelName);
     }
@@ -622,10 +625,9 @@ function _getLocalFieldValues(doc, localField, model, options, virtual, schema)
   const localFieldPath = localFieldPathType === 'real' ?
     model.schema.path(localField) :
     localFieldPathType.schema;
-  const localFieldGetters = localFieldPath && localFieldPath.getters ?
-    localFieldPath.getters : [];
+  const localFieldGetters = localFieldPath?.getters || [];
 
-  localField = localFieldPath != null && localFieldPath.instance === 'Embedded' ? localField + '._id' : localField;
+  localField = localFieldPath?.instance === 'Embedded' ? localField + '._id' : localField;
 
   const _populateOptions = get(options, 'options', {});
 
@@ -657,17 +659,17 @@ function _getLocalFieldValues(doc, localField, model, options, virtual, schema)
  */
 
 function convertTo_id(val, schema) {
-  if (val != null && val.$__ != null) {
+  if (val?.$__ != null) {
     return val._doc._id;
   }
-  if (val != null && val._id != null && (schema == null || !schema.$isSchemaMap)) {
+  if (val?._id != null && !schema?.$isSchemaMap) {
     return val._id;
   }
 
   if (Array.isArray(val)) {
-    const rawVal = val.__array != null ? val.__array : val;
+    const rawVal = val.__array ?? val;
     for (let i = 0; i < rawVal.length; ++i) {
-      if (rawVal[i] != null && rawVal[i].$__ != null) {
+      if (rawVal[i]?.$__ != null) {
         rawVal[i] = rawVal[i]._doc._id;
       }
     }
@@ -683,7 +685,7 @@ function convertTo_id(val, schema) {
   if (getConstructorName(val) === 'Object' &&
       // The intent here is we should only flatten the object if we expect
       // to get a Map in the end. Avoid doing this for mixed types.
-      (schema == null || schema[schemaMixedSymbol] == null)) {
+      schema?.[schemaMixedSymbol] == null) {
     const ret = [];
     for (const key of Object.keys(val)) {
       ret.push(val[key]);
@@ -721,7 +723,7 @@ function _findRefPathForDiscriminators(doc, modelSchema, data, options, normaliz
     if (schematype != null &&
         schematype.$isMongooseDocumentArray &&
         schematype.Constructor.discriminators != null &&
-        Object.keys(schematype.Constructor.discriminators).length !== 0) {
+        utils.hasOwnKeys(schematype.Constructor.discriminators)) {
       const subdocs = utils.getValue(cur, doc);
       const remnant = options.path.substring(cur.length + 1);
       const discriminatorKey = schematype.Constructor.schema.options.discriminatorKey;
@@ -729,7 +731,7 @@ function _findRefPathForDiscriminators(doc, modelSchema, data, options, normaliz
       for (const subdoc of subdocs) {
         const discriminatorName = utils.getValue(discriminatorKey, subdoc);
         const discriminator = schematype.Constructor.discriminators[discriminatorName];
-        const discriminatorSchema = discriminator && discriminator.schema;
+        const discriminatorSchema = discriminator?.schema;
         if (discriminatorSchema == null) {
           continue;
         }

package/lib/helpers/populate/getSchemaTypes.js

@@ -32,12 +32,11 @@ module.exports = function getSchemaTypes(model, schema, doc, path) {
     return pathschema;
   }
 
-  const discriminatorKey = schema.discriminatorMapping &&
-    schema.discriminatorMapping.key;
+  const discriminatorKey = schema.discriminatorMapping?.key;
   if (discriminatorKey && model != null) {
-    if (doc != null && doc[discriminatorKey] != null) {
+    if (doc?.[discriminatorKey] != null) {
       const discriminator = getDiscriminatorByValue(model.discriminators, doc[discriminatorKey]);
-      schema = discriminator ? discriminator.schema : schema;
+      schema = discriminator?.schema || schema;
     } else if (model.discriminators != null) {
       return Object.keys(model.discriminators).reduce((arr, name) => {
         const disc = model.discriminators[name];
@@ -65,7 +64,7 @@ module.exports = function getSchemaTypes(model, schema, doc, path) {
         }
 
         let schemas = null;
-        if (foundschema.schema != null && foundschema.schema.discriminators != null) {
+        if (foundschema.schema?.discriminators != null) {
           const discriminators = foundschema.schema.discriminators;
           const discriminatorKeyPath = trypath + '.' +
             foundschema.schema.options.discriminatorKey;
@@ -178,7 +177,7 @@ module.exports = function getSchemaTypes(model, schema, doc, path) {
       }
 
       const fullPath = nestedPath.concat([trypath]).join('.');
-      if (topLevelDoc != null && topLevelDoc.$__ && topLevelDoc.$populated(fullPath, true) && p < parts.length) {
+      if (topLevelDoc?.$__ && topLevelDoc.$populated(fullPath, true) && p < parts.length) {
         const model = topLevelDoc.$populated(fullPath, true).options[populateModelSymbol];
         if (model != null) {
           const ret = search(
@@ -198,7 +197,7 @@ module.exports = function getSchemaTypes(model, schema, doc, path) {
           leanPopulateMap.get(_val[0]) :
           leanPopulateMap.get(_val);
         // Populated using lean, `leanPopulateMap` value is the foreign model
-        const schema = model != null ? model.schema : null;
+        const schema = model?.schema ?? null;
         if (schema != null) {
           const ret = search(
             parts.slice(p),

package/lib/helpers/printJestWarning.js

@@ -11,7 +11,7 @@ if (typeof jest !== 'undefined' && !process.env.SUPPRESS_JEST_WARNINGS) {
       'to hide this warning.');
   }
 
-  if (setTimeout.clock != null && typeof setTimeout.clock.Date === 'function') {
+  if (typeof setTimeout.clock?.Date === 'function') {
     utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
       'with Jest\'s mock timers enabled. Please make sure you read ' +
       'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +

package/lib/helpers/processConnectionOptions.js

@@ -31,7 +31,7 @@ function resolveOptsConflicts(pref, opts) {
 }
 
 function setsIndexOptions(opts) {
-  const configIdx = opts.config && opts.config.autoIndex;
+  const configIdx = opts.config?.autoIndex;
   const { autoCreate, autoIndex } = opts;
   return !!(configIdx || autoCreate || autoIndex);
 }

package/lib/helpers/query/castUpdate.js

@@ -71,7 +71,7 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     const discriminatorValue = filter[schema.options.discriminatorKey];
     const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
     schema = schema.discriminators[discriminatorValue] ||
-      (byValue && byValue.schema) ||
+      byValue?.schema ||
       schema;
   } else if (schema != null &&
       options.overwriteDiscriminatorKey &&
@@ -80,7 +80,7 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     const discriminatorValue = obj[schema.options.discriminatorKey];
     const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
     schema = schema.discriminators[discriminatorValue] ||
-      (byValue && byValue.schema) ||
+      byValue?.schema ||
       schema;
   } else if (schema != null &&
       options.overwriteDiscriminatorKey &&
@@ -90,7 +90,7 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     const discriminatorValue = obj.$set[schema.options.discriminatorKey];
     const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
     schema = schema.discriminators[discriminatorValue] ||
-      (byValue && byValue.schema) ||
+      byValue?.schema ||
       schema;
   }
 
@@ -133,7 +133,7 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     const op = ops[i];
     val = ret[op];
     hasDollarKey = hasDollarKey || op.startsWith('$');
-    if (val != null && val.$__) {
+    if (val?.$__) {
       val = val.toObject(internalToObjectOptions);
       ret[op] = val;
     }
@@ -153,9 +153,9 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     }
   }
 
-  if (Object.keys(ret).length === 0 &&
+  if (utils.hasOwnKeys(ret) === false &&
       options.upsert &&
-      Object.keys(filter).length > 0) {
+      utils.hasOwnKeys(filter)) {
     // Trick the driver into allowing empty upserts to work around
     // https://github.com/mongodb/node-mongodb-native/pull/2490
     // Shallow clone to avoid passing defaults in re: gh-13962
@@ -225,7 +225,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
 
   let aggregatedError = null;
 
-  const strictMode = strict != null ? strict : schema.options.strict;
+  const strictMode = strict ?? schema.options.strict;
 
   while (i--) {
     key = keys[i];
@@ -241,7 +241,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
           schematype = _res.schematype;
         }
       }
-      if (schematype != null && schematype.schema != null) {
+      if (schematype?.schema != null) {
         obj[key] = cast(schematype.schema, obj[key], options, context);
         hasKeys = true;
         continue;
@@ -305,7 +305,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
             obj[key].$position = castNumber(val.$position);
           }
         } else {
-          if (schematype != null && schematype.$isSingleNested) {
+          if (schematype?.$isSingleNested) {
             const _strict = strict == null ? schematype.schema.options.strict : strict;
             try {
               obj[key] = schematype.castForQuery(null, val, context, { strict: _strict });
@@ -359,7 +359,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
         const pathToCheck = (prefix + key);
         const v = schema._getPathType(pathToCheck);
         let _strict = strict;
-        if (v && v.schema && _strict == null) {
+        if (v?.schema && _strict == null) {
           _strict = v.schema.options.strict;
         }
 
@@ -376,7 +376,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
         // we should be able to set a schema-less field
         // to an empty object literal
         hasKeys |= walkUpdatePath(schema, val, op, options, context, filter, prefix + key) ||
-          (utils.isObject(val) && Object.keys(val).length === 0);
+          (utils.isObject(val) && utils.hasOwnKeys(val) === false);
       }
     } else {
       const isModifier = (key === '$each' || key === '$or' || key === '$and' || key === '$in');
@@ -407,7 +407,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
       }
 
       let isStrict = strict;
-      if (pathDetails && pathDetails.schema && strict == null) {
+      if (pathDetails?.schema && strict == null) {
         isStrict = pathDetails.schema.options.strict;
       }
 

package/lib/helpers/query/getEmbeddedDiscriminatorPath.js

@@ -23,7 +23,7 @@ module.exports = function getEmbeddedDiscriminatorPath(schema, update, filter, p
 
   filter = filter || {};
   update = update || {};
-  const arrayFilters = options != null && Array.isArray(options.arrayFilters) ?
+  const arrayFilters = Array.isArray(options?.arrayFilters) ?
     options.arrayFilters : [];
   const updatedPathsByFilter = updatedPathsByArrayFilter(update);
   let startIndex = 0;
@@ -83,7 +83,7 @@ module.exports = function getEmbeddedDiscriminatorPath(schema, update, filter, p
       }
 
       const discriminator = getDiscriminatorByValue(schematype.Constructor.discriminators, discriminatorKey);
-      const discriminatorSchema = discriminator && discriminator.schema;
+      const discriminatorSchema = discriminator?.schema;
       if (discriminatorSchema == null) {
         continue;
       }

package/lib/helpers/query/handleImmutable.js

@@ -16,7 +16,7 @@ const StrictModeError = require('../../error/strict');
  */
 
 module.exports = function handleImmutable(schematype, strict, obj, key, fullPath, options, ctx) {
-  if (schematype == null || !schematype.options || !schematype.options.immutable) {
+  if (!schematype?.options?.immutable) {
     return false;
   }
   let immutable = schematype.options.immutable;
@@ -28,7 +28,7 @@ module.exports = function handleImmutable(schematype, strict, obj, key, fullPath
     return false;
   }
 
-  if (options && options.overwriteImmutable) {
+  if (options?.overwriteImmutable) {
     return false;
   }
   if (strict === false) {

package/lib/helpers/query/sanitizeFilter.js

@@ -17,7 +17,7 @@ module.exports = function sanitizeFilter(filter) {
   const filterKeys = Object.keys(filter);
   for (const key of filterKeys) {
     const value = filter[key];
-    if (value != null && value[trustedSymbol]) {
+    if (value?.[trustedSymbol]) {
       continue;
     }
     if (key === '$and' || key === '$or') {

package/lib/helpers/schema/applyPlugins.js

@@ -6,7 +6,7 @@ module.exports = function applyPlugins(schema, plugins, options, cacheKey) {
   }
   schema[cacheKey] = true;
 
-  if (!options || !options.skipTopLevel) {
+  if (!options?.skipTopLevel) {
     let pluginTags = null;
     for (const plugin of plugins) {
       const tags = plugin[1] == null ? null : plugin[1].tags;

package/lib/helpers/schema/applyReadConcern.js

@@ -9,7 +9,7 @@ module.exports = function applyReadConcern(schema, options) {
   // because you shouldn't set read concern on individual operations
   // within a transaction.
   // See: https://www.mongodb.com/docs/manual/reference/read-concern/
-  if (options && options.session && options.session.transaction) {
+  if (options?.session?.transaction) {
     return;
   }
 

package/lib/helpers/schema/applyWriteConcern.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const utils = require('../../utils');
+
 module.exports = function applyWriteConcern(schema, options) {
   if (options.writeConcern != null) {
     return;
@@ -7,11 +9,11 @@ module.exports = function applyWriteConcern(schema, options) {
   // Don't apply default write concern to operations in transactions,
   // because setting write concern on an operation in a transaction is an error
   // See: https://www.mongodb.com/docs/manual/reference/write-concern/
-  if (options && options.session && options.session.transaction) {
+  if (options?.session?.transaction) {
     return;
   }
   const writeConcern = schema.options.writeConcern ?? {};
-  if (Object.keys(writeConcern).length != 0) {
+  if (utils.hasOwnKeys(writeConcern)) {
     options.writeConcern = {};
     if (!('w' in options) && writeConcern.w != null) {
       options.writeConcern.w = writeConcern.w;

package/lib/helpers/schema/getIndexes.js

@@ -69,7 +69,7 @@ module.exports = function getIndexes(schema) {
 
       const index = path._index || (path.embeddedSchemaType && path.embeddedSchemaType._index);
 
-      if (index !== false && index !== null && index !== undefined) {
+      if (index !== false && index != null) {
         const field = {};
         const isObject = helperIsObject(index);
         const options = isObject ? { ...index } : {};
@@ -100,7 +100,7 @@ module.exports = function getIndexes(schema) {
           options._autoIndex = schema.options.autoIndex;
         }
 
-        const indexName = options && options.name;
+        const indexName = options?.name;
 
         if (typeof indexName === 'string') {
           if (indexByName.has(indexName)) {
@@ -156,7 +156,7 @@ module.exports = function getIndexes(schema) {
       }
 
       const newIndexOptions = Object.assign({}, indexOptions);
-      if (indexOptions != null && indexOptions.partialFilterExpression != null) {
+      if (indexOptions?.partialFilterExpression != null) {
         newIndexOptions.partialFilterExpression = {};
         const partialFilterExpression = indexOptions.partialFilterExpression;
         for (const key of Object.keys(partialFilterExpression)) {

package/lib/helpers/schema/getSubdocumentStrictValue.js

@@ -19,7 +19,7 @@ module.exports = function getSubdocumentStrictValue(schema, parts) {
   let strict = undefined;
   for (let i = 0; i < parts.length - 1; ++i) {
     const curSchemaType = schema.path(cur);
-    if (curSchemaType && curSchemaType.schema) {
+    if (curSchemaType?.schema) {
       strict = curSchemaType.schema.options.strict;
       schema = curSchemaType.schema;
       cur = curSchemaType.$isMongooseDocumentArray && !isNaN(parts[i + 1]) ? '' : parts[i + 1];

package/lib/helpers/schema/handleIdOption.js

@@ -3,7 +3,7 @@
 const addAutoId = require('./addAutoId');
 
 module.exports = function handleIdOption(schema, options) {
-  if (options == null || options._id == null) {
+  if (options?._id == null) {
     return schema;
   }
 

package/lib/helpers/schema/idGetter.js

@@ -12,7 +12,7 @@ module.exports = function addIdGetter(schema) {
   if (!autoIdGetter) {
     return schema;
   }
-  if (schema.aliases && schema.aliases.id) {
+  if (schema.aliases?.id) {
     return schema;
   }
   schema.virtual('id').get(idGetter);

package/lib/helpers/schematype/handleImmutable.js

@@ -26,7 +26,7 @@ function createImmutableSetter(path, immutable) {
     if (this.isNew) {
       return v;
     }
-    if (options && options.overwriteImmutable) {
+    if (options?.overwriteImmutable) {
       return v;
     }
 

package/lib/helpers/setDefaultsOnInsert.js

@@ -15,10 +15,7 @@ const get = require('./get');
 module.exports = function(filter, schema, castedDoc, options) {
   options = options || {};
 
-  const shouldSetDefaultsOnInsert =
-    options.setDefaultsOnInsert != null ?
-      options.setDefaultsOnInsert :
-      schema.base.options.setDefaultsOnInsert;
+  const shouldSetDefaultsOnInsert = options.setDefaultsOnInsert ?? schema.base.options.setDefaultsOnInsert;
 
   if (!options.upsert || shouldSetDefaultsOnInsert === false) {
     return castedDoc;
@@ -60,7 +57,7 @@ module.exports = function(filter, schema, castedDoc, options) {
     updatedKeys[path] = true;
   }
 
-  if (options && options.overwrite && !hasDollarUpdate) {
+  if (options?.overwrite && !hasDollarUpdate) {
     // Defaults will be set later, since we're overwriting we'll cast
     // the whole update to a document
     return castedDoc;

package/lib/helpers/timestamps/setDocumentTimestamps.js

@@ -1,8 +1,8 @@
 'use strict';
 
 module.exports = function setDocumentTimestamps(doc, timestampOption, currentTime, createdAt, updatedAt) {
-  const skipUpdatedAt = timestampOption != null && timestampOption.updatedAt === false;
-  const skipCreatedAt = timestampOption != null && timestampOption.createdAt === false;
+  const skipUpdatedAt = timestampOption?.updatedAt === false;
+  const skipCreatedAt = timestampOption?.createdAt === false;
 
   const defaultTimestamp = currentTime != null ?
     currentTime() :

package/lib/helpers/timestamps/setupTimestamps.js

@@ -31,8 +31,8 @@ module.exports = function setupTimestamps(schema, timestamps) {
   schema.$timestamps = { createdAt: createdAt, updatedAt: updatedAt };
 
   if (createdAt && !schema.paths[createdAt]) {
-    const baseImmutableCreatedAt = schema.base != null ? schema.base.get('timestamps.createdAt.immutable') : null;
-    const immutable = baseImmutableCreatedAt != null ? baseImmutableCreatedAt : true;
+    const baseImmutableCreatedAt = schema.base?.get('timestamps.createdAt.immutable') ?? null;
+    const immutable = baseImmutableCreatedAt ?? true;
     schemaAdditions[createdAt] = { [schema.options.typeKey || 'type']: Date, immutable };
   }
 

package/lib/helpers/update/applyTimestampsToUpdate.js

@@ -5,6 +5,7 @@
  */
 
 const get = require('../get');
+const utils = require('../../utils');
 
 module.exports = applyTimestampsToUpdate;
 
@@ -22,11 +23,11 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
     return currentUpdate;
   }
 
-  const skipCreatedAt = timestamps != null && timestamps.createdAt === false;
-  const skipUpdatedAt = timestamps != null && timestamps.updatedAt === false;
+  const skipCreatedAt = timestamps?.createdAt === false;
+  const skipUpdatedAt = timestamps?.updatedAt === false;
 
   if (isReplace) {
-    if (currentUpdate && currentUpdate.$set) {
+    if (currentUpdate?.$set) {
       currentUpdate = currentUpdate.$set;
       updates.$set = {};
       _updates = updates.$set;
@@ -51,7 +52,7 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
   }
   updates.$set = updates.$set || {};
   if (!skipUpdatedAt && updatedAt &&
-      (!currentUpdate.$currentDate || !currentUpdate.$currentDate[updatedAt])) {
+      !currentUpdate.$currentDate?.[updatedAt]) {
     let timestampSet = false;
     if (updatedAt.indexOf('.') !== -1) {
       const pieces = updatedAt.split('.');
@@ -62,7 +63,7 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
           currentUpdate[start][remnant] = now;
           timestampSet = true;
           break;
-        } else if (currentUpdate.$set && currentUpdate.$set[start]) {
+        } else if (currentUpdate.$set?.[start]) {
           currentUpdate.$set[start][remnant] = now;
           timestampSet = true;
           break;
@@ -81,7 +82,7 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
 
   if (!skipCreatedAt && createdAt) {
     const overwriteImmutable = get(options, 'overwriteImmutable', false);
-    const hasUserCreatedAt = currentUpdate[createdAt] != null || currentUpdate?.$set[createdAt] != null;
+    const hasUserCreatedAt = currentUpdate[createdAt] != null || currentUpdate.$set?.[createdAt] != null;
 
     // If overwriteImmutable is true and user provided createdAt, keep their value
     if (overwriteImmutable && hasUserCreatedAt) {
@@ -95,7 +96,7 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
       if (currentUpdate[createdAt]) {
         delete currentUpdate[createdAt];
       }
-      if (currentUpdate.$set && currentUpdate.$set[createdAt]) {
+      if (currentUpdate.$set?.[createdAt]) {
         delete currentUpdate.$set[createdAt];
       }
       let timestampSet = false;
@@ -108,7 +109,7 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
             currentUpdate[start][remnant] = now;
             timestampSet = true;
             break;
-          } else if (currentUpdate.$set && currentUpdate.$set[start]) {
+          } else if (currentUpdate.$set?.[start]) {
             currentUpdate.$set[start][remnant] = now;
             timestampSet = true;
             break;
@@ -123,7 +124,7 @@ function applyTimestampsToUpdate(now, createdAt, updatedAt, currentUpdate, optio
     }
   }
 
-  if (Object.keys(updates.$set).length === 0) {
+  if (utils.hasOwnKeys(updates.$set) === false) {
     delete updates.$set;
   }
   return updates;

package/lib/helpers/update/castArrayFilters.js

@@ -4,6 +4,7 @@ const castFilterPath = require('../query/castFilterPath');
 const cleanPositionalOperators = require('../schema/cleanPositionalOperators');
 const getPath = require('../schema/getPath');
 const updatedPathsByArrayFilter = require('./updatedPathsByArrayFilter');
+const utils = require('../../utils');
 
 module.exports = function castArrayFilters(query) {
   const arrayFilters = query.options.arrayFilters;
@@ -18,7 +19,7 @@ module.exports = function castArrayFilters(query) {
   if (query._mongooseOptions.strict != null) {
     strictQuery = query._mongooseOptions.strict;
   }
-  if (query.model && query.model.base.options.strictQuery != null) {
+  if (query.model?.base.options.strictQuery != null) {
     strictQuery = query.model.base.options.strictQuery;
   }
   if (schema._userProvidedOptions.strictQuery != null) {
@@ -63,8 +64,7 @@ function _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilt
 
     const baseSchematype = getPath(schema, baseFilterPath, discriminatorValueMap);
     let filterBaseSchema = baseSchematype != null ? baseSchematype.schema : null;
-    if (filterBaseSchema != null &&
-        filterBaseSchema.discriminators != null &&
+    if (filterBaseSchema?.discriminators != null &&
         filter[filterWildcardPath + '.' + filterBaseSchema.options.discriminatorKey]) {
       filterBaseSchema = filterBaseSchema.discriminators[filter[filterWildcardPath + '.' + filterBaseSchema.options.discriminatorKey]] || filterBaseSchema;
       discriminatorValueMap[baseFilterPath] = filter[filterWildcardPath + '.' + filterBaseSchema.options.discriminatorKey];
@@ -74,7 +74,7 @@ function _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilt
       if (updatedPathsByFilter[key] === null) {
         continue;
       }
-      if (Object.keys(updatedPathsByFilter).length === 0) {
+      if (utils.hasOwnKeys(updatedPathsByFilter) === false) {
         continue;
       }
       const dot = key.indexOf('.');

package/lib/helpers/update/decorateUpdateWithVersionKey.js

@@ -6,7 +6,7 @@
  */
 
 module.exports = function decorateUpdateWithVersionKey(update, options, versionKey) {
-  if (!versionKey || !(options && options.upsert || false)) {
+  if (!versionKey || !options?.upsert) {
     return;
   }