Update elixirscript cli and mix task to use new compiler

bryanjos · bryanjos · commit 7150eeeef927 · 2017-05-31T19:57:27.000-05:00
diff --git a/lib/elixir_script/cli.ex b/lib/elixir_script/cli.ex
@@ -4,13 +4,19 @@ defmodule ElixirScript.CLI do
   @app_version Mix.Project.config()[:version]
 
   @switches [
-    output: :string, elixir: :boolean,
-    help: :boolean, full_build: :boolean, version: :boolean,
-    watch: :boolean, format: :string, js_module: [:string, :keep], remove_unused: :boolean
+    output: :string,
+    help: :boolean, 
+    version: :boolean,
+    watch: :boolean, 
+    format: :string, 
+    js_module: [:string, :keep]
   ]
 
   @aliases [
-    o: :output, e: :elixir, h: :help, v: :version, f: :format
+    o: :output,
+    h: :help, 
+    v: :version, 
+    f: :format
   ]
 
   def main(argv) do
@@ -39,19 +45,15 @@ defmodule ElixirScript.CLI do
 
   def help_message() do
   """
-  usage: elixirscript <input> [options]
-  <input> path to elixir files or
-  the elixir code string if passed the -e flag
+  usage: elixirscript <module> [options]
+  <module> the entry module of your application
 
   options:
   --js-module [<identifer>:<path>] A js module used in your code. ex: React:react
                         Multiple can be defined 
   -f  --format [format] module format of output. options: es (default), common, umd
   -o  --output [path]   places output at the given path. 
                         Can be a directory or filename.
-  -e  --elixir          read input as elixir code string
-  --remove-unused       Removes unused modules from output
-  --full-build          informs the compiler to do a full build instead of an incremental one
   -v  --version         the current version number
   -h  --help            this message
   """
@@ -79,27 +81,18 @@ defmodule ElixirScript.CLI do
     js_modules = Keyword.get_values(options, :js_module)
     |> build_js_modules
 
-    compile_opts = %{
-      include_path: true,
-      core_path: Keyword.get(options, :core_path, "Elixir.Bootstrap"),
-      full_build: Keyword.get(options, :full_build, false),
+    compile_opts = [
       output: Keyword.get(options, :output, :stdout),
       format: String.to_atom(Keyword.get(options, :format, "es")),
       js_modules: js_modules,
-      remove_unused: Keyword.get(options, :remove_unused, false)
-    }
+    ]
 
-    case options[:elixir] do
-      true ->
-        ElixirScript.compile(input, compile_opts)
-      _ ->
-        input = handle_input(input)
-        ElixirScript.compile_path(input, compile_opts)
-
-        if watch do
-          ElixirScript.Watcher.start_link(input, compile_opts)
-          :timer.sleep :infinity
-        end
+    input = handle_input(input)
+    ElixirScript.Compiler.compile(input, compile_opts)
+
+    if watch do
+      ElixirScript.Watcher.start_link(input, compile_opts)
+      :timer.sleep :infinity
     end
   end
 
@@ -117,6 +110,7 @@ defmodule ElixirScript.CLI do
     input = input
     |> Enum.map(fn(x) -> String.split(x, [" ", ","], trim: true) end)
     |> List.flatten
+    |> Enum.map(fn(x) -> Module.concat([x]) end)
   end
 
   defp build_js_modules(values) do
diff --git a/lib/elixir_script/watcher.ex b/lib/elixir_script/watcher.ex
@@ -24,7 +24,7 @@ defmodule ElixirScript.Watcher do
     try do
       if input_changed?(to_string(path), state) do
         Logger.debug "Event: #{inspect event} Path: #{path}"
-        ElixirScript.compile_path(state[:input], state[:options])
+        ElixirScript.Compiler.compile(state[:input], state[:options])
       end
     rescue
       x ->
diff --git a/lib/mix/tasks/compile.elixir_script.ex b/lib/mix/tasks/compile.elixir_script.ex
@@ -14,13 +14,13 @@ defmodule Mix.Tasks.Compile.ElixirScript do
           version: "0.1.0",
           elixir: "~> 1.0",
           deps: deps,
-          elixir_script: [ input: "src/exjs", output: "dest/js"],
-          compilers: [:elixir_script] ++ Mix.compilers
+          elixir_script: [ entry: Example, output: "dest/js"],
+          compilers: Mix.compilers ++ [:elixir_script]
         ]
       end
 
   Available options are:
-  * `input`: The folder to look for Elixirscript files in. (defaults to `lib/elixirscript`)
+  * `input`: The module or modules that are the entry to your application (required)
   * `output`: The path of the generated JavaScript file. (defaults to `priv/elixirscript`)
 
     If path ends in `.js` then that will be the name of the file. If a directory is given,
@@ -47,50 +47,30 @@ defmodule Mix.Tasks.Compile.ElixirScript do
   end
 
   defp do_compile(elixirscript_base, app) do
-    elixirscript_config = get_elixirscript_config()
-    File.mkdir_p!(elixirscript_base)
-    elixirscript_path = Path.join([elixirscript_base, "#{app}"])
-
-    input_path = elixirscript_config
-    |> Keyword.get(:input)
-    |> List.wrap
-    |> Enum.map(fn(path) ->
-      Path.absname(path)
-    end)
-    |> Enum.join("\n")
-
-    File.write!(elixirscript_path, input_path)
-
-    paths = [elixirscript_base, "*"]
-    |> Path.join()
-    |> Path.wildcard
-    |> Enum.map(fn(path) ->
-      app = Path.basename(path)
-      paths = path |> File.read!() |> String.split("\n")
-      {app, paths}
-    end)
-    |> Map.new
-
-    output_path = Keyword.get(elixirscript_config, :output)
-    format = Keyword.get(elixirscript_config, :format)
-    js_modules = Keyword.get(elixirscript_config, :js_modules, [])
-
-    ElixirScript.compile_path(paths, %{output: output_path, format: format, js_modules: js_modules})
+
+    {input, opts} = get_compiler_params()
+    ElixirScript.compiler.compile(input, opts)
   end
 
   def clean do
-    elixirscript_config = get_elixirscript_config()
-    output_path = Keyword.get(elixirscript_config, :output)
-
-    path = ElixirScript.Passes.HandleOutput.get_js_path(output_path)
-
-    if File.exists?(path) do
-      File.rm!(path)
-    end
-
+    #TODO: Figure out how to clean
     :ok
   end
 
+  @doc false
+  def get_compiler_params() do
+    elixirscript_config = get_elixirscript_config()
+    input = Keyword.fetch!(elixirscript_config, :input)
+    opts = [
+      output: Keyword.get(elixirscript_config, :output),
+      format: Keyword.get(elixirscript_config, :format),
+      js_modules: Keyword.get(elixirscript_config, :js_modules, [])
+    ]   
+
+    {input, opts}
+  end
+
+
   defp get_elixirscript_config() do
     config  = Mix.Project.config
     exjs_config = cond do
@@ -107,7 +87,6 @@ defmodule Mix.Tasks.Compile.ElixirScript do
 
   defp defaults() do
     [
-      input: "lib/elixirscript",
       output: "priv/elixirscript",
       format: :es
     ]
diff --git a/lib/mix/tasks/elixirscript.watch.ex b/lib/mix/tasks/elixirscript.watch.ex
@@ -14,51 +14,23 @@ defmodule Mix.Tasks.Elixirscript.Watch do
         version: "0.1.0",
         elixir: "~> 1.0",
         deps: deps,
-        elixir_script: [ input: "src/exjs", output: "dest/js"],
-        compilers: [:elixir_script] ++ Mix.compilers
+        elixir_script: [ input: Example, output: "dest/js"],
+        compilers: Mix.compilers ++ [:elixir_script]
       ]
     end
   """
 
-
-
   def run(_) do
     Mix.Task.run "app.start"
 
-    elixirscript_config = get_elixirscript_config()
-    input_path = Keyword.get(elixirscript_config, :input)
-    output_path = Keyword.get(elixirscript_config, :output)
-    format = Keyword.get(elixirscript_config, :format)
-    js_modules = Keyword.get(elixirscript_config, :js_modules, [])       
+    {input, opts} = Mix.Tasks.Compile.ElixirScript.get_compiler_params() 
 
     {:ok, _} = ElixirScript.Watcher.start_link(
-      input_path, 
-      %{output: output_path, format: format, js_modules: js_modules}
+      input, 
+      opts
     )
 
     :timer.sleep :infinity
   end
 
-  defp get_elixirscript_config() do
-    config  = Mix.Project.config
-    exjs_config = cond do
-      Keyword.has_key?(config, :elixir_script) ->
-        Keyword.get(config, :elixir_script, [])
-      Keyword.has_key?(config, :elixirscript) ->
-        Keyword.get(config, :elixirscript, [])
-      true ->
-        defaults()
-    end
-
-    Keyword.merge(defaults(), exjs_config)
-  end
-
-  defp defaults() do
-    [
-      input: "lib/elixirscript",
-      output: "priv/elixirscript",
-      format: :es
-    ]
-  end
-
 end
diff --git a/mix.exs b/mix.exs
@@ -5,8 +5,8 @@ defmodule ElixirScript.Mixfile do
     [
       app: :elixir_script,
       version: "0.28.0-dev",
-      elixir: "~> 1.0",
-      elixirc_paths: elixirc_paths(),
+      elixir: "~> 1.5-dev",
+      elixirc_paths: elixirc_paths(Mix.env),
       escript: escript_config(),
       deps: deps(),
       description: description(),
@@ -36,7 +36,8 @@ defmodule ElixirScript.Mixfile do
     ]
   end
 
-  defp elixirc_paths(), do: ["lib", "priv/std_lib"]
+  defp elixirc_paths(:test), do: ["lib", "priv/std_lib", "test/support"]
+  defp elixirc_paths(_),     do: ["lib", "priv/std_lib"]
 
   defp escript_config do
     [main_module: ElixirScript.CLI, name: "elixirscript"]
@@ -62,8 +63,7 @@ defmodule ElixirScript.Mixfile do
 
   defp aliases do
     [dist: &dist/1,
-     install: &install/1,
-     supported: &supported/1]
+     install: &install/1]
   end
 
   def dist(_) do
@@ -106,10 +106,4 @@ defmodule ElixirScript.Mixfile do
     IO.puts("installed at /usr/local/elixirscript")
   end
 
-  def supported(_) do
-    Mix.Task.run "app.start"
-
-    ElixirScript.Gen.Supported.generate()
-  end
-
 end
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "build": "rollup -c rollup.config.js",
     "clean": "rm -rf priv/build",
     "test": "nyc ava src/javascript/tests",
-    "build:test-app": "mix elixirscript test/app/src/ -f common -o test/app/build/",
+    "build:test-app": "MIX_ENV=test mix elixirscript Main -f common -o test/app/build/",
     "test-app": "yarn run build:test-app && NODE_ENV=test ava 'test/app/spec/**/*.spec.js'"
   },
   "repository": {
diff --git a/test/support/main.ex b/test/support/main.ex
diff --git a/test/support/user.ex b/test/support/user.ex
