@angular-eslint/eslint-plugin-template 16.0.4-alpha.22 → 16.0.4-alpha.27

package/dist/rules/attributes-order.js

@@ -146,9 +146,13 @@ function byLocation(one, other) {
 }
 function byOrder(order, alphabetical) {
     return function (one, other) {
+        var _a, _b, _c, _d;
         const orderComparison = getOrderIndex(one, order) - getOrderIndex(other, order);
         if (alphabetical && orderComparison === 0) {
-            return one.name > other.name ? 1 : -1;
+            return ((_b = (_a = one.keySpan) === null || _a === void 0 ? void 0 : _a.details) !== null && _b !== void 0 ? _b : one.name) >
+                ((_d = (_c = other.keySpan) === null || _c === void 0 ? void 0 : _c.details) !== null && _d !== void 0 ? _d : other.name)
+                ? 1
+                : -1;
         }
         return orderComparison;
     };
@@ -175,9 +179,27 @@ function toTemplateReferenceVariableOrderType(reference) {
     return Object.assign(Object.assign({}, reference), { orderType: "TEMPLATE_REFERENCE" /* OrderType.TemplateReferenceVariable */ });
 }
 function extractTemplateAttrs(node) {
-    return isTmplAstTemplate(node.parent)
-        ? node.parent.templateAttrs.map(toStructuralDirectiveOrderType)
-        : [];
+    if (!isTmplAstTemplate(node.parent)) {
+        return [];
+    }
+    /*
+     * There may be multiple "attributes" for a structural directive even though
+     * there is only a single HTML attribute:
+     * e.g. `<ng-container *ngFor="let foo of bar"></ng-container>`
+     * will parsed as two attributes (`ngFor` and `ngForOf`)
+     */
+    const attrs = node.parent.templateAttrs.map(toStructuralDirectiveOrderType);
+    // Pick up on any subsequent `let` bindings, e.g. `index as i`
+    let sourceEnd = attrs[attrs.length - 1].sourceSpan.end;
+    node.parent.variables.forEach((v) => {
+        if (v.sourceSpan.start.offset <= sourceEnd.offset &&
+            sourceEnd.offset < v.sourceSpan.end.offset) {
+            sourceEnd = v.sourceSpan.end;
+        }
+    });
+    return [
+        Object.assign(Object.assign({}, attrs[0]), { sourceSpan: new bundled_angular_compiler_1.ParseSourceSpan(attrs[0].sourceSpan.start, sourceEnd) }),
+    ];
 }
 function normalizeInputsOutputs(inputs, outputs) {
     const extractedInputs = inputs
@@ -200,19 +222,21 @@ function isOnSameLocation(input, output) {
         input.sourceSpan.end === output.sourceSpan.end);
 }
 function getMessageName(expected) {
+    var _a, _b;
+    const fullName = (_b = (_a = expected.keySpan) === null || _a === void 0 ? void 0 : _a.details) !== null && _b !== void 0 ? _b : expected.name;
     switch (expected.orderType) {
         case "STRUCTURAL_DIRECTIVE" /* OrderType.StructuralDirective */:
-            return `*${expected.name}`;
+            return `*${fullName}`;
         case "TEMPLATE_REFERENCE" /* OrderType.TemplateReferenceVariable */:
-            return `#${expected.name}`;
+            return `#${fullName}`;
         case "INPUT_BINDING" /* OrderType.InputBinding */:
-            return `[${expected.name}]`;
+            return `[${fullName}]`;
         case "OUTPUT_BINDING" /* OrderType.OutputBinding */:
-            return `(${expected.name})`;
+            return `(${fullName})`;
         case "TWO_WAY_BINDING" /* OrderType.TwoWayBinding */:
-            return `[(${expected.name})]`;
+            return `[(${fullName})]`;
         default:
-            return expected.name;
+            return fullName;
     }
 }
 function getStartPos(expected) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "16.0.4-alpha.22+53163f2",
+  "version": "16.0.4-alpha.27+90c0e91",
   "description": "ESLint plugin for Angular Templates",
   "license": "MIT",
   "main": "dist/index.js",
@@ -17,8 +17,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@angular-eslint/bundled-angular-compiler": "16.0.4-alpha.22+53163f2",
-    "@angular-eslint/utils": "16.0.4-alpha.22+53163f2",
+    "@angular-eslint/bundled-angular-compiler": "16.0.4-alpha.27+90c0e91",
+    "@angular-eslint/utils": "16.0.4-alpha.27+90c0e91",
     "@typescript-eslint/type-utils": "5.59.9",
     "@typescript-eslint/utils": "5.59.9",
     "aria-query": "5.1.3",
@@ -31,5 +31,5 @@
     "eslint": "^7.20.0 || ^8.0.0",
     "typescript": "*"
   },
-  "gitHead": "53163f26e67bfd911a42b320e4ea592e278cfba1"
+  "gitHead": "90c0e916654297b29cabf8289b1811ed307018ab"
 }