Clean up code, support grouped one-of conditions

Author: rmosolgo

lib/graphql/schema/validator/required_validator.rb

@@ -40,42 +40,32 @@ class RequiredValidator < Validator
         # @param message [String]
         def initialize(one_of: nil, argument: nil, allow_all_hidden: nil, message: nil, **default_options)
           @one_of = if one_of
-            @single_argument = false
             one_of
           elsif argument
-            @single_argument = true
             [ argument ]
           else
             raise ArgumentError, "`one_of:` or `argument:` must be given in `validates required: {...}`"
           end
-          @allow_all_hidden = allow_all_hidden.nil? ? @single_argument : allow_all_hidden
+          @allow_all_hidden = allow_all_hidden.nil? ? !!argument : allow_all_hidden
           @message = message
           super(**default_options)
         end
 
         def validate(_object, context, value)
           fully_matched_conditions = 0
           partially_matched_conditions = 0
-          if @one_of
-            visible_keywords = context.types.arguments(@validated).map(&:keyword)
-            visible_one_ofs = @one_of & visible_keywords
-            if visible_one_ofs.empty?
-              if @allow_all_hidden
-                return nil
-              else
-                raise GraphQL::Error, <<~ERR
-                  #{@validated.path} validates `required: ...` but all required arguments were hidden.
 
-                  Update your schema definition to allow the client to see some fields or skip validation by adding `required: { ..., allow_all_hidden: true }`
-                ERR
-              end
-            end
-          end
+          visible_keywords = context.types.arguments(@validated).map(&:keyword)
+          no_visible_conditions = true
 
           if !value.nil?
             @one_of.each do |one_of_condition|
               case one_of_condition
               when Symbol
+                if no_visible_conditions && visible_keywords.include?(one_of_condition)
+                  no_visible_conditions = false
+                end
+
                 if value.key?(one_of_condition)
                   fully_matched_conditions += 1
                 end
@@ -84,6 +74,9 @@ def validate(_object, context, value)
                 full_match = true
 
                 one_of_condition.each do |k|
+                  if no_visible_conditions && visible_keywords.include?(k)
+                    no_visible_conditions = false
+                  end
                   if value.key?(k)
                     any_match = true
                   else
@@ -106,6 +99,18 @@ def validate(_object, context, value)
             end
           end
 
+          if no_visible_conditions
+            if @allow_all_hidden
+              return nil
+            else
+              raise GraphQL::Error, <<~ERR
+                #{@validated.path} validates `required: ...` but all required arguments were hidden.
+
+                Update your schema definition to allow the client to see some fields or skip validation by adding `required: { ..., allow_all_hidden: true }`
+              ERR
+            end
+          end
+
           if fully_matched_conditions == 1 && partially_matched_conditions == 0
             nil # OK
           else

spec/graphql/schema/validator/required_validator_spec.rb

@@ -136,6 +136,14 @@ class Query < GraphQL::Schema::Object
           argument :b, Int, required: false, always_hidden: true
           argument :c, Int
         end
+
+        field :four_arguments, Int, fallback_value: 4 do
+          validates required: { one_of: [[:a, :b], :c, :d], allow_all_hidden: true}
+          argument :a, Int, required: false, always_hidden: true
+          argument :b, Int, required: false, always_hidden: true
+          argument :c, Int, required: false, always_hidden: true
+          argument :d, Int, required: false, always_hidden: true
+        end
       end
 
       query(Query)
@@ -157,6 +165,11 @@ class Query < GraphQL::Schema::Object
       assert_equal expected_message, err.message
     end
 
+    it "doesn't require hidden arguments when required as a group" do
+      result = RequiredHiddenSchema.execute("{ fourArguments }")
+      assert_equal 4, result["data"]["fourArguments"]
+    end
+
     it "Doesn't require hidden argument to be present" do
       result = RequiredHiddenSchema.execute("{ oneArgument }")
       assert_equal 1, result["data"]["oneArgument"]