@angular-eslint/eslint-plugin-template 21.0.1-alpha.2 → 21.0.1

package/dist/rules/prefer-contextual-for-variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-contextual-for-variables.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-contextual-for-variables.ts"],"names":[],"mappings":"AAoBA,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,QAAQ,CAAC,cAAc,CAAC,EAAE;YACxB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC3B,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC1B,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;SAC1B,CAAC;KACH;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,0BAA0B,GAC1B,aAAa,GACb,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,WAAW,CAAC;AAChB,eAAO,MAAM,SAAS,oCAAoC,CAAC;;AAc3D,wBAkaG;AAyOH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}
+{"version":3,"file":"prefer-contextual-for-variables.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-contextual-for-variables.ts"],"names":[],"mappings":"AAoBA,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,QAAQ,CAAC,cAAc,CAAC,EAAE;YACxB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC3B,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC1B,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;SAC1B,CAAC;KACH;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,0BAA0B,GAC1B,aAAa,GACb,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,WAAW,CAAC;AAChB,eAAO,MAAM,SAAS,oCAAoC,CAAC;;AAc3D,wBAkaG;AAmRH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}

package/dist/rules/prefer-contextual-for-variables.js

@@ -406,17 +406,21 @@ function getAllowedAliases(allowedAliases, variableName) {
 function getVariableRangeToRemove(problem, sourceCode, variableCount) {
     let start = problem.variable.sourceSpan.start.offset;
     let end = problem.variable.sourceSpan.end.offset;
-    if (variableCount === 1) {
-        // There's only one variable defined, so we
-        // want to remove the `let` keyword as well.
-        const letIndex = getStartOfPreviousToken('let', start, sourceCode);
+    // Check if this variable has its own `let` keyword (semicolon-separated)
+    // vs being part of a comma-separated list after a single `let`.
+    const letIndex = getStartOfPreviousToken('let', start, sourceCode);
+    const hasOwnLet = letIndex !== undefined &&
+        hasOwnLetKeyword(letIndex, start, end, sourceCode);
+    if (variableCount === 1 || hasOwnLet) {
+        // Either there's only one variable, or this variable has its own
+        // `let` keyword (semicolon-separated), so remove the `let` as well.
         if (letIndex !== undefined) {
             // We also want to remove the preceding semicolon.
             start = getStartOfPreviousToken(';', letIndex, sourceCode) ?? letIndex;
         }
     }
     else if (problem.index === 0) {
-        // There are multiple variables, but we're removing
+        // There are multiple comma-separated variables, and we're removing
         // the first one. We need to keep the `let` keyword, but
         // remove the trailing comma and any whitespace after it.
         const commaIndex = getStartOfNextToken(',', end, sourceCode);
@@ -427,12 +431,40 @@ function getVariableRangeToRemove(problem, sourceCode, variableCount) {
         }
     }
     else {
-        // There is a variable before this one, so we
+        // There is a comma-separated variable before this one, so we
         // need to remove the preceding comma as well.
         start = getStartOfPreviousToken(',', start, sourceCode) ?? start;
     }
     return [start, end];
 }
+/**
+ * Checks if the `let` keyword at `letIndex` belongs solely to this variable
+ * (i.e., this is a semicolon-separated declaration where this variable
+ * has its own `let` keyword that isn't shared with other variables).
+ *
+ * A variable has its own `let` if:
+ * 1. It's the first variable after the `let` (no comma before it), AND
+ * 2. There are no comma-separated variables after it (next char after
+ *    the variable is `;` or `)`, not `,`)
+ */
+function hasOwnLetKeyword(letIndex, variableStart, variableEnd, sourceCode) {
+    const text = sourceCode.text;
+    // Check if there's a comma between `let` and the variable start.
+    // If there is, this variable is not the first after `let`.
+    const betweenLetAndVar = text.slice(letIndex + 3, variableStart);
+    if (betweenLetAndVar.includes(',')) {
+        return false;
+    }
+    // This variable is the first after `let`. Now check if there are more
+    // comma-separated variables after it. If so, this `let` is shared.
+    // Find the next non-whitespace character after the variable.
+    let nextIndex = variableEnd;
+    while (nextIndex < text.length && /\s/.test(text[nextIndex])) {
+        nextIndex++;
+    }
+    // If the next character is a comma, there are more variables sharing this `let`.
+    return text[nextIndex] !== ',';
+}
 function getStartOfPreviousToken(tokenToFind, startIndex, sourceCode) {
     const text = sourceCode.text;
     for (let i = startIndex - tokenToFind.length; i >= 0; i--) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "21.0.1-alpha.2",
+  "version": "21.0.1",
   "description": "ESLint plugin for Angular Templates",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,19 +20,19 @@
   "dependencies": {
     "aria-query": "5.3.2",
     "axobject-query": "4.1.0",
-    "@angular-eslint/bundled-angular-compiler": "21.0.1-alpha.2",
-    "@angular-eslint/utils": "21.0.1-alpha.2"
+    "@angular-eslint/bundled-angular-compiler": "21.0.1",
+    "@angular-eslint/utils": "21.0.1"
   },
   "devDependencies": {
     "@types/aria-query": "5.0.4",
-    "@angular-eslint/test-utils": "21.0.1-alpha.2"
+    "@angular-eslint/test-utils": "21.0.1"
   },
   "peerDependencies": {
     "@typescript-eslint/types": "^7.11.0 || ^8.0.0",
     "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
     "eslint": "^8.57.0 || ^9.0.0",
     "typescript": "*",
-    "@angular-eslint/template-parser": "21.0.1-alpha.2"
+    "@angular-eslint/template-parser": "21.0.1"
   },
   "gitHead": "e2006e5e9c99e5a943d1a999e0efa5247d29ec24"
 }