@angular-eslint/eslint-plugin-template 21.3.2-alpha.1 → 21.4.0

package/dist/rules/cyclomatic-complexity.d.ts

@@ -1,6 +1,9 @@
-export type Options = [{
-    maxComplexity: number;
-}];
+export type Options = [
+    {
+        maxComplexity?: number;
+        variant?: 'classic' | 'modified';
+    }
+];
 export type MessageIds = 'cyclomaticComplexity';
 export declare const RULE_NAME = "cyclomatic-complexity";
 declare const _default: import("@typescript-eslint/utils/ts-eslint").RuleModule<"cyclomaticComplexity", Options, import("../utils/create-eslint-rule").RuleDocs, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {

package/dist/rules/cyclomatic-complexity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cyclomatic-complexity.d.ts","sourceRoot":"","sources":["../../src/rules/cyclomatic-complexity.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,OAAO,GAAG,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAChD,eAAO,MAAM,SAAS,0BAA0B,CAAC;;;;AAIjD,wBAiEG;AAEH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}
+{"version":3,"file":"cyclomatic-complexity.d.ts","sourceRoot":"","sources":["../../src/rules/cyclomatic-complexity.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,OAAO,GAAG;IACpB;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAA;KAAE;CAC7D,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAChD,eAAO,MAAM,SAAS,0BAA0B,CAAC;;;;AAOjD,wBA8GG;AAEH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}

package/dist/rules/cyclomatic-complexity.js

@@ -5,7 +5,10 @@ const bundled_angular_compiler_1 = require("@angular-eslint/bundled-angular-comp
 const utils_1 = require("@angular-eslint/utils");
 const create_eslint_rule_1 = require("../utils/create-eslint-rule");
 exports.RULE_NAME = 'cyclomatic-complexity';
-const DEFAULT_MAX_COMPLEXITY = 5;
+const DEFAULT_OPTIONS = {
+    maxComplexity: 5,
+    variant: 'classic',
+};
 exports.default = (0, create_eslint_rule_1.createESLintRule)({
     name: exports.RULE_NAME,
     meta: {
@@ -21,6 +24,10 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                         type: 'number',
                         minimum: 1,
                     },
+                    variant: {
+                        type: 'string',
+                        enum: ['classic', 'modified'],
+                    },
                 },
                 additionalProperties: false,
             },
@@ -29,8 +36,13 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             cyclomaticComplexity: 'The cyclomatic complexity {{totalComplexity}} exceeds the defined limit {{maxComplexity}}',
         },
     },
-    defaultOptions: [{ maxComplexity: DEFAULT_MAX_COMPLEXITY }],
-    create(context, [{ maxComplexity }]) {
+    defaultOptions: [
+        {
+            maxComplexity: DEFAULT_OPTIONS.maxComplexity,
+            variant: DEFAULT_OPTIONS.variant,
+        },
+    ],
+    create(context, [{ maxComplexity = DEFAULT_OPTIONS.maxComplexity, variant = DEFAULT_OPTIONS.variant, },]) {
         let totalComplexity = 0;
         const parserServices = (0, utils_1.getTemplateParserServices)(context);
         function increment(node) {
@@ -44,19 +56,37 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                 data: { maxComplexity, totalComplexity },
             });
         }
+        const isModified = variant === 'modified';
+        // Checks *ngIf, *ngFor, and *ngSwitchCase ('classic' variant) or *ngSwitch ('modified' variant)
+        function isLegacyStructuralDirective(node) {
+            const legacyStructuralDirectiveRegex = isModified
+                ? /^(ngForOf|ngIf|ngSwitch)$/
+                : /^(ngForOf|ngIf|ngSwitchCase)$/;
+            return (node instanceof bundled_angular_compiler_1.TmplAstBoundAttribute &&
+                legacyStructuralDirectiveRegex.test(node.name));
+        }
+        // Checks *ngSwitchDefault ('classic' variant)
+        function isLegacySwitchDefault(node) {
+            return (!isModified &&
+                node instanceof bundled_angular_compiler_1.TmplAstTextAttribute &&
+                node.name === 'ngSwitchDefault');
+        }
+        // Checks @if and @for
+        function isControlFlowBlock(node) {
+            return (node instanceof bundled_angular_compiler_1.TmplAstIfBlock || node instanceof bundled_angular_compiler_1.TmplAstForLoopBlock);
+        }
+        // Checks @switch ('modified' variant) or @switchCase ('classic' variant)
+        function isSwitchComplexity(node) {
+            return isModified
+                ? node instanceof bundled_angular_compiler_1.TmplAstSwitchBlock
+                : node instanceof bundled_angular_compiler_1.TmplAstSwitchBlockCase;
+        }
         return {
             '*': (node) => {
-                if (node instanceof bundled_angular_compiler_1.TmplAstBoundAttribute &&
-                    /^(ngForOf|ngIf|ngSwitchCase)$/.test(node.name)) {
-                    increment(node);
-                }
-                else if (node instanceof bundled_angular_compiler_1.TmplAstTextAttribute &&
-                    node.name === 'ngSwitchDefault') {
-                    increment(node);
-                }
-                else if (node instanceof bundled_angular_compiler_1.TmplAstIfBlock ||
-                    node instanceof bundled_angular_compiler_1.TmplAstForLoopBlock ||
-                    node instanceof bundled_angular_compiler_1.TmplAstSwitchBlockCase) {
+                if (isLegacyStructuralDirective(node) ||
+                    isLegacySwitchDefault(node) ||
+                    isControlFlowBlock(node) ||
+                    isSwitchComplexity(node)) {
                     increment(node);
                 }
             },

package/dist/rules/eqeqeq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eqeqeq.d.ts","sourceRoot":"","sources":["../../src/rules/eqeqeq.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQzD,MAAM,MAAM,OAAO,GAAG,CAAC;IAAE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AACpE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,uBAAuB,CAAC;AAC5D,eAAO,MAAM,SAAS,WAAW,CAAC;;;;AAGlC,wBA4EG;AA6EH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}
+{"version":3,"file":"eqeqeq.d.ts","sourceRoot":"","sources":["../../src/rules/eqeqeq.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQzD,MAAM,MAAM,OAAO,GAAG,CAAC;IAAE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AACpE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,uBAAuB,CAAC;AAC5D,eAAO,MAAM,SAAS,WAAW,CAAC;;;;AAGlC,wBA4EG;AA8EH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}

package/dist/rules/eqeqeq.js

@@ -78,9 +78,10 @@ function getSpanLength({ span: { start, end } }) {
     return end - start;
 }
 const getFix = ({ node, right, end, sourceCode, fixer, }) => {
-    const { source, ast } = (0, get_nearest_node_from_1.getNearestNodeFrom)(node, isASTWithSource);
-    if (!source)
+    const result = (0, get_nearest_node_from_1.getNearestNodeFrom)(node, isASTWithSource);
+    if (!result?.source)
         return null;
+    const { source, ast } = result;
     let startOffset = 0;
     while (!isInterpolation(ast) && isLeadingTriviaChar(source[startOffset])) {
         startOffset++;

package/dist/rules/prefer-template-literal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-template-literal.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-template-literal.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,SAAS,0BAA0B,CAAC;AAE1C,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC;AAC1C,eAAO,MAAM,SAAS,4BAA4B,CAAC;;;;AA8FnD,wBA+IG;AAEH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}
+{"version":3,"file":"prefer-template-literal.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-template-literal.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,SAAS,0BAA0B,CAAC;AAE1C,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC;AAC1C,eAAO,MAAM,SAAS,4BAA4B,CAAC;;;;AA8FnD,wBAiKG;AAEH,eAAO,MAAM,mBAAmB;;CAG/B,CAAC"}

package/dist/rules/prefer-template-literal.js

@@ -90,6 +90,21 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     },
     defaultOptions: [],
     create(context) {
+        // When the template is defined inline in a component, the template will
+        // usually be defined as a template string, which means if template
+        // literals were to be used within the template, the backticks would
+        // need to be escaped. Escaping them causes errors when we parse the
+        // template. What this ultimately means is that template literals cannot
+        // be used in inline templates, so we'll just skip this entire template
+        // if it looks like it is an inline template.
+        //
+        // See https://github.com/angular-eslint/angular-eslint/issues/2906
+        //
+        // This pattern needs to match what is used in
+        // `packages/eslint-plugin-template/src/processors.ts`.
+        if (/inline-template-[^/\\]+-\d+\.component\.html$/.test(context.filename)) {
+            return {};
+        }
         (0, utils_1.ensureTemplateParser)(context);
         const { sourceCode } = context;
         return {
@@ -185,5 +200,5 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     },
 });
 exports.RULE_DOCS_EXTENSION = {
-    rationale: 'Template literals (backticks with ${} syntax) are more modern, readable, and maintainable than string concatenation with the + operator. String concatenation like "Hello " + name + "!" is harder to read and error-prone (easy to forget spaces or quotes) compared to the template literal `Hello ${name}!`. Template literals make string composition clearer, especially with multiple expressions. This is a widely accepted JavaScript/TypeScript best practice that should be followed in Angular templates for consistency. Angular templates have supported template literal syntax since v19.2. Using template literals throughout your codebase creates a consistent style and makes complex string building much more readable.',
+    rationale: 'Template literals (backticks with ${} syntax) are more modern, readable, and maintainable than string concatenation with the + operator. String concatenation like "Hello " + name + "!" is harder to read and error-prone (easy to forget spaces or quotes) compared to the template literal `Hello ${name}!`. Template literals make string composition clearer, especially with multiple expressions. This is a widely accepted JavaScript/TypeScript best practice that should be followed in Angular templates for consistency. Angular templates have supported template literal syntax since v19.2. Using template literals throughout your codebase creates a consistent style and makes complex string building much more readable.\n\nℹ This rule is not checked in inline templates due to the common use of backticks to define the inline template.',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "21.3.2-alpha.1",
+  "version": "21.4.0",
   "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/utils": "21.3.2-alpha.1",
-    "@angular-eslint/bundled-angular-compiler": "21.3.2-alpha.1"
+    "@angular-eslint/bundled-angular-compiler": "21.4.0",
+    "@angular-eslint/utils": "21.4.0"
   },
   "devDependencies": {
     "@types/aria-query": "5.0.4",
-    "@angular-eslint/test-utils": "21.3.2-alpha.1"
+    "@angular-eslint/test-utils": "21.4.0"
   },
   "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 || ^10.0.0",
     "typescript": "*",
-    "@angular-eslint/template-parser": "21.3.2-alpha.1"
+    "@angular-eslint/template-parser": "21.4.0"
   },
   "gitHead": "e2006e5e9c99e5a943d1a999e0efa5247d29ec24"
 }