@angular-eslint/eslint-plugin-template 17.4.2-alpha.7 → 17.5.0

package/dist/index.d.ts

@@ -100,6 +100,7 @@ declare const _default: {
             readonly allowNullOrUndefined?: boolean | undefined;
         }], import("@typescript-eslint/utils/ts-eslint").RuleListener>;
         i18n: import("@typescript-eslint/utils/ts-eslint").RuleModule<import("./rules/i18n").MessageIds, [{
+            readonly allowMarkupInContent?: boolean | undefined;
             readonly boundTextAllowedPattern?: string | undefined;
             readonly checkAttributes?: boolean | undefined;
             readonly checkDuplicateId?: boolean | undefined;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmFA,kBAuCE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmFA,kBAuCE"}

package/dist/rules/i18n.d.ts

@@ -1,6 +1,7 @@
 import type { TSESLint } from '@typescript-eslint/utils';
 type Options = [
     {
+        readonly allowMarkupInContent?: boolean;
         readonly boundTextAllowedPattern?: string;
         readonly checkAttributes?: boolean;
         readonly checkDuplicateId?: boolean;
@@ -12,7 +13,7 @@ type Options = [
         readonly requireMeaning?: boolean;
     }
 ];
-export type MessageIds = 'i18nAttribute' | 'i18nAttributeOnIcuOrText' | 'i18nCustomIdOnAttribute' | 'i18nCustomIdOnElement' | 'i18nDuplicateCustomId' | 'suggestAddI18nAttribute' | 'i18nMissingDescription' | 'i18nMissingMeaning';
+export type MessageIds = 'i18nAttribute' | 'i18nAttributeOnIcuOrText' | 'i18nCustomIdOnAttribute' | 'i18nCustomIdOnElement' | 'i18nDuplicateCustomId' | 'suggestAddI18nAttribute' | 'i18nMissingDescription' | 'i18nMissingMeaning' | 'i18nMarkupInContent';
 export declare const RULE_NAME = "i18n";
 declare const _default: TSESLint.RuleModule<MessageIds, Options, TSESLint.RuleListener>;
 export default _default;

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

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/rules/i18n.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AA6CnE,KAAK,OAAO,GAAG;IACb;QACE,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QAC1C,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC9C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QACxC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;KACnC;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,eAAe,GACf,0BAA0B,GAC1B,yBAAyB,GACzB,uBAAuB,GACvB,uBAAuB,GACvB,yBAAyB,GACzB,wBAAwB,GACxB,oBAAoB,CAAC;AAqBzB,eAAO,MAAM,SAAS,SAAS,CAAC;;AAiBhC,wBAqTG"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/rules/i18n.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AA6CnE,KAAK,OAAO,GAAG;IACb;QACE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;QACxC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QAC1C,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC9C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QACxC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;KACnC;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,eAAe,GACf,0BAA0B,GAC1B,yBAAyB,GACzB,uBAAuB,GACvB,uBAAuB,GACvB,yBAAyB,GACzB,wBAAwB,GACxB,oBAAoB,GACpB,qBAAqB,CAAC;AAqB1B,eAAO,MAAM,SAAS,SAAS,CAAC;;AAkBhC,wBAsUG"}

package/dist/rules/i18n.js

@@ -46,6 +46,7 @@ const DEFAULT_ALLOWED_ATTRIBUTES = new Set([
 ]);
 exports.RULE_NAME = 'i18n';
 const DEFAULT_OPTIONS = {
+    allowMarkupInContent: true,
     checkAttributes: true,
     checkId: true,
     checkDuplicateId: true,
@@ -77,6 +78,10 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             {
                 type: 'object',
                 properties: {
+                    allowMarkupInContent: {
+                        type: 'boolean',
+                        default: DEFAULT_OPTIONS.allowMarkupInContent,
+                    },
                     boundTextAllowedPattern: {
                         type: 'string',
                     },
@@ -130,12 +135,13 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             suggestAddI18nAttribute: 'Add the `i18n` attribute',
             i18nMissingDescription: `Missing i18n description on element. See more at ${STYLE_GUIDE_LINK_METADATA_FOR_TRANSLATION}`,
             i18nMissingMeaning: `Missing i18n meaning on element. See more at ${STYLE_GUIDE_LINK_METADATA_FOR_TRANSLATION}`,
+            i18nMarkupInContent: 'Avoid HTML markup in an element with an i18n attribute.',
         },
     },
     defaultOptions: [DEFAULT_OPTIONS],
-    create(context, [{ boundTextAllowedPattern, checkAttributes, checkId, checkDuplicateId, checkText, ignoreAttributes, ignoreTags, requireDescription, requireMeaning, },]) {
+    create(context, [{ allowMarkupInContent, boundTextAllowedPattern, checkAttributes, checkId, checkDuplicateId, checkText, ignoreAttributes, ignoreTags, requireDescription, requireMeaning, },]) {
         const parserServices = (0, utils_1.getTemplateParserServices)(context);
-        const sourceCode = context.getSourceCode();
+        const sourceCode = context.sourceCode;
         const allowedBoundTextPattern = boundTextAllowedPattern
             ? new RegExp(boundTextAllowedPattern)
             : DEFAULT_ALLOWED_BOUND_TEXT_PATTERN;
@@ -155,12 +161,20 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         function handleElementOrTemplate(node) {
             const { i18n, sourceSpan } = node;
             const parent = getNextElementOrTemplateParent(node);
-            if (isTagAllowed(allowedTags, node) ||
-                isElementWithI18n(parent) ||
-                isNgTemplateWithI18n(parent)) {
+            if (isTagAllowed(allowedTags, node)) {
                 return;
             }
             const loc = parserServices.convertNodeSourceSpanToLoc(sourceSpan);
+            if (isElementWithI18n(parent) || isNgTemplateWithI18n(parent)) {
+                if (allowMarkupInContent) {
+                    return;
+                }
+                context.report({
+                    messageId: 'i18nMarkupInContent',
+                    loc,
+                });
+                return;
+            }
             const customId = getI18nCustomId(i18n);
             if (checkId) {
                 if (!customId) {
@@ -269,8 +283,11 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             collectedCustomIds.clear();
         }
         return {
-            ...((checkId || requireDescription || requireMeaning) && {
-                ':matches(Element$1, Template[tagName="ng-template"])[i18n]'(node) {
+            ...((!allowMarkupInContent ||
+                checkId ||
+                requireDescription ||
+                requireMeaning) && {
+                [`:matches(Element$1, Template[tagName="ng-template"])${allowMarkupInContent ? '[i18n]' : ''}`](node) {
                     handleElementOrTemplate(node);
                 },
             }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "17.4.2-alpha.7",
+  "version": "17.5.0",
   "description": "ESLint plugin for Angular Templates",
   "license": "MIT",
   "main": "dist/index.js",
@@ -18,8 +18,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@angular-eslint/bundled-angular-compiler": "17.4.2-alpha.7",
-    "@angular-eslint/utils": "17.4.2-alpha.7",
+    "@angular-eslint/bundled-angular-compiler": "17.5.0",
+    "@angular-eslint/utils": "17.5.0",
     "@typescript-eslint/type-utils": "7.10.0",
     "@typescript-eslint/utils": "7.10.0",
     "aria-query": "5.3.0",