graphql 2.0.17 → 2.0.19

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 "".
 #
 
@@ -16,22 +16,22 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 448)
 
 EMPTY_ARRAY = [].freeze
 
-def initialize(query_string, filename:, tracer: Tracing::NullTracer)
+def initialize(query_string, filename:, trace: Tracing::NullTrace)
   raise GraphQL::ParseError.new("No query string was present", nil, nil, query_string) if query_string.nil?
   @query_string = query_string
   @filename = filename
-  @tracer = tracer
+  @trace = trace
   @reused_next_token = [nil, nil]
 end
 
 def parse_document
   @document ||= begin
     # Break the string into tokens
-    @tracer.trace("lex", {query_string: @query_string}) do
+    @trace.lex(query_string: @query_string) do
       @tokens ||= GraphQL.scan(@query_string)
     end
     # From the tokens, build an AST
-    @tracer.trace("parse", {query_string: @query_string}) do
+    @trace.parse(query_string: @query_string) do
       if @tokens.empty?
         raise GraphQL::ParseError.new("Unexpected end of document", nil, nil, @query_string)
       else
@@ -44,17 +44,17 @@ end
 class << self
   attr_accessor :cache
 
-  def parse(query_string, filename: nil, tracer: GraphQL::Tracing::NullTracer)
-    new(query_string, filename: filename, tracer: tracer).parse_document
+  def parse(query_string, filename: nil, trace: GraphQL::Tracing::NullTrace)
+    new(query_string, filename: filename, trace: trace).parse_document
   end
 
-  def parse_file(filename, tracer: GraphQL::Tracing::NullTracer)
+  def parse_file(filename, trace: GraphQL::Tracing::NullTrace)
     if cache
       cache.fetch(filename) do
-        parse(File.read(filename), filename: filename, tracer: tracer)
+        parse(File.read(filename), filename: filename, trace: trace)
       end
     else
-      parse(File.read(filename), filename: filename, tracer: tracer)
+      parse(File.read(filename), filename: filename, trace: trace)
     end
   end
 end
@@ -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 ----
@@ -448,22 +448,22 @@ end
 
 EMPTY_ARRAY = [].freeze
 
-def initialize(query_string, filename:, tracer: Tracing::NullTracer)
+def initialize(query_string, filename:, trace: Tracing::NullTrace)
   raise GraphQL::ParseError.new("No query string was present", nil, nil, query_string) if query_string.nil?
   @query_string = query_string
   @filename = filename
-  @tracer = tracer
+  @trace = trace
   @reused_next_token = [nil, nil]
 end
 
 def parse_document
   @document ||= begin
     # Break the string into tokens
-    @tracer.trace("lex", {query_string: @query_string}) do
+    @trace.lex(query_string: @query_string) do
       @tokens ||= GraphQL.scan(@query_string)
     end
     # From the tokens, build an AST
-    @tracer.trace("parse", {query_string: @query_string}) do
+    @trace.parse(query_string: @query_string) do
       if @tokens.empty?
         raise GraphQL::ParseError.new("Unexpected end of document", nil, nil, @query_string)
       else
@@ -476,17 +476,17 @@ end
 class << self
   attr_accessor :cache
 
-  def parse(query_string, filename: nil, tracer: GraphQL::Tracing::NullTracer)
-    new(query_string, filename: filename, tracer: tracer).parse_document
+  def parse(query_string, filename: nil, trace: GraphQL::Tracing::NullTrace)
+    new(query_string, filename: filename, trace: trace).parse_document
   end
 
-  def parse_file(filename, tracer: GraphQL::Tracing::NullTracer)
+  def parse_file(filename, trace: GraphQL::Tracing::NullTrace)
     if cache
       cache.fetch(filename) do
-        parse(File.read(filename), filename: filename, tracer: tracer)
+        parse(File.read(filename), filename: filename, trace: trace)
       end
     else
-      parse(File.read(filename), filename: filename, tracer: tracer)
+      parse(File.read(filename), filename: filename, trace: trace)
     end
   end
 end
@@ -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/pagination/active_record_relation_connection.rb

@@ -7,14 +7,6 @@ module GraphQL
     class ActiveRecordRelationConnection < Pagination::RelationConnection
       private
 
-      def relation_larger_than(relation, initial_offset, size)
-        if already_loaded?(relation)
-          (relation.size + initial_offset) > size
-        else
-          set_offset(sliced_nodes, initial_offset + size).exists?
-        end
-      end
-
       def relation_count(relation)
         int_or_hash = if already_loaded?(relation)
           relation.size

data/lib/graphql/query/context.rb

@@ -91,22 +91,31 @@ module GraphQL
       end
 
       class ScopedContext
+        NO_PATH = [].freeze
+        NO_CONTEXT = {}.freeze
+
         def initialize(query_context)
           @query_context = query_context
-          @scoped_contexts = {}
-          @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)
-          ctx = @scoped_contexts
+          @all_keys ||= Set.new
+          @all_keys.merge(hash.keys)
+          ctx = @scoped_contexts ||= {}
           current_path.each do |path_part|
             ctx = ctx[path_part] ||= { parent: ctx }
           end
@@ -114,15 +123,12 @@ module GraphQL
           this_scoped_ctx.merge!(hash)
         end
 
-        def current_path
-          thread_info = Thread.current[:__graphql_runtime_info]
-          (thread_info && thread_info[:current_path]) || @no_path
-        end
-
         def key?(key)
-          each_present_path_ctx do |path_ctx|
-            if path_ctx.key?(key)
-              return true
+          if @all_keys && @all_keys.include?(key)
+            each_present_path_ctx do |path_ctx|
+              if path_ctx.key?(key)
+                return true
+              end
             end
           end
           false
@@ -137,6 +143,10 @@ module GraphQL
           nil
         end
 
+        def current_path
+          @query_context.current_path || NO_PATH
+        end
+
         def dig(key, *other_keys)
           each_present_path_ctx do |path_ctx|
             if path_ctx.key?(key)
@@ -157,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
@@ -209,14 +223,30 @@ module GraphQL
         elsif @provided_values.key?(key)
           @provided_values[key]
         elsif RUNTIME_METADATA_KEYS.include?(key)
-          thread_info = Thread.current[:__graphql_runtime_info]
-          thread_info && thread_info[key]
+          if key == :current_path
+            current_path
+          else
+            thread_info = Thread.current[:__graphql_runtime_info]
+            thread_info && thread_info[key]
+          end
         else
           # not found
           nil
         end
       end
 
+      def current_path
+        thread_info = Thread.current[:__graphql_runtime_info]
+        path = thread_info &&
+          (result = thread_info[:current_result]) &&
+          (result.path)
+        if path && (rn = thread_info[:current_result_name])
+          path = path.dup
+          path.push(rn)
+        end
+        path
+      end
+
       def delete(key)
         if @scoped_context.key?(key)
           @scoped_context.delete(key)