Merge pull request #1019 from binaryseed/type-kind-updates

Corrections on __TypeKind
absinthe-graphql · Jan 2, 2021 · 0f3df91 · 0f3df91
2 parents e74c9d5 + 678b8e7
commit 0f3df91
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Bug Fix: [Interface nullability](https://github.com/absinthe-graphql/absinthe/pull/1009) corrections
 - Bug Fix: Fix [field listing for Inputs](https://github.com/absinthe-graphql/absinthe/pull/1015) that import fields
 - Bug Fix: Properly [trim all descriptions](https://github.com/absinthe-graphql/absinthe/pull/1014) no matter the mechanism used to specify them
+- Bug Fix: Fix incorrect specification of [`__TypeKind`](https://github.com/absinthe-graphql/absinthe/pull/1019)
 
 ## 1.5.5
 

diff --git a/lib/absinthe/introspection/kind.ex b/lib/absinthe/introspection/kind.ex
diff --git a/lib/absinthe/introspection/type_kind.ex b/lib/absinthe/introspection/type_kind.ex
@@ -0,0 +1,24 @@
+defmodule Absinthe.Introspection.TypeKind do
+  @moduledoc false
+
+  # https://spec.graphql.org/draft/#sec-Type-Kinds
+
+  defmacro __using__(kind) do
+    quote do
+      @behaviour unquote(__MODULE__)
+      def kind, do: unquote(kind)
+    end
+  end
+
+  @type type_kind ::
+          :scalar
+          | :object
+          | :interface
+          | :union
+          | :enum
+          | :input_object
+          | :list
+          | :non_null
+
+  @callback kind() :: type_kind()
+end
diff --git a/lib/absinthe/type/built_ins/introspection.ex b/lib/absinthe/type/built_ins/introspection.ex
@@ -94,15 +94,14 @@ defmodule Absinthe.Type.BuiltIns.Introspection do
 
   enum :__type_kind,
     values: [
-      :schema,
       :scalar,
       :object,
       :interface,
       :union,
       :enum,
-      :non_null,
       :input_object,
-      :list
+      :list,
+      :non_null
     ]
 
   enum :__directive_location,

diff --git a/lib/absinthe/type/directive.ex b/lib/absinthe/type/directive.ex
@@ -8,7 +8,6 @@ defmodule Absinthe.Type.Directive do
 
   alias Absinthe.Type
   alias Absinthe.Language
-  use Absinthe.Introspection.Kind
 
   @typedoc """
   A defined directive.

diff --git a/lib/absinthe/type/enum.ex b/lib/absinthe/type/enum.ex
@@ -51,7 +51,7 @@ defmodule Absinthe.Type.Enum do
 
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :enum
 
   alias Absinthe.{Blueprint, Type}
 

diff --git a/lib/absinthe/type/input_object.ex b/lib/absinthe/type/input_object.ex
@@ -31,7 +31,7 @@ defmodule Absinthe.Type.InputObject do
   ```
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :input_object
   use Absinthe.Type.Fetch
 
   alias Absinthe.Type

diff --git a/lib/absinthe/type/interface.ex b/lib/absinthe/type/interface.ex
@@ -42,7 +42,7 @@ defmodule Absinthe.Type.Interface do
   ```
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :interface
 
   alias Absinthe.Type
   alias Absinthe.Schema

diff --git a/lib/absinthe/type/list.ex b/lib/absinthe/type/list.ex
@@ -18,7 +18,7 @@ defmodule Absinthe.Type.List do
   ```
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :list
   use Absinthe.Type.Fetch
 
   @typedoc "

diff --git a/lib/absinthe/type/non_null.ex b/lib/absinthe/type/non_null.ex
@@ -21,7 +21,7 @@ defmodule Absinthe.Type.NonNull do
   ```
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :non_null
   use Absinthe.Type.Fetch
 
   @typedoc """

diff --git a/lib/absinthe/type/object.ex b/lib/absinthe/type/object.ex
@@ -67,7 +67,7 @@ defmodule Absinthe.Type.Object do
   """
 
   alias Absinthe.Type
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :object
 
   @typedoc """
   A defined object type.

diff --git a/lib/absinthe/type/scalar.ex b/lib/absinthe/type/scalar.ex
@@ -29,7 +29,7 @@ defmodule Absinthe.Type.Scalar do
   ```
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :scalar
 
   alias Absinthe.Type
 

diff --git a/lib/absinthe/type/union.ex b/lib/absinthe/type/union.ex
@@ -23,7 +23,7 @@ defmodule Absinthe.Type.Union do
   ```
   """
 
-  use Absinthe.Introspection.Kind
+  use Absinthe.Introspection.TypeKind, :union
 
   alias Absinthe.{Schema, Type}
 

diff --git a/test/absinthe/integration/execution/introspection/type_kind_test.exs b/test/absinthe/integration/execution/introspection/type_kind_test.exs
@@ -0,0 +1,54 @@
+defmodule Elixir.Absinthe.Integration.Execution.Introspection.TypeKindTest do
+  use Absinthe.Case, async: true
+
+  @query """
+  query {
+    __type(name: "__TypeKind") {
+      name
+      enumValues {
+        name
+      }
+    }
+  }
+  """
+
+  # https://spec.graphql.org/draft/#sel-HAJbLA6GABABKwzN
+  #
+  # enum __TypeKind {
+  #   SCALAR
+  #   OBJECT
+  #   INTERFACE
+  #   UNION
+  #   ENUM
+  #   INPUT_OBJECT
+  #   LIST
+  #   NON_NULL
+  # }
+
+  @expected [
+    "SCALAR",
+    "OBJECT",
+    "INTERFACE",
+    "UNION",
+    "ENUM",
+    "INPUT_OBJECT",
+    "LIST",
+    "NON_NULL"
+  ]
+
+  test "Contains expected values" do
+    {:ok,
+     %{
+       data: %{
+         "__type" => %{
+           "name" => "__TypeKind",
+           "enumValues" => enum_values
+         }
+       }
+     }} = Absinthe.run(@query, Absinthe.Fixtures.ContactSchema, [])
+
+    type_kind_values = enum_values |> Enum.map(& &1["name"])
+
+    assert Enum.sort(type_kind_values) == Enum.sort(@expected)
+  end
+end