graphql 1.9.14 → 1.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23da143cfa3964ded042927d8b52fa98598387b3ab471b2ae66a2d25282af9b4
-  data.tar.gz: e1a2924a847a05c1214b350bb316f093ab36a09b4be20c7e4cb66a2ee429058f
+  metadata.gz: 2f0505024fefcdebc975dad9259c3f3470f883b4251380e759de60ba380b3314
+  data.tar.gz: d92149e0da6aa4e110525a38badaf2163bf887205e2c6dd75c327302e0cfabb4
 SHA512:
-  metadata.gz: c354cc5db0bf2072f25adb3798c90e011b9998cbb287ec825bdcc2f4733070af552810e28e46045b0eace05b9c8db571823a84be5e770c0be76eeb44dcd499fd
-  data.tar.gz: 8d7d75c3dfa2b001e36d30554eaf313b3f489625519462e53fa7c479a1f0baf4fc7d4c27aec8cc78ceb9ef28dd7182bae61a6c2c768e8a30915657379c2832c7
+  metadata.gz: 47b920de6ba95b4c15ebc4aace97d74931cc24efee8c3fb6a6291ea68a13b3ef46b9c613658306e1ff100d0917433431c129baba12553a94dc96a4184cbc5435
+  data.tar.gz: 0e9c03e45fd3b3cb40a9b6b948ee1f71952f618511254acb3840195ff9c054036308636c7b2a42858096e70d1764e38458b88b0f2f369f699c7f71cdd0afd415

data/lib/generators/graphql/templates/base_field.erb

@@ -1,9 +1,5 @@
 module Types
   class BaseField < GraphQL::Schema::Field
     argument_class Types::BaseArgument
-
-    def resolve_field(obj, args, ctx)
-      resolve(obj, args, ctx)
-    end
   end
 end

data/lib/generators/graphql/templates/graphql_controller.erb

@@ -2,7 +2,7 @@ class GraphqlController < ApplicationController
   # If accessing from outside this domain, nullify the session
   # This allows for outside API access while preventing CSRF attacks,
   # but you'll have to authenticate your user separately
-  protect_from_forgery with: :null_session
+  # protect_from_forgery with: :null_session
 
   def execute
     variables = ensure_hash(params[:variables])

data/lib/generators/graphql/templates/schema.erb

@@ -24,7 +24,7 @@ class <%= schema_name %> < GraphQL::Schema
   def self.resolve_type(type, obj, ctx)
     # TODO: Implement this function
     # to return the correct type for `obj`
-    raise(NotImplementedError)
+    raise(GraphQL::RequiredImplementationMissingError)
   end
 <% end %><% if options[:batch] %>
   # GraphQL::Batch setup:

data/lib/graphql.rb

@@ -10,6 +10,9 @@ module GraphQL
   class Error < StandardError
   end
 
+  class RequiredImplementationMissingError < Error
+  end
+
   # 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]

data/lib/graphql/analysis/ast/analyzer.rb

@@ -22,7 +22,7 @@ module GraphQL
         # in a query error.
         # @return [Any] The analyzer result
         def result
-          raise NotImplementedError
+          raise GraphQL::RequiredImplementationMissingError
         end
 
         class << self

data/lib/graphql/base_type.rb

@@ -167,7 +167,7 @@ module GraphQL
     end
 
     def coerce_result(value, ctx)
-      raise NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     end
 
     # Types with fields may override this

data/lib/graphql/function.rb

@@ -43,7 +43,7 @@ module GraphQL
 
     # @return [Object] This function's resolver
     def call(obj, args, ctx)
-      raise NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     end
 
     # @return [String, nil]

data/lib/graphql/input_object_type.rb

@@ -99,7 +99,8 @@ module GraphQL
         end
       end
 
-      arguments_class.new(input_values, context: ctx, defaults_used: defaults_used)
+      result = arguments_class.new(input_values, context: ctx, defaults_used: defaults_used)
+      result.prepare
     end
 
     # @api private

data/lib/graphql/language/document_from_schema_definition.rb

@@ -207,7 +207,7 @@ module GraphQL
         when ListType
           default_value.to_a.map { |v| build_default_value(v, type.of_type) }
         else
-          raise NotImplementedError, "Unexpected default value type #{type.inspect}"
+          raise GraphQL::RequiredImplementationMissingError, "Unexpected default value type #{type.inspect}"
         end
       end
 

data/lib/graphql/language/lexer.rb

@@ -314,7 +314,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:RCURLY, ts, te, meta) 
+											emit(:RCURLY, ts, te, meta, "}") 
 										end
 										
 									end
@@ -328,7 +328,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:LCURLY, ts, te, meta) 
+											emit(:LCURLY, ts, te, meta, "{") 
 										end
 										
 									end
@@ -342,7 +342,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:RPAREN, ts, te, meta) 
+											emit(:RPAREN, ts, te, meta, ")") 
 										end
 										
 									end
@@ -356,7 +356,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:LPAREN, ts, te, meta) 
+											emit(:LPAREN, ts, te, meta, "(")
 										end
 										
 									end
@@ -370,7 +370,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:RBRACKET, ts, te, meta) 
+											emit(:RBRACKET, ts, te, meta, "]") 
 										end
 										
 									end
@@ -384,7 +384,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:LBRACKET, ts, te, meta) 
+											emit(:LBRACKET, ts, te, meta, "[") 
 										end
 										
 									end
@@ -398,7 +398,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:COLON, ts, te, meta) 
+											emit(:COLON, ts, te, meta, ":") 
 										end
 										
 									end
@@ -440,7 +440,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:VAR_SIGN, ts, te, meta) 
+											emit(:VAR_SIGN, ts, te, meta, "$") 
 										end
 										
 									end
@@ -454,7 +454,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:DIR_SIGN, ts, te, meta) 
+											emit(:DIR_SIGN, ts, te, meta, "@") 
 										end
 										
 									end
@@ -468,7 +468,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:ELLIPSIS, ts, te, meta) 
+											emit(:ELLIPSIS, ts, te, meta, "...") 
 										end
 										
 									end
@@ -482,7 +482,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:EQUALS, ts, te, meta) 
+											emit(:EQUALS, ts, te, meta, "=") 
 										end
 										
 									end
@@ -496,7 +496,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:BANG, ts, te, meta) 
+											emit(:BANG, ts, te, meta, "!") 
 										end
 										
 									end
@@ -510,7 +510,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:PIPE, ts, te, meta) 
+											emit(:PIPE, ts, te, meta, "|") 
 										end
 										
 									end
@@ -524,7 +524,7 @@ def self.run_lexer(query_string)
 									begin
 										te = p+1;
 										begin
-											emit(:AMP, ts, te, meta) 
+											emit(:AMP, ts, te, meta, "&") 
 										end
 										
 									end
@@ -738,7 +738,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:ON, ts, te, meta) 
+												emit(:ON, ts, te, meta, "on") 
 											end
 											
 										end
@@ -746,7 +746,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:FRAGMENT, ts, te, meta) 
+												emit(:FRAGMENT, ts, te, meta, "fragment") 
 											end
 											
 										end
@@ -754,7 +754,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:TRUE, ts, te, meta) 
+												emit(:TRUE, ts, te, meta, "true") 
 											end
 											
 										end
@@ -762,7 +762,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:FALSE, ts, te, meta) 
+												emit(:FALSE, ts, te, meta, "false") 
 											end
 											
 										end
@@ -770,7 +770,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:NULL, ts, te, meta) 
+												emit(:NULL, ts, te, meta, "null") 
 											end
 											
 										end
@@ -778,7 +778,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:QUERY, ts, te, meta) 
+												emit(:QUERY, ts, te, meta, "query") 
 											end
 											
 										end
@@ -786,7 +786,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:MUTATION, ts, te, meta) 
+												emit(:MUTATION, ts, te, meta, "mutation") 
 											end
 											
 										end
@@ -794,7 +794,7 @@ def self.run_lexer(query_string)
 										begin
 											p = ((te))-1;
 											begin
-												emit(:SUBSCRIPTION, ts, te, meta) 
+												emit(:SUBSCRIPTION, ts, te, meta, "subscription") 
 											end
 											
 										end
@@ -1371,11 +1371,11 @@ end
 
 def self.record_comment(ts, te, meta)
 token = GraphQL::Language::Token.new(
-name: :COMMENT,
-value: meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
-line: meta[:line],
-col: meta[:col],
-prev_token: meta[:previous_token],
+:COMMENT,
+meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
+meta[:line],
+meta[:col],
+meta[:previous_token],
 )
 
 meta[:previous_token] = token
@@ -1383,13 +1383,14 @@ meta[:previous_token] = token
 meta[:col] += te - ts
 end
 
-def self.emit(token_name, ts, te, meta)
+def self.emit(token_name, ts, te, meta, token_value = nil)
+token_value ||= meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING)
 meta[:tokens] << token = GraphQL::Language::Token.new(
-name: token_name,
-value: meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
-line: meta[:line],
-col: meta[:col],
-prev_token: meta[:previous_token],
+token_name,
+token_value,
+meta[:line],
+meta[:col],
+meta[:previous_token],
 )
 meta[:previous_token] = token
 # Bump the column counter for the next token
@@ -1428,30 +1429,30 @@ end
 # (It's faster: https://bugs.ruby-lang.org/issues/8110)
 if !value.valid_encoding? || value !~ VALID_STRING
 meta[:tokens] << token = GraphQL::Language::Token.new(
-name: :BAD_UNICODE_ESCAPE,
-value: value,
-line: meta[:line],
-col: meta[:col],
-prev_token: meta[:previous_token],
+:BAD_UNICODE_ESCAPE,
+value,
+meta[:line],
+meta[:col],
+meta[:previous_token],
 )
 else
 replace_escaped_characters_in_place(value)
 
 if !value.valid_encoding?
 	meta[:tokens] << token = GraphQL::Language::Token.new(
-	name: :BAD_UNICODE_ESCAPE,
-	value: value,
-	line: meta[:line],
-	col: meta[:col],
-	prev_token: meta[:previous_token],
+	:BAD_UNICODE_ESCAPE,
+	value,
+	meta[:line],
+	meta[:col],
+	meta[:previous_token],
 	)
 	else
 	meta[:tokens] << token = GraphQL::Language::Token.new(
-	name: :STRING,
-	value: value,
-	line: meta[:line],
-	col: meta[:col],
-	prev_token: meta[:previous_token],
+	:STRING,
+	value,
+	meta[:line],
+	meta[:col],
+	meta[:previous_token],
 	)
 	end
 end

data/lib/graphql/language/lexer.rl

@@ -67,14 +67,14 @@
   main := |*
     INT           => { emit(:INT, ts, te, meta) };
     FLOAT         => { emit(:FLOAT, ts, te, meta) };
-    ON            => { emit(:ON, ts, te, meta) };
-    FRAGMENT      => { emit(:FRAGMENT, ts, te, meta) };
-    TRUE          => { emit(:TRUE, ts, te, meta) };
-    FALSE         => { emit(:FALSE, ts, te, meta) };
-    NULL          => { emit(:NULL, ts, te, meta) };
-    QUERY         => { emit(:QUERY, ts, te, meta) };
-    MUTATION      => { emit(:MUTATION, ts, te, meta) };
-    SUBSCRIPTION  => { emit(:SUBSCRIPTION, ts, te, meta) };
+    ON            => { emit(:ON, ts, te, meta, "on") };
+    FRAGMENT      => { emit(:FRAGMENT, ts, te, meta, "fragment") };
+    TRUE          => { emit(:TRUE, ts, te, meta, "true") };
+    FALSE         => { emit(:FALSE, ts, te, meta, "false") };
+    NULL          => { emit(:NULL, ts, te, meta, "null") };
+    QUERY         => { emit(:QUERY, ts, te, meta, "query") };
+    MUTATION      => { emit(:MUTATION, ts, te, meta, "mutation") };
+    SUBSCRIPTION  => { emit(:SUBSCRIPTION, ts, te, meta, "subscription") };
     SCHEMA        => { emit(:SCHEMA, ts, te, meta) };
     SCALAR        => { emit(:SCALAR, ts, te, meta) };
     TYPE          => { emit(:TYPE, ts, te, meta) };
@@ -85,22 +85,22 @@
     ENUM          => { emit(:ENUM, ts, te, meta) };
     INPUT         => { emit(:INPUT, ts, te, meta) };
     DIRECTIVE     => { emit(:DIRECTIVE, ts, te, meta) };
-    RCURLY        => { emit(:RCURLY, ts, te, meta) };
-    LCURLY        => { emit(:LCURLY, ts, te, meta) };
-    RPAREN        => { emit(:RPAREN, ts, te, meta) };
-    LPAREN        => { emit(:LPAREN, ts, te, meta) };
-    RBRACKET      => { emit(:RBRACKET, ts, te, meta) };
-    LBRACKET      => { emit(:LBRACKET, ts, te, meta) };
-    COLON         => { emit(:COLON, ts, te, meta) };
+    RCURLY        => { emit(:RCURLY, ts, te, meta, "}") };
+    LCURLY        => { emit(:LCURLY, ts, te, meta, "{") };
+    RPAREN        => { emit(:RPAREN, ts, te, meta, ")") };
+    LPAREN        => { emit(:LPAREN, ts, te, meta, "(")};
+    RBRACKET      => { emit(:RBRACKET, ts, te, meta, "]") };
+    LBRACKET      => { emit(:LBRACKET, ts, te, meta, "[") };
+    COLON         => { emit(:COLON, ts, te, meta, ":") };
     QUOTED_STRING => { emit_string(ts, te, meta, block: false) };
     BLOCK_STRING  => { emit_string(ts, te, meta, block: true) };
-    VAR_SIGN      => { emit(:VAR_SIGN, ts, te, meta) };
-    DIR_SIGN      => { emit(:DIR_SIGN, ts, te, meta) };
-    ELLIPSIS      => { emit(:ELLIPSIS, ts, te, meta) };
-    EQUALS        => { emit(:EQUALS, ts, te, meta) };
-    BANG          => { emit(:BANG, ts, te, meta) };
-    PIPE          => { emit(:PIPE, ts, te, meta) };
-    AMP           => { emit(:AMP, ts, te, meta) };
+    VAR_SIGN      => { emit(:VAR_SIGN, ts, te, meta, "$") };
+    DIR_SIGN      => { emit(:DIR_SIGN, ts, te, meta, "@") };
+    ELLIPSIS      => { emit(:ELLIPSIS, ts, te, meta, "...") };
+    EQUALS        => { emit(:EQUALS, ts, te, meta, "=") };
+    BANG          => { emit(:BANG, ts, te, meta, "!") };
+    PIPE          => { emit(:PIPE, ts, te, meta, "|") };
+    AMP           => { emit(:AMP, ts, te, meta, "&") };
     IDENTIFIER    => { emit(:IDENTIFIER, ts, te, meta) };
     COMMENT       => { record_comment(ts, te, meta) };
 
@@ -163,11 +163,11 @@ module GraphQL
 
       def self.record_comment(ts, te, meta)
         token = GraphQL::Language::Token.new(
-          name: :COMMENT,
-          value: meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
-          line: meta[:line],
-          col: meta[:col],
-          prev_token: meta[:previous_token],
+          :COMMENT,
+          meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
+          meta[:line],
+          meta[:col],
+          meta[:previous_token],
         )
 
         meta[:previous_token] = token
@@ -175,13 +175,14 @@ module GraphQL
         meta[:col] += te - ts
       end
 
-      def self.emit(token_name, ts, te, meta)
+      def self.emit(token_name, ts, te, meta, token_value = nil)
+        token_value ||= meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING)
         meta[:tokens] << token = GraphQL::Language::Token.new(
-          name: token_name,
-          value: meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
-          line: meta[:line],
-          col: meta[:col],
-          prev_token: meta[:previous_token],
+          token_name,
+          token_value,
+          meta[:line],
+          meta[:col],
+          meta[:previous_token],
         )
         meta[:previous_token] = token
         # Bump the column counter for the next token
@@ -220,30 +221,30 @@ module GraphQL
         # (It's faster: https://bugs.ruby-lang.org/issues/8110)
         if !value.valid_encoding? || value !~ VALID_STRING
           meta[:tokens] << token = GraphQL::Language::Token.new(
-            name: :BAD_UNICODE_ESCAPE,
-            value: value,
-            line: meta[:line],
-            col: meta[:col],
-            prev_token: meta[:previous_token],
+            :BAD_UNICODE_ESCAPE,
+            value,
+            meta[:line],
+            meta[:col],
+            meta[:previous_token],
           )
         else
           replace_escaped_characters_in_place(value)
 
           if !value.valid_encoding?
             meta[:tokens] << token = GraphQL::Language::Token.new(
-              name: :BAD_UNICODE_ESCAPE,
-              value: value,
-              line: meta[:line],
-              col: meta[:col],
-              prev_token: meta[:previous_token],
+              :BAD_UNICODE_ESCAPE,
+              value,
+              meta[:line],
+              meta[:col],
+              meta[:previous_token],
             )
           else
             meta[:tokens] << token = GraphQL::Language::Token.new(
-              name: :STRING,
-              value: value,
-              line: meta[:line],
-              col: meta[:col],
-              prev_token: meta[:previous_token],
+              :STRING,
+              value,
+              meta[:line],
+              meta[:col],
+              meta[:previous_token],
             )
           end
         end

data/lib/graphql/language/nodes.rb

@@ -28,7 +28,8 @@ module GraphQL
         def initialize(options={})
           if options.key?(:position_source)
             position_source = options.delete(:position_source)
-            @line, @col = position_source.line_and_column
+            @line = position_source.line
+            @col = position_source.col
           end
 
           @filename = options.delete(:filename)
@@ -66,7 +67,7 @@ module GraphQL
 
         # @return [Symbol] the method to call on {Language::Visitor} for this node
         def visit_method
-          raise NotImplementedError, "#{self.class.name}#visit_method shold return a symbol"
+          raise GraphQL::RequiredImplementationMissingError, "#{self.class.name}#visit_method shold return a symbol"
         end
 
         def position
@@ -350,6 +351,8 @@ module GraphQL
 
       # A single selection in a GraphQL query.
       class Field < AbstractNode
+        NONE = [].freeze
+
         scalar_methods :name, :alias
         children_methods({
           arguments: GraphQL::Language::Nodes::Argument,
@@ -360,13 +363,13 @@ module GraphQL
         # @!attribute selections
         #   @return [Array<Nodes::Field>] Selections on this object (or empty array if this is a scalar field)
 
-        def initialize_node(name: nil, arguments: [], directives: [], selections: [], **kwargs)
-          @name = name
-          @arguments = arguments
-          @directives = directives
-          @selections = selections
+        def initialize_node(attributes)
+          @name = attributes[:name]
+          @arguments = attributes[:arguments] || NONE
+          @directives = attributes[:directives] || NONE
+          @selections = attributes[:selections] || NONE
           # oops, alias is a keyword:
-          @alias = kwargs.fetch(:alias, nil)
+          @alias = attributes[:alias]
         end
 
         # Override this because default is `:fields`

data/lib/graphql/language/parser.rb

@@ -21,6 +21,7 @@ def initialize(query_string, filename:, tracer: Tracing::NullTracer)
   @query_string = query_string
   @filename = filename
   @tracer = tracer
+  @reused_next_token = [nil, nil]
 end
 
 def parse_document
@@ -51,7 +52,9 @@ def next_token
   if lexer_token.nil?
     nil
   else
-    [lexer_token.name, lexer_token]
+    @reused_next_token[0] = lexer_token.name
+    @reused_next_token[1] = lexer_token
+    @reused_next_token
   end
 end
 

data/lib/graphql/language/parser.y

@@ -440,6 +440,7 @@ def initialize(query_string, filename:, tracer: Tracing::NullTracer)
   @query_string = query_string
   @filename = filename
   @tracer = tracer
+  @reused_next_token = [nil, nil]
 end
 
 def parse_document
@@ -470,7 +471,9 @@ def next_token
   if lexer_token.nil?
     nil
   else
-    [lexer_token.name, lexer_token]
+    @reused_next_token[0] = lexer_token.name
+    @reused_next_token[1] = lexer_token
+    @reused_next_token
   end
 end
 

data/lib/graphql/language/token.rb

@@ -14,7 +14,7 @@ module GraphQL
       attr_reader :value
       attr_reader :prev_token, :line, :col
 
-      def initialize(value:, name:, line:, col:, prev_token:)
+      def initialize(name, value, line, col, prev_token)
         @name = name
         @value = -value
         @line = line

data/lib/graphql/query/arguments.rb

@@ -87,6 +87,10 @@ module GraphQL
 
       def_delegators :to_h, :keys, :values, :each, :any?
 
+      def prepare
+        self
+      end
+
       # Access each key, value and type for the arguments in this set.
       # @yield [argument_value] The {ArgumentValue} for each argument
       # @yieldparam argument_value [ArgumentValue]
@@ -152,7 +156,8 @@ module GraphQL
             wrap_value(value, arg_defn_type.of_type, context)
           when GraphQL::InputObjectType
             if value.is_a?(Hash)
-              arg_defn_type.arguments_class.new(value, context: context, defaults_used: Set.new)
+              result = arg_defn_type.arguments_class.new(value, context: context, defaults_used: Set.new)
+              result.prepare
             else
               value
             end

data/lib/graphql/query/literal_input.rb

@@ -108,7 +108,8 @@ module GraphQL
           end
         end
 
-        argument_owner.arguments_class.new(values_hash, context: context, defaults_used: defaults_used)
+        result = argument_owner.arguments_class.new(values_hash, context: context, defaults_used: defaults_used)
+        result.prepare
       end
     end
   end

data/lib/graphql/relay/base_connection.rb

@@ -139,7 +139,7 @@ module GraphQL
 
       # An opaque operation which returns a connection-specific cursor.
       def cursor_from_node(object)
-        raise NotImplementedError, "must return a cursor for this object/connection pair"
+        raise GraphQL::RequiredImplementationMissingError, "must return a cursor for this object/connection pair"
       end
 
       def inspect
@@ -161,11 +161,11 @@ module GraphQL
       end
 
       def paged_nodes
-        raise NotImplementedError, "must return nodes for this connection after paging"
+        raise GraphQL::RequiredImplementationMissingError, "must return nodes for this connection after paging"
       end
 
       def sliced_nodes
-        raise NotImplementedError, "must return  all nodes for this connection after chopping off first and last"
+        raise GraphQL::RequiredImplementationMissingError, "must return  all nodes for this connection after chopping off first and last"
       end
     end
   end

data/lib/graphql/relay/relation_connection.rb

@@ -25,12 +25,16 @@ module GraphQL
 
       def has_next_page
         if first
-          paged_nodes.length >= first && sliced_nodes_count > first
-        elsif GraphQL::Relay::ConnectionType.bidirectional_pagination && last
-          sliced_nodes_count >= last
-        else
-          false
+          if defined?(ActiveRecord::Relation) && nodes.is_a?(ActiveRecord::Relation)
+            initial_offset = after ? offset_from_cursor(after) : 0
+            return paged_nodes.length >= first && nodes.offset(first + initial_offset).exists?
+          end
+          return paged_nodes.length >= first && sliced_nodes_count > first
+        end
+        if GraphQL::Relay::ConnectionType.bidirectional_pagination && last
+          return sliced_nodes_count >= last
         end
+        false
       end
 
       def has_previous_page

data/lib/graphql/schema.rb

@@ -281,13 +281,13 @@ module GraphQL
       ensure_defined
       # Assert that all necessary configs are present:
       validation_error = Validation.validate(self)
-      validation_error && raise(NotImplementedError, validation_error)
+      validation_error && raise(GraphQL::RequiredImplementationMissingError, validation_error)
       rebuild_artifacts
 
       @definition_error = nil
       nil
     rescue StandardError => err
-      if @raise_definition_error || err.is_a?(CyclicalDefinitionError)
+      if @raise_definition_error || err.is_a?(CyclicalDefinitionError) || err.is_a?(GraphQL::RequiredImplementationMissingError)
         raise
       else
         # Raise this error _later_ to avoid messing with Rails constant loading
@@ -492,7 +492,7 @@ module GraphQL
     def resolve_type(type, object, ctx = :__undefined__)
       check_resolved_type(type, object, ctx) do |ok_type, ok_object, ok_ctx|
         if @resolve_type_proc.nil?
-          raise(NotImplementedError, "Can't determine GraphQL type for: #{ok_object.inspect}, define `resolve_type (type, obj, ctx) -> { ... }` inside `Schema.define`.")
+          raise(GraphQL::RequiredImplementationMissingError, "Can't determine GraphQL type for: #{ok_object.inspect}, define `resolve_type (type, obj, ctx) -> { ... }` inside `Schema.define`.")
         end
         @resolve_type_proc.call(ok_type, ok_object, ok_ctx)
       end
@@ -553,7 +553,7 @@ module GraphQL
     # @return [Any] The application object identified by `id`
     def object_from_id(id, ctx)
       if @object_from_id_proc.nil?
-        raise(NotImplementedError, "Can't fetch an object for id \"#{id}\" because the schema's `object_from_id (id, ctx) -> { ... }` function is not defined")
+        raise(GraphQL::RequiredImplementationMissingError, "Can't fetch an object for id \"#{id}\" because the schema's `object_from_id (id, ctx) -> { ... }` function is not defined")
       else
         @object_from_id_proc.call(id, ctx)
       end
@@ -620,7 +620,7 @@ module GraphQL
     # @return [String] a unique identifier for `object` which clients can use to refetch it
     def id_from_object(object, type, ctx)
       if @id_from_object_proc.nil?
-        raise(NotImplementedError, "Can't generate an ID for #{object.inspect} of type #{type}, schema's `id_from_object` must be defined")
+        raise(GraphQL::RequiredImplementationMissingError, "Can't generate an ID for #{object.inspect} of type #{type}, schema's `id_from_object` must be defined")
       else
         @id_from_object_proc.call(object, type, ctx)
       end
@@ -956,16 +956,16 @@ module GraphQL
         if type.kind.object?
           type
         else
-          raise NotImplementedError, "#{self.name}.resolve_type(type, obj, ctx) must be implemented to use Union types or Interface types (tried to resolve: #{type.name})"
+          raise GraphQL::RequiredImplementationMissingError, "#{self.name}.resolve_type(type, obj, ctx) must be implemented to use Union types or Interface types (tried to resolve: #{type.name})"
         end
       end
 
       def object_from_id(node_id, ctx)
-        raise NotImplementedError, "#{self.name}.object_from_id(node_id, ctx) must be implemented to load by ID (tried to load from id `#{node_id}`)"
+        raise GraphQL::RequiredImplementationMissingError, "#{self.name}.object_from_id(node_id, ctx) must be implemented to load by ID (tried to load from id `#{node_id}`)"
       end
 
       def id_from_object(object, type, ctx)
-        raise NotImplementedError, "#{self.name}.id_from_object(object, type, ctx) must be implemented to create global ids (tried to create an id for `#{object.inspect}`)"
+        raise GraphQL::RequiredImplementationMissingError, "#{self.name}.id_from_object(object, type, ctx) must be implemented to create global ids (tried to create an id for `#{object.inspect}`)"
       end
 
       def visible?(member, context)

data/lib/graphql/schema/argument.rb

@@ -94,17 +94,7 @@ module GraphQL
       end
 
       def authorized?(obj, ctx)
-        arg_type = type.unwrap
-        if arg_type.kind.input_object? && arg_type != @owner
-          arg_type.arguments.each do |_name, input_obj_arg|
-            if !input_obj_arg.authorized?(obj, ctx)
-              return false
-            end
-          end
-          true
-        else
-          true
-        end
+        true
       end
 
       def to_graphql

data/lib/graphql/schema/build_from_definition.rb

@@ -111,7 +111,7 @@ module GraphQL
         end
 
         NullResolveType = ->(type, obj, ctx) {
-          raise(NotImplementedError, "Generated Schema cannot use Interface or Union types for execution. Implement resolve_type on your resolver.")
+          raise(GraphQL::RequiredImplementationMissingError, "Generated Schema cannot use Interface or Union types for execution. Implement resolve_type on your resolver.")
         }
 
         NullScalarCoerce = ->(val, _ctx) { val }

data/lib/graphql/schema/directive/feature.rb

@@ -58,7 +58,7 @@ module GraphQL
         # @param context [GraphQL::Query::Context]
         # @return [Boolean] If truthy, execution will continue
         def self.enabled?(flag_name, object, context)
-          raise NotImplementedError, "Implement `.enabled?(flag_name, object, context)` to return true or false for the feature flag (#{flag_name.inspect})"
+          raise GraphQL::RequiredImplementationMissingError, "Implement `.enabled?(flag_name, object, context)` to return true or false for the feature flag (#{flag_name.inspect})"
         end
       end
     end

data/lib/graphql/schema/field.rb

@@ -14,6 +14,7 @@ module GraphQL
       include GraphQL::Schema::Member::AcceptsDefinition
       include GraphQL::Schema::Member::HasArguments
       include GraphQL::Schema::Member::HasPath
+      extend GraphQL::Schema::FindInheritedValue
 
       # @return [String] the GraphQL name for this field, camelized unless `camelize: false` is provided
       attr_reader :name
@@ -135,6 +136,22 @@ module GraphQL
         end
       end
 
+      # This extension is applied to fields when {#connection?} is true.
+      #
+      # You can override it in your base field definition.
+      # @return [Class] A {FieldExtension} subclass for implementing pagination behavior.
+      # @example Configuring a custom extension
+      #   class Types::BaseField < GraphQL::Schema::Field
+      #     connection_extension(MyCustomExtension)
+      #   end
+      def self.connection_extension(new_extension_class = nil)
+        if new_extension_class
+          @connection_extension = new_extension_class
+        else
+          @connection_extension ||= find_inherited_value(:connection_extension, ConnectionExtension)
+        end
+      end
+
       # @param name [Symbol] The underscore-cased version of this field name (will be camelized for the GraphQL API)
       # @param type [Class, GraphQL::BaseType, Array] The return type of this field
       # @param owner [Class] The type that this field belongs to
@@ -246,7 +263,7 @@ module GraphQL
         # The problem with putting this after the definition_block
         # is that it would override arguments
         if connection?
-          self.extension(ConnectionExtension)
+          self.extension(self.class.connection_extension)
         end
 
         if definition_block
@@ -582,7 +599,7 @@ module GraphQL
         elsif ctx.respond_to?(extra_name)
           ctx.public_send(extra_name)
         else
-          raise NotImplementedError, "Unknown field extra for #{self.path}: #{extra_name.inspect}"
+          raise GraphQL::RequiredImplementationMissingError, "Unknown field extra for #{self.path}: #{extra_name.inspect}"
         end
       end
 

data/lib/graphql/schema/input_object.rb

@@ -57,6 +57,10 @@ module GraphQL
         to_h
       end
 
+      def prepare
+        self
+      end
+
       def unwrap_value(value)
         case value
         when Array

data/lib/graphql/schema/loader.rb

@@ -34,7 +34,7 @@ module GraphQL
       end
 
       NullResolveType = ->(type, obj, ctx) {
-        raise(NotImplementedError, "This schema was loaded from string, so it can't resolve types for objects")
+        raise(GraphQL::RequiredImplementationMissingError, "This schema was loaded from string, so it can't resolve types for objects")
       }
 
       NullScalarCoerce = ->(val, _ctx) { val }
@@ -51,7 +51,7 @@ module GraphQL
           when "NON_NULL"
             NonNullType.new(of_type: resolve_type(types, type.fetch("ofType")))
           else
-            fail NotImplementedError, "#{kind} not implemented"
+            fail GraphQL::RequiredImplementationMissingError, "#{kind} not implemented"
           end
         end
 
@@ -171,7 +171,7 @@ module GraphQL
               }
             )
           else
-            fail NotImplementedError, "#{type["kind"]} not implemented"
+            fail GraphQL::RequiredImplementationMissingError, "#{type["kind"]} not implemented"
           end
         end
       end

data/lib/graphql/schema/member/base_dsl_methods.rb

@@ -74,7 +74,7 @@ module GraphQL
 
         # @return [GraphQL::BaseType] Convert this type to a legacy-style object.
         def to_graphql
-          raise NotImplementedError
+          raise GraphQL::RequiredImplementationMissingError
         end
 
         alias :unwrap :itself
@@ -88,7 +88,7 @@ module GraphQL
         # without any namespaces and with any `-Type` suffix removed
         def default_graphql_name
           @default_graphql_name ||= begin
-            raise NotImplementedError, 'Anonymous class should declare a `graphql_name`' if name.nil?
+            raise GraphQL::RequiredImplementationMissingError, 'Anonymous class should declare a `graphql_name`' if name.nil?
 
             name.split("::").last.sub(/Type\Z/, "")
           end

data/lib/graphql/schema/member/has_fields.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'irb/ruby-token'
+
 module GraphQL
   class Schema
     class Member
@@ -38,16 +40,23 @@ module GraphQL
           end
         end
 
+        # A list of Ruby keywords.
+        #
+        # @api private
+        RUBY_KEYWORDS = RubyToken::TokenDefinitions.select { |definition| definition[1] == RubyToken::TkId }
+                                                   .map { |definition| definition[2] }
+                                                   .compact
+
+        # A list of GraphQL-Ruby keywords.
+        #
+        # @api private
+        GRAPHQL_RUBY_KEYWORDS = [:context, :object, :method]
+
         # A list of field names that we should advise users to pick a different
         # resolve method name.
         #
         # @api private
-        CONFLICT_FIELD_NAMES = Set.new([
-          # GraphQL-Ruby conflicts
-          :context, :object,
-          # Ruby built-ins conflicts
-          :method, :class
-        ])
+        CONFLICT_FIELD_NAMES = Set.new(GRAPHQL_RUBY_KEYWORDS + RUBY_KEYWORDS)
 
         # Register this field with the class, overriding a previous one if needed.
         # @param field_defn [GraphQL::Schema::Field]

data/lib/graphql/schema/member/type_system_helpers.rb

@@ -30,7 +30,7 @@ module GraphQL
 
         # @return [GraphQL::TypeKinds::TypeKind]
         def kind
-          raise NotImplementedError
+          raise GraphQL::RequiredImplementationMissingError
         end
       end
     end

data/lib/graphql/schema/resolver.rb

@@ -103,7 +103,7 @@ module GraphQL
       # Do the work. Everything happens here.
       # @return [Object] An object corresponding to the return type
       def resolve(**args)
-        raise NotImplementedError, "#{self.class.name}#resolve should execute the field's logic"
+        raise GraphQL::RequiredImplementationMissingError, "#{self.class.name}#resolve should execute the field's logic"
       end
 
       # Called before arguments are prepared.
@@ -267,6 +267,7 @@ module GraphQL
             arguments: arguments,
             null: null,
             complexity: complexity,
+            extensions: extensions,
           }
         end
 
@@ -320,6 +321,18 @@ module GraphQL
           inherited_lookups.merge(own_arguments_loads_as_type)
         end
 
+        # Registers new extension
+        # @param extension [Class] Extension class
+        # @param options [Hash] Optional extension options
+        def extension(extension, **options)
+          extensions << {extension => options}
+        end
+
+        # @api private
+        def extensions
+          @extensions ||= []
+        end
+
         private
 
         def own_arguments_loads_as_type

data/lib/graphql/schema/wrapper.rb

@@ -14,7 +14,7 @@ module GraphQL
       end
 
       def to_graphql
-        raise NotImplementedError
+        raise GraphQL::RequiredImplementationMissingError
       end
 
       def unwrap

data/lib/graphql/static_validation/definition_dependencies.rb

@@ -11,11 +11,11 @@ module GraphQL
         super
         @defdep_node_paths = {}
 
-        # { name => node } pairs for fragments
-        @defdep_fragment_definitions = {}
+        # { name => [node, ...] } pairs for fragments (although duplicate-named fragments are _invalid_, they are _possible_)
+        @defdep_fragment_definitions = Hash.new{ |h, k| h[k] = [] }
 
         # This tracks dependencies from fragment to Node where it was used
-        # { fragment_definition_node => [dependent_node, dependent_node]}
+        # { fragment_definition_name => [dependent_node, dependent_node]}
         @defdep_dependent_definitions = Hash.new { |h, k| h[k] = Set.new }
 
         # First-level usages of spreads within definitions
@@ -32,7 +32,7 @@ module GraphQL
       def on_document(node, parent)
         node.definitions.each do |definition|
           if definition.is_a? GraphQL::Language::Nodes::FragmentDefinition
-            @defdep_fragment_definitions[definition.name] = definition
+            @defdep_fragment_definitions[definition.name] << definition
           end
         end
         super
@@ -42,7 +42,7 @@ module GraphQL
       end
 
       def on_operation_definition(node, prev_node)
-        @defdep_node_paths[node] = NodeWithPath.new(node, context.path)
+        @defdep_node_paths[node.name] = NodeWithPath.new(node, context.path)
         @defdep_current_parent = node
         super
         @defdep_current_parent = nil
@@ -59,7 +59,7 @@ module GraphQL
         @defdep_node_paths[node] = NodeWithPath.new(node, context.path)
 
         # Track both sides of the dependency
-        @defdep_dependent_definitions[@defdep_fragment_definitions[node.name]] << @defdep_current_parent
+        @defdep_dependent_definitions[node.name] << @defdep_current_parent
         @defdep_immediate_dependencies[@defdep_current_parent] << node
         super
       end
@@ -116,24 +116,28 @@ module GraphQL
         dependency_map = DependencyMap.new
         # Don't allow the loop to run more times
         # than the number of fragments in the document
-        max_loops = @defdep_fragment_definitions.size
+        max_loops = 0
+        @defdep_fragment_definitions.each_value do |v|
+          max_loops += v.size
+        end
+
         loops = 0
 
         # Instead of tracking independent fragments _as you visit_,
         # determine them at the end. This way, we can treat fragments with the
         # same name as if they were the same name. If _any_ of the fragments
         # with that name has a dependency, we record it.
-        independent_fragment_nodes = @defdep_fragment_definitions.values - @defdep_immediate_dependencies.keys
+        independent_fragment_nodes = @defdep_fragment_definitions.values.flatten - @defdep_immediate_dependencies.keys
 
         while fragment_node = independent_fragment_nodes.pop
           loops += 1
           if loops > max_loops
-            raise("Resolution loops exceeded the number of definitions; infinite loop detected.")
+            raise("Resolution loops exceeded the number of definitions; infinite loop detected. (Max: #{max_loops}, Current: #{loops})")
           end
           # Since it's independent, let's remove it from here.
           # That way, we can use the remainder to identify cycles
           @defdep_immediate_dependencies.delete(fragment_node)
-          fragment_usages = @defdep_dependent_definitions[fragment_node]
+          fragment_usages = @defdep_dependent_definitions[fragment_node.name]
           if fragment_usages.empty?
             # If we didn't record any usages during the visit,
             # then this fragment is unused.
@@ -151,10 +155,15 @@ module GraphQL
               if block_given?
                 yield(definition_node, removed, fragment_node)
               end
-              if remaining.empty? && definition_node.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
+              if remaining.empty? &&
+                definition_node.is_a?(GraphQL::Language::Nodes::FragmentDefinition) &&
+                definition_node.name != fragment_node.name
                 # If all of this definition's dependencies have
                 # been resolved, we can now resolve its
                 # own dependents.
+                #
+                # But, it's possible to have a duplicate-named fragment here.
+                # Skip it in that case
                 independent_fragment_nodes << definition_node
               end
             end
@@ -166,7 +175,7 @@ module GraphQL
         # then they're still in there
         @defdep_immediate_dependencies.each do |defn_node, deps|
           deps.each do |spread|
-            if @defdep_fragment_definitions[spread.name].nil?
+            if !@defdep_fragment_definitions.key?(spread.name)
               dependency_map.unmet_dependencies[@defdep_node_paths[defn_node]] << @defdep_node_paths[spread]
               deps.delete(spread)
             end

data/lib/graphql/subscriptions.rb

@@ -124,7 +124,7 @@ module GraphQL
     # @yieldparam subscription_id [String]
     # @return [void]
     def each_subscription_id(event)
-      raise NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     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 NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     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 NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     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 NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     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 NotImplementedError
+      raise GraphQL::RequiredImplementationMissingError
     end
 
     # @return [String] A new unique identifier for a subscription

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 NotImplementedError, "Return transformed text here"
+        raise GraphQL::RequiredImplementationMissingError, "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.14"
+  VERSION = "1.9.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.15
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips