@angular-eslint/eslint-plugin-template 19.1.1-alpha.0 → 19.1.1-alpha.1

package/dist/processors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processors.d.ts","sourceRoot":"","sources":["../src/processors.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CA2BT;AAED,KAAK,gBAAgB,GAAG,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,CAAC;AAExE,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,gBAAgB,CAqJlB;AAED,wBAAgB,wBAAwB,CACtC,wBAAwB,EAAE;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE;QACJ,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,EAAE,EAAE,EACL,QAAQ,EAAE,MAAM,GACf,SAAS,OAAO,EAAE,CAmDpB;;;;;;;;;;;AAED,wBASE"}
+{"version":3,"file":"processors.d.ts","sourceRoot":"","sources":["../src/processors.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CA2BT;AAED,KAAK,gBAAgB,GAAG,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,CAAC;AAExE,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,gBAAgB,CAmJlB;AAyDD,wBAAgB,wBAAwB,CACtC,wBAAwB,EAAE;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE;QACJ,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,EAAE,EAAE,EACL,QAAQ,EAAE,MAAM,GACf,SAAS,OAAO,EAAE,CAmDpB;;;;;;;;;;;AAED,wBASE"}

package/dist/processors.js

@@ -50,7 +50,7 @@ function preprocessComponentFile(text, filename) {
     try {
         const sourceFile = typescript_1.default.createSourceFile(filename, text, typescript_1.default.ScriptTarget.Latest, 
         /* setParentNodes */ true);
-        const classDeclarations = sourceFile.statements.filter((s) => typescript_1.default.isClassDeclaration(s));
+        const classDeclarations = getClassDeclarationFromSourceFile(sourceFile);
         if (!classDeclarations || !classDeclarations.length) {
             return noopResult;
         }
@@ -153,6 +153,46 @@ function preprocessComponentFile(text, filename) {
         return noopResult;
     }
 }
+function getClassDeclarationFromSourceFile(sourceFile) {
+    const classDeclarations = [];
+    visit(sourceFile);
+    return classDeclarations;
+    function visit(node) {
+        if (typescript_1.default.isClassDeclaration(node)) {
+            classDeclarations.push(node);
+            return;
+        }
+        // Class declarations are usually at the top-level, but there are
+        // some situations where they might be nested, such as in test files.
+        // If the node could have a class declaration somewhere in its
+        // descendant nodes, then we will recurse down into each child node.
+        // Keywords, tokens and trivia all come before `FirstNode`. They won't
+        // contain child nodes anyway, but we can skip them to save some time.
+        // Likewise, we can skip nodes that are part of JSDoc comments.
+        if (node.kind < typescript_1.default.SyntaxKind.FirstNode ||
+            node.kind > typescript_1.default.SyntaxKind.FirstJSDocNode) {
+            return;
+        }
+        // Type nodes can be skipped.
+        if (node.kind >= typescript_1.default.SyntaxKind.TypePredicate &&
+            node.kind <= typescript_1.default.SyntaxKind.ImportType) {
+            return;
+        }
+        // Some specific kinds of nodes can be skipped because
+        // we know that they cannot contain class declarations.
+        switch (node.kind) {
+            case typescript_1.default.SyntaxKind.InterfaceDeclaration:
+            case typescript_1.default.SyntaxKind.EnumDeclaration:
+            case typescript_1.default.SyntaxKind.ImportEqualsDeclaration:
+            case typescript_1.default.SyntaxKind.ImportDeclaration:
+            case typescript_1.default.SyntaxKind.ImportClause:
+                return;
+        }
+        // For everything else, we'll play it safe
+        // and recurse down into the child nodes.
+        typescript_1.default.forEachChild(node, visit);
+    }
+}
 function postprocessComponentFile(multiDimensionalMessages, filename) {
     const messagesFromComponentSource = multiDimensionalMessages[0];
     /**

package/dist/rules/prefer-self-closing-tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-self-closing-tags.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-self-closing-tags.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC;AACjD,eAAO,MAAM,SAAS,6BAA6B,CAAC;;AAEpD,wBAuIG"}
+{"version":3,"file":"prefer-self-closing-tags.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-self-closing-tags.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC;AACjD,eAAO,MAAM,SAAS,6BAA6B,CAAC;;AAEpD,wBAiJG"}

package/dist/rules/prefer-self-closing-tags.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RULE_NAME = void 0;
-const bundled_angular_compiler_1 = require("@angular-eslint/bundled-angular-compiler");
 const utils_1 = require("@angular-eslint/utils");
 const create_eslint_rule_1 = require("../utils/create-eslint-rule");
 const get_dom_elements_1 = require("../utils/get-dom-elements");
@@ -22,7 +21,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     defaultOptions: [],
     create(context) {
         const parserServices = (0, utils_1.getTemplateParserServices)(context);
-        // angular 18 doesnt support self closing tags in index.html
+        // angular 18 doesn't support self closing tags in index.html
         if (/src[\\/]index\.html$/.test(context.physicalFilename)) {
             // If it is, return an empty object to skip this rule
             return {};
@@ -42,24 +41,31 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             },
         };
         function processElementOrTemplateNode(node) {
-            const { children, startSourceSpan, endSourceSpan } = node;
-            const noContent = !children.length ||
-                children.every((node) => {
-                    // If the node is only whitespace, we can consider it empty.
-                    // We need to look at the text from the source code, rather
-                    // than the `TmplAstText.value` property. The `value` property
-                    // contains the HTML-decoded value, so if the raw text contains
-                    // ` `, that is decoded to a space, but we don't want to
-                    // treat that as empty text.
-                    return (node instanceof bundled_angular_compiler_1.TmplAstText &&
-                        context.sourceCode.text
-                            .slice(node.sourceSpan.start.offset, node.sourceSpan.end.offset)
-                            .trim() === '');
-                });
-            const noCloseTag = !endSourceSpan ||
+            const { startSourceSpan, endSourceSpan } = node;
+            if (!endSourceSpan ||
                 (startSourceSpan.start.offset === endSourceSpan.start.offset &&
-                    startSourceSpan.end.offset === endSourceSpan.end.offset);
-            if (!noContent || noCloseTag) {
+                    startSourceSpan.end.offset === endSourceSpan.end.offset)) {
+                // No close tag.
+                return;
+            }
+            // If the element only contains whitespace, we can consider it
+            // empty. We cannot use the children to reliably determine whether
+            // the element only contains whitespace because the template
+            // parser will HTML-decoded the text. For example, if the raw
+            // content contains ` `, that is decoded to a space, but
+            // we need to treat that as content that should be kept.
+            //
+            // Likewise, if the node only contains comments, those comments
+            // will not appear in the syntax tree, which results in the
+            // content appearing empty.
+            //
+            // So instead of using the syntax tree, we'll look at the
+            // source code and get the text that appears between the
+            // start element and the end element.
+            if (context.sourceCode.text
+                .slice(startSourceSpan.end.offset, endSourceSpan.start.offset)
+                .trim() !== '') {
+                // The element has content.
                 return;
             }
             // HTML tags always have more than two characters
@@ -75,25 +81,29 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         function processContentNode(node) {
             const { sourceSpan } = node;
             const ngContentCloseTag = '</ng-content>';
-            if (sourceSpan.toString().includes(ngContentCloseTag)) {
-                const whiteSpaceContent = sourceSpan
-                    .toString()
-                    .match(/<ng-content[^>]*>(\s*)<\/ng-content>/m)
-                    ?.at(1);
-                const hasContent = typeof whiteSpaceContent === 'undefined';
-                if (hasContent) {
-                    return;
+            const source = sourceSpan.toString();
+            if (source.endsWith(ngContentCloseTag)) {
+                // Content nodes don't have information about `startSourceSpan`
+                // and `endSourceSpan`, so we need to calculate where the inner
+                // HTML is ourselves. We know that the source ends with
+                // "</ng-content>", so we know where inner HTML ends.
+                // We just need to find where the inner HTML starts.
+                const startOfInnerHTML = findStartOfNgContentInnerHTML(source);
+                // If the start of the inner HTML is also where the close tag starts,
+                // then there is no inner HTML and we can avoid slicing the string.
+                if (startOfInnerHTML < source.length - ngContentCloseTag.length) {
+                    if (source.slice(startOfInnerHTML, -ngContentCloseTag.length).trim()
+                        .length > 0) {
+                        return;
+                    }
                 }
-                const openingTagLastChar = 
-                // This is more than the minimum length of a ng-content element
+                // The source will always have at least "<ng-content"
+                // before the inner HTML, so two characters before
+                // the inner HTML will always be a valid index.
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                sourceSpan
-                    .toString()
-                    .at(-2 - ngContentCloseTag.length - whiteSpaceContent.length);
+                const openingTagLastChar = source.at(startOfInnerHTML - 2);
                 const closingTagPrefix = getClosingTagPrefix(openingTagLastChar);
                 context.report({
-                    // content nodes don't have information about startSourceSpan and endSourceSpan,
-                    // so we need to calculate it by our own
                     loc: {
                         start: {
                             line: sourceSpan.end.line + 1,
@@ -106,10 +116,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                     },
                     messageId: 'preferSelfClosingTags',
                     fix: (fixer) => fixer.replaceTextRange([
-                        sourceSpan.end.offset -
-                            ngContentCloseTag.length -
-                            whiteSpaceContent.length -
-                            1,
+                        sourceSpan.start.offset + startOfInnerHTML - 1,
                         sourceSpan.end.offset,
                     ], closingTagPrefix + '/>'),
                 });
@@ -120,6 +127,30 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
 function isContentNode(node) {
     return 'name' in node && node.name === 'ng-content';
 }
+function findStartOfNgContentInnerHTML(html) {
+    let quote;
+    // The HTML will always start with at least "<ng-content",
+    // so we can skip over that part and start at index 11.
+    for (let i = 11; i < html.length; i++) {
+        const char = html.at(i);
+        if (quote !== undefined) {
+            if (quote === char) {
+                quote = undefined;
+            }
+        }
+        else {
+            switch (char) {
+                case '>':
+                    return i + 1;
+                case '"':
+                case "'":
+                    quote = char;
+                    break;
+            }
+        }
+    }
+    return html.length;
+}
 function getClosingTagPrefix(openingTagLastChar) {
     const hasOwnWhitespace = openingTagLastChar.trim() === '';
     return hasOwnWhitespace ? '' : ' ';

package/dist/rules/prefer-static-string-properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-static-string-properties.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-static-string-properties.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,8BAA8B,CAAC;AACxD,eAAO,MAAM,SAAS,oCAAoC,CAAC;;AAE3D,wBA6CG"}
+{"version":3,"file":"prefer-static-string-properties.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-static-string-properties.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,8BAA8B,CAAC;AACxD,eAAO,MAAM,SAAS,oCAAoC,CAAC;;AAE3D,wBAiDG"}

package/dist/rules/prefer-static-string-properties.js

@@ -22,7 +22,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     create(context) {
         const parserServices = (0, utils_1.getTemplateParserServices)(context);
         return {
-            BoundAttribute({ name, sourceSpan, value }) {
+            ['BoundAttribute.inputs']({ name, sourceSpan, value, }) {
                 if (value instanceof bundled_angular_compiler_1.ASTWithSource &&
                     value.ast instanceof bundled_angular_compiler_1.LiteralPrimitive &&
                     typeof value.ast.value === 'string') {

package/package.json

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