graphql 2.0.6 → 2.0.9

data/lib/graphql/tracing/platform_tracing.rb

@@ -10,6 +10,10 @@ module GraphQL
     class PlatformTracing
       class << self
         attr_accessor :platform_keys
+
+        def inherited(child_class)
+          child_class.platform_keys = self.platform_keys
+        end
       end
 
       def initialize(options = {})
@@ -41,7 +45,7 @@ module GraphQL
 
             platform_key = if trace_field
               context = data.fetch(:query).context
-              cached_platform_key(context, field) { platform_field_key(data[:owner], field) }
+              cached_platform_key(context, field, :field) { platform_field_key(data[:owner], field) }
             else
               nil
             end
@@ -57,14 +61,14 @@ module GraphQL
         when "authorized", "authorized_lazy"
           type = data.fetch(:type)
           context = data.fetch(:context)
-          platform_key = cached_platform_key(context, type) { platform_authorized_key(type) }
+          platform_key = cached_platform_key(context, type, :authorized) { platform_authorized_key(type) }
           platform_trace(platform_key, key, data) do
             yield
           end
         when "resolve_type", "resolve_type_lazy"
           type = data.fetch(:type)
           context = data.fetch(:context)
-          platform_key = cached_platform_key(context, type) { platform_resolve_type_key(type) }
+          platform_key = cached_platform_key(context, type, :resolve_type) { platform_resolve_type_key(type) }
           platform_trace(platform_key, key, data) do
             yield
           end
@@ -112,7 +116,7 @@ module GraphQL
       # If the key isn't present, the given block is called and the result is cached for `key`.
       #
       # @return [String]
-      def cached_platform_key(ctx, key)
+      def cached_platform_key(ctx, key, trace_phase)
         cache = ctx.namespace(self.class)[:platform_key_cache] ||= {}
         cache.fetch(key) { cache[key] = yield }
       end

data/lib/graphql/tracing.rb

@@ -8,6 +8,7 @@ require "graphql/tracing/new_relic_tracing"
 require "graphql/tracing/scout_tracing"
 require "graphql/tracing/statsd_tracing"
 require "graphql/tracing/prometheus_tracing"
+require "graphql/tracing/opentelemetry_tracing"
 
 if defined?(PrometheusExporter::Server)
   require "graphql/tracing/prometheus_tracing/graphql_collector"

data/lib/graphql/types/iso_8601_date_time.rb

@@ -60,6 +60,9 @@ module GraphQL
           # But without this, it would zero out given any time part of `str_value` (hours and/or minutes)
           if dt.iso8601.start_with?(str_value)
             dt
+          elsif str_value.length == 8 && str_value.match?(/\A\d{8}\Z/)
+            # Allow dates that are missing the "-". eg. "20220404"
+            dt
           else
             nil
           end

data/lib/graphql/types/relay/base_connection.rb

@@ -10,6 +10,8 @@ module GraphQL
       # so you can extend your own `BaseObject` instead of `GraphQL::Schema::Object`.
       #
       # @example Implementation a connection and edge
+      #   class BaseObject < GraphQL::Schema::Object; end
+      #
       #   # Given some object in your app ...
       #   class Types::Post < BaseObject
       #   end
@@ -20,14 +22,22 @@ module GraphQL
       #
       #   # Then extend them for the object in your app
       #   class Types::PostEdge < Types::BaseEdge
-      #     node_type(Types::Post)
+      #     node_type Types::Post
       #   end
+      #
       #   class Types::PostConnection < Types::BaseConnection
-      #     edge_type(Types::PostEdge)
-      #     edges_nullable(true)
-      #     edge_nullable(true)
-      #     node_nullable(true)
-      #     has_nodes_field(true)
+      #     edge_type Types::PostEdge,
+      #               edges_nullable: true,
+      #               edge_nullable: true,
+      #               node_nullable: true,
+      #               nodes_field: true
+      #
+      #     # Alternatively, you can call the class methods followed by your edge type
+      #     # edges_nullable true
+      #     # edge_nullable true
+      #     # nodes_nullable true
+      #     # has_nodes_field true
+      #     # edge_type Types::PostEdge
       #   end
       #
       # @see Relay::BaseEdge for edge types

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.9
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -314,7 +314,6 @@ files:
 - lib/graphql/execution/interpreter/runtime.rb
 - lib/graphql/execution/lazy.rb
 - lib/graphql/execution/lazy/lazy_method_map.rb
-- lib/graphql/execution/lazy/resolve.rb
 - lib/graphql/execution/lookahead.rb
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution_error.rb
@@ -539,6 +538,7 @@ files:
 - lib/graphql/tracing/data_dog_tracing.rb
 - lib/graphql/tracing/new_relic_tracing.rb
 - lib/graphql/tracing/notifications_tracing.rb
+- lib/graphql/tracing/opentelemetry_tracing.rb
 - lib/graphql/tracing/platform_tracing.rb
 - lib/graphql/tracing/prometheus_tracing.rb
 - lib/graphql/tracing/prometheus_tracing/graphql_collector.rb

data/lib/graphql/execution/lazy/resolve.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  module Execution
-    class Lazy
-      # Helpers for dealing with data structures containing {Lazy} instances
-      # @api private
-      module Resolve
-        # Mutate `value`, replacing {Lazy} instances in place with their resolved values
-        # @return [void]
-
-        # This object can be passed like an array, but it doesn't allocate an
-        # array until it's used.
-        #
-        # There's one crucial difference: you have to _capture_ the result
-        # of `#<<`. (This _works_ with arrays but isn't required, since it has a side-effect.)
-        # @api private
-        module NullAccumulator
-          def self.<<(item)
-            [item]
-          end
-
-          def self.empty?
-            true
-          end
-        end
-
-        def self.resolve(value)
-          lazies = resolve_in_place(value)
-          deep_sync(lazies)
-        end
-
-        def self.resolve_in_place(value)
-          acc = each_lazy(NullAccumulator, value)
-
-          if acc.empty?
-            Lazy::NullResult
-          else
-            Lazy.new {
-              acc.each_with_index { |ctx, idx|
-                acc[idx] = ctx.value.value
-              }
-              resolve_in_place(acc)
-            }
-          end
-        end
-
-        # If `value` is a collection,
-        # add any {Lazy} instances in the collection
-        # to `acc`
-        # @return [void]
-        def self.each_lazy(acc, value)
-          case value
-          when Hash
-            value.each do |key, field_result|
-              acc = each_lazy(acc, field_result)
-            end
-          when Array
-            value.each do |field_result|
-              acc = each_lazy(acc, field_result)
-            end
-          when Query::Context::SharedMethods
-            field_value = value.value
-            case field_value
-            when Lazy
-              acc = acc << value
-            when Enumerable # shortcut for Hash & Array
-              acc = each_lazy(acc, field_value)
-            end
-          end
-
-          acc
-        end
-
-        # Traverse `val`, triggering resolution for each {Lazy}.
-        # These {Lazy}s are expected to mutate their owner data structures
-        # during resolution! (They're created with the `.then` calls in `resolve_in_place`).
-        # @return [void]
-        def self.deep_sync(val)
-          case val
-          when Lazy
-            deep_sync(val.value)
-          when Array
-            val.each { |v| deep_sync(v.value) }
-          when Hash
-            val.each { |k, v| deep_sync(v.value) }
-          end
-        end
-      end
-    end
-  end
-end