Incorporated feedback from pull request

- Simplified logic for testing return assignments
- Added additional test

Author: michoelchaikin

lib/rules/entry-points.js

@@ -62,24 +62,14 @@ module.exports = {
         }
 
         if (returnArgument && returnArgument.type === 'Identifier') {
-          for (let i = 0; i < callbackBody.length; i++) {
-            const childNode = callbackBody[i];
-
-            if (childNode.type !== 'ExpressionStatement') {
-              continue;
-            }
-
-            const expressionLeft = childNode.expression.left;
-
-            if (
-              expressionLeft.object.name === returnArgument.name &&
-              scriptTypeMap[scriptType].entryPoints.includes(expressionLeft.property.name) &&
-              (expressionLeft.property.type === 'Identifier' ||
-              expressionLeft.property.type === 'FunctionExpression')
-            ) {
-              hasValidEntryPoint = true;
-              break;
-            }
+          const returnAssignments = callbackBody.filter(n =>
+            n.type === 'ExpressionStatement' &&
+            n.expression.left.type === 'MemberExpression' &&
+            n.expression.left.object.name === returnArgument.name &&
+            scriptTypeMap[scriptType].entryPoints.includes(n.expression.left.property.name)
+          );
+          if (returnAssignments.length > 0) {
+            hasValidEntryPoint = true;
           }
         }
 

tests/rules/entry-points.js

@@ -162,6 +162,20 @@ ruleTester.run('entry-points', rule, {
         '});'
       ].join('\n'),
       errors: [{ messageId: 'returnEntryPoint', data: { type: 'ClientScript' }}]
+    },
+    {
+      code: [
+        '/**',
+        ' * @NScriptType ClientScript',
+        ' */',
+        'define([], function() {',
+        '  var exports = {};',
+        '  var notTheReturnObject = {};',
+        '  notTheReturnObject.pageInit = x;',
+        '  return exports;',
+        '});'
+      ].join('\n'),
+      errors: [{ messageId: 'returnEntryPoint', data: { type: 'ClientScript' }}]
     }
   ]
 });