@angular-eslint/eslint-plugin-template 16.1.3-alpha.7 → 16.2.0

package/dist/configs/all.json

@@ -24,6 +24,7 @@
     "@angular-eslint/template/no-interpolation-in-attributes": "error",
     "@angular-eslint/template/no-negated-async": "error",
     "@angular-eslint/template/no-positive-tabindex": "error",
+    "@angular-eslint/template/prefer-ngsrc": "error",
     "@angular-eslint/template/prefer-self-closing-tags": "error",
     "@angular-eslint/template/role-has-required-aria": "error",
     "@angular-eslint/template/table-scope": "error",

package/dist/index.js

@@ -52,6 +52,7 @@ const no_inline_styles_1 = __importStar(require("./rules/no-inline-styles"));
 const no_interpolation_in_attributes_1 = __importStar(require("./rules/no-interpolation-in-attributes"));
 const no_negated_async_1 = __importStar(require("./rules/no-negated-async"));
 const no_positive_tabindex_1 = __importStar(require("./rules/no-positive-tabindex"));
+const prefer_ngsrc_1 = __importStar(require("./rules/prefer-ngsrc"));
 const prefer_self_closing_tags_1 = __importStar(require("./rules/prefer-self-closing-tags"));
 const role_has_required_aria_1 = __importStar(require("./rules/role-has-required-aria"));
 const table_scope_1 = __importStar(require("./rules/table-scope"));
@@ -89,6 +90,7 @@ module.exports = {
         [no_negated_async_1.RULE_NAME]: no_negated_async_1.default,
         [no_positive_tabindex_1.RULE_NAME]: no_positive_tabindex_1.default,
         [prefer_self_closing_tags_1.RULE_NAME]: prefer_self_closing_tags_1.default,
+        [prefer_ngsrc_1.RULE_NAME]: prefer_ngsrc_1.default,
         [role_has_required_aria_1.RULE_NAME]: role_has_required_aria_1.default,
         [table_scope_1.RULE_NAME]: table_scope_1.default,
         [use_track_by_function_1.RULE_NAME]: use_track_by_function_1.default,

package/dist/rules/prefer-ngsrc.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RULE_NAME = void 0;
+const utils_1 = require("@angular-eslint/utils");
+const create_eslint_rule_1 = require("../utils/create-eslint-rule");
+exports.RULE_NAME = 'prefer-ngsrc';
+exports.default = (0, create_eslint_rule_1.createESLintRule)({
+    name: exports.RULE_NAME,
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Ensures ngSrc is used instead of src for img elements',
+            recommended: false,
+        },
+        schema: [],
+        messages: {
+            missingAttribute: 'The attribute [ngSrc] should be used for img elements instead of [src].',
+            invalidDoubleSource: 'Only [ngSrc] should exist on an img element. Delete the [src] attribute.',
+        },
+    },
+    defaultOptions: [],
+    create(context) {
+        const parserServices = (0, utils_1.getTemplateParserServices)(context);
+        return {
+            'Element$1[name=img]'(element) {
+                const ngSrcAttribute = hasNgSrcAttribute(element);
+                const srcAttribute = hasNormalSrcAttribute(element);
+                if (!srcAttribute) {
+                    return;
+                }
+                const loc = parserServices.convertNodeSourceSpanToLoc(srcAttribute.sourceSpan);
+                context.report({
+                    loc,
+                    messageId: !ngSrcAttribute
+                        ? 'missingAttribute'
+                        : 'invalidDoubleSource',
+                });
+            },
+        };
+    },
+});
+function hasNgSrcAttribute({ inputs, attributes, }) {
+    return [...inputs, ...attributes].find(({ name }) => name === 'ngSrc');
+}
+function hasNormalSrcAttribute({ inputs, attributes, }) {
+    return [...inputs, ...attributes].find(({ name }) => name === 'src');
+}

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

@@ -42,10 +42,15 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                 if (!noContent || noCloseTag) {
                     return;
                 }
+                // HTML tags always have more than two characters
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const openingTagLastChar = startSourceSpan.toString().at(-2);
+                const hasOwnWhitespace = openingTagLastChar.trim() === '';
+                const closingTagPrefix = hasOwnWhitespace ? '' : ' ';
                 context.report({
                     loc: parserServices.convertNodeSourceSpanToLoc(endSourceSpan),
                     messageId: exports.MESSAGE_ID,
-                    fix: (fixer) => fixer.replaceTextRange([startSourceSpan.end.offset - 1, endSourceSpan.end.offset], ' />'),
+                    fix: (fixer) => fixer.replaceTextRange([startSourceSpan.end.offset - 1, endSourceSpan.end.offset], closingTagPrefix + '/>'),
                 });
             },
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "16.1.3-alpha.7+470e12b",
+  "version": "16.2.0",
   "description": "ESLint plugin for Angular Templates",
   "license": "MIT",
   "main": "dist/index.js",
@@ -17,8 +17,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@angular-eslint/bundled-angular-compiler": "16.1.3-alpha.7+470e12b",
-    "@angular-eslint/utils": "16.1.3-alpha.7+470e12b",
+    "@angular-eslint/bundled-angular-compiler": "16.2.0",
+    "@angular-eslint/utils": "16.2.0",
     "@typescript-eslint/type-utils": "5.62.0",
     "@typescript-eslint/utils": "5.62.0",
     "aria-query": "5.3.0",
@@ -31,5 +31,5 @@
     "eslint": "^7.20.0 || ^8.0.0",
     "typescript": "*"
   },
-  "gitHead": "470e12b5b482857735e2140e3524a5726d4fc6a8"
+  "gitHead": "038422b3f939f2649375975a95e1417171f38ce0"
 }