Treat conditional expressions as custom properties (#31)

Author: Michał Sajnóg

lib/utils/ember.js

@@ -126,12 +126,13 @@ function isObjectProp(node) {
 
 function isCustomProp(property) {
   var value = property.value;
-  var isCustomObjectProp = utils.isObjectExpression(property.value) && property.key.name !== 'actions';
+  var isCustomObjectProp = utils.isObjectExpression(value) && property.key.name !== 'actions';
 
   return utils.isLiteral(value) ||
       utils.isIdentifier(value) ||
       utils.isArrayExpression(value) ||
-      isCustomObjectProp;
+      isCustomObjectProp ||
+      utils.isConditionalExpression(value);
 }
 
 function isModelProp(property) {

lib/utils/utils.js

@@ -11,6 +11,7 @@ module.exports = {
   isNewExpression: isNewExpression,
   isCallWithFunctionExpression: isCallWithFunctionExpression,
   isThisExpression: isThisExpression,
+  isConditionalExpression: isConditionalExpression,
   getSize: getSize,
   parseCallee: parseCallee,
   parseArgs: parseArgs,
@@ -151,6 +152,16 @@ function isThisExpression(node) {
     return node !== undefined && node.type === 'ThisExpression';
 }
 
+/**
+ * Check whether or not a node is a ConditionalExpression.
+ *
+ * @param {Object} node The node to check.
+ * @returns {boolean} Whether or not the node is a ConditionalExpression.
+ */
+function isConditionalExpression(node) {
+    return node !== undefined && node.type === 'ConditionalExpression';
+}
+
 /**
  * Get size of expression in lines
  *

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

@@ -304,6 +304,17 @@ eslintTester.run('order-in-components', rule, {
         ],
       }],
     },
+    {
+      code: `export default Component.extend({
+        role: "sloth",
+        qwe: foo ? 'bar' : null,
+        abc: [],
+        def: {},
+
+        ghi: alias("def")
+      });`,
+      parserOptions: {ecmaVersion: 6, sourceType: "module"},
+    },
   ],
   invalid: [
     {

tests/lib/utils/ember-test.js

@@ -144,6 +144,9 @@ describe('isCustomProp', function() {
     node = getProperty(`test = { test: {} }`);
     assert.ok(emberUtils.isCustomProp(node));
 
+    node = getProperty(`test = { test: foo ? 'bar': 'baz' }`);
+    assert.ok(emberUtils.isCustomProp(node));
+
     node = getProperty(`test = { actions: {} }`);
     assert.notOk(emberUtils.isCustomProp(node));
   });

tests/lib/utils/utils-test.js

@@ -116,6 +116,14 @@ describe('isThisExpression', function() {
   });
 });
 
+describe('isConditionalExpression', function() {
+  const node = parse(`test = true ? 'asd' : 'qwe'`).right;
+
+  it('should check if node is a conditional expression', function() {
+    assert.ok(utils.isConditionalExpression(node));
+  });
+});
+
 describe('getSize', function() {
   const node = parse('some = {\nfew: "line",\nheight: "statement",\nthat: "should",\nhave: "6 lines",\n};');