Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed an issue related to missing optional applications #514

Merged
merged 1 commit into from
Aug 26, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
94 changes: 70 additions & 24 deletions lib/dialyxir/project.ex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule Dialyxir.Project do

Check warning on line 1 in lib/dialyxir/project.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.15.4 / OTP 24.3

redefining module Dialyxir.Project (current version loaded from /home/runner/.mix/archives/dialyxir-1.3.0/dialyxir-1.3.0/ebin/Elixir.Dialyxir.Project.beam)

Check warning on line 1 in lib/dialyxir/project.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.15.4 / OTP 25.3

redefining module Dialyxir.Project (current version loaded from /home/runner/.mix/archives/dialyxir-1.3.0/dialyxir-1.3.0/ebin/Elixir.Dialyxir.Project.beam)

Check warning on line 1 in lib/dialyxir/project.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.15.4 / OTP 26.0

redefining module Dialyxir.Project (current version loaded from /home/runner/.mix/archives/dialyxir-1.3.0/dialyxir-1.3.0/ebin/Elixir.Dialyxir.Project.beam)
@moduledoc false
import Dialyxir.Output

Expand Down Expand Up @@ -362,38 +362,84 @@
deps_app(app, recursive)
end

@spec deps_app(atom(), boolean()) :: [atom]
defp deps_app(app, recursive) do
with_each =
if recursive do
&deps_app(&1, true)
else
fn _ -> [] end
if System.version() |> Version.parse!() |> then(&(&1.major >= 1 and &1.minor >= 15)) do
@spec deps_app(atom(), boolean()) :: [atom()]
defp deps_app(app, recursive) do
case do_load_app(app) do
:ok ->
with_each =
if recursive do
&deps_app(&1, true)
else
fn _ -> [] end
end

# Identify the optional applications which can't be loaded and thus not available
missing_apps =
Application.spec(app, :optional_applications)
|> List.wrap()
|> Enum.reject(&(do_load_app(&1) == :ok))

# Remove the optional applications which are not available from all the applications
required_apps =
Application.spec(app, :applications)
|> List.wrap()
|> Enum.reject(&(&1 in missing_apps))

required_apps |> Stream.flat_map(&with_each.(&1)) |> Enum.concat(required_apps)

{:error, err} ->
error("Error loading #{app}, dependency list may be incomplete.\n #{inspect(err)}")

[]
end
end
else
@spec deps_app(atom(), boolean()) :: [atom()]
defp deps_app(app, recursive) do
with_each =
if recursive do
&deps_app(&1, true)
else
fn _ -> [] end
end

case Application.load(app) do
:ok ->
nil
case do_load_app(app) do
:ok ->
nil

{:error, {:already_loaded, _}} ->
nil
{:error, err} ->
error("Error loading #{app}, dependency list may be incomplete.\n #{inspect(err)}")

{:error, err} ->
nil
error("Error loading #{app}, dependency list may be incomplete.\n #{inspect(err)}")
nil
end

case Application.spec(app, :applications) do
[] ->
[]

nil ->
[]

this_apps ->
Enum.map(this_apps, with_each)
|> List.flatten()
|> Enum.concat(this_apps)
end
end
end

case Application.spec(app, :applications) do
[] ->
[]
@spec do_load_app(atom()) :: :ok | {:error, term()}
defp do_load_app(app) do
case Application.load(app) do
:ok ->
:ok

nil ->
[]
{:error, {:already_loaded, _}} ->
:ok

this_apps ->
Enum.map(this_apps, with_each)
|> List.flatten()
|> Enum.concat(this_apps)
{:error, err} ->
{:error, err}
end
end

Expand Down