Updated from testing

bryanjos · bryanjos · commit b57c2b137f64 · 2017-07-05T21:18:07.000-05:00
diff --git a/lib/elixir_script/beam.ex b/lib/elixir_script/beam.ex
@@ -20,6 +20,16 @@ defmodule ElixirScript.Beam do
     end
   end
 
+  #Replacing Agent module with our ElixirScript's version
+  def debug_info(Agent) do
+    case debug_info(ElixirScript.Agent) do
+      {:ok, info} ->
+        {:ok, Map.put(info, :module, Agent)}
+      e ->
+        e
+    end
+  end
+
   def debug_info(module) when is_atom(module) do
     #TODO: Get modified date from _beam_path to check for cached version?
     with  {_, beam, _beam_path} <- :code.get_object_code(module),
diff --git a/lib/elixir_script/lib/agent.ex b/lib/elixir_script/lib/agent.ex
@@ -0,0 +1,53 @@
+defmodule ElixirScript.Agent do
+  @moduledoc false
+
+  def start(fun, options \\ []) do
+    pid = JS.new JS.Bootstrap.Core.PID, []
+
+    name = if Keyword.has_key?(options, :name) do
+      Keyword.get(options, :name)
+    else
+      nil
+    end
+
+    ElixirScript.Store.create(pid, fun.(), name)
+    { :ok, pid }
+  end
+
+  def start_link(fun, options \\ []) do
+    pid = JS.new JS.Bootstrap.Core.PID, []
+
+    name = if Keyword.has_key?(options, :name) do
+      Keyword.get(options, :name)
+    else
+      nil
+    end
+
+    ElixirScript.Store.create(pid, fun.(), name)
+    { :ok, pid }
+  end
+
+  def stop(agent) do
+    ElixirScript.Store.remove(agent)
+    :ok
+  end
+
+  def update(agent, fun) do
+    current_state = ElixirScript.Store.read(agent)
+    ElixirScript.Store.update(agent, fun.(current_state))
+    :ok
+  end
+
+  def get(agent, fun) do
+    current_state = ElixirScript.Store.read(agent)
+    fun.(current_state)
+  end
+
+  def get_and_update(agent, fun) do
+    current_state = ElixirScript.Store.read(agent)
+    {val, new_state} = fun.(current_state)
+    ElixirScript.Store.update(agent, new_state)
+    val
+  end
+
+end
diff --git a/lib/elixir_script/lib/store.ex b/lib/elixir_script/lib/store.ex
@@ -0,0 +1,43 @@
+defmodule ElixirScript.Store do
+
+  defp get_key(key) do
+    real_key = case JS.__elixirscript_names__.has(key) do
+                 true ->
+                   JS.__elixirscript_names__.get(key)
+                 false ->
+                   key
+               end
+
+    case JS.__elixirscript_store__.has(real_key) do
+      true ->
+        real_key
+      false ->
+        JS.throw JS.new(JS.Error, ["Key Not Found"])
+    end
+  end
+
+  def create(key, value, name \\ nil) do
+    if name != nil do
+      JS.__elixirscript_names__.set(name, key)
+    end
+
+    JS.__elixirscript_store__.set(key, value)
+  end
+
+  def update(key, value) do
+    real_key = get_key(key)
+    JS.__elixirscript_store__.set(real_key, value)
+  end
+
+  def read(key) do
+    real_key = get_key(key)
+    JS.__elixirscript_store__.get(real_key)
+  end
+
+  def remove(key) do
+    real_key = get_key(key)
+    JS.__elixirscript_store__.delete(real_key)
+  end
+
+
+end
diff --git a/lib/elixir_script/passes/find_used_functions.ex b/lib/elixir_script/passes/find_used_functions.ex
@@ -36,7 +36,8 @@ defmodule ElixirScript.FindUsedFunctions do
 
     reachable_defs = Enum.filter(defs, fn
       { _, type, _, _} when type in [:defmacro, :defmacrop] -> false
-      { name, _, _, _} -> not(name in unreachable)
+      { name, _, _, _} ->
+        not(name in unreachable)
       _ -> true
     end)
 
@@ -128,8 +129,8 @@ defmodule ElixirScript.FindUsedFunctions do
   end
 
   defp walk({:%, _, [module, params]}, state) do
-    ModuleState.add_used(state.pid, module, {:__struct__, 0})
-    ModuleState.add_used(state.pid, module, {:__struct__, 1})
+    walk_module(module, :__struct__, 0, state.pid)
+    walk_module(module, :__struct__, 1, state.pid)
     walk(params, state)
   end
 
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -232,6 +232,11 @@ defmodule ElixirScript.FindUsedModules do
     walk({function, [], params}, state)
   end
 
+  defp walk({{:., _, [module, function]} = ast, _, params}, state) do
+    walk(ast, state)
+    walk(params, state)
+  end
+
   defp walk({:., _, [JS, _]}, _) do
     nil
   end
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -207,6 +207,15 @@ defmodule ElixirScript.Translate.Form do
     ElixirScript.Translate.Function.compile(ast, state)
   end
 
+  def compile({{:., _, [{_, _, nil} = var, func_or_prop]}, _, []}, state) do
+    ast = J.call_expression(
+      ElixirScript.Translate.Forms.JS.call_property(),
+      [compile!(var, state), J.literal(to_string(func_or_prop))]
+    )
+
+    {ast, state}
+  end
+
   def compile({{:., _, [JS, _]}, _, _} = ast, state) do
     ElixirScript.Translate.Forms.JS.compile(ast, state)
   end
diff --git a/lib/elixir_script/passes/translate/forms/js.ex b/lib/elixir_script/passes/translate/forms/js.ex
@@ -39,6 +39,13 @@ defmodule ElixirScript.Translate.Forms.JS do
   def compile({{:., _, [JS, :new]}, _, [module, params]}, state) do
     members = Module.split(module)
 
+    members = case members do
+      ["JS" | rest] ->
+        rest
+      x ->
+        x
+    end
+
     params = case params do
       p when is_list(p) ->
         Enum.map(params, &Form.compile!(&1, state))
diff --git a/lib/elixir_script/passes/translate/forms/pattern.ex b/lib/elixir_script/passes/translate/forms/pattern.ex
@@ -118,6 +118,21 @@ defmodule ElixirScript.Translate.Forms.Pattern do
 
   defp process_pattern({:%{}, _, props}, state) do
     properties = Enum.map(props, fn
+      {:__module__struct__, {_, _, nil} = var } ->
+       {pattern, params} = process_pattern(var, state)
+
+        a = J.object_expression([%ESTree.Property{
+            key: J.identifier("__MODULE__"),
+            value: hd(List.wrap(pattern))
+          }])
+
+        property = ElixirScript.Translate.Forms.Map.make_property(
+          Form.compile!(:__struct__, state),
+          a
+        )
+
+        { property, params }
+
       {:__module__struct__, module} ->
         a = J.object_expression([%ESTree.Property{
             key: J.identifier("__MODULE__"),
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "erlang-types": "^1.0.1",
-    "tailored": "^2.4.7"
+    "tailored": "^2.4.8"
   },
   "devDependencies": {
     "ava": "^0.19.1",
diff --git a/rollup.config.js b/rollup.config.js
@@ -8,12 +8,12 @@ export default {
   plugins: [
     nodeResolve({ jsnext: true }),
     babel({
-      babelrc: false,
-    }),
-    babili({
-      keepFnName: true,
-      keepClassName: true,
-    }),
+      babelrc: false
+    })
+    //babili({
+    //  keepFnName: true,
+    //  keepClassName: true,
+    //}),
   ],
-  targets: [{ dest: 'priv/build/iife/Elixir.Bootstrap.js', format: 'iife' }],
+  targets: [{ dest: 'priv/build/iife/Elixir.Bootstrap.js', format: 'iife' }]
 };
diff --git a/src/javascript/lib/core/erlang_compat/erlang.js b/src/javascript/lib/core/erlang_compat/erlang.js
@@ -202,7 +202,7 @@ function element(n, tuple) {
 }
 
 function setelement(index, tuple1, value) {
-  const tupleData = [...tuple1.data];
+  const tupleData = [...tuple1.values];
 
   tupleData[index - 1] = value;
 
@@ -220,28 +220,28 @@ function make_tuple(arity, initialValue) {
 }
 
 function insert_element(index, tuple, term) {
-  const list = [...tuple.data];
+  const list = [...tuple.values];
   list.splice(index - 1, 0, term);
 
   return new ErlangTypes.Tuple(...list);
 }
 
 function append_element(tuple, term) {
-  const list = [...tuple.data];
+  const list = [...tuple.values];
   list.push(term);
 
   return new ErlangTypes.Tuple(...list);
 }
 
 function delete_element(index, tuple) {
-  const list = [...tuple.data];
+  const list = [...tuple.values];
   list.splice(index - 1, 1);
 
   return new ErlangTypes.Tuple(...list);
 }
 
 function tuple_to_list(tuple) {
-  const list = [...tuple.data];
+  const list = [...tuple.values];
   return list;
 }
 
diff --git a/src/javascript/lib/core/erlang_compat/lists.js b/src/javascript/lib/core/erlang_compat/lists.js
@@ -263,5 +263,5 @@ export default {
   all,
   any,
   splitwith,
-  sort,
+  sort
 };
diff --git a/src/javascript/lib/core/erlang_compat/maps.js b/src/javascript/lib/core/erlang_compat/maps.js
@@ -129,7 +129,7 @@ function update(key, value, map1) {
     return new ErlangTypes.Tuple(BADMAP, map1);
   }
 
-  if (is_key(key) === false) {
+  if (is_key(key, map1) === false) {
     return new ErlangTypes.Tuple(BADKEY, key);
   }
 
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -24,7 +24,7 @@ function iterator_to_reducer(iterable, acc, fun) {
 
 function call_property(item, property) {
   if (!property) {
-    if (item instanceof Function) {
+    if (item instanceof Function || typeof item === 'function') {
       return item();
     }
 
@@ -54,7 +54,7 @@ function call_property(item, property) {
     throw new Error(`Property ${property} not found in ${item}`);
   }
 
-  if (item[prop] instanceof Function) {
+  if (item[prop] instanceof Function || typeof item[prop] === 'function') {
     return item[prop]();
   }
   return item[prop];
@@ -96,5 +96,5 @@ export default {
   defprotocol,
   defimpl,
   build_namespace,
-  iterator_to_reducer,
+  iterator_to_reducer
 };
diff --git a/test/support/main.ex b/test/support/main.ex
@@ -2,6 +2,10 @@ defmodule Main do
   def start(:normal, [callback]) do
     callback.("started")
 
-    Enum.each(1..3, fn x -> JS.console.log(x)  end)
+    JS.fetch("/api/todo").then(fn(response) ->
+      response.json()
+    end).catch(fn(err) ->
+      :console.debug(err)
+    end)
   end
 end
diff --git a/yarn.lock b/yarn.lock
@@ -3771,9 +3771,9 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tailored@^2.4.7:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.4.7.tgz#1d90846b4885631be00cfd8bc9f56b0dec1686bf"
+tailored@^2.4.8:
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.4.8.tgz#adef8f95aa621068d5735f970ceb458d689e6de5"
   dependencies:
     erlang-types "^1.0.0"
 
