Merge branch 'main' into codex/edit-error-string-in-eslint-utils.ts

JamesHenry · web-flow · commit 01ed2086b6cb · 2025-05-24T17:40:18.000+04:00
diff --git a/AGENTS.md b/AGENTS.md
@@ -4,14 +4,14 @@ This repository uses Nx as the task runner. Nx Cloud requires internet access, w
 
 ## Required checks
 
-When modifying rule implementations or documentation, run the following commands and ensure they pass:
+When modifying rule implementations or documentation, run the following commands and ensure they pass (noting the comments that explain what to do if any of these checks fail):
 
 ```bash
-pnpm format-check
-NX_NO_CLOUD=true pnpm nx sync:check
-NX_NO_CLOUD=true pnpm nx run-many -t check-rule-docs
-NX_NO_CLOUD=true pnpm nx run-many -t check-rule-lists
-NX_NO_CLOUD=true pnpm nx run-many -t check-rule-configs
+pnpm format-check # run pnpm nx format and commit the result if this check fails
+pnpm nx sync:check # run pnpm nx sync and commit the result if this check fails
+NX_NO_CLOUD=true pnpm nx run-many -t check-rule-docs # run NX_NO_CLOUD=true pnpm nx run-many -t update-rule-docs and commit the result if this check fails
+NX_NO_CLOUD=true pnpm nx run-many -t check-rule-lists # run NX_NO_CLOUD=true pnpm nx run-many -t update-rule-lists and commit the result if this check fails
+NX_NO_CLOUD=true pnpm nx run-many -t check-rule-configs # run NX_NO_CLOUD=true pnpm nx run-many -t update-rule-configs and commit the result if this check fails
 ```
 
 Additionally, run tests and lints for any affected project. For example, changes to `eslint-plugin-template` require:
@@ -21,9 +21,13 @@ NX_NO_CLOUD=true pnpm nx test eslint-plugin-template
 NX_NO_CLOUD=true pnpm nx lint eslint-plugin-template
 ```
 
+If there are memory issues with jest tests, try passing `--runInBand` to the test command.
+
 ## Commit conventions
 
 Use [Conventional Commits](https://www.conventionalcommits.org/) for commit messages and PR titles.
 
 - When a change affects a single project, include its name as the scope: `feat(eslint-plugin-template): add new rule`.
 - When multiple projects are affected, omit the scope: `fix: correct lint configuration`.
+
+By convention, if only updating a single rule within a single project, for example the `alt-text` rule within the `eslint-plugin-template` project, the commit message should be `fix(eslint-plugin-template): [alt-text] description of the change`.
diff --git a/packages/eslint-plugin-template/docs/rules/alt-text.md b/packages/eslint-plugin-template/docs/rules/alt-text.md
@@ -408,6 +408,32 @@ The rule does not have any configuration options.
 
 #### ✅ Valid Code
 
+```html
+<object aria-label="foo" id="bar"></object>
+```
+
+<br>
+
+---
+
+<br>
+
+#### Default Config
+
+```json
+{
+  "rules": {
+    "@angular-eslint/template/alt-text": [
+      "error"
+    ]
+  }
+}
+```
+
+<br>
+
+#### ✅ Valid Code
+
 ```html
 <area aria-label="foo" />
 ```
@@ -486,6 +512,32 @@ The rule does not have any configuration options.
 
 #### ✅ Valid Code
 
+```html
+<area alt="desc" href="path">
+```
+
+<br>
+
+---
+
+<br>
+
+#### Default Config
+
+```json
+{
+  "rules": {
+    "@angular-eslint/template/alt-text": [
+      "error"
+    ]
+  }
+}
+```
+
+<br>
+
+#### ✅ Valid Code
+
 ```html
 <input type="text">
 ```
@@ -568,6 +620,110 @@ The rule does not have any configuration options.
 <input type="image" aria-labelledby="id1">
 ```
 
+<br>
+
+---
+
+<br>
+
+#### Default Config
+
+```json
+{
+  "rules": {
+    "@angular-eslint/template/alt-text": [
+      "error"
+    ]
+  }
+}
+```
+
+<br>
+
+#### ✅ Valid Code
+
+```html
+<object [title]="title" [other]="val"></object>
+```
+
+<br>
+
+---
+
+<br>
+
+#### Default Config
+
+```json
+{
+  "rules": {
+    "@angular-eslint/template/alt-text": [
+      "error"
+    ]
+  }
+}
+```
+
+<br>
+
+#### ✅ Valid Code
+
+```html
+<object [attr.aria-label]="desc" [custom]="x"></object>
+```
+
+<br>
+
+---
+
+<br>
+
+#### Default Config
+
+```json
+{
+  "rules": {
+    "@angular-eslint/template/alt-text": [
+      "error"
+    ]
+  }
+}
+```
+
+<br>
+
+#### ✅ Valid Code
+
+```html
+<area [alt]="altText" [id]="itemId">
+```
+
+<br>
+
+---
+
+<br>
+
+#### Default Config
+
+```json
+{
+  "rules": {
+    "@angular-eslint/template/alt-text": [
+      "error"
+    ]
+  }
+}
+```
+
+<br>
+
+#### ✅ Valid Code
+
+```html
+<area [attr.aria-label]="label" [prop]="p">
+```
+
 </details>
 
 <br>
diff --git a/packages/eslint-plugin-template/src/rules/alt-text.ts b/packages/eslint-plugin-template/src/rules/alt-text.ts
@@ -81,8 +81,9 @@ function isValidObjectNode(node: TmplAstElement): boolean {
     hasAriaLabelAttribute = false;
 
   for (const attribute of node.attributes) {
-    hasTitleAttribute = attribute.name === 'title';
-    hasAriaLabelAttribute = isAriaLabel(attribute.name);
+    hasTitleAttribute = hasTitleAttribute || attribute.name === 'title';
+    hasAriaLabelAttribute =
+      hasAriaLabelAttribute || isAriaLabel(attribute.name);
   }
 
   // Note that we return "early" before looping through `element.inputs`.
@@ -96,8 +97,8 @@ function isValidObjectNode(node: TmplAstElement): boolean {
     hasAriaLabelBinding = false;
 
   for (const input of node.inputs) {
-    hasTitleBinding = input.name === 'title';
-    hasAriaLabelBinding = isAriaLabel(input.name);
+    hasTitleBinding = hasTitleBinding || input.name === 'title';
+    hasAriaLabelBinding = hasAriaLabelBinding || isAriaLabel(input.name);
   }
 
   if (hasTitleBinding || hasAriaLabelBinding) {
@@ -119,8 +120,9 @@ function isValidAreaNode(node: TmplAstElement): boolean {
     hasAriaLabelAttribute = false;
 
   for (const attribute of node.attributes) {
-    hasAltAttribute = isAlt(attribute.name);
-    hasAriaLabelAttribute = isAriaLabel(attribute.name);
+    hasAltAttribute = hasAltAttribute || isAlt(attribute.name);
+    hasAriaLabelAttribute =
+      hasAriaLabelAttribute || isAriaLabel(attribute.name);
   }
 
   // Note that we return "early" before looping through `element.inputs`.
@@ -134,8 +136,8 @@ function isValidAreaNode(node: TmplAstElement): boolean {
     hasAriaLabelBinding = false;
 
   for (const input of node.inputs) {
-    hasAltBinding = isAlt(input.name);
-    hasAriaLabelBinding = isAriaLabel(input.name);
+    hasAltBinding = hasAltBinding || isAlt(input.name);
+    hasAriaLabelBinding = hasAriaLabelBinding || isAriaLabel(input.name);
   }
 
   return hasAltBinding || hasAriaLabelBinding;
diff --git a/packages/eslint-plugin-template/tests/rules/alt-text/cases.ts b/packages/eslint-plugin-template/tests/rules/alt-text/cases.ts
@@ -16,13 +16,19 @@ export const valid: readonly (string | ValidTestCase<Options>)[] = [
   '<object aria-labelledby="id1">',
   '<object>Meaningful description</object>',
   '<object title="An object">',
+  '<object aria-label="foo" id="bar"></object>',
   '<area aria-label="foo" />',
   '<area aria-labelledby="id1" />',
   '<area alt="This is descriptive!" />',
+  '<area alt="desc" href="path">',
   '<input type="text">',
   '<input type="image" alt="This is descriptive!">',
   '<input type="image" aria-label="foo">',
   '<input type="image" aria-labelledby="id1">',
+  '<object [title]="title" [other]="val"></object>',
+  '<object [attr.aria-label]="desc" [custom]="x"></object>',
+  '<area [alt]="altText" [id]="itemId">',
+  '<area [attr.aria-label]="label" [prop]="p">',
 ];
 
 export const invalid: readonly InvalidTestCase<MessageIds, Options>[] = [
