Generate app file for gleam deps on compilation

Author: Papipo

lib/mix/lib/mix/dep/loader.ex

@@ -374,46 +374,13 @@ defmodule Mix.Dep.Loader do
     from = Path.join(opts[:dest], "gleam.toml")
     deps = Enum.map(config[:deps], &to_dep(&1, from, _manager = nil, locked?))
 
-    properties =
-      [{:vsn, to_charlist(config[:version])}]
-      |> gleam_mod(config)
-      |> gleam_applications(config)
-
-    contents = :io_lib.format("~p.~n", [{:application, dep.app, properties}])
-
-    [opts[:build], "ebin"]
-    |> Path.join()
-    |> File.mkdir_p!()
-
-    [opts[:build], "ebin", "#{dep.app}.app"]
-    |> Path.join()
-    |> File.write!(IO.chardata_to_string(contents))
-
     {dep, deps}
   end
 
   defp gleam_dep(%Mix.Dep{opts: opts} = dep, children, locked?) do
     {dep, Enum.map(children, &to_dep(&1, opts[:dest], _manager = nil, locked?))}
   end
 
-  defp gleam_mod(properties, config) do
-    case config[:mod] do
-      nil -> properties
-      mod -> [{:mod, {String.to_atom(mod), []}} | properties]
-    end
-  end
-
-  defp gleam_applications(properties, config) do
-    case config[:extra_applications] do
-      nil ->
-        properties
-
-      applications ->
-        applications = Enum.map(applications, &String.to_atom/1)
-        [{:applications, applications} | properties]
-    end
-  end
-
   defp mix_children(config, locked?, opts) do
     from = Mix.Project.project_file()
 

lib/mix/lib/mix/gleam.ex

@@ -43,7 +43,7 @@ defmodule Mix.Gleam do
           {dep, version, opts}
 
         %{"path" => path} ->
-          {dep, Keyword.merge(opts, path: path)}
+          {dep, Keyword.merge(opts, path: Path.expand(path))}
 
         %{"git" => git, "ref" => ref} ->
           {dep, git: git, ref: ref}

lib/mix/lib/mix/tasks/deps.compile.ex

@@ -334,7 +334,55 @@ defmodule Mix.Tasks.Deps.Compile do
        ["compile-package", "--target", "erlang", "--package", package, "--out", out, "--lib", lib]}
 
     shell_cmd!(dep, config, command)
-    Code.prepend_path(Path.join(out, "ebin"), cache: true)
+
+    ebin = Path.join(out, "ebin")
+    app_file_path = Keyword.get(opts, :app, Path.join(ebin, "#{dep.app}.app"))
+    create_app_file = app_file_path && !File.exists?(app_file_path)
+
+    if create_app_file do
+      generate_gleam_app_file(opts)
+    end
+
+    Code.prepend_path(ebin, cache: true)
+  end
+
+  defp gleam_extra_applications(config) do
+    config
+    |> Map.get(:extra_applications, [])
+    |> Enum.map(&String.to_atom/1)
+  end
+
+  defp gleam_mod(config) do
+    case config[:mod] do
+      nil -> []
+      mod -> {String.to_atom(mod), []}
+    end
+  end
+
+  defp generate_gleam_app_file(opts) do
+    toml = File.cd!(opts[:dest], fn -> Mix.Gleam.load_config(".") end)
+
+    module =
+      quote do
+        def project do
+          [
+            app: unquote(toml.name) |> String.to_atom(),
+            version: "#{unquote(toml.version)}"
+          ]
+        end
+
+        def application do
+          [
+            mod: unquote(gleam_mod(toml)),
+            extra_applications: unquote(gleam_extra_applications(toml))
+          ]
+        end
+      end
+
+    module_name = String.to_atom("Gleam.#{toml.name}")
+    Module.create(module_name, module, Macro.Env.location(__ENV__))
+    Mix.Project.push(module_name)
+    Mix.Tasks.Compile.App.run([])
   end
 
   defp make_command(dep) do

lib/mix/test/mix/gleam_test.exs

@@ -87,20 +87,22 @@ defmodule Mix.GleamTest do
         assert :gleam_dep.main()
         assert :gleam@int.to_string(1) == "1"
 
-        load_paths =
-          Mix.Dep.Converger.converge([])
-          |> Enum.map(&Mix.Dep.load_paths(&1))
-          |> Enum.concat()
-
-        assert Enum.any?(load_paths, &String.ends_with?(&1, "gleam_dep/ebin"))
-        assert Enum.any?(load_paths, &String.ends_with?(&1, "gleam_stdlib/ebin"))
-        # Dep of a dep
-        assert Enum.any?(load_paths, &String.ends_with?(&1, "gleam_erlang/ebin"))
         {:ok, content} = :file.consult("_build/dev/lib/gleam_dep/ebin/gleam_dep.app")
 
         assert content == [
-                 {:application, :gleam_dep,
-                  [applications: [:ssl], mod: {:gleam_dep@somemodule, []}, vsn: ~c"1.0.0"]}
+                 {
+                   :application,
+                   :gleam_dep,
+                   [
+                     {:modules, [:gleam_dep]},
+                     {:optional_applications, []},
+                     {:applications, [:kernel, :stdlib, :elixir, :ssl]},
+                     {:description, ~c"gleam_dep"},
+                     {:registered, []},
+                     {:vsn, ~c"1.0.0"},
+                     {:mod, {:gleam_dep@somemodule, []}}
+                   ]
+                 }
                ]
       end)
     end