graphql 1.12.12 → 2.2.14

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

@@ -9,16 +9,34 @@ module GraphQL
 
         def self.included(child_class)
           child_class.extend(ClassMethods)
-          child_class.extend(Relay::DefaultRelay)
-          child_class.default_relay(true)
           child_class.has_nodes_field(true)
           child_class.node_nullable(true)
           child_class.edges_nullable(true)
           child_class.edge_nullable(true)
+          child_class.module_eval {
+            self.edge_type = nil
+            self.node_type = nil
+            self.edge_class = nil
+          }
           add_page_info_field(child_class)
         end
 
         module ClassMethods
+          def inherited(child_class)
+            super
+            child_class.has_nodes_field(has_nodes_field)
+            child_class.node_nullable(node_nullable)
+            child_class.edges_nullable(edges_nullable)
+            child_class.edge_nullable(edge_nullable)
+            child_class.edge_type = nil
+            child_class.node_type = nil
+            child_class.edge_class = nil
+          end
+
+          def default_relay?
+            true
+          end
+
           # @return [Class]
           attr_reader :node_type
 
@@ -35,7 +53,8 @@ module GraphQL
           # It's called when you subclass this base connection, trying to use the
           # class name to set defaults. You can call it again in the class definition
           # to override the default (or provide a value, if the default lookup failed).
-          def edge_type(edge_type_class, edge_class: GraphQL::Relay::Edge, node_type: edge_type_class.node_type, nodes_field: self.has_nodes_field, node_nullable: self.node_nullable, edges_nullable: self.edges_nullable, edge_nullable: self.edge_nullable)
+          # @param field_options [Hash] Any extra keyword arguments to pass to the `field :edges, ...` and `field :nodes, ...` configurations
+          def edge_type(edge_type_class, edge_class: GraphQL::Pagination::Connection::Edge, node_type: edge_type_class.node_type, nodes_field: self.has_nodes_field, node_nullable: self.node_nullable, edges_nullable: self.edges_nullable, edge_nullable: self.edge_nullable, field_options: nil)
             # Set this connection's graphql name
             node_type_name = node_type.graphql_name
 
@@ -43,13 +62,22 @@ module GraphQL
             @edge_type = edge_type_class
             @edge_class = edge_class
 
-            field :edges, [edge_type_class, null: edge_nullable],
+            base_field_options = {
+              name: :edges,
+              type: [edge_type_class, null: edge_nullable],
               null: edges_nullable,
               description: "A list of edges.",
-              legacy_edge_class: edge_class, # This is used by the old runtime only, for EdgesInstrumentation
-              connection: false
+              scope: false, # Assume that the connection was already scoped.
+              connection: false,
+            }
+
+            if field_options
+              base_field_options.merge!(field_options)
+            end
 
-            define_nodes_field(node_nullable) if nodes_field
+            field(**base_field_options)
+
+            define_nodes_field(node_nullable, field_options: field_options) if nodes_field
 
             description("The connection type for #{node_type_name}.")
           end
@@ -59,21 +87,31 @@ module GraphQL
             node_type.scope_items(items, context)
           end
 
+          # The connection will skip auth on its nodes if the node_type is configured for that
+          def reauthorize_scoped_objects(new_value = nil)
+            if new_value.nil?
+              if @reauthorize_scoped_objects != nil
+                @reauthorize_scoped_objects
+              else
+                node_type.reauthorize_scoped_objects
+              end
+            else
+              @reauthorize_scoped_objects = new_value
+            end
+          end
+
           # Add the shortcut `nodes` field to this connection and its subclasses
-          def nodes_field(node_nullable: self.node_nullable)
-            define_nodes_field(node_nullable)
+          def nodes_field(node_nullable: self.node_nullable, field_options: nil)
+            define_nodes_field(node_nullable, field_options: field_options)
           end
 
           def authorized?(obj, ctx)
             true # Let nodes be filtered out
           end
 
-          def accessible?(ctx)
-            node_type.accessible?(ctx)
-          end
-
           def visible?(ctx)
-            node_type.visible?(ctx)
+            # if this is an abstract base class, there may be no `node_type`
+            node_type ? node_type.visible?(ctx) : super
           end
 
           # Set the default `node_nullable` for this class and its child classes. (Defaults to `true`.)
@@ -116,13 +154,26 @@ module GraphQL
             end
           end
 
+          protected
+
+          attr_writer :edge_type, :node_type,  :edge_class
+
           private
 
-          def define_nodes_field(nullable)
-            field :nodes, [@node_type, null: nullable],
+          def define_nodes_field(nullable, field_options: nil)
+            base_field_options = {
+              name: :nodes,
+              type: [@node_type, null: nullable],
               null: nullable,
               description: "A list of nodes.",
-              connection: false
+              connection: false,
+              # Assume that the connection was scoped before this step:
+              scope: false,
+            }
+            if field_options
+              base_field_options.merge!(field_options)
+            end
+            field(**base_field_options)
           end
         end
 
@@ -132,23 +183,22 @@ module GraphQL
           end
         end
 
-        # By default this calls through to the ConnectionWrapper's edge nodes method,
-        # but sometimes you need to override it to support the `nodes` field
-        def nodes
-          @object.edge_nodes
+        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 edges
-          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
-          else
-            # This is done by edges_instrumentation
-            @object.edge_nodes
-          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

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

@@ -8,19 +8,48 @@ module GraphQL
           child_class.description("An edge in a connection.")
           child_class.field(:cursor, String, null: false, description: "A cursor for use in pagination.")
           child_class.extend(ClassMethods)
+          child_class.class_eval { self.node_type = nil }
           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
+            child_class.node_type = nil
+            child_class.node_nullable = nil
+          end
+
+          def default_relay?
+            true
+          end
+
           # Get or set the Object type that this edge wraps.
           #
           # @param node_type [Class] A `Schema::Object` subclass
           # @param null [Boolean]
-          def node_type(node_type = nil, null: self.node_nullable)
+          # @param field_options [Hash] Any extra arguments to pass to the `field :node` configuration
+          def node_type(node_type = nil, null: self.node_nullable, field_options: nil)
             if node_type
               @node_type = node_type
               # Add a default `node` field
-              field :node, node_type, null: null, description: "The item at the end of the edge.", connection: false
+              base_field_options = {
+                name: :node,
+                type: node_type,
+                null: null,
+                description: "The item at the end of the edge.",
+                connection: false,
+              }
+              if field_options
+                base_field_options.merge!(field_options)
+              end
+              field(**base_field_options)
             end
             @node_type
           end
@@ -29,10 +58,6 @@ module GraphQL
             true
           end
 
-          def accessible?(ctx)
-            node_type.accessible?(ctx)
-          end
-
           def visible?(ctx)
             node_type.visible?(ctx)
           end
@@ -41,11 +66,15 @@ module GraphQL
           # Use `node_nullable(false)` in your base class to make non-null `node` field.
           def node_nullable(new_value = nil)
             if new_value.nil?
-              defined?(@node_nullable) ? @node_nullable : superclass.node_nullable
+              @node_nullable != nil ? @node_nullable : superclass.node_nullable
             else
               @node_nullable = new_value
             end
           end
+
+          protected
+
+          attr_writer :node_type, :node_nullable
         end
       end
     end

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

@@ -3,6 +3,7 @@
 module GraphQL
   module Types
     module Relay
+      # Include this module to your root Query type to get a Relay-compliant `node(id: ID!): Node` field that uses the schema's `object_from_id` hook.
       module HasNodeField
         def self.included(child_class)
           child_class.field(**field_options, &field_block)
@@ -12,7 +13,6 @@ module GraphQL
           def field_options
             {
               name: "node",
-              owner: nil,
               type: GraphQL::Types::Relay::Node,
               null: true,
               description: "Fetches an object given its ID.",
@@ -22,7 +22,7 @@ module GraphQL
 
           def field_block
             Proc.new {
-              argument :id, "ID!", required: true,
+              argument :id, "ID!",
                 description: "ID of the object."
 
               def resolve(obj, args, ctx)

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

@@ -3,6 +3,7 @@
 module GraphQL
   module Types
     module Relay
+      # Include this module to your root Query type to get a Relay-style `nodes(id: ID!): [Node]` field that uses the schema's `object_from_id` hook.
       module HasNodesField
         def self.included(child_class)
           child_class.field(**field_options, &field_block)
@@ -12,7 +13,6 @@ module GraphQL
           def field_options
             {
               name: "nodes",
-              owner: nil,
               type: [GraphQL::Types::Relay::Node, null: true],
               null: false,
               description: "Fetches a list of objects given a list of IDs.",
@@ -22,7 +22,7 @@ module GraphQL
 
           def field_block
             Proc.new {
-              argument :ids, "[ID!]!", required: true,
+              argument :ids, "[ID!]!",
                 description: "IDs of the objects."
 
               def resolve(obj, args, ctx)

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

@@ -5,9 +5,19 @@ module GraphQL
     module Relay
       module NodeBehaviors
         def self.included(child_module)
-          child_module.extend(DefaultRelay)
+          child_module.extend(ClassMethods)
           child_module.description("An object with an ID.")
-          child_module.field(:id, ID, null: false, description: "ID of the object.")
+          child_module.field(:id, ID, null: false, description: "ID of the object.", resolver_method: :default_global_id)
+        end
+
+        def default_global_id
+          context.schema.id_from_object(object, self.class, context)
+        end
+
+        module ClassMethods
+          def default_relay?
+            true
+          end
         end
       end
     end

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

@@ -4,8 +4,7 @@ module GraphQL
     module Relay
       module PageInfoBehaviors
         def self.included(child_class)
-          child_class.extend GraphQL::Types::Relay::DefaultRelay
-
+          child_class.extend ClassMethods
           child_class.description "Information about pagination in a connection."
           child_class.field :has_next_page, Boolean, null: false,
             description: "When paginating forwards, are there more items?"
@@ -20,6 +19,12 @@ module GraphQL
             description: "When paginating forwards, the cursor to continue."
         end
       end
+
+      module ClassMethods
+        def default_relay?
+          true
+        end
+      end
     end
   end
 end

data/lib/graphql/types/relay.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 # behavior modules:
-require "graphql/types/relay/default_relay"
 require "graphql/types/relay/connection_behaviors"
 require "graphql/types/relay/edge_behaviors"
 require "graphql/types/relay/node_behaviors"
@@ -14,8 +13,6 @@ require "graphql/types/relay/page_info"
 require "graphql/types/relay/base_connection"
 require "graphql/types/relay/base_edge"
 require "graphql/types/relay/node"
-require "graphql/types/relay/node_field"
-require "graphql/types/relay/nodes_field"
 
 module GraphQL
   module Types

data/lib/graphql/types/string.rb

@@ -7,7 +7,7 @@ module GraphQL
 
       def self.coerce_result(value, ctx)
         str = value.to_s
-        if str.encoding == Encoding::UTF_8
+        if str.encoding == Encoding::UTF_8 || str.ascii_only?
           str
         elsif str.frozen?
           str.encode(Encoding::UTF_8)
@@ -15,7 +15,7 @@ module GraphQL
           str.encode!(Encoding::UTF_8)
         end
       rescue EncodingError
-        err = GraphQL::StringEncodingError.new(str)
+        err = GraphQL::StringEncodingError.new(str, context: ctx)
         ctx.schema.type_error(err, ctx)
       end
 

data/lib/graphql/types.rb

@@ -6,6 +6,7 @@ require "graphql/types/id"
 require "graphql/types/int"
 require "graphql/types/iso_8601_date"
 require "graphql/types/iso_8601_date_time"
+require "graphql/types/iso_8601_duration"
 require "graphql/types/json"
 require "graphql/types/string"
 require "graphql/types/relay"

data/lib/graphql/unauthorized_error.rb

@@ -12,7 +12,7 @@ module GraphQL
     attr_reader :type
 
     # @return [GraphQL::Query::Context] the context for the current query
-    attr_reader :context
+    attr_accessor :context
 
     def initialize(message = nil, object: nil, type: nil, context: nil)
       if message.nil? && object.nil? && type.nil?

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -17,6 +17,17 @@ module GraphQL
   class Error < StandardError
   end
 
+  # This error is raised when GraphQL-Ruby encounters a situation
+  # that it *thought* would never happen. Please report this bug!
+  class InvariantError < Error
+    def initialize(message)
+      message += "
+
+This is probably a bug in GraphQL-Ruby, please report this error on GitHub: https://github.com/rmosolgo/graphql-ruby/issues/new?template=bug_report.md"
+      super(message)
+    end
+  end
+
   class RequiredImplementationMissingError < Error
   end
 
@@ -31,8 +42,8 @@ module GraphQL
   # Turn a query string or schema definition into an AST
   # @param graphql_string [String] a GraphQL query string or schema definition
   # @return [GraphQL::Language::Nodes::Document]
-  def self.parse(graphql_string, tracer: GraphQL::Tracing::NullTracer)
-    parse_with_racc(graphql_string, tracer: tracer)
+  def self.parse(graphql_string, trace: GraphQL::Tracing::NullTrace, filename: nil)
+    default_parser.parse(graphql_string, trace: trace, filename: filename)
   end
 
   # Read the contents of `filename` and parse them as GraphQL
@@ -40,41 +51,28 @@ module GraphQL
   # @return [GraphQL::Language::Nodes::Document]
   def self.parse_file(filename)
     content = File.read(filename)
-    parse_with_racc(content, filename: filename)
-  end
-
-  def self.parse_with_racc(string, filename: nil, tracer: GraphQL::Tracing::NullTracer)
-    GraphQL::Language::Parser.parse(string, filename: filename, tracer: tracer)
+    default_parser.parse(content, filename: filename)
   end
 
-  # @return [Array<GraphQL::Language::Token>]
+  # @return [Array<Array>]
   def self.scan(graphql_string)
-    scan_with_ragel(graphql_string)
+    default_parser.scan(graphql_string)
   end
 
-  def self.scan_with_ragel(graphql_string)
-    GraphQL::Language::Lexer.tokenize(graphql_string)
+  def self.parse_with_racc(string, filename: nil, trace: GraphQL::Tracing::NullTrace)
+    warn "`GraphQL.parse_with_racc` is deprecated; GraphQL-Ruby no longer uses racc for parsing. Call `GraphQL.parse` or `GraphQL::Language::Parser.parse` instead."
+    GraphQL::Language::Parser.parse(string, filename: filename, trace: trace)
   end
 
-  # Support Ruby 2.2 by implementing `-"str"`. If we drop 2.2 support, we can remove this backport.
-  module StringDedupBackport
-    refine String do
-      def -@
-        if frozen?
-          self
-        else
-          self.dup.freeze
-        end
-      end
-    end
+  def self.scan_with_ruby(graphql_string)
+    GraphQL::Language::Lexer.tokenize(graphql_string)
   end
 
-  module StringMatchBackport
-    refine String do
-      def match?(pattern)
-        self =~ pattern
-      end
-    end
+  NOT_CONFIGURED = Object.new
+  private_constant :NOT_CONFIGURED
+  module EmptyObjects
+    EMPTY_HASH = {}.freeze
+    EMPTY_ARRAY = [].freeze
   end
 end
 
@@ -90,26 +88,10 @@ require "graphql/invalid_name_error"
 require "graphql/integer_decoding_error"
 require "graphql/integer_encoding_error"
 require "graphql/string_encoding_error"
-
-require "graphql/define"
-require "graphql/base_type"
-require "graphql/object_type"
-require "graphql/enum_type"
-require "graphql/input_object_type"
-require "graphql/interface_type"
-require "graphql/list_type"
-require "graphql/non_null_type"
-require "graphql/union_type"
-
-require "graphql/argument"
-require "graphql/field"
+require "graphql/date_encoding_error"
+require "graphql/duration_encoding_error"
 require "graphql/type_kinds"
-
-require "graphql/backwards_compatibility"
-require "graphql/scalar_type"
-
 require "graphql/name_validator"
-
 require "graphql/language"
 
 require_relative "./graphql/railtie" if defined? Rails::Railtie
@@ -121,66 +103,22 @@ require "graphql/execution"
 require "graphql/pagination"
 require "graphql/schema"
 require "graphql/query"
-require "graphql/directive"
-require "graphql/execution"
+require "graphql/dataloader"
 require "graphql/types"
-require "graphql/relay"
-require "graphql/boolean_type"
-require "graphql/float_type"
-require "graphql/id_type"
-require "graphql/int_type"
-require "graphql/string_type"
+require "graphql/static_validation"
+require "graphql/execution"
 require "graphql/schema/built_in_types"
 require "graphql/schema/loader"
 require "graphql/schema/printer"
-require "graphql/filter"
-require "graphql/internal_representation"
-require "graphql/static_validation"
-require "graphql/dataloader"
 require "graphql/introspection"
+require "graphql/relay"
 
 require "graphql/version"
-require "graphql/compatibility"
-require "graphql/function"
 require "graphql/subscriptions"
 require "graphql/parse_error"
 require "graphql/backtrace"
 
-require "graphql/deprecated_dsl"
-require "graphql/authorization"
 require "graphql/unauthorized_error"
 require "graphql/unauthorized_field_error"
 require "graphql/load_application_object_failed_error"
-require "graphql/deprecation"
-
-module GraphQL
-  # Ruby has `deprecate_constant`,
-  # but I don't see a way to give a nice error message in that case,
-  # so I'm doing this instead.
-  DEPRECATED_INT_TYPE = INT_TYPE
-  DEPRECATED_FLOAT_TYPE = FLOAT_TYPE
-  DEPRECATED_STRING_TYPE = STRING_TYPE
-  DEPRECATED_BOOLEAN_TYPE = BOOLEAN_TYPE
-  DEPRECATED_ID_TYPE = ID_TYPE
-
-  remove_const :INT_TYPE
-  remove_const :FLOAT_TYPE
-  remove_const :STRING_TYPE
-  remove_const :BOOLEAN_TYPE
-  remove_const :ID_TYPE
-
-  def self.const_missing(const_name)
-    deprecated_const_name = :"DEPRECATED_#{const_name}"
-    if const_defined?(deprecated_const_name)
-      deprecated_type = const_get(deprecated_const_name)
-      deprecated_caller = caller(1, 1).first
-      # Don't warn about internal uses, like `types.Int`
-      if !deprecated_caller.include?("lib/graphql")
-        warn "GraphQL::#{const_name} is deprecated and will be removed in GraphQL-Ruby 2.0, use GraphQL::Types::#{deprecated_type.graphql_name} instead. (from #{deprecated_caller})"
-      end
-      deprecated_type
-    else
-      super
-    end
-  end
-end
+require "graphql/testing"

data/readme.md

@@ -2,15 +2,12 @@
 
 [![CI Suite](https://github.com/rmosolgo/graphql-ruby/actions/workflows/ci.yaml/badge.svg)](https://github.com/rmosolgo/graphql-ruby/actions/workflows/ci.yaml)
 [![Gem Version](https://badge.fury.io/rb/graphql.svg)](https://rubygems.org/gems/graphql)
-[![Code Climate](https://codeclimate.com/github/rmosolgo/graphql-ruby/badges/gpa.svg)](https://codeclimate.com/github/rmosolgo/graphql-ruby)
-[![Test Coverage](https://codeclimate.com/github/rmosolgo/graphql-ruby/badges/coverage.svg)](https://codeclimate.com/github/rmosolgo/graphql-ruby)
-[![built with love](https://cloud.githubusercontent.com/assets/2231765/6766607/d07992c6-cfc9-11e4-813f-d9240714dd50.png)](https://rmosolgo.github.io/react-badges/)
 
 A Ruby implementation of [GraphQL](https://graphql.org/).
 
 - [Website](https://graphql-ruby.org/)
 - [API Documentation](https://www.rubydoc.info/github/rmosolgo/graphql-ruby)
-- [Newsletter](https://tinyletter.com/graphql-ruby)
+- [Newsletter](https://buttondown.email/graphql-ruby)
 
 ## Installation
 
@@ -37,7 +34,17 @@ Or, see ["Getting Started"](https://graphql-ruby.org/getting_started.html).
 
 ## Upgrade
 
-I also sell [GraphQL::Pro](https://graphql.pro) which provides several features on top of the GraphQL runtime, including [Pundit authorization](https://graphql-ruby.org/authorization/pundit_integration), [CanCan authorization](https://graphql-ruby.org/authorization/can_can_integration), [Pusher-based subscriptions](https://graphql-ruby.org/subscriptions/pusher_implementation) and [persisted queries](https://graphql-ruby.org/operation_store/overview). Besides that, Pro customers get email support and an opportunity to support graphql-ruby's development!
+I also sell [GraphQL::Pro](https://graphql.pro) which provides several features on top of the GraphQL runtime, including:
+
+- [Persisted queries](https://graphql-ruby.org/operation_store/overview)
+- [API versioning](https://graphql-ruby.org/changesets/overview)
+- [Streaming payloads](https://graphql-ruby.org/defer/overview)
+- [Server-side caching](https://graphql-ruby.org/object_cache/overview)
+- [Rate limiters](https://graphql-ruby.org/limiters/overview)
+- Subscriptions backends for [Pusher](https://graphql-ruby.org/subscriptions/pusher_implementation) and [Ably](https://graphql-ruby.org/subscriptions/ably_implementation)
+- Authorization plugins for [Pundit](https://graphql-ruby.org/authorization/pundit_integration) and  [CanCan](https://graphql-ruby.org/authorization/can_can_integration)
+
+Besides that, Pro customers get email support and an opportunity to support graphql-ruby's development!
 
 ## Goals
 
@@ -47,6 +54,6 @@ I also sell [GraphQL::Pro](https://graphql.pro) which provides several features
 
 ## Getting Involved
 
-- __Say hi & ask questions__ in the [#ruby channel on Slack](https://graphql-slack.herokuapp.com/) or [on Twitter](https://twitter.com/rmosolgo)!
+- __Say hi & ask questions__ in the #graphql-ruby channel on [Discord](https://discord.com/invite/xud7bH9).
 - __Report bugs__ by posting a description, full stack trace, and all relevant code in a  [GitHub issue](https://github.com/rmosolgo/graphql-ruby/issues).
 - __Start hacking__ with the [Development guide](https://graphql-ruby.org/development).