add map_to_valid_object/1, symbol_to_string/1

vans163 · vans163 · commit 0b95bc11078d · 2017-08-30T12:54:58.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [unreleased]
 ### Added
 - Reimplement `String.split_at/2` to make sure Unicode library isn't compiled
+- Added `ElixirScript.JS.map_to_valid_object/1` to make sure keys are strings, values not symbols
+- Added `ElixirScript.JS.symbol_to_string/1` to turn Symbol (Elixir atom) into string
 
 ### Fixed
 - Make sure not to add underscores to erlang functions
diff --git a/lib/elixir_script/lib/js.ex b/lib/elixir_script/lib/js.ex
@@ -62,4 +62,26 @@ defmodule ElixirScript.JS do
   ```
   """
   defexternal map_to_object(object)
+
+  @doc """
+  Takes the given map and returns a valid object
+  Throws an error if any key is not a
+  number, binary, or atom
+
+
+  ```elixir
+  ElixirScript.JS.map_to_valid_object(%{my: "map"})
+  ```
+  """
+  defexternal map_to_valid_object(object)
+
+  @doc """
+  Takes the given symbol and returns a string
+
+
+  ```elixir
+  ElixirScript.JS.symbol_to_string(:js_symbol)
+  ```
+  """
+  defexternal symbol_to_string(symbol)
 end
diff --git a/lib/elixir_script/passes/translate/forms/js.ex b/lib/elixir_script/passes/translate/forms/js.ex
@@ -104,4 +104,32 @@ defmodule ElixirScript.Translate.Forms.JS do
 
     {ast, state}
   end
+
+  def compile({{:., _, [ElixirScript.JS, :map_to_valid_object]}, _, [object]}, state) do
+    ast = Helpers.call(
+      J.member_expression(
+        Helpers.functions(),
+        J.identifier("map_to_valid_object")
+      ),
+      [
+        Form.compile!(object, state)
+      ]
+    )
+
+    {ast, state}
+  end
+
+  def compile({{:., _, [ElixirScript.JS, :symbol_to_string]}, _, [symbol]}, state) do
+    ast = Helpers.call(
+      J.member_expression(
+        Helpers.functions(),
+        J.identifier("symbol_to_string")
+      ),
+      [
+        Form.compile!(symbol, state)
+      ]
+    )
+
+    {ast, state}
+  end
 end
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -106,6 +106,35 @@ function map_to_object(map) {
   return object;
 }
 
+function symbol_to_string(symbol) {
+  const REGEX = /^Symbol\((.*)\)$/;
+  const string = symbol.toString();
+  return REGEX.exec(string)[1];
+}
+
+function map_to_valid_object(map) {
+  const object = {};
+
+  for (const [key, value] of map.entries()) {
+    var key2 = key;
+    if (typeof key == 'number') {
+      key2 = key.toString()
+    } else if (typeof key == 'symbol') {
+      key2 = symbol_to_string(key)
+    }
+
+    if (value instanceof Map) {
+      object[key2] = map_to_object(value);
+    } else if (typeof value == 'symbol') {
+      object[key2] = symbol_to_string(value);
+    } else {
+      object[key2] = value;
+    }
+  }
+
+  return object;
+}
+
 class Recurse {
   constructor(func) {
     this.func = func;
@@ -155,6 +184,8 @@ export default {
   defimpl,
   build_namespace,
   map_to_object,
+  symbol_to_string,
+  map_to_valid_object,
   trampoline,
   Recurse,
   split_at
diff --git a/test/passes/translate/forms/js_test.exs b/test/passes/translate/forms/js_test.exs
@@ -95,5 +95,20 @@ defmodule ElixirScript.Translate.Forms.JS.Test do
         J.identifier("entry0")
       ]
     )
+
+  test "map_to_valid_object/1" do
+    ast = {{:., [], [ElixirScript.JS, :map_to_valid_object]}, [], [{:entry, [], nil}]}
+    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(
+        Helpers.functions(),
+        J.identifier("map_to_valid_object")
+      ),
+      [
+        J.identifier("entry0")
+      ]
+    )
   end
 end
