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.

Sign up for GitHub

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

Jump to bottom

fix: dyalizer and igniter deprecations #224

Merged
merged 2 commits into from
Oct 7, 2024
Merged

fix: dyalizer and igniter deprecations #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a384247
fix compile warnings because of igniter deprecations
barnabasJ Oct 7, 2024
68e4c0e
fix dialyzer
barnabasJ Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/domain/domain.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ defmodule AshGraphql.Domain do
)
end

Igniter.Code.Module.find_and_update_module!(igniter, schema, fn zipper ->
Igniter.Project.Module.find_and_update_module!(igniter, schema, fn zipper ->
with {:ok, zipper} <- Igniter.Code.Module.move_to_use(zipper, AshGraphql),
{:ok, zipper} <- Igniter.Code.Function.move_to_nth_argument(zipper, 1),
{:ok, zipper} <- Igniter.Code.Keyword.get_key(zipper, :domains),
Expand Down
19 changes: 12 additions & 7 deletions lib/igniter.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ defmodule AshGraphql.Igniter do

modules
|> Enum.find(fn module ->
with {:ok, {_igniter, _source, zipper}} <- Igniter.Code.Module.find_module(igniter, module),
with {:ok, {_igniter, _source, zipper}} <-
Igniter.Project.Module.find_module(igniter, module),
{:ok, zipper} <- Igniter.Code.Module.move_to_use(zipper, AshGraphql),
{:ok, zipper} <- Igniter.Code.Function.move_to_nth_argument(zipper, 1),
{:ok, zipper} <- Igniter.Code.Keyword.get_key(zipper, :domains),
Expand All @@ -33,7 +34,7 @@ defmodule AshGraphql.Igniter do

@doc "Sets up an absinthe schema for AshGraphql"
def setup_absinthe_schema(igniter, schema_name \\ nil) do
schema_name = schema_name || Igniter.Code.Module.module_name(igniter, "GraphqlSchema")
schema_name = schema_name || Igniter.Project.Module.module_name(igniter, "GraphqlSchema")

{igniter, domains} = Ash.Domain.Igniter.list_domains(igniter)

Expand All @@ -59,7 +60,7 @@ defmodule AshGraphql.Igniter do
{igniter, false},
fn {mod, arities}, {igniter, false} ->
with {:ok, {igniter, _source, zipper}} <-
Igniter.Code.Module.find_module(igniter, mod),
Igniter.Project.Module.find_module(igniter, mod),
{:ok, zipper} <-
Igniter.Code.Function.move_to_function_call_in_current_scope(
zipper,
Expand Down Expand Up @@ -114,7 +115,7 @@ defmodule AshGraphql.Igniter do
end

igniter
|> Igniter.Code.Module.find_and_update_or_create_module(
|> Igniter.Project.Module.find_and_update_or_create_module(
schema_name,
"""
use Absinthe.Schema
Expand All @@ -132,6 +133,10 @@ defmodule AshGraphql.Igniter do
mutation do
# Custom Absinthe mutations can be placed here
end

subscription do
# Custom Absinthe subscriptions can be placed here
end
""",
fn zipper ->
# Should never get here
Expand All @@ -142,7 +147,7 @@ defmodule AshGraphql.Igniter do

@doc "Sets up the phoenix module for AshGraphql"
def setup_phoenix(igniter, schema_name \\ nil) do
schema_name = schema_name || Igniter.Code.Module.module_name(igniter, "GraphqlSchema")
schema_name = schema_name || Igniter.Project.Module.module_name(igniter, "GraphqlSchema")

case Igniter.Libs.Phoenix.select_router(igniter) do
{igniter, nil} ->
Expand Down Expand Up @@ -179,7 +184,7 @@ defmodule AshGraphql.Igniter do

@doc "Returns all modules that `use AshGraphql`"
def ash_graphql_schemas(igniter) do
Igniter.Code.Module.find_all_matching_modules(igniter, fn _name, zipper ->
Igniter.Project.Module.find_all_matching_modules(igniter, fn _name, zipper ->
match?({:ok, _}, Igniter.Code.Module.move_to_use(zipper, AshGraphql))
end)
end
Expand All @@ -189,7 +194,7 @@ defmodule AshGraphql.Igniter do
Igniter.Libs.Phoenix.endpoints_for_router(igniter, router)

Enum.reduce(endpoints_that_need_parser, igniter, fn endpoint, igniter ->
Igniter.Code.Module.find_and_update_module!(igniter, endpoint, fn zipper ->
Igniter.Project.Module.find_and_update_module!(igniter, endpoint, fn zipper ->
case Igniter.Code.Function.move_to_function_call_in_current_scope(
zipper,
:plug,
Expand Down
5 changes: 4 additions & 1 deletion lib/subscription/batcher.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,10 @@ defmodule AshGraphql.Subscription.Batcher do
[]
end

{:error, error} ->
{:error, {_method, error}, _phase} ->
raise Ash.Error.to_error_class(error)

{:error, error, _phase} ->
raise Ash.Error.to_error_class(error)
end

Expand Down
Loading