mongoose 9.0.1 → 9.1.0

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;
   }
 

package/lib/helpers/updateValidators.js

@@ -38,7 +38,7 @@ module.exports = async function updateValidators(query, schema, castedDoc, optio
         const _keys = Object.keys(castedDoc[keys[i]]);
         for (let ii = 0; ii < _keys.length; ++ii) {
           currentUpdate = castedDoc[keys[i]][_keys[ii]];
-          if (currentUpdate && currentUpdate.$each) {
+          if (currentUpdate?.$each) {
             arrayAtomicUpdates[_keys[ii]] = (arrayAtomicUpdates[_keys[ii]] || []).
               concat(currentUpdate.$each);
           } else {
@@ -109,7 +109,7 @@ module.exports = async function updateValidators(query, schema, castedDoc, optio
         continue;
       }
 
-      if (schemaPath.$isMongooseDocumentArrayElement && v != null && v.$__ != null) {
+      if (schemaPath.$isMongooseDocumentArrayElement && v?.$__ != null) {
         alreadyValidated.push(updates[i]);
         validatorsToExecute.push(
           schemaPath.doValidate(v, context, { updateValidator: true }).catch(err => {
@@ -158,7 +158,7 @@ module.exports = async function updateValidators(query, schema, castedDoc, optio
       validatorsToExecute.push(
         schemaPath.doValidate(
           arrayAtomicUpdates[arrayUpdate],
-          options && options.context === 'query' ? query : null
+          options?.context === 'query' ? query : null
         ).catch(err => {
           err.path = arrayUpdate;
           validationErrors.push(err);
@@ -170,7 +170,7 @@ module.exports = async function updateValidators(query, schema, castedDoc, optio
         validatorsToExecute.push(
           schemaPath.doValidate(
             atomicUpdate,
-            options && options.context === 'query' ? query : null,
+            options?.context === 'query' ? query : null,
             { updateValidator: true }
           ).catch(err => {
             err.path = arrayUpdate;

package/lib/model.js

@@ -434,7 +434,7 @@ Model.prototype.$__save = async function $__save(options) {
                 continue;
               }
               minimize(updateOp[key]);
-              if (Object.keys(updateOp[key]).length === 0) {
+              if (utils.hasOwnKeys(updateOp[key]) === false) {
                 delete updateOp[key];
                 update.$unset = update.$unset || {};
                 update.$unset[key] = 1;
@@ -754,7 +754,7 @@ Model.prototype.deleteOne = function deleteOne(options) {
 
   const self = this;
   const where = this.$__where();
-  const query = self.constructor.deleteOne(where, options);
+  const query = self.constructor.deleteOne();
 
   if (this.$session() != null) {
     if (!('session' in query.options)) {
@@ -763,12 +763,13 @@ Model.prototype.deleteOne = function deleteOne(options) {
   }
 
   query.pre(async function queryPreDeleteOne() {
-    const res = await self.constructor._middleware.execPre('deleteOne', self, [self]);
+    const res = await self.constructor._middleware.execPre('deleteOne', self, [self, options]);
     // `self` is passed to pre hooks as argument for backwards compatibility, but that
     // isn't the actual arguments passed to the wrapped function.
-    if (res?.length !== 1 || res[0] !== self) {
+    if (res[0] !== self || res[1] !== options) {
       throw new Error('Document deleteOne pre hooks cannot overwrite arguments');
     }
+    query.deleteOne(where, options);
     // Apply custom where conditions _after_ document deleteOne middleware for
     // consistency with save() - sharding plugin needs to set $where
     if (self.$where != null) {
@@ -790,6 +791,12 @@ Model.prototype.deleteOne = function deleteOne(options) {
   query.post(function queryPostDeleteOne() {
     return self.constructor._middleware.execPost('deleteOne', self, [self], {});
   });
+  query.transform(function setIsDeleted(result) {
+    if (result?.deletedCount > 0) {
+      self.$isDeleted(true);
+    }
+    return result;
+  });
 
   return query;
 };
@@ -1146,25 +1153,16 @@ Model.createCollection = async function createCollection(options) {
     throw err;
   });
 
-  const collectionOptions = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.collectionOptions;
+  const collectionOptions = this?.schema?.options?.collectionOptions;
   if (collectionOptions != null) {
     options = Object.assign({}, collectionOptions, options);
   }
 
-  const schemaCollation = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.collation;
+  const schemaCollation = this?.schema?.options?.collation;
   if (schemaCollation != null) {
     options = Object.assign({ collation: schemaCollation }, options);
   }
-  const capped = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.capped;
+  const capped = this?.schema?.options?.capped;
   if (capped != null) {
     if (typeof capped === 'number') {
       options = Object.assign({ capped: true, size: capped }, options);
@@ -1172,10 +1170,7 @@ Model.createCollection = async function createCollection(options) {
       options = Object.assign({ capped: true }, capped, options);
     }
   }
-  const timeseries = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.timeseries;
+  const timeseries = this?.schema?.options?.timeseries;
   if (timeseries != null) {
     options = Object.assign({ timeseries }, options);
     if (options.expireAfterSeconds != null) {
@@ -1190,10 +1185,7 @@ Model.createCollection = async function createCollection(options) {
     }
   }
 
-  const clusteredIndex = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.clusteredIndex;
+  const clusteredIndex = this?.schema?.options?.clusteredIndex;
   if (clusteredIndex != null) {
     options = Object.assign({ clusteredIndex: { ...clusteredIndex, unique: true } }, options);
   }
@@ -1495,7 +1487,7 @@ Model.cleanIndexes = async function cleanIndexes(options) {
   }
   const model = this;
 
-  if (Array.isArray(options && options.toDrop)) {
+  if (Array.isArray(options?.toDrop)) {
     const res = await _dropIndexes(options.toDrop, model, options);
     return res;
   }
@@ -1510,7 +1502,7 @@ async function _dropIndexes(toDrop, model, options) {
   }
 
   const collection = model.$__collection;
-  if (options && options.hideIndexes) {
+  if (options?.hideIndexes) {
     await Promise.all(toDrop.map(indexName => {
       return model.db.db.command({
         collMod: collection.collectionName,
@@ -1854,7 +1846,7 @@ Model.translateAliases = function translateAliases(fields, errorOnDuplicates) {
     let currentSchema = this.schema;
     for (const i in fieldKeys) {
       const name = fieldKeys[i];
-      if (currentSchema && currentSchema.aliases[name]) {
+      if (currentSchema?.aliases[name]) {
         alias = currentSchema.aliases[name];
         if (errorOnDuplicates && alias in fields) {
           throw new MongooseError(`Provided object has both field "${name}" and its alias "${alias}"`);
@@ -1868,7 +1860,7 @@ Model.translateAliases = function translateAliases(fields, errorOnDuplicates) {
       }
 
       // Check if aliased path is a schema
-      if (currentSchema && currentSchema.paths[alias]) {
+      if (currentSchema?.paths[alias]) {
         currentSchema = currentSchema.paths[alias].schema;
       }
       else
@@ -3054,13 +3046,13 @@ Model.insertMany = async function insertMany(arr, options) {
     // `writeErrors` is a property reported by the MongoDB driver,
     // just not if there's only 1 error.
     if (error.writeErrors == null &&
-        (error.result && error.result.result && error.result.result.writeErrors) != null) {
+        error.result?.result?.writeErrors != null) {
       error.writeErrors = error.result.result.writeErrors;
     }
 
     // `insertedDocs` is a Mongoose-specific property
-    const hasWriteErrors = error && error.writeErrors;
-    const erroredIndexes = new Set((error && error.writeErrors || []).map(err => err.index));
+    const hasWriteErrors = error?.writeErrors;
+    const erroredIndexes = new Set((error?.writeErrors || []).map(err => err.index));
 
     if (error.writeErrors != null) {
       for (let i = 0; i < error.writeErrors.length; ++i) {
@@ -3248,12 +3240,14 @@ function _setIsNew(doc, val) {
  * @param {Object} [ops.updateOne.update] An object containing [update operators](https://www.mongodb.com/docs/manual/reference/operator/update/)
  * @param {Boolean} [ops.updateOne.upsert=false] If true, insert a doc if none match
  * @param {Boolean} [ops.updateOne.timestamps=true] If false, do not apply [timestamps](https://mongoosejs.com/docs/guide.html#timestamps) to the operation
+ * @param {Boolean} [ops.updateOne.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
  * @param {Object} [ops.updateOne.collation] The [MongoDB collation](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-34-collations) to use
  * @param {Array} [ops.updateOne.arrayFilters] The [array filters](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-36-array-filters.html) used in `update`
  * @param {Object} [ops.updateMany.filter] Update all the documents that match this filter
  * @param {Object} [ops.updateMany.update] An object containing [update operators](https://www.mongodb.com/docs/manual/reference/operator/update/)
  * @param {Boolean} [ops.updateMany.upsert=false] If true, insert a doc if no documents match `filter`
  * @param {Boolean} [ops.updateMany.timestamps=true] If false, do not apply [timestamps](https://mongoosejs.com/docs/guide.html#timestamps) to the operation
+ * @param {Boolean} [ops.updateMany.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
  * @param {Object} [ops.updateMany.collation] The [MongoDB collation](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-34-collations) to use
  * @param {Array} [ops.updateMany.arrayFilters] The [array filters](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-36-array-filters.html) used in `update`
  * @param {Object} [ops.deleteOne.filter] Delete the first document that matches this filter
@@ -3286,12 +3280,15 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
   }
   options = options || {};
 
-  [ops, options] = await this.hooks.execPre('bulkWrite', this, [ops, options]).catch(err => {
+  try {
+    [ops, options] = await this.hooks.execPre('bulkWrite', this, [ops, options]);
+  } catch (err) {
     if (err instanceof Kareem.skipWrappedFunction) {
-      return [err];
+      ops = err;
+    } else {
+      await this.hooks.execPost('bulkWrite', this, [null], { error: err });
     }
-    throw err;
-  });
+  }
 
   if (ops instanceof Kareem.skipWrappedFunction) {
     return ops.args[0];
@@ -3486,7 +3483,7 @@ Model.bulkSave = async function bulkSave(documents, options) {
   const successfulDocuments = [];
   for (let i = 0; i < documents.length; i++) {
     const document = documents[i];
-    const documentError = bulkWriteError && bulkWriteError.writeErrors.find(writeError => {
+    const documentError = bulkWriteError?.writeErrors.find(writeError => {
       const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
       return writeErrorDocumentId.toString() === document._doc._id.toString();
     });
@@ -3650,7 +3647,7 @@ Model.castObject = function castObject(obj, options) {
 
   for (const path of paths) {
     const schemaType = schema.path(path);
-    if (!schemaType || !schemaType.$isMongooseArray) {
+    if (!schemaType?.$isMongooseArray) {
       continue;
     }
 
@@ -3839,7 +3836,7 @@ Model.hydrate = function(obj, projection, options) {
   }
 
   if (projection != null) {
-    if (obj != null && obj.$__ != null) {
+    if (obj?.$__ != null) {
       obj = obj.toObject(internalToObjectOptions);
     }
     obj = applyProjection(obj, projection);
@@ -3978,7 +3975,7 @@ Model.updateOne = function updateOne(conditions, doc, options) {
 Model.replaceOne = function replaceOne(conditions, doc, options) {
   _checkContext(this, 'replaceOne');
 
-  const versionKey = this && this.schema && this.schema.options && this.schema.options.versionKey || null;
+  const versionKey = this?.schema?.options?.versionKey || null;
   if (versionKey && !doc[versionKey]) {
     doc[versionKey] = 0;
   }
@@ -4004,10 +4001,7 @@ function _update(model, op, conditions, doc, options) {
   }
   options = typeof options === 'function' ? options : clone(options);
 
-  const versionKey = model &&
-  model.schema &&
-  model.schema.options &&
-  model.schema.options.versionKey || null;
+  const versionKey = model?.schema?.options?.versionKey || null;
   decorateUpdateWithVersionKey(doc, options, versionKey);
 
   return mq[op](conditions, doc, options);
@@ -4146,7 +4140,7 @@ Model.validate = async function validate(obj, pathsOrOptions, context) {
 
   for (const path of paths) {
     const schemaType = schema.path(path);
-    if (!schemaType || !schemaType.$isMongooseArray || schemaType.$isMongooseDocumentArray) {
+    if (!schemaType?.$isMongooseArray || schemaType.$isMongooseDocumentArray) {
       continue;
     }
 
@@ -4294,7 +4288,7 @@ const excludeIdRegGlobal = /\s?-_id\s?/g;
 
 async function _populatePath(model, docs, populateOptions) {
   if (populateOptions.strictPopulate == null) {
-    if (populateOptions._localModel != null && populateOptions._localModel.schema._userProvidedOptions.strictPopulate != null) {
+    if (populateOptions._localModel?.schema._userProvidedOptions.strictPopulate != null) {
       populateOptions.strictPopulate = populateOptions._localModel.schema._userProvidedOptions.strictPopulate;
     } else if (populateOptions._localModel != null && model.base.options.strictPopulate != null) {
       populateOptions.strictPopulate = model.base.options.strictPopulate;
@@ -4378,7 +4372,7 @@ async function _populatePath(model, docs, populateOptions) {
       }
     }
 
-    if (mod.options.options && mod.options.options.limit != null) {
+    if (mod.options.options?.limit != null) {
       assignmentOpts.originalLimit = mod.options.options.limit;
     } else if (mod.options.limit != null) {
       assignmentOpts.originalLimit = mod.options.limit;
@@ -4432,7 +4426,7 @@ async function _populatePath(model, docs, populateOptions) {
   }
   for (const arr of params) {
     const mod = arr[0];
-    if (mod.options && mod.options.options && mod.options.options._leanTransform) {
+    if (mod.options?.options?._leanTransform) {
       for (const doc of vals) {
         mod.options.options._leanTransform(doc);
       }
@@ -4987,7 +4981,7 @@ Model._applyQueryMiddleware = function _applyQueryMiddleware() {
       return !!contexts.query;
     }
     if (hook.name === 'deleteOne' || hook.name === 'updateOne') {
-      return !!contexts.query || Object.keys(contexts).length === 0;
+      return !!contexts.query || utils.hasOwnKeys(contexts) === false;
     }
     if (hook.query != null || hook.document != null) {
       return !!hook.query;

package/lib/mongoose.js

@@ -82,7 +82,7 @@ function Mongoose(options) {
 
   // If a user creates their own Mongoose instance, give them a separate copy
   // of the `Schema` constructor so they get separate custom types. (gh-6933)
-  if (!options || !options[defaultMongooseSymbol]) {
+  if (!options?.[defaultMongooseSymbol]) {
     const _this = this;
     this.Schema = function() {
       this.base = _this;
@@ -308,8 +308,8 @@ Mongoose.prototype.set = function getsetOptions(key, value) {
     } else if (optionKey === 'createInitialConnection') {
       if (optionValue && !_mongoose.connection) {
         _createDefaultConnection(_mongoose);
-      } else if (optionValue === false && _mongoose.connection && _mongoose.connection[defaultConnectionSymbol]) {
-        if (_mongoose.connection.readyState === STATES.disconnected && Object.keys(_mongoose.connection.models).length === 0) {
+      } else if (optionValue === false && _mongoose.connection?.[defaultConnectionSymbol]) {
+        if (_mongoose.connection.readyState === STATES.disconnected && utils.hasOwnKeys(_mongoose.connection.models) === false) {
           _mongoose.connections.shift();
         }
       }
@@ -746,8 +746,8 @@ Mongoose.prototype._applyPlugins = function _applyPlugins(schema, options) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   options = options || {};
-  options.applyPluginsToDiscriminators = _mongoose.options && _mongoose.options.applyPluginsToDiscriminators || false;
-  options.applyPluginsToChildSchemas = typeof (_mongoose.options && _mongoose.options.applyPluginsToChildSchemas) === 'boolean' ?
+  options.applyPluginsToDiscriminators = _mongoose.options?.applyPluginsToDiscriminators || false;
+  options.applyPluginsToChildSchemas = typeof _mongoose.options?.applyPluginsToChildSchemas === 'boolean' ?
     _mongoose.options.applyPluginsToChildSchemas :
     true;
   applyPlugins(schema, _mongoose.plugins, options, '$globalPluginsApplied');

package/lib/options/virtualOptions.js

@@ -6,7 +6,7 @@ class VirtualOptions {
   constructor(obj) {
     Object.assign(this, obj);
 
-    if (obj != null && obj.options != null) {
+    if (obj?.options != null) {
       this.options = Object.assign({}, obj.options);
     }
   }

package/lib/plugins/saveSubdocs.js

@@ -27,7 +27,7 @@ module.exports = function saveSubdocs(schema) {
 
   schema.s.hooks.pre('save', async function saveSubdocsPreDeleteOne() {
     const removedSubdocs = this.$__.removedSubdocs;
-    if (!removedSubdocs || !removedSubdocs.length) {
+    if (!removedSubdocs?.length) {
       return;
     }
 
@@ -41,7 +41,7 @@ module.exports = function saveSubdocs(schema) {
 
   schema.s.hooks.post('save', async function saveSubdocsPostDeleteOne() {
     const removedSubdocs = this.$__.removedSubdocs;
-    if (!removedSubdocs || !removedSubdocs.length) {
+    if (!removedSubdocs?.length) {
       return;
     }
 

package/lib/plugins/trackTransaction.js

@@ -39,12 +39,11 @@ function _getAtomics(doc, previous) {
 
   for (const path of pathsToCheck) {
     const val = doc.$__getValue(path);
-    if (val != null &&
-        Array.isArray(val) &&
+    if (Array.isArray(val) &&
         utils.isMongooseDocumentArray(val) &&
         val.length &&
         val[arrayAtomicsSymbol] != null &&
-        Object.keys(val[arrayAtomicsSymbol]).length !== 0) {
+        utils.hasOwnKeys(val[arrayAtomicsSymbol])) {
       const existing = previous.get(path) || {};
       pathToAtomics.set(path, mergeAtomics(existing, val[arrayAtomicsSymbol]));
     }
@@ -55,7 +54,7 @@ function _getAtomics(doc, previous) {
     const path = dirt.path;
 
     const val = dirt.value;
-    if (val != null && val[arrayAtomicsSymbol] != null && Object.keys(val[arrayAtomicsSymbol]).length !== 0) {
+    if (val?.[arrayAtomicsSymbol] != null && utils.hasOwnKeys(val[arrayAtomicsSymbol])) {
       const existing = previous.get(path) || {};
       pathToAtomics.set(path, mergeAtomics(existing, val[arrayAtomicsSymbol]));
     }