Merge pull request #7 from bryanjos/jsx

bryanjos · bryanjos · commit f23fe863ab22 · 2016-01-28T22:02:27.000-06:00
JSX
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v2.2.0-dev
+* Enhancements:
+  * Added structs for JSX AST
+
 # v2.1.2
 
 * Bug fixes
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@ Defines structs that represent the JavaScript AST nodes from the ESTree spec.
 
 [ESTree Spec](https://github.com/estree/estree)
 
+[JSX AST Spec](https://github.com/facebook/jsx)
+
 Also includes a JavaScript AST to JavaScript code generator.
 
 ```elixir
@@ -16,5 +18,23 @@ ast = Builder.array_expression([
 ])
 
 Generator.generate(ast)
-#"[1, a]"
-```
+# "[1, a]"
+
+#jsx ast and generation
+    ast = Builder.jsx_element(
+      Builder.jsx_opening_element(
+        Builder.jsx_identifier(
+          "Test"
+        )
+      ),
+      [],
+      Builder.jsx_closing_element(
+        Builder.jsx_identifier(
+          "Test"
+        )
+      )
+    )
+    
+Generator.generate(ast)
+# "<Test></Test>"
+```
diff --git a/lib/es_tree/jsx_attribute.ex b/lib/es_tree/jsx_attribute.ex
@@ -0,0 +1,9 @@
+defmodule ESTree.JSXAttribute do
+  @type t :: %ESTree.JSXAttribute{ 
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil, 
+    name: ESTree.JSXIdentifier.t | ESTree.JSXNamespacedName.t,
+    value: ESTree.Literal.t | ESTree.JSXExpressionContainer.t | ESTree.JSXElement.t | nil
+  }
+  defstruct type: "JSXAttribute", loc: nil, name: nil, value: nil
+end 
diff --git a/lib/es_tree/jsx_closing_element.ex b/lib/es_tree/jsx_closing_element.ex
@@ -0,0 +1,8 @@
+defmodule ESTree.JSXClosingElement do
+  @type t :: %ESTree.JSXClosingElement{ 
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil, 
+    name: ESTree.JSXIdentifier.t | ESTree.JSXMemberExpression.t | ESTree.JSXNamespacedName.t
+  }
+  defstruct type: "JSXClosingElement", loc: nil, name: nil
+end 
diff --git a/lib/es_tree/jsx_element.ex b/lib/es_tree/jsx_element.ex
@@ -0,0 +1,10 @@
+defmodule ESTree.JSXElement do
+  @type t :: %ESTree.JSXElement{ 
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil,
+    openingElement: ESTree.JSXOpeningElement.t,
+    children: [ESTree.Literal.t | ESTree.JSXExpressionContainer.t | ESTree.JSXElement.t],
+    closingElement: ESTree.JSXClosingElement.t | nil
+  }
+  defstruct type: "JSXElement", loc: nil, openingElement: nil, children: [], closingElement: nil
+end
diff --git a/lib/es_tree/jsx_empty_expression.ex b/lib/es_tree/jsx_empty_expression.ex
@@ -0,0 +1,4 @@
+defmodule ESTree.JSXEmptyExpression do
+  @type t :: %ESTree.JSXEmptyExpression{ type: binary, loc: ESTree.SourceLocation.t | nil }
+  defstruct type: "JSXEmptyExpression", loc: nil
+end 
diff --git a/lib/es_tree/jsx_expression_container.ex b/lib/es_tree/jsx_expression_container.ex
@@ -0,0 +1,9 @@
+defmodule ESTree.JSXExpressionContainer do
+  @type t :: %ESTree.JSXExpressionContainer{
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil,
+    expression: ESTree.Expression.t | JSXEmptyExpression.t
+  }
+
+  defstruct type: "JSXExpressionContainer", loc: nil, expression: %ESTree.JSXEmptyExpression{}
+end 
diff --git a/lib/es_tree/jsx_identifier.ex b/lib/es_tree/jsx_identifier.ex
@@ -0,0 +1,9 @@
+defmodule ESTree.JSXIdentifier do
+  @type t :: %ESTree.JSXIdentifier{ 
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil, 
+    name: binary
+  }
+
+  defstruct type: "JSXIdentifier", loc: nil, name: nil
+end
diff --git a/lib/es_tree/jsx_member_expression.ex b/lib/es_tree/jsx_member_expression.ex
@@ -0,0 +1,14 @@
+ defmodule ESTree.JSXMemberExpression do
+  @type t :: %ESTree.JSXMemberExpression{ 
+    type: binary, 
+    loc: ESTree.SourceLocation.t | nil, 
+    object: ESTree.JSXMemberExpression.t | ESTree.JSXIdentifier.t,
+    property: ESTree.JSXIdentifier.t
+  }
+
+  defstruct type: "JSXMemberExpression", 
+  loc: nil, 
+  object: nil,
+  property: nil
+
+end 
diff --git a/lib/es_tree/jsx_namespaced_name.ex b/lib/es_tree/jsx_namespaced_name.ex
@@ -0,0 +1,14 @@
+defmodule ESTree.JSXNamespacedName do
+  @type t :: %ESTree.JSXNamespacedName{ 
+    type: binary, 
+    loc: ESTree.SourceLocation.t | nil, 
+    namespace: ESTree.JSXIdentifier.t,
+    name: ESTree.JSXIdentifier.t
+  }
+
+  defstruct type: "JSXNamespacedName", 
+  loc: nil, 
+  namespace: nil,
+  name: nil
+
+end 
diff --git a/lib/es_tree/jsx_opening_element.ex b/lib/es_tree/jsx_opening_element.ex
@@ -0,0 +1,10 @@
+defmodule ESTree.JSXOpeningElement do
+  @type t :: %ESTree.JSXOpeningElement{ 
+    type: binary,
+    loc: ESTree.SourceLocation.t | nil, 
+    name: ESTree.JSXIdentifier.t | ESTree.JSXMemberExpression.t | ESTree.JSXNamespacedName.t,
+    attributes: [ ESTree.JSXAttribute.t | ESTree.JSXSpreadAttribute.t ],
+    selfClosing: boolean
+  }
+  defstruct type: "JSXOpeningElement", loc: nil, name: nil, attributes: [], selfClosing: false
+end 
diff --git a/lib/es_tree/jsx_spread_attribute.ex b/lib/es_tree/jsx_spread_attribute.ex
@@ -0,0 +1,10 @@
+defmodule ESTree.JSXSpreadAttribute do
+  @type t :: %ESTree.JSXSpreadAttribute{ 
+    type: binary, 
+    loc: ESTree.SourceLocation.t | nil,
+    argument: ESTree.Expression.t
+  }
+  defstruct type: "JSXSpreadAttribute", 
+  loc: nil, 
+  argument: %ESTree.EmptyExpression{}
+end
diff --git a/lib/es_tree/tools/builder.ex b/lib/es_tree/tools/builder.ex
@@ -770,4 +770,115 @@ defmodule ESTree.Tools.Builder do
       argument: argument, loc: loc, delegate: delegate
     }
   end
+
+
+  @spec jsx_identifier(
+    binary,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXIdentifier.t
+  def jsx_identifier(name, loc \\ nil) do
+    %ESTree.JSXIdentifier{ 
+      name: name, loc: loc
+    }
+  end
+
+
+  @spec jsx_member_expression(
+    ESTree.JSXMemberExpression.t | ESTree.JSXIdentifier.t,
+    ESTree.JSXIdentifier.t,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.MemberExpression.t
+  def jsx_member_expression(object, property, loc \\ nil) do
+    %ESTree.JSXMemberExpression{ 
+      object: object, property: property, loc: loc
+    }
+  end
+
+  @spec jsx_namespaced_name(
+    ESTree.JSXIdentifier.t,
+    ESTree.JSXIdentifier.t,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXNamespacedName.t
+  def jsx_namespaced_name(namespace, name, loc \\ nil) do
+    %ESTree.JSXNamespacedName{ 
+      namespace: namespace, name: name, loc: loc
+    }
+  end
+
+  @spec jsx_empty_expression(
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXEmptyExpression.t
+  def jsx_empty_expression(loc \\ nil) do
+    %ESTree.JSXEmptyExpression{ 
+      loc: loc
+    }
+  end
+
+  @spec jsx_expression_container(
+    ESTree.Expression.t | ESTree.JSXEmptyExpression.t,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXExpressionContainer.t
+  def jsx_expression_container(expression, loc \\ nil) do
+    %ESTree.JSXExpressionContainer{ 
+      expression: expression, loc: loc
+    }
+  end
+
+
+  @spec jsx_opening_element(
+    ESTree.JSXIdentifier.t | ESTree.JSXMemberExpression.t | ESTree.JSXNamespacedName.t,
+    [ ESTree.JSXAttribute.t | ESTree.JSXSpreadAttribute.t ],
+    boolean,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXOpeningElement.t
+  def jsx_opening_element(name, attributes \\ [], selfClosing \\ false, loc \\ nil) do
+    %ESTree.JSXOpeningElement{ 
+      name: name, attributes: attributes, selfClosing: selfClosing, loc: loc
+    }
+  end
+
+
+  @spec jsx_closing_element(
+    ESTree.JSXIdentifier.t | ESTree.JSXMemberExpression.t | ESTree.JSXNamespacedName.t,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXClosingElement.t
+  def jsx_closing_element(name, loc \\ nil) do
+    %ESTree.JSXClosingElement{ 
+      name: name, loc: loc
+    }
+  end
+
+
+  @spec jsx_attribute(
+    ESTree.JSXIdentifier.t | ESTree.JSXNamespacedName.t,
+    ESTree.Literal.t | ESTree.JSXExpressionContainer.t | ESTree.JSXElement.t | nil,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXAttribute.t
+  def jsx_attribute(name, value \\ nil, loc \\ nil) do
+    %ESTree.JSXAttribute{ 
+      name: name, value: value, loc: loc
+    }
+  end
+
+  @spec jsx_spread_attribute(
+    ESTree.Expression.t | nil,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.SpreadElement.t
+  def jsx_spread_attribute(argument, loc \\ nil) do
+    %ESTree.JSXSpreadAttribute{ 
+      argument: argument, loc: loc
+    }
+  end
+
+  @spec jsx_element(
+    ESTree.JSXOpeningElement.t,
+    [ESTree.Literal.t | ESTree.JSXExpressionContainer.t | ESTree.JSXElement.t],
+    ESTree.JSXClosingElement.t | nil,
+    ESTree.SourceLocation.t | nil
+  ) :: ESTree.JSXElement.t
+  def jsx_element(openingElement, children \\ [], closingElement \\ nil, loc \\ nil) do
+    %ESTree.JSXElement{ 
+      openingElement: openingElement, children: children, closingElement: closingElement, loc: loc
+    }
+  end
 end
diff --git a/lib/es_tree/tools/generator.ex b/lib/es_tree/tools/generator.ex
@@ -701,6 +701,48 @@ defmodule ESTree.Tools.Generator do
     "await #{generate(argument)}"
   end
 
+  def do_generate(%ESTree.JSXIdentifier{ name: name }, level) do
+    "#{name}"
+  end
+
+  def do_generate(%ESTree.JSXMemberExpression{ object: object, property: property }, level) do
+    "#{ generate(object) }.#{ generate(property) }"
+  end
+
+  def do_generate(%ESTree.JSXNamespacedName{ namespace: namespace, name: name }, level) do
+    "#{ generate(namespace) }:#{ generate(name) }"
+  end
+
+  def do_generate(%ESTree.JSXEmptyExpression{}, level) do
+    ""
+  end
+
+  def do_generate(%ESTree.JSXExpressionContainer{ expression: expression }, level) do
+    "{#{ generate(expression) }}"
+  end
+
+  def do_generate(%ESTree.JSXOpeningElement{ name: name, attributes: attributes, selfClosing: selfClosing }, level) do
+    selfClosing = if selfClosing, do: "/", else: ""
+
+    "<#{generate(name)} #{ Enum.map(attributes, &generate(&1)) |> Enum.join(" ") }#{selfClosing}>"
+  end
+
+  def do_generate(%ESTree.JSXClosingElement{ name: name }, level) do
+    "</#{ generate(name) }>"
+  end
+
+  def do_generate(%ESTree.JSXAttribute{ name: name, value: value }, level) do
+    "#{ generate(name) }=#{ generate(value) }"
+  end
+
+  def do_generate(%ESTree.JSXSpreadAttribute{ argument: argument }, level) do
+    "{...#{ generate(argument) }}"
+  end
+
+  def do_generate(%ESTree.JSXElement{ openingElement: openingElement, children: children, closingElement: closingElement }, level) do
+    "#{ generate(openingElement) } #{ Enum.map(children, &generate(&1, level + 1)) |> Enum.join(" ") } #{ generate(closingElement) }"
+  end
+
   defp convert_string_characters(str) do
     String.replace(str, "\n", "\\n")
         |> String.replace("\t", "\\t")
diff --git a/mix.exs b/mix.exs
@@ -3,7 +3,7 @@ defmodule ESTree.Mixfile do
 
   def project do
     [app: :estree,
-     version: "2.1.2",
+     version: "2.2.0-dev",
      elixir: "~> 1.0",
      deps: deps,
      description: description,
diff --git a/test/tools/generator/jsx_test.exs b/test/tools/generator/jsx_test.exs
