Add more tests

bryanjos · bryanjos · commit 6ff7c750ac03 · 2017-06-25T19:52:04.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ stdlib_state.bin
 .nyc_output
 test/app/build
 .vscode
+cover
diff --git a/lib/elixir_script.ex b/lib/elixir_script.ex
@@ -1,2 +1,3 @@
 defmodule ElixirScript do
+  @moduledoc false
 end
diff --git a/lib/elixir_script/cli.ex b/lib/elixir_script/cli.ex
@@ -19,12 +19,6 @@ defmodule ElixirScript.CLI do
     f: :format
   ]
 
-  def main(argv) do
-    argv
-    |> parse_args
-    |> process
-  end
-
   def parse_args(args) do
     { options, input, errors } = OptionParser.parse(args, switches: @switches, aliases: @aliases)
 
@@ -43,7 +37,7 @@ defmodule ElixirScript.CLI do
 
   end
 
-  def help_message() do
+  defp help_message() do
   """
   usage: elixirscript <module> [options]
   <module> the entry module of your application
diff --git a/lib/elixir_script/compiler.ex b/lib/elixir_script/compiler.ex
@@ -28,9 +28,11 @@ defmodule ElixirScript.Compiler do
 
     IO.puts "Building Output"
     modules = ElixirScript.State.list_modules(pid)
-    ElixirScript.Output.execute(modules, pid)
+    result = ElixirScript.Output.execute(modules, pid)
   
     ElixirScript.State.stop(pid)
+
+    result
   end
 
   defp build_compiler_options(opts, entry_modules) do
diff --git a/lib/elixir_script/module_systems/common.ex b/lib/elixir_script/module_systems/common.ex
@@ -2,16 +2,14 @@ defmodule ElixirScript.ModuleSystems.Common do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
   alias ElixirScript.Translator
-  alias ElixirScript.Translator.State
-  alias ElixirScript.Translator.Utils
+  alias ElixirScript.Translator.{State, Utils}
 
   def build(imports, js_imports, body, exports) do
     module_imports = Enum.map(imports, fn {module, path} -> import_module(module, path) end)
 
     imports = js_imports
     |> Enum.map(fn
       {module, path} -> import_module(module, path)
-      {module, path, _} -> import_module(module, path)
     end)
 
     imports = Enum.uniq(imports ++ module_imports)
diff --git a/lib/elixir_script/module_systems/es.ex b/lib/elixir_script/module_systems/es.ex
@@ -1,17 +1,13 @@
 defmodule ElixirScript.ModuleSystems.ES do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translator
-  alias ElixirScript.Translator.State
-  alias ElixirScript.Translator.Utils
 
   def build(imports, js_imports, body, exports) do
     module_imports = Enum.map(imports, fn {module, path} -> import_module(module, path) end)
 
     imports = js_imports
     |> Enum.map(fn
       {module, path} -> import_module(module, path)
-      {module, path, default: true} -> import_module(module, path)
       {module, path, default: false} -> import_namespace_module(module, path)
     end)
 
diff --git a/lib/elixir_script/module_systems/namespace.ex b/lib/elixir_script/module_systems/namespace.ex
@@ -1,9 +1,6 @@
 defmodule ElixirScript.ModuleSystems.Namespace do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translator
-  alias ElixirScript.Translator.State
-  alias ElixirScript.Translator.Utils
   alias ElixirScript.Translate.Identifier
 
   def build(module_name, body, exports, env) do
@@ -15,20 +12,6 @@ defmodule ElixirScript.ModuleSystems.Namespace do
     Identifier.make_namespace_members(members)
   end
 
-  def import_module(module_name) do
-    name = ["Elixir" | Module.split(module_name) ] |> Enum.join("$")
-
-    declarator = JS.variable_declarator(
-      JS.identifier(name),
-      JS.call_expression(
-        module_name_function_call(module_name, "__load"),
-        [JS.identifier("Elixir")]
-      )
-    )
-
-    JS.variable_declaration([declarator], :const)
-  end
-
   defp build_namespace() do
     JS.member_expression(
       JS.identifier("Bootstrap"),
diff --git a/lib/elixir_script/module_systems/umd.ex b/lib/elixir_script/module_systems/umd.ex
@@ -1,17 +1,13 @@
 defmodule ElixirScript.ModuleSystems.UMD do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translator
-  alias ElixirScript.Translator.State
-  alias ElixirScript.Translator.Utils
 
   def build(imports, js_imports, body, exports) do
     module_imports = Enum.map(imports, fn {module, path} -> import_module(module, path) end)
 
     imports = js_imports
     |> Enum.map(fn
       {module, path} -> import_module(module, path)
-      {module, path, _} -> import_module(module, path)
     end)
 
     imports = Enum.uniq(imports ++ module_imports)
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -21,7 +21,7 @@ defmodule ElixirScript.FindUsedModules do
       {:ok, module, implementations} ->
         walk_protocol(module, implementations, pid)
       {:error, error} ->
-        raise "An error occurred while compiling #{inspect module}: #{error}"
+        raise ElixirScript.CompileError, "An error occurred while compiling #{inspect module}: #{error}"
     end
   end
 
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -63,17 +63,21 @@ defmodule ElixirScript.Output do
   end
 
   defp output(code, path) do
-    file_name = case Path.extname(path) do
-      ".js" ->
-        path
-      _ ->
-        Path.join([path, @generated_name])
-    end
+    file_name = get_output_file_name(path)
 
     if !File.exists?(Path.dirname(file_name)) do
       File.mkdir_p!(Path.dirname(file_name))
     end
 
     File.write!(file_name, code)
   end
+
+  def get_output_file_name(path) do
+    case Path.extname(path) do
+      ".js" ->
+        path
+      _ ->
+        Path.join([path, @generated_name])
+    end 
+  end
 end
diff --git a/lib/elixir_script/passes/translate/clause.ex b/lib/elixir_script/passes/translate/clause.ex
@@ -84,7 +84,7 @@ defmodule ElixirScript.Translate.Clause do
 
     return_statement = case declaration do
       %ESTree.ArrayPattern{elements: elements} ->
-        if(length(elements) == 1) do
+        if length(elements) == 1 do
           J.return_statement(hd(declaration.elements))
         else
           J.return_statement(J.array_expression(declaration.elements))
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -2,8 +2,7 @@ defmodule ElixirScript.Translate.Form do
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Forms.{Bitstring, Match, Try, For, Receive, Remote, Pattern}
   alias ElixirScript.Translate.Functions.{Erlang, Lists, Maps}
-  alias ElixirScript.Translate.Identifier
-  alias ElixirScript.Translate.Clause
+  alias ElixirScript.Translate.{Identifier, Clause}
   require Logger
 
   @moduledoc """
@@ -180,7 +179,9 @@ defmodule ElixirScript.Translate.Form do
   def compile({:receive, context, [blocks]}, state) do
     line = Keyword.get(context, :line, 1)
     {function, arity} = Map.get(state, :function)
-    Logger.warn "receive not supported, Module: #{inspect state.module}, Function: #{function}, Line: #{line}"
+    Logger.warn fn() ->
+      "receive not supported, Module: #{inspect state.module}, Function: #{function}, Line: #{line}"
+    end
     Receive.compile(blocks, state)
   end
 
diff --git a/lib/elixir_script/passes/translate/forms/bitstring.ex b/lib/elixir_script/passes/translate/forms/bitstring.ex
@@ -120,7 +120,7 @@ defmodule ElixirScript.Translate.Forms.Bitstring do
   end
 
   def make_interpolated_string(elements, state) do
-    translated_elements = Enum.map(elements, fn(x)->
+    translated_elements = Enum.map(elements, fn(x) ->
       case x do
         elem when is_binary(elem) ->
           Form.compile!(elem, state)
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -1,8 +1,9 @@
 defmodule ElixirScript.Translate.Forms.For do
+  @moduledoc false
+
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translate.Form
-  alias ElixirScript.Translate.Clause
-  alias ElixirScript.Translate.Forms.{Pattern}
+  alias ElixirScript.Translate.{Form, Clause}
+  alias ElixirScript.Translate.Forms.Pattern
 
  def compile({:for, _, generators}, state) do
     args = handle_args(generators, state)
diff --git a/lib/elixir_script/passes/translate/forms/map.ex b/lib/elixir_script/passes/translate/forms/map.ex
@@ -1,4 +1,5 @@
 defmodule ElixirScript.Translate.Forms.Map do
+  @moduledoc false
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Form
 
diff --git a/lib/elixir_script/passes/translate/forms/match.ex b/lib/elixir_script/passes/translate/forms/match.ex
@@ -1,7 +1,9 @@
 defmodule ElixirScript.Translate.Forms.Match do
+  @moduledoc false
+
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Form
-  alias ElixirScript.Translate.Forms.{Pattern}
+  alias ElixirScript.Translate.Forms.Pattern
 
   def compile({:=, _, [left, right]}, state) do
     { right_ast, state } = Form.compile(right, state)
diff --git a/lib/elixir_script/passes/translate/forms/pattern.ex b/lib/elixir_script/passes/translate/forms/pattern.ex
@@ -2,7 +2,7 @@ defmodule ElixirScript.Translate.Forms.Pattern do
   alias ElixirScript.Translate.Forms.Pattern.Patterns, as: PM
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Form
-  alias ElixirScript.Translate.Forms.{Bitstring}
+  alias ElixirScript.Translate.Forms.Bitstring
 
   @moduledoc """
   Handles all pattern matching translations
diff --git a/lib/elixir_script/passes/translate/forms/pattern/patterns.ex b/lib/elixir_script/passes/translate/forms/pattern/patterns.ex
@@ -1,4 +1,6 @@
 defmodule ElixirScript.Translate.Forms.Pattern.Patterns do
+  @moduledoc false
+
   alias ESTree.Tools.Builder, as: J
   
   @patterns J.member_expression(
diff --git a/lib/elixir_script/passes/translate/forms/remote.ex b/lib/elixir_script/passes/translate/forms/remote.ex
@@ -2,8 +2,7 @@ defmodule ElixirScript.Translate.Forms.Remote do
   @moduledoc false
 
   alias ESTree.Tools.Builder, as: J
-  alias ElixirScript.Translate.Form
-  alias ElixirScript.Translate.Identifier
+  alias ElixirScript.Translate.{Form, Identifier}
 
   @erlang_modules [
     :erlang,
@@ -126,10 +125,9 @@ defmodule ElixirScript.Translate.Forms.Remote do
   end
     
   def compile({:., _, [module, function]}, state) do
-    function_name = cond do
-      ElixirScript.Translate.Module.is_js_module(module, state) ->
+    function_name = if ElixirScript.Translate.Module.is_js_module(module, state) do
         ElixirScript.Translate.Identifier.make_extern_function_name(function)
-      true ->
+    else
         ElixirScript.Translate.Identifier.make_function_name(function)            
     end
 
diff --git a/lib/elixir_script/passes/translate/forms/try.ex b/lib/elixir_script/passes/translate/forms/try.ex
@@ -1,8 +1,7 @@
 defmodule ElixirScript.Translate.Forms.Try do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translate.Clause
-  alias ElixirScript.Translate.{Form, Function}
+  alias ElixirScript.Translate.{Form, Function, Clause}
 
   def compile(blocks, state) do
     try_block = Keyword.get(blocks, :do)
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -1,8 +1,7 @@
 defmodule ElixirScript.Translate.Function do
   alias ESTree.Tools.Builder, as: J
-  alias ElixirScript.Translate.Clause
+  alias ElixirScript.Translate.{Clause, Form}
   alias ElixirScript.Translate.Forms.Pattern
-  alias ElixirScript.Translate.Form
 
   @moduledoc """
   Translates the given Elixir function AST into the
@@ -115,10 +114,10 @@ defmodule ElixirScript.Translate.Function do
   end
 
   defp compile_clause({ _, args, guards, body}, state) do
-    state = if !Map.has_key?(state, :vars) do
-      Map.put(state, :vars, %{})
-    else
+    state = if Map.has_key?(state, :vars) do
       state
+    else
+      Map.put(state, :vars, %{})
     end
 
     {patterns, params, state} = Pattern.compile(args, state)
diff --git a/lib/elixir_script/passes/translate/module.ex b/lib/elixir_script/passes/translate/module.ex
@@ -1,9 +1,7 @@
 defmodule ElixirScript.Translate.Module do
   @moduledoc false
   alias ESTree.Tools.Builder, as: J
-  alias ElixirScript.Translate.Function
-  alias ElixirScript.Translate.Form
-  alias ElixirScript.Translate.Identifier
+  alias ElixirScript.Translate.{Function, Form, Identifier}
   alias ElixirScript.State, as: ModuleState
 
   @doc """
diff --git a/lib/elixir_script/passes/translate/protocol.ex b/lib/elixir_script/passes/translate/protocol.ex
@@ -1,9 +1,7 @@
 defmodule ElixirScript.Translate.Protocol do
   @moduledoc false
   alias ESTree.Tools.Builder, as: J
-  alias ElixirScript.Translate.Function
-  alias ElixirScript.Translate.Form
-  alias ElixirScript.Translate.Identifier
+  alias ElixirScript.Translate.{Function, Form, Identifier}
   alias ElixirScript.State, as: ModuleState
 
 
diff --git a/lib/elixir_script/state.ex b/lib/elixir_script/state.ex
@@ -60,8 +60,11 @@ defmodule ElixirScript.State do
   def get_javascript_modules(pid) do
     Agent.get(pid, fn(state) ->
       Map.get(state.compiler_opts, :js_modules, [])
-      |> Enum.map(fn({module_name, _path}) ->
-        module_name
+      |> Enum.map(fn
+        {module_name, _path} ->
+          module_name
+        {module_name, _path, _opts} ->
+          module_name
       end)
     end)
   end
diff --git a/lib/elixir_script/watcher.ex b/lib/elixir_script/watcher.ex
@@ -23,7 +23,9 @@ defmodule ElixirScript.Watcher do
 
     try do
       if input_changed?(to_string(path), state) do
-        Logger.debug "Event: #{inspect event} Path: #{path}"
+        Logger.debug fn() ->
+          "Event: #{inspect event} Path: #{path}"
+        end
         ElixirScript.Compiler.compile(state[:input], state[:options])
       end
     rescue
diff --git a/lib/mix/tasks/compile.elixir_script.ex b/lib/mix/tasks/compile.elixir_script.ex
@@ -53,7 +53,15 @@ defmodule Mix.Tasks.Compile.ElixirScript do
   end
 
   def clean do
-    #TODO: Figure out how to clean
+    {input, opts} = get_compiler_params()
+
+    case opts[:output] do
+      path when is_binary(path) ->
+        file_name = ElixirScript.Output.get_output_file_name(path)
+        File.rm!(file_name)
+      _ ->
+        nil
+    end
     :ok
   end
 
diff --git a/mix.exs b/mix.exs
diff --git a/mix.lock b/mix.lock
diff --git a/test/beam_test.exs b/test/beam_test.exs
diff --git a/test/cli_test.exs b/test/cli_test.exs
diff --git a/test/compiler_test.exs b/test/compiler_test.exs
diff --git a/test/support/user.ex b/test/support/user.ex

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`defmodule ElixirScript do`
	`2`	`+ @moduledoc false`
`2`	`3`	`end`