Support FFI js files with dots in them

bryanjos · bryanjos · commit 0fe7abe89556 · 2017-08-06T17:35:17.000-05:00
diff --git a/lib/elixir_script/module_systems/es.ex b/lib/elixir_script/module_systems/es.ex
@@ -2,16 +2,12 @@ defmodule ElixirScript.ModuleSystems.ES do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
 
-  def build(imports, js_imports, body, exports) do
-    module_imports = Enum.map(imports, fn {module, path} -> import_module(module, path) end)
-
+  def build(js_imports, body, exports) do
     imports = js_imports
     |> Enum.map(fn
-      {_module, name, path} -> import_module(name, path)
+      {_module, name, _path, import_path} -> import_module(name, import_path)
     end)
 
-    imports = Enum.uniq(imports ++ module_imports)
-
     export = if is_nil(exports), do: [], else: [export_module(exports)]
     imports ++ body ++ export
   end
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -26,7 +26,8 @@ defmodule ElixirScript.Output do
     end)
     |> Enum.map(fn
       {module, name, path} ->
-        {module, name, Path.join(opts.root, path)}
+        import_path = Path.join(opts.root, path)
+        {module, name, path, import_path}
     end)
 
     bundle(modules, opts, js_modules)
@@ -82,7 +83,7 @@ defmodule ElixirScript.Output do
 
     apps = get_app_names()
     output_dir = Path.dirname(file_name)
-    Enum.each(js_modules, fn({_, _, path}) ->
+    Enum.each(js_modules, fn({_, _, path, _}) ->
       copy_javascript_module(apps, output_dir, path)
     end)
 
@@ -108,16 +109,31 @@ defmodule ElixirScript.Output do
 
   defp copy_javascript_module(apps, output_dir, js_module_path) do
     Enum.each(apps, fn(app) ->
-      full_path = Path.join([:code.priv_dir(app), "elixir_script", js_module_path]) <> ".js"
+      base_path = Path.join([:code.priv_dir(app), "elixir_script"])
+
+      js_input_path = cond do
+        File.exists?(Path.join([base_path, js_module_path])) ->
+          Path.join([base_path, js_module_path])
+        File.exists?(Path.join([base_path, slashes_to_dots(js_module_path)])) ->
+          Path.join([base_path, slashes_to_dots(js_module_path)])
+        true ->
+          nil
+      end
 
-      if File.exists?(full_path) do
-        js_output_path = Path.join(output_dir, js_module_path) <> ".js"
-        if !File.exists?(Path.dirname(js_output_path)) do
-          File.mkdir_p!(Path.dirname(js_output_path))
+      if js_input_path != nil do
+        js_output_path = Path.join(output_dir, js_module_path)
+        js_output_dir = Path.dirname(js_output_path)
+        if !File.exists?(js_output_dir) do
+          File.mkdir_p!(js_output_dir)
         end
 
-        File.cp(full_path, js_output_path)
+        File.cp(js_input_path, js_output_path)
       end
     end)
   end
+
+  defp slashes_to_dots(js_module_path) do
+    js_module_path
+    |> String.replace("/", ".")
+  end
 end
diff --git a/lib/elixir_script/passes/output/js_module.ex b/lib/elixir_script/passes/output/js_module.ex
@@ -12,7 +12,6 @@ defmodule ElixirScript.Output.JSModule do
     elixir = J.variable_declaration([declarator], :const)
 
     ast = opts.module_formatter.build(
-      [],
       js_modules,
       [elixir, create_atom_table(), start(), load()] ++ body,
       J.identifier("Elixir")
@@ -94,4 +93,4 @@ defmodule ElixirScript.Output.JSModule do
     )
   end
 
-end
+end
