fix(inference): Robust parsing for shorthand object methods

This extends findTarget and the membership interference steps, treating ObjectProperty within var-assigned objects the same as we did for ObjectMethods. It also adds tests that specifically test findTarget directly.

Fixes #649 and fixes #678

Author: tmcw

lib/infer/finders.js

@@ -22,15 +22,19 @@ function findTarget(path/*: Object */) {
     path = path.get('declaration');
   }
 
-  // var x = init;
   if (t.isVariableDeclaration(path)) {
+    // var x = init;
     path = path.get('declarations')[0];
 
-  // foo.x = TARGET
   } else if (t.isExpressionStatement(path)) {
+    // foo.x = TARGET
     path = path.get('expression').get('right');
+  } else if (t.isObjectProperty(path)) {
+    // var foo = { x: TARGET };
+    path = path.get('value');
   }
 
+
   return path.node && path;
 }
 

lib/infer/membership.js

@@ -296,14 +296,23 @@ module.exports = function () {
       }
     }
 
-    // Foo = { bar() {} };
-    // Foo.prototype = { bar() {} };
-    // Foo.bar = { baz() {} };
+    // Shorthand methods on ordinary objects
     if (n.isObjectMethod(path.node) &&
-        n.isObjectExpression(path.parentPath) &&
-        n.isAssignmentExpression(path.parentPath.parentPath)) {
-      identifiers = extractIdentifiers(path.parentPath.parentPath.get('left'));
-      if (identifiers.length >= 1) {
+      n.isObjectExpression(path.parentPath)) {
+
+      // Foo = { bar() {} };
+      // Foo.prototype = { bar() {} };
+      // Foo.bar = { baz() {} };
+      if (n.isAssignmentExpression(path.parentPath.parentPath)) {
+        identifiers = extractIdentifiers(path.parentPath.parentPath.get('left'));
+        if (identifiers.length >= 1) {
+          inferMembershipFromIdentifiers(comment, identifiers);
+        }
+      }
+
+      // var Foo = { bar() {} };
+      if (n.isVariableDeclarator(path.parentPath.parentPath)) {
+        identifiers = [path.parentPath.parentPath.get('id').node.name];
         inferMembershipFromIdentifiers(comment, identifiers);
       }
     }