graphql 1.9.21 → 1.10.0.pre1

data/lib/graphql/static_validation/rules/variables_are_used_and_defined.rb

@@ -2,7 +2,7 @@
 module GraphQL
   module StaticValidation
     # The problem is
-    #   - Variable usage must be determined at the OperationDefinition level
+    #   - Variable $usage must be determined at the OperationDefinition level
     #   - You can't tell how fragments use variables until you visit FragmentDefinitions (which may be at the end of the document)
     #
     #  So, this validator includes some crazy logic to follow fragment spreads recursively, while avoiding infinite loops.

data/lib/graphql/subscriptions.rb

@@ -20,7 +20,7 @@ module GraphQL
     def self.use(defn, options = {})
       schema = defn.target
       options[:schema] = schema
-      schema.subscriptions = self.new(**options)
+      schema.subscriptions = self.new(options)
       instrumentation = Subscriptions::Instrumentation.new(schema: schema)
       defn.instrument(:field, instrumentation)
       defn.instrument(:query, instrumentation)
@@ -90,7 +90,7 @@ module GraphQL
       operation_name = query_data.fetch(:operation_name)
       # Re-evaluate the saved query
       result = @schema.execute(
-        **{
+        {
           query: query_string,
           context: context,
           subscription_topic: event.topic,
@@ -124,7 +124,7 @@ module GraphQL
     # @yieldparam subscription_id [String]
     # @return [void]
     def each_subscription_id(event)
-      raise GraphQL::RequiredImplementationMissingError
+      raise NotImplementedError
     end
 
     # The system wants to send an update to this subscription.
@@ -132,7 +132,7 @@ module GraphQL
     # @param subscription_id [String]
     # @return [Hash] Containing required keys
     def read_subscription(subscription_id)
-      raise GraphQL::RequiredImplementationMissingError
+      raise NotImplementedError
     end
 
     # A subscription query was re-evaluated, returning `result`.
@@ -141,7 +141,7 @@ module GraphQL
     # @param result [Hash]
     # @return [void]
     def deliver(subscription_id, result)
-      raise GraphQL::RequiredImplementationMissingError
+      raise NotImplementedError
     end
 
     # `query` was executed and found subscriptions to `events`.
@@ -150,7 +150,7 @@ module GraphQL
     # @param events [Array<GraphQL::Subscriptions::Event>]
     # @return [void]
     def write_subscription(query, events)
-      raise GraphQL::RequiredImplementationMissingError
+      raise NotImplementedError
     end
 
     # A subscription was terminated server-side.
@@ -158,7 +158,7 @@ module GraphQL
     # @param subscription_id [String]
     # @return void.
     def delete_subscription(subscription_id)
-      raise GraphQL::RequiredImplementationMissingError
+      raise NotImplementedError
     end
 
     # @return [String] A new unique identifier for a subscription

data/lib/graphql/subscriptions/action_cable_subscriptions.rb

@@ -26,7 +26,7 @@ module GraphQL
     #       variables = ensure_hash(data["variables"])
     #       operation_name = data["operationName"]
     #       context = {
-    #         # Re-implement whatever context methods you need 
+    #         # Re-implement whatever context methods you need
     #         # in this channel or ApplicationCable::Channel
     #         # current_user: current_user,
     #         # Make sure the channel is in the context
@@ -41,7 +41,7 @@ module GraphQL
     #       })
     #
     #       payload = {
-    #         result: result.subscription? ? { data: nil } : result.to_h,
+    #         result: result.to_h,
     #         more: result.subscription?,
     #       }
     #

data/lib/graphql/subscriptions/event.rb

@@ -37,7 +37,7 @@ module GraphQL
           arguments
         when Hash
           if field.is_a?(GraphQL::Schema::Field)
-            stringify_args(field, arguments)
+            stringify_args(arguments)
           else
             GraphQL::Query::LiteralInput.from_arguments(
               arguments,
@@ -55,35 +55,21 @@ module GraphQL
 
       class << self
         private
-        def stringify_args(arg_owner, args)
+        def stringify_args(args)
           case args
           when Hash
             next_args = {}
             args.each do |k, v|
-              arg_name = k.to_s
-              camelized_arg_name = GraphQL::Schema::Member::BuildType.camelize(arg_name)
-              arg_defn = get_arg_definition(arg_owner, camelized_arg_name)
-
-              if arg_defn
-                normalized_arg_name = camelized_arg_name
-              else
-                normalized_arg_name = arg_name
-                arg_defn = get_arg_definition(arg_owner, normalized_arg_name)
-              end
-
-              next_args[normalized_arg_name] = stringify_args(arg_defn[1].type, v)
+              str_k = GraphQL::Schema::Member::BuildType.camelize(k.to_s)
+              next_args[str_k] = stringify_args(v)
             end
             next_args
           when Array
-            args.map { |a| stringify_args(arg_owner, a) }
+            args.map { |a| stringify_args(a) }
           else
             args
           end
         end
-
-        def get_arg_definition(arg_owner, arg_name)
-          arg_owner.arguments.find { |k, v| k == arg_name || v.keyword.to_s == arg_name }
-        end
       end
     end
   end

data/lib/graphql/subscriptions/instrumentation.rb

@@ -44,7 +44,10 @@ module GraphQL
 
         # Wrap the proc with subscription registration logic
         def call(obj, args, ctx)
-          @inner_proc.call(obj, args, ctx) if @inner_proc && !@inner_proc.is_a?(GraphQL::Field::Resolve::BuiltInResolve)
+          result = nil
+          if @inner_proc && !@inner_proc.is_a?(GraphQL::Field::Resolve::BuiltInResolve)
+            result = @inner_proc.call(obj, args, ctx)
+          end
 
           events = ctx.namespace(:subscriptions)[:events]
 
@@ -56,10 +59,12 @@ module GraphQL
               arguments: args,
               context: ctx,
             )
-            ctx.skip
+            result
           elsif ctx.irep_node.subscription_topic == ctx.query.subscription_topic
-            # The root object is _already_ the subscription update:
-            if obj.is_a?(GraphQL::Schema::Object)
+            if !result.nil?
+              result
+            elsif obj.is_a?(GraphQL::Schema::Object)
+              # The root object is _already_ the subscription update:
               obj.object
             else
               obj

data/lib/graphql/subscriptions/subscription_root.rb

@@ -40,7 +40,7 @@ module GraphQL
             # for the backend to register:
             events << Subscriptions::Event.new(
               name: field.name,
-              arguments: arguments_without_field_extras(arguments: arguments),
+              arguments: arguments,
               context: context,
               field: field,
             )
@@ -48,7 +48,7 @@ module GraphQL
             value
           elsif context.query.subscription_topic == Subscriptions::Event.serialize(
               field.name,
-              arguments_without_field_extras(arguments: arguments),
+              arguments,
               field,
               scope: (field.subscription_scope ? context[field.subscription_scope] : nil),
             )
@@ -60,14 +60,6 @@ module GraphQL
             context.skip
           end
         end
-
-        private
-
-        def arguments_without_field_extras(arguments:)
-          arguments.dup.tap do |event_args|
-            field.extras.each { |k| event_args.delete(k) }
-          end
-        end
       end
     end
   end

data/lib/graphql/tracing/skylight_tracing.rb

@@ -18,7 +18,6 @@ module GraphQL
       #   This is not advised if you run more than one query per HTTP request, for example, with `graphql-client` or multiplexing.
       #   It can also be specified per-query with `context[:set_skylight_endpoint_name]`.
       def initialize(options = {})
-        warn("GraphQL::Tracing::SkylightTracing is deprecated, please enable Skylight's GraphQL probe instead: https://www.skylight.io/support/getting-more-from-skylight#graphql.")
         @set_endpoint_name = options.fetch(:set_endpoint_name, false)
         super
       end

data/lib/graphql/types/int.rb

@@ -10,7 +10,7 @@ module GraphQL
       MAX = (2**31) - 1
 
       def self.coerce_input(value, _ctx)
-        value.is_a?(Numeric) ? value.to_i : nil
+        value.is_a?(Integer) ? value : nil
       end
 
       def self.coerce_result(value, ctx)

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

@@ -106,7 +106,9 @@ module GraphQL
         end
 
         def edges
-          if context.interpreter?
+          if @object.is_a?(GraphQL::Pagination::Connection)
+            @object.edges
+          elsif context.interpreter?
             context.schema.after_lazy(object.edge_nodes) do |nodes|
               nodes.map { |n| self.class.edge_class.new(n, object) }
             end

data/lib/graphql/union_type.rb

@@ -24,34 +24,22 @@ module GraphQL
   #  }
   #
   class UnionType < GraphQL::BaseType
-    # Rubocop was unhappy about the syntax when this was a proc literal
-    class AcceptPossibleTypesDefinition
-      def self.call(target, possible_types, options = {})
-        target.add_possible_types(possible_types, **options)
-      end
-    end
-
-    accepts_definitions :resolve_type, :type_membership_class,
-      possible_types: AcceptPossibleTypesDefinition
-    ensure_defined :possible_types, :resolve_type, :resolve_type_proc, :type_membership_class
+    accepts_definitions :possible_types, :resolve_type
+    ensure_defined :possible_types, :resolve_type, :resolve_type_proc
 
     attr_accessor :resolve_type_proc
-    attr_reader :type_memberships
-    attr_accessor :type_membership_class
 
     def initialize
       super
-      @type_membership_class = GraphQL::Schema::TypeMembership
-      @type_memberships = []
-      @cached_possible_types = nil
+      @dirty_possible_types = []
+      @clean_possible_types = nil
       @resolve_type_proc = nil
     end
 
     def initialize_copy(other)
       super
-      @type_membership_class = other.type_membership_class
-      @type_memberships = other.type_memberships.dup
-      @cached_possible_types = nil
+      @clean_possible_types = nil
+      @dirty_possible_types = other.dirty_possible_types.dup
     end
 
     def kind
@@ -59,35 +47,24 @@ module GraphQL
     end
 
     # @return [Boolean] True if `child_type_defn` is a member of this {UnionType}
-    def include?(child_type_defn, ctx = GraphQL::Query::NullContext)
-      possible_types(ctx).include?(child_type_defn)
-    end
-
-    # @return [Array<GraphQL::ObjectType>] Types which may be found in this union
-    def possible_types(ctx = GraphQL::Query::NullContext)
-      if ctx == GraphQL::Query::NullContext
-        # Only cache the default case; if we cached for every `ctx`, it would be a memory leak
-        # (The warden should cache calls to this method, so it's called only once per query,
-        # unless user code calls it directly.)
-        @cached_possible_types ||= possible_types_for_context(ctx)
-      else
-        possible_types_for_context(ctx)
-      end
+    def include?(child_type_defn)
+      possible_types.include?(child_type_defn)
     end
 
-    def possible_types=(types)
-      # This is a re-assignment, so clear the previous values
-      @type_memberships = []
-      @cached_possible_types = nil
-      add_possible_types(types, **{})
+    def possible_types=(new_possible_types)
+      @clean_possible_types = nil
+      @dirty_possible_types = new_possible_types
     end
 
-    def add_possible_types(types, **options)
-      @type_memberships ||= []
-      Array(types).each { |t|
-        @type_memberships << self.type_membership_class.new(self, t, **options)
-      }
-      nil
+    # @return [Array<GraphQL::ObjectType>] Types which may be found in this union
+    def possible_types
+      @clean_possible_types ||= begin
+        if @dirty_possible_types.respond_to?(:map)
+          @dirty_possible_types.map { |type| GraphQL::BaseType.resolve_related_type(type) }
+        else
+          @dirty_possible_types
+        end
+      end
     end
 
     # Get a possible type of this {UnionType} by type name
@@ -96,7 +73,7 @@ module GraphQL
     # @return [GraphQL::ObjectType, nil] The type named `type_name` if it exists and is a member of this {UnionType}, (else `nil`)
     def get_possible_type(type_name, ctx)
       type = ctx.query.get_type(type_name)
-      type if type && ctx.query.schema.possible_types(self, ctx).include?(type)
+      type if type && ctx.query.warden.possible_types(self).include?(type)
     end
 
     # Check if a type is a possible type of this {UnionType}
@@ -116,20 +93,8 @@ module GraphQL
       @resolve_type_proc = new_resolve_type_proc
     end
 
-    def type_memberships=(type_memberships)
-      @type_memberships = type_memberships
-    end
-
-    private
+    protected
 
-    def possible_types_for_context(ctx)
-      visible_types = []
-      @type_memberships.each do |type_membership|
-        if type_membership.visible?(ctx)
-          visible_types << BaseType.resolve_related_type(type_membership.object_type)
-        end
-      end
-      visible_types
-    end
+    attr_reader :dirty_possible_types
   end
 end

data/lib/graphql/upgrader/member.rb

@@ -13,7 +13,7 @@ module GraphQL
       # @param input_text [String] Untransformed GraphQL-Ruby code
       # @return [String] The input text, with a transformation applied if necessary
       def apply(input_text)
-        raise GraphQL::RequiredImplementationMissingError, "Return transformed text here"
+        raise NotImplementedError, "Return transformed text here"
       end
 
       # Recursively transform a `.define`-DSL-based type expression into a class-ready expression, for example:

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.9.21"
+  VERSION = "1.10.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.9.21
+  version: 1.10.0.pre1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -182,30 +182,30 @@ dependencies:
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.15
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -340,7 +340,6 @@ files:
 - lib/generators/graphql/templates/base_field.erb
 - lib/generators/graphql/templates/base_input_object.erb
 - lib/generators/graphql/templates/base_interface.erb
-- lib/generators/graphql/templates/base_mutation.erb
 - lib/generators/graphql/templates/base_object.erb
 - lib/generators/graphql/templates/base_scalar.erb
 - lib/generators/graphql/templates/base_union.erb
@@ -484,6 +483,14 @@ files:
 - lib/graphql/name_validator.rb
 - lib/graphql/non_null_type.rb
 - lib/graphql/object_type.rb
+- lib/graphql/pagination.rb
+- lib/graphql/pagination/active_record_relation_connection.rb
+- lib/graphql/pagination/array_connection.rb
+- lib/graphql/pagination/connection.rb
+- lib/graphql/pagination/connections.rb
+- lib/graphql/pagination/mongoid_relation_connection.rb
+- lib/graphql/pagination/relation_connection.rb
+- lib/graphql/pagination/sequel_dataset_connection.rb
 - lib/graphql/parse_error.rb
 - lib/graphql/query.rb
 - lib/graphql/query/arguments.rb
@@ -565,6 +572,7 @@ files:
 - lib/graphql/schema/member/cached_graphql_definition.rb
 - lib/graphql/schema/member/graphql_type_names.rb
 - lib/graphql/schema/member/has_arguments.rb
+- lib/graphql/schema/member/has_ast_node.rb
 - lib/graphql/schema/member/has_fields.rb
 - lib/graphql/schema/member/has_path.rb
 - lib/graphql/schema/member/instrumentation.rb
@@ -588,7 +596,6 @@ files:
 - lib/graphql/schema/timeout_middleware.rb
 - lib/graphql/schema/traversal.rb
 - lib/graphql/schema/type_expression.rb
-- lib/graphql/schema/type_membership.rb
 - lib/graphql/schema/union.rb
 - lib/graphql/schema/unique_within_type.rb
 - lib/graphql/schema/validation.rb
@@ -727,11 +734,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby