Fixup and spec for object formatting

Author: bobjflong

lib/es_tree/tools/generator.ex

@@ -17,7 +17,7 @@ defmodule ESTree.Tools.Generator do
 
   @spec generate(ESTree.operator | ESTree.Node.t, integer) :: binary
   def generate(value, level \\ nil) do
-    "#{indent(level)}#{do_generate(value, calculate_next_level(level))}"
+    "#{do_generate(value, calculate_next_level(level))}"
   end
 
   def do_generate(nil, level)do
@@ -232,7 +232,10 @@ defmodule ESTree.Tools.Generator do
   end
 
   def do_generate(%ESTree.ObjectExpression{properties: properties}, level) do
-   "{#{newline(level)}#{indent(calculate_next_level(level))}" <> Enum.map_join(properties, ", ", &generate(&1, calculate_next_level(level))) <> "#{newline(level)}#{indent(level)}}"
+    next_level = calculate_next_level(level)
+    previous_level = calculate_previous_level(level)
+    key_value_separator = ",#{newline(level)}#{indent(level)}"
+   "{#{newline(level)}#{indent(level)}" <> Enum.map_join(properties, key_value_separator, &generate(&1)) <> "#{newline(level)}#{indent(previous_level)}}"
   end
 
   def do_generate(%ESTree.Property{key: key, value: value, kind: :init, shorthand: false, method: false, computed: false}, level) do
@@ -360,8 +363,8 @@ defmodule ESTree.Tools.Generator do
   end
 
   def do_generate(%ESTree.CallExpression{callee: %ESTree.MemberExpression{ object: %ESTree.FunctionExpression{} } = callee, arguments: arguments}, level) do
-    callee = generate(callee)
-    arguments = Enum.map_join(arguments, ",", &generate(&1))
+    callee = generate(callee, level)
+    arguments = Enum.map_join(arguments, ",", &generate(&1, level))
 
     "(#{callee}(#{arguments}))"
   end
@@ -374,7 +377,7 @@ defmodule ESTree.Tools.Generator do
 
   def do_generate(%ESTree.CallExpression{callee: callee, arguments: arguments}, level) do
     callee = generate(callee)
-    arguments = Enum.map_join(arguments, ",", &generate(&1))
+    arguments = Enum.map_join(arguments, ",", &generate(&1, calculate_previous_level(level)))
 
     "#{callee}(#{arguments})"
   end
@@ -785,6 +788,14 @@ defmodule ESTree.Tools.Generator do
     level + 1
   end
 
+  defp calculate_previous_level(nil) do
+    nil
+  end
+
+  defp calculate_previous_level(level) do
+    level - 1
+  end
+
   defp newline(nil) do
     ""
   end

test/tools/generator/formatting_test.exs

@@ -0,0 +1,50 @@
+defmodule ESTree.Tools.Generator.Formatting.Test do
+  use ShouldI
+  alias ESTree.Tools.Builder
+  alias ESTree.Tools.Generator
+
+  should "format objects" do
+    ast = Builder.object_expression([
+      Builder.property(
+        Builder.identifier(:key),
+        Builder.identifier(:value)
+      ),
+      Builder.property(
+        Builder.identifier(:key),
+        Builder.identifier(:value)
+      )
+    ])
+    assert Generator.generate(ast, 0) <> "\n" ==
+"""
+{
+  key: value,
+  key: value
+}
+"""
+  end
+
+  should "format objects in function calls" do
+    ast = Builder.call_expression(
+      Builder.identifier(:foo),
+      [
+        Builder.object_expression([
+          Builder.property(
+            Builder.identifier(:key),
+            Builder.identifier(:value)
+          ),
+          Builder.property(
+            Builder.identifier(:key),
+            Builder.identifier(:value)
+          )
+        ])
+      ]
+    )
+    assert Generator.generate(ast, 0) <> "\n" ==
+"""
+foo({
+  key: value,
+  key: value
+})
+"""
+  end
+end

test/tools/generator/object_expression_test.exs

@@ -34,7 +34,7 @@ defmodule ESTree.Tools.Generator.ObjectExpression.Test do
         Builder.identifier(:value1)
       )
     ])
-    assert Generator.generate(ast) == "{key: value, key1: value1}" 
+    assert Generator.generate(ast) == "{key: value,key1: value1}"
   end
 
 
@@ -51,7 +51,7 @@ defmodule ESTree.Tools.Generator.ObjectExpression.Test do
         :set
       ),
     ])
-    assert Generator.generate(ast) == "{get key() {}, set key(p) {}}" 
+    assert Generator.generate(ast) == "{get key() {},set key(p) {}}"
   end
 
   should "convert object when properties contains getter and setter methods" do
@@ -71,7 +71,7 @@ defmodule ESTree.Tools.Generator.ObjectExpression.Test do
         true
       ),
     ])
-    assert Generator.generate(ast) == "{key() {}, key(p) {}}" 
+    assert Generator.generate(ast) == "{key() {},key(p) {}}"
   end
 
   should "convert object when properties contains shorthand properties" do