Apply suggestions from code review

Co-authored-by: Francesco Trotta <[email protected]>
eslint · Jul 26, 2024 · c9a60fd · c9a60fd
1 parent d76f47e
commit c9a60fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/shared/config-validator.js b/lib/shared/config-validator.js
@@ -149,7 +149,7 @@ export default class ConfigValidator {
         const validateRule = ruleValidators.get(rule);
 
         if (validateRule) {
-            const mergedOptions = deepMergeArrays(rule.meta && rule.meta.defaultOptions, localOptions);
+            const mergedOptions = deepMergeArrays(rule.meta?.defaultOptions, localOptions);
 
             validateRule(mergedOptions);
 

diff --git a/lib/shared/deep-merge-arrays.js b/lib/shared/deep-merge-arrays.js
@@ -9,7 +9,7 @@
  * @returns {boolean} Whether value is an object
  */
 function isObjectNotArray(value) {
-    return typeof value === "object" && value !== null && value !== void 0 && !Array.isArray(value);
+    return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 /**
@@ -40,8 +40,8 @@ function deepMergeObjects(first, second) {
 
 /**
  * Deeply merges second on top of first, creating a new [] array if needed.
- * @param {T[]} first Base, default values.
- * @param {U[]} second User-specified values.
+ * @param {T[] | undefined} first Base, default values.
+ * @param {U[] | undefined} second User-specified values.
  * @returns {(T | U | (T & U))[]} Merged equivalent of second on top of first.
  */
 function deepMergeArrays(first, second) {
@@ -50,7 +50,7 @@ function deepMergeArrays(first, second) {
     }
 
     return [
-        ...first.map((value, i) => deepMergeObjects(value, i < second.length ? second[i] : void 0)),
+        ...first.map((value, i) => deepMergeObjects(value, second[i])),
         ...second.slice(first.length)
     ];
 }