graphql 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1caad3d02e9d64f06c086fd46c324a0df1fc66c35353aef62dd716fe7ea4b9c
-  data.tar.gz: 8c53383e4fe8b0e7d5199d42460e0a5920940ae27965a7223f5ef020b1c594cc
+  metadata.gz: 7177c15aedde0b99419bee77e944a4907bb84e39b5e9aafb05b2a1360903f3e6
+  data.tar.gz: e7252b975a41c1d8a0871e71a3fc37522741c0b872899f2f33863b76ad09934d
 SHA512:
-  metadata.gz: ae189d6de14b18dbee6781688a43d1f15cfb1418fa9ceb45ca099f577a5cd9339c6e16d8402e7b15ba62c64afbfbaed64f3d5d64b253a51597fb50d586d5a6dd
-  data.tar.gz: ab5860a939248086c5b8df11f0f638edce805110e75f51b068addce3e0956a9ffeda17836bf02962a943b137e4defccd48e3c18f836973f0c780c4ef225f7bd0
+  metadata.gz: d29b25a1186ce62664cd2225de1eac675925ebbf93ed14c6513a1008c7cd6a1b01b375a1785082ab14024ead927a073f8e3afb72ffa5905a342fcdec6a60d9fa
+  data.tar.gz: 6d2a445f577027d5f87a0a0ee0f0c1a562d494d7d9a5bc7209dfbb2fc5c98ce38f5fab86e7101b6537f9b9b590a2d41e1303f5dc606809683a1bde22c6bc283d

data/lib/generators/graphql/install_generator.rb

@@ -106,7 +106,7 @@ module Graphql
         end
 
         # All resolvers are defined as living in their own module, including this class.
-        template("base_resolver.erb", "#{options[:directory]}/resolvers/base.rb")
+        template("base_resolver.erb", "#{options[:directory]}/resolvers/base_resolver.rb")
 
         # Note: You can't have a schema without the query type, otherwise introspection breaks
         template("query_type.erb", "#{options[:directory]}/types/query_type.rb")

data/lib/generators/graphql/templates/base_resolver.erb

@@ -1,5 +1,5 @@
 <% module_namespacing_when_supported do -%>
-module Types
+module Resolvers
   class BaseResolver < GraphQL::Schema::Resolver
   end
 end

data/lib/graphql/dataloader/async_dataloader.rb

@@ -19,29 +19,27 @@ module GraphQL
           while first_pass || job_tasks.any?
             first_pass = false
 
-            root_task.async do |jobs_task|
-              while (task = job_tasks.shift || spawn_job_task(jobs_task, jobs_condition))
-                if task.alive?
-                  next_job_tasks << task
-                elsif task.failed?
-                  # re-raise a raised error -
-                  # this also covers errors from sources since
-                  # these jobs wait for sources as needed.
-                  task.wait
-                end
+            while (task = job_tasks.shift || spawn_job_task(root_task, jobs_condition))
+              if task.alive?
+                next_job_tasks << task
+              elsif task.failed?
+                # re-raise a raised error -
+                # this also covers errors from sources since
+                # these jobs wait for sources as needed.
+                task.wait
               end
-            end.wait
+            end
+            root_task.yield # give job tasks a chance to run
             job_tasks.concat(next_job_tasks)
             next_job_tasks.clear
 
             while source_tasks.any? || @source_cache.each_value.any? { |group_sources| group_sources.each_value.any?(&:pending?) }
-              root_task.async do |sources_loop_task|
-                while (task = source_tasks.shift || spawn_source_task(sources_loop_task, sources_condition))
-                  if task.alive?
-                    next_source_tasks << task
-                  end
+              while (task = source_tasks.shift || spawn_source_task(root_task, sources_condition))
+                if task.alive?
+                  next_source_tasks << task
                 end
-              end.wait
+              end
+              root_task.yield # give source tasks a chance to run
               sources_condition.signal
               source_tasks.concat(next_source_tasks)
               next_source_tasks.clear
@@ -58,7 +56,7 @@ module GraphQL
       def spawn_job_task(parent_task, condition)
         if @pending_jobs.any?
           fiber_vars = get_fiber_variables
-          parent_task.async do |t|
+          parent_task.async do
             set_fiber_variables(fiber_vars)
             Thread.current[:graphql_dataloader_next_tick] = condition
             while job = @pending_jobs.shift

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -631,7 +631,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby