fix: review suggestions

eslint-community · Nov 27, 2023 · fa93557 · fa93557
1 parent d6659ee
commit fa93557
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/lib/rules/no-hide-core-modules.js b/lib/rules/no-hide-core-modules.js
@@ -85,10 +85,11 @@ module.exports = {
         },
     },
     create(context) {
-        if ((context.filename ?? context.getFilename()) === "<input>") {
+        const filename = context.filename ?? context.getFilename()
+        if (filename === "<input>") {
             return {}
         }
-        const filePath = path.resolve(context.filename ?? context.getFilename())
+        const filePath = path.resolve(filename)
         const dirPath = path.dirname(filePath)
         const packageJson = getPackageJson(filePath)
         const deps = new Set(

diff --git a/lib/util/get-typescript-extension-map.js b/lib/util/get-typescript-extension-map.js
@@ -112,21 +112,15 @@ function getFromTSConfigFromFile(filename) {
  * @returns {string[]} A list of extensions.
  */
 module.exports = function getTypescriptExtensionMap(context) {
+    const filename =
+        context.physicalFilename ??
+        context.getPhysicalFilename?.() ??
+        context.filename ??
+        context.getFilename?.()
     return (
         get(context.options?.[0]) ||
         get(context.settings?.n ?? context.settings?.node) ||
-        getFromTSConfigFromFile(
-            // eslint ^8
-            context.getPhysicalFilename() ??
-                context.physicalFilename ??
-                // eslint ^7.28 (deprecated ^8)
-                context.getPhysicalFilename?.() ??
-                // eslint ^8 (if physicalFilename undefined)
-                context.getFilename() ??
-                context.filename ??
-                // eslint ^7 (deprecated ^8)
-                context.getFilename?.()
-        ) ||
+        getFromTSConfigFromFile(filename) ||
         PRESERVE_MAPPING
     )
 }