Added assignment property

Author: bryanjos

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v2.3.0
+* Enhancements:
+  * Added AssignmentProperty for use with ObjectPattern
+  * Updated some typespecs to reflect updates in ESTree spec
+
 # v2.2.0
 * Enhancements:
   * Added structs for JSX AST

lib/es_tree/assignment_expression.ex

@@ -1,14 +1,14 @@
 defmodule ESTree.AssignmentExpression do
-  @type t :: %ESTree.AssignmentExpression{ 
-    type: binary, 
+  @type t :: %ESTree.AssignmentExpression{
+    type: binary,
     loc: ESTree.SourceLocation.t | nil,
     operator: ESTree.assignment_operator,
-    left: ESTree.Pattern.t | ESTree.Expression.t, 
+    left: ESTree.Pattern.t,
     right: ESTree.Expression.t
   }
-  defstruct type: "AssignmentExpression", 
-            loc: nil, 
+  defstruct type: "AssignmentExpression",
+            loc: nil,
             operator: nil,
             left: %ESTree.EmptyExpression{},
-            right: %ESTree.EmptyExpression{}            
-end 
+            right: %ESTree.EmptyExpression{}
+end 

lib/es_tree/assignment_property.ex

@@ -0,0 +1,10 @@
+defmodule ESTree.AssignmentProperty do
+  @type t :: %ESTree.AssignmentProperty{
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil,
+    value: ESTree.Pattern.t
+  }
+  defstruct type: "Property",
+  loc: nil,
+  value: %ESTree.EmptyExpression{}
+end

lib/es_tree/for_in_statement.ex

@@ -1,8 +1,8 @@
 defmodule ESTree.ForInStatement do
-  @type t :: %ESTree.ForInStatement{ 
-    type: binary, 
+  @type t :: %ESTree.ForInStatement{
+    type: binary,
     loc: ESTree.SourceLocation.t | nil,
-    left: ESTree.VariableDeclaration.t | ESTree.Expression.t ,
+    left: ESTree.VariableDeclaration.t | ESTree.Pattern.t ,
     right: ESTree.Expression.t ,
     body: ESTree.Statement.t
   }
@@ -11,4 +11,4 @@ defmodule ESTree.ForInStatement do
             left: %ESTree.EmptyExpression{},
             right: %ESTree.EmptyExpression{},
             body: %ESTree.EmptyStatement{}
-end 
+end 

lib/es_tree/for_of_statement.ex

@@ -1,14 +1,14 @@
 defmodule ESTree.ForOfStatement do
-  @type t :: %ESTree.ForOfStatement{ 
-    type: binary, 
+  @type t :: %ESTree.ForOfStatement{
+    type: binary,
     loc: ESTree.SourceLocation.t | nil,
-    left: ESTree.VariableDeclaration.t | ESTree.Expression.t ,
+    left: ESTree.VariableDeclaration.t | ESTree.Pattern.t ,
     right: ESTree.Expression.t ,
-    body: ESTree.Statement.t 
+    body: ESTree.Statement.t
   }
-  defstruct type: "ForOfStatement", 
-            loc: nil, 
+  defstruct type: "ForOfStatement",
+            loc: nil,
             left: %ESTree.EmptyExpression{},
             right: %ESTree.EmptyExpression{},
             body: %ESTree.EmptyStatement{}
-end 
+end

lib/es_tree/node.ex

@@ -8,8 +8,6 @@ defmodule ESTree.Node do
               ESTree.Pattern.t |
               ESTree.SwitchCase.t |
               ESTree.CatchClause.t |
-              ESTree.Identifier.t |
-              ESTree.Literal.t |
               ESTree.MethodDefinition.t |
               ESTree.Class.t |
               ESTree.ClassBody.t |

lib/es_tree/object_pattern.ex

@@ -1,10 +1,10 @@
 defmodule ESTree.ObjectPattern do
-  @type t :: %ESTree.ObjectPattern{ 
+  @type t :: %ESTree.ObjectPattern{
     type: binary,
     loc: ESTree.SourceLocation.t | nil,
-    properties: [ESTree.Property.t]
+    properties: [ESTree.AssignmentProperty.t]
   }
   defstruct type: "ObjectPattern",
             loc: nil,
             properties: []
-end 
+end

lib/es_tree/tools/builder.ex

@@ -28,24 +28,35 @@ defmodule ESTree.Tools.Builder do
     ESTree.SourceLocation.t | nil
   ) :: ESTree.ArrowFunctionExpression.t
   def arrow_function_expression(params, defaults, body, generator \\ false, expression \\ false, loc \\ nil) do
-    %ESTree.ArrowFunctionExpression{ 
-      params: params, defaults: defaults, 
-      body: body, generator: generator, expression: expression, loc: loc 
+    %ESTree.ArrowFunctionExpression{
+      params: params, defaults: defaults,
+      body: body, generator: generator, expression: expression, loc: loc
     }
   end 
 
   @spec assignment_expression(
-    ESTree.assignment_operator, 
-    ESTree.Pattern.t | ESTree.Expression.t, 
+    ESTree.assignment_operator,
+    ESTree.Pattern.t,
     ESTree.Expression.t,
     ESTree.SourceLocation.t | nil
   ) :: ESTree.AssignmentExpression.t
   def assignment_expression(operator, left, right, loc \\ nil) do
-    %ESTree.AssignmentExpression{ 
+    %ESTree.AssignmentExpression{
       operator: operator, left: left, right: right, loc: loc
     }
   end
 
+  @spec assignment_property(
+    ESTree.Pattern.t,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.AssignmentProperty.t
+  def assignment_property(value, loc \\ nil) do
+    %ESTree.AssignmentProperty{
+      value: value, loc: loc
+    }
+  end
+
+
   @spec await_expression(
     ESTree.Expression.t | nil, 
     boolean,
@@ -259,19 +270,19 @@ defmodule ESTree.Tools.Builder do
   end
 
   @spec for_in_statement(
-    ESTree.VariableDeclaration.t | ESTree.Expression.t,
+    ESTree.VariableDeclaration.t | ESTree.Pattern.t,
     ESTree.Expression.t,
     ESTree.Statement.t,
     ESTree.SourceLocation.t | nil
   ) :: ESTree.ForInStatement.t
   def for_in_statement(left, right, body, loc \\ nil) do
-    %ESTree.ForInStatement{ 
+    %ESTree.ForInStatement{
       left: left, right: right, body: body, loc: loc
     }
   end
 
   @spec for_of_statement(
-    ESTree.VariableDeclaration.t | ESTree.Expression.t,
+    ESTree.VariableDeclaration.t | ESTree.Pattern.t,
     ESTree.Expression.t,
     ESTree.Statement.t,
     ESTree.SourceLocation.t | nil

lib/es_tree/tools/generator.ex

@@ -456,9 +456,9 @@ defmodule ESTree.Tools.Generator do
     else
       ""
     end
-    
+
     params = params_and_defaults(ast.params, ast.defaults)
-    
+
     "(#{params})#{generator} => #{generate(ast.body)}"
   end
 
@@ -474,6 +474,11 @@ defmodule ESTree.Tools.Generator do
      "{" <> Enum.map_join(properties, ",", &generate(&1)) <> "}"
   end
 
+  def do_generate(%ESTree.AssignmentProperty{ value: value }, _) do
+    value = generate(value)
+    "#{value}"
+  end
+
   def do_generate(%ESTree.ArrayPattern{elements: elements}, level) do
      "[" <> Enum.map_join(elements, ",", &generate(&1)) <> "]"
   end

mix.exs

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