Make sure that remote ast works correctly with variables

bryanjos · bryanjos · commit a34c875da004 · 2017-09-08T21:08:54.000-05:00
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -323,7 +323,7 @@ defmodule ElixirScript.Translate.Form do
     {ast, state}
   end
 
-  def compile({{:., _, [{_, _, nil} = var, func_or_prop]}, _, []}, state) do
+  def compile({{:., _, [{_, _, atom} = var, func_or_prop]}, _, []}, state) when is_atom(atom) do
     ast = Helpers.call(
       ElixirScript.Translate.Forms.JS.call_property(),
       [compile!(var, state), J.literal(to_string(func_or_prop))]
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -98,8 +98,8 @@ function map_to_object(map, options = []) {
     if (opt_keys === Symbol.for('string') && typeof key === 'number') {
       key = key.toString();
     } else if (
-      (opt_keys === Symbol.for('string') || opt_symbols !== Symbol.for('undefined'))
-      && typeof key === 'symbol'
+      (opt_keys === Symbol.for('string') || opt_symbols !== Symbol.for('undefined')) &&
+      typeof key === 'symbol'
     ) {
       key = erlang.atom_to_binary(key);
     }
@@ -121,8 +121,8 @@ function object_to_map(object, options = []) {
   const opt_recurse_array = proplists.get_value(Symbol.for('recurse_array'), options) === true;
 
   if (object.constructor === Object) {
-    let map = new Map();
-    Reflect.ownKeys(object).forEach(key => {
+    const map = new Map();
+    Reflect.ownKeys(object).forEach((key) => {
       let key2 = key;
       let value = object[key];
       if (opt_atom_keys && typeof key === 'string') {
@@ -135,18 +135,15 @@ function object_to_map(object, options = []) {
       map.set(key2, value);
     });
     return map;
-
   } else if (object instanceof Array && opt_recurse_array) {
-    return object.map(function(ele) {
+    return object.map((ele) => {
       if (ele.constructor === Object || ele instanceof Array) {
         return object_to_map(ele, options);
       }
       return ele;
     });
-
-  } else {
-    throw new Error(`Object ${object} is not an native object or array`);
   }
+  throw new Error(`Object ${object} is not an native object or array`);
 }
 
 class Recurse {
diff --git a/test/integration/integration_test.exs b/test/integration/integration_test.exs
@@ -11,4 +11,12 @@ defmodule ElixirScript.Integration.Test do
     val = call_compiled_function Integration, :test_string_interpolation, []
     assert val == "5"
   end
+
+  test "shorthand failure" do
+    val = call_compiled_function Integration, :shorthand_failure, []
+    assert val == [
+      [:option, %{value: "test@hotmail.com"}, "test@hotmail.com"],
+      [:option, %{value: "test2@hotmail.com"}, "test2@hotmail.com"]
+    ]
+  end
 end
diff --git a/test/support/integration.ex b/test/support/integration.ex
@@ -4,4 +4,10 @@ defmodule Integration do
   def test_string_interpolation do
     "#{5}"
   end
+
+  def shorthand_failure do
+    orders = [%{email: "test@hotmail.com"},%{email: "test2@hotmail.com"}]
+    options = Enum.reduce(orders, [],
+    &(&2 ++ [ [:option, %{value: &1.email}, &1.email] ]))
+  end
 end
diff --git a/test/support/term_converter.ex b/test/support/term_converter.ex
@@ -38,11 +38,7 @@ defmodule ElixirScript.TermConverter do
     String.to_atom(term)
   end
 
-  def decode("null") do
-    nil
-  end
-
-  def decode(term) when is_binary(term) or is_boolean(term) or is_number(term) do
+  def decode(term) when is_binary(term) or is_boolean(term) or is_number(term) or is_nil(term) do
     term
   end
 
@@ -54,8 +50,8 @@ defmodule ElixirScript.TermConverter do
     List.to_tuple(terms)
   end
 
-  def decode(%{"__type__" => "map", "terms" => terms}) do
-    Enum.map(terms, fn [key, term] -> {decode(key), decode(term)} end)
+  def decode(%{"__type__" => "map", "values" => values}) do
+    Enum.map(values, fn [key, term] -> {decode(key), decode(term)} end)
     |> Enum.into(%{})
   end
 end
