Move manifest writing to top level of compiler

bryanjos · bryanjos · commit 3ae89c6e650c · 2017-11-09T19:27:02.000-06:00
diff --git a/lib/elixir_script/compiler.ex b/lib/elixir_script/compiler.ex
@@ -31,12 +31,13 @@ defmodule ElixirScript.Compiler do
     Translate,
     FindUsedModules,
     FindUsedFunctions,
-    Output
+    Output,
+    Manifest,
   }
   alias ElixirScript.ModuleSystems.ES
   alias Kernel.ParallelCompiler
 
-  @spec compile(atom | [atom] | binary, []) :: nil
+  @spec compile(atom | [atom] | binary, []) :: [{atom, map}]
   def compile(path, opts \\ [])
 
   def compile(path, opts) when is_binary(path) do
@@ -86,6 +87,9 @@ 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
   end
 
diff --git a/lib/elixir_script/manifest.ex b/lib/elixir_script/manifest.ex
@@ -6,8 +6,8 @@ defmodule ElixirScript.Manifest do
 
   end
 
-  @spec write_manifest(binary, [{atom, map}]) :: :ok
-  def write_manifest(manifest_path, modules) do
+  @spec write_manifest(binary, [{atom, map}], map) :: :ok
+  def write_manifest(manifest_path, modules, _opts) do
     data = Enum.reduce(modules, %{}, fn {module, info}, current_data ->
       info = %{
         references: info.used_modules,
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -3,7 +3,6 @@ defmodule ElixirScript.Output do
 
   alias ElixirScript.State, as: ModuleState
   alias ESTree.Tools.{Builder, Generator}
-  alias ElixirScript.Manifest
 
   @doc """
   Takes outputs the JavaScript code in the specified output
@@ -29,12 +28,7 @@ defmodule ElixirScript.Output do
     end)
 
 
-    result = create_modules(prepared_modules, opts, js_modules)
-
-    manifest_path = Path.join(Mix.Project.manifest_path(), ".compile.elixir_script")
-    Manifest.write_manifest(manifest_path, modules)
-
-    result
+    create_modules(prepared_modules, opts, js_modules)
   end
 
   defp concat(code) do
diff --git a/lib/mix/tasks/compile.elixir_script.ex b/lib/mix/tasks/compile.elixir_script.ex
@@ -2,6 +2,8 @@ defmodule Mix.Tasks.Compile.ElixirScript do
   use Mix.Task
 
   @recursive true
+  @manifest ".compile.elixir_script"
+  @manifest_vsn 1
 
   @moduledoc """
   Mix compiler to allow mix to compile Elixirscript source files into JavaScript
@@ -48,6 +50,9 @@ defmodule Mix.Tasks.Compile.ElixirScript do
     :ok
   end
 
+  def manifests, do: [manifest()]
+  defp manifest, do: Path.join(Mix.Project.manifest_path(), @manifest)
+
   @doc false
   def get_compiler_params() do
     elixirscript_config = get_elixirscript_config()
