Merge pull request #670 from cdtinney/fix-order-in-rules-template-literals

Update `order-in-*` rules to consider template literals as properties

Author: bmish

lib/utils/ember.js

@@ -278,6 +278,7 @@ function isCustomProp(property) {
 
   return (
     types.isLiteral(value) ||
+    types.isTemplateLiteral(value) ||
     types.isIdentifier(value) ||
     types.isArrayExpression(value) ||
     types.isUnaryExpression(value) ||

tests/lib/rules/order-in-components.js

@@ -26,6 +26,16 @@ eslintTester.run('order-in-components', rule, {
         levelOfHappiness: computed("attitude", "health", () => {
         }),
 
+        actions: {}
+      });`,
+    `export default Component.extend({
+        role: ${`${'sloth'}`},
+
+        vehicle: alias("car"),
+
+        levelOfHappiness: computed("attitude", "health", () => {
+        }),
+
         actions: {}
       });`,
     `export default Component.extend({
@@ -345,6 +355,33 @@ eslintTester.run('order-in-components', rule, {
         },
       ],
     },
+    {
+      code: `export default Component.extend({
+        actions: {},
+
+        role: ${`${'sloth'}`},
+
+        vehicle: alias("car"),
+
+        levelOfHappiness: computed("attitude", "health", () => {
+        })
+      });`,
+      errors: [
+        {
+          message: 'The "role" property should be above the actions hash on line 2',
+          line: 4,
+        },
+        {
+          message: 'The "vehicle" single-line function should be above the actions hash on line 2',
+          line: 6,
+        },
+        {
+          message:
+            'The "levelOfHappiness" multi-line function should be above the actions hash on line 2',
+          line: 8,
+        },
+      ],
+    },
     {
       code: `export default Component.extend({
         vehicle: alias("car"),

tests/lib/utils/ember-test.js

@@ -834,6 +834,9 @@ describe('isCustomProp', () => {
     node = getProperty("test = { test: 'someLiteral' }");
     expect(emberUtils.isCustomProp(node)).toBeTruthy();
 
+    node = getProperty("test = { test: `foo${'bar'}` }");
+    expect(emberUtils.isCustomProp(node)).toBeTruthy();
+
     node = getProperty('test = { test: someIdentifier }');
     expect(emberUtils.isCustomProp(node)).toBeTruthy();
 

tests/lib/utils/property-order-test.js

@@ -188,6 +188,16 @@ describe('determinePropertyType', () => {
       expect(propertyOrder.determinePropertyType(node, 'component')).toStrictEqual('property');
     });
 
+    it('should determine template literals as properties', () => {
+      const context = new FauxContext(
+        `export default Component.extend({
+          foo: ${`foo${"bar"}`}
+        });`
+      );
+      const node = context.ast.body[0].declaration.arguments[0].properties[0];
+      expect(propertyOrder.determinePropertyType(node, 'component')).toStrictEqual('property');
+    });
+
     it('should determine empty methods', () => {
       const context = new FauxContext(
         `export default Component.extend({