GraphQL::Analysis::AST::FieldUsage deprecated argument detections for mutations raises an error when the InputType value is prepared about graphql-ruby HOT 3 CLOSED

diff --git a/lib/graphql/analysis/ast/field_usage.rb b/lib/graphql/analysis/ast/field_usage.rb
index dc83577dbd..185b9a8f9b 100644
--- a/lib/graphql/analysis/ast/field_usage.rb
+++ b/lib/graphql/analysis/ast/field_usage.rb
@@ -48,8 +48,8 @@ module GraphQL
               argument_type = argument_type.of_type
             end

-            if argument_type.kind.input_object? && argument.value.respond_to?(:arguments) # Skip if value is not a GraphQL::Schema::InputObject
-              extract_deprecated_arguments(argument.value.arguments.argument_values) # rubocop:disable Development/ContextIsPassedCop -- runtime args instance
+            if argument_type.kind.input_object?
+              extract_deprecated_arguments(argument.original_value.arguments.argument_values) # rubocop:disable Development/ContextIsPassedCop -- runtime args instance
             elsif argument_type.kind.enum?
               extract_deprecated_enum_value(argument_type, argument.value)
             elsif argument_type.list?
diff --git a/lib/graphql/execution/interpreter/argument_value.rb b/lib/graphql/execution/interpreter/argument_value.rb
index 4ca37977c0..82d31f3804 100644
--- a/lib/graphql/execution/interpreter/argument_value.rb
+++ b/lib/graphql/execution/interpreter/argument_value.rb
@@ -6,15 +6,19 @@ module GraphQL
       # A container for metadata regarding arguments present in a GraphQL query.
       # @see Interpreter::Arguments#argument_values for a hash of these objects.
       class ArgumentValue
-        def initialize(definition:, value:, default_used:)
+        def initialize(definition:, value:, original_value:, default_used:)
           @definition = definition
           @value = value
+          @original_value = original_value
           @default_used = default_used
         end

         # @return [Object] The Ruby-ready value for this Argument
         attr_reader :value

+        # @return [Object] The original Ruby-ready value for this Argument
+        attr_reader :original_value
+
         # @return [GraphQL::Schema::Argument] The definition instance for this argument
         attr_reader :definition

diff --git a/lib/graphql/schema/argument.rb b/lib/graphql/schema/argument.rb
index 633f329b65..dfa85a69a2 100644
--- a/lib/graphql/schema/argument.rb
+++ b/lib/graphql/schema/argument.rb
@@ -261,8 +261,11 @@ module GraphQL
         end

         loaded_value = nil
+        original_value = nil
         coerced_value = begin
-          type.coerce_input(value, context)
+          type.coerce_input(value, context) do |input_obj_instance|
+            original_value = input_obj_instance
+          end
         rescue StandardError => err
           context.schema.handle_or_reraise(context, err)
         end
@@ -290,6 +293,7 @@ module GraphQL
             # TODO code smell to access such a deeply-nested constant in a distant module
             argument_values[arg_key] = GraphQL::Execution::Interpreter::ArgumentValue.new(
               value: resolved_loaded_value,
+              original_value: original_value,
               definition: self,
               default_used: default_used,
             )
diff --git a/lib/graphql/schema/input_object.rb b/lib/graphql/schema/input_object.rb
index 46c69c1826..856eae5ef5 100644
--- a/lib/graphql/schema/input_object.rb
+++ b/lib/graphql/schema/input_object.rb
@@ -216,6 +216,7 @@ module GraphQL
               raise resolved_arguments
             else
               input_obj_instance = self.new(resolved_arguments, ruby_kwargs: resolved_arguments.keyword_arguments, context: ctx, defaults_used: nil)
+              yield input_obj_instance if block_given?
               input_obj_instance.prepare
             end
           end
diff --git a/spec/graphql/analysis/ast/field_usage_spec.rb b/spec/graphql/analysis/ast/field_usage_spec.rb
index 53cafb4851..56924b3904 100644
--- a/spec/graphql/analysis/ast/field_usage_spec.rb
+++ b/spec/graphql/analysis/ast/field_usage_spec.rb
@@ -254,18 +254,30 @@ describe GraphQL::Analysis::AST::FieldUsage do
     end
   end

-  describe "mutation with deprecated arguments with prepared values does not break" do
+  describe "mutation with deprecated arguments with prepared values" do
     let(:query_string) {%|
       mutation {
-        pushValue(preparedTestInput: { deprecatedDate: "2020-10-10" })
+        pushValue(preparedTestInput: { date: "2020-10-10" })
       }
     |}

-    it "does not keeps track of nested deprecated arguments" do
+    it "does not return non-deprecated arguments" do
       assert_equal [], result[:used_deprecated_arguments]
     end
   end

+  describe "mutation with deprecated arguments with prepared values" do
+    let(:query_string) {%|
+      mutation {
+        pushValue(preparedTestInput: { deprecatedDate: "2020-10-10" })
+      }
+    |}
+
+    it "keeps track of nested deprecated arguments" do
+      assert_equal ['PreparedDateInput.deprecatedDate'], result[:used_deprecated_arguments]
+    end
+  end
+
   describe "when an argument prepare raises a GraphQL::ExecutionError" do
     class ArgumentErrorFieldUsageSchema < GraphQL::Schema
       class FieldUsage < GraphQL::Analysis::AST::FieldUsage