Remove mutate/2

bryanjos · bryanjos · commit 049d1b444410 · 2017-07-19T20:24:58.000-05:00
Fix broken tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - ElixirScript now has an FFI layer for interoperability with JavaScript. For more details, see documentation at `ElixirScript.FFI`
-- ElixirScript.JS.mutate/2
 - ElixirScript.JS.mutate/3
 
 ### Changed
diff --git a/lib/elixir_script/lib/js.ex b/lib/elixir_script/lib/js.ex
@@ -38,17 +38,10 @@ defmodule ElixirScript.JS do
   """
   defmacro this()
 
-  @doc """
-  Mutates an existing JavaScript object.
-  ex:
-    ElixirScript.JS.mutate elem, %{"width" => 100}
-  """
-  defmacro update(object, map)
-
   @doc """
   Mutates an existing JavaScript object.
   ex:
     ElixirScript.JS.mutate elem, "width", 100
   """
-  defmacro update(object, key, value)
+  defmacro mutate(object, key, value)
 end
diff --git a/test/passes/translate/forms/js_test.exs b/test/passes/translate/forms/js_test.exs
@@ -65,48 +65,18 @@ defmodule ElixirScript.Translate.Forms.JS.Test do
     )
   end
 
-  test "mutate/2" do
-    properties = [{"a", 1}]
-    map_ast = {:%{}, [], properties}
-
-    ast = {{:., [], [ElixirScript.JS, :mutate]}, [], [{:%{}, [], []}, map_ast]}
-    state = %{function: {:each, nil}, module: Enum, vars: %{:_ => 0, "entry" => 0, "enumerable" => 0, "fun" => 0}}
-
-    {js_ast, _} = Form.compile(ast, state)
-    assert js_ast == J.call_expression(
-      J.member_expression(
-        J.identifier("Object"),
-        J.identifier("assign")
-      ),
-      [
-        J.object_expression([]),
-        J.object_expression([
-          J.property(
-            J.identifier("a"),
-            J.literal(1)
-          )
-        ])
-      ]
-    )
-  end
-
   test "mutate/3" do
     properties = [{"a", 1}]
     map_ast = {:%{}, [], properties}
 
-    ast = {{:., [], [ElixirScript.JS, :mutate]}, [], [map_ast, "a", 2]}
+    ast = {{:., [], [ElixirScript.JS, :mutate]}, [], [{:entry, [], nil}, "a", 2]}
     state = %{function: {:each, nil}, module: Enum, vars: %{:_ => 0, "entry" => 0, "enumerable" => 0, "fun" => 0}}
 
     {js_ast, _} = Form.compile(ast, state)
     assert js_ast == J.assignment_expression(
       :=,
       J.member_expression(
-        J.object_expression([
-          J.property(
-            J.identifier("a"),
-            J.literal(1)
-          )
-        ]),
+        J.identifier("entry0"),
         J.literal("a"),
         true
       ),
diff --git a/test/passes/translate/forms/map_test.exs b/test/passes/translate/forms/map_test.exs
@@ -9,19 +9,23 @@ defmodule ElixirScript.Translate.Forms.Map.Test do
     state = %{}
 
     {js_ast, _} = Form.compile(ast, state)
-    assert js_ast == J.object_expression([
-      J.property(
-        J.call_expression(
-          J.member_expression(
-            J.identifier("Symbol"),
-            J.identifier("for")
-          ),
-          [J.literal(:a)]
-        ),
-        J.literal(1),
-        :init, false, false, true      
-      )
-    ])
+    assert js_ast == J.new_expression(
+      J.identifier("Map"),
+      [
+        J.array_expression([
+          J.array_expression([
+              J.call_expression(
+                J.member_expression(
+                  J.identifier("Symbol"),
+                  J.identifier("for")
+                ),
+                [J.literal(:a)]
+              ),
+              J.literal(1),
+          ])
+        ])
+      ]
+    )
   end
 
   test "map with string key" do
@@ -30,12 +34,17 @@ defmodule ElixirScript.Translate.Forms.Map.Test do
     state = %{}
 
     {js_ast, _} = Form.compile(ast, state)
-    assert js_ast == J.object_expression([
-      J.property(
-        J.identifier("a"),
-        J.literal(1)  
-      )
-    ])
+    assert js_ast == J.new_expression(
+      J.identifier("Map"),
+      [
+        J.array_expression([
+          J.array_expression([
+            J.literal("a"),
+            J.literal(1),
+          ])
+        ])
+      ]
+    )
   end
 
 
@@ -47,28 +56,30 @@ defmodule ElixirScript.Translate.Forms.Map.Test do
 
     ast = {:%{}, [], [{:|, [], [map_ast, new_values]}]}
 
+    map_ast = J.new_expression(
+      J.identifier("Map"),
+      [
+        J.array_expression([
+          J.array_expression([
+            J.literal("a"),
+            J.literal(1),
+          ])
+        ])
+      ]
+    )
+
     {js_ast, _} = Form.compile(ast, state)
-    assert js_ast == J.call_expression(
-      J.member_expression(
-        J.identifier("Object"),
-        J.identifier("assign")
-      ),
+    assert js_ast == J.new_expression(
+      J.identifier("Map"),
       [
-        J.object_expression([]),
-        J.object_expression([
-              J.property(
-                J.identifier("a"),
-                J.literal(1)  
-              )
-            ]),
-        J.object_expression([
-              J.property(
-                J.identifier("a"),
-                J.literal(2)  
-              )
-            ])        
+        J.array_expression(
+          [J.spread_element(map_ast)] ++ [J.array_expression([
+            J.literal("a"),
+            J.literal(2)
+          ])]
+        )
       ]
     )
   end
 
-end
+end
