Add root option. Keep extension for imports

bryanjos · bryanjos · commit ba22c80e750b · 2017-08-06T08:54:23.000-05:00
Root option allows for specifying the first part of imports
used when importing FFI modules. The extension change is also
for FFI module imports. Both are added from testing inside of
Chrome when using ES modules directly.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - ElixirScript now has a Foreign Function Interface (FFI) for interoperability with JavaScript. For more details, see documentation at `ElixirScript.FFI`
 - `ElixirScript.JS.mutate/3`
 - `ElixirScript.JS.map_to_object/1`
+- `root` option for specifying the root import path for FFI JavaScript modules. Defaults to `"."`
+- For imports, now keeping the `.js` extension
 
 ### Changed
 - Compiler has been completely rewritten. ElixirScript now requires Erlang 20+ and Elixir 1.5+
diff --git a/GettingStarted.md b/GettingStarted.md
@@ -37,12 +37,14 @@ Available options are:
     If path ends in `.js` then that will be the name of the file. If a directory is given,
     file will be named `Elixir.App.js`
 
+* `root`: Optional root for imports of FFI JavaScript modules. Defaults to `.`. If using output directly in a browser, you may want to make it something like `/js` or some uri.
+
 
 Now run `mix compile` and you should see a JavaScript file named `Elixir.App.js` in the `priv/elixir_script/build/` directory. ElixirScript outputs JavaScript in the ES Module format. If your browser supports it, you can include the output in a script tag with the type "module"
 
 ```html
 <script type="module">
-  import Elixir from './Elixir.App.js'
+  import Elixir from '/js/Elixir.App.js'
   const myInitialArgs = []
 
   Elixir.start(Elixir.MyEntryModule, myInitialArgs)
diff --git a/JavascriptInterop.md b/JavascriptInterop.md
@@ -44,6 +44,8 @@ export default {
 }
 ```
 
+For more information and options. Check the documentation for `ElixirScript.FFI`
+
 ## JavaScript Calling ElixirScript
 
   In order to start an ElixirScript application, you must first import it using whichever JavaScript module system you are using and then call `Elixir.start`
@@ -60,8 +62,7 @@ export default {
   ```
 
   ```javascript
-  //ES module example
-  import Elixir from './Elixir.App'
+  import Elixir from './Elixir.App.js'
   Elixir.start(Elixir.Main, [1, 2, 3])
   ```
 
diff --git a/lib/elixir_script/cli.ex b/lib/elixir_script/cli.ex
@@ -7,7 +7,8 @@ defmodule ElixirScript.CLI do
     output: :string,
     help: :boolean,
     version: :boolean,
-    watch: :boolean
+    watch: :boolean,
+    root: :string
   ]
 
   @aliases [
@@ -44,6 +45,7 @@ defmodule ElixirScript.CLI do
                         Can be a directory or filename.
   -v  --version         the current version number
   -h  --help            this message
+  --root                The root import path for FFI imports
   """
   end
 
@@ -67,7 +69,8 @@ defmodule ElixirScript.CLI do
     {watch, options} = Keyword.pop(options, :watch, false)
 
     compile_opts = [
-      output: Keyword.get(options, :output, :stdout)
+      output: Keyword.get(options, :output, :stdout),
+      root: Keyword.get(options, :root, ".")
     ]
 
     input = handle_input(input)
diff --git a/lib/elixir_script/compiler.ex b/lib/elixir_script/compiler.ex
@@ -36,6 +36,7 @@ defmodule ElixirScript.Compiler do
     |> Map.put(:output, Keyword.get(opts, :output))
     |> Map.put(:format, :es)
     |> Map.put(:entry_modules, entry_modules)
+    |> Map.put(:root, Keyword.get(opts, :root, "."))
 
     options = default_options
     Map.put(options, :module_formatter, ElixirScript.ModuleSystems.ES)
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -32,6 +32,7 @@ defmodule ElixirScript.FindUsedModules do
       {name, path}
     else
       name = Enum.join(Module.split(module), "_")
+      path = path <> ".js"
       {name, path}
     end
 
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -26,7 +26,7 @@ defmodule ElixirScript.Output do
     end)
     |> Enum.map(fn
       {module, name, path} ->
-        {module, name, Path.join(".", path)}
+        {module, name, Path.join(opts.root, path)}
     end)
 
     bundle(modules, opts, js_modules)
diff --git a/lib/elixir_script/passes/translate/module.ex b/lib/elixir_script/passes/translate/module.ex
@@ -13,21 +13,6 @@ defmodule ElixirScript.Translate.Module do
     ElixirScript.Translate.Protocol.compile(module, info, pid)
   end
 
-  def compile(module, %{attributes: [__foreign_info__: %{path: path, name: name, global: global}]}, pid) do
-    {name, path} = if global do
-      name = if name, do: name, else: module
-      path = nil
-      {name, path}
-    else
-      name = Enum.join(Module.split(module), "_")
-      {name, path}
-    end
-
-    ModuleState.put_javascript_module(pid, module, name, path)
-
-    nil
-  end
-
   def compile(module, info, pid) do
     %{
       attributes: attrs,
diff --git a/lib/elixir_script/state.ex b/lib/elixir_script/state.ex
@@ -105,4 +105,4 @@ defmodule ElixirScript.State do
       state.modules
     end)
   end
-end
+end

-Original file line number
+Diff line change
       state.modules
     end)
   end
 -end
 +end