Add support for arrow funcs

softeng-aueb · May 14, 2022 · 36fe79f · 36fe79f
1 parent 92f33a0
commit 36fe79f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/code-parser-module/constants/astObjectTypes.js b/code-parser-module/constants/astObjectTypes.js
@@ -3,7 +3,10 @@ const AST_OBJECT_TYPES = {
     VARIABLE_DECLARATION: "VariableDeclaration",
     RETURN_STATEMENT:"ReturnStatement",
     BINARY_EXPRESSION:"BinaryExpression",
-    IDENTIFIER:"Identifier"
+    IDENTIFIER:"Identifier",
+    EXPRESSION_STATEMENT:"ExpressionStatement",
+    ARROW_FUNCTION_EXPRESSION:"ArrowFunctionExpression",
+
 }
 
 module.exports = Object.freeze(AST_OBJECT_TYPES)
diff --git a/code-parser-module/domain/FunctionAst.js b/code-parser-module/domain/FunctionAst.js
@@ -7,33 +7,43 @@ const AstObjectTypesParser = require("../helpers/AstObjectTypesParser");
 class FunctionAst {
     constructor(ast) {
         this.ast = ast;
-        this.codeParsedObj = this.ast && this.ast.program && this.ast.program.body && this.ast.program.body[0];
+        this.codeParsedObj = (this.isRegularFunction())
+            ? this.ast && this.ast.program && this.ast.program.body && this.ast.program.body[0]
+            : this.ast && this.ast.program && this.ast.program.body && this.ast.program.body[0] && this.ast.program.body[0].expression
     }
 
     isFunction() {
-        return this.codeParsedObj && this.codeParsedObj.type === AST_OBJECT_TYPES.FUNCTION_DECLARATION;
+        return this.isRegularFunction() || this.isArrowFunction();
+    }
+
+    isRegularFunction() {
+        return (this.codeParsedObj && this.codeParsedObj.type === AST_OBJECT_TYPES.FUNCTION_DECLARATION) ? true : false;
+    }
+
+    isArrowFunction() {
+        return (this.codeParsedObj && this.codeParsedObj.type === AST_OBJECT_TYPES.ARROW_FUNCTION_EXPRESSION) ? true : false;
     }
 
     getFunctionName() {
-        return this.codeParsedObj.id && this.codeParsedObj.id.name;
+        return (this.isRegularFunction()) ? this.codeParsedObj.id && this.codeParsedObj.id.name : "";
     }
 
-    getFunctionArgs(){
-        const params = this.codeParsedObj && this.codeParsedObj.params || [];
-        return params.map(p => new FunctionParam(p.type, p.name));
+    getFunctionArgs() {
+        let args =  this.codeParsedObj && this.codeParsedObj.params || [];;
+        return args.map(p => new FunctionParam(p.type, p.name));
     }
 
-    getFunctionType(){
-        if(this.codeParsedObj && this.codeParsedObj.async === true) return FUNCTION_TYPES.ASYNC;
+    getFunctionType() {
+        if (this.codeParsedObj && this.codeParsedObj.async === true) return FUNCTION_TYPES.ASYNC;
         return FUNCTION_TYPES.SYNC;
     }
 
-    getFunctionBody(){
+    getFunctionBody() {
         const bodyStatements = this.codeParsedObj && this.codeParsedObj.body && this.codeParsedObj.body.body || [];
         return bodyStatements.map(statement => {
-            if(statement.type === AST_OBJECT_TYPES.VARIABLE_DECLARATION){
+            if (statement.type === AST_OBJECT_TYPES.VARIABLE_DECLARATION) {
                 return AstObjectTypesParser.variableDeclarationsParser(statement);
-            }else if(statement.type === AST_OBJECT_TYPES.RETURN_STATEMENT){
+            } else if (statement.type === AST_OBJECT_TYPES.RETURN_STATEMENT) {
                 return AstObjectTypesParser.returnStatementParser(statement);
             }
         });

diff --git a/code-parser-module/parser.js b/code-parser-module/parser.js
@@ -20,7 +20,7 @@ class Parser {
 }
 
 let func = Parser.parse([
-    "function add(a, b) {",
+    "(a, b) => {",
     "let x = a+b;",
     "  return x;",
     "}"