Added async property to functions. Added AwaitExpression

Author: bryanjos

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.1.0
+
+* Enhancements
+  * Added async field to FunctionDeclaration and FunctionExpression
+  * Added AwaitExpression
+
 # v2.0.1
 
 * Enhancements

README.md

@@ -17,4 +17,4 @@ ast = Builder.array_expression([
 
 Generator.generate(ast)
 #"[1, a]"
-```
+```

lib/es_tree/await_expression.ex

@@ -0,0 +1,12 @@
+defmodule ESTree.AwaitExpression do
+  @type t :: %ESTree.AwaitExpression{ 
+    type: binary, 
+    loc: ESTree.SourceLocation.t | nil,
+    argument: ESTree.Expression.t | nil,
+    all: boolean
+  }
+  defstruct type: "AwaitExpression", 
+            loc: nil, 
+            argument: nil,
+            all: false         
+end 

lib/es_tree/expression.ex

@@ -18,5 +18,6 @@ defmodule ESTree.Expression do
               ESTree.Literal.t |
               ESTree.ClassExpression.t |
               ESTree.TemplateLiteral.t |
-              ESTree.TaggedTemplateExpression.t
+              ESTree.TaggedTemplateExpression.t |
+              ESTree.AwaitExpression.t
 end 

lib/es_tree/function_declaration.ex

@@ -7,7 +7,8 @@ defmodule ESTree.FunctionDeclaration do
     defaults: [ ESTree.Expression.t  ],
     body: ESTree.BlockStatement.t | ESTree.Expression.t,
     generator: boolean,
-    expression: boolean  
+    expression: boolean,
+    async: boolean 
   }
   defstruct type: "FunctionDeclaration", 
             loc: nil, 
@@ -16,5 +17,6 @@ defmodule ESTree.FunctionDeclaration do
             defaults: [],
             body: %ESTree.BlockStatement{},
             generator: false,
-            expression: false  
+            expression: false,
+            async: false  
 end 

lib/es_tree/function_expression.ex

@@ -6,13 +6,15 @@ defmodule ESTree.FunctionExpression do
     defaults: [ ESTree.Expression.t  ],
     body: ESTree.BlockStatement.t,
     generator: boolean,
-    expression: boolean  
+    expression: boolean,
+    async: boolean   
   }
   defstruct type: "FunctionExpression", 
             loc: nil, 
             params: [],
             defaults: [],
             body: %ESTree.BlockStatement{},
             generator: false,
-            expression: false  
+            expression: false,
+            async: false
 end 

lib/es_tree/tools/builder.ex

@@ -46,6 +46,17 @@ defmodule ESTree.Tools.Builder do
     }
   end
 
+  @spec await_expression(
+    ESTree.Expression.t | nil, 
+    boolean,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.AwaitExpression.t
+  def await_expression(argument, all \\ false, loc \\ nil) do
+    %ESTree.AwaitExpression{ 
+      argument: argument, all: all, loc: loc
+    }
+  end
+
   @spec binary_expression(
     ESTree.binary_operator, 
     ESTree.Expression.t, 
@@ -291,12 +302,13 @@ defmodule ESTree.Tools.Builder do
     ESTree.BlockStatement.t,
     boolean,
     boolean,
+    boolean,
     ESTree.SourceLocation.t | nil
   ) :: ESTree.FunctionDeclaration.t
-  def function_declaration(id, params, defaults, body, generator \\ false, expression \\ false, loc \\ nil) do
+  def function_declaration(id, params, defaults, body, generator \\ false, expression \\ false, async \\ false, loc \\ nil) do
     %ESTree.FunctionDeclaration{ 
       id: id, params: params, defaults: defaults, 
-      body: body, generator: generator,
+      body: body, generator: generator, async: async,
       expression: expression, loc: loc 
     }
   end 
@@ -307,12 +319,13 @@ defmodule ESTree.Tools.Builder do
     ESTree.BlockStatement.t,
     boolean,
     boolean,
+    boolean,
     ESTree.SourceLocation.t | nil
   ) :: ESTree.FunctionExpression.t
-  def function_expression(params, defaults, body, generator \\ false, expression \\ false, loc \\ nil) do
+  def function_expression(params, defaults, body, generator \\ false, expression \\ false, async \\ false, loc \\ nil) do
     %ESTree.FunctionExpression{ 
       params: params, defaults: defaults,
-      body: body, generator: generator,
+      body: body, generator: generator, async: async,
       expression: expression, loc: loc 
     }
   end 

lib/es_tree/tools/generator.ex

@@ -68,18 +68,20 @@ defmodule ESTree.Tools.Generator do
 
   def do_generate(%ESTree.FunctionDeclaration{} = ast, level) do
     generator = if ast.generator, do: "*", else: ""
+    async = if ast.async, do: "async ", else: ""
 
     params = params_and_defaults(ast.params, ast.defaults)
     id = generate(ast.id)
 
-    "function#{generator} #{id}(#{params})#{generate(ast.body, level + 1)}"
+    "#{async}function#{generator} #{id}(#{params})#{generate(ast.body, level + 1)}"
   end
 
   def do_generate(%ESTree.FunctionExpression{} = ast, level) do
     generator = if ast.generator, do: "*", else: ""
+    async = if ast.async, do: "async ", else: ""
     params = params_and_defaults(ast.params, ast.defaults)
 
-    "function#{generator}(#{params})#{generate(ast.body, level + 1)}"
+    "#{async}function#{generator}(#{params})#{generate(ast.body, level + 1)}"
   end
 
   def do_generate(%ESTree.EmptyStatement{}, level) do
@@ -687,6 +689,10 @@ defmodule ESTree.Tools.Generator do
     "`#{literal}`"
   end
 
+  def do_generate(%ESTree.AwaitExpression{ argument: argument, all: all }, level) do
+    "await #{generate(argument)}"
+  end
+
   defp convert_string_characters(str) do
     String.replace(str, "\n", "\\n")
         |> String.replace("\t", "\\t")

mix.exs

@@ -3,7 +3,7 @@ defmodule ESTree.Mixfile do
 
   def project do
     [app: :estree,
-     version: "2.0.1",
+     version: "2.1.0",
      elixir: "~> 1.0",
      deps: deps,
      description: description,