graphql 1.10.0.pre1 → 1.10.0.pre2

data/lib/graphql/execution/lazy/lazy_method_map.rb

@@ -36,6 +36,10 @@ module GraphQL
           @storage.compute_if_absent(value.class) { find_superclass_method(value.class) }
         end
 
+        def each
+          @storage.each_pair { |k, v| yield(k, v) }
+        end
+
         protected
 
         attr_reader :storage

data/lib/graphql/execution/lookahead.rb

@@ -223,14 +223,14 @@ module GraphQL
             subselections_on_type = selections_on_type
             if (t = ast_selection.type)
               # Assuming this is valid, that `t` will be found.
-              on_type = @query.schema.types[t.name].metadata[:type_class]
+              on_type = @query.schema.get_type(t.name).type_class
               subselections_on_type = subselections_by_type[on_type] ||= {}
             end
             find_selections(subselections_by_type, subselections_on_type, on_type, ast_selection.selections, arguments)
           when GraphQL::Language::Nodes::FragmentSpread
             frag_defn = @query.fragments[ast_selection.name] || raise("Invariant: Can't look ahead to nonexistent fragment #{ast_selection.name} (found: #{@query.fragments.keys})")
             # Again, assuming a valid AST
-            on_type = @query.schema.types[frag_defn.type.name].metadata[:type_class]
+            on_type = @query.schema.get_type(frag_defn.type.name).type_class
             subselections_on_type = subselections_by_type[on_type] ||= {}
             find_selections(subselections_by_type, subselections_on_type, on_type, frag_defn.selections, arguments)
           else
@@ -366,10 +366,10 @@ module GraphQL
 
         def get_field(schema, owner_type, field_name)
           field_defn = owner_type.get_field(field_name)
-          field_defn ||= if owner_type == schema.query.metadata[:type_class] && (entry_point_field = schema.introspection_system.entry_point(name: field_name))
-            entry_point_field.metadata[:type_class]
+          field_defn ||= if owner_type == schema.query.type_class && (entry_point_field = schema.introspection_system.entry_point(name: field_name))
+            entry_point_field.type_class
           elsif (dynamic_field = schema.introspection_system.dynamic_field(name: field_name))
-            dynamic_field.metadata[:type_class]
+            dynamic_field.type_class
           else
             nil
           end

data/lib/graphql/execution/multiplex.rb

@@ -95,6 +95,7 @@ module GraphQL
             query.result
           end
         rescue Exception
+          # TODO rescue at a higher level so it will catch errors in analysis, too
           # Assign values here so that the query's `@executed` becomes true
           queries.map { |q| q.result_values ||= {} }
           raise
@@ -173,6 +174,15 @@ module GraphQL
         def instrument_and_analyze(multiplex)
           GraphQL::Execution::Instrumentation.apply_instrumenters(multiplex) do
             schema = multiplex.schema
+            if schema.interpreter? && schema.analysis_engine != GraphQL::Analysis::AST
+              raise <<-ERR
+Can't use `GraphQL::Execution::Interpreter` without `GraphQL::Analysis::AST`, please add this plugin to your schema:
+
+    use GraphQL::Analysis::AST
+
+For information about the new analysis engine: https://graphql-ruby.org/queries/ast_analysis.html
+ERR
+            end
             multiplex_analyzers = schema.multiplex_analyzers
             if multiplex.max_complexity
               multiplex_analyzers += if schema.using_ast_analysis?

data/lib/graphql/function.rb

@@ -43,7 +43,7 @@ module GraphQL
 
     # @return [Object] This function's resolver
     def call(obj, args, ctx)
-      raise NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     end
 
     # @return [String, nil]

data/lib/graphql/input_object_type.rb

@@ -99,7 +99,8 @@ module GraphQL
         end
       end
 
-      arguments_class.new(input_values, context: ctx, defaults_used: defaults_used)
+      result = arguments_class.new(input_values, context: ctx, defaults_used: defaults_used)
+      result.prepare
     end
 
     # @api private
@@ -135,7 +136,7 @@ module GraphQL
       # Items in the input that are unexpected
       input.each do |name, value|
         if visible_arguments_map[name].nil?
-          result.add_problem("Field is not defined on #{self.name}", [name])
+          result.add_problem("Field is not defined on #{self.graphql_name}", [name])
         end
       end
 

data/lib/graphql/interface_type.rb

@@ -71,7 +71,7 @@ module GraphQL
     # @return [GraphQL::ObjectType, nil] The type named `type_name` if it exists and implements this {InterfaceType}, (else `nil`)
     def get_possible_type(type_name, ctx)
       type = ctx.query.get_type(type_name)
-      type if type && ctx.query.schema.possible_types(self).include?(type)
+      type if type && ctx.query.warden.possible_types(self).include?(type)
     end
 
     # Check if a type is a possible type of this {InterfaceType}

data/lib/graphql/introspection/base_object.rb

@@ -2,15 +2,12 @@
 module GraphQL
   module Introspection
     class BaseObject < GraphQL::Schema::Object
+      introspection(true)
+
       def self.field(*args, **kwargs, &block)
         kwargs[:introspection] = true
         super(*args, **kwargs, &block)
       end
-
-      def self.inherited(child_class)
-        child_class.introspection(true)
-        super
-      end
     end
   end
 end

data/lib/graphql/introspection/directive_type.rb

@@ -9,7 +9,7 @@ module GraphQL
                   "in ways field arguments will not suffice, such as conditionally including or "\
                   "skipping a field. Directives provide this by describing additional information "\
                     "to the executor."
-      field :name, String, null: false
+      field :name, String, null: false, method: :graphql_name
       field :description, String, null: true
       field :locations, [GraphQL::Schema::LateBoundType.new("__DirectiveLocation")], null: false
       field :args, [GraphQL::Schema::LateBoundType.new("__InputValue")], null: false

data/lib/graphql/introspection/entry_points.rb

@@ -10,22 +10,22 @@ module GraphQL
       def __schema
         # Apply wrapping manually since this field isn't wrapped by instrumentation
         schema = @context.query.schema
-        schema_type = schema.introspection_system.schema_type
-        schema_type.metadata[:type_class].authorized_new(schema, @context)
+        schema_type = schema.introspection_system.types["__Schema"]
+        schema_type.type_class.authorized_new(schema, @context)
       end
 
       def __type(name:)
         type = context.warden.get_type(name)
 
-        if type && context.interpreter?
-          type = type.metadata[:type_class] || raise("Invariant: interpreter requires class-based type for #{name}")
+        if type && context.interpreter? && !type.is_a?(Module)
+          type = type.type_class || raise("Invariant: interpreter requires class-based type for #{name}")
         end
 
         # The interpreter provides this wrapping, other execution doesnt, so support both.
         if type && !context.interpreter?
           # Apply wrapping manually since this field isn't wrapped by instrumentation
-          type_type = context.schema.introspection_system.type_type
-          type = type_type.metadata[:type_class].authorized_new(type, context)
+          type_type = context.schema.introspection_system.types["__Type"]
+          type = type_type.type_class.authorized_new(type, context)
         end
         type
       end

data/lib/graphql/introspection/schema_type.rb

@@ -14,12 +14,7 @@ module GraphQL
       field :directives, [GraphQL::Schema::LateBoundType.new("__Directive")], "A list of all directives supported by this server.", null: false
 
       def types
-        types = @context.warden.types
-        if context.interpreter?
-          types.map { |t| t.metadata[:type_class] || raise("Invariant: can't introspect non-class-based type: #{t}") }
-        else
-          types
-        end
+        @context.warden.types.values
       end
 
       def query_type

data/lib/graphql/introspection/type_type.rb

@@ -37,7 +37,7 @@ module GraphQL
         if !@object.kind.enum?
           nil
         else
-          enum_values = @context.warden.enum_values(@object.graphql_definition)
+          enum_values = @context.warden.enum_values(@object)
 
           if !include_deprecated
             enum_values = enum_values.select {|f| !f.deprecation_reason }
@@ -49,7 +49,7 @@ module GraphQL
 
       def interfaces
         if @object.kind == GraphQL::TypeKinds::OBJECT
-          @context.warden.interfaces(@object.graphql_definition)
+          @context.warden.interfaces(@object)
         else
           nil
         end
@@ -57,7 +57,7 @@ module GraphQL
 
       def input_fields
         if @object.kind.input_object?
-          @context.warden.arguments(@object.graphql_definition)
+          @context.warden.arguments(@object)
         else
           nil
         end
@@ -65,7 +65,7 @@ module GraphQL
 
       def possible_types
         if @object.kind.abstract?
-          @context.warden.possible_types(@object.graphql_definition)
+          @context.warden.possible_types(@object).sort_by(&:graphql_name)
         else
           nil
         end
@@ -75,7 +75,7 @@ module GraphQL
         if !@object.kind.fields?
           nil
         else
-          fields = @context.warden.fields(@object.graphql_definition)
+          fields = @context.warden.fields(@object)
           if !include_deprecated
             fields = fields.select {|f| !f.deprecation_reason }
           end

data/lib/graphql/language.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require "graphql/language/block_string"
 require "graphql/language/printer"
-require "graphql/language/definition_slice"
 require "graphql/language/document_from_schema_definition"
 require "graphql/language/generation"
 require "graphql/language/lexer"
@@ -9,6 +8,7 @@ require "graphql/language/nodes"
 require "graphql/language/parser"
 require "graphql/language/token"
 require "graphql/language/visitor"
+require "graphql/language/definition_slice"
 
 module GraphQL
   module Language

data/lib/graphql/language/block_string.rb

@@ -32,10 +32,10 @@ module GraphQL
         end
 
         # Remove leading & trailing blank lines
-        while lines.first.empty?
+        while lines.size > 0 && lines[0].empty?
           lines.shift
         end
-        while lines.last.empty?
+        while lines.size > 0 && lines[-1].empty?
           lines.pop
         end
 

data/lib/graphql/language/definition_slice.rb

@@ -7,23 +7,34 @@ module GraphQL
       def slice(document, name)
         definitions = {}
         document.definitions.each { |d| definitions[d.name] = d }
-        names = find_definition_dependencies(definitions, name)
+        names = Set.new
+        DependencyVisitor.find_definition_dependencies(definitions, name, names)
         definitions = document.definitions.select { |d| names.include?(d.name) }
         Nodes::Document.new(definitions: definitions)
       end
 
       private
 
-      def find_definition_dependencies(definitions, name)
-        names = Set.new([name])
-        visitor = Visitor.new(definitions[name])
-        visitor[Nodes::FragmentSpread] << ->(node, parent) {
-          if fragment = definitions[node.name]
-            names.merge(find_definition_dependencies(definitions, fragment.name))
+      class DependencyVisitor < GraphQL::Language::Visitor
+        def initialize(doc, definitions, names)
+          @names = names
+          @definitions = definitions
+          super(doc)
+        end
+
+        def on_fragment_spread(node, parent)
+          if fragment = @definitions[node.name]
+            self.class.find_definition_dependencies(@definitions, fragment.name, @names)
           end
-        }
-        visitor.visit
-        names
+          super
+        end
+
+        def self.find_definition_dependencies(definitions, name, names)
+          names.add(name)
+          visitor = self.new(definitions[name], definitions, names)
+          visitor.visit
+          nil
+        end
       end
     end
   end

data/lib/graphql/language/document_from_schema_definition.rb

@@ -38,9 +38,9 @@ module GraphQL
 
       def build_schema_node
         GraphQL::Language::Nodes::SchemaDefinition.new(
-          query: warden.root_type_for_operation("query"),
-          mutation: warden.root_type_for_operation("mutation"),
-          subscription: warden.root_type_for_operation("subscription"),
+          query: (q = warden.root_type_for_operation("query")) && q.graphql_name,
+          mutation: (m = warden.root_type_for_operation("mutation")) && m.graphql_name,
+          subscription: (s = warden.root_type_for_operation("subscription")) && s.graphql_name,
           # This only supports directives from parsing,
           # use a custom printer to add to this list.
           directives: @schema.ast_node ? @schema.ast_node.directives : [],
@@ -49,8 +49,8 @@ module GraphQL
 
       def build_object_type_node(object_type)
         GraphQL::Language::Nodes::ObjectTypeDefinition.new(
-          name: object_type.name,
-          interfaces: warden.interfaces(object_type).sort_by(&:name).map { |iface| build_type_name_node(iface) },
+          name: object_type.graphql_name,
+          interfaces: warden.interfaces(object_type).sort_by(&:graphql_name).map { |iface| build_type_name_node(iface) },
           fields: build_field_nodes(warden.fields(object_type)),
           description: object_type.description,
         )
@@ -58,7 +58,7 @@ module GraphQL
 
       def build_field_node(field)
         field_node = GraphQL::Language::Nodes::FieldDefinition.new(
-          name: field.name,
+          name: field.graphql_name,
           arguments: build_argument_nodes(warden.arguments(field)),
           type: build_type_name_node(field.type),
           description: field.description,
@@ -66,7 +66,7 @@ module GraphQL
 
         if field.deprecation_reason
           field_node = field_node.merge_directive(
-            name: GraphQL::Directive::DeprecatedDirective.name,
+            name: GraphQL::Directive::DeprecatedDirective.graphql_name,
             arguments: [GraphQL::Language::Nodes::Argument.new(name: "reason", value: field.deprecation_reason)]
           )
         end
@@ -76,15 +76,15 @@ module GraphQL
 
       def build_union_type_node(union_type)
         GraphQL::Language::Nodes::UnionTypeDefinition.new(
-          name: union_type.name,
+          name: union_type.graphql_name,
           description: union_type.description,
-          types: warden.possible_types(union_type).sort_by(&:name).map { |type| build_type_name_node(type) }
+          types: warden.possible_types(union_type).sort_by(&:graphql_name).map { |type| build_type_name_node(type) }
         )
       end
 
       def build_interface_type_node(interface_type)
         GraphQL::Language::Nodes::InterfaceTypeDefinition.new(
-          name: interface_type.name,
+          name: interface_type.graphql_name,
           description: interface_type.description,
           fields: build_field_nodes(warden.fields(interface_type))
         )
@@ -92,8 +92,8 @@ module GraphQL
 
       def build_enum_type_node(enum_type)
         GraphQL::Language::Nodes::EnumTypeDefinition.new(
-          name: enum_type.name,
-          values: warden.enum_values(enum_type).sort_by(&:name).map do |enum_value|
+          name: enum_type.graphql_name,
+          values: warden.enum_values(enum_type).sort_by(&:graphql_name).map do |enum_value|
             build_enum_value_node(enum_value)
           end,
           description: enum_type.description,
@@ -102,13 +102,13 @@ module GraphQL
 
       def build_enum_value_node(enum_value)
         enum_value_node = GraphQL::Language::Nodes::EnumValueDefinition.new(
-          name: enum_value.name,
+          name: enum_value.graphql_name,
           description: enum_value.description,
         )
 
         if enum_value.deprecation_reason
           enum_value_node = enum_value_node.merge_directive(
-            name: GraphQL::Directive::DeprecatedDirective.name,
+            name: GraphQL::Directive::DeprecatedDirective.graphql_name,
             arguments: [GraphQL::Language::Nodes::Argument.new(name: "reason", value: enum_value.deprecation_reason)]
           )
         end
@@ -118,7 +118,7 @@ module GraphQL
 
       def build_scalar_type_node(scalar_type)
         GraphQL::Language::Nodes::ScalarTypeDefinition.new(
-          name: scalar_type.name,
+          name: scalar_type.graphql_name,
           description: scalar_type.description,
         )
       end
@@ -131,7 +131,7 @@ module GraphQL
         end
 
         argument_node = GraphQL::Language::Nodes::InputValueDefinition.new(
-          name: argument.name,
+          name: argument.graphql_name,
           description: argument.description,
           type: build_type_name_node(argument.type),
           default_value: default_value,
@@ -142,7 +142,7 @@ module GraphQL
 
       def build_input_object_node(input_object)
         GraphQL::Language::Nodes::InputObjectTypeDefinition.new(
-          name: input_object.name,
+          name: input_object.graphql_name,
           fields: build_argument_nodes(warden.arguments(input_object)),
           description: input_object.description,
         )
@@ -168,17 +168,17 @@ module GraphQL
       end
 
       def build_type_name_node(type)
-        case type
-        when GraphQL::ListType
+        case type.kind.name
+        when "LIST"
           GraphQL::Language::Nodes::ListType.new(
             of_type: build_type_name_node(type.of_type)
           )
-        when GraphQL::NonNullType
+        when "NON_NULL"
           GraphQL::Language::Nodes::NonNullType.new(
             of_type: build_type_name_node(type.of_type)
           )
         else
-          GraphQL::Language::Nodes::TypeName.new(name: type.name)
+          GraphQL::Language::Nodes::TypeName.new(name: type.graphql_name)
         end
       end
 
@@ -187,43 +187,43 @@ module GraphQL
           return GraphQL::Language::Nodes::NullValue.new(name: "null")
         end
 
-        case type
-        when GraphQL::ScalarType
+        case type.kind.name
+        when "SCALAR"
           type.coerce_isolated_result(default_value)
-        when EnumType
+        when "ENUM"
           GraphQL::Language::Nodes::Enum.new(name: type.coerce_isolated_result(default_value))
-        when InputObjectType
+        when "INPUT_OBJECT"
           GraphQL::Language::Nodes::InputObject.new(
             arguments: default_value.to_h.map do |arg_name, arg_value|
-              arg_type = type.input_fields.fetch(arg_name.to_s).type
+              arg_type = type.arguments.fetch(arg_name.to_s).type
               GraphQL::Language::Nodes::Argument.new(
-                name: arg_name,
+                name: arg_name.to_s,
                 value: build_default_value(arg_value, arg_type)
               )
             end
           )
-        when NonNullType
+        when "NON_NULL"
           build_default_value(default_value, type.of_type)
-        when ListType
+        when "LIST"
           default_value.to_a.map { |v| build_default_value(v, type.of_type) }
         else
-          raise NotImplementedError, "Unexpected default value type #{type.inspect}"
+          raise GraphQL::RequiredImplementationMissingError, "Unexpected default value type #{type.inspect}"
         end
       end
 
       def build_type_definition_node(type)
-        case type
-        when GraphQL::ObjectType
+        case type.kind.name
+        when "OBJECT"
           build_object_type_node(type)
-        when GraphQL::UnionType
+        when "UNION"
           build_union_type_node(type)
-        when GraphQL::InterfaceType
+        when "INTERFACE"
           build_interface_type_node(type)
-        when GraphQL::ScalarType
+        when "SCALAR"
           build_scalar_type_node(type)
-        when GraphQL::EnumType
+        when "ENUM"
           build_enum_type_node(type)
-        when GraphQL::InputObjectType
+        when "INPUT_OBJECT"
           build_input_object_node(type)
         else
           raise TypeError
@@ -250,7 +250,7 @@ module GraphQL
         definitions = []
         definitions << build_schema_node if include_schema_node?
         definitions += build_directive_nodes(warden.directives)
-        definitions += build_type_definition_nodes(warden.types)
+        definitions += build_type_definition_nodes(warden.types.values)
         definitions
       end
 
@@ -260,7 +260,7 @@ module GraphQL
         end
 
         if !include_built_in_scalars
-          types = types.reject { |type| type.default_scalar? }
+          types = types.reject { |type| type.kind.scalar? && type.default_scalar? }
         end
 
         types
@@ -281,9 +281,9 @@ module GraphQL
       end
 
       def schema_respects_root_name_conventions?(schema)
-        (schema.query.nil? || schema.query.name == 'Query') &&
-        (schema.mutation.nil? || schema.mutation.name == 'Mutation') &&
-        (schema.subscription.nil? || schema.subscription.name == 'Subscription')
+        (schema.query.nil? || schema.query.graphql_name == 'Query') &&
+        (schema.mutation.nil? || schema.mutation.graphql_name == 'Mutation') &&
+        (schema.subscription.nil? || schema.subscription.graphql_name == 'Subscription')
       end
 
       attr_reader :schema, :warden, :always_include_schema,