fix and update per review

Author: felipemelendez

lib/rules/v-if-else-key.js

@@ -36,11 +36,7 @@ const casing = require('../utils/casing')
  */
 const hasConditionalRenderedSiblings = (node, componentName) => {
   if (node.parent && node.parent.type === 'VElement') {
-    const siblings = node.parent.children.filter(
-      (child) => child.type === 'VElement'
-    )
-
-    return siblings.some(
+    return node.parent.children.some(
       (sibling) =>
         sibling !== node &&
         sibling.type === 'VElement' &&
@@ -220,7 +216,7 @@ module.exports = {
           if (node.parent && node.parent.type === 'VElement') {
             let conditionalFamily = conditionalFamilies.get(node.parent)
 
-            if (conditionType === 'if') {
+            if (conditionType === 'if' && !conditionalFamily) {
               conditionalFamily = createConditionalFamily(node)
               conditionalFamilies.set(node.parent, conditionalFamily)
             }
@@ -253,55 +249,44 @@ module.exports = {
         const currentScope = componentUsageStack[componentUsageStack.length - 1]
         const usageInfo = currentScope.get(componentName) || {
           count: 0,
-          firstNode: null,
-          hasIf: false
+          firstNode: null
         }
 
-        const isIfDirective = utils.getDirective(node, 'if') !== null
-        const isConditional =
-          isIfDirective ||
-          utils.getDirective(node, 'else-if') !== null ||
-          utils.getDirective(node, 'else') !== null
-
-        if (isConditional) {
-          if (isIfDirective && usageInfo.hasIf) {
-            // Reset if family already has an 'if' directive
-            usageInfo.count = 1
+        if (hasConditionalDirective(node)) {
+          // Store the first node if this is the first occurrence
+          if (usageInfo.count === 0) {
             usageInfo.firstNode = node
-          } else {
-            usageInfo.hasIf = true
-            if (usageInfo.count === 0) {
-              usageInfo.firstNode = node
-            } else if (usageInfo.count > 0 && usageInfo.firstNode !== node) {
-              const uniqueKey = `${casing.kebabCase(componentName)}-${
-                usageInfo.count + 1
-              }`
+          }
+
+          if (usageInfo.count > 0) {
+            const uniqueKey = `${casing.kebabCase(componentName)}-${
+              usageInfo.count + 1
+            }`
+            checkForKey(
+              node,
+              context,
+              componentName,
+              uniqueKey,
+              conditionalFamilies
+            )
+
+            // If this is the second occurrence, also apply a fix to the first occurrence
+            if (usageInfo.count === 1) {
+              const uniqueKeyForFirstInstance = `${casing.kebabCase(
+                componentName
+              )}-1`
               checkForKey(
-                node,
+                usageInfo.firstNode,
                 context,
                 componentName,
-                uniqueKey,
+                uniqueKeyForFirstInstance,
                 conditionalFamilies
               )
-
-              if (usageInfo.count === 1) {
-                const uniqueKeyForFirstInstance = `${casing.kebabCase(
-                  componentName
-                )}-1`
-                checkForKey(
-                  usageInfo.firstNode,
-                  context,
-                  componentName,
-                  uniqueKeyForFirstInstance,
-                  conditionalFamilies
-                )
-              }
             }
-            usageInfo.count++
           }
+          usageInfo.count += 1
           currentScope.set(componentName, usageInfo)
         }
-
         componentUsageStack.push(new Map())
         pushedNodes.add(node)
       },