graphql 1.8.0.pre5 → 1.8.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08af6fe85ac8b3665acc0a2b8a38ab165dd418a
-  data.tar.gz: f4be355d3ba05a0566ff508d4f00621acafa0f77
+  metadata.gz: d974acad8e306ebc40d3ef5185293be78a6172a7
+  data.tar.gz: 68befc3fffce8764a3bd14173ecc55484dad4fc7
 SHA512:
-  metadata.gz: 0a6b65f5db04ad1c127e3328d0ab5dce93430cfb20f6be9cf08e95e9cfbf681d653a1d1277a81347dbbf04d95541010956d7711f14a865bc9e00bad16db62a78
-  data.tar.gz: e5f307b33f3136c71fcd538a9e5e957271bf1a0aaf622287e0e991a5e1a0d3dbc23621df0307332ed3af4840e80eee8b5b3f2ee94deec3f274dadfe3c1eadb72
+  metadata.gz: a98b86f3ddfd3443da23161c7c662d2dc1bf12e5ec32c202d2376d71800f5b8f6ee8c99c33f13242ad5858743b6edbe90e228e558c20a6de55dc58545460f6a7
+  data.tar.gz: 4b0f87b1f29351dea232bcf0032438669a1cbba9a90b0ab87de4535767c6861018285c13fc4c8e22780cb7571013114fdd1c3ef6c34ab9534217a4e375fca772

data/lib/graphql/internal_representation/node.rb

@@ -12,8 +12,18 @@ module GraphQL
         CHILDREN = [].freeze
         def dup; self; end
         def any?; false; end
+        def none?; true; end
         def [](key); CHILDREN; end
         def each; end
+
+        # Compatibility for when this was an Array:
+        def method_missing(method_name, *args, &block)
+          if CHILDREN.respond_to?(method_name)
+            CHILDREN.send(method_name, *args, &block)
+          else
+            raise NotImplementedError
+          end
+        end
       end
       NO_TYPED_CHILDREN = NoTypedChildren.new
 

data/lib/graphql/language/printer.rb

@@ -154,8 +154,8 @@ module GraphQL
       def print_object_type_definition(object_type)
         out = print_description(object_type)
         out << "type #{object_type.name}"
-        out << print_directives(object_type.directives)
         out << " implements " << object_type.interfaces.map(&:name).join(", ") unless object_type.interfaces.empty?
+        out << print_directives(object_type.directives)
         out << print_field_definitions(object_type.fields)
       end
 

data/lib/graphql/schema.rb

@@ -22,6 +22,7 @@ require "graphql/schema/build_from_definition"
 
 require "graphql/schema/member"
 require "graphql/schema/argument"
+require "graphql/schema/enum_value"
 require "graphql/schema/enum"
 require "graphql/schema/field"
 require "graphql/schema/input_object"

data/lib/graphql/schema/enum.rb

@@ -20,9 +20,6 @@ module GraphQL
   #   end
   class Schema
     class Enum < GraphQL::Schema::Member
-      # @api private
-      Value = Struct.new(:name, :description, :value, :deprecation_reason)
-
       class << self
         # Define a value for this enum
         # @param graphql_name [String, Symbol] the GraphQL value for this, usually `SCREAMING_CASE`
@@ -30,10 +27,10 @@ module GraphQL
         # @param value [Object], the translated Ruby value for this object (defaults to `graphql_name`)
         # @param deprecation_reason [String] if this object is deprecated, include a message here
         # @return [void]
-        def value(graphql_name, description = nil, value: nil, deprecation_reason: nil)
-          graphql_name = graphql_name.to_s
-          value ||= graphql_name
-          own_values[graphql_name] = Value.new(graphql_name, description, value, deprecation_reason)
+        # @see {Schema::EnumValue} which handles these inputs by default
+        def value(*args, &block)
+          value = enum_value_class.new(*args, &block)
+          own_values[value.graphql_name] = value
           nil
         end
 
@@ -51,22 +48,27 @@ module GraphQL
           enum_type.description = description
           enum_type.introspection = introspection
           values.each do |name, val|
-            enum_value = GraphQL::EnumType::EnumValue.new
-            enum_value.name = val.name
-            enum_value.description = val.description
-            enum_value.value = val.value
-            enum_value.deprecation_reason = val.deprecation_reason
-            enum_type.add_value(enum_value)
+            enum_type.add_value(val.to_graphql)
           end
           enum_type
         end
 
+        # @return [Class] for handling `value(...)` inputs and building `GraphQL::Enum::EnumValue`s out of them
+        def enum_value_class(new_enum_value_class = nil)
+          if new_enum_value_class
+            @enum_value_class = new_enum_value_class
+          end
+          @enum_value_class || (superclass <= GraphQL::Schema::Enum ? superclass.enum_value_class : nil)
+        end
+
         private
 
         def own_values
           @own_values ||= {}
         end
       end
+
+      enum_value_class(GraphQL::Schema::EnumValue)
     end
   end
 end

data/lib/graphql/schema/enum_value.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Schema
+    # A possible value for an {Enum}.
+    #
+    # You can extend this class to customize enum values in your schema.
+    #
+    # @example custom enum value class
+    #   # define a custom class:
+    #   class CustomEnumValue < GraphQL::Schema::EnumValue
+    #     def initialize(*args)
+    #       # arguments to `value(...)` in Enum classes are passed here
+    #       super
+    #     end
+    #
+    #     def to_graphql
+    #       enum_value = super
+    #       # customize the derived GraphQL::EnumValue here
+    #       enum_value
+    #     end
+    #   end
+    #
+    #   class BaseEnum < GraphQL::Schema::Enum
+    #     # use it for these enums:
+    #     enum_value_class CustomEnumValue
+    #   end
+    class EnumValue < GraphQL::Schema::Member
+      attr_reader :graphql_name
+
+      def initialize(graphql_name, desc = nil, description: nil, value: nil, deprecation_reason: nil, &block)
+        @graphql_name = graphql_name.to_s
+        @description = desc || description
+        @value = value || @graphql_name
+        @deprecation_reason = deprecation_reason
+        if block_given?
+          instance_eval(&block)
+        end
+      end
+
+      def description(new_desc = nil)
+        if new_desc
+          @description = new_desc
+        end
+        @description
+      end
+
+      def value(new_val = nil)
+        if new_val
+          @value = new_val
+        end
+        @value
+      end
+
+      # @return [GraphQL::EnumType::EnumValue] A runtime-ready object derived from this object
+      def to_graphql
+        enum_value = GraphQL::EnumType::EnumValue.new
+        enum_value.name = @graphql_name
+        enum_value.description = @description
+        enum_value.value = @value
+        enum_value.deprecation_reason = @deprecation_reason
+        enum_value
+      end
+    end
+  end
+end

data/lib/graphql/upgrader/member.rb

@@ -59,6 +59,32 @@ module GraphQL
           .gsub(/([a-z\d])([A-Z])/,'\1_\2')     # someThing -> some_Thing
           .downcase
       end
+
+      def apply_processor(input_text, processor)
+        ruby_ast = Parser::CurrentRuby.parse(input_text)
+        processor.process(ruby_ast)
+        processor
+      rescue Parser::SyntaxError
+        puts "Error text:"
+        puts input_text
+        raise
+      end
+
+      def reindent_lines(input_text, from_indent:, to_indent:)
+        prev_indent = " " * from_indent
+        next_indent = " " * to_indent
+        # For each line, remove the previous indent, then add the new indent
+        lines = input_text.split("\n").map do |line|
+          line = line.sub(prev_indent, "")
+          "#{next_indent}#{line}".rstrip
+        end
+        lines.join("\n")
+      end
+
+      # Remove trailing whitespace
+      def trim_lines(input_text)
+        input_text.gsub(/ +$/, "")
+      end
     end
 
     # Turns `{X} = GraphQL::{Y}Type.define do` into `class {X} < Types::Base{Y}`.
@@ -174,7 +200,7 @@ module GraphQL
     class RemoveRedundantKwargTransform < Transform
       def initialize(kwarg:)
         @kwarg = kwarg
-        @finder_pattern = /(field|connection|argument) :(?<name>[a-zA-Z_0-9]*).*#{@kwarg}: ['":](?<kwarg_value>[a-zA-Z_0-9]+)['"]?/
+        @finder_pattern = /(field|connection|argument) :(?<name>[a-zA-Z_0-9]*).*#{@kwarg}: ['":](?<kwarg_value>[a-zA-Z_0-9?!]+)['"]?/
       end
 
       def apply(input_text)
@@ -203,6 +229,75 @@ module GraphQL
       end
     end
 
+    class ProcToClassMethodTransform < Transform
+      # @param proc_name [String] The name of the proc to be moved to `def self.#{proc_name}`
+      def initialize(proc_name)
+        @proc_name = proc_name
+        # This will tell us whether to operate on the input or not
+        @proc_check_pattern = /#{proc_name}\s?->/
+      end
+
+      def apply(input_text)
+        if input_text =~ @proc_check_pattern
+          processor = apply_processor(input_text, NamedProcProcessor.new(@proc_name))
+          proc_body = input_text[processor.proc_body_start..processor.proc_body_end]
+          method_defn_indent = " " * processor.proc_defn_indent
+          method_defn = "def self.#{@proc_name}(#{processor.proc_arg_names.join(", ")})\n#{method_defn_indent}  #{proc_body}\n#{method_defn_indent}end\n"
+          method_defn = trim_lines(method_defn)
+          # replace the proc with the new method
+          input_text[processor.proc_defn_start..processor.proc_defn_end] = method_defn
+        end
+        input_text
+      end
+
+      class NamedProcProcessor < Parser::AST::Processor
+        attr_reader :proc_arg_names, :proc_defn_start, :proc_defn_end, :proc_defn_indent, :proc_body_start, :proc_body_end
+        def initialize(proc_name)
+          @proc_name_sym = proc_name.to_sym
+          @proc_arg_names = nil
+          # Beginning of the `#{proc_name} -> {...}` call
+          @proc_defn_start = nil
+          # End of the last `end/}`
+          @proc_defn_end = nil
+          # Amount of whitespace to insert to the rewritten body
+          @proc_defn_indent = nil
+          # First statement of the proc
+          @proc_body_start = nil
+          # End of last statement in the proc
+          @proc_body_end = nil
+          # Used for identifying the proper block
+          @inside_proc = false
+        end
+
+        def on_send(node)
+          receiver, method_name, _args = *node
+          if method_name == @proc_name_sym && receiver.nil?
+            source_exp = node.loc.expression
+            @proc_defn_start = source_exp.begin.begin_pos
+            @proc_defn_end = source_exp.end.end_pos
+            @proc_defn_indent = source_exp.column
+            @inside_proc = true
+          end
+          res = super(node)
+          @inside_proc = false
+          res
+        end
+
+        def on_block(node)
+          send_node, args_node, body_node = node.children
+          _receiver, method_name, _send_args_node = *send_node
+          if method_name == :lambda && @inside_proc
+            source_exp = body_node.loc.expression
+            @proc_arg_names = args_node.children.map { |arg_node| arg_node.children[0].to_s }
+            @proc_body_start = source_exp.begin.begin_pos
+            @proc_body_end = source_exp.end.end_pos
+          end
+          super(node)
+        end
+      end
+    end
+
+
     class ResolveProcToMethodTransform < Transform
       def apply(input_text)
         if input_text =~ /resolve ->/
@@ -226,15 +321,7 @@ module GraphQL
 
           input_text.match(/(?<field_type>input_field|field|connection|argument) :(?<name>[a-zA-Z_0-9_]*)/)
           field_name = $~[:name]
-          begin
-            field_ast = Parser::CurrentRuby.parse(input_text)
-          rescue Parser::SyntaxError
-            puts "Error text:"
-            puts input_text
-            raise
-          end
-          processor = ResolveProcProcessor.new
-          processor.process(field_ast)
+          processor = apply_processor(input_text, ResolveProcProcessor.new)
           proc_body = input_text[processor.proc_start..processor.proc_end]
           obj_arg_name, args_arg_name, ctx_arg_name = processor.proc_arg_names
           # This is not good, it will hit false positives
@@ -242,15 +329,9 @@ module GraphQL
           proc_body.gsub!(/([^\w:]|^)#{obj_arg_name}([^\w]|$)/, '\1@object\2')
           proc_body.gsub!(/([^\w:]|^)#{ctx_arg_name}([^\w]|$)/, '\1@context\2')
 
-          indent = " " * processor.resolve_indent
-          prev_body_indent = "#{indent}  "
-          next_body_indent = indent
-          method_def_indent = indent[2..-1]
+          method_def_indent = " " * (processor.resolve_indent - 2)
           # Turn the proc body into a method body
-          lines = proc_body.split("\n").map do |line|
-            line = line.sub(prev_body_indent, "")
-            "#{next_body_indent}#{line}".rstrip
-          end
+          method_body = reindent_lines(proc_body, from_indent: processor.resolve_indent + 2, to_indent: processor.resolve_indent)
           # Add `def... end`
           method_def = if input_text.include?("argument ")
             # This field has arguments
@@ -259,9 +340,8 @@ module GraphQL
             # No field arguments, so, no method arguments
             "def #{field_name}"
           end
-          lines.unshift("\n#{method_def_indent}#{method_def}")
-          lines << "#{method_def_indent}end\n"
-          method_body = lines.join("\n")
+          # Wrap the body in def ... end
+          method_body = "\n#{method_def_indent}#{method_def}\n#{method_body}\n#{method_def_indent}end\n"
           # Update Argument access to be underscore and symbols
           # Update `args[...]` and `args.key?`
           method_body = method_body.gsub(/#{args_arg_name}(?<method_begin>\.key\?\(?|\[)["':](?<arg_name>[a-zA-Z0-9_]+)["']?(?<method_end>\]|\))?/) do
@@ -288,7 +368,6 @@ module GraphQL
         end
       end
 
-
       class ResolveProcProcessor < Parser::AST::Processor
         attr_reader :proc_start, :proc_end, :proc_arg_names, :resolve_start, :resolve_end, :resolve_indent
         def initialize
@@ -327,10 +406,9 @@ module GraphQL
 
     # Transform `interfaces [A, B, C]` to `implements A\nimplements B\nimplements C\n`
     class InterfacesToImplementsTransform < Transform
+      PATTERN = /(?<indent>\s*)(?:interfaces) \[\s*(?<interfaces>(?:[a-zA-Z_0-9:\.,\s]+))\]/m
       def apply(input_text)
-        input_text.gsub(
-          /(?<indent>\s*)(?:interfaces) \[\s*(?<interfaces>(?:[a-zA-Z_0-9:\.,\s]+))\]/m
-        ) do
+        input_text.gsub(PATTERN) do
           indent = $~[:indent]
           interfaces = $~[:interfaces].split(',').map(&:strip).reject(&:empty?)
           # Preserve leading newlines before the `interfaces ...`
@@ -345,10 +423,26 @@ module GraphQL
       end
     end
 
+    # Transform `possible_types [A, B, C]` to `possible_types(A, B, C)`
+    class PossibleTypesTransform < Transform
+      PATTERN = /(?<indent>\s*)(?:possible_types) \[\s*(?<possible_types>(?:[a-zA-Z_0-9:\.,\s]+))\]/m
+      def apply(input_text)
+        input_text.gsub(PATTERN) do
+          indent = $~[:indent]
+          possible_types = $~[:possible_types].split(',').map(&:strip).reject(&:empty?)
+          extra_leading_newlines = indent[/^\n*/]
+          method_indent = indent.sub(/^\n*/m, "")
+          type_indent = "  " + method_indent
+          possible_types_call = "#{method_indent}possible_types(\n#{possible_types.map { |t| "#{type_indent}#{t},"}.join("\n")}\n#{method_indent})"
+          extra_leading_newlines + trim_lines(possible_types_call)
+        end
+      end
+    end
+
     class UpdateMethodSignatureTransform < Transform
       def apply(input_text)
         input_text.scan(/(?:input_field|field|connection|argument) .*$/).each do |field|
-          matches = /(?<field_type>input_field|field|connection|argument) :(?<name>[a-zA-Z_0-9_]*)?, (?<return_type>([A-Za-z\[\]\.\!_0-9]|::|-> ?\{ ?| ?\})+)(?<remainder>( |,|$).*)/.match(field)
+          matches = /(?<field_type>input_field|field|connection|argument) :(?<name>[a-zA-Z_0-9_]*)?(:?, (?<return_type>([A-Za-z\[\]\.\!_0-9\(\)]|::|-> ?\{ ?| ?\})+))?(?<remainder>( |,|$).*)/.match(field)
           if matches
             name = matches[:name]
             return_type = matches[:return_type]
@@ -361,7 +455,7 @@ module GraphQL
             remainder.chomp!
 
             if return_type
-              non_nullable = return_type.gsub! '!', ''
+              non_nullable = return_type.sub! /(^|[^\[])!/, '\1'
               nullable = !non_nullable
               return_type = normalize_type_expression(return_type)
               return_type = return_type.gsub ',', ''
@@ -372,7 +466,11 @@ module GraphQL
 
             input_text.sub!(field) do
               is_argument = ['argument', 'input_field'].include?(field_type)
-              f = "#{is_argument ? 'argument' : 'field'} :#{name}, #{return_type}"
+              f = "#{is_argument ? 'argument' : 'field'} :#{name}"
+
+              if return_type
+                f += ", #{return_type}"
+              end
 
               unless remainder.empty?
                 f += ',' + remainder
@@ -428,11 +526,12 @@ module GraphQL
     end
 
     # Skip this file if you see any `field`
-    # helpers with `null: true` or `null: false` keywords,
+    # helpers with `null: true` or `null: false` keywords
+    # or `argument` helpers with `required:` keywords,
     # because it's already been transformed
     class SkipOnNullKeyword
       def skip?(input_text)
-        input_text =~ /field.*null: (true|false)/
+        input_text =~ /field.*null: (true|false)/ || input_text =~ /argument.*required: (true|false)/
       end
     end
 
@@ -449,6 +548,10 @@ module GraphQL
         TypeDefineToClassTransform,
         NameTransform,
         InterfacesToImplementsTransform,
+        PossibleTypesTransform,
+        ProcToClassMethodTransform.new("coerce_input"),
+        ProcToClassMethodTransform.new("coerce_result"),
+        ProcToClassMethodTransform.new("resolve_type"),
       ]
 
       DEFAULT_FIELD_TRANSFORMS = [

data/lib/graphql/version.rb

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

data/spec/fixtures/upgrader/account.original.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Platform
+  module Unions
+    Account = GraphQL::UnionType.define do
+      name "Account"
+      description "Users and organizations."
+      visibility :internal
+
+      possible_types [
+        Objects::User,
+        Objects::Organization,
+        Objects::Bot
+      ]
+
+      resolve_type ->(obj, ctx) { :stand_in }
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Platform
+  module Unions
+    class Account < Platform::Unions::Base
+      description "Users and organizations."
+      visibility :internal
+
+      possible_types(
+        Objects::User,
+        Objects::Organization,
+        Objects::Bot,
+      )
+
+      def self.resolve_type(obj, ctx)
+        :stand_in
+      end
+    end
+  end
+end

data/spec/fixtures/upgrader/date_time.original.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Platform
+  module Scalars
+    DateTime = GraphQL::ScalarType.define do
+      name "DateTime"
+      description "An ISO-8601 encoded UTC date string."
+
+      # rubocop:disable Layout/SpaceInLambdaLiteral
+      coerce_input -> (value, context) do
+        begin
+          Time.iso8601(value)
+        rescue ArgumentError, ::TypeError
+        end
+      end
+      # rubocop:enable Layout/SpaceInLambdaLiteral
+
+      coerce_result ->(value, context) do
+        return nil unless value
+        value.utc.iso8601
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Platform
+  module Scalars
+    class DateTime < Platform::Scalars::Base
+      description "An ISO-8601 encoded UTC date string."
+
+      # rubocop:disable Layout/SpaceInLambdaLiteral
+      def self.coerce_input(value, context)
+        begin
+          Time.iso8601(value)
+        rescue ArgumentError, ::TypeError
+        end
+      end
+      # rubocop:enable Layout/SpaceInLambdaLiteral
+
+      def self.coerce_result(value, context)
+        return nil unless value
+        value.utc.iso8601
+      end
+    end
+  end
+end

data/spec/fixtures/upgrader/gist_order_field.original.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Platform
+  module Enums
+    GistOrderField = GraphQL::EnumType.define do
+      name "GistOrderField"
+      description "Properties by which gist connections can be ordered."
+
+      value "CREATED_AT", "Order gists by creation time", value: "created_at"
+      value "UPDATED_AT", "Order gists by update time", value: "updated_at"
+      value "PUSHED_AT", "Order gists by push time", value: "pushed_at"
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Platform
+  module Enums
+    class GistOrderField < Platform::Enums::Base
+      description "Properties by which gist connections can be ordered."
+
+      value "CREATED_AT", "Order gists by creation time", value: "created_at"
+      value "UPDATED_AT", "Order gists by update time", value: "updated_at"
+      value "PUSHED_AT", "Order gists by push time", value: "pushed_at"
+    end
+  end
+end

data/spec/fixtures/upgrader/release_order.original.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Platform
+  module Inputs
+    ReleaseOrder = GraphQL::InputObjectType.define do
+      name "ReleaseOrder"
+      description "Ways in which lists of releases can be ordered upon return."
+
+      input_field :field, types[!Enums::ReleaseOrderField], <<-MD
+        The field in which to order releases by.
+      MD
+      input_field :direction, !Enums::OrderDirection, "The direction in which to order releases by the specified field."
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Platform
+  module Inputs
+    class ReleaseOrder < Platform::Inputs::Base
+      description "Ways in which lists of releases can be ordered upon return."
+
+      argument :field, [Enums::ReleaseOrderField], <<-MD, required: false
+        The field in which to order releases by.
+      MD
+      argument :direction, Enums::OrderDirection, "The direction in which to order releases by the specified field.", required: true
+    end
+  end
+end

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

@@ -46,6 +46,10 @@ module Platform
           subscribable.async_subscription_status(context[:viewer]).then(&:success?)
         end
       end
+
+      connection :issues, function: Platform::Functions::Issues.new, description: "A list of issues associated with the milestone."
+      connection :files, -> { !Connections.define(PackageFile) }, description: "List of files associated with this registry package version"
+      field :enabled, !types.Boolean, "Whether enabled for this project", property: :enabled?
     end
   end
 end

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

@@ -41,6 +41,10 @@ module Platform
 
         @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
+      field :files, Connections.define(PackageFile), description: "List of files associated with this registry package version", null: false, connection: true
+      field :enabled, Boolean, "Whether enabled for this project", method: :enabled?, null: false
     end
   end
 end

data/spec/graphql/language/printer_spec.rb

@@ -105,7 +105,7 @@ describe GraphQL::Language::Printer do
       end
 
       describe "full featured schema" do
-        # From: https://github.com/graphql/graphql-js/blob/bc96406ab44453a120da25a0bd6e2b0237119ddf/src/language/__tests__/schema-kitchen-sink.graphql
+        # Based on: https://github.com/graphql/graphql-js/blob/bc96406ab44453a120da25a0bd6e2b0237119ddf/src/language/__tests__/schema-kitchen-sink.graphql
         let(:query_string) {<<-schema
           schema {
             query: QueryType
@@ -128,7 +128,7 @@ describe GraphQL::Language::Printer do
           # Scalar description
           scalar CustomScalar
 
-          type AnnotatedObject @onObject(arg: "value") {
+          type AnnotatedObject implements Bar @onObject(arg: "value") {
             annotatedField(arg: Type = "default" @onArg): Type @onField
           }
 

data/spec/graphql/schema/enum_spec.rb

@@ -24,8 +24,17 @@ describe GraphQL::Schema::Enum do
       perc_value = new_enum.values["PERCUSSION"]
       assert_equal "new description", perc_value.description
     end
+
+    it "accepts a block" do
+      assert_equal "Neither here nor there, really", enum.values["KEYS"].description
+    end
   end
 
+  it "uses a custom enum value class" do
+    enum_type = enum.to_graphql
+    value = enum_type.values["STRING"]
+    assert_equal 1, value.metadata[:custom_setting]
+  end
 
   describe ".to_graphql" do
     it "creates an EnumType" do

data/spec/graphql/upgrader/member_spec.rb

@@ -463,6 +463,13 @@ describe GraphQL::Upgrader::Member do
       end
     end
 
+    # Modify the default output to match the custom structure
+    class InputObjectsToInputsTransform < GraphQL::Upgrader::Transform
+      def apply(input_text)
+        input_text.gsub("Platform::InputObjects::", "Platform::Inputs::")
+      end
+    end
+
     def custom_upgrade(original_text)
       # Replace the default one with a custom one:
       type_transforms = GraphQL::Upgrader::Member::DEFAULT_TYPE_TRANSFORMS.map { |t|
@@ -474,7 +481,8 @@ describe GraphQL::Upgrader::Member do
       }
 
       type_transforms.unshift(ActiveRecordTypeToClassTransform)
-      field_transforms = GraphQL::Upgrader::Member::DEFAULT_FIELD_TRANSFORMS
+      type_transforms.push(InputObjectsToInputsTransform)
+      field_transforms = GraphQL::Upgrader::Member::DEFAULT_FIELD_TRANSFORMS.dup
       field_transforms.unshift(GraphQL::Upgrader::ConfigurationToKwargTransform.new(kwarg: "visibility"))
       upgrader = GraphQL::Upgrader::Member.new(original_text, type_transforms: type_transforms, field_transforms: field_transforms)
       upgrader.upgrade
@@ -485,6 +493,7 @@ describe GraphQL::Upgrader::Member do
       transformed_file = original_file.sub(".original.", ".transformed.")
       original_text = File.read(original_file)
       expected_text = File.read(transformed_file)
+
       it "transforms #{original_file} -> #{transformed_file}" do
         transformed_text = custom_upgrade(original_text)
         assert_equal(expected_text, transformed_text)

data/spec/support/jazz.rb

@@ -104,6 +104,22 @@ module Jazz
     field_class BaseField
   end
 
+  class BaseEnumValue < GraphQL::Schema::EnumValue
+    def initialize(*args, custom_setting: nil, **kwargs, &block)
+      @custom_setting = custom_setting
+      super(*args, **kwargs, &block)
+    end
+
+    def to_graphql
+      enum_value_defn = super
+      enum_value_defn.metadata[:custom_setting] = @custom_setting
+      enum_value_defn
+    end
+  end
+
+  class BaseEnum < GraphQL::Schema::Enum
+    enum_value_class BaseEnumValue
+  end
 
   # Some arbitrary global ID scheme
   # *Type suffix is removed automatically
@@ -154,15 +170,17 @@ module Jazz
     field :musicians, "[Jazz::Musician]", null: false
   end
 
-  class Family < GraphQL::Schema::Enum
+  class Family < BaseEnum
     description "Groups of musical instruments"
     # support string and symbol
-    value "STRING", "Makes a sound by vibrating strings", value: :str
+    value "STRING", "Makes a sound by vibrating strings", value: :str, custom_setting: 1
     value :WOODWIND, "Makes a sound by vibrating air in a pipe"
     value :BRASS, "Makes a sound by amplifying the sound of buzzing lips"
     value "PERCUSSION", "Makes a sound by hitting something that vibrates"
-    value "KEYS", "Neither here nor there, really"
     value "DIDGERIDOO", "Makes a sound by amplifying the sound of buzzing lips", deprecation_reason: "Merged into BRASS"
+    value "KEYS" do
+      description "Neither here nor there, really"
+    end
   end
 
   # Lives side-by-side with an old-style definition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre5
+  version: 1.8.0.pre6
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -511,6 +511,7 @@ files:
 - lib/graphql/schema/default_parse_error.rb
 - lib/graphql/schema/default_type_error.rb
 - lib/graphql/schema/enum.rb
+- lib/graphql/schema/enum_value.rb
 - lib/graphql/schema/field.rb
 - lib/graphql/schema/field/dynamic_resolve.rb
 - lib/graphql/schema/field/unwrapped_resolve.rb
@@ -899,8 +900,16 @@ files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zy/zywotY5ANjNyE78CLDqC1eYRFwL1ZFzkT9J5LzNlI4M.cache
 - spec/dummy/tmp/restart.txt
 - spec/dummy/tmp/screenshots/failures_test_it_handles_subscriptions.png
+- spec/fixtures/upgrader/account.original.rb
+- spec/fixtures/upgrader/account.transformed.rb
 - spec/fixtures/upgrader/blame_range.original.rb
 - spec/fixtures/upgrader/blame_range.transformed.rb
+- spec/fixtures/upgrader/date_time.original.rb
+- spec/fixtures/upgrader/date_time.transformed.rb
+- spec/fixtures/upgrader/gist_order_field.original.rb
+- spec/fixtures/upgrader/gist_order_field.transformed.rb
+- spec/fixtures/upgrader/release_order.original.rb
+- spec/fixtures/upgrader/release_order.transformed.rb
 - spec/fixtures/upgrader/subscribable.original.rb
 - spec/fixtures/upgrader/subscribable.transformed.rb
 - spec/fixtures/upgrader/type_x.original.rb
@@ -1390,8 +1399,16 @@ test_files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Zz/Zzsh2ASGqBSWLSWIU4fAyxS3iVuJDxdTCw8jOOsUNzA.cache
 - spec/dummy/tmp/restart.txt
 - spec/dummy/tmp/screenshots/failures_test_it_handles_subscriptions.png
+- spec/fixtures/upgrader/account.original.rb
+- spec/fixtures/upgrader/account.transformed.rb
 - spec/fixtures/upgrader/blame_range.original.rb
 - spec/fixtures/upgrader/blame_range.transformed.rb
+- spec/fixtures/upgrader/date_time.original.rb
+- spec/fixtures/upgrader/date_time.transformed.rb
+- spec/fixtures/upgrader/gist_order_field.original.rb
+- spec/fixtures/upgrader/gist_order_field.transformed.rb
+- spec/fixtures/upgrader/release_order.original.rb
+- spec/fixtures/upgrader/release_order.transformed.rb
 - spec/fixtures/upgrader/subscribable.original.rb
 - spec/fixtures/upgrader/subscribable.transformed.rb
 - spec/fixtures/upgrader/type_x.original.rb