Add js module to atom table

bryanjos · bryanjos · commit 547862e23fad · 2017-04-16T19:19:40.000-05:00
diff --git a/lib/elixir_script/passes/create_js_modules.ex b/lib/elixir_script/passes/create_js_modules.ex
@@ -65,10 +65,15 @@ defmodule ElixirScript.Passes.CreateJSModules do
 
     elixir = JS.variable_declaration([declarator], :const)
 
+    table_additions = Enum.map(opts.js_modules, fn
+      {module, path} -> add_import_to_table(module)
+      {module, path, _} -> add_import_to_table(module)
+    end)
+
     ast = opts.module_formatter.build(
       [],
       opts.js_modules,
-      [elixir, start, load] ++ body,
+      [elixir, create_atom_table(), start, load] ++ table_additions ++ body,
       JS.identifier("Elixir")
     )
 
@@ -128,4 +133,37 @@ defmodule ElixirScript.Passes.CreateJSModules do
       )
     )
   end
+
+  defp create_atom_table() do
+    JS.assignment_expression(
+      :=,
+      JS.member_expression(
+        JS.identifier("Elixir"),
+        JS.identifier("__table__")
+      ),
+      JS.object_expression([])
+    )
+  end
+
+  defp add_import_to_table(module_name) do
+    ref = ElixirScript.Translator.Identifier.make_namespace_members(module_name)
+    JS.assignment_expression(
+      :=,
+      JS.member_expression(
+        JS.member_expression(
+          JS.identifier("Elixir"),
+          JS.identifier("__table__")
+        ),
+        JS.call_expression(
+          JS.member_expression(
+            JS.identifier("Symbol"),
+            JS.identifier("for")            
+          ),
+          [JS.literal(ref.name)]
+        ),
+        true
+      ),
+      ref
+    )
+  end
 end
diff --git a/priv/std_lib/range.ex b/priv/std_lib/range.ex
@@ -3,10 +3,10 @@ defmodule ElixirScript.Range do
   defstruct first: nil, last: nil
 
   def new(first, last) do
-    %ElixirScript.Range{first: first, last: last}
+    %Range{first: first, last: last}
   end
 
-  def range?(%ElixirScript.Range{}), do: true
+  def range?(%Range{}), do: true
   def range?(_), do: false
 
 end
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -77,8 +77,8 @@ function build_namespace(ns, ns_string) {
     parent = parent[part];
   }
 
-  root.__table = ns.__table || {};
-  root.__table[Symbol.for(ns_string)] = parent;
+  root.__table__ = ns.__table__ || {};
+  root.__table__[Symbol.for(ns_string)] = parent;
 
   return parent;
 }

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ function build_namespace(ns, ns_string) {`
`77`	`77`	`parent = parent[part];`
`78`	`78`	`}`
`79`	`79`
`80`		`- root.__table = ns.__table \|\| {};`
`81`		`- root.__table[Symbol.for(ns_string)] = parent;`
	`80`	`+ root.__table__ = ns.__table__ \|\| {};`
	`81`	`+ root.__table__[Symbol.for(ns_string)] = parent;`
`82`	`82`
`83`	`83`	`return parent;`
`84`	`84`	`}`