Merge pull request rmosolgo#2379 from rmosolgo/generate-base-argument

Generate BaseArgument during install

Author: rmosolgo

lib/generators/graphql/install_generator.rb

@@ -13,6 +13,7 @@ module Generators
     #   - graphql/
     #     - resolvers/
     #     - types/
+    #       - base_argument.rb
     #       - base_field.rb
     #       - base_enum.rb
     #       - base_input_object.rb
@@ -94,7 +95,7 @@ def create_folder_structure
         create_dir("#{options[:directory]}/types")
         template("schema.erb", schema_file_path)
 
-        ["base_object", "base_field", "base_enum", "base_input_object", "base_interface", "base_scalar", "base_union"].each do |base_type|
+        ["base_object", "base_argument", "base_field", "base_enum", "base_input_object", "base_interface", "base_scalar", "base_union"].each do |base_type|
           template("#{base_type}.erb", "#{options[:directory]}/types/#{base_type}.rb")
         end
 

lib/generators/graphql/templates/base_argument.erb

@@ -0,0 +1,4 @@
+module Types
+  class BaseArgument < GraphQL::Schema::Argument
+  end
+end

lib/generators/graphql/templates/base_field.erb

@@ -1,5 +1,7 @@
 module Types
   class BaseField < GraphQL::Schema::Field
+    argument_class Types::BaseArgument
+
     def resolve_field(obj, args, ctx)
       resolve(obj, args, ctx)
     end

lib/generators/graphql/templates/base_input_object.erb

@@ -1,4 +1,5 @@
 module Types
   class BaseInputObject < GraphQL::Schema::InputObject
+    argument_class Types::BaseArgument
   end
 end

lib/graphql/schema/member/has_fields.rb

@@ -54,7 +54,7 @@ def get_field(field_name)
         # @return [void]
         def add_field(field_defn)
           if CONFLICT_FIELD_NAMES.include?(field_defn.method_sym)
-            warn "#{self.graphql_name}'s `field :#{field_defn.name}` conflicts with a built-in method, use `method:` to pick a different resolver method for this field (for example, `resolver_method: :resolve_#{field_defn.method_sym}` and `def resolve_#{field_defn.method_sym}`)"
+            warn "#{self.graphql_name}'s `field :#{field_defn.name}` conflicts with a built-in method, use `resolver_method:` to pick a different resolver method for this field (for example, `resolver_method: :resolve_#{field_defn.method_sym}` and `def resolve_#{field_defn.method_sym}`)"
           end
           own_fields[field_defn.name] = field_defn
           nil

spec/graphql/schema/object_spec.rb

@@ -315,7 +315,7 @@ def call(o, a, c)
 
   describe "when fields conflict with built-ins" do
     it "warns when no override" do
-      expected_warning = "X's `field :method` conflicts with a built-in method, use `method:` to pick a different resolver method for this field (for example, `resolver_method: :resolve_method` and `def resolve_method`)\n"
+      expected_warning = "X's `field :method` conflicts with a built-in method, use `resolver_method:` to pick a different resolver method for this field (for example, `resolver_method: :resolve_method` and `def resolve_method`)\n"
       assert_output "", expected_warning do
         Class.new(GraphQL::Schema::Object) do
           graphql_name "X"

spec/integration/rails/generators/graphql/install_generator_spec.rb

@@ -65,6 +65,26 @@ def test_field
 
     assert_file "app/graphql/types/query_type.rb", expected_query_type
     assert_file "app/controllers/graphql_controller.rb", EXPECTED_GRAPHQLS_CONTROLLER
+    expected_base_field = <<-RUBY
+module Types
+  class BaseField < GraphQL::Schema::Field
+    argument_class Types::BaseArgument
+
+    def resolve_field(obj, args, ctx)
+      resolve(obj, args, ctx)
+    end
+  end
+end
+RUBY
+    assert_file "app/graphql/types/base_field.rb", expected_base_field
+
+    expected_base_argument = <<-RUBY
+module Types
+  class BaseArgument < GraphQL::Schema::Argument
+  end
+end
+RUBY
+    assert_file "app/graphql/types/base_argument.rb", expected_base_argument
   end
 
   test "it allows for a user-specified install directory" do