Skip to content

Commit 9b5c31f

Browse files
committed
Fix formatting
1 parent d7bddaa commit 9b5c31f

File tree

9 files changed

+50
-36
lines changed

9 files changed

+50
-36
lines changed

lib/absinthe.ex

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ defmodule Absinthe do
4747
@type continuation_t :: nil | [Continuation.t()]
4848

4949
@type result_t ::
50-
%{required(:data) => nil | result_selection_t,
50+
%{
51+
required(:data) => nil | result_selection_t,
5152
optional(:ordinal) => term(),
5253
optional(:continuation) => continuation_t,
53-
optional(:errors) => [result_error_t]}
54+
optional(:errors) => [result_error_t]
55+
}
5456
| %{errors: [result_error_t]}
5557

5658
@doc """

lib/absinthe/blueprint/continuation.ex

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ defmodule Absinthe.Blueprint.Continuation do
1212
]
1313

1414
@type t :: %__MODULE__{
15-
phase_input: Pipeline.data_t,
16-
pipeline: Pipeline.t()
17-
}
18-
15+
phase_input: Pipeline.data_t(),
16+
pipeline: Pipeline.t()
17+
}
1918
end

lib/absinthe/phase/document/result.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ defmodule Absinthe.Phase.Document.Result do
138138
defp format_location(_), do: []
139139

140140
defp maybe_add_continuations(result, %{continuations: continuations}) when continuations != [],
141-
do: Map.put(result, :continuation, continuations)
141+
do: Map.put(result, :continuation, continuations)
142142

143143
defp maybe_add_continuations(result, _), do: result
144144
end

lib/absinthe/phase/subscription/get_ordinal.ex

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ defmodule Absinthe.Phase.Subscription.GetOrdinal do
1010
@spec run(any, Keyword.t()) :: {:ok, Blueprint.t()}
1111
def run(blueprint, _options \\ []) do
1212
op = Blueprint.current_operation(blueprint)
13+
1314
if op.type == :subscription do
14-
{:ok, %{blueprint | result: Map.put(blueprint.result, :ordinal, get_ordinal(op, blueprint))}}
15+
{:ok,
16+
%{blueprint | result: Map.put(blueprint.result, :ordinal, get_ordinal(op, blueprint))}}
1517
else
1618
{:ok, blueprint}
1719
end
@@ -20,16 +22,20 @@ defmodule Absinthe.Phase.Subscription.GetOrdinal do
2022
defp get_ordinal(op, blueprint) do
2123
%{selections: [field]} = op
2224
{:ok, config} = SubscribeSelf.get_config(field, blueprint.execution.context, blueprint)
25+
2326
case config[:ordinal] do
2427
nil ->
2528
nil
29+
2630
fun when is_function(fun, 1) ->
2731
fun.(blueprint.execution.root_value)
32+
2833
_fun ->
2934
IO.write(
3035
:stderr,
3136
"Ordinal function must be 1-arity"
3237
)
38+
3339
nil
3440
end
3541
end

lib/absinthe/phase/subscription/prime.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ defmodule Absinthe.Phase.Subscription.Prime do
22
@moduledoc false
33

44
@spec run(any(), Keyword.t()) :: Phase.result_t()
5-
def run(blueprint, [prime_result: cr]) do
5+
def run(blueprint, prime_result: cr) do
66
{:ok, put_in(blueprint.execution.root_value, cr)}
77
end
88
end

lib/absinthe/phase/subscription/result.ex

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defmodule Absinthe.Phase.Subscription.Result do
1313
topic = Keyword.get(options, :topic)
1414
prime = Keyword.get(options, :prime)
1515
result = %{"subscribed" => topic}
16+
1617
case prime do
1718
nil ->
1819
{:ok, put_in(blueprint.result, result)}

lib/absinthe/phase/subscription/subscribe_self.ex

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ defmodule Absinthe.Phase.Subscription.SubscribeSelf do
4646
end
4747

4848
def get_config(
49-
%{schema_node: schema_node, argument_data: argument_data} = field,
50-
context,
51-
blueprint
52-
) do
49+
%{schema_node: schema_node, argument_data: argument_data} = field,
50+
context,
51+
blueprint
52+
) do
5353
name = schema_node.identifier
5454

5555
config =

lib/absinthe/pipeline.ex

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ defmodule Absinthe.Pipeline do
3737
case result do
3838
{:ok, blueprint, phases} when rest == [] ->
3939
{:ok, blueprint, phases}
40+
4041
{:ok, blueprint, phases} ->
4142
bp_result = Map.put(blueprint.result, :continuation, rest)
4243
blueprint = Map.put(blueprint, :result, bp_result)
4344
{:ok, blueprint, phases}
44-
error -> error
45+
46+
error ->
47+
error
4548
end
4649
end
4750

test/absinthe/execution/subscription_test.exs

+25-22
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
142142
:ok,
143143
topic: args.client_id,
144144
prime: fn %{context: %{prime_id: prime_id}} ->
145-
{:ok, Enum.map(args.prime_data, &(%{id: prime_id, name: &1}))}
145+
{:ok, Enum.map(args.prime_data, &%{id: prime_id, name: &1})}
146146
end
147147
}
148148
end
@@ -154,8 +154,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
154154
config fn args, _ ->
155155
{
156156
:ok,
157-
topic: args.client_id,
158-
ordinal: fn %{version: version} -> version end
157+
topic: args.client_id, ordinal: fn %{version: version} -> version end
159158
}
160159
end
161160
end
@@ -217,7 +216,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
217216
assert %{
218217
event: "subscription:data",
219218
result: %{data: %{"thing" => "foo"}, ordinal: nil},
220-
topic: topic,
219+
topic: topic
221220
} == msg
222221
end
223222

@@ -261,7 +260,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
261260
msg = %{
262261
event: "subscription:data",
263262
result: %{data: %{"multipleTopics" => "foo"}, ordinal: nil},
264-
topic: topic,
263+
topic: topic
265264
}
266265

267266
Absinthe.Subscription.publish(PubSub, "foo", multiple_topics: "topic_1")
@@ -363,7 +362,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
363362
assert %{
364363
event: "subscription:data",
365364
result: %{data: %{"user" => %{"id" => "1", "name" => "foo"}}, ordinal: nil},
366-
topic: topic,
365+
topic: topic
367366
} == msg
368367
end
369368

@@ -411,7 +410,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
411410
assert %{
412411
event: "subscription:data",
413412
result: %{data: %{"thing" => "foo"}, ordinal: nil},
414-
topic: topic,
413+
topic: topic
415414
} == msg
416415
end
417416

@@ -430,7 +429,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
430429
assert %{
431430
event: "subscription:data",
432431
result: %{data: %{"thing" => "foo"}, ordinal: nil},
433-
topic: topic,
432+
topic: topic
434433
} == msg
435434
end)
436435

@@ -642,7 +641,7 @@ defmodule Absinthe.Execution.SubscriptionTest do
642641
assert %{
643642
event: "subscription:data",
644643
result: %{data: %{"thing" => "foo"}, ordinal: nil},
645-
topic: topic,
644+
topic: topic
646645
} == msg
647646

648647
# Subscription events
@@ -675,13 +674,15 @@ defmodule Absinthe.Execution.SubscriptionTest do
675674
context: %{prime_id: "test_prime_id"}
676675
)
677676

678-
assert {:more, %{
679-
data: %{"prime" => %{"id" => "test_prime_id", "name" => "name1"}},
680-
continuation: continuation}}
681-
= Absinthe.continue(continuation)
677+
assert {:more,
678+
%{
679+
data: %{"prime" => %{"id" => "test_prime_id", "name" => "name1"}},
680+
continuation: continuation
681+
}} =
682+
Absinthe.continue(continuation)
682683

683-
assert {:ok, %{data: %{"prime" => %{"id" => "test_prime_id", "name" => "name2"}}}}
684-
= Absinthe.continue(continuation)
684+
assert {:ok, %{data: %{"prime" => %{"id" => "test_prime_id", "name" => "name2"}}}} =
685+
Absinthe.continue(continuation)
685686
end
686687

687688
@query """
@@ -733,14 +734,16 @@ defmodule Absinthe.Execution.SubscriptionTest do
733734
}
734735
)
735736

736-
assert {:more, %{
737-
data: %{"primeOrdinal" => %{"name" => "first_user"}},
738-
ordinal: 1,
739-
continuation: continuation}}
740-
= Absinthe.continue(continuation)
737+
assert {:more,
738+
%{
739+
data: %{"primeOrdinal" => %{"name" => "first_user"}},
740+
ordinal: 1,
741+
continuation: continuation
742+
}} =
743+
Absinthe.continue(continuation)
741744

742-
assert {:ok, %{data: %{"primeOrdinal" => %{"name" => "second_user"}}, ordinal: 2}}
743-
= Absinthe.continue(continuation)
745+
assert {:ok, %{data: %{"primeOrdinal" => %{"name" => "second_user"}}, ordinal: 2}} =
746+
Absinthe.continue(continuation)
744747
end
745748

746749
defp run_subscription(query, schema, opts \\ []) do

0 commit comments

Comments
 (0)