graphql 1.8.0.pre2 → 1.8.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8b7496d11a982cbb450b60c94ae0cfd2633892
-  data.tar.gz: ef5dfa73699f3e6536987f5721a609cfbf6f0dfa
+  metadata.gz: 2a150383d3c4ffcaf126e675d8e844f93c4d2244
+  data.tar.gz: 76b98bf791afc9ca8cd0eb9caf9798005d058169
 SHA512:
-  metadata.gz: e31127a8a336fd40f787b9369330a6a2bc1b347ef4f7f6c83bd56cabe6290520fbd67c314023d8d95052817bd2b6668f5d094612928bada3fd9898a87f50ccf9
-  data.tar.gz: e0d167e65ce91ba9d19550fd9dd3b8a97150df1b9f5fec6a1b6463f00c88b30110cd982f8a3edaff4226ba3dc81d6f281f5bf5f5d9d71c1bfe4d9fa79342325e
+  metadata.gz: 4850a2d2c7872936c2ef09e016e6da4d6afba9bc554f76f08cc7f747d38e336e183ce201f184053364c468241b25442483ac83eab4e9bb63da2a74f19a67a202
+  data.tar.gz: 853775ca411cab71eae69b917071ebb0c03c61d1a4557d38ff8fb4410b05da3e34dad381098ba41417b03e39114d6e1ba36aab441fc3297fffb356d0222d1b73

data/lib/graphql.rb

@@ -90,7 +90,6 @@ require "graphql/string_type"
 require "graphql/directive"
 require "graphql/name_validator"
 
-require "graphql/introspection"
 require "graphql/language"
 require "graphql/analysis"
 require "graphql/tracing"
@@ -99,6 +98,7 @@ require "graphql/relay"
 require "graphql/schema"
 require "graphql/schema/loader"
 require "graphql/schema/printer"
+require "graphql/introspection"
 
 require "graphql/analysis_error"
 require "graphql/coercion_error"

data/lib/graphql/deprecated_dsl.rb

@@ -15,6 +15,8 @@ module GraphQL
   module DeprecatedDSL
     def self.activate
       GraphQL::Schema::Member.extend(Methods)
+      GraphQL::Schema::Member::ListTypeProxy.include(Methods)
+      GraphQL::Schema::Member::NonNullTypeProxy.include(Methods)
     end
     module Methods
       def !

data/lib/graphql/enum_type.rb

@@ -121,7 +121,7 @@ module GraphQL
       if enum_value
         enum_value.name
       else
-        raise(UnresolvedValueError, "Can't resolve enum #{name} for #{value}")
+        raise(UnresolvedValueError, "Can't resolve enum #{name} for #{value.inspect}")
       end
     end
 

data/lib/graphql/field.rb

@@ -131,6 +131,7 @@ module GraphQL
       :relay_nodes_field,
       :subscription_scope,
       :trace,
+      :introspection,
       argument: GraphQL::Define::AssignArgument
 
     ensure_defined(
@@ -138,7 +139,8 @@ module GraphQL
       :mutation, :arguments, :complexity, :function,
       :resolve, :resolve=, :lazy_resolve, :lazy_resolve=, :lazy_resolve_proc, :resolve_proc,
       :type, :type=, :name=, :property=, :hash_key=,
-      :relay_node_field, :relay_nodes_field, :edges?, :edge_class, :subscription_scope
+      :relay_node_field, :relay_nodes_field, :edges?, :edge_class, :subscription_scope,
+      :introspection?
     )
 
     # @return [Boolean] True if this is the Relay find-by-id field
@@ -183,6 +185,7 @@ module GraphQL
     attr_accessor :arguments_class
 
     attr_writer :connection
+    attr_writer :introspection
 
     # @return [nil, String] Prefix for subscription names from this field
     attr_accessor :subscription_scope
@@ -217,6 +220,7 @@ module GraphQL
       @connection_max_page_size = nil
       @edge_class = nil
       @trace = nil
+      @introspection = false
     end
 
     def initialize_copy(other)
@@ -225,6 +229,11 @@ module GraphQL
       @arguments = other.arguments.dup
     end
 
+    # @return [Boolean] Is this field a predefined introspection field?
+    def introspection?
+      @introspection
+    end
+
     # Get a value for this field
     # @example resolving a field value
     #   field.resolve(obj, args, ctx)

data/lib/graphql/input_object_type.rb

@@ -84,6 +84,7 @@ module GraphQL
 
     def coerce_non_null_input(value, ctx)
       input_values = {}
+      defaults_used = Set.new
 
       arguments.each do |input_key, input_field_defn|
         field_value = value[input_key]
@@ -93,10 +94,11 @@ module GraphQL
           input_values[input_key] = input_field_defn.prepare(coerced_value, ctx)
         elsif input_field_defn.default_value?
           input_values[input_key] = input_field_defn.default_value
+          defaults_used << input_key
         end
       end
 
-      arguments_class.new(input_values, context: ctx)
+      arguments_class.new(input_values, context: ctx, defaults_used: defaults_used)
     end
 
     # @api private

data/lib/graphql/introspection.rb

@@ -4,25 +4,18 @@ module GraphQL
   end
 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"
-
-require "graphql/introspection/fields_field"
-require "graphql/introspection/of_type_field"
-require "graphql/introspection/input_fields_field"
-require "graphql/introspection/possible_types_field"
-require "graphql/introspection/enum_values_field"
-require "graphql/introspection/interfaces_field"
-
 require "graphql/introspection/type_type"
-require "graphql/introspection/arguments_field"
 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/base_object.rb

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

data/lib/graphql/introspection/directive_location_enum.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
-GraphQL::Introspection::DirectiveLocationEnum = GraphQL::EnumType.define do
-  name "__DirectiveLocation"
-  description "A Directive can be adjacent to many parts of the GraphQL language, a "\
-              "__DirectiveLocation describes one such possible adjacencies."
+module GraphQL
+  module Introspection
+    class DirectiveLocationEnum < GraphQL::Schema::Enum
+      graphql_name "__DirectiveLocation"
+      description "A Directive can be adjacent to many parts of the GraphQL language, "\
+                  "a __DirectiveLocation describes one such possible adjacencies."
 
-  GraphQL::Directive::LOCATIONS.each do |location|
-    value(location.to_s, GraphQL::Directive::LOCATION_DESCRIPTIONS[location], value: location)
+      GraphQL::Directive::LOCATIONS.each do |location|
+        value(location.to_s, GraphQL::Directive::LOCATION_DESCRIPTIONS[location], value: location)
+      end
+      introspection true
+    end
   end
-  introspection true
 end

data/lib/graphql/introspection/directive_type.rb

@@ -1,18 +1,25 @@
 # frozen_string_literal: true
-GraphQL::Introspection::DirectiveType = GraphQL::ObjectType.define do
-  name "__Directive"
-  description "A Directive provides a way to describe alternate runtime execution and type validation behavior in a GraphQL document."\
-              "\n\n"\
-              "In some cases, you need to provide options to alter GraphQL's execution behavior "\
-              "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, !types.String
-  field :description, types.String
-  field :locations, !types[!GraphQL::Introspection::DirectiveLocationEnum]
-  field :args, field: GraphQL::Introspection::ArgumentsField
-  field :onOperation, !types.Boolean, deprecation_reason: "Use `locations`.", property: :on_operation?
-  field :onFragment, !types.Boolean, deprecation_reason: "Use `locations`.", property: :on_fragment?
-  field :onField, !types.Boolean, deprecation_reason: "Use `locations`.", property: :on_field?
-  introspection true
+module GraphQL
+  module Introspection
+    class DirectiveType < Introspection::BaseObject
+      graphql_name "__Directive"
+      description "A Directive provides a way to describe alternate runtime execution and type validation behavior in a GraphQL document."\
+                  "\n\n"\
+                  "In some cases, you need to provide options to alter GraphQL's execution behavior "\
+                  "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 :description, String, null: true
+      field :locations, [GraphQL::Schema::LateBoundType.new("__DirectiveLocation")], null: false
+      field :args, [GraphQL::Schema::LateBoundType.new("__InputValue")], null: false
+      field :on_operation, Boolean, null: false, deprecation_reason: "Use `locations`.", method: :on_operation?
+      field :on_fragment, Boolean, null: false, deprecation_reason: "Use `locations`.", method: :on_fragment?
+      field :on_field, Boolean, null: false, deprecation_reason: "Use `locations`.", method: :on_field?
+
+      def args
+        @context.warden.arguments(@object)
+      end
+    end
+  end
 end

data/lib/graphql/introspection/dynamic_fields.rb

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

data/lib/graphql/introspection/entry_points.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module GraphQL
+  module Introspection
+    class EntryPoints < GraphQL::Schema::Object
+      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
+      end
+
+      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[:object_class].new(schema, @context)
+      end
+
+      def __type(name:)
+        type = @context.warden.get_type(name)
+        if type
+          # Apply wrapping manually since this field isn't wrapped by instrumentation
+          type_type = @context.schema.introspection_system.type_type
+          type_type.metadata[:object_class].new(type, @context)
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/graphql/introspection/enum_value_type.rb

@@ -1,14 +1,19 @@
 # frozen_string_literal: true
-GraphQL::Introspection::EnumValueType = GraphQL::ObjectType.define do
-  name "__EnumValue"
-  description "One possible value for a given Enum. Enum values are unique values, not a "\
-              "placeholder for a string or numeric value. However an Enum value is returned in "\
-              "a JSON response as a string."
-  field :name, !types.String
-  field :description, types.String
-  field :isDeprecated, !types.Boolean do
-    resolve ->(obj, a, c) { !!obj.deprecation_reason }
+module GraphQL
+  module Introspection
+    class EnumValueType < Introspection::BaseObject
+      graphql_name "__EnumValue"
+      description "One possible value for a given Enum. Enum values are unique values, not a "\
+                  "placeholder for a string or numeric value. However an Enum value is returned in "\
+                  "a JSON response as a string."
+      field :name, String, null: false
+      field :description, String, null: true
+      field :is_deprecated, Boolean, null: false
+      field :deprecation_reason, String, null: true
+
+      def is_deprecated
+        !!@object.deprecation_reason
+      end
+    end
   end
-  field :deprecationReason, types.String, property: :deprecation_reason
-  introspection true
 end

data/lib/graphql/introspection/field_type.rb

@@ -1,15 +1,24 @@
 # frozen_string_literal: true
-GraphQL::Introspection::FieldType = GraphQL::ObjectType.define do
-  name "__Field"
-  description "Object and Interface types are described by a list of Fields, each of which has "\
-              "a name, potentially a list of arguments, and a return type."
-  field :name, !types.String
-  field :description, types.String
-  field :args, GraphQL::Introspection::ArgumentsField
-  field :type, !GraphQL::Introspection::TypeType
-  field :isDeprecated, !types.Boolean do
-    resolve ->(obj, a, c) { !!obj.deprecation_reason }
+module GraphQL
+  module Introspection
+    class FieldType < Introspection::BaseObject
+      graphql_name "__Field"
+      description "Object and Interface types are described by a list of Fields, each of which has "\
+                  "a name, potentially a list of arguments, and a return type."
+      field :name, String, null: false
+      field :description, String, null: true
+      field :args, [GraphQL::Schema::LateBoundType.new("__InputValue")], null: false
+      field :type, GraphQL::Schema::LateBoundType.new("__Type"), null: false
+      field :is_deprecated, Boolean, null: false
+      field :deprecation_reason, String, null: true
+
+      def is_deprecated
+        !!@object.deprecation_reason
+      end
+
+      def args
+        @context.warden.arguments(@object)
+      end
+    end
   end
-  field :deprecationReason, types.String, property: :deprecation_reason
-  introspection true
 end

data/lib/graphql/introspection/input_value_type.rb

@@ -1,30 +1,33 @@
 # frozen_string_literal: true
-GraphQL::Introspection::InputValueType = GraphQL::ObjectType.define do
-  name "__InputValue"
-  description "Arguments provided to Fields or Directives and the input fields of an "\
-              "InputObject are represented as Input Values which describe their type and "\
-              "optionally a default value."
-  field :name, !types.String
-  field :description, types.String
-  field :type, !GraphQL::Introspection::TypeType
-  field :defaultValue, types.String, "A GraphQL-formatted string representing the default value for this input value." do
-    resolve ->(obj, args, ctx) {
-      if obj.default_value?
-        value = obj.default_value
-        if value.nil?
-          'null'
-        else
-          coerced_default_value = obj.type.coerce_result(value, ctx)
-          if obj.type.unwrap.is_a?(GraphQL::EnumType)
-            coerced_default_value
+module GraphQL
+  module Introspection
+    class InputValueType < Introspection::BaseObject
+      graphql_name "__InputValue"
+      description "Arguments provided to Fields or Directives and the input fields of an "\
+                  "InputObject are represented as Input Values which describe their type and "\
+                  "optionally a default value."
+      field :name, String, null: false
+      field :description, String, null: true
+      field :type, GraphQL::Schema::LateBoundType.new("__Type"), null: false
+      field :default_value, String, "A GraphQL-formatted string representing the default value for this input value.", null: true
+
+      def default_value
+        if @object.default_value?
+          value = @object.default_value
+          if value.nil?
+            'null'
           else
-            GraphQL::Language.serialize(coerced_default_value)
+            coerced_default_value = @object.type.coerce_result(value, @context)
+            if @object.type.unwrap.is_a?(GraphQL::EnumType)
+              coerced_default_value
+            else
+              GraphQL::Language.serialize(coerced_default_value)
+            end
           end
+        else
+          nil
         end
-      else
-        nil
       end
-    }
+    end
   end
-  introspection true
 end

data/lib/graphql/introspection/schema_field.rb

@@ -4,8 +4,13 @@ module GraphQL
     SchemaField = GraphQL::Field.define do
       name("__schema")
       description("This GraphQL schema")
-      type(!GraphQL::Introspection::SchemaType)
-      resolve ->(o, a, ctx) { ctx.query.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[:object_class].new(schema, ctx.query.context)
+      }
     end
   end
 end

data/lib/graphql/introspection/schema_type.rb

@@ -1,29 +1,43 @@
 # frozen_string_literal: true
-GraphQL::Introspection::SchemaType = GraphQL::ObjectType.define do
-  name "__Schema"
-  description "A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all "\
-              "available types and directives on the server, as well as the entry points for "\
-              "query, mutation, and subscription operations."
-
-  field :types, !types[!GraphQL::Introspection::TypeType], "A list of all types supported by this server." do
-    resolve ->(obj, arg, ctx) { ctx.warden.types }
-  end
+module GraphQL
+  module Introspection
+    class SchemaType < Introspection::BaseObject
+      graphql_name "__Schema"
+      description "A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all "\
+                  "available types and directives on the server, as well as the entry points for "\
+                  "query, mutation, and subscription operations."
 
-  field :queryType, !GraphQL::Introspection::TypeType, "The type that query operations will be rooted at." do
-    resolve ->(obj, arg, ctx) { ctx.warden.root_type_for_operation("query") }
-  end
+      field :types, [GraphQL::Schema::LateBoundType.new("__Type")], "A list of all types supported by this server.", null: false
+      field :queryType, GraphQL::Schema::LateBoundType.new("__Type"), "The type that query operations will be rooted at.", null: false
+      field :mutationType, GraphQL::Schema::LateBoundType.new("__Type"), "If this server supports mutation, the type that mutation operations will be rooted at.", null: true
+      field :subscriptionType, GraphQL::Schema::LateBoundType.new("__Type"), "If this server support subscription, the type that subscription operations will be rooted at.", null: true
+      field :directives, [GraphQL::Schema::LateBoundType.new("__Directive")], "A list of all directives supported by this server.", null: false
 
-  field :mutationType, GraphQL::Introspection::TypeType, "If this server supports mutation, the type that mutation operations will be rooted at." do
-    resolve ->(obj, arg, ctx) { ctx.warden.root_type_for_operation("mutation") }
-  end
+      def types
+        @context.warden.types
+      end
 
-  field :subscriptionType, GraphQL::Introspection::TypeType, "If this server support subscription, the type that subscription operations will be rooted at." do
-    resolve ->(obj, arg, ctx) { ctx.warden.root_type_for_operation("subscription") }
-  end
+      def query_type
+        permitted_root_type("query")
+      end
 
-  field :directives, !types[!GraphQL::Introspection::DirectiveType], "A list of all directives supported by this server." do
-    resolve ->(obj, arg, ctx) { obj.directives.values }
-  end
+      def mutation_type
+        permitted_root_type("mutation")
+      end
 
-  introspection true
+      def subscription_type
+        permitted_root_type("subscription")
+      end
+
+      def directives
+        @object.directives.values
+      end
+
+      private
+
+      def permitted_root_type(op_type)
+        @context.warden.root_type_for_operation(op_type)
+      end
+    end
+  end
 end