Move Elixir app code into core

bryanjos · bryanjos · commit beff4a7e48e1 · 2017-10-10T20:59:16.000-05:00
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -49,7 +49,12 @@ defmodule ElixirScript.Output do
   end
 
   defp concat(code) do
-    "'use strict';\nimport ElixirScript from './ElixirScript.Core.js';\n#{code}"
+    """
+    'use strict';
+    import ElixirScript from './ElixirScript.Core.js';
+    const Elixir = ElixirScript.Core.initApp();
+    #{code}
+    """
   end
 
   defp prepare_js_ast(js_ast) do
diff --git a/lib/elixir_script/passes/output/js_module.ex b/lib/elixir_script/passes/output/js_module.ex
@@ -2,77 +2,12 @@ defmodule ElixirScript.Output.JSModule do
   @moduledoc false
 
   alias ESTree.Tools.Builder, as: J
-  alias ElixirScript.Translate.Helpers
 
   def compile(body, opts, js_modules) do
-    elixir = Helpers.declare("Elixir", J.object_expression([]))
-
     imports = opts.module_formatter.build_imports(js_modules)
     exports = opts.module_formatter.build_export(J.identifier("Elixir"))
 
-    [elixir, create_atom_table(), start(), load(), imports] ++ body ++ [exports]
-  end
-
-  def start do
-    normal = Helpers.symbol("normal")
-
-    Helpers.assign(
-      J.member_expression(
-        J.identifier("Elixir"),
-        J.identifier("start")
-      ),
-      Helpers.function(
-        [J.identifier(:app), J.identifier(:args)],
-        J.block_statement([
-          Helpers.call(
-            J.member_expression(
-              Helpers.call(
-                J.member_expression(
-                  J.identifier(:app),
-                  J.identifier("__load")
-                ),
-                [J.identifier("Elixir")]
-              ),
-              J.identifier("start")
-            ),
-            [normal, J.identifier(:args)]
-          )
-        ])
-      )
-    )
-  end
-
-  def load do
-    Helpers.assign(
-      J.member_expression(
-        J.identifier("Elixir"),
-        J.identifier("load")
-      ),
-      Helpers.function(
-        [J.identifier(:module)],
-        J.block_statement([
-          J.return_statement(
-            Helpers.call(
-              J.member_expression(
-                J.identifier(:module),
-                J.identifier("__load")
-              ),
-              [J.identifier("Elixir")]
-            )
-          )
-        ])
-      )
-    )
-  end
-
-  defp create_atom_table() do
-    Helpers.assign(
-      J.member_expression(
-        J.identifier("Elixir"),
-        J.identifier("__table__")
-      ),
-      J.object_expression([])
-    )
+    [imports] ++ body ++ [exports]
   end
 
 end
diff --git a/src/javascript/lib/core.js b/src/javascript/lib/core.js
@@ -30,6 +30,18 @@ function get_global() {
   return null;
 }
 
+function initApp() {
+  const Elixir = {};
+
+  Elixir.__table__ = {};
+  Elixir.start = (app, args) => {
+    app.__load(Elixir).start(Symbol.for('normal'), args);
+  };
+  Elixir.load = module => module.__load(Elixir);
+
+  return Elixir;
+}
+
 const globalState = get_global();
 
 globalState.__elixirscript_store__ = new Map();
@@ -57,4 +69,5 @@ export default {
   elixir_config,
   math,
   proplists,
+  initApp,
 };
