Consolidate protocols *always*

The reason protcol consolidation was disabled for test env was because
some protocol implementations were defined in tests.

These are now defined under lib/ so and now we can use consolidation.

Tests now run in 0.1-0.2 seconds on my MBP.

Author: freshtonic

lib/graphql/test_support/visitor_implementations.ex

@@ -0,0 +1,50 @@
+
+defmodule GraphQL.TestSupport.VisitorImplementations do
+
+  alias GraphQL.Lang.AST.Visitor
+  alias GraphQL.Lang.AST.PostprocessingVisitor
+
+
+  defmodule TracingVisitor do
+    defstruct name: nil
+  end
+
+  defimpl Visitor, for: TracingVisitor do
+    def enter(visitor, node, accumulator) do
+      {:continue, %{accumulator | calls: ["#{visitor.name} entering #{node[:kind]}"] ++ accumulator[:calls]}}
+    end
+
+    def leave(visitor, node, accumulator) do
+      %{accumulator | calls: ["#{visitor.name} leaving #{node[:kind]}"] ++ accumulator[:calls]}
+    end
+  end
+
+  defmodule CallReverser do
+    defstruct name: "call reverser"
+  end
+
+  defimpl PostprocessingVisitor, for: CallReverser do
+    def finish(_visitor, accumulator) do
+      Enum.reverse(accumulator[:calls])
+    end
+  end
+
+  defmodule BalancedCallsVisitor do
+    defstruct name: "balanced calls visitor"
+  end
+
+  defimpl Visitor, for: BalancedCallsVisitor do
+    def enter(_visitor, _node, accumulator) do
+      {:continue, %{accumulator | count: accumulator[:count] + 1}}
+    end
+
+    def leave(_visitor, _node, accumulator) do
+      %{accumulator | count: accumulator[:count] - 1}
+    end
+  end
+
+  defimpl PostprocessingVisitor, for: BalancedCallsVisitor do
+    def finish(_visitor, accumulator), do: accumulator[:count]
+  end
+end
+

mix.exs

@@ -17,7 +17,7 @@ defmodule GraphQL.Mixfile do
      homepage_url: @repo_url,
      build_embedded: Mix.env == :prod,
      start_permanent: Mix.env == :prod,
-     consolidate_protocols: Mix.env == :prod,
+     consolidate_protocols: true,
      name: "GraphQL",
      docs: [main: "GraphQL", logo: "logo.png", extras: ["README.md"]]]
   end

test/graphql/lang/ast/composite_visitor_test.exs

@@ -4,33 +4,9 @@ defmodule GraphQL.Lang.AST.CompositeVisitorTest do
 
   alias GraphQL.Lang.Parser
   alias GraphQL.Lang.AST.Reducer
-  alias GraphQL.Lang.AST.Visitor
   alias GraphQL.Lang.AST.CompositeVisitor
-  alias GraphQL.Lang.AST.PostprocessingVisitor
 
-  defmodule TracingVisitor do
-    defstruct name: nil
-  end
-
-  defimpl Visitor, for: TracingVisitor do
-    def enter(visitor, node, accumulator) do
-      {:continue, %{accumulator | calls: ["#{visitor.name} entering #{node[:kind]}"] ++ accumulator[:calls]}}
-    end
-
-    def leave(visitor, node, accumulator) do
-      %{accumulator | calls: ["#{visitor.name} leaving #{node[:kind]}"] ++ accumulator[:calls]}
-    end
-  end
-
-  defmodule CallReverser do
-    defstruct name: "call reverser"
-  end
-
-  defimpl PostprocessingVisitor, for: CallReverser do
-    def finish(_visitor, accumulator) do
-      Enum.reverse(accumulator[:calls])
-    end
-  end
+  alias GraphQL.TestSupport.VisitorImplementations.{CallReverser, TracingVisitor}
 
   test "Composed Visitors are called in the correct order" do
     v0 = %CallReverser{}

test/graphql/lang/ast/reducer_test.exs

@@ -4,46 +4,13 @@ defmodule GraphQL.Lang.AST.ReducerTest do
 
   alias GraphQL.Lang.Parser
   alias GraphQL.Lang.AST.Reducer
-  alias GraphQL.Lang.AST.Visitor
-  alias GraphQL.Lang.AST.PostprocessingVisitor
+  alias GraphQL.Lang.AST.CompositeVisitor
 
-  defmodule TracingVisitor do
-    defstruct name: "logging visitor"
-  end
-
-  defimpl Visitor, for: TracingVisitor do
-    def enter(_visitor, node, accumulator) do
-      {:continue, Map.merge(accumulator, %{calls: ["Entering: #{node[:kind]}"] ++ accumulator[:calls]})}
-    end
-
-    def leave(_visitor, node, accumulator) do
-      Map.merge(accumulator, %{calls: ["Leaving: #{node[:kind]}"] ++ accumulator[:calls]})
-    end
-  end
-
-  defimpl PostprocessingVisitor, for: TracingVisitor do
-    def finish(_visitor, accumulator) do
-      Enum.reverse accumulator[:calls]
-    end
-  end
-
-  defmodule BalancedCallsVisitor do
-    defstruct name: "balanced calls visitor"
-  end
-
-  defimpl Visitor, for: BalancedCallsVisitor do
-    def enter(_visitor, _node, accumulator) do
-      {:continue, %{accumulator | count: accumulator[:count] + 1}}
-    end
-
-    def leave(_visitor, _node, accumulator) do
-      %{accumulator | count: accumulator[:count] - 1}
-    end
-  end
-
-  defimpl PostprocessingVisitor, for: BalancedCallsVisitor do
-    def finish(_visitor, accumulator), do: accumulator[:count]
-  end
+  alias GraphQL.TestSupport.VisitorImplementations.{
+    CallReverser,
+    TracingVisitor,
+    BalancedCallsVisitor
+  }
 
   test "Enter and leave calls should be balanced" do
     {:ok, ast} = Parser.parse "type Person {name: String}"
@@ -53,22 +20,27 @@ defmodule GraphQL.Lang.AST.ReducerTest do
 
   test "All nodes are visited" do
     {:ok, ast} = Parser.parse "type Person {name: String}"
-    log = Reducer.reduce(ast, %TracingVisitor{}, %{calls: []})
+
+    v0 = %CallReverser{}
+    v1 = %TracingVisitor{name: "Tracing Visitor"}
+    composite_visitor = CompositeVisitor.compose([v0, v1])
+
+    log = Reducer.reduce(ast, composite_visitor, %{calls: []})
     assert log == [
-      "Entering: Document",
-      "Entering: ObjectTypeDefinition",
-      "Entering: Name",
-      "Leaving: Name",
-      "Entering: FieldDefinition",
-      "Entering: Name",
-      "Leaving: Name",
-      "Entering: NamedType",
-      "Entering: Name",
-      "Leaving: Name",
-      "Leaving: NamedType",
-      "Leaving: FieldDefinition",
-      "Leaving: ObjectTypeDefinition",
-      "Leaving: Document"
+      "Tracing Visitor entering Document",
+      "Tracing Visitor entering ObjectTypeDefinition",
+      "Tracing Visitor entering Name",
+      "Tracing Visitor leaving Name",
+      "Tracing Visitor entering FieldDefinition",
+      "Tracing Visitor entering Name",
+      "Tracing Visitor leaving Name",
+      "Tracing Visitor entering NamedType",
+      "Tracing Visitor entering Name",
+      "Tracing Visitor leaving Name",
+      "Tracing Visitor leaving NamedType",
+      "Tracing Visitor leaving FieldDefinition",
+      "Tracing Visitor leaving ObjectTypeDefinition",
+      "Tracing Visitor leaving Document"
     ]
   end
 end