Merge pull request #15866 from Automattic/refactor/use-object-has-own

refactor: use Object.hasOwn instead of Object.prototype.hasOwnProperty(...)

Author: vkarpov15

lib/aggregate.js

@@ -103,7 +103,7 @@ Aggregate.prototype._optionsForExec = function() {
   const options = this.options || {};
 
   const asyncLocalStorage = this.model()?.db?.base.transactionAsyncLocalStorage?.getStore();
-  if (!options.hasOwnProperty('session') && asyncLocalStorage?.session != null) {
+  if (!Object.hasOwn(options, 'session') && asyncLocalStorage?.session != null) {
     options.session = asyncLocalStorage.session;
   }
 

lib/cast.js

@@ -107,7 +107,7 @@ module.exports = function cast(schema, obj, options, context) {
       val = cast(schema, val, options, context);
     } else if (path === '$text') {
       val = castTextSearch(val, path);
-    } else if (path === '$comment' && !schema.paths.hasOwnProperty('$comment')) {
+    } else if (path === '$comment' && !Object.hasOwn(schema.paths, '$comment')) {
       val = castString(val, path);
       obj[path] = val;
     } else {

lib/connection.js

@@ -164,7 +164,7 @@ Object.defineProperty(Connection.prototype, 'readyState', {
  */
 
 Connection.prototype.get = function getOption(key) {
-  if (this.config.hasOwnProperty(key)) {
+  if (Object.hasOwn(this.config, key)) {
     return this.config[key];
   }
 
@@ -192,7 +192,7 @@ Connection.prototype.get = function getOption(key) {
  */
 
 Connection.prototype.set = function setOption(key, val) {
-  if (this.config.hasOwnProperty(key)) {
+  if (Object.hasOwn(this.config, key)) {
     this.config[key] = val;
     return val;
   }
@@ -459,7 +459,7 @@ Connection.prototype.bulkWrite = async function bulkWrite(ops, options) {
 
   const ordered = options.ordered == null ? true : options.ordered;
   const asyncLocalStorage = this.base.transactionAsyncLocalStorage?.getStore();
-  if ((!options || !options.hasOwnProperty('session')) && asyncLocalStorage?.session != null) {
+  if ((!options || !Object.hasOwn(options, 'session')) && asyncLocalStorage?.session != null) {
     options = { ...options, session: asyncLocalStorage.session };
   }
 
@@ -477,7 +477,7 @@ Connection.prototype.bulkWrite = async function bulkWrite(ops, options) {
       if (op.name == null) {
         throw new MongooseError('Must specify operation name in Connection.prototype.bulkWrite()');
       }
-      if (!castBulkWrite.cast.hasOwnProperty(op.name)) {
+      if (!Object.hasOwn(castBulkWrite.cast, op.name)) {
         throw new MongooseError(`Unrecognized bulkWrite() operation name ${op.name}`);
       }
 
@@ -513,7 +513,7 @@ Connection.prototype.bulkWrite = async function bulkWrite(ops, options) {
         results[i] = error;
         continue;
       }
-      if (!castBulkWrite.cast.hasOwnProperty(op.name)) {
+      if (!Object.hasOwn(castBulkWrite.cast, op.name)) {
         const error = new MongooseError(`Unrecognized bulkWrite() operation name ${op.name}`);
         validationErrors.push({ index: i, error: error });
         results[i] = error;
@@ -772,10 +772,10 @@ async function _wrapUserTransaction(fn, session, mongoose) {
 function _resetSessionDocuments(session) {
   for (const doc of session[sessionNewDocuments].keys()) {
     const state = session[sessionNewDocuments].get(doc);
-    if (state.hasOwnProperty('isNew')) {
+    if (Object.hasOwn(state, 'isNew')) {
       doc.$isNew = state.isNew;
     }
-    if (state.hasOwnProperty('versionKey')) {
+    if (Object.hasOwn(state, 'versionKey')) {
       doc.set(doc.schema.options.versionKey, state.versionKey);
     }
 
@@ -1013,7 +1013,7 @@ Connection.prototype.onOpen = function() {
   // avoid having the collection subscribe to our event emitter
   // to prevent 0.3 warning
   for (const i in this.collections) {
-    if (utils.object.hasOwnProperty(this.collections, i)) {
+    if (Object.hasOwn(this.collections, i)) {
       this.collections[i].onOpen();
     }
   }
@@ -1321,7 +1321,7 @@ Connection.prototype.onClose = function onClose(force) {
   // avoid having the collection subscribe to our event emitter
   // to prevent 0.3 warning
   for (const i in this.collections) {
-    if (utils.object.hasOwnProperty(this.collections, i)) {
+    if (Object.hasOwn(this.collections, i)) {
       this.collections[i].onClose(force);
     }
   }

lib/document.js

@@ -784,7 +784,7 @@ function init(self, obj, doc, opts, prefix) {
       }
     } else {
       // Retain order when overwriting defaults
-      if (doc.hasOwnProperty(i) && value !== void 0 && !opts.hydratedPopulatedDocs) {
+      if (Object.hasOwn(doc, i) && value !== void 0 && !opts.hydratedPopulatedDocs) {
         delete doc[i];
       }
       if (value === null) {
@@ -1167,7 +1167,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
     const orderedKeys = Object.keys(this.$__schema.tree);
     for (let i = 0, len = orderedKeys.length; i < len; ++i) {
       (key = orderedKeys[i]) &&
-      (this._doc.hasOwnProperty(key)) &&
+      (Object.hasOwn(this._doc, key)) &&
       (orderedDoc[key] = undefined);
     }
     this._doc = Object.assign(orderedDoc, this._doc);
@@ -1217,8 +1217,8 @@ Document.prototype.$set = function $set(path, val, type, options) {
         return this;
       }
       const wasModified = this.$isModified(path);
-      const hasInitialVal = this.$__.savedState != null && this.$__.savedState.hasOwnProperty(path);
-      if (this.$__.savedState != null && !this.$isNew && !this.$__.savedState.hasOwnProperty(path)) {
+      const hasInitialVal = this.$__.savedState != null && Object.hasOwn(this.$__.savedState, path);
+      if (this.$__.savedState != null && !this.$isNew && !Object.hasOwn(this.$__.savedState, path)) {
         const initialVal = this.$__getValue(path);
         this.$__.savedState[path] = initialVal;
 
@@ -1523,7 +1523,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
       this.$__.session[sessionNewDocuments].get(this).modifiedPaths &&
       !this.$__.session[sessionNewDocuments].get(this).modifiedPaths.has(savedStatePath);
     if (savedState != null &&
-        savedState.hasOwnProperty(savedStatePath) &&
+        Object.hasOwn(savedState, savedStatePath) &&
         (!isInTransaction || isModifiedWithinTransaction) &&
         utils.deepEqual(val, savedState[savedStatePath])) {
       this.unmarkModified(path);
@@ -2005,7 +2005,7 @@ Document.prototype.$get = Document.prototype.get;
 
 Document.prototype.$__path = function(path) {
   const adhocs = this.$__.adhocPaths;
-  const adhocType = adhocs && adhocs.hasOwnProperty(path) ? adhocs[path] : null;
+  const adhocType = adhocs && Object.hasOwn(adhocs, path) ? adhocs[path] : null;
 
   if (adhocType) {
     return adhocType;
@@ -2049,7 +2049,7 @@ Document.prototype.$__saveInitialState = function $__saveInitialState(path) {
   if (savedState != null) {
     const firstDot = savedStatePath.indexOf('.');
     const topLevelPath = firstDot === -1 ? savedStatePath : savedStatePath.slice(0, firstDot);
-    if (!savedState.hasOwnProperty(topLevelPath)) {
+    if (!Object.hasOwn(savedState, topLevelPath)) {
       savedState[topLevelPath] = clone(this.$__getValue(topLevelPath));
     }
   }
@@ -2360,15 +2360,15 @@ Document.prototype.$isDefault = function(path) {
   }
 
   if (typeof path === 'string' && path.indexOf(' ') === -1) {
-    return this.$__.activePaths.getStatePaths('default').hasOwnProperty(path);
+    return Object.hasOwn(this.$__.activePaths.getStatePaths('default'), path);
   }
 
   let paths = path;
   if (!Array.isArray(paths)) {
     paths = paths.split(' ');
   }
 
-  return paths.some(path => this.$__.activePaths.getStatePaths('default').hasOwnProperty(path));
+  return paths.some(path => Object.hasOwn(this.$__.activePaths.getStatePaths('default'), path));
 };
 
 /**
@@ -2422,7 +2422,7 @@ Document.prototype.isDirectModified = function(path) {
   }
 
   if (typeof path === 'string' && path.indexOf(' ') === -1) {
-    const res = this.$__.activePaths.getStatePaths('modify').hasOwnProperty(path);
+    const res = Object.hasOwn(this.$__.activePaths.getStatePaths('modify'), path);
     if (res || path.indexOf('.') === -1) {
       return res;
     }
@@ -2461,15 +2461,15 @@ Document.prototype.isInit = function(path) {
   }
 
   if (typeof path === 'string' && path.indexOf(' ') === -1) {
-    return this.$__.activePaths.getStatePaths('init').hasOwnProperty(path);
+    return Object.hasOwn(this.$__.activePaths.getStatePaths('init'), path);
   }
 
   let paths = path;
   if (!Array.isArray(paths)) {
     paths = paths.split(' ');
   }
 
-  return paths.some(path => this.$__.activePaths.getStatePaths('init').hasOwnProperty(path));
+  return paths.some(path => Object.hasOwn(this.$__.activePaths.getStatePaths('init'), path));
 };
 
 /**
@@ -2607,7 +2607,7 @@ Document.prototype.isDirectSelected = function isDirectSelected(path) {
     return true;
   }
 
-  if (this.$__.selected.hasOwnProperty(path)) {
+  if (Object.hasOwn(this.$__.selected, path)) {
     return inclusive;
   }
 
@@ -2779,7 +2779,7 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
         if (doc.$isModified(fullPathToSubdoc, null, modifiedPaths) &&
               // Avoid using isDirectModified() here because that does additional checks on whether the parent path
               // is direct modified, which can cause performance issues re: gh-14897
-              !subdocParent.$__.activePaths.getStatePaths('modify').hasOwnProperty(fullPathToSubdoc) &&
+              !Object.hasOwn(subdocParent.$__.activePaths.getStatePaths('modify'), fullPathToSubdoc) &&
               !subdocParent.$isDefault(fullPathToSubdoc)) {
           paths.add(fullPathToSubdoc);
 
@@ -2850,7 +2850,12 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
       // Single nested paths (paths embedded under single nested subdocs) will
       // be validated on their own when we call `validate()` on the subdoc itself.
       // Re: gh-8468
-      Object.keys(flat).filter(path => !doc.$__schema.singleNestedPaths.hasOwnProperty(path)).forEach(addToPaths);
+      const singleNestedPaths = doc.$__schema.singleNestedPaths;
+      for (const path of Object.keys(flat)) {
+        if (!Object.hasOwn(singleNestedPaths, path)) {
+          addToPaths(path);
+        }
+      }
     }
   }
 
@@ -4188,7 +4193,7 @@ function applyVirtuals(self, json, options, toObjectOptions) {
     }
 
     // Allow skipping aliases with `toObject({ virtuals: true, aliases: false })`
-    if (!aliases && schema.aliases.hasOwnProperty(path)) {
+    if (!aliases && Object.hasOwn(schema.aliases, path)) {
       continue;
     }
 
@@ -5101,7 +5106,7 @@ function checkDivergentArray(doc, path, array) {
   // would be similarly destructive as we never received all
   // elements of the array and potentially would overwrite data.
   const check = pop.options.match ||
-      pop.options.options && utils.object.hasOwnProperty(pop.options.options, 'limit') || // 0 is not permitted
+      pop.options.options && Object.hasOwn(pop.options.options, 'limit') || // 0 is not permitted
       pop.options.options && pop.options.options.skip || // 0 is permitted
       pop.options.select && // deselected _id?
       (pop.options.select._id === 0 ||

lib/drivers/node-mongodb-native/connection.js

@@ -508,7 +508,7 @@ function _setClient(conn, client, options, dbName) {
   conn.onOpen();
 
   for (const i in conn.collections) {
-    if (utils.object.hasOwnProperty(conn.collections, i)) {
+    if (Object.hasOwn(conn.collections, i)) {
       conn.collections[i].onOpen();
     }
   }

lib/helpers/common.js

@@ -55,7 +55,7 @@ function flatten(update, path, options, schema) {
     if (isNested) {
       const paths = Object.keys(schema.paths);
       for (const p of paths) {
-        if (p.startsWith(path + key + '.') && !result.hasOwnProperty(p)) {
+        if (p.startsWith(path + key + '.') && !Object.hasOwn(result, p)) {
           result[p] = void 0;
         }
       }

lib/helpers/indexes/applySchemaCollation.js

@@ -7,7 +7,7 @@ module.exports = function applySchemaCollation(indexKeys, indexOptions, schemaOp
     return;
   }
 
-  if (schemaOptions.hasOwnProperty('collation') && !indexOptions.hasOwnProperty('collation')) {
+  if (Object.hasOwn(schemaOptions, 'collation') && !Object.hasOwn(indexOptions, 'collation')) {
     indexOptions.collation = schemaOptions.collation;
   }
 };

lib/helpers/indexes/isDefaultIdIndex.js

@@ -14,5 +14,5 @@ module.exports = function isDefaultIdIndex(index) {
   }
 
   const key = get(index, 'key', {});
-  return Object.keys(key).length === 1 && key.hasOwnProperty('_id');
+  return Object.keys(key).length === 1 && Object.hasOwn(key, '_id');
 };

lib/helpers/model/applyMethods.js

@@ -28,7 +28,7 @@ module.exports = function applyMethods(model, schema) {
   }
   for (const method of Object.keys(schema.methods)) {
     const fn = schema.methods[method];
-    if (schema.tree.hasOwnProperty(method)) {
+    if (Object.hasOwn(schema.tree, method)) {
       throw new Error('You have a method and a property in your schema both ' +
         'named "' + method + '"');
     }

lib/helpers/model/castBulkWrite.js

@@ -297,7 +297,7 @@ function _addDiscriminatorToObject(schema, obj) {
 
 function decideModelByObject(model, object) {
   const discriminatorKey = model.schema.options.discriminatorKey;
-  if (object != null && object.hasOwnProperty(discriminatorKey)) {
+  if (object != null && Object.hasOwn(object, discriminatorKey)) {
     model = getDiscriminatorByValue(model.discriminators, object[discriminatorKey]) || model;
   }
   return model;