Graham McIntire
1400c38f44
Rework of d61fbd3's dialyzer suppression: the 4 warnings from
LiveTable.LiveResource's macro expansion are now fixed at the
root rather than hidden via .dialyzer_ignore.exs.
Changes:
- Delete .dialyzer_ignore.exs and remove ignore_warnings from
mix.exs. No more hidden suppressions.
- New MicrowavepropWeb.LiveTableResource shim that wraps
use LiveTable.LiveResource and overrides:
* maybe_subscribe/1 — explicit :ok = on Phoenix.PubSub.subscribe/2
(previously discarded, tripping :unmatched_return).
* handle_info/2 — explicit _ = on File.rm, Process.send_after.
Switch all 4 LiveTable-using LiveViews (contact_live/index,
beacon_live/index, admin/contact_edit_live, user_management_live/index)
to use MicrowavepropWeb.LiveTableResource instead.
- New priv/dep_patches/live_table-0.4.1.patch adds _ = in front of
LiveTable.LiveSelectHelpers.restore_live_select_from_params/2 in
the dep's macro-expanded handle_params/3. The call's return was
silently discarded, tripping the fourth warning per LiveView.
- New lib/mix/tasks/deps.patch.ex applies every
priv/dep_patches/*.patch to its target dep idempotently after
mix deps.get. Wired into the :setup alias + overridden
mix deps.get so the patch survives cache regeneration in CI.
- Other modified files in this commit are the spec-coverage
additions from the parallel agent pass (beacons.ex,
commercial.ex, propagation.ex, weather.ex, narr_client.ex,
run_timing.ex, 3 workers) — tighter specs for bounds, tuple
shapes, schema-typed params. Dialyzer remains at 0 after
the changes.
Upstream TODO: send a PR for the live_table `_ =` fix. Once
merged and released, drop the patch + mix task + bump the dep.
mix dialyzer --format short | grep ^lib/ | wc -l -> 0
mix test: 2165 tests, 2 pre-existing flakes (MapLive timestamp +
PropagationPrune ScoresFile), 0 regressions.
77 lines
2.6 KiB
Elixir
77 lines
2.6 KiB
Elixir
defmodule Mix.Tasks.Deps.Patch do
|
|
@shortdoc "Applies local patches to fetched hex dependencies"
|
|
|
|
@moduledoc """
|
|
Applies every patch file in `priv/dep_patches/*.patch` to its
|
|
corresponding dependency under `deps/`. Each patch name follows the
|
|
convention `<dep_name>-<version>.patch` (e.g. `live_table-0.4.1.patch`).
|
|
|
|
Applied idempotently — if the patched text is already present we skip
|
|
the dep. Run after `mix deps.get` / `mix deps.compile`. Safe to invoke
|
|
repeatedly.
|
|
|
|
Why this exists: `live_table` 0.4.1 has a call to
|
|
`LiveTable.LiveSelectHelpers.restore_live_select_from_params/2` whose
|
|
return value is discarded inside the macro-expanded `handle_params/3`,
|
|
tripping the strict dialyzer `:unmatched_return` flag at every `use`
|
|
site. The patch adds an `_ =` binding. Upstream PR TODO — once merged
|
|
and released, drop both the patch and this task.
|
|
"""
|
|
use Mix.Task
|
|
|
|
@patches_dir "priv/dep_patches"
|
|
|
|
@impl Mix.Task
|
|
def run(_args) do
|
|
case File.ls(@patches_dir) do
|
|
{:ok, entries} ->
|
|
patches = entries |> Enum.filter(&String.ends_with?(&1, ".patch")) |> Enum.sort()
|
|
|
|
Enum.each(patches, &apply_patch/1)
|
|
|
|
{:error, :enoent} ->
|
|
Mix.shell().info("deps.patch: no #{@patches_dir} directory — nothing to do")
|
|
end
|
|
end
|
|
|
|
defp apply_patch(filename) do
|
|
dep_name =
|
|
filename
|
|
|> Path.basename(".patch")
|
|
|> String.split("-")
|
|
|> Enum.drop(-1)
|
|
|> Enum.join("-")
|
|
|
|
dep_dir = Path.join("deps", dep_name)
|
|
|
|
cond do
|
|
not File.dir?(dep_dir) ->
|
|
Mix.shell().info("deps.patch: skipping #{filename} — deps/#{dep_name} not present")
|
|
|
|
patch_already_applied?(filename, dep_dir) ->
|
|
Mix.shell().info("deps.patch: #{filename} already applied")
|
|
|
|
true ->
|
|
patch_path = Path.join(@patches_dir, filename)
|
|
{output, exit_code} = System.cmd("patch", ["-p1", "-i", Path.absname(patch_path)], cd: dep_dir)
|
|
|
|
if exit_code == 0 do
|
|
Mix.shell().info("deps.patch: applied #{filename}")
|
|
touch_sentinel(filename, dep_dir)
|
|
else
|
|
Mix.raise("deps.patch: failed to apply #{filename}:\n#{output}")
|
|
end
|
|
end
|
|
end
|
|
|
|
# Record that the patch landed by writing a sentinel file inside the
|
|
# dep dir. `File.touch!/1` avoids spurious re-applications when the
|
|
# patch contains text the dep happens to contain already.
|
|
defp touch_sentinel(filename, dep_dir) do
|
|
File.touch!(Path.join(dep_dir, ".#{filename}.applied"))
|
|
end
|
|
|
|
defp patch_already_applied?(filename, dep_dir) do
|
|
File.exists?(Path.join(dep_dir, ".#{filename}.applied"))
|
|
end
|
|
end
|