Move manifest writing to the mix compiler

bryanjos · bryanjos · commit 3c8dcd19dbb0 · 2017-11-09T22:54:00.000-06:00
diff --git a/lib/elixir_script/compiler.ex b/lib/elixir_script/compiler.ex
@@ -32,12 +32,11 @@ defmodule ElixirScript.Compiler do
     FindUsedModules,
     FindUsedFunctions,
     Output,
-    Manifest,
   }
   alias ElixirScript.ModuleSystems.ES
   alias Kernel.ParallelCompiler
 
-  @spec compile(atom | [atom] | binary, []) :: [{atom, map}]
+  @spec compile(atom | [atom] | binary, []) :: map
   def compile(path, opts \\ [])
 
   def compile(path, opts) when is_binary(path) do
@@ -87,10 +86,7 @@ defmodule ElixirScript.Compiler do
 
     State.stop(pid)
 
-    manifest_path = Path.join(Mix.Project.manifest_path(), ".compile.elixir_script")
-    Manifest.write_manifest(manifest_path, modules, opts)
-
-    result
+    transform_output(modules, result, opts)
   end
 
   defp build_compiler_options(opts) do
@@ -107,4 +103,25 @@ defmodule ElixirScript.Compiler do
   defp on_module_compile(pid, _file, module, beam) do
     State.put_in_memory_module(pid, module, beam)
   end
+
+  defp transform_output(modules, compiled_js, opts) do
+    output_path = if opts.output == nil or opts.output == :stdout do
+     ""
+    else
+      Path.dirname(opts.output)
+    end
+
+    Enum.reduce(modules, %{}, fn {module, info}, current_data ->
+      info = %{
+        references: info.used_modules,
+        last_modified: info.last_modified,
+        beam_path: Map.get(info, :beam_path),
+        source: Map.get(info, :file),
+        js_path: Path.join(output_path, "#{module}.js"),
+        js_code: Keyword.get(compiled_js, module)
+      }
+
+      Map.put(current_data, module, info)
+    end)
+  end
 end
diff --git a/lib/elixir_script/manifest.ex b/lib/elixir_script/manifest.ex
@@ -6,24 +6,10 @@ defmodule ElixirScript.Manifest do
 
   end
 
-  @spec write_manifest(binary, [{atom, map}], map) :: :ok
-  def write_manifest(manifest_path, modules, opts) do
-    output_path = if opts.output == nil or opts.output == :stdout do
-     ""
-    else
-      Path.dirname(opts.output)
-    end
-
+  @spec write_manifest(binary, map) :: :ok
+  def write_manifest(manifest_path, modules) do
     data = Enum.reduce(modules, %{}, fn {module, info}, current_data ->
-      info = %{
-        references: info.used_modules,
-        last_modified: info.last_modified,
-        beam_path: Map.get(info, :beam_path),
-        source: Map.get(info, :file),
-        js_path: Path.join(output_path, "#{module}.js")
-      }
-
-      Map.put(current_data, module, info)
+      Map.put(current_data, module, Map.drop(info, :js_code))
     end)
 
     data = :erlang.term_to_binary(data, [:compressed])
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -7,7 +7,7 @@ defmodule ElixirScript.Output do
   @doc """
   Takes outputs the JavaScript code in the specified output
   """
-  @spec execute([atom], pid, map) :: any
+  @spec execute([atom], pid, map) :: [{atom, binary}]
   def execute(modules, pid, opts) do
     prepared_modules = modules
     |> Enum.filter(fn {_, info} -> Map.has_key?(info, :js_ast) end)
@@ -71,12 +71,10 @@ defmodule ElixirScript.Output do
     |> String.replace(".", "$")
   end
 
-  defp output(code, _, nil, _) do
-     code
-  end
-
-  defp output(code, _, :stdout, _) do
+  defp output(code, module, nil, _), do: {module, code}
+  defp output(code, module, :stdout, _) do
     IO.puts(code)
+    {module, code}
   end
 
   defp output(code, module, path, js_modules) do
@@ -99,6 +97,8 @@ defmodule ElixirScript.Output do
 
     copy_bootstrap_js(output_dir)
     File.write!(file_name, code)
+
+    {module, code}
   end
 
   defp copy_bootstrap_js(directory) do
diff --git a/lib/mix/tasks/compile.elixir_script.ex b/lib/mix/tasks/compile.elixir_script.ex
@@ -1,5 +1,6 @@
 defmodule Mix.Tasks.Compile.ElixirScript do
   use Mix.Task
+  alias ElixirScript.Manifest
 
   @recursive true
   @manifest ".compile.elixir_script"
@@ -43,7 +44,9 @@ defmodule Mix.Tasks.Compile.ElixirScript do
 
   defp do_compile() do
     {input, opts} = get_compiler_params()
-    ElixirScript.Compiler.compile(input, opts)
+    result = ElixirScript.Compiler.compile(input, opts)
+
+    Manifest.write_manifest(manifest(), result)
   end
 
   def clean do
diff --git a/test/compiler_test.exs b/test/compiler_test.exs
@@ -3,17 +3,17 @@ defmodule ElixirScript.Compiler.Test do
 
   test "Can compile one entry module" do
     result = ElixirScript.Compiler.compile(Version)
-    assert is_binary(hd(result))
+    assert result |> Map.to_list |> hd |> elem(1) |> Map.get(:js_code) |> is_binary
   end
 
   test "Can compile multiple entry modules" do
     result = ElixirScript.Compiler.compile([Atom, String, Agent])
-    assert is_binary(hd(result))
+    assert result |> Map.to_list |> hd |> elem(1) |> Map.get(:js_code) |> is_binary
   end
 
   test "Output" do
     result = ElixirScript.Compiler.compile(Atom, [])
-    assert hd(result) =~ "export default"
+    assert result |> Map.to_list |> hd |> elem(1) |> Map.get(:js_code) =~ "export default"
   end
 
   test "compile file" do
