changed to use map_to_object/2

vans163 · vans163 · commit 3833893173fb · 2017-08-30T12:54:58.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,7 @@ 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
+- Added `ElixirScript.JS.map_to_object/2` with options [keys: :string, symbols: false]
 
 ### 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
@@ -50,7 +50,6 @@ defmodule ElixirScript.JS do
   """
   defexternal mutate(object, key, value)
 
-
   @doc """
   Takes the given map and returns an object
   Throws an error if any key is not a
@@ -64,24 +63,13 @@ defmodule ElixirScript.JS do
   defexternal map_to_object(object)
 
   @doc """
-  Takes the given map and returns a valid object
+  Takes the given map and returns an 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)
+  ElixirScript.JS.map_to_object(%{my: "map"}, keys: :string)
   ```
   """
-  defexternal symbol_to_string(symbol)
+  defexternal map_to_object(object, options)
 end
diff --git a/lib/elixir_script/passes/translate/forms/js.ex b/lib/elixir_script/passes/translate/forms/js.ex
@@ -105,28 +105,15 @@ defmodule ElixirScript.Translate.Forms.JS do
     {ast, state}
   end
 
-  def compile({{:., _, [ElixirScript.JS, :map_to_valid_object]}, _, [object]}, state) do
+  def compile({{:., _, [ElixirScript.JS, :map_to_object]}, _, [object, options]}, 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")
+        J.identifier("map_to_object")
       ),
       [
-        Form.compile!(symbol, state)
+        Form.compile!(object, state),
+        Form.compile!(options, state)
       ]
     )
 
diff --git a/src/javascript/lib/core/erlang_compat/proplists.js b/src/javascript/lib/core/erlang_compat/proplists.js
@@ -0,0 +1,21 @@
+import ErlangTypes from 'erlang-types';
+import lists from './lists';
+
+function get_value(key, list, defaultv = Symbol("undefined")) {
+    var tuple = lists.keyfind(key, 1, list)
+    if (tuple) {
+        [_symbol, value] = keys.values;
+        return value;
+    } else {
+        return defaultv;
+    }
+}
+
+function is_defined(key, list) {
+    var tuple = lists.keyfind(key, 1, list)
+    if (tuple) {
+        return true;
+    } else {
+        return false;
+    }
+}
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -1,5 +1,7 @@
 import Protocol from './protocol';
 import Core from '../core';
+import proplists from './erlang_compat/proplists';
+import erlang from './erlang_compat/erlang';
 
 function call_property(item, property) {
   if (!property) {
@@ -92,43 +94,28 @@ function build_namespace(ns, ns_string) {
   return parent;
 }
 
-function map_to_object(map) {
+function map_to_object(map, options = []) {
   const object = {};
 
-  for (const [key, value] of map.entries()) {
-    if (value instanceof Map) {
-      object[key] = map_to_object(value);
-    } else {
-      object[key] = value;
-    }
-  }
-
-  return object;
-}
-
-function symbol_to_string(symbol) {
-  const REGEX = /^Symbol\((.*)\)$/;
-  const string = symbol.toString();
-  return REGEX.exec(string)[1];
-}
+  var type_keys = proplists.get_value(Symbol("keys"), options);
+  var symbols = proplists.get_value(Symbol("symbols"), options);
 
-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)
+  for (var [key, value] of map.entries()) {
+    if (type_keys == Symbol("string") && typeof key == 'number') {
+      key = key.toString();
+    } else if (
+        (type_keys == Symbol("string") || symbols != Symbol("undefined")) 
+        && typeof key == 'symbol'
+    ) {
+      key = erlang.atom_to_binary(key);
     }
 
     if (value instanceof Map) {
-      object[key2] = map_to_object(value);
-    } else if (typeof value == 'symbol') {
-      object[key2] = symbol_to_string(value);
+      object[key] = map_to_object(value, options);
+    } else if (symbols != Symbol("undefined") && typeof value == 'symbol') {
+      object[key] = erlang.atom_to_binary(value);
     } else {
-      object[key2] = value;
+      object[key] = value;
     }
   }
 
@@ -184,8 +171,6 @@ 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
@@ -96,20 +96,4 @@ defmodule ElixirScript.Translate.Forms.JS.Test do
       ]
     )
   end
-
-  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
