Fix 1.3 imperative assignment warnings (#103)

- Fix imperative assignment warnings
- Update deps

Closes #89

Author: Josh Price

lib/graphql/lang/ast/type_info_visitor.ex

@@ -24,7 +24,7 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
         old_type_info = var!(accumulator)[:type_info]
         new_type_info = %TypeInfo{old_type_info |
           unquote(stack_name) => Stack.push(old_type_info.unquote(stack_name), unquote(value))}
-        var!(accumulator) = put_in(var!(accumulator)[:type_info], new_type_info)
+        put_in(var!(accumulator)[:type_info], new_type_info)
       end
     end
 
@@ -33,30 +33,26 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
         old_type_info = var!(accumulator)[:type_info]
         new_type_info = %TypeInfo{old_type_info |
           unquote(stack_name) => Stack.pop(old_type_info.unquote(stack_name))}
-        var!(accumulator) = put_in(var!(accumulator)[:type_info], new_type_info)
+        put_in(var!(accumulator)[:type_info], new_type_info)
       end
     end
 
-    defmacrop set_directive(directive) do
-      quote do
-        var!(accumulator) = put_in(
-          var!(accumulator)[:type_info],
-          %TypeInfo{ var!(accumulator)[:type_info] | directive: unquote(directive)}
-        )
-      end
+    def set_directive(accumulator, directive) do
+      put_in(
+        accumulator[:type_info],
+        %TypeInfo{accumulator[:type_info] | directive: directive}
+      )
     end
 
-    defmacrop set_argument(argument) do
-      quote do
-        var!(accumulator) = put_in(
-          var!(accumulator)[:type_info],
-          %TypeInfo{var!(accumulator)[:type_info] | argument: unquote(argument)}
-        )
-      end
+    def set_argument(accumulator, argument) do
+      put_in(
+        accumulator[:type_info],
+        %TypeInfo{accumulator[:type_info] | argument: argument}
+      )
     end
 
     def enter(_visitor, node, accumulator) do
-      case node.kind do
+      accumulator = case node.kind do
         :SelectionSet ->
           type = TypeInfo.type(accumulator[:type_info])
           named_type = TypeInfo.named_type(type)
@@ -74,10 +70,10 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
               node
             )
             field_def_type = if field_def, do: field_def.type, else: nil
-            stack_push(:field_def_stack, field_def)
+            accumulator = stack_push(:field_def_stack, field_def)
             stack_push(:type_stack, field_def_type)
           else
-            stack_push(:field_def_stack, nil)
+            accumulator = stack_push(:field_def_stack, nil)
             stack_push(:type_stack, nil)
           end
         :Directive ->
@@ -89,7 +85,7 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
           #this._directive = schema.getDirective(node.name.value); // JS example
           # and set it like this
           #set_directive(directive_def)
-          set_directive(nil)
+          set_directive(accumulator, nil)
         :OperationDefinition ->
           type = case node.operation do
             :query -> accumulator[:type_info].schema.query
@@ -115,15 +111,15 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
               Map.get(field_or_directive, :arguments, %{}),
               fn(arg) -> arg == node.name.value end
             )
-            set_argument(arg_def)
+            accumulator = set_argument(accumulator, arg_def)
             stack_push(:input_type_stack, (if arg_def && Map.has_key?(arg_def, :type), do: arg_def.type, else: nil))
           else
-            set_argument(nil)
+            accumulator = set_argument(accumulator, nil)
             stack_push(:input_type_stack, nil)
           end
         :List ->
           input_type = TypeInfo.input_type(accumulator[:type_info])
-          list_type =  TypeInfo.nullable_type(accumulator[:type_info], input_type)
+          list_type = TypeInfo.named_type(input_type)
           if %Type.List{} === list_type  do
             stack_push(:input_type_stack, list_type.ofType)
           else
@@ -144,7 +140,7 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
             stack_push(:input_type_stack, nil)
           end
         _ ->
-          :ignore
+          accumulator
       end
       {:continue, accumulator}
     end
@@ -154,20 +150,19 @@ defmodule GraphQL.Lang.AST.TypeInfoVisitor do
         :SelectionSet ->
           stack_pop(:parent_type_stack)
         :Field ->
-          stack_pop(:field_def_stack)
+          accumulator = stack_pop(:field_def_stack)
           stack_pop(:type_stack)
         :Directive ->
-          set_directive(nil)
+          set_directive(accumulator, nil)
         kind when kind in [:OperationDefinition, :InlineFragment, :FragmentDefinition] ->
           stack_pop(:type_stack)
         :Argument ->
-          set_argument(nil)
+          set_argument(accumulator, nil)
         kind when kind in [:List, :ObjectField, :VariableDefinition] ->
           stack_pop(:input_type_stack)
         _ ->
-          :ignore
+          accumulator
       end
-      accumulator
     end
   end
 end

lib/graphql/validation/rules/fields_on_correct_type.ex

@@ -16,15 +16,14 @@ defmodule GraphQL.Validation.Rules.FieldsOnCorrectType do
       schema = accumulator[:type_info].schema
       parent_type = TypeInfo.parent_type(accumulator[:type_info])
       field_def = TypeInfo.find_field_def(schema, parent_type, node)
-      if parent_type do
-        if !field_def do
-          accumulator = report_error(
-            accumulator,
-            undefined_field_message(schema, node.name.value, parent_type)
-          )
-        end
+      if parent_type && !field_def do
+        {:continue, report_error(
+          accumulator,
+          undefined_field_message(schema, node.name.value, parent_type)
+        )}
+      else
+        {:continue, accumulator}
       end
-      {:continue, accumulator}
     end
 
     def enter(_visitor, _node, accumulator), do: {:continue, accumulator}
@@ -44,6 +43,7 @@ defmodule GraphQL.Validation.Rules.FieldsOnCorrectType do
 
     defp field_usage_count({_, count}), do: count
 
+    # TODO is this meant to be a ==?
     defp is_a_graphql_object_type(type), do: %ObjectType{} = type
 
     defp to_self_and_interfaces(type), do: [type] ++ type.interfaces
@@ -85,10 +85,11 @@ defmodule GraphQL.Validation.Rules.FieldsOnCorrectType do
           |> Enum.slice(0, @max_type_suggestions)
           |> Enum.map(&"\"#{&1}\"")
           |> Enum.join(", ")
-        message = "#{message} However, this field exists on #{suggestions}. "
-                <> "Perhaps you meant to use an inline fragment?"
+        "#{message} However, this field exists on #{suggestions}. " <>
+        "Perhaps you meant to use an inline fragment?"
+      else
+        message
       end
-      message
     end
   end
 end

lib/graphql/validation/rules/no_fragment_cycles.ex

@@ -31,6 +31,7 @@ defmodule GraphQL.Validation.Rules.NoFragmentCycles do
 
     def leave(_visitor, _node, acc), do: acc
 
+    defp detect_cycles(acc, nil), do: acc
     defp detect_cycles(acc, fragment_def) do
       acc
       |> mark_visited(fragment_def)
@@ -40,18 +41,18 @@ defmodule GraphQL.Validation.Rules.NoFragmentCycles do
     defp detect_cycles_via_spread_nodes(acc, _, []), do: acc
     defp detect_cycles_via_spread_nodes(acc, fragment_def, spread_nodes) do
       frag_name = fragment_def.name.value
-      acc = %{ acc | spread_path_indices:
+      acc = %{acc | spread_path_indices:
         Map.merge(acc[:spread_path_indices], %{frag_name => Stack.length(acc[:spread_path])})}
 
       acc = process_spread_nodes(acc, spread_nodes)
 
-      %{ acc | spread_path_indices: Map.delete(acc[:spread_path_indices], frag_name)}
+      %{acc | spread_path_indices: Map.delete(acc[:spread_path_indices], frag_name)}
     end
 
     defp process_spread_nodes(acc, []), do: acc
     defp process_spread_nodes(acc, [spread_node|rest]) do
       spread_name = spread_node.name.value
-      cycle_index = Map.get(acc[:spread_path_indices], spread_name, nil)
+      cycle_index = Map.get(acc[:spread_path_indices], spread_name)
       process_spread_nodes(process_one_node(acc, spread_node, cycle_index), rest)
     end
 
@@ -65,14 +66,15 @@ defmodule GraphQL.Validation.Rules.NoFragmentCycles do
     end
 
     defp process_one_node(acc, spread_node, _) do
-      acc = %{ acc | spread_path: Stack.push(acc[:spread_path], spread_node)} 
-      if !visited?(acc, spread_node) do
-        spread_fragment = DocumentInfo.get_fragment_definition(acc[:document_info], spread_node.name.value)
-        if spread_fragment do
-          acc = detect_cycles(acc, spread_fragment)
+      acc = %{acc | spread_path: Stack.push(acc[:spread_path], spread_node)}
+      acc =
+        if !visited?(acc, spread_node) do
+          spread_fragment = DocumentInfo.get_fragment_definition(acc[:document_info], spread_node.name.value)
+          detect_cycles(acc, spread_fragment)
+        else
+          acc
         end
-      end
-      %{ acc | spread_path: Stack.pop(acc[:spread_path])} 
+      %{acc | spread_path: Stack.pop(acc[:spread_path])}
     end
 
     defp visited?(acc, node) do

mix.lock

@@ -1,10 +1,10 @@
 %{"bunt": {:hex, :bunt, "0.1.6", "5d95a6882f73f3b9969fdfd1953798046664e6f77ec4e486e6fafc7caad97c6f", [:mix], []},
-  "credo": {:hex, :credo, "0.3.13", "90d2d2deb9d376bb2a63f81126a320c3920ce65acb1294982ab49a8aacc7d89f", [:mix], [{:bunt, "~> 0.1.4", [hex: :bunt, optional: false]}]},
-  "dialyxir": {:hex, :dialyxir, "0.3.3", "2f8bb8ab4e17acf4086cae847bd385c0f89296d3e3448dc304c26bfbe4b46cb4", [:mix], []},
-  "dogma": {:hex, :dogma, "0.1.5", "d8d9c9d50f099c5bde47334da077b555b2027147d16906ea7bb4e7cdaedb2d8b", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, optional: false]}]},
+  "credo": {:hex, :credo, "0.4.11", "03a64e9d53309b7132556284dda0be57ba1013885725124cfea7748d740c6170", [:mix], [{:bunt, "~> 0.1.6", [hex: :bunt, optional: false]}]},
+  "dialyxir": {:hex, :dialyxir, "0.3.5", "eaba092549e044c76f83165978979f60110dc58dd5b92fd952bf2312f64e9b14", [:mix], []},
+  "dogma": {:hex, :dogma, "0.1.7", "927f76a89a809db96e0983b922fc899f601352690aefa123529b8aa0c45123b2", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, optional: false]}]},
   "earmark": {:hex, :earmark, "0.2.1", "ba6d26ceb16106d069b289df66751734802777a3cbb6787026dd800ffeb850f3", [:mix], []},
-  "ex_doc": {:hex, :ex_doc, "0.11.5", "0dc51cb84f8312162a2313d6c71573a9afa332333d8a332bb12540861b9834db", [:mix], [{:earmark, "~> 0.1.17 or ~> 0.2", [hex: :earmark, optional: true]}]},
+  "ex_doc": {:hex, :ex_doc, "0.12.0", "b774aabfede4af31c0301aece12371cbd25995a21bb3d71d66f5c2fe074c603f", [:mix], [{:earmark, "~> 0.2", [hex: :earmark, optional: false]}]},
   "fs": {:hex, :fs, "0.9.2", "ed17036c26c3f70ac49781ed9220a50c36775c6ca2cf8182d123b6566e49ec59", [:rebar], []},
-  "inch_ex": {:hex, :inch_ex, "0.5.1", "c1c18966c935944cbb2d273796b36e44fab3c54fd59f906ff026a686205b4e14", [:mix], [{:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}]},
+  "inch_ex": {:hex, :inch_ex, "0.5.3", "39f11e96181ab7edc9c508a836b33b5d9a8ec0859f56886852db3d5708889ae7", [:mix], [{:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}]},
   "mix_test_watch": {:hex, :mix_test_watch, "0.2.6", "9fcc2b1b89d1594c4a8300959c19d50da2f0ff13642c8f681692a6e507f92cab", [:mix], [{:fs, "~> 0.9.1", [hex: :fs, optional: false]}]},
-  "poison": {:hex, :poison, "2.1.0", "f583218ced822675e484648fa26c933d621373f01c6c76bd00005d7bd4b82e27", [:mix], []}}
+  "poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], []}}