Make RelayClassicMutation work without field_options

Author: rmosolgo

lib/graphql/schema/member/has_arguments.rb

@@ -92,12 +92,27 @@ def add_argument(arg_defn)
           arg_defn
         end
 
+        def remove_argument(arg_defn)
+          prev_defn = @own_arguments[arg_defn.name]
+          case prev_defn
+          when nil
+            # done
+          when Array
+            prev_defn.delete(arg_defn)
+          when GraphQL::Schema::Argument
+            @own_arguments.delete(arg_defn.name)
+          else
+            raise "Invariant: unexpected `@own_arguments[#{arg_defn.name.inspect}]`: #{prev_defn.inspect}"
+          end
+          nil
+        end
+
         # @return [Hash<String => GraphQL::Schema::Argument] Arguments defined on this thing, keyed by name. Includes inherited definitions
         def arguments(context = GraphQL::Query::NullContext)
           inherited_arguments = if self.is_a?(Class) && superclass.respond_to?(:arguments)
             superclass.arguments(context)
           elsif defined?(@resolver_class) && @resolver_class
-            @resolver_class.arguments(context)
+            @resolver_class.field_arguments(context)
           else
             nil
           end
@@ -131,6 +146,10 @@ def all_argument_definitions
                 all_defns.merge!(ancestor.own_arguments)
               end
             end
+          elsif defined?(@resolver_class) && @resolver_class
+            all_defns = {}
+            all_defns.merge!(@resolver_class.own_field_arguments)
+            all_defns.merge!(own_arguments)
           else
             all_defns = own_arguments
           end
@@ -147,7 +166,7 @@ def get_argument(argument_name, context = GraphQL::Query::NullContext)
             if a && Warden.visible_entry?(:visible_argument?, a, context, warden)
               a
             elsif defined?(@resolver_class) && @resolver_class
-              @resolver_class.get_argument(argument_name, context)
+              @resolver_class.get_field_argument(argument_name, context)
             else
               nil
             end

lib/graphql/schema/relay_classic_mutation.rb

@@ -70,11 +70,32 @@ def resolve_with_support(**inputs)
       end
 
       class << self
+        def dummy
+          @dummy ||= begin
+            d = Class.new(GraphQL::Schema::Resolver)
+            d.argument_class(self.argument_class)
+            # TODO make this lazier?
+            d.argument(:input, input_type, description: "Parameters for #{self.graphql_name}", required: true)
+            d
+          end
+        end
+
+        def field_arguments(context = GraphQL::Query::NullContext)
+          dummy.arguments(context)
+        end
+
+        def get_field_argument(name, context = GraphQL::Query::NullContext)
+          dummy.get_argument(name, context)
+        end
+
+        def own_field_arguments
+          dummy.own_arguments
+        end
 
         # Also apply this argument to the input type:
-        def argument(*args, **kwargs, &block)
+        def argument(*args, own_argument: false, **kwargs, &block)
           it = input_type # make sure any inherited arguments are already added to it
-          arg = super
+          arg = super(*args, **kwargs, &block)
 
           # This definition might be overriding something inherited;
           # if it is, remove the inherited definition so it's not confused at runtime as having multiple definitions
@@ -114,27 +135,24 @@ def input_type(new_input_type = nil)
           @input_type ||= generate_input_type
         end
 
-        # Extend {Schema::Mutation.field_options} to add the `input` argument
-        def field_options
-          sig = super
-          # Arguments were added at the root, but they should be nested
-          sig[:arguments].clear
-          sig[:arguments][:input] = { type: input_type, required: true, description: "Parameters for #{graphql_name}" }
-          sig
-        end
-
         private
 
         # Generate the input type for the `input:` argument
         # To customize how input objects are generated, override this method
         # @return [Class] a subclass of {.input_object_class}
         def generate_input_type
           mutation_args = all_argument_definitions
-          mutation_name = graphql_name
           mutation_class = self
           Class.new(input_object_class) do
-            graphql_name("#{mutation_name}Input")
-            description("Autogenerated input type of #{mutation_name}")
+            class << self
+              def default_graphql_name
+                "#{self.mutation.graphql_name}Input"
+              end
+
+              def description(new_desc = nil)
+                super || "Autogenerated input type of #{self.mutation.graphql_name}"
+              end
+            end
             mutation(mutation_class)
             # these might be inherited:
             mutation_args.each do |arg|

lib/graphql/schema/resolver.rb

@@ -208,6 +208,18 @@ def get_argument(name, context = GraphQL::Query::NullContext)
       end
 
       class << self
+        def field_arguments(context = GraphQL::Query::NullContext)
+          arguments(arguments)
+        end
+
+        def get_field_argument(name, context = GraphQL::Query::NullContext)
+          get_argument(name, context)
+        end
+
+        def own_field_arguments
+          own_arguments
+        end
+
         # Default `:resolve` set below.
         # @return [Symbol] The method to call on instances of this object to resolve the field
         def resolve_method(new_method = nil)

spec/graphql/schema/relay_classic_mutation_spec.rb

@@ -51,7 +51,8 @@
         graphql_name "SomeMutation"
       end
 
-      assert_equal "Parameters for SomeMutation", mutation.field_options[:arguments][:input][:description]
+      field = GraphQL::Schema::Field.new(name: "blah", resolver_class: mutation)
+      assert_equal "Parameters for SomeMutation", field.get_argument("input").description
     end
   end
 
@@ -70,7 +71,6 @@
         }
       }
       GRAPHQL
-
       assert_equal "Sitar", res["data"]["addSitar"]["instrument"]["name"]
     end