graphql 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1511256e7812b5c2de2a01ffa44f8a77f2e8959837344eaf1c8780d0b1bf700
-  data.tar.gz: 87a0734b541d8f2cbbd3fb293a63663cbc57c61e6ab39242449596c6ca759442
+  metadata.gz: c8f2d38dd0c349521f7f22050bb70cee1f06a7832de74d5afe523a35310ed318
+  data.tar.gz: da047a5e11a1441060411c47468daad16300db1dc7064ab1b1a76d2e519e76fd
 SHA512:
-  metadata.gz: fff5ef36d8e8dff310cac664178ebf0e902cd067a893fedd164902625751fe457a070f1daf2a2251d0dd2ec57fb16daccc81b54267048bbb71c027caf7905100
-  data.tar.gz: 5fc4e6c4a44398e9f77d99c5224d22128a9c80e64a17a156500337b4d658270da9aa7af71f8d06cc065939cc42b41de3e07d66cb7622704ad179424c312dd7a0
+  metadata.gz: 73bd380530a4183241587083beb2ef6c96709657fb18e702a294a37c22f26e2141b2111b96c79570b9588d330e9c8d851fd532cdaf6d6fbd55f9dd5b30c6fe4e
+  data.tar.gz: 917e88d0cec3cbc760ec89714cf31325088f94f0a93094b3fcbf1cc3c07f52a99e30f0e418e561518c0a7deef0358dfa0ae457b8bad88fb50883aacb9d7dae7f

data/lib/graphql/dataloader/async_dataloader.rb

@@ -77,6 +77,7 @@ module GraphQL
             set_fiber_variables(fiber_vars)
             Thread.current[:graphql_dataloader_next_tick] = condition
             pending_sources.each(&:run_pending_keys)
+            cleanup_fiber
           end
         end
       end

data/lib/graphql/dataloader.rb

@@ -88,6 +88,11 @@ module GraphQL
       nil
     end
 
+    # This method is called when Dataloader is finished using a fiber.
+    # Use it to perform any cleanup, such as releasing database connections (if required manually)
+    def cleanup_fiber
+    end
+
     # Get a Source instance from this dataloader, for calling `.load(...)` or `.request(...)` on.
     #
     # @param source_class [Class<GraphQL::Dataloader::Source]
@@ -231,9 +236,7 @@ module GraphQL
       Fiber.new(blocking: !@nonblocking) {
         set_fiber_variables(fiber_vars)
         yield
-        # With `.transfer`, you have to explicitly pass back to the parent --
-        # if the fiber is allowed to terminate normally, control is passed to the main fiber instead.
-        true
+        cleanup_fiber
       }
     end
 

data/lib/graphql/execution/interpreter/runtime.rb

@@ -127,7 +127,6 @@ module GraphQL
         end
 
         def gather_selections(owner_object, owner_type, selections, selections_to_run = nil, selections_by_name = {})
-
           selections.each do |node|
             # Skip gathering this if the directive says so
             if !directives_include?(node, owner_object, owner_type)
@@ -172,17 +171,26 @@ module GraphQL
                   type_defn = schema.get_type(node.type.name, context)
 
                   if query.warden.possible_types(type_defn).include?(owner_type)
-                    gather_selections(owner_object, owner_type, node.selections, selections_to_run, next_selections)
+                    result = gather_selections(owner_object, owner_type, node.selections, selections_to_run, next_selections)
+                    if !result.equal?(next_selections)
+                      selections_to_run = result
+                    end
                   end
                 else
                   # it's an untyped fragment, definitely continue
-                  gather_selections(owner_object, owner_type, node.selections, selections_to_run, next_selections)
+                  result = gather_selections(owner_object, owner_type, node.selections, selections_to_run, next_selections)
+                  if !result.equal?(next_selections)
+                    selections_to_run = result
+                  end
                 end
               when GraphQL::Language::Nodes::FragmentSpread
                 fragment_def = query.fragments[node.name]
                 type_defn = query.get_type(fragment_def.type.name)
                 if query.warden.possible_types(type_defn).include?(owner_type)
-                  gather_selections(owner_object, owner_type, fragment_def.selections, selections_to_run, next_selections)
+                  result = gather_selections(owner_object, owner_type, fragment_def.selections, selections_to_run, next_selections)
+                  if !result.equal?(next_selections)
+                    selections_to_run = result
+                  end
                 end
               else
                 raise "Invariant: unexpected selection class: #{node.class}"

data/lib/graphql/language/nodes.rb

@@ -20,6 +20,15 @@ module GraphQL
             @definition_line = definition_line
             super(**_rest)
           end
+
+          def marshal_dump
+            super << @definition_line
+          end
+
+          def marshal_load(values)
+            @definition_line = values.pop
+            super
+          end
         end
 
         attr_reader :filename
@@ -273,18 +282,20 @@ module GraphQL
               end
             end
 
-            all_method_names = scalar_method_names + @children_methods.keys
+            children_method_names = @children_methods.keys
+
+            all_method_names = scalar_method_names + children_method_names
             if all_method_names.include?(:alias)
               # Rather than complicating this special case,
               # let it be overridden (in field)
               return
             else
               arguments = scalar_method_names.map { |m| "#{m}: nil"} +
-                @children_methods.keys.map { |m| "#{m}: NO_CHILDREN" } +
+                children_method_names.map { |m| "#{m}: NO_CHILDREN" } +
                 DEFAULT_INITIALIZE_OPTIONS
 
               assignments = scalar_method_names.map { |m| "@#{m} = #{m}"} +
-                @children_methods.keys.map { |m| "@#{m} = #{m}.freeze" }
+                children_method_names.map { |m| "@#{m} = #{m}.freeze" }
 
               if name.end_with?("Definition") && name != "FragmentDefinition"
                 arguments << "definition_pos: nil"
@@ -292,7 +303,7 @@ module GraphQL
               end
 
               keywords = scalar_method_names.map { |m| "#{m}: #{m}"} +
-                @children_methods.keys.map { |m| "#{m}: #{m}" }
+                children_method_names.map { |m| "#{m}: #{m}" }
 
               module_eval <<-RUBY, __FILE__, __LINE__
                 def initialize(#{arguments.join(", ")})
@@ -304,9 +315,21 @@ module GraphQL
                   #{assignments.join("\n")}
                 end
 
-                def self.from_a(filename, line, col, #{(scalar_method_names + @children_methods.keys).join(", ")})
+                def self.from_a(filename, line, col, #{all_method_names.join(", ")})
                   self.new(filename: filename, line: line, col: col, #{keywords.join(", ")})
                 end
+
+                def marshal_dump
+                  [
+                    line, col, # use methods here to force them to be calculated
+                    @filename,
+                    #{all_method_names.map { |n| "@#{n}," }.join}
+                  ]
+                end
+
+                def marshal_load(values)
+                  @line, @col, @filename #{all_method_names.map { |n| ", @#{n}"}.join} = values
+                end
               RUBY
             end
           end
@@ -397,6 +420,14 @@ module GraphQL
           self.new(filename: filename, line: line, col: col, field_alias: field_alias, name: name, arguments: arguments, directives: directives, selections: selections)
         end
 
+        def marshal_dump
+          [line, col, @filename, @name, @arguments, @directives, @selections, @alias]
+        end
+
+        def marshal_load(values)
+          @line, @col, @filename, @name, @arguments, @directives, @selections, @alias = values
+        end
+
         # Override this because default is `:fields`
         self.children_method_name = :selections
       end
@@ -430,6 +461,14 @@ module GraphQL
         def self.from_a(filename, line, col, name, type, directives, selections)
           self.new(filename: filename, line: line, col: col, name: name, type: type, directives: directives, selections: selections)
         end
+
+        def marshal_dump
+          [line, col, @filename, @name, @type, @directives, @selections]
+        end
+
+        def marshal_load(values)
+          @line, @col, @filename, @name, @type, @directives, @selections = values
+        end
       end
 
       # Application of a named fragment in a selection

data/lib/graphql/language/parser.rb

@@ -478,7 +478,7 @@ module GraphQL
         end
 
         if at?(:BANG)
-          type = Nodes::NonNullType.new(pos: pos, of_type: type)
+          type = Nodes::NonNullType.new(pos: pos, of_type: type, source: self)
           expect_token(:BANG)
         end
         type
@@ -487,7 +487,7 @@ module GraphQL
       def list_type
         loc = pos
         expect_token(:LBRACKET)
-        type = Nodes::ListType.new(pos: loc, of_type: self.type)
+        type = Nodes::ListType.new(pos: loc, of_type: self.type, source: self)
         expect_token(:RBRACKET)
         type
       end

data/lib/graphql/query.rb

@@ -304,7 +304,7 @@ module GraphQL
 
     # @return [String] An opaque hash for identifying this query's given query string and selected operation
     def operation_fingerprint
-      @operation_fingerprint ||= "#{selected_operation_name || "anonymous"}/#{Fingerprint.generate(query_string)}"
+      @operation_fingerprint ||= "#{selected_operation_name || "anonymous"}/#{Fingerprint.generate(query_string || "")}"
     end
 
     # @return [String] An opaque hash for identifying this query's given a variable values (not including defaults)

data/lib/graphql/tracing/prometheus_trace.rb

@@ -25,33 +25,33 @@ module GraphQL
       }.each do |trace_method, platform_key|
         module_eval <<-RUBY, __FILE__, __LINE__
           def #{trace_method}(**data)
-            instrument_execution("#{platform_key}", "#{trace_method}") { super }
+            instrument_prometheus_execution("#{platform_key}", "#{trace_method}") { super }
           end
         RUBY
       end
 
       def platform_execute_field(platform_key, &block)
-        instrument_execution(platform_key, "execute_field", &block)
+        instrument_prometheus_execution(platform_key, "execute_field", &block)
       end
 
       def platform_execute_field_lazy(platform_key, &block)
-        instrument_execution(platform_key, "execute_field_lazy", &block)
+        instrument_prometheus_execution(platform_key, "execute_field_lazy", &block)
       end
 
       def platform_authorized(platform_key, &block)
-        instrument_execution(platform_key, "authorized", &block)
+        instrument_prometheus_execution(platform_key, "authorized", &block)
       end
 
       def platform_authorized_lazy(platform_key, &block)
-        instrument_execution(platform_key, "authorized_lazy", &block)
+        instrument_prometheus_execution(platform_key, "authorized_lazy", &block)
       end
 
       def platform_resolve_type(platform_key, &block)
-        instrument_execution(platform_key, "resolve_type", &block)
+        instrument_prometheus_execution(platform_key, "resolve_type", &block)
       end
 
       def platform_resolve_type_lazy(platform_key, &block)
-        instrument_execution(platform_key, "resolve_type_lazy", &block)
+        instrument_prometheus_execution(platform_key, "resolve_type_lazy", &block)
       end
 
       def platform_field_key(field)
@@ -68,7 +68,7 @@ module GraphQL
 
       private
 
-      def instrument_execution(platform_key, key, &block)
+      def instrument_prometheus_execution(platform_key, key, &block)
         if @keys_whitelist.include?(key)
           start = ::Process.clock_gettime ::Process::CLOCK_MONOTONIC
           result = block.call

data/lib/graphql/tracing/sentry_trace.rb

@@ -12,7 +12,7 @@ module GraphQL
         @set_transaction_name = set_transaction_name
         super
       end
-      
+
       def execute_query(**data)
         set_this_txn_name = data[:query].context[:set_sentry_transaction_name]
         if set_this_txn_name == true || (set_this_txn_name.nil? && @set_transaction_name)
@@ -20,7 +20,7 @@ module GraphQL
             scope.set_transaction_name(transaction_name(data[:query]))
           end
         end
-        instrument_execution("graphql.execute", "execute_query", data) { super }
+        instrument_sentry_execution("graphql.execute", "execute_query", data) { super }
       end
 
       {
@@ -34,33 +34,33 @@ module GraphQL
       }.each do |trace_method, platform_key|
         module_eval <<-RUBY, __FILE__, __LINE__
         def #{trace_method}(**data)
-          instrument_execution("#{platform_key}", "#{trace_method}", data) { super }
+          instrument_sentry_execution("#{platform_key}", "#{trace_method}", data) { super }
         end
         RUBY
       end
 
       def platform_execute_field(platform_key, &block)
-        instrument_execution(platform_key, "execute_field", &block)
+        instrument_sentry_execution(platform_key, "execute_field", &block)
       end
 
       def platform_execute_field_lazy(platform_key, &block)
-        instrument_execution(platform_key, "execute_field_lazy", &block)
+        instrument_sentry_execution(platform_key, "execute_field_lazy", &block)
       end
 
       def platform_authorized(platform_key, &block)
-        instrument_execution(platform_key, "authorized", &block)
+        instrument_sentry_execution(platform_key, "authorized", &block)
       end
 
       def platform_authorized_lazy(platform_key, &block)
-        instrument_execution(platform_key, "authorized_lazy", &block)
+        instrument_sentry_execution(platform_key, "authorized_lazy", &block)
       end
 
       def platform_resolve_type(platform_key, &block)
-        instrument_execution(platform_key, "resolve_type", &block)
+        instrument_sentry_execution(platform_key, "resolve_type", &block)
       end
 
       def platform_resolve_type_lazy(platform_key, &block)
-        instrument_execution(platform_key, "resolve_type_lazy", &block)
+        instrument_sentry_execution(platform_key, "resolve_type_lazy", &block)
       end
 
       def platform_field_key(field)
@@ -77,7 +77,7 @@ module GraphQL
 
       private
 
-      def instrument_execution(platform_key, trace_method, data=nil, &block)
+      def instrument_sentry_execution(platform_key, trace_method, data=nil, &block)
         return yield unless Sentry.initialized?
 
         Sentry.with_child_span(op: platform_key, start_timestamp: Sentry.utc_now.to_f) do |span|

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "2.3.3"
+  VERSION = "2.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64