Merge branch 'dev' of https://github.com/oslabs-beta/reactime into chris-10-29

Author: chriswillsflannery

package/astParser.js

@@ -9,47 +9,32 @@ module.exports = elementType => {
   // Initialize empty object to store the setters and getter
   let ast = JSXParser.parse(elementType);
   const hookState = {};
-  // All module exports will always start off as a single 'FunctionDeclaration' type
+
   while (Object.hasOwnProperty.call(ast, 'body')) {
-    // Traverse down .body once before invoking parsing logic and will loop through any .body after
     ast = ast.body;
     const statements = [];
 
-    function saveAstHooks(st) {
-      st.forEach((el, i) => {
-        if (el.match(/_use/)) hookState[el] = statements[i + 2];
-      });
-    }
-
-    function findHookDeclarations(astVal) {
-      astVal.forEach(elem => {
+    /** All module exports always start off as a single 'FunctionDeclaration' type
+     * Other types: "BlockStatement" / "ExpressionStatement" / "ReturnStatement"
+     * Iterate through AST of every function declaration
+     * Check within each function declaration if there are hook declarations */
+    ast.forEach(functionDec => {
+      let body;
+      if (functionDec.expression) body = functionDec.expression.body.body;
+      else body = functionDec.body.body;
+      // Traverse through the function's funcDecs and Expression Statements
+      body.forEach(elem => {
         if (elem.type === 'VariableDeclaration') {
-          elem.declarations.forEach(decClar => {
-            statements.push(decClar.id.name);
+          elem.declarations.forEach(hook => {
+            statements.push(hook.id.name);
           });
         }
       });
-    }
-
-    // handle useState useContext
-    if (ast[0].expression.body.body) {
-      ast = ast[0].expression.body.body;
-      // Hook Declarations will only be under 'VariableDeclaration' type
-      findHookDeclarations(ast);
       // Iterate array and determine getter/setters based on pattern
-      saveAstHooks(statements); // add key-value to hookState
-    } else {
-      // TODO test if this is needed, backward compatibility?
-      // Iterate through AST of every function declaration
-      // Check within each function declaration if there are hook declarations
-      ast.forEach(functionDec => {
-        const { body } = functionDec.body;
-        // Traverse through the function's funcDecs and Expression Statements
-        findHookDeclarations(body);
-        // Iterate array and determine getter/setters based on pattern
-        saveAstHooks(statements); // add key-value to hookState
+      statements.forEach((el, i) => {
+        if (el.match(/_use/)) hookState[el] = statements[i + 2];
       });
-    }
+    });
   }
   return hookState;
 };