[Refactor] jsx-sort-props: make the map to an object instead of an array

Author: ljharb

lib/rules/jsx-sort-props.js

@@ -47,11 +47,11 @@ function isReservedPropName(name, list) {
 }
 
 let attributeMap;
-// attributeMap = [endrange, true||false if comment in between nodes exists, it needs to be sorted to end]
+// attributeMap = { end: endrange, hasComment: true||false if comment in between nodes exists, it needs to be sorted to end }
 
 function shouldSortToEnd(node) {
   const attr = attributeMap.get(node);
-  return !!attr && !!attr[1];
+  return !!attr && !!attr.hasComment;
 }
 
 function contextCompare(a, b, options) {
@@ -170,35 +170,35 @@ function getGroupsOfSortableAttributes(attributes, context) {
     }
     if (!attrIsSpread) {
       if (comment.length === 0) {
-        attributeMap.set(attribute, [attribute.range[1], false]);
+        attributeMap.set(attribute, { end: attribute.range[1], hasComment: false });
         addtoSortableAttributeGroups(attribute);
       } else {
         const firstComment = comment[0];
         const commentline = firstComment.loc.start.line;
         if (comment.length === 1) {
           if (attributeline + 1 === commentline && nextAttribute) {
-            attributeMap.set(attribute, [nextAttribute.range[1], true]);
+            attributeMap.set(attribute, { end: nextAttribute.range[1], hasComment: true });
             addtoSortableAttributeGroups(attribute);
             i += 1;
           } else if (attributeline === commentline) {
             if (firstComment.type === 'Block' && nextAttribute) {
-              attributeMap.set(attribute, [nextAttribute.range[1], true]);
+              attributeMap.set(attribute, { end: nextAttribute.range[1], hasComment: true });
               i += 1;
             } else if (firstComment.type === 'Block') {
-              attributeMap.set(attribute, [firstComment.range[1], true]);
+              attributeMap.set(attribute, { end: firstComment.range[1], hasComment: true });
             } else {
-              attributeMap.set(attribute, [firstComment.range[1], false]);
+              attributeMap.set(attribute, { end: firstComment.range[1], hasComment: false });
             }
             addtoSortableAttributeGroups(attribute);
           }
         } else if (comment.length > 1 && attributeline + 1 === comment[1].loc.start.line && nextAttribute) {
           const commentNextAttribute = sourceCode.getCommentsAfter(nextAttribute);
-          attributeMap.set(attribute, [nextAttribute.range[1], true]);
+          attributeMap.set(attribute, { end: nextAttribute.range[1], hasComment: true });
           if (
             commentNextAttribute.length === 1
             && nextAttribute.loc.start.line === commentNextAttribute[0].loc.start.line
           ) {
-            attributeMap.set(attribute, [commentNextAttribute[0].range[1], true]);
+            attributeMap.set(attribute, { end: commentNextAttribute[0].range[1], hasComment: true });
           }
           addtoSortableAttributeGroups(attribute);
           i += 1;
@@ -248,10 +248,9 @@ function generateFixerFunction(node, context, reservedList) {
     sortableAttributeGroups.forEach((sortableGroup, ii) => {
       sortableGroup.forEach((attr, jj) => {
         const sortedAttr = sortedAttributeGroups[ii][jj];
-        const sortedAttrText = source.substring(sortedAttr.range[0], attributeMap.get(sortedAttr)[0]);
-        const attrrangeEnd = attributeMap.get(attr)[0];
+        const sortedAttrText = source.substring(sortedAttr.range[0], attributeMap.get(sortedAttr).end);
         fixers.push({
-          range: [attr.range[0], attrrangeEnd],
+          range: [attr.range[0], attributeMap.get(attr).end],
           text: sortedAttrText,
         });
       });