Merge pull request #2527 from johanrd/review/2426

Post-merge review of #2426 (`template-no-duplicate-id`)

Author: NullVoxPopuli

lib/rules/template-no-duplicate-id.js

@@ -7,13 +7,6 @@ function isControlFlowHelper(node) {
   return false;
 }
 
-function isIfUnless(node) {
-  if (node.type === 'GlimmerBlockStatement' && node.path?.type === 'GlimmerPathExpression') {
-    return ['if', 'unless'].includes(node.path.original);
-  }
-  return false;
-}
-
 // Walk up the parent chain to find an ancestor element/block whose blockParams
 // include headName. Used to make block-param-derived IDs unique per invocation.
 function findBlockParamAncestor(node, headName) {
@@ -236,14 +229,14 @@ module.exports = {
 
       GlimmerBlock(node) {
         const parent = node.parent;
-        if (parent && isIfUnless(parent)) {
+        if (parent && isControlFlowHelper(parent)) {
           enterConditionalBranch();
         }
       },
 
       'GlimmerBlock:exit'(node) {
         const parent = node.parent;
-        if (parent && isIfUnless(parent)) {
+        if (parent && isControlFlowHelper(parent)) {
           exitConditionalBranch();
         }
       },

tests/lib/rules/template-no-duplicate-id.js

@@ -113,6 +113,14 @@ ruleTester.run('template-no-duplicate-id', rule, {
         <Input id={{inputProperties.id}} />
       </MyComponent>
     </template>`,
+    // IDs in different branches of {{#each}} should not conflict
+    `<template>
+      {{#each items as |item|}}
+        <div id="x"></div>
+      {{else}}
+        <div id="x"></div>
+      {{/each}}
+    </template>`,
   ],
   invalid: [
     // blockParams on an element must not isolate static IDs from outer scope
@@ -423,6 +431,12 @@ hbsRuleTester.run('template-no-duplicate-id (hbs)', rule, {
       <MyComponent as |inputProperties|>
         <Input id={{inputProperties.id}} />
       </MyComponent>`,
+    // IDs in different branches of {{#each}} should not conflict
+    `{{#each items as |item|}}
+        <div id="x"></div>
+      {{else}}
+        <div id="x"></div>
+      {{/each}}`,
   ],
   invalid: [
     // blockParams on an element must not isolate static IDs from outer scope