graphql 2.0.18 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f43155bcb78f5842e409f8c001b7d031578604d2e7d962457cc7fd92e1d68d4
-  data.tar.gz: e86aa4c3071f63d605f9e2e3833ba967282f906c3ff0e1252db71b063fe69cd9
+  metadata.gz: 0e3f276db828fe3908e759e87f8cc5d33ae761c3ea80bd53b92b16a971ef507a
+  data.tar.gz: fc59e806f45125da3065ed4d7758170f88231377664b9a130e0896d6b2790fa3
 SHA512:
-  metadata.gz: 79c16409d45a11f1bba6623e1d97877984bfe10577ab5241ecd3ebe515fefb6cd42940f336640c60cf19f94c61d902692f26b0497699e4ca9e912f2532fa6168
-  data.tar.gz: a9f5e954d7988a440c083cd0afbb6f5ff72ab77d30d4fab708f9f501d2ce8af49b13fde571e50788c9ba79fd943d38e4c207e4ac9ddccd93c80d2c0f9ef8f997
+  metadata.gz: 580e967d89228c0174072f5857cb646ea7495ee5a00587249ffc3034ffe9b536f751c09b8112e443b0c93efcd868db01c584497364897d23c7e798ee3f496d64
+  data.tar.gz: 43db761134f0ea83311f6a8b62b3b34b9dccdc335869c9067f43dcc5b9fc7f4023b77b8bb70cf203435ac25711d16d0ce5aa620478d351950d0db9f2e7bee9c7

data/lib/graphql/language/lexer.rb

@@ -129,13 +129,13 @@ module GraphQL
       end
 
       def self.emit(token_name, ts, te, meta, token_value)
-        meta[:tokens] << token = GraphQL::Language::Token.new(
+        meta[:tokens] << token = [
           token_name,
-          token_value,
           meta[:line],
           meta[:col],
+          token_value,
           meta[:previous_token],
-        )
+        ]
         meta[:previous_token] = token
         # Bump the column counter for the next token
         meta[:col] += te - ts
@@ -168,13 +168,13 @@ module GraphQL
       end
 
       def self.record_comment(ts, te, meta, str)
-        token = GraphQL::Language::Token.new(
+        token = [
           :COMMENT,
-          str,
           meta[:line],
           meta[:col],
+          str,
           meta[:previous_token],
-        )
+        ]
 
         meta[:previous_token] = token
 

data/lib/graphql/language/nodes.rb

@@ -28,8 +28,8 @@ module GraphQL
         def initialize(options = {})
           if options.key?(:position_source)
             position_source = options.delete(:position_source)
-            @line = position_source.line
-            @col = position_source.col
+            @line = position_source[1]
+            @col = position_source[2]
           end
 
           @filename = options.delete(:filename)

data/lib/graphql/language/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 
@@ -66,7 +66,7 @@ def next_token
   if lexer_token.nil?
     nil
   else
-    @reused_next_token[0] = lexer_token.name
+    @reused_next_token[0] = lexer_token[0]
     @reused_next_token[1] = lexer_token
     @reused_next_token
   end
@@ -77,13 +77,13 @@ def get_description(token)
 
   loop do
     prev_token = token
-    token = token.prev_token
+    token = token[4]
 
     break if token.nil?
-    break if token.name != :COMMENT
-    break if prev_token.line != token.line + 1
+    break if token[0] != :COMMENT
+    break if prev_token[1] != token[1] + 1
 
-    comments.unshift(token.to_s.sub(/^#\s*/, ""))
+    comments.unshift(token[3].sub(/^#\s*/, ""))
   end
 
   return nil if comments.empty?
@@ -99,11 +99,12 @@ def on_error(parser_token_id, lexer_token, vstack)
     if parser_token_name.nil?
       raise GraphQL::ParseError.new("Parse Error on unknown token: {token_id: #{parser_token_id}, lexer_token: #{lexer_token}} from #{@query_string}", nil, nil, @query_string, filename: @filename)
     else
-      line, col = lexer_token.line_and_column
-      if lexer_token.name == :BAD_UNICODE_ESCAPE
-        raise GraphQL::ParseError.new("Parse error on bad Unicode escape sequence: #{lexer_token.to_s.inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
+      line = lexer_token[1]
+      col = lexer_token[2]
+      if lexer_token[0] == :BAD_UNICODE_ESCAPE
+        raise GraphQL::ParseError.new("Parse error on bad Unicode escape sequence: #{lexer_token[3].inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
       else
-        raise GraphQL::ParseError.new("Parse error on #{lexer_token.to_s.inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
+        raise GraphQL::ParseError.new("Parse error on #{lexer_token[3].inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
       end
     end
   end
@@ -111,8 +112,8 @@ end
 
 def make_node(node_name, assigns)
   assigns.each do |key, value|
-    if key != :position_source && value.is_a?(GraphQL::Language::Token)
-      assigns[key] = value.to_s
+    if key != :position_source && value.is_a?(Array) && value[0].is_a?(Symbol)
+      assigns[key] = value[3]
     end
   end
 
@@ -1280,7 +1281,7 @@ module_eval(<<'.,.,', 'parser.y', 119)
 
 module_eval(<<'.,.,', 'parser.y', 164)
   def _reduce_63(val, _values, result)
-     result = make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+     result = make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
     result
   end
 .,.,
@@ -1336,21 +1337,21 @@ module_eval(<<'.,.,', 'parser.y', 179)
 
 module_eval(<<'.,.,', 'parser.y', 182)
   def _reduce_71(val, _values, result)
-     result = val[0].to_f
+     result = val[0][3].to_f
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 183)
   def _reduce_72(val, _values, result)
-     result = val[0].to_i
+     result = val[0][3].to_i
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 184)
   def _reduce_73(val, _values, result)
-     result = val[0].to_s
+     result = val[0][3]
     result
   end
 .,.,
@@ -1597,7 +1598,7 @@ module_eval(<<'.,.,', 'parser.y', 277)
 
 module_eval(<<'.,.,', 'parser.y', 286)
   def _reduce_114(val, _values, result)
-     result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0].line, directives: val[1], **val[3])
+     result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0][1], directives: val[1], **val[3])
     result
   end
 .,.,
@@ -1613,7 +1614,7 @@ module_eval(<<'.,.,', 'parser.y', 290)
 
 module_eval(<<'.,.,', 'parser.y', 293)
   def _reduce_117(val, _values, result)
-     result = { val[0].to_s.to_sym => val[2] }
+     result = { val[0][3].to_sym => val[2] }
     result
   end
 .,.,
@@ -1766,7 +1767,7 @@ module_eval(<<'.,.,', 'parser.y', 343)
 
 module_eval(<<'.,.,', 'parser.y', 353)
   def _reduce_151(val, _values, result)
-            result = make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1774,7 +1775,7 @@ module_eval(<<'.,.,', 'parser.y', 353)
 
 module_eval(<<'.,.,', 'parser.y', 358)
   def _reduce_152(val, _values, result)
-            result = make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1840,7 +1841,7 @@ module_eval(<<'.,.,', 'parser.y', 376)
 
 module_eval(<<'.,.,', 'parser.y', 380)
   def _reduce_162(val, _values, result)
-            result = make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1876,7 +1877,7 @@ module_eval(<<'.,.,', 'parser.y', 389)
 
 module_eval(<<'.,.,', 'parser.y', 393)
   def _reduce_167(val, _values, result)
-            result = make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1919,7 +1920,7 @@ module_eval(<<'.,.,', 'parser.y', 403)
 
 module_eval(<<'.,.,', 'parser.y', 407)
   def _reduce_173(val, _values, result)
-            result = make_node(:InterfaceTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:InterfaceTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1941,7 +1942,7 @@ module_eval(<<'.,.,', 'parser.y', 412)
 
 module_eval(<<'.,.,', 'parser.y', 416)
   def _reduce_176(val, _values, result)
-            result = make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1949,7 +1950,7 @@ module_eval(<<'.,.,', 'parser.y', 416)
 
 module_eval(<<'.,.,', 'parser.y', 421)
   def _reduce_177(val, _values, result)
-             result = make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+             result = make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1957,7 +1958,7 @@ module_eval(<<'.,.,', 'parser.y', 421)
 
 module_eval(<<'.,.,', 'parser.y', 426)
   def _reduce_178(val, _values, result)
-            result = make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1965,7 +1966,7 @@ module_eval(<<'.,.,', 'parser.y', 426)
 
 module_eval(<<'.,.,', 'parser.y', 431)
   def _reduce_179(val, _values, result)
-            result = make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[7], repeatable: !!val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[7], repeatable: !!val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
@@ -1977,14 +1978,14 @@ module_eval(<<'.,.,', 'parser.y', 431)
 
 module_eval(<<'.,.,', 'parser.y', 439)
   def _reduce_182(val, _values, result)
-     result = [make_node(:DirectiveLocation, name: val[0].to_s, position_source: val[0])]
+     result = [make_node(:DirectiveLocation, name: val[0][3], position_source: val[0])]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 440)
   def _reduce_183(val, _values, result)
-     val[0] << make_node(:DirectiveLocation, name: val[2].to_s, position_source: val[2])
+     val[0] << make_node(:DirectiveLocation, name: val[2][3], position_source: val[2])
     result
   end
 .,.,

data/lib/graphql/language/parser.y

@@ -162,7 +162,7 @@ rule
     | schema_keyword
 
   enum_value_definition:
-    description_opt enum_name directives_list_opt { result = make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1]) }
+    description_opt enum_name directives_list_opt { result = make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1]) }
 
   enum_value_definitions:
       enum_value_definition                        { result = [val[0]] }
@@ -180,9 +180,9 @@ rule
       name COLON input_value { result = make_node(:Argument, name: val[0], value: val[2], position_source: val[0])}
 
   literal_value:
-      FLOAT       { result = val[0].to_f }
-    | INT         { result = val[0].to_i }
-    | STRING      { result = val[0].to_s }
+      FLOAT       { result = val[0][3].to_f }
+    | INT         { result = val[0][3].to_i }
+    | STRING      { result = val[0][3] }
     | TRUE        { result = true }
     | FALSE       { result = false }
     | null_value
@@ -284,14 +284,14 @@ rule
    | directive_definition
 
   schema_definition:
-      SCHEMA directives_list_opt LCURLY operation_type_definition_list RCURLY { result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0].line, directives: val[1], **val[3]) }
+      SCHEMA directives_list_opt LCURLY operation_type_definition_list RCURLY { result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0][1], directives: val[1], **val[3]) }
 
   operation_type_definition_list:
       operation_type_definition
     | operation_type_definition_list operation_type_definition { result = val[0].merge(val[1]) }
 
   operation_type_definition:
-      operation_type COLON name { result = { val[0].to_s.to_sym => val[2] } }
+      operation_type COLON name { result = { val[0][3].to_sym => val[2] } }
 
   type_definition:
       scalar_type_definition
@@ -351,12 +351,12 @@ rule
 
   scalar_type_definition:
       description_opt SCALAR name directives_list_opt {
-        result = make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   object_type_definition:
       description_opt TYPE name implements_opt directives_list_opt field_definition_list_opt {
-        result = make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   implements_opt:
@@ -378,7 +378,7 @@ rule
 
   input_value_definition:
       description_opt name COLON type default_value_opt directives_list_opt {
-        result = make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   input_value_definition_list:
@@ -391,7 +391,7 @@ rule
 
   field_definition:
       description_opt name arguments_definitions_opt COLON type directives_list_opt {
-        result = make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   field_definition_list_opt:
@@ -405,7 +405,7 @@ rule
 
   interface_type_definition:
       description_opt INTERFACE name implements_opt directives_list_opt field_definition_list_opt {
-        result = make_node(:InterfaceTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:InterfaceTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   union_members:
@@ -414,22 +414,22 @@ rule
 
   union_type_definition:
       description_opt UNION name directives_list_opt EQUALS union_members {
-        result = make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   enum_type_definition:
       description_opt ENUM name directives_list_opt LCURLY enum_value_definitions RCURLY {
-         result = make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+         result = make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   input_object_type_definition:
       description_opt INPUT name directives_list_opt LCURLY input_value_definition_list RCURLY {
-        result = make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   directive_definition:
       description_opt DIRECTIVE DIR_SIGN name arguments_definitions_opt directive_repeatable_opt ON directive_locations {
-        result = make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[7], repeatable: !!val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+        result = make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[7], repeatable: !!val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
       }
 
   directive_repeatable_opt:
@@ -437,8 +437,8 @@ rule
     | REPEATABLE
 
   directive_locations:
-      name                          { result = [make_node(:DirectiveLocation, name: val[0].to_s, position_source: val[0])] }
-    | directive_locations PIPE name { val[0] << make_node(:DirectiveLocation, name: val[2].to_s, position_source: val[2]) }
+      name                          { result = [make_node(:DirectiveLocation, name: val[0][3], position_source: val[0])] }
+    | directive_locations PIPE name { val[0] << make_node(:DirectiveLocation, name: val[2][3], position_source: val[2]) }
 end
 
 ---- header ----
@@ -498,7 +498,7 @@ def next_token
   if lexer_token.nil?
     nil
   else
-    @reused_next_token[0] = lexer_token.name
+    @reused_next_token[0] = lexer_token[0]
     @reused_next_token[1] = lexer_token
     @reused_next_token
   end
@@ -509,13 +509,13 @@ def get_description(token)
 
   loop do
     prev_token = token
-    token = token.prev_token
+    token = token[4]
 
     break if token.nil?
-    break if token.name != :COMMENT
-    break if prev_token.line != token.line + 1
+    break if token[0] != :COMMENT
+    break if prev_token[1] != token[1] + 1
 
-    comments.unshift(token.to_s.sub(/^#\s*/, ""))
+    comments.unshift(token[3].sub(/^#\s*/, ""))
   end
 
   return nil if comments.empty?
@@ -531,11 +531,12 @@ def on_error(parser_token_id, lexer_token, vstack)
     if parser_token_name.nil?
       raise GraphQL::ParseError.new("Parse Error on unknown token: {token_id: #{parser_token_id}, lexer_token: #{lexer_token}} from #{@query_string}", nil, nil, @query_string, filename: @filename)
     else
-      line, col = lexer_token.line_and_column
-      if lexer_token.name == :BAD_UNICODE_ESCAPE
-        raise GraphQL::ParseError.new("Parse error on bad Unicode escape sequence: #{lexer_token.to_s.inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
+      line = lexer_token[1]
+      col = lexer_token[2]
+      if lexer_token[0] == :BAD_UNICODE_ESCAPE
+        raise GraphQL::ParseError.new("Parse error on bad Unicode escape sequence: #{lexer_token[3].inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
       else
-        raise GraphQL::ParseError.new("Parse error on #{lexer_token.to_s.inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
+        raise GraphQL::ParseError.new("Parse error on #{lexer_token[3].inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
       end
     end
   end
@@ -543,8 +544,8 @@ end
 
 def make_node(node_name, assigns)
   assigns.each do |key, value|
-    if key != :position_source && value.is_a?(GraphQL::Language::Token)
-      assigns[key] = value.to_s
+    if key != :position_source && value.is_a?(Array) && value[0].is_a?(Symbol)
+      assigns[key] = value[3]
     end
   end
 

data/lib/graphql/query/context.rb

@@ -72,18 +72,6 @@ module GraphQL
       # @return [Array<String, Integer>] The current position in the result
       attr_reader :path
 
-      module EmptyScopedContext
-        EMPTY_HASH = {}.freeze
-
-        def self.key?(k)
-          false
-        end
-
-        def self.merged_context
-          EMPTY_HASH
-        end
-      end
-
       # Make a new context which delegates key lookup to `values`
       # @param query [GraphQL::Query] the query who owns this context
       # @param values [Hash] A hash of arbitrary values which will be accessible at query-time
@@ -99,28 +87,35 @@ module GraphQL
         @path = []
         @value = nil
         @context = self # for SharedMethods TODO delete sharedmethods
-        @scoped_context = EmptyScopedContext
+        @scoped_context = ScopedContext.new(self)
       end
 
       class ScopedContext
+        NO_PATH = [].freeze
+        NO_CONTEXT = {}.freeze
+
         def initialize(query_context)
           @query_context = query_context
-          @scoped_contexts = {}
-          @all_keys = Set.new
-          @no_path = [].freeze
+          @scoped_contexts = nil
+          @all_keys = nil
         end
 
         def merged_context
-          merged_ctx = {}
-          each_present_path_ctx do |path_ctx|
-            merged_ctx = path_ctx.merge(merged_ctx)
+          if @scoped_contexts.nil?
+            NO_CONTEXT
+          else
+            merged_ctx = {}
+            each_present_path_ctx do |path_ctx|
+              merged_ctx = path_ctx.merge(merged_ctx)
+            end
+            merged_ctx
           end
-          merged_ctx
         end
 
         def merge!(hash)
+          @all_keys ||= Set.new
           @all_keys.merge(hash.keys)
-          ctx = @scoped_contexts
+          ctx = @scoped_contexts ||= {}
           current_path.each do |path_part|
             ctx = ctx[path_part] ||= { parent: ctx }
           end
@@ -129,7 +124,7 @@ module GraphQL
         end
 
         def key?(key)
-          if @all_keys.include?(key)
+          if @all_keys && @all_keys.include?(key)
             each_present_path_ctx do |path_ctx|
               if path_ctx.key?(key)
                 return true
@@ -149,7 +144,7 @@ module GraphQL
         end
 
         def current_path
-          @query_context.current_path || @no_path
+          @query_context.current_path || NO_PATH
         end
 
         def dig(key, *other_keys)
@@ -172,19 +167,23 @@ module GraphQL
         # but look up the tree for previously-assigned scoped values
         def each_present_path_ctx
           ctx = @scoped_contexts
-          current_path.each do |path_part|
-            if ctx.key?(path_part)
-              ctx = ctx[path_part]
-            else
-              break
+          if ctx.nil?
+            # no-op
+          else
+            current_path.each do |path_part|
+              if ctx.key?(path_part)
+                ctx = ctx[path_part]
+              else
+                break
+              end
             end
-          end
 
-          while ctx
-            if (scoped_ctx = ctx[:scoped_context])
-              yield(scoped_ctx)
+            while ctx
+              if (scoped_ctx = ctx[:scoped_context])
+                yield(scoped_ctx)
+              end
+              ctx = ctx[:parent]
             end
-            ctx = ctx[:parent]
           end
         end
       end
@@ -329,9 +328,6 @@ module GraphQL
       end
 
       def scoped_merge!(hash)
-        if @scoped_context == EmptyScopedContext
-          @scoped_context = ScopedContext.new(self)
-        end
         @scoped_context.merge!(hash)
       end
 

data/lib/graphql/schema/timeout.rb

@@ -81,7 +81,7 @@ module GraphQL
 
             error
           else
-            yield
+            super
           end
         end
       end

data/lib/graphql/schema.rb

@@ -147,7 +147,12 @@ module GraphQL
         if new_class
           @trace_class = new_class
         elsif !defined?(@trace_class)
-          @trace_class = Class.new(GraphQL::Tracing::Trace)
+          parent_trace_class = if superclass.respond_to?(:trace_class)
+            superclass.trace_class
+          else
+            GraphQL::Tracing::Trace
+          end
+          @trace_class = Class.new(parent_trace_class)
         end
         @trace_class
       end
@@ -955,14 +960,17 @@ module GraphQL
       # @param options [Hash] Keywords that will be passed to the tracing class during `#initialize`
       # @return [void]
       def trace_with(trace_mod, **options)
-        @trace_options ||= {}
-        @trace_options.merge!(options)
+        trace_options.merge!(options)
         trace_class.include(trace_mod)
       end
 
+      def trace_options
+        @trace_options ||= superclass.respond_to?(:trace_options) ? superclass.trace_options.dup : {}
+      end
+
       def new_trace(**options)
         if defined?(@trace_options)
-          options = @trace_options.merge(options)
+          options = trace_options.merge(options)
         end
         trace_class.new(**options)
       end

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

@@ -35,7 +35,7 @@ module GraphQL
       #     # Alternatively, you can call the class methods followed by your edge type
       #     # edges_nullable true
       #     # edge_nullable true
-      #     # nodes_nullable true
+      #     # node_nullable true
       #     # has_nodes_field true
       #     # edge_type Types::PostEdge
       #   end

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -58,8 +58,12 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
     GraphQL::Language::Parser.parse(string, filename: filename, trace: trace)
   end
 
-  # @return [Array<GraphQL::Language::Token>]
+  # @return [Array<Array>]
   def self.scan(graphql_string)
+    scan_with_ruby(graphql_string)
+  end
+
+  def self.scan_with_ruby(graphql_string)
     GraphQL::Language::Lexer.tokenize(graphql_string)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.19
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -112,16 +112,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +331,6 @@ files:
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution_error.rb
 - lib/graphql/filter.rb
-- lib/graphql/graphql_ext.bundle
 - lib/graphql/integer_decoding_error.rb
 - lib/graphql/integer_encoding_error.rb
 - lib/graphql/introspection.rb