graphql 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7177c15aedde0b99419bee77e944a4907bb84e39b5e9aafb05b2a1360903f3e6
-  data.tar.gz: e7252b975a41c1d8a0871e71a3fc37522741c0b872899f2f33863b76ad09934d
+  metadata.gz: 87199d36a0f9e158d8892e0e9ca2086f89c321adbbe5dec68b16e662ccb5e912
+  data.tar.gz: 5dde06249941e5ce75bc06613c37bf75cc8d6c110a1e7c39f1fede566bb0d160
 SHA512:
-  metadata.gz: d29b25a1186ce62664cd2225de1eac675925ebbf93ed14c6513a1008c7cd6a1b01b375a1785082ab14024ead927a073f8e3afb72ffa5905a342fcdec6a60d9fa
-  data.tar.gz: 6d2a445f577027d5f87a0a0ee0f0c1a562d494d7d9a5bc7209dfbb2fc5c98ce38f5fab86e7101b6537f9b9b590a2d41e1303f5dc606809683a1bde22c6bc283d
+  metadata.gz: a2da271a3986e6859048054a64021fdb900b71439abec89b3f0b89ef5b2607266c507dae5e3de81b305028c7ba45cde8e7271612fabeda45ac9e8a18be3d9818
+  data.tar.gz: 80a579e0e22967804de66b86fa98a5c0041d45ca1665beba4e50ef5045848364da5b71d115cbe862d308b72919723b121b8a001c9185b664c2394dcc054d5f20

data/lib/graphql/dataloader/async_dataloader.rb

@@ -3,69 +3,63 @@ module GraphQL
   class Dataloader
     class AsyncDataloader < Dataloader
       def yield
-        Thread.current[:graphql_dataloader_next_tick].wait
+        if (condition = Thread.current[:graphql_dataloader_next_tick])
+          condition.wait
+        else
+          Fiber.yield
+        end
         nil
       end
 
       def run
-        job_tasks = []
-        next_job_tasks = []
+        job_fibers = []
+        next_job_fibers = []
         source_tasks = []
         next_source_tasks = []
         first_pass = true
-        jobs_condition = Async::Condition.new
         sources_condition = Async::Condition.new
-        Sync do |root_task|
-          while first_pass || job_tasks.any?
+        manager = spawn_fiber do
+          while first_pass || job_fibers.any?
             first_pass = false
 
-            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
+            while (f = (job_fibers.shift || spawn_job_fiber))
+              if f.alive?
+                finished = run_fiber(f)
+                if !finished
+                  next_job_fibers << f
+                end
               end
             end
-            root_task.yield # give job tasks a chance to run
-            job_tasks.concat(next_job_tasks)
-            next_job_tasks.clear
+            job_fibers.concat(next_job_fibers)
+            next_job_fibers.clear
 
-            while source_tasks.any? || @source_cache.each_value.any? { |group_sources| group_sources.each_value.any?(&:pending?) }
-              while (task = source_tasks.shift || spawn_source_task(root_task, sources_condition))
-                if task.alive?
-                  next_source_tasks << task
+            Sync do |root_task|
+              while source_tasks.any? || @source_cache.each_value.any? { |group_sources| group_sources.each_value.any?(&:pending?) }
+                while (task = source_tasks.shift || spawn_source_task(root_task, sources_condition))
+                  if task.alive?
+                    root_task.yield # give the source task a chance to run
+                    next_source_tasks << task
+                  end
                 end
+                sources_condition.signal
+                source_tasks.concat(next_source_tasks)
+                next_source_tasks.clear
               end
-              root_task.yield # give source tasks a chance to run
-              sources_condition.signal
-              source_tasks.concat(next_source_tasks)
-              next_source_tasks.clear
             end
-            jobs_condition.signal
           end
         end
+
+        manager.resume
+        if manager.alive?
+          raise "Invariant: Manager didn't terminate successfully: #{manager}"
+        end
+
       rescue UncaughtThrowError => e
         throw e.tag, e.value
       end
 
       private
 
-      def spawn_job_task(parent_task, condition)
-        if @pending_jobs.any?
-          fiber_vars = get_fiber_variables
-          parent_task.async do
-            set_fiber_variables(fiber_vars)
-            Thread.current[:graphql_dataloader_next_tick] = condition
-            while job = @pending_jobs.shift
-              job.call
-            end
-          end
-        end
-      end
-
       def spawn_source_task(parent_task, condition)
         pending_sources = nil
         @source_cache.each_value do |source_by_batch_params|

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

@@ -513,7 +513,7 @@ module GraphQL
             end
           when Array
             # It's an array full of execution errors; add them all.
-            if value.any? && value.all? { |v| v.is_a?(GraphQL::ExecutionError) }
+            if value.any? && value.all?(GraphQL::ExecutionError)
               list_type_at_all = (field && (field.type.list?))
               if selection_result.nil? || !dead_result?(selection_result)
                 value.each_with_index do |error, index|

data/lib/graphql/language/parser.rb

@@ -566,6 +566,15 @@ module GraphQL
         when :NULL
           advance_token
           "null"
+        when :ON
+          advance_token
+          "on"
+        when :DIRECTIVE
+          advance_token
+          "directive"
+        when :EXTEND
+          advance_token
+          "extend"
         else
           expect_token(:NAME)
         end

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc