Add test for FFI output. Refactor debug_info for ElixirScript replacements

bryanjos · bryanjos · commit f5b09cb6e047 · 2017-07-14T20:44:43.000-05:00
diff --git a/lib/elixir_script/beam.ex b/lib/elixir_script/beam.ex
@@ -10,21 +10,11 @@ defmodule ElixirScript.Beam do
   @spec debug_info(atom) :: {:ok | :error, map | binary}
   def debug_info(module)
 
-  #Replacing String module with our ElixirScript's version
-  def debug_info(String) do
-    case debug_info(ElixirScript.String) do
+  #Replace some modules with ElixirScript versions
+  def debug_info(module) when module in [String, Agent] do
+    case debug_info(Module.concat(ElixirScript, module)) do
       {:ok, info} ->
-        {:ok, Map.put(info, :module, String)}
-      e ->
-        e
-    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)}
+        {:ok, Map.put(info, :module, module)}
       e ->
         e
     end
diff --git a/test/compiler_test.exs b/test/compiler_test.exs
@@ -6,8 +6,14 @@ defmodule ElixirScript.Compiler.Test do
     assert is_binary(result)
   end
 
+  test "Use defined module with FFI module" do
+    result = ElixirScript.Compiler.compile(Main)
+    assert is_binary(result)
+    assert result =~ "import Data_JSON from './data/json'"
+  end
+
   test "Can compile multiple entry modules" do
-    result = ElixirScript.Compiler.compile([Atom, String])
+    result = ElixirScript.Compiler.compile([Atom, String, Agent])
     assert is_binary(result)
   end
 
diff --git a/test/support/main.ex b/test/support/main.ex
@@ -1,5 +1,7 @@
 defmodule Main do
   def start(:normal, [callback]) do
     callback.("started")
+
+    Data.JSON.stringify(1)
   end
 end
