@angular-eslint/eslint-plugin-template 20.5.2-alpha.0 → 20.5.2-alpha.2

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

@@ -1 +1 @@
-{"version":3,"file":"conditional-complexity.d.ts","sourceRoot":"","sources":["../../src/rules/conditional-complexity.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,OAAO,GAAG,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC;AACjD,eAAO,MAAM,SAAS,2BAA2B,CAAC;;AAIlD,wBAkFG"}
+{"version":3,"file":"conditional-complexity.d.ts","sourceRoot":"","sources":["../../src/rules/conditional-complexity.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,OAAO,GAAG,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC;AACjD,eAAO,MAAM,SAAS,2BAA2B,CAAC;;AAIlD,wBAsFG"}

package/dist/rules/conditional-complexity.js

@@ -36,7 +36,9 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         const sourceCode = context.sourceCode;
         return {
             BoundAttribute(node) {
-                if (!node.value.source || node.value.ast instanceof bundled_angular_compiler_1.Interpolation) {
+                if (!node.value.source ||
+                    !node.valueSpan ||
+                    node.value.ast instanceof bundled_angular_compiler_1.Interpolation) {
                     return;
                 }
                 const possibleBinary = extractPossibleBinaryOrConditionalFrom(getParser().parseBinding(node.value.source, node.valueSpan, 0).ast);

package/dist/rules/prefer-ngsrc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-ngsrc.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-ngsrc.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AACpE,eAAO,MAAM,SAAS,iBAAiB,CAAC;;AAExC,wBA4CG"}
+{"version":3,"file":"prefer-ngsrc.d.ts","sourceRoot":"","sources":["../../src/rules/prefer-ngsrc.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AACpE,eAAO,MAAM,SAAS,iBAAiB,CAAC;;AAExC,wBA4CG"}

package/dist/rules/prefer-ngsrc.js

@@ -23,8 +23,8 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         const parserServices = (0, utils_1.getTemplateParserServices)(context);
         return {
             'Element[name=/^img$/i]'(element) {
-                const ngSrcAttribute = hasNgSrcAttribute(element);
-                const srcAttribute = hasNormalSrcAttribute(element);
+                const ngSrcAttribute = getNgSrcAttribute(element);
+                const srcAttribute = getNormalSrcAttribute(element);
                 if (!srcAttribute ||
                     (!ngSrcAttribute && isSrcBase64Image(srcAttribute))) {
                     return;
@@ -40,17 +40,33 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         };
     },
 });
-function hasNgSrcAttribute({ inputs, attributes, }) {
+function getNgSrcAttribute({ inputs, attributes, }) {
     return [...inputs, ...attributes].find(({ name }) => name === 'ngSrc');
 }
-function hasNormalSrcAttribute({ inputs, attributes, }) {
+function getNormalSrcAttribute({ inputs, attributes, }) {
     return [...inputs, ...attributes].find(({ name }) => name === 'src');
 }
 // Adheres to angular's assertion that ngSrc value is not a data URL.
 // https://github.com/angular/angular/blob/17.0.3/packages/common/src/directives/ng_optimized_image/ng_optimized_image.ts#L585
 function isSrcBase64Image(attribute) {
-    if (attribute instanceof bundled_angular_compiler_1.TmplAstTextAttribute) {
-        return attribute.value.trim().startsWith('data:');
+    const isPlainDataAttribute = attribute instanceof bundled_angular_compiler_1.TmplAstTextAttribute &&
+        attribute.value.trim().startsWith('data:');
+    if (isPlainDataAttribute) {
+        return true;
     }
-    return false;
+    const isBoundDataAttribute = attribute.value instanceof bundled_angular_compiler_1.ASTWithSource &&
+        isDataStringPrimitive(attribute.value.ast);
+    if (isBoundDataAttribute) {
+        return true;
+    }
+    const isBoundDataInExpression = attribute.value instanceof bundled_angular_compiler_1.ASTWithSource &&
+        attribute.value.ast instanceof bundled_angular_compiler_1.Binary &&
+        attribute.value.ast.operation === '+' &&
+        isDataStringPrimitive(attribute.value.ast.left);
+    return isBoundDataInExpression;
+}
+function isDataStringPrimitive(primitive) {
+    return (primitive instanceof bundled_angular_compiler_1.LiteralPrimitive &&
+        typeof primitive.value === 'string' &&
+        primitive.value.trim().startsWith('data:'));
 }

package/package.json

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