From 92b2c15db75ad222c44d0cc79298020b1a9d6644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Tue, 28 Apr 2026 09:13:10 +0200
Subject: [PATCH 1/3] test(require-input-label): add failing cases for id false
 positive/negative

Refs: https://github.com/ember-template-lint/ember-template-lint/issues/3388

- id + aria-label wrongly flagged as multipleLabels (false positive)
- id alone not flagged as missing label (false negative)
---
 tests/lib/rules/template-require-input-label.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/lib/rules/template-require-input-label.js b/tests/lib/rules/template-require-input-label.js
index 45180c179b..de96896205 100644
--- a/tests/lib/rules/template-require-input-label.js
+++ b/tests/lib/rules/template-require-input-label.js
@@ -19,6 +19,10 @@ ruleTester.run('template-require-input-label', rule, {
     '<template><input id="probablyHasLabel" /></template>',
     '<template><input aria-label={{labelText}} /></template>',
     '<template><input aria-labelledby="someIdValue" /></template>',
+    // https://github.com/ember-template-lint/ember-template-lint/issues/3388
+    // id alone does not establish a labeling relationship — a <label for> is
+    // needed and cannot be verified statically. Only aria-label should count.
+    '<template><input id="hello" aria-label="hello" /></template>',
     '<template><div></div></template>',
     '<template><Input id="foo" /></template>',
     '<template>{{input id="foo"}}</template>',
@@ -65,6 +69,13 @@ ruleTester.run('template-require-input-label', rule, {
     },
   ],
   invalid: [
+    // https://github.com/ember-template-lint/ember-template-lint/issues/3388
+    // id alone does not establish a labeling relationship.
+    {
+      code: '<template><input id="hello" /></template>',
+      output: null,
+      errors: [{ message: NO_LABEL }],
+    },
     {
       code: '<template><my-label><input /></my-label></template>',
       output: null,

From 7316bafa59536cafb640754f9124953f695d58e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Tue, 28 Apr 2026 09:23:06 +0200
Subject: [PATCH 2/3] fix(require-input-label): don't count id as a label
 alongside aria-label/labelledby

Refs: https://github.com/ember-template-lint/ember-template-lint/issues/3388

id alone cannot be verified statically as a <label for> reference (same
rationale as vuejs-accessibility form-control-has-label). Counting it as
a second label when aria-label or aria-labelledby is already present causes
a false positive multipleLabels error. Keep the bail-out for id-only inputs
(no real labels present) to avoid flagging inputs that likely have an
off-screen <label for> sibling.
---
 lib/rules/template-require-input-label.js       | 10 +++++-----
 tests/lib/rules/template-require-input-label.js | 17 -----------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/lib/rules/template-require-input-label.js b/lib/rules/template-require-input-label.js
index 747cc27f58..89e6cc58c2 100644
--- a/lib/rules/template-require-input-label.js
+++ b/lib/rules/template-require-input-label.js
@@ -160,12 +160,8 @@ module.exports = {
           labelCount++;
         }
 
-        const hasId = hasAttr(node, 'id');
         const hasAriaLabel = hasAttr(node, 'aria-label');
         const hasAriaLabelledBy = hasAttr(node, 'aria-labelledby');
-        if (hasId) {
-          labelCount++;
-        }
         if (hasAriaLabel) {
           labelCount++;
         }
@@ -177,7 +173,11 @@ module.exports = {
           return;
         }
 
-        if (validLabel && hasId) {
+        // id alone is treated as a potential <label for> reference that static
+        // analysis cannot verify (see vuejs-accessibility form-control-has-label
+        // for the same rationale). Skip only when no other label is present to
+        // avoid a false positive when id is combined with aria-label/labelledby.
+        if (labelCount === 0 && hasAttr(node, 'id')) {
           return;
         }
 
diff --git a/tests/lib/rules/template-require-input-label.js b/tests/lib/rules/template-require-input-label.js
index de96896205..1b9d619ae7 100644
--- a/tests/lib/rules/template-require-input-label.js
+++ b/tests/lib/rules/template-require-input-label.js
@@ -69,13 +69,6 @@ ruleTester.run('template-require-input-label', rule, {
     },
   ],
   invalid: [
-    // https://github.com/ember-template-lint/ember-template-lint/issues/3388
-    // id alone does not establish a labeling relationship.
-    {
-      code: '<template><input id="hello" /></template>',
-      output: null,
-      errors: [{ message: NO_LABEL }],
-    },
     {
       code: '<template><my-label><input /></my-label></template>',
       output: null,
@@ -107,11 +100,6 @@ ruleTester.run('template-require-input-label', rule, {
       output: null,
       errors: [{ message: MULTIPLE_LABELS }],
     },
-    {
-      code: '<template><input id="label-input" aria-label="second label"></template>',
-      output: null,
-      errors: [{ message: MULTIPLE_LABELS }],
-    },
     {
       code: '<template><label>Input label<input aria-label="Custom label"></label></template>',
       output: null,
@@ -271,11 +259,6 @@ hbsRuleTester.run('template-require-input-label', rule, {
       output: null,
       errors: [{ message: MULTIPLE_LABELS }],
     },
-    {
-      code: '<input id="label-input" aria-label="second label">',
-      output: null,
-      errors: [{ message: MULTIPLE_LABELS }],
-    },
     {
       code: '<label>Input label<input aria-label="Custom label"></label>',
       output: null,

From 41bcb2ef1dd876b41f0f2f7e1e0623c111fd95fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Tue, 28 Apr 2026 09:48:51 +0200
Subject: [PATCH 3/3] test(require-input-label): cover id + aria-labelledby and
 wrapped-label cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add valid: <input id aria-labelledby> (GJS + HBS)
- Add invalid: <label><input id aria-label></label> still multipleLabels —
  locks in the corrected behavior after the validLabel && hasId carve-out
  was removed.
- Drop peer-plugin reference from the id-skip comment; keep the spec-anchored
  reason (static analysis can't verify the <label for>) and inline the
  one-shot aria-label/labelledby locals.
---
 lib/rules/template-require-input-label.js     | 14 ++++++--------
 .../lib/rules/template-require-input-label.js | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/rules/template-require-input-label.js b/lib/rules/template-require-input-label.js
index 89e6cc58c2..df540ed0ce 100644
--- a/lib/rules/template-require-input-label.js
+++ b/lib/rules/template-require-input-label.js
@@ -160,12 +160,10 @@ module.exports = {
           labelCount++;
         }
 
-        const hasAriaLabel = hasAttr(node, 'aria-label');
-        const hasAriaLabelledBy = hasAttr(node, 'aria-labelledby');
-        if (hasAriaLabel) {
+        if (hasAttr(node, 'aria-label')) {
           labelCount++;
         }
-        if (hasAriaLabelledBy) {
+        if (hasAttr(node, 'aria-labelledby')) {
           labelCount++;
         }
 
@@ -173,10 +171,10 @@ module.exports = {
           return;
         }
 
-        // id alone is treated as a potential <label for> reference that static
-        // analysis cannot verify (see vuejs-accessibility form-control-has-label
-        // for the same rationale). Skip only when no other label is present to
-        // avoid a false positive when id is combined with aria-label/labelledby.
+        // An `id` may pair with a sibling `<label for>` we can't see in this
+        // template. Treat id-only as valid to avoid false positives, but don't
+        // count it toward labelCount — otherwise id + aria-label is wrongly
+        // flagged as multiple labels.
         if (labelCount === 0 && hasAttr(node, 'id')) {
           return;
         }
diff --git a/tests/lib/rules/template-require-input-label.js b/tests/lib/rules/template-require-input-label.js
index 1b9d619ae7..d9ed927676 100644
--- a/tests/lib/rules/template-require-input-label.js
+++ b/tests/lib/rules/template-require-input-label.js
@@ -21,8 +21,10 @@ ruleTester.run('template-require-input-label', rule, {
     '<template><input aria-labelledby="someIdValue" /></template>',
     // https://github.com/ember-template-lint/ember-template-lint/issues/3388
     // id alone does not establish a labeling relationship — a <label for> is
-    // needed and cannot be verified statically. Only aria-label should count.
+    // needed and cannot be verified statically. Only aria-label/labelledby
+    // should count.
     '<template><input id="hello" aria-label="hello" /></template>',
+    '<template><input id="hello" aria-labelledby="someIdValue" /></template>',
     '<template><div></div></template>',
     '<template><Input id="foo" /></template>',
     '<template>{{input id="foo"}}</template>',
@@ -105,6 +107,13 @@ ruleTester.run('template-require-input-label', rule, {
       output: null,
       errors: [{ message: MULTIPLE_LABELS }],
     },
+    {
+      // id is irrelevant for labelling here — wrapping <label> + aria-label is
+      // still multiple labels.
+      code: '<template><label>Input label<input id="foo" aria-label="Custom label"></label></template>',
+      output: null,
+      errors: [{ message: MULTIPLE_LABELS }],
+    },
     {
       code: '<template>{{input type="button"}}</template>',
       output: null,
@@ -172,6 +181,9 @@ hbsRuleTester.run('template-require-input-label', rule, {
     '<input id="probablyHasLabel" />',
     '<input aria-label={{labelText}} />',
     '<input aria-labelledby="someIdValue" />',
+    // https://github.com/ember-template-lint/ember-template-lint/issues/3388
+    '<input id="hello" aria-label="hello" />',
+    '<input id="hello" aria-labelledby="someIdValue" />',
     '<div></div>',
     '<Input id="foo" />',
     '{{input id="foo"}}',
@@ -264,6 +276,11 @@ hbsRuleTester.run('template-require-input-label', rule, {
       output: null,
       errors: [{ message: MULTIPLE_LABELS }],
     },
+    {
+      code: '<label>Input label<input id="foo" aria-label="Custom label"></label>',
+      output: null,
+      errors: [{ message: MULTIPLE_LABELS }],
+    },
     {
       code: '{{input type="button"}}',
       output: null,