graphql 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5283bf51e22ac60f8d9368d9cc19b8c6d038d8b
-  data.tar.gz: 147ec429661a6fbc1aaef685ba94c8a81d87910e
+  metadata.gz: 6d3ae1b02473b2855990db63798b1c5d2fea46de
+  data.tar.gz: cfdc979146afea3eb44a969b66ac3a0763956db7
 SHA512:
-  metadata.gz: 06a2a8730fc1c13dc0a0d76a35b19e89dd40ad842e41618abb1b05a7f75b667eede56c106728e3e68bd531e36e29b28050b991319599b7952ac3285fb3f9be3c
-  data.tar.gz: 8231c7696681477decf92b0665f3e4249b308153338c8d7cf5102b7e95133b9ac7aa6156f3dddc026c4178ea9fcb25d7f181f752298d5cf38185141af653a471
+  metadata.gz: 762efe82d940d001685c0cf242e1b6fc0c7ee9a5b77de66c4917268b6d2ae0340346daf707d74d41c9b1dd77b71c2d2d1f887e74e2eae2ab9c7869a787a5a74b
+  data.tar.gz: 4bcd06d7c866bb65154310cb8d11965902372860747aaaa99ebf44a73ebac3f6b1743e459e47730ba44e7fab57588031352bd1ed63925a42ec89550d32bf7906

data/lib/graphql/compatibility/schema_parser_specification.rb

@@ -78,6 +78,34 @@ module GraphQL
             assert_equal [], type.values[2].directives
           end
 
+          def test_it_parses_union_types
+            document = parse(
+              "union BagOfThings = \n" \
+              "A |\n" \
+              "B |\n" \
+              "C"
+            )
+
+            union = document.definitions.first
+
+            assert_equal GraphQL::Language::Nodes::UnionTypeDefinition, union.class
+            assert_equal 'BagOfThings', union.name
+            assert_equal 3, union.types.length
+            assert_equal [1, 1], union.position
+
+            assert_equal GraphQL::Language::Nodes::TypeName, union.types[0].class
+            assert_equal 'A', union.types[0].name
+            assert_equal [2, 1], union.types[0].position
+
+            assert_equal GraphQL::Language::Nodes::TypeName, union.types[1].class
+            assert_equal 'B', union.types[1].name
+            assert_equal [3, 1], union.types[1].position
+
+            assert_equal GraphQL::Language::Nodes::TypeName, union.types[2].class
+            assert_equal 'C', union.types[2].name
+            assert_equal [4, 1], union.types[2].position
+          end
+
           def test_it_parses_input_types
             document = parse('
               input EmptyMutationInput {

data/lib/graphql/enum_type.rb

@@ -12,8 +12,8 @@ module GraphQL
   #
   # @example An enum of programming languages
   #   LanguageEnum = GraphQL::EnumType.define do
-  #     name "Languages"
-  #     description "Programming languages for Web projects"
+  #     name "Language"
+  #     description "Programming language for Web projects"
   #     value("PYTHON", "A dynamic, function-oriented language")
   #     value("RUBY", "A very dynamic language aimed at programmer happiness")
   #     value("JAVASCRIPT", "Accidental lingua franca of the web")
@@ -57,7 +57,7 @@ module GraphQL
   #   }
   #
   # @example Enum whose values are different in ActiveRecord-land
-  #   class Language < ActiveRecord::BaseType
+  #   class Language < ActiveRecord::Base
   #     enum language: {
   #       rb: 0
   #     }

data/lib/graphql/execution_error.rb

@@ -12,11 +12,19 @@ module GraphQL
     attr_accessor :path
 
     # @return [Hash] Optional data for error objects
+    # @deprecated Use `extensions` instead of `options`. The GraphQL spec
+    # recommends that any custom entries in an error be under the
+    # `extensions` key.
     attr_accessor :options
 
-    def initialize(message, ast_node: nil, options: nil)
+    # @return [Hash] Optional custom data for error objects which will be added
+    # under the `extensions` key.
+    attr_accessor :extensions
+
+    def initialize(message, ast_node: nil, options: nil, extensions: nil)
       @ast_node = ast_node
       @options = options
+      @extensions = extensions
       super(message)
     end
 
@@ -39,6 +47,10 @@ module GraphQL
       if options
         hash.merge!(options)
       end
+      if extensions
+        hash["extensions"] ||= {}
+        hash["extensions"].merge!(extensions)
+      end
       hash
     end
   end

data/lib/graphql/introspection.rb

@@ -5,7 +5,6 @@ module GraphQL
 end
 
 require "graphql/introspection/base_object"
-require "graphql/introspection/typename_field"
 require "graphql/introspection/input_value_type"
 require "graphql/introspection/enum_value_type"
 require "graphql/introspection/type_kind_enum"
@@ -14,8 +13,6 @@ require "graphql/introspection/field_type"
 require "graphql/introspection/directive_location_enum"
 require "graphql/introspection/directive_type"
 require "graphql/introspection/schema_type"
-require "graphql/introspection/schema_field"
-require "graphql/introspection/type_by_name_field"
 require "graphql/introspection/introspection_query"
 require "graphql/introspection/dynamic_fields"
 require "graphql/introspection/entry_points"

data/lib/graphql/introspection/dynamic_fields.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GraphQL
   module Introspection
-    class DynamicFields < GraphQL::Schema::Object
+    class DynamicFields < Introspection::BaseObject
       field :__typename, String, "The name of this type", null: false, extras: [:irep_node]
       def __typename(irep_node:)
         irep_node.owner_type.name

data/lib/graphql/introspection/entry_points.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GraphQL
   module Introspection
-    class EntryPoints < GraphQL::Schema::Object
+    class EntryPoints < Introspection::BaseObject
       field :__schema, GraphQL::Schema::LateBoundType.new("__Schema"), "This GraphQL schema", null: false
       field :__type, GraphQL::Schema::LateBoundType.new("__Type"), "A type in the GraphQL system", null: true do
         argument :name, String, required: true

data/lib/graphql/introspection/type_type.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GraphQL
   module Introspection
-    class TypeType < GraphQL::Schema::Object
+    class TypeType < Introspection::BaseObject
       graphql_name "__Type"
       description "The fundamental unit of any GraphQL Schema is the type. There are many kinds of types in "\
                   "GraphQL as represented by the `__TypeKind` enum.\n\n"\
@@ -24,7 +24,6 @@ module GraphQL
       end
       field :input_fields, [GraphQL::Schema::LateBoundType.new("__InputValue")], null: true
       field :of_type, GraphQL::Schema::LateBoundType.new("__Type"), null: true
-      introspection true
 
       def kind
         @object.kind.name

data/lib/graphql/language/parser.rb

@@ -1651,14 +1651,14 @@ module_eval(<<'.,.,', 'parser.y', 341)
 
 module_eval(<<'.,.,', 'parser.y', 345)
   def _reduce_141(val, _values, result)
-     return [make_node(:TypeName, name: val[0])]
+     return [make_node(:TypeName, name: val[0], position_source: val[0])]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 346)
   def _reduce_142(val, _values, result)
-     val[0] << make_node(:TypeName, name: val[2]) 
+     val[0] << make_node(:TypeName, name: val[2], position_source: val[2]) 
     result
   end
 .,.,

data/lib/graphql/language/parser.y

@@ -343,8 +343,8 @@ rule
       }
 
   union_members:
-      name                    { return [make_node(:TypeName, name: val[0])]}
-    | union_members PIPE name { val[0] << make_node(:TypeName, name: val[2]) }
+      name                    { return [make_node(:TypeName, name: val[0], position_source: val[0])]}
+    | union_members PIPE name { val[0] << make_node(:TypeName, name: val[2], position_source: val[2]) }
 
   union_type_definition:
       UNION name directives_list_opt EQUALS union_members {

data/lib/graphql/railtie.rb

@@ -40,7 +40,7 @@ module GraphQL
             unless File.exists?(destination_file)
               FileUtils.mkdir_p(File.dirname(destination_file))
               File.open(destination_file, 'w') do |f|
-                f.write "class Types::BaseScalar < GraphQL::Schema::Scalar\nend"
+                f.puts "class Types::BaseScalar < GraphQL::Schema::Scalar\nend"
               end
             end
 
@@ -48,7 +48,7 @@ module GraphQL
             unless File.exists?(destination_file)
               FileUtils.mkdir_p(File.dirname(destination_file))
               File.open(destination_file, 'w') do |f|
-                f.write "class Types::BaseInputObject < GraphQL::Schema::InputObject\nend"
+                f.puts "class Types::BaseInputObject < GraphQL::Schema::InputObject\nend"
               end
             end
 
@@ -56,7 +56,7 @@ module GraphQL
             unless File.exists?(destination_file)
               FileUtils.mkdir_p(File.dirname(destination_file))
               File.open(destination_file, 'w') do |f|
-                f.write "class Types::BaseEnum < GraphQL::Schema::Enum\nend"
+                f.puts "class Types::BaseEnum < GraphQL::Schema::Enum\nend"
               end
             end
 
@@ -64,7 +64,7 @@ module GraphQL
             unless File.exists?(destination_file)
               FileUtils.mkdir_p(File.dirname(destination_file))
               File.open(destination_file, 'w') do |f|
-                f.write "class Types::BaseUnion < GraphQL::Schema::Union\nend"
+                f.puts "class Types::BaseUnion < GraphQL::Schema::Union\nend"
               end
             end
 
@@ -72,14 +72,14 @@ module GraphQL
             unless File.exists?(destination_file)
               FileUtils.mkdir_p(File.dirname(destination_file))
               File.open(destination_file, 'w') do |f|
-                f.write "module Types::BaseInterface\n  include GraphQL::Schema::Interface\nend"
+                f.puts "module Types::BaseInterface\n  include GraphQL::Schema::Interface\nend"
               end
             end
 
             destination_file = File.join(base_dir, "types", "base_object.rb")
             unless File.exists?(destination_file)
               File.open(destination_file, 'w') do |f|
-                f.write "class Types::BaseObject < GraphQL::Schema::Object\nend"
+                f.puts "class Types::BaseObject < GraphQL::Schema::Object\nend"
               end
             end
           end

data/lib/graphql/schema/resolver.rb

@@ -112,7 +112,6 @@ module GraphQL
         end
 
         # A non-normalized type configuration, without `null` applied
-        # @api private
         def type_expr
           @type_expr || (superclass.respond_to?(:type_expr) ? superclass.type_expr : nil)
         end

data/lib/graphql/schema/warden.rb

@@ -136,13 +136,17 @@ module GraphQL
       end
 
       def visible_type?(type_defn)
-        visible?(type_defn) && (
-            root_type?(type_defn) ||
-            type_defn.introspection? ||
-            referenced?(type_defn) ||
-            visible_abstract_type?(type_defn) ||
-            possible_types?(type_defn)
-          )
+        return false unless visible?(type_defn)
+        return true if root_type?(type_defn)
+        return true if type_defn.introspection?
+
+        if type_defn.kind.union?
+          visible_possible_types?(type_defn) && (referenced?(type_defn) || orphan_type?(type_defn))
+        elsif type_defn.kind.interface?
+          visible_possible_types?(type_defn)
+        else
+          referenced?(type_defn) || visible_abstract_type?(type_defn)
+        end
       end
 
       def root_type?(type_defn)
@@ -154,6 +158,10 @@ module GraphQL
         members.any? { |m| visible?(m) }
       end
 
+      def orphan_type?(type_defn)
+        @schema.orphan_types.include?(type_defn)
+      end
+
       def visible_abstract_type?(type_defn)
         type_defn.kind.object? && (
             interfaces(type_defn).any? ||
@@ -161,9 +169,8 @@ module GraphQL
           )
       end
 
-      def possible_types?(type_defn)
-        (type_defn.kind.union? || type_defn.kind.interface?) &&
-          @schema.possible_types(type_defn).any? { |t| visible_type?(t) }
+      def visible_possible_types?(type_defn)
+        @schema.possible_types(type_defn).any? { |t| visible_type?(t) }
       end
 
       def visible?(member)

data/lib/graphql/static_validation/rules/fields_are_defined_on_type.rb

@@ -19,7 +19,7 @@ module GraphQL
         field = context.warden.get_field(parent_type, ast_field.name)
 
         if field.nil?
-          if  parent_type.kind.union?
+          if parent_type.kind.union?
             context.errors << message("Selections can't be made directly on unions (see selections on #{parent_type.name})", parent, context: context)
           else
             context.errors << message("Field '#{ast_field.name}' doesn't exist on type '#{parent_type.name}'", ast_field, context: context)

data/lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb

@@ -29,8 +29,8 @@ module GraphQL
           else
             "Selections can't be made on scalars (%{node_name} returns #{resolved_type.name} but has selections [#{ast_node.selections.map(&:name).join(", ")}])"
           end
-        elsif resolved_type.kind.object? && ast_node.selections.none?
-          "Objects must have selections (%{node_name} returns #{resolved_type.name} but has no selections)"
+        elsif resolved_type.kind.fields? && ast_node.selections.none?
+          "Field must have selections (%{node_name} returns #{resolved_type.name} but has no selections. Did you mean '#{ast_node.name} { ... }'?)"
         else
           nil
         end

data/lib/graphql/upgrader/member.rb

@@ -356,10 +356,10 @@ module GraphQL
           # This is not good, it will hit false positives
           # Should use AST to make this substitution
           if obj_arg_name != "_"
-            proc_body.gsub!(/([^\w:.]|^)#{obj_arg_name}([^\w:]|$)/, '\1@object\2')
+            proc_body.gsub!(/([^\w:.]|^)#{obj_arg_name}([^\w:]|$)/, '\1object\2')
           end
           if ctx_arg_name != "_"
-            proc_body.gsub!(/([^\w:.]|^)#{ctx_arg_name}([^\w:]|$)/, '\1@context\2')
+            proc_body.gsub!(/([^\w:.]|^)#{ctx_arg_name}([^\w:]|$)/, '\1context\2')
           end
 
           method_defn = "def #{@proc_name}(**#{args_arg_name})\n#{method_defn_indent}  #{proc_body}\n#{method_defn_indent}end\n"
@@ -491,8 +491,8 @@ module GraphQL
           # - Get the three argument names (obj, arg, ctx)
           # - Get the proc body
           # - Find and replace:
-          #  - The ctx argument becomes `@context`
-          #  - The obj argument becomes `@object`
+          #  - The ctx argument becomes `context`
+          #  - The obj argument becomes `object`
           # - Args is trickier:
           #   - If it's not used, remove it
           #   - If it's used, abandon ship and make it `**args`
@@ -513,10 +513,10 @@ module GraphQL
           # This is not good, it will hit false positives
           # Should use AST to make this substitution
           if obj_arg_name != "_"
-            proc_body.gsub!(/([^\w:.]|^)#{obj_arg_name}([^\w:]|$)/, '\1@object\2')
+            proc_body.gsub!(/([^\w:.]|^)#{obj_arg_name}([^\w:]|$)/, '\1object\2')
           end
           if ctx_arg_name != "_"
-            proc_body.gsub!(/([^\w:.]|^)#{ctx_arg_name}([^\w:]|$)/, '\1@context\2')
+            proc_body.gsub!(/([^\w:.]|^)#{ctx_arg_name}([^\w:]|$)/, '\1context\2')
           end
 
           method_def_indent = " " * (processor.resolve_indent - 2)

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/spec/fixtures/upgrader/blame_range.transformed.rb

@@ -13,13 +13,13 @@ module Platform
       field :starting_line, Integer, description: "The starting line for the range", null: false
 
       def starting_line
-        @object.lines.first[:lineno]
+        object.lines.first[:lineno]
       end
 
       field :ending_line, Integer, description: "The ending line for the range", null: false
 
       def ending_line
-        @object.lines.first[:lineno] + (@object.lines.length - 1)
+        object.lines.first[:lineno] + (object.lines.length - 1)
       end
 
       field :commit, Objects::Commit, description: "Identifies the line author", null: false

data/spec/fixtures/upgrader/delete_project.transformed.rb

@@ -12,13 +12,13 @@ module Platform
 
       def resolve(**inputs)
         project =  Platform::Helpers::NodeIdentification.typed_object_from_id(
-          [Objects::Project], inputs[:project_id], @context
+          [Objects::Project], inputs[:project_id], context
         )
 
-        @context[:permission].can_modify?("DeleteProject", project).sync
-        @context[:abilities].authorize_content(:project, :destroy, owner: project.owner)
+        context[:permission].can_modify?("DeleteProject", project).sync
+        context[:abilities].authorize_content(:project, :destroy, owner: project.owner)
 
-        project.enqueue_delete(actor: @context[:viewer])
+        project.enqueue_delete(actor: context[:viewer])
 
         { owner: project.owner }
       end

data/spec/fixtures/upgrader/increment_count.transformed.rb

@@ -20,7 +20,7 @@ module Platform
         { abcDef: 1 }
         some_method do { xyzAbc: 1 } end
 
-        thing = Platform::Helpers::NodeIdentification.typed_object_from_id(Objects::Thing, inputs[:thing_id], @context)
+        thing = Platform::Helpers::NodeIdentification.typed_object_from_id(Objects::Thing, inputs[:thing_id], context)
         raise Errors::Validation.new("Thing not found.") unless thing
 
         ThingActivity.track(thing.id, Time.now.change(min: 0, sec: 0))

data/spec/fixtures/upgrader/photo.transformed.rb

@@ -5,7 +5,7 @@ module Platform
       field :caption, String, null: true
 
       def caption
-        @object.caption
+        object.caption
       end
     end
   end

data/spec/fixtures/upgrader/starrable.transformed.rb

@@ -13,9 +13,9 @@ module Platform
       end
 
       def viewer_has_starred(**arguments)
-        if @context[:viewer]
+        if context[:viewer]
           ->(test_inner_proc) do
-            @context[:viewer].starred?(@object)
+            context[:viewer].starred?(object)
           end
         else
           false
@@ -27,11 +27,11 @@ module Platform
       end
 
       def stargazers(**arguments)
-        scope = case @object
+        scope = case object
         when Repository
-          @object.stars
+          object.stars
         when Gist
-          GistStar.where(gist_id: @object.id)
+          GistStar.where(gist_id: object.id)
         end
 
         table = scope.table_name

data/spec/fixtures/upgrader/subscribable.transformed.rb

@@ -11,17 +11,17 @@ module Platform
       field :viewer_subscription, Enums::SubscriptionState, description: "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.", null: false
 
       def viewer_subscription
-        if @context[:viewer].nil?
+        if context[:viewer].nil?
           return "unsubscribed"
         end
 
-        subscription_status_response = @object.async_subscription_status(@context[:viewer]).sync
+        subscription_status_response = object.async_subscription_status(context[:viewer]).sync
 
         if subscription_status_response.failed?
           error = Platform::Errors::ServiceUnavailable.new("Subscriptions are currently unavailable. Please try again later.")
-          error.ast_node = @context.irep_node.ast_node
-          error.path = @context.path
-          @context.errors << error
+          error.ast_node = context.irep_node.ast_node
+          error.path = context.path
+          context.errors << error
           return "unavailable"
         end
 
@@ -38,9 +38,9 @@ module Platform
       field :viewer_can_subscribe, Boolean, description: "Check if the viewer is able to change their subscription status for the repository.", null: false
 
       def viewer_can_subscribe
-        return false if @context[:viewer].nil?
+        return false if context[:viewer].nil?
 
-        @object.async_subscription_status(@context[:viewer]).then(&:success?)
+        object.async_subscription_status(context[:viewer]).then(&:success?)
       end
 
       field :issues, function: Platform::Functions::Issues.new, description: "A list of issues associated with the milestone.", connection: true

data/spec/fixtures/upgrader/type_x.transformed.rb

@@ -23,12 +23,12 @@ module Platform
       def f4(**arguments)
         Class1.new(
           a: Class2.new(
-            b: @object.b_1,
-            c: @object.c_1
+            b: object.b_1,
+            c: object.c_1
           ),
           d: Class3.new(
-            b: @object.b_2,
-            c: @object.c_3,
+            b: object.b_2,
+            c: object.c_3,
           )
         )
       end
@@ -46,9 +46,9 @@ module Platform
       field :f10, String, null: true
 
       def f10
-        @object.something do |_|
+        object.something do |_|
           xyz_obj.obj
-          @object.f10
+          object.f10
         end
       end
     end

data/spec/graphql/execution/multiplex_spec.rb

@@ -92,7 +92,7 @@ describe GraphQL::Execution::Multiplex do
         },
         {
           "errors" => [{
-            "message"=>"Objects must have selections (field 'nullableNestedSum' returns LazySum but has no selections)",
+            "message"=>"Field must have selections (field 'nullableNestedSum' returns LazySum but has no selections. Did you mean 'nullableNestedSum { ... }'?)",
             "locations"=>[{"line"=>1, "column"=>4}],
             "fields"=>["query", "validationError"]
           }]

data/spec/graphql/execution_error_spec.rb

@@ -271,7 +271,26 @@ describe GraphQL::ExecutionError do
       assert_equal(expected_result, result)
     end
   end
-  
+
+  describe "extensions in ExecutionError" do
+    let(:query_string) {%|
+    {
+      executionErrorWithExtensions
+    }
+    |}
+    it "the error is inserted into the errors key with custom data set in `extensions`" do
+      expected_result = {
+        "data"=>{"executionErrorWithExtensions"=>nil},
+        "errors"=>
+            [{"message"=>"Permission Denied!",
+              "locations"=>[{"line"=>3, "column"=>7}],
+              "path"=>["executionErrorWithExtensions"],
+              "extensions"=>{"code"=>"permission_denied"}}]
+      }
+      assert_equal(expected_result, result)
+    end
+  end
+
   describe "more than one ExecutionError" do
     let(:query_string) { %|{ multipleErrorsOnNonNullableField} |}
     it "the errors are inserted into the errors key and the data is nil even for a NonNullable field " do

data/spec/graphql/introspection/schema_type_spec.rb

@@ -30,6 +30,7 @@ describe GraphQL::Introspection::SchemaType do
             {"name"=>"deepNonNull"},
             {"name"=>"error"},
             {"name"=>"executionError"},
+            {"name"=>"executionErrorWithExtensions"},
             {"name"=>"executionErrorWithOptions"},
             {"name"=>"favoriteEdible"},
             {"name"=>"fromSource"},

data/spec/graphql/relay/mongo_relation_connection_spec.rb

@@ -1,7 +1,18 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe GraphQL::Relay::RelationConnection do
+if MONGO_DETECTED
+  require "support/star_trek/data"
+  require "support/star_trek/schema"
+end
+
+describe GraphQL::Relay::MongoRelationConnection do
+  before do
+    if !MONGO_DETECTED
+      skip("Mongo not detected")
+    end
+  end
+
   def get_names(result)
     ships = result["data"]["federation"]["bases"]["edges"]
     ships.map { |e| e["node"]["name"] }

data/spec/graphql/schema/warden_spec.rb

@@ -358,6 +358,135 @@ describe GraphQL::Schema::Warden do
       assert_equal false, possible_type_names(res["data"]["LanguageMember"]).include?("Phoneme")
     end
 
+    it "hides interfaces if all possible types are hidden" do
+      sdl = %|
+        type Query {
+          a: String
+          repository: Repository
+        }
+
+        type Repository implements Node {
+          id: ID!
+        }
+
+        interface Node {
+          id: ID!
+        }
+      |
+
+      schema = GraphQL::Schema.from_definition(sdl)
+
+      query_string = %|
+        {
+          Node: __type(name: "Node") { name }
+        }
+      |
+
+      res = schema.execute(query_string)
+      assert res["data"]["Node"]
+
+      res = schema.execute(query_string, except: ->(m, _) { m.name == "Repository" })
+      assert_nil res["data"]["Node"]
+    end
+
+    it "hides unions if all possible types are hidden or its references are hidden" do
+      sdl = "
+        type Query {
+          bag: BagOfThings
+        }
+
+        type A {
+          id: ID!
+        }
+
+        type B {
+          id: ID!
+        }
+
+        type C {
+          id: ID!
+        }
+
+        union BagOfThings = A | B | C
+      "
+
+      schema = GraphQL::Schema.from_definition(sdl)
+      schema.orphan_types = []
+
+      query_string = %|
+        {
+          BagOfThings: __type(name: "BagOfThings") { name }
+          Query: __type(name: "Query") { fields { name } }
+        }
+      |
+
+      res = schema.execute(query_string)
+      assert res["data"]["BagOfThings"]
+      assert_equal ["bag"], res["data"]["Query"]["fields"].map { |f| f["name"] }
+
+      # Hide the union when all its possible types are gone. This will cause the field to be hidden too.
+      res = schema.execute(query_string, except: ->(m, _) { ["A", "B", "C"].include?(m.name) })
+      assert_nil res["data"]["BagOfThings"]
+      assert_equal [], res["data"]["Query"]["fields"]
+
+      res = schema.execute(query_string, except: ->(m, _) { m.name == "bag" })
+      assert_nil res["data"]["BagOfThings"]
+      assert_equal [], res["data"]["Query"]["fields"]
+
+      # Unreferenced but still visible because orphan type
+      schema.orphan_types = [schema.find("BagOfThings")]
+      res = schema.execute(query_string, except: ->(m, _) { m.name == "bag" })
+      assert res["data"]["BagOfThings"]
+    end
+
+    it "hides interfaces if all possible types are hidden or its references are hidden" do
+      sdl = "
+        type Query {
+          node: Node
+        }
+
+        type A implements Node {
+          id: ID!
+        }
+
+        type B implements Node {
+          id: ID!
+        }
+
+        type C implements Node {
+          id: ID!
+        }
+
+        interface Node {
+          id: ID!
+        }
+      "
+
+      schema = GraphQL::Schema.from_definition(sdl)
+
+      query_string = %|
+        {
+          Node: __type(name: "Node") { name }
+          Query: __type(name: "Query") { fields { name } }
+        }
+      |
+
+      res = schema.execute(query_string)
+      assert res["data"]["Node"]
+      assert_equal ["node"], res["data"]["Query"]["fields"].map { |f| f["name"] }
+
+      # When the possible types are all hidden, hide the interface and fields pointing to it
+      res = schema.execute(query_string, except: ->(m, _) { ["A", "B", "C"].include?(m.name) })
+      assert_nil res["data"]["Node"]
+      assert_equal [], res["data"]["Query"]["fields"]
+
+      # Even when it's not the return value of a field,
+      # still show the interface since it allows code reuse
+      res = schema.execute(query_string, except: ->(m, _) { m.name == "node" })
+      assert_equal "Node", res["data"]["Node"]["name"]
+      assert_equal [], res["data"]["Query"]["fields"]
+    end
+
     it "can't be a fragment condition" do
       query_string = %|
       {

data/spec/graphql/static_validation/rules/fields_have_appropriate_selections_spec.rb

@@ -6,32 +6,40 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
   let(:query_string) {"
     query getCheese {
       okCheese: cheese(id: 1) { fatContent, similarCheese(source: YAK) { source } }
-      missingFieldsCheese: cheese(id: 1)
+      missingFieldsObject: cheese(id: 1)
+      missingFieldsInterface: cheese(id: 1) { selfAsEdible }
       illegalSelectionCheese: cheese(id: 1) { id { something, ... someFields } }
       incorrectFragmentSpread: cheese(id: 1) { flavor { ... on String { __typename } } }
     }
   "}
 
   it "adds errors for selections on scalars" do
-    assert_equal(3, errors.length)
+    assert_equal(4, errors.length)
 
     illegal_selection_error = {
       "message"=>"Selections can't be made on scalars (field 'id' returns Int but has selections [something, someFields])",
-      "locations"=>[{"line"=>5, "column"=>47}],
+      "locations"=>[{"line"=>6, "column"=>47}],
       "fields"=>["query getCheese", "illegalSelectionCheese", "id"],
     }
     assert_includes(errors, illegal_selection_error, "finds illegal selections on scalars")
 
-    selection_required_error = {
-      "message"=>"Objects must have selections (field 'cheese' returns Cheese but has no selections)",
+    objects_selection_required_error = {
+      "message"=>"Field must have selections (field 'cheese' returns Cheese but has no selections. Did you mean 'cheese { ... }'?)",
       "locations"=>[{"line"=>4, "column"=>7}],
-      "fields"=>["query getCheese", "missingFieldsCheese"],
+      "fields"=>["query getCheese", "missingFieldsObject"],
+    }
+    assert_includes(errors, objects_selection_required_error, "finds objects without selections")
+
+    interfaces_selection_required_error = {
+      "message"=>"Field must have selections (field 'selfAsEdible' returns Edible but has no selections. Did you mean 'selfAsEdible { ... }'?)",
+      "locations"=>[{"line"=>5, "column"=>47}],
+      "fields"=>["query getCheese", "missingFieldsInterface", "selfAsEdible"],
     }
-    assert_includes(errors, selection_required_error, "finds objects without selections")
+    assert_includes(errors, interfaces_selection_required_error, "finds interfaces without selections")
 
     incorrect_fragment_error = {
       "message"=>"Selections can't be made on scalars (field 'flavor' returns String but has inline fragments [String])",
-      "locations"=>[{"line"=>6, "column"=>48}],
+      "locations"=>[{"line"=>7, "column"=>48}],
       "fields"=>["query getCheese", "incorrectFragmentSpread", "flavor"],
     }
     assert_includes(errors, incorrect_fragment_error, "finds scalar fields with selections")
@@ -43,7 +51,7 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
       assert_equal(1, errors.length)
 
       selections_required_error = {
-        "message"=> "Objects must have selections (anonymous query returns Query but has no selections)",
+        "message"=> "Field must have selections (anonymous query returns Query but has no selections. Did you mean ' { ... }'?)",
         "locations"=>[{"line"=>1, "column"=>1}],
         "fields"=>["query"]
       }

data/spec/graphql/upgrader/member_spec.rb

@@ -195,7 +195,7 @@ RUBY
     end
 
     describe "resolve proc to method" do
-      it "converts @object and @context" do
+      it "converts object and context" do
         old = %{
           field :firstName, !types.String do
             resolve ->(obj, arg, ctx) {
@@ -211,11 +211,11 @@ RUBY
           field :first_name, String, null: false
 
           def first_name
-            @context.something
+            context.something
             other_ctx # test combined identifiers
 
-            @object[@context] + @object
-            @object.given_name
+            object[context] + object
+            object.given_name
           end
         }
         assert_equal new, upgrade(old)
@@ -233,7 +233,7 @@ RUBY
           field :first_name, String, null: false
 
           def first_name
-            @object.given_name
+            object.given_name
           end
         }
         assert_equal new, upgrade(old)

data/spec/spec_helper.rb

@@ -27,6 +27,22 @@ require "pry"
 require "minitest/autorun"
 require "minitest/focus"
 require "minitest/reporters"
+
+MONGO_DETECTED = begin
+  require "mongo"
+  Mongo::Client.new('mongodb://127.0.0.1:27017/graphql_ruby_test',
+      connect_timeout: 1,
+      socket_timeout: 1,
+      server_selection_timeout: 1,
+      logger: Logger.new(nil)
+    )
+    .database
+    .collections
+rescue StandardError, LoadError => err # rubocop:disable Lint/UselessAssignment
+  # puts err.message, err.backtrace
+  false
+end
+
 Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new(color: true)
 
 Minitest::Spec.make_my_diffs_pretty!
@@ -62,9 +78,12 @@ NO_OP_RESOLVE_TYPE = ->(type, obj, ctx) {
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|
+  # These require mongodb in order to run,
+  # so only load them in the specific tests that require them.
+  next if f.include?("star_trek")
+
   unless rails_should_be_installed?
     next if f.end_with?('star_wars/data.rb')
-    next if f.end_with?('star_trek/data.rb')
     next if f.end_with?('base_generator_test.rb')
   end
   require f

data/spec/support/dummy/schema.rb

@@ -381,6 +381,13 @@ module Dummy
       }
     end
 
+    field :executionErrorWithExtensions do
+      type GraphQL::INT_TYPE
+      resolve ->(t, a, c) {
+        GraphQL::ExecutionError.new("Permission Denied!", extensions: { "code" => "permission_denied" })
+      }
+    end
+
     # To test possibly-null fields
     field :maybeNull, MaybeNullType do
       resolve ->(t, a, c) { OpenStruct.new(cheese: nil) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -304,20 +304,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: algoliasearch-jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A plain-Ruby implementation of GraphQL.
 email:
 - rdmosolgo@gmail.com
@@ -433,12 +419,9 @@ files:
 - lib/graphql/introspection/field_type.rb
 - lib/graphql/introspection/input_value_type.rb
 - lib/graphql/introspection/introspection_query.rb
-- lib/graphql/introspection/schema_field.rb
 - lib/graphql/introspection/schema_type.rb
-- lib/graphql/introspection/type_by_name_field.rb
 - lib/graphql/introspection/type_kind_enum.rb
 - lib/graphql/introspection/type_type.rb
-- lib/graphql/introspection/typename_field.rb
 - lib/graphql/invalid_name_error.rb
 - lib/graphql/invalid_null_error.rb
 - lib/graphql/language.rb
@@ -1005,7 +988,6 @@ files:
 - spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
-- spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
 - spec/graphql/language/block_string_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
@@ -1553,7 +1535,6 @@ test_files:
 - spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
-- spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
 - spec/graphql/language/block_string_spec.rb
 - spec/graphql/language/definition_slice_spec.rb

data/lib/graphql/introspection/schema_field.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  module Introspection
-    SchemaField = GraphQL::Field.define do
-      name("__schema")
-      description("This GraphQL schema")
-      type(GraphQL::Schema::LateBoundType.new("__Schema").to_non_null_type)
-      resolve ->(o, a, ctx) {
-        # Apply wrapping manually since this field isn't wrapped by instrumentation
-        schema = ctx.query.schema
-        schema_type = schema.introspection_system.schema_type
-        schema_type.metadata[:type_class].new(schema, ctx.query.context)
-      }
-    end
-  end
-end

data/lib/graphql/introspection/type_by_name_field.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  module Introspection
-    TypeByNameField = GraphQL::Field.define do
-      name("__type")
-      description("A type in the GraphQL system")
-      introspection true
-      type(GraphQL::Schema::LateBoundType.new("__Type"))
-      argument :name, !types.String
-      resolve ->(o, args, ctx) {
-        type = ctx.warden.get_type(args["name"])
-        if type
-          # Apply wrapping manually since this field isn't wrapped by instrumentation
-          type_type = ctx.schema.introspection_system.type_type
-          type_type.metadata[:type_class].new(type, ctx)
-        else
-          nil
-        end
-      }
-    end
-  end
-end

data/lib/graphql/introspection/typename_field.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  module Introspection
-    TypenameField = GraphQL::Field.define do
-      name "__typename"
-      description "The name of this type"
-      type -> { !GraphQL::STRING_TYPE }
-      introspection true
-      resolve ->(obj, a, ctx) { ctx.irep_node.owner_type }
-    end
-  end
-end

data/spec/graphql/introspection/type_by_name_field_spec.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-require "spec_helper"
-
-describe GraphQL::Introspection::TypeByNameField do
-  describe "after instrumentation" do
-    # Just make sure it returns a new object, not the original field
-    class DupInstrumenter
-      def self.instrument(t, f)
-        f.redefine {
-          resolve ->(o, a, c) { :no_op }
-        }
-      end
-    end
-
-    class ArgAnalyzer
-      def call(_, _, node)
-        if node.ast_node.is_a?(GraphQL::Language::Nodes::Field)
-          node.arguments
-        end
-      end
-    end
-
-    let(:instrumented_schema) {
-      # This was probably assigned earlier in the test suite, but to simulate an application, clear it.
-      GraphQL::Introspection::TypeByNameField.arguments_class = nil
-
-      Dummy::Schema.redefine {
-        instrument(:field, DupInstrumenter)
-        query_analyzer(ArgAnalyzer.new)
-      }
-    }
-
-    it "still works with __type" do
-      res = instrumented_schema.execute("{ __type(name: \"X\") { name } }")
-      assert_equal({"data"=>{"__type"=>nil}}, res)
-    end
-  end
-end