test(require-input-label): cover id + aria-labelledby and wrapped-label cases

- 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.

Author: johanrd

lib/rules/template-require-input-label.js

@@ -160,23 +160,21 @@ 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++;
         }
 
         if (labelCount === 1) {
           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;
         }

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,