@angular-eslint/eslint-plugin-template 21.1.1-alpha.10 → 21.1.1-alpha.11

package/dist/rules/button-has-type.js

@@ -100,6 +100,7 @@ function getInvalidButtonTypeIfPresent(element) {
         if (name === TYPE_ATTRIBUTE_NAME &&
             value instanceof bundled_angular_compiler_1.ASTWithSource &&
             value.ast instanceof bundled_angular_compiler_1.LiteralPrimitive &&
+            typeof value.ast.value === 'string' &&
             !VALID_BUTTON_TYPES.includes(value.ast.value)) {
             return {
                 value: value.ast.value,

package/dist/rules/no-empty-control-flow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-empty-control-flow.d.ts","sourceRoot":"","sources":["../../src/rules/no-empty-control-flow.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAC9C,eAAO,MAAM,SAAS,0BAA0B,CAAC;;AAEjD,wBA0EG;AAEH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}
+{"version":3,"file":"no-empty-control-flow.d.ts","sourceRoot":"","sources":["../../src/rules/no-empty-control-flow.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAC9C,eAAO,MAAM,SAAS,0BAA0B,CAAC;;AAEjD,wBA4FG;AAEH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}

package/dist/rules/no-empty-control-flow.js

@@ -20,7 +20,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     create(context) {
         const parserServices = (0, utils_1.getTemplateParserServices)(context);
         return {
-            'ForLoopBlockEmpty,IfBlockBranch,SwitchBlockCase'(node) {
+            'ForLoopBlockEmpty,IfBlockBranch'(node) {
                 if (node.children.length === 0 ||
                     isEmpty(node.startSourceSpan.end, node.endSourceSpan?.start)) {
                     report(node);
@@ -42,8 +42,19 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                 // A switch block is pointless without cases, so
                 // if there are no cases, don't bother checking
                 // if there's non-whitespace characters within it.
-                if (node.cases.length === 0) {
+                if (node.groups.length === 0) {
                     report(node);
+                    return;
+                }
+                // Check each group for empty content
+                for (const group of node.groups) {
+                    if (group.children.length === 0 ||
+                        isEmpty(group.startSourceSpan.end, group.endSourceSpan?.start)) {
+                        // Report on the first case in the group
+                        if (group.cases.length > 0) {
+                            reportCase(group.cases[0]);
+                        }
+                    }
                 }
             },
         };
@@ -59,6 +70,12 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                 loc: parserServices.convertNodeSourceSpanToLoc(node.nameSpan),
             });
         }
+        function reportCase(node) {
+            context.report({
+                messageId: 'noEmptyControlFlow',
+                loc: parserServices.convertNodeSourceSpanToLoc(node.nameSpan),
+            });
+        }
     },
 });
 exports.RULE_DOCS_EXTENSION = {

package/dist/rules/prefer-class-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-class-binding.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-class-binding.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAC9C,eAAO,MAAM,SAAS,yBAAyB,CAAC;;AAEhD,wBAmCG;AAoDH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}
+{"version":3,"file":"prefer-class-binding.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-class-binding.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAC9C,eAAO,MAAM,SAAS,yBAAyB,CAAC;;AAEhD,wBAmCG;AAwDH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}

package/dist/rules/prefer-class-binding.js

@@ -61,6 +61,10 @@ function requiresNgClass(node) {
     const parsedAst = getParser().parseBinding(node.value.source, node.valueSpan, 0).ast;
     if (parsedAst instanceof bundled_angular_compiler_1.LiteralMap) {
         for (const astKey of parsedAst.keys) {
+            // Skip spread keys as they don't have a key property
+            if (astKey.kind === 'spread') {
+                continue;
+            }
             const className = astKey.key;
             if (typeof className === 'string' &&
                 hasSpaceSeparatedClasses(className)) {

package/dist/utils/are-equivalent-asts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"are-equivalent-asts.d.ts","sourceRoot":"","sources":["../../src/utils/are-equivalent-asts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAqBJ,MAAM,0CAA0C,CAAC;AAElD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CA4IzD"}
+{"version":3,"file":"are-equivalent-asts.d.ts","sourceRoot":"","sources":["../../src/utils/are-equivalent-asts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAsBJ,MAAM,0CAA0C,CAAC;AAElD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CA2JzD"}

package/dist/utils/are-equivalent-asts.js

@@ -4,11 +4,10 @@ exports.areEquivalentASTs = areEquivalentASTs;
 const bundled_angular_compiler_1 = require("@angular-eslint/bundled-angular-compiler");
 function areEquivalentASTs(a, b) {
     // An `ImplicitReceiver` is equivalent to a `ThisReceiver` because
-    // `this.foo` and `foo` mean the same thing. A `ThisReceiver` extends
-    // `ImplicitReceiver` so before we check if the two ASTs are the same
-    // type, we can check if they are both some sort of `ImplicitReceiver`.
-    if (a instanceof bundled_angular_compiler_1.ImplicitReceiver) {
-        return b instanceof bundled_angular_compiler_1.ImplicitReceiver;
+    // `this.foo` and `foo` mean the same thing. In Angular v21.1.0+,
+    // `ThisReceiver` is a separate class, so we check for both types.
+    if (a instanceof bundled_angular_compiler_1.ImplicitReceiver || a instanceof bundled_angular_compiler_1.ThisReceiver) {
+        return b instanceof bundled_angular_compiler_1.ImplicitReceiver || b instanceof bundled_angular_compiler_1.ThisReceiver;
     }
     // Bail out if the two ASTs are not the same type.
     if (a.constructor !== b.constructor) {
@@ -73,7 +72,21 @@ function areEquivalentASTs(a, b) {
             // the `quoted` property because a quoted key with the same value as
             // an unquoted key is the same key. Likewise, the `isShorthandInitialized`
             // property doesn't affect the name of the key.
-            a.keys.every((aKey, index) => aKey.key === b.keys[index].key) &&
+            a.keys.every((aKey, index) => {
+                const bKey = b.keys[index];
+                // Handle spread keys - they match if both are spread keys
+                if (aKey.kind === 'spread' && bKey.kind === 'spread') {
+                    return true;
+                }
+                // If one is spread and the other isn't, they don't match
+                if (aKey.kind !== bKey.kind) {
+                    return false;
+                }
+                // Both are property keys, compare the key values
+                return (aKey.kind === 'property' &&
+                    bKey.kind === 'property' &&
+                    aKey.key === bKey.key);
+            }) &&
             areEquivalentASTArrays(a.values, b.values));
     }
     // Pipes and interpolations are next.

package/dist/utils/get-attribute-value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-attribute-value.d.ts","sourceRoot":"","sources":["../../src/utils/get-attribute-value.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAU/E;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,cAAc,EACtC,aAAa,EAAE,MAAM,GACpB,OAAO,CA6BT"}
+{"version":3,"file":"get-attribute-value.d.ts","sourceRoot":"","sources":["../../src/utils/get-attribute-value.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAU/E;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,cAAc,EACtC,aAAa,EAAE,MAAM,GACpB,OAAO,CAiCT"}

package/dist/utils/get-attribute-value.js

@@ -28,6 +28,10 @@ function getAttributeValue({ attributes, inputs }, attributeName) {
     if (attributeOrInput.value.ast instanceof bundled_angular_compiler_1.LiteralMap) {
         const { keys, values } = attributeOrInput.value.ast;
         return keys.reduce((current, next, index) => {
+            // Skip spread keys as they don't have a key property
+            if (next.kind === 'spread') {
+                return current;
+            }
             return current.set(next.key, values[index]);
         }, new Map());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "21.1.1-alpha.10",
+  "version": "21.1.1-alpha.11",
   "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.1.1-alpha.10",
-    "@angular-eslint/utils": "21.1.1-alpha.10"
+    "@angular-eslint/bundled-angular-compiler": "21.1.1-alpha.11",
+    "@angular-eslint/utils": "21.1.1-alpha.11"
   },
   "devDependencies": {
     "@types/aria-query": "5.0.4",
-    "@angular-eslint/test-utils": "21.1.1-alpha.10"
+    "@angular-eslint/test-utils": "21.1.1-alpha.11"
   },
   "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.1.1-alpha.10"
+    "@angular-eslint/template-parser": "21.1.1-alpha.11"
   },
   "gitHead": "e2006e5e9c99e5a943d1a999e0efa5247d29ec24"
 }