Added View module for updating view based on state passed in

bryanjos · bryanjos · commit c2ae00c0ca51 · 2015-11-27T14:03:45.000-06:00
diff --git a/lib/elixir_script/lib/html.ex b/lib/elixir_script/lib/html.ex
@@ -30,26 +30,42 @@ defmodule ElixirScript.Html do
     @doc """
     Defines a macro for the html element, #{tag}
     """
-    defmacro unquote(tag)(attributes \\ [], block \\ [do: nil]) do
+    defmacro unquote(tag)(attrs, do: inner) do
       tag = Atom.to_string(unquote(tag))
+      { inner, attributes } = do_tag(inner, attrs)
 
-      inner = case Keyword.get(block, :do) do
-        {:__block__, [], params} ->
-          params
-        nil ->
-          []
-        x ->
-          [x]
+      quote do
+         Elixir.VirtualDOM.h(unquote(tag), unquote(attributes), unquote_splicing(inner))
       end
+    end
+
+    defmacro unquote(tag)(attrs \\ []) do
+      tag = Atom.to_string(unquote(tag))
 
-      attributes = config_to_map(attributes)
+      { inner, attributes } = Dict.pop(attrs, :do)
+      { inner, attributes } = do_tag(inner, attributes)
 
       quote do
          Elixir.VirtualDOM.h(unquote(tag), unquote(attributes), unquote_splicing(inner))
       end
     end
   end
 
+  defp do_tag(inner, attributes) do
+    inner = case inner do
+      {:__block__, [], params} ->
+        params
+      nil ->
+        []
+      x ->
+        [x]
+    end
+
+    attributes = config_to_map(attributes)
+
+    {inner, attributes}
+  end
+
   defp config_to_map(config) do
     config = Enum.map(config, fn({key, value}) ->
     if is_atom(key) do
diff --git a/lib/elixir_script/translator/function.ex b/lib/elixir_script/translator/function.ex
@@ -5,13 +5,12 @@ defmodule ElixirScript.Translator.Function do
   alias ElixirScript.Translator.Utils
   alias ElixirScript.PatternMatching.Match
   alias ElixirScript.Preprocess.Variables
-  alias ElixirScript.Translator.Map
 
   @standard_libs [
     :Patterns, :Kernel, :Atom, :Enum, :Integer, :JS,
     :List, :Range, :Tuple, :Agent, :Keyword, :BitString,
     :Base, :String, :Bitwise, :Collectable, :Enumerable,
-    :Inspect, :Map, :MapSet, :Set, :VirtualDom, :ViewAgent
+    :Inspect, :Map, :MapSet, :Set, :VirtualDom, :View
   ]
 
   def update_alias({:__aliases__, context, [:List, :Chars]}) do
diff --git a/priv/elixir.js b/priv/elixir.js
diff --git a/src/javascript/elixir.js b/src/javascript/elixir.js
@@ -25,3 +25,4 @@ export { default as Set } from './lib/set';
 export { default as MapSet } from './lib/map_set';
 export { IntegerType, FloatType } from './lib/protocol';
 export { default as VirtualDOM } from './lib/virtual-dom';
+export { default as View } from './lib/view';
diff --git a/src/javascript/lib/view.js b/src/javascript/lib/view.js
@@ -0,0 +1,50 @@
+import Kernel from './kernel';
+import Keyword from './keyword';
+import VirtualDOM from './virtual-dom';
+
+
+const start = function(domRoot, renderFn, initialState, options = []){
+  const name = Keyword.has_key__qm__(options, Kernel.SpecialForms.atom("name")) ? Keyword.get(options, Kernel.SpecialForms.atom("name")) : Symbol();
+
+  self.post_office.add_mailbox(name);
+
+  const tree = renderFn.apply(this, initialState);
+  const rootNode = VirtualDOM.create(tree);
+
+  domRoot.appendChild(rootNode);
+  self.post_office.send(name, Kernel.SpecialForms.tuple(rootNode, tree, renderFn));
+
+  return Kernel.SpecialForms.tuple(Kernel.SpecialForms.atom("ok"), name);
+}
+
+const stop = function(agent, timeout = 5000){
+  self.post_office.remove_mailbox(agent);
+  return Kernel.SpecialForms.atom("ok");
+}
+
+
+const update = function(agent, state){
+
+  const current_state = self.post_office.receive(agent);
+
+  let rootNode = Kernel.elem(current_state, 0);
+  let tree = Kernel.elem(current_state, 1);
+  let renderFn = Kernel.elem(current_state, 2);
+
+  let newTree = renderFn.apply(this, state);
+
+  let patches = VirtualDOM.diff(tree, newTree)
+  rootNode = VirtualDOM.patch(rootNode, patches)
+
+
+  self.post_office.send(agent, Kernel.SpecialForms.tuple(rootNode, newTree, renderFn));
+
+  return Kernel.SpecialForms.atom("ok");
+}
+
+
+export default {
+  start,
+  stop,
+  update
+}
