chore: Object.prototype.hasOwnProperty.call -> Object.hasOwn

hartman · Jan 9, 2023 · 333522a · 333522a
1 parent 9b07314
commit 333522a
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 70 deletions.
diff --git a/packages/jsdoc-core/lib/name.js b/packages/jsdoc-core/lib/name.js
@@ -21,8 +21,6 @@
 const _ = require('lodash');
 const escape = require('escape-string-regexp');
 
-const hasOwnProp = Object.prototype.hasOwnProperty;
-
 /**
  * Longnames that have a special meaning in JSDoc.
  *
@@ -443,7 +441,7 @@ exports.longnamesToTree = (longnames, doclets) => {
         currentParent = currentParent.children;
       }
 
-      if (!hasOwnProp.call(currentParent, chunk)) {
+      if (!Object.hasOwn(currentParent, chunk)) {
         currentParent[chunk] = nameInfo[currentLongname];
       }
 

diff --git a/packages/jsdoc-util/lib/bus.js b/packages/jsdoc-util/lib/bus.js
@@ -18,7 +18,6 @@ const EventEmitter = require('events').EventEmitter;
 const { default: ow } = require('ow');
 
 let cache = {};
-const hasOwnProp = Object.prototype.hasOwnProperty;
 
 /**
  * An event bus that works the same way as a standard Node.js event emitter, with a few key
@@ -52,7 +51,7 @@ class EventBus extends EventEmitter {
 
     const shouldCache = _.isBoolean(opts.cache) ? opts.cache : true;
 
-    if (hasOwnProp.call(cache, id) && shouldCache) {
+    if (Object.hasOwn(cache, id) && shouldCache) {
       return cache[id];
     }
 

diff --git a/packages/jsdoc/lib/jsdoc/augment.js b/packages/jsdoc/lib/jsdoc/augment.js
@@ -24,8 +24,6 @@ const jsdoc = {
   doclet: require('jsdoc/doclet'),
 };
 
-const hasOwnProp = Object.prototype.hasOwnProperty;
-
 function mapDependencies(index, propertyName) {
   const dependencies = {};
   let doc;
@@ -39,7 +37,7 @@ function mapDependencies(index, propertyName) {
       doc = doclets[i];
       if (kinds.includes(doc.kind)) {
         dependencies[indexName] = {};
-        if (hasOwnProp.call(doc, propertyName)) {
+        if (Object.hasOwn(doc, propertyName)) {
           len = doc[propertyName].length;
           for (let j = 0; j < len; j++) {
             dependencies[indexName][doc[propertyName][j]] = true;
@@ -172,7 +170,7 @@ function updateAddedDoclets(doclet, additions, indexes) {
  * @return {void}
  */
 function updateDocumentedDoclets(doclet, documented) {
-  if (!hasOwnProp.call(documented, doclet.longname)) {
+  if (!Object.hasOwn(documented, doclet.longname)) {
     documented[doclet.longname] = [];
   }
 
@@ -190,7 +188,7 @@ function updateDocumentedDoclets(doclet, documented) {
  */
 function updateMemberofDoclets(doclet, memberof) {
   if (doclet.memberof) {
-    if (!hasOwnProp.call(memberof, doclet.memberof)) {
+    if (!Object.hasOwn(memberof, doclet.memberof)) {
       memberof[doclet.memberof] = [];
     }
 
@@ -261,7 +259,7 @@ function getInheritedAdditions(doclets, docs, { documented, memberof }) {
 
           // We don't want to fold in properties from the child doclet if it had an
           // `@inheritdoc` tag.
-          if (hasOwnProp.call(childDoclet, 'inheritdoc')) {
+          if (Object.hasOwn(childDoclet, 'inheritdoc')) {
             childDoclet = {};
           }
 
@@ -280,15 +278,15 @@ function getInheritedAdditions(doclets, docs, { documented, memberof }) {
           // Indicate what the descendant is overriding. (We only care about the closest
           // ancestor. For classes A > B > C, if B#a overrides A#a, and C#a inherits B#a,
           // we don't want the doclet for C#a to say that it overrides A#a.)
-          if (hasOwnProp.call(docs.index.longname, member.longname)) {
+          if (Object.hasOwn(docs.index.longname, member.longname)) {
             member.overrides = parentDoclet.longname;
           } else {
             delete member.overrides;
           }
 
           // Add the ancestor's docs unless the descendant overrides the ancestor AND
           // documents the override.
-          if (!hasOwnProp.call(documented, member.longname)) {
+          if (!Object.hasOwn(documented, member.longname)) {
             updateAddedDoclets(member, additions, additionIndexes);
             updateDocumentedDoclets(member, documented);
             updateMemberofDoclets(member, memberof);
@@ -414,7 +412,7 @@ function updateImplements(implDoclets, implementedLongname) {
   }
 
   implDoclets.forEach((implDoclet) => {
-    if (!hasOwnProp.call(implDoclet, 'implements')) {
+    if (!Object.hasOwn(implDoclet, 'implements')) {
       implDoclet.implements = [];
     }
 
@@ -465,7 +463,7 @@ function getImplementedAdditions(implDoclets, allDoclets, { documented, memberof
 
           // We don't want to fold in properties from the child doclet if it had an
           // `@inheritdoc` tag.
-          if (hasOwnProp.call(childDoclet, 'inheritdoc')) {
+          if (Object.hasOwn(childDoclet, 'inheritdoc')) {
             childDoclet = {};
           }
 
@@ -475,13 +473,13 @@ function getImplementedAdditions(implDoclets, allDoclets, { documented, memberof
           updateImplements(implementationDoclet, parentDoclet.longname);
 
           // If there's no implementation, move along.
-          implExists = hasOwnProp.call(allDoclets.index.longname, implementationDoclet.longname);
+          implExists = Object.hasOwn(allDoclets.index.longname, implementationDoclet.longname);
           if (!implExists) {
             continue;
           }
 
           // Add the interface's docs unless the implementation is already documented.
-          if (!hasOwnProp.call(commentedDoclets, implementationDoclet.longname)) {
+          if (!Object.hasOwn(commentedDoclets, implementationDoclet.longname)) {
             updateAddedDoclets(implementationDoclet, additions, additionIndexes);
             updateDocumentedDoclets(implementationDoclet, commentedDoclets);
             updateMemberofDoclets(implementationDoclet, memberof);
@@ -536,7 +534,7 @@ function augment(doclets, propertyName, docletFinder, jsdocDeps) {
     additions.forEach((addition) => {
       const longname = addition.longname;
 
-      if (!hasOwnProp.call(index, longname)) {
+      if (!Object.hasOwn(index, longname)) {
         index[longname] = [];
       }
       index[longname].push(addition);

diff --git a/packages/jsdoc/lib/jsdoc/doclet.js b/packages/jsdoc/lib/jsdoc/doclet.js
@@ -353,14 +353,10 @@ function copyMostProperties(primary, secondary, target, exclude) {
  */
 function copySpecificProperties(primary, secondary, target, include) {
   include.forEach((property) => {
-    if (
-      {}.hasOwnProperty.call(primary, property) &&
-      primary[property] &&
-      primary[property].length
-    ) {
+    if (Object.hasOwn(primary, property) && primary[property] && primary[property].length) {
       target[property] = _.cloneDeep(primary[property]);
     } else if (
-      {}.hasOwnProperty.call(secondary, property) &&
+      Object.hasOwn(secondary, property) &&
       secondary[property] &&
       secondary[property].length
     ) {

diff --git a/packages/jsdoc/lib/jsdoc/src/parser.js b/packages/jsdoc/lib/jsdoc/src/parser.js
@@ -25,8 +25,6 @@ const { getBasename, LONGNAMES, SCOPE, toParts } = require('@jsdoc/core').name;
 const { Visitor } = require('jsdoc/src/visitor');
 const { Walker } = require('jsdoc/src/walker');
 
-const hasOwnProp = Object.prototype.hasOwnProperty;
-
 /* eslint-disable no-script-url */
 // Prefix for JavaScript strings that were provided in lieu of a filename.
 const SCHEMA = 'javascript:';
@@ -38,7 +36,7 @@ class DocletCache {
   }
 
   get(itemName) {
-    if (!hasOwnProp.call(this._doclets, itemName)) {
+    if (!Object.hasOwn(this._doclets, itemName)) {
       return null;
     }
 
@@ -47,7 +45,7 @@ class DocletCache {
   }
 
   put(itemName, value) {
-    if (!hasOwnProp.call(this._doclets, itemName)) {
+    if (!Object.hasOwn(this._doclets, itemName)) {
       this._doclets[itemName] = [];
     }
 
@@ -76,7 +74,7 @@ function definedInScope(doclet, basename) {
     Boolean(doclet.meta) &&
     Boolean(doclet.meta.vars) &&
     Boolean(basename) &&
-    hasOwnProp.call(doclet.meta.vars, basename)
+    Object.hasOwn(doclet.meta.vars, basename)
   );
 }
 
@@ -221,29 +219,29 @@ class Parser extends EventEmitter {
     this._resultBuffer.push(doclet);
 
     // track all doclets by longname
-    if (!hasOwnProp.call(index.longname, doclet.longname)) {
+    if (!Object.hasOwn(index.longname, doclet.longname)) {
       index.longname[doclet.longname] = [];
     }
     index.longname[doclet.longname].push(doclet);
 
     // track all doclets that have a memberof by memberof
     if (doclet.memberof) {
-      if (!hasOwnProp.call(index.memberof, doclet.memberof)) {
+      if (!Object.hasOwn(index.memberof, doclet.memberof)) {
         index.memberof[doclet.memberof] = [];
       }
       index.memberof[doclet.memberof].push(doclet);
     }
 
     // track longnames of documented symbols
     if (!doclet.undocumented) {
-      if (!hasOwnProp.call(index.documented, doclet.longname)) {
+      if (!Object.hasOwn(index.documented, doclet.longname)) {
         index.documented[doclet.longname] = [];
       }
       index.documented[doclet.longname].push(doclet);
     }
 
     // track doclets with a `borrowed` property
-    if (hasOwnProp.call(doclet, 'borrowed')) {
+    if (Object.hasOwn(doclet, 'borrowed')) {
       index.borrowed.push(doclet);
     }
   }

diff --git a/packages/jsdoc/lib/jsdoc/tag/dictionary.js b/packages/jsdoc/lib/jsdoc/tag/dictionary.js
@@ -17,8 +17,6 @@
 const definitions = require('jsdoc/tag/dictionary/definitions');
 const { log } = require('@jsdoc/util');
 
-const hasOwnProp = Object.prototype.hasOwnProperty;
-
 const DEFINITIONS = {
   closure: 'closureTags',
   jsdoc: 'jsdocTags',
@@ -159,7 +157,7 @@ class Dictionary {
   lookup(title) {
     title = this.normalize(title);
 
-    if (hasOwnProp.call(this._tags, title)) {
+    if (Object.hasOwn(this._tags, title)) {
       return this._tags[title];
     }
 
@@ -177,7 +175,7 @@ class Dictionary {
   normalize(title) {
     const canonicalName = title.toLowerCase();
 
-    if (hasOwnProp.call(this._tagSynonyms, canonicalName)) {
+    if (Object.hasOwn(this._tagSynonyms, canonicalName)) {
       return this._tagSynonyms[canonicalName];
     }
 

diff --git a/packages/jsdoc/lib/jsdoc/util/templateHelper.js b/packages/jsdoc/lib/jsdoc/util/templateHelper.js
@@ -21,8 +21,6 @@ const { inline } = require('@jsdoc/tag');
 const { log } = require('@jsdoc/util');
 const { longnamesToTree, SCOPE, SCOPE_TO_PUNC, toParts } = require('@jsdoc/core').name;
 
-const hasOwnProp = Object.prototype.hasOwnProperty;
-
 const MODULE_NAMESPACE = 'module:';
 
 const files = {};
@@ -92,7 +90,7 @@ function makeUniqueFilename(filename, str) {
 
   // append enough underscores to make the filename unique
   while (nonUnique) {
-    if (hasOwnProp.call(files, key)) {
+    if (Object.hasOwn(files, key)) {
       filename += '_';
       key = filename.toLowerCase();
     } else {
@@ -152,7 +150,7 @@ const getUniqueFilename = (exports.getUniqueFilename = (str, dependencies) => {
 function getFilename(longname, dependencies) {
   let fileUrl;
 
-  if (hasOwnProp.call(longnameToUrl, longname)) {
+  if (Object.hasOwn(longnameToUrl, longname)) {
     fileUrl = longnameToUrl[longname];
   } else {
     fileUrl = getUniqueFilename(longname, dependencies);
@@ -191,7 +189,7 @@ function makeUniqueId(filename, id) {
 
   // append enough underscores to make the identifier unique
   while (nonUnique) {
-    if (hasOwnProp.call(ids, filename) && hasOwnProp.call(ids[filename], key)) {
+    if (Object.hasOwn(ids, filename) && Object.hasOwn(ids[filename], key)) {
       id += '_';
       key = id.toLowerCase();
     } else {
@@ -211,7 +209,7 @@ function makeUniqueId(filename, id) {
  * @private
  */
 function getId(longname, id) {
-  if (hasOwnProp.call(longnameToId, longname)) {
+  if (Object.hasOwn(longnameToId, longname)) {
     id = longnameToId[longname];
   } else if (!id) {
     // no ID required
@@ -342,7 +340,7 @@ function buildLink(longname, linkText, options) {
 
     return stringifyType(parsedType, options.cssClass, options.linkMap);
   } else {
-    fileUrl = hasOwnProp.call(options.linkMap, longname) ? options.linkMap[longname] : '';
+    fileUrl = Object.hasOwn(options.linkMap, longname) ? options.linkMap[longname] : '';
     text = linkText || (options.shortenName ? getShortName(longname) : longname);
   }
 

diff --git a/packages/jsdoc/templates/default/publish.js b/packages/jsdoc/templates/default/publish.js
@@ -26,7 +26,6 @@ const template = require('jsdoc/template');
 const htmlsafe = helper.htmlsafe;
 const linkto = helper.linkto;
 const resolveAuthorLinks = helper.resolveAuthorLinks;
-const hasOwnProp = Object.prototype.hasOwnProperty;
 
 const FONT_NAMES = [
   'OpenSans-Bold',
@@ -342,9 +341,9 @@ function buildMemberNav(items, itemHeading, itemsSeen, linktoFn, dependencies) {
     items.forEach((item) => {
       let displayName;
 
-      if (!hasOwnProp.call(item, 'longname')) {
+      if (!Object.hasOwn(item, 'longname')) {
         itemsNav += `<li>${linktoFn('', item.name)}</li>`;
-      } else if (!hasOwnProp.call(itemsSeen, item.longname)) {
+      } else if (!Object.hasOwn(itemsSeen, item.longname)) {
         if (config.templates.default.useLongnameInNav) {
           displayName = item.longname;
         } else {
@@ -401,7 +400,7 @@ function buildNav(members, dependencies) {
     globalNav = '';
 
     members.globals.forEach(({ kind, longname, name }) => {
-      if (kind !== 'typedef' && !hasOwnProp.call(seen, longname)) {
+      if (kind !== 'typedef' && !Object.hasOwn(seen, longname)) {
         globalNav += `<li>${linkto(longname, name)}</li>`;
       }
       seen[longname] = true;