graphql 2.0.26 → 2.1.0

data/lib/graphql/subscriptions.rb

@@ -125,10 +125,10 @@ module GraphQL
         variables: variables,
         root_value: object,
       }
-      
+
        # merge event's and query's context together
       context.merge!(event.context) unless event.context.nil? || context.nil?
-      
+
       execute_options[:validate] = validate_update?(**execute_options)
       result = @schema.execute(**execute_options)
       subscriptions_context = result.context.namespace(:subscriptions)
@@ -136,11 +136,9 @@ module GraphQL
         result = nil
       end
 
-      unsubscribed = subscriptions_context[:unsubscribed]
-
-      if unsubscribed
+      if subscriptions_context[:unsubscribed] && !subscriptions_context[:final_update]
         # `unsubscribe` was called, clean up on our side
-        # TODO also send `{more: false}` to client?
+        # The transport should also send `{more: false}` to client
         delete_subscription(subscription_id)
         result = nil
       end
@@ -164,7 +162,14 @@ module GraphQL
       res = execute_update(subscription_id, event, object)
       if !res.nil?
         deliver(subscription_id, res)
+
+        if res.context.namespace(:subscriptions)[:unsubscribed]
+          # `unsubscribe` was called, clean up on our side
+          # The transport should also send `{more: false}` to client
+          delete_subscription(subscription_id)
+        end
       end
+
     end
 
     # Event `event` occurred on `object`,

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

@@ -67,9 +67,8 @@ module GraphQL
               type: [edge_type_class, null: edge_nullable],
               null: edges_nullable,
               description: "A list of edges.",
+              scope: false, # Assume that the connection was already scoped.
               connection: false,
-              # Assume that the connection was scoped before this step:
-              scope: false,
             }
 
             if field_options
@@ -170,6 +169,24 @@ module GraphQL
             obj_type.field :page_info, GraphQL::Types::Relay::PageInfo, null: false, description: "Information to aid in pagination."
           end
         end
+
+        def edges
+          # Assume that whatever authorization needed to happen
+          # already happened at the connection level.
+          current_runtime_state = Thread.current[:__graphql_runtime_info]
+          query_runtime_state = current_runtime_state[context.query]
+          query_runtime_state.was_authorized_by_scope_items = @object.was_authorized_by_scope_items?
+          @object.edges
+        end
+
+        def nodes
+          # Assume that whatever authorization needed to happen
+          # already happened at the connection level.
+          current_runtime_state = Thread.current[:__graphql_runtime_info]
+          query_runtime_state = current_runtime_state[context.query]
+          query_runtime_state.was_authorized_by_scope_items = @object.was_authorized_by_scope_items?
+          @object.nodes
+        end
       end
     end
   end

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

@@ -12,6 +12,13 @@ module GraphQL
           child_class.node_nullable(true)
         end
 
+        def node
+          current_runtime_state = Thread.current[:__graphql_runtime_info]
+          query_runtime_state = current_runtime_state[context.query]
+          query_runtime_state.was_authorized_by_scope_items = @object.was_authorized_by_scope_items?
+          @object.node
+        end
+
         module ClassMethods
           def inherited(child_class)
             super

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -103,7 +103,6 @@ require "graphql/schema"
 require "graphql/query"
 require "graphql/types"
 require "graphql/dataloader"
-require "graphql/filter"
 require "graphql/static_validation"
 require "graphql/execution"
 require "graphql/schema/built_in_types"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.1.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -331,7 +331,6 @@ files:
 - lib/graphql/execution/lookahead.rb
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution_error.rb
-- lib/graphql/filter.rb
 - lib/graphql/integer_decoding_error.rb
 - lib/graphql/integer_encoding_error.rb
 - lib/graphql/introspection.rb
@@ -536,7 +535,6 @@ files:
 - lib/graphql/static_validation/rules/variables_are_input_types_error.rb
 - lib/graphql/static_validation/rules/variables_are_used_and_defined.rb
 - lib/graphql/static_validation/rules/variables_are_used_and_defined_error.rb
-- lib/graphql/static_validation/type_stack.rb
 - lib/graphql/static_validation/validation_context.rb
 - lib/graphql/static_validation/validation_timeout_error.rb
 - lib/graphql/static_validation/validator.rb

data/lib/graphql/filter.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-require "graphql/deprecation"
-
-module GraphQL
-  # @api private
-  class Filter
-    def initialize(only: nil, except: nil, silence_deprecation_warning: false)
-      if !silence_deprecation_warning
-        line = caller(2, 10).find { |l| !l.include?("lib/graphql") }
-        GraphQL::Deprecation.warn("GraphQL::Filter, `only:`, `except:`, and `.merge_filters` are deprecated and will be removed in v2.1.0. Implement `visible?` on your schema members instead (https://graphql-ruby.org/authorization/visibility.html).\n  #{line}")
-      end
-      @only = only
-      @except = except
-    end
-
-    # Returns true if `member, ctx` passes this filter
-    def call(member, ctx)
-      (@only ? @only.call(member, ctx) : true) &&
-      (@except ? !@except.call(member, ctx) : true)
-    end
-
-    def merge(only: nil, except: nil)
-      onlies = [self].concat(Array(only))
-      merged_only = MergedOnly.build(onlies)
-      merged_except = MergedExcept.build(Array(except))
-      self.class.new(only: merged_only, except: merged_except, silence_deprecation_warning: true)
-    end
-
-    private
-
-    class MergedOnly
-      def initialize(first, second)
-        @first = first
-        @second = second
-      end
-
-      def call(member, ctx)
-        @first.call(member, ctx) && @second.call(member, ctx)
-      end
-
-      def self.build(onlies)
-        case onlies.size
-        when 0
-          nil
-        when 1
-          onlies[0]
-        else
-          onlies.reduce { |memo, only| self.new(memo, only) }
-        end
-      end
-    end
-
-    class MergedExcept < MergedOnly
-      def call(member, ctx)
-        @first.call(member, ctx) || @second.call(member, ctx)
-      end
-    end
-  end
-end

data/lib/graphql/static_validation/type_stack.rb

@@ -1,216 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  module StaticValidation
-    # - Ride along with `GraphQL::Language::Visitor`
-    # - Track type info, expose it to validators
-    class TypeStack
-      # These are jumping-off points for infering types down the tree
-      TYPE_INFERRENCE_ROOTS = [
-        GraphQL::Language::Nodes::OperationDefinition,
-        GraphQL::Language::Nodes::FragmentDefinition,
-      ]
-
-      # @return [GraphQL::Schema] the schema whose types are present in this document
-      attr_reader :schema
-
-      # When it enters an object (starting with query or mutation root), it's pushed on this stack.
-      # When it exits, it's popped off.
-      # @return [Array<GraphQL::ObjectType, GraphQL::Union, GraphQL::Interface>]
-      attr_reader :object_types
-
-      # When it enters a field, it's pushed on this stack (useful for nested fields, args).
-      # When it exits, it's popped off.
-      # @return [Array<GraphQL::Field>] fields which have been entered
-      attr_reader :field_definitions
-
-      # Directives are pushed on, then popped off while traversing the tree
-      # @return [Array<GraphQL::Node::Directive>] directives which have been entered
-      attr_reader :directive_definitions
-
-      # @return [Array<GraphQL::Node::Argument>] arguments which have been entered
-      attr_reader :argument_definitions
-
-      # @return [Array<String>] fields which have been entered (by their AST name)
-      attr_reader :path
-
-      # @param schema [GraphQL::Schema] the schema whose types to use when climbing this document
-      # @param visitor [GraphQL::Language::Visitor] a visitor to follow & watch the types
-      def initialize(schema, visitor)
-        @schema = schema
-        @object_types = []
-        @field_definitions = []
-        @directive_definitions = []
-        @argument_definitions = []
-        @path = []
-
-        PUSH_STRATEGIES.each do |node_class, strategy|
-          visitor[node_class].enter << EnterWithStrategy.new(self, strategy)
-          visitor[node_class].leave << LeaveWithStrategy.new(self, strategy)
-        end
-      end
-
-      private
-
-
-      module FragmentWithTypeStrategy
-        def push(stack, node)
-          object_type = if node.type
-            stack.schema.get_type(node.type.name)
-          else
-            stack.object_types.last
-          end
-          if !object_type.nil?
-            object_type = object_type.unwrap
-          end
-          stack.object_types.push(object_type)
-          push_path_member(stack, node)
-        end
-
-        def pop(stack, node)
-          stack.object_types.pop
-          stack.path.pop
-        end
-      end
-
-      module FragmentDefinitionStrategy
-        extend FragmentWithTypeStrategy
-        module_function
-        def push_path_member(stack, node)
-          stack.path.push("fragment #{node.name}")
-        end
-      end
-
-      module InlineFragmentStrategy
-        extend FragmentWithTypeStrategy
-        module_function
-        def push_path_member(stack, node)
-          stack.path.push("...#{node.type ? " on #{node.type.to_query_string}" : ""}")
-        end
-      end
-
-      module OperationDefinitionStrategy
-        module_function
-        def push(stack, node)
-          # eg, QueryType, MutationType
-          object_type = stack.schema.root_type_for_operation(node.operation_type)
-          stack.object_types.push(object_type)
-          stack.path.push("#{node.operation_type}#{node.name ? " #{node.name}" : ""}")
-        end
-
-        def pop(stack, node)
-          stack.object_types.pop
-          stack.path.pop
-        end
-      end
-
-      module FieldStrategy
-        module_function
-        def push(stack, node)
-          parent_type = stack.object_types.last
-          parent_type = parent_type.unwrap
-
-          field_definition = stack.schema.get_field(parent_type, node.name)
-          stack.field_definitions.push(field_definition)
-          if !field_definition.nil?
-            next_object_type = field_definition.type
-            stack.object_types.push(next_object_type)
-          else
-            stack.object_types.push(nil)
-          end
-          stack.path.push(node.alias || node.name)
-        end
-
-        def pop(stack, node)
-          stack.field_definitions.pop
-          stack.object_types.pop
-          stack.path.pop
-        end
-      end
-
-      module DirectiveStrategy
-        module_function
-        def push(stack, node)
-          directive_defn = stack.schema.directives[node.name]
-          stack.directive_definitions.push(directive_defn)
-        end
-
-        def pop(stack, node)
-          stack.directive_definitions.pop
-        end
-      end
-
-      module ArgumentStrategy
-        module_function
-        # Push `argument_defn` onto the stack.
-        # It's possible that `argument_defn` will be nil.
-        # Push it anyways so `pop` has something to pop.
-        def push(stack, node)
-          if stack.argument_definitions.last
-            arg_type = stack.argument_definitions.last.type.unwrap
-            if arg_type.kind.input_object?
-              argument_defn = arg_type.arguments[node.name]
-            else
-              argument_defn = nil
-            end
-          elsif stack.directive_definitions.last
-            argument_defn = stack.directive_definitions.last.arguments[node.name]
-          elsif stack.field_definitions.last
-            argument_defn = stack.field_definitions.last.arguments[node.name]
-          else
-            argument_defn = nil
-          end
-          stack.argument_definitions.push(argument_defn)
-          stack.path.push(node.name)
-        end
-
-        def pop(stack, node)
-          stack.argument_definitions.pop
-          stack.path.pop
-        end
-      end
-
-      module FragmentSpreadStrategy
-        module_function
-        def push(stack, node)
-          stack.path.push("... #{node.name}")
-        end
-
-        def pop(stack, node)
-          stack.path.pop
-        end
-      end
-
-      PUSH_STRATEGIES = {
-        GraphQL::Language::Nodes::FragmentDefinition => FragmentDefinitionStrategy,
-        GraphQL::Language::Nodes::InlineFragment => InlineFragmentStrategy,
-        GraphQL::Language::Nodes::FragmentSpread => FragmentSpreadStrategy,
-        GraphQL::Language::Nodes::Argument => ArgumentStrategy,
-        GraphQL::Language::Nodes::Field => FieldStrategy,
-        GraphQL::Language::Nodes::Directive => DirectiveStrategy,
-        GraphQL::Language::Nodes::OperationDefinition => OperationDefinitionStrategy,
-      }
-
-      class EnterWithStrategy
-        def initialize(stack, strategy)
-          @stack = stack
-          @strategy = strategy
-        end
-
-        def call(node, parent)
-          @strategy.push(@stack, node)
-        end
-      end
-
-      class LeaveWithStrategy
-        def initialize(stack, strategy)
-          @stack = stack
-          @strategy = strategy
-        end
-
-        def call(node, parent)
-          @strategy.pop(@stack, node)
-        end
-      end
-    end
-  end
-end