fix: Use optional chaining and nullish coalescing

eslint-community · Sep 5, 2023 · f812d33 · f812d33
1 parent 889dc2e
commit f812d33
Showing 1 changed file with 7 additions and 21 deletions.
diff --git a/lib/util/get-typescript-extension-map.js b/lib/util/get-typescript-extension-map.js
@@ -54,19 +54,17 @@ function normalise(typescriptExtensionMap) {
  * @returns {ExtensionMap} The `typescriptExtensionMap` value, or `null`.
  */
 function get(option) {
-    if (!option || !option.typescriptExtensionMap) {
-        return null
-    }
-
     if (
-        {}.hasOwnProperty.call(tsConfigMapping, option.typescriptExtensionMap)
+        {}.hasOwnProperty.call(tsConfigMapping, option?.typescriptExtensionMap)
     ) {
         return tsConfigMapping[option.typescriptExtensionMap]
     }
 
-    if (Array.isArray(option.typescriptExtensionMap)) {
+    if (Array.isArray(option?.typescriptExtensionMap)) {
         return normalise(option.typescriptExtensionMap)
     }
+
+    return null
 }
 
 /**
@@ -78,17 +76,7 @@ function get(option) {
 function getFromTSConfig(filename) {
     const tsconfig = getTsconfig(filename, "tsconfig.json", fsCache)
 
-    if (
-        !tsconfig ||
-        !tsconfig.config ||
-        !tsconfig.config.compilerOptions ||
-        !tsconfig.config.compilerOptions.jsx
-    ) {
-        return null
-    }
-
-    const jsx = tsconfig.config.compilerOptions.jsx
-
+    const jsx = tsconfig?.config?.compilerOptions?.jsx
     if ({}.hasOwnProperty.call(tsConfigMapping, jsx)) {
         return tsConfigMapping[jsx]
     }
@@ -113,10 +101,8 @@ function getFromTSConfig(filename) {
  */
 module.exports = function getTypescriptExtensionMap(context) {
     return (
-        get(context.options && context.options[0]) ||
-        get(
-            context.settings && (context.settings.n || context.settings.node)
-        ) ||
+        get(context.options?.[0]) ||
+        get(context.settings?.n ?? context.settings?.node) ||
         getFromTSConfig(context.filename) ||
         PRESERVE_MAPPING
     )