Add map_to_object/2

vans163 · vans163 · commit 5bdbd78f4169 · 2017-08-31T23:01:00.000-04:00
Squashed commit of the following: commit 2c2198e Author: vans163 <vans_163@yahoo.com> Date: Wed Aug 30 13:00:58 2017 -0400 export default commit 1400a8b Merge: ce710b5 338e792 Author: vans163 <vans_163@yahoo.com> Date: Wed Aug 30 12:57:09 2017 -0400 Merge branch 'map_to_valid_object' of https://github.com/vans163/elixirscript into map_to_valid_object commit ce710b5 Author: vans163 <vans_163@yahoo.com> Date: Wed Aug 30 12:54:37 2017 -0400 fix whitespace commit 3833893 Author: vans163 <vans_163@yahoo.com> Date: Wed Aug 30 12:44:54 2017 -0400 changed to use map_to_object/2 commit a7ec702 Author: vans163 <vans_163@yahoo.com> Date: Fri Aug 25 13:29:38 2017 -0400 fix broken syntax on js_test.ex commit 0b95bc1 Author: vans163 <vans_163@yahoo.com> Date: Fri Aug 25 13:24:01 2017 -0400 add map_to_valid_object/1, symbol_to_string/1 commit 338e792 Author: vans163 <vans_163@yahoo.com> Date: Wed Aug 30 12:44:54 2017 -0400 changed to use map_to_object/2 commit e1cc332 Author: vans163 <vans_163@yahoo.com> Date: Fri Aug 25 13:29:38 2017 -0400 fix broken syntax on js_test.ex commit 8e8e4da Author: vans163 <vans_163@yahoo.com> Date: Fri Aug 25 13:24:01 2017 -0400 add map_to_valid_object/1, symbol_to_string/1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +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_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
@@ -62,4 +61,15 @@ defmodule ElixirScript.JS do
   ```
   """
   defexternal map_to_object(object)
+
+  @doc """
+  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_object(%{my: "map"}, keys: :string)
+  ```
+  """
+  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
@@ -104,4 +104,19 @@ defmodule ElixirScript.Translate.Forms.JS do
 
     {ast, state}
   end
+
+  def compile({{:., _, [ElixirScript.JS, :map_to_object]}, _, [object, options]}, state) do
+    ast = Helpers.call(
+      J.member_expression(
+        Helpers.functions(),
+        J.identifier("map_to_object")
+      ),
+      [
+        Form.compile!(object, state),
+        Form.compile!(options, state)
+      ]
+    )
+
+    {ast, state}
+  end
 end
diff --git a/src/javascript/lib/core/erlang_compat/proplists.js b/src/javascript/lib/core/erlang_compat/proplists.js
@@ -0,0 +1,26 @@
+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;
+    }
+}
+
+export default {
+  get_value,
+  is_defined
+};
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,12 +94,26 @@ 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()) {
+  var type_keys = proplists.get_value(Symbol("keys"), options);
+  var symbols = proplists.get_value(Symbol("symbols"), options);
+
+  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[key] = map_to_object(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[key] = value;
     }
diff --git a/src/javascript/tests/core/functions.spec.js b/src/javascript/tests/core/functions.spec.js
@@ -24,3 +24,16 @@ test('split_at', t => {
   t.deepEqual(Functions.split_at('abc', -1000).values, ['', 'abc']);
   t.deepEqual(Functions.split_at('😀abélkm', 4).values, ['😀abé', 'lkm']);
 });
+
+test('map_to_object/2', t => {
+  const map = new Map([
+    [Symbol.for('key'), "value"],
+    [Symbol.for('anotherKey'), "value2"],
+  ]);
+
+  const options = [new Core.Tuple(Symbol.for('keys'),Symbol.for('strings'))];
+
+  const result = Functions.map_to_object(map, options);
+
+  t.deepEqual(result, {key: "value", anotherKey: "value"});
+});
