graphql 1.8.7 → 1.9.0

data/lib/graphql/language/parser.rb

@@ -28,7 +28,7 @@ def parse_document
     end
     # From the tokens, build an AST
     @tracer.trace("parse", {query_string: @query_string}) do
-      if @tokens.none?
+      if @tokens.empty?
         make_node(:Document, definitions: [], filename: @filename)
       else
         do_parse
@@ -476,24 +476,24 @@ racc_action_default = [
    -93,   -97,   -99,   -99,  -165,  -160 ]
 
 racc_goto_table = [
-    10,    72,    59,    10,    91,   195,   129,   132,   133,   283,
-   164,   203,    68,   125,   175,   202,   102,   135,    92,    37,
-   259,   227,    37,     4,   301,   182,    39,   159,   235,    99,
-   304,   119,   271,   245,   274,   270,   118,     2,   140,   271,
-   171,   274,   274,   167,   153,    88,   311,   139,    97,   143,
-   145,   147,   149,   134,   177,   103,   175,   281,     1,   288,
-   161,   256,    99,    95,   231,   202,   313,    40,   183,     3,
-   117,   258,   141,   266,   121,   165,   241,   127,   152,   292,
-   221,   248,   249,   224,   179,   202,   252,   276,   144,   146,
-   148,   150,   151,   255,   154,   155,   156,   157,   286,    99,
-   124,   137,   202,    99,    67,    99,   251,    99,   236,    99,
-   264,   170,   294,   246,   240,   173,   nil,    91,   264,   247,
-   nil,   nil,   172,   180,   nil,   nil,    41,    65,   264,   nil,
-   nil,   202,   nil,   nil,   189,   137,   nil,   202,   137,    99,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   197,   nil,   264,
-   202,   nil,   nil,   202,   nil,   nil,   nil,   nil,   nil,   264,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   201,   nil,
-   nil,   nil,   nil,   nil,   nil,    65,   nil,   137,   nil,   nil,
+    10,    72,    59,    10,    91,   195,   129,   164,   133,    68,
+   102,   203,   283,   259,   227,   202,    92,   175,   119,    37,
+   125,   235,    37,   274,   182,   270,   245,   135,   271,    99,
+   274,   274,   301,   140,   118,   271,   141,   132,   304,   153,
+   171,   139,   152,   143,   145,   147,   149,   161,    97,     2,
+   167,   134,   288,   236,   311,   103,    88,   159,   246,   175,
+    95,   256,    99,   231,   177,   202,   266,   240,     4,   313,
+   117,    39,   247,   165,   121,   281,   241,   127,   179,     1,
+   276,   248,   249,   252,    40,   202,   183,     3,   144,   146,
+   148,   150,   151,   258,   154,   155,   156,   157,   286,    99,
+   292,   137,   202,    99,   255,    99,   251,    99,   124,    99,
+   221,   170,   294,   224,    67,   173,   nil,    91,   nil,   nil,
+   nil,   nil,   172,   180,   264,   nil,    41,    65,   nil,   nil,
+   nil,   202,   264,   nil,   189,   137,   nil,   202,   137,    99,
+   nil,   nil,   264,   nil,   nil,   nil,   nil,   197,   nil,   nil,
+   202,   nil,   nil,   202,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   264,   nil,   nil,   nil,   nil,   201,   nil,
+   nil,   nil,   nil,   264,   nil,    65,   nil,   137,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   100,   nil,   nil,
    104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
    114,   115,   nil,   nil,   nil,   nil,   238,   242,   308,   122,
@@ -520,24 +520,24 @@ racc_goto_table = [
    nil,   nil,   nil,   nil,   nil,   nil,   309,   nil,   293 ]
 
 racc_goto_check = [
-    10,    13,    15,    10,    23,    79,    19,    14,    19,    20,
-    22,    36,    28,    35,    55,    29,    48,    54,    27,    32,
-    45,    71,    32,     4,    21,    76,     4,    14,    71,    49,
-    21,    18,    31,    71,    78,    30,    17,     2,    70,    31,
-    19,    78,    78,    35,    70,    12,    21,    48,    13,    48,
-    48,    48,    48,    27,    54,    13,    55,    81,     1,    45,
-    18,    36,    49,    28,    76,    29,    20,    11,    77,     3,
-    13,    44,    72,    71,    13,    27,    74,    13,    72,    47,
-    14,    74,    74,    14,    48,    29,    22,    71,    13,    13,
-    13,    13,    13,    43,    13,    13,    13,    13,    36,    49,
-    34,    10,    29,    49,    50,    49,    19,    49,    73,    49,
-    80,    13,    79,    73,    33,    13,   nil,    23,    80,    33,
-   nil,   nil,    15,    13,   nil,   nil,    16,    16,    80,   nil,
-   nil,    29,   nil,   nil,    13,    10,   nil,    29,    10,    49,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil,    80,
-    29,   nil,   nil,    29,   nil,   nil,   nil,   nil,   nil,    80,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
-   nil,   nil,   nil,   nil,   nil,    16,   nil,    10,   nil,   nil,
+    10,    13,    15,    10,    23,    79,    19,    22,    19,    28,
+    48,    36,    20,    45,    71,    29,    27,    55,    18,    32,
+    35,    71,    32,    78,    76,    30,    71,    54,    31,    49,
+    78,    78,    21,    70,    17,    31,    72,    14,    21,    70,
+    19,    48,    72,    48,    48,    48,    48,    18,    13,     2,
+    35,    27,    45,    73,    21,    13,    12,    14,    73,    55,
+    28,    36,    49,    76,    54,    29,    71,    33,     4,    20,
+    13,     4,    33,    27,    13,    81,    74,    13,    48,     1,
+    71,    74,    74,    22,    11,    29,    77,     3,    13,    13,
+    13,    13,    13,    44,    13,    13,    13,    13,    36,    49,
+    47,    10,    29,    49,    43,    49,    19,    49,    34,    49,
+    14,    13,    79,    14,    50,    13,   nil,    23,   nil,   nil,
+   nil,   nil,    15,    13,    80,   nil,    16,    16,   nil,   nil,
+   nil,    29,    80,   nil,    13,    10,   nil,    29,    10,    49,
+   nil,   nil,    80,   nil,   nil,   nil,   nil,    13,   nil,   nil,
+    29,   nil,   nil,    29,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    80,   nil,   nil,   nil,   nil,    10,   nil,
+   nil,   nil,   nil,    80,   nil,    16,   nil,    10,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,
     16,    16,    16,    16,    16,    16,    16,    16,    16,    16,
     16,    16,   nil,   nil,   nil,   nil,    32,    32,    19,    16,
@@ -564,15 +564,15 @@ racc_goto_check = [
    nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,    16 ]
 
 racc_goto_pointer = [
-   nil,    58,    37,    69,    23,   nil,   nil,   nil,   nil,   nil,
-     0,    57,     5,   -18,   -90,    -9,   116,   -53,   -58,   -90,
-  -242,  -260,  -111,   -55,   nil,   nil,   nil,   -47,    -3,  -153,
-  -203,  -208,    19,   -73,     6,   -81,  -157,   nil,   nil,   nil,
-   nil,   nil,   nil,  -125,  -148,  -199,   nil,  -182,   -57,   -40,
-    89,   nil,   nil,   nil,   -84,  -121,   nil,   nil,   nil,   nil,
+   nil,    79,    49,    87,    68,   nil,   nil,   nil,   nil,   nil,
+     0,    74,    16,   -18,   -60,    -9,   116,   -55,   -71,   -90,
+  -239,  -252,  -114,   -55,   nil,   nil,   nil,   -49,    -6,  -153,
+  -213,  -212,    19,  -120,    14,   -74,  -157,   nil,   nil,   nil,
+   nil,   nil,   nil,  -114,  -126,  -206,   nil,  -161,   -63,   -40,
+    99,   nil,   nil,   nil,   -74,  -118,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   -67,  -157,   -33,   -78,  -112,   nil,  -117,   -74,  -207,  -153,
-  -117,  -193 ]
+   -72,  -164,   -69,  -133,  -112,   nil,  -118,   -56,  -218,  -153,
+  -103,  -175 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,     5,     6,     7,     8,     9,
@@ -1246,7 +1246,7 @@ module_eval(<<'.,.,', 'parser.y', 116)
 
 module_eval(<<'.,.,', 'parser.y', 159)
   def _reduce_60(val, _values, result)
-     return make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), position_source: val[0] || val[1]) 
+     return 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
   end
 .,.,
@@ -1572,7 +1572,7 @@ module_eval(<<'.,.,', 'parser.y', 273)
 
 module_eval(<<'.,.,', 'parser.y', 282)
   def _reduce_113(val, _values, result)
-     return make_node(:SchemaDefinition, position_source: val[0], directives: val[1], **val[3]) 
+     return make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0].line, directives: val[1], **val[3]) 
     result
   end
 .,.,
@@ -1734,7 +1734,7 @@ module_eval(<<'.,.,', 'parser.y', 338)
 
 module_eval(<<'.,.,', 'parser.y', 348)
   def _reduce_149(val, _values, result)
-            return make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return 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
   end
@@ -1742,7 +1742,7 @@ module_eval(<<'.,.,', 'parser.y', 348)
 
 module_eval(<<'.,.,', 'parser.y', 353)
   def _reduce_150(val, _values, result)
-            return make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
       
     result
   end
@@ -1808,7 +1808,7 @@ module_eval(<<'.,.,', 'parser.y', 371)
 
 module_eval(<<'.,.,', 'parser.y', 375)
   def _reduce_160(val, _values, result)
-            return make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return 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
   end
@@ -1844,7 +1844,7 @@ module_eval(<<'.,.,', 'parser.y', 384)
 
 module_eval(<<'.,.,', 'parser.y', 388)
   def _reduce_165(val, _values, result)
-            return make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return 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
   end
@@ -1873,7 +1873,7 @@ module_eval(<<'.,.,', 'parser.y', 394)
 
 module_eval(<<'.,.,', 'parser.y', 398)
   def _reduce_169(val, _values, result)
-            return make_node(:InterfaceTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return make_node(:InterfaceTypeDefinition, 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
   end
@@ -1895,7 +1895,7 @@ module_eval(<<'.,.,', 'parser.y', 403)
 
 module_eval(<<'.,.,', 'parser.y', 407)
   def _reduce_172(val, _values, result)
-            return make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return 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
   end
@@ -1903,7 +1903,7 @@ module_eval(<<'.,.,', 'parser.y', 407)
 
 module_eval(<<'.,.,', 'parser.y', 412)
   def _reduce_173(val, _values, result)
-             return make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+             return 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
   end
@@ -1911,7 +1911,7 @@ module_eval(<<'.,.,', 'parser.y', 412)
 
 module_eval(<<'.,.,', 'parser.y', 417)
   def _reduce_174(val, _values, result)
-            return make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return 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
   end
@@ -1919,7 +1919,7 @@ module_eval(<<'.,.,', 'parser.y', 417)
 
 module_eval(<<'.,.,', 'parser.y', 422)
   def _reduce_175(val, _values, result)
-            return make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[6], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+            return make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[6], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
       
     result
   end

data/lib/graphql/language/parser.y

@@ -157,7 +157,7 @@ rule
     | schema_keyword
 
   enum_value_definition:
-    description_opt enum_name directives_list_opt { return make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), position_source: val[0] || val[1]) }
+    description_opt enum_name directives_list_opt { return 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]) }
 
   enum_value_definitions:
       enum_value_definition                        { return [val[0]] }
@@ -280,7 +280,7 @@ rule
    | directive_definition
 
   schema_definition:
-      SCHEMA directives_list_opt LCURLY operation_type_definition_list RCURLY { return make_node(:SchemaDefinition, position_source: val[0], directives: val[1], **val[3]) }
+      SCHEMA directives_list_opt LCURLY operation_type_definition_list RCURLY { return make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0].line, directives: val[1], **val[3]) }
 
   operation_type_definition_list:
       operation_type_definition
@@ -346,12 +346,12 @@ rule
 
   scalar_type_definition:
       description_opt SCALAR name directives_list_opt {
-        return make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return 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])
       }
 
   object_type_definition:
       description_opt TYPE name implements_opt directives_list_opt LCURLY field_definition_list RCURLY {
-        return make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
       }
 
   implements_opt:
@@ -373,7 +373,7 @@ rule
 
   input_value_definition:
       description_opt name COLON type default_value_opt directives_list_opt {
-        return make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return 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])
       }
 
   input_value_definition_list:
@@ -386,7 +386,7 @@ rule
 
   field_definition:
       description_opt name arguments_definitions_opt COLON type directives_list_opt {
-        return make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return 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])
       }
 
   field_definition_list:
@@ -396,7 +396,7 @@ rule
 
   interface_type_definition:
       description_opt INTERFACE name directives_list_opt LCURLY field_definition_list RCURLY {
-        return make_node(:InterfaceTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return make_node(:InterfaceTypeDefinition, 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])
       }
 
   union_members:
@@ -405,22 +405,22 @@ rule
 
   union_type_definition:
       description_opt UNION name directives_list_opt EQUALS union_members {
-        return make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return 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])
       }
 
   enum_type_definition:
       description_opt ENUM name directives_list_opt LCURLY enum_value_definitions RCURLY {
-         return make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+         return 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])
       }
 
   input_object_type_definition:
       description_opt INPUT name directives_list_opt LCURLY input_value_definition_list RCURLY {
-        return make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return 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])
       }
 
   directive_definition:
       description_opt DIRECTIVE DIR_SIGN name arguments_definitions_opt ON directive_locations {
-        return make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[6], description: val[0] || get_description(val[1]), position_source: val[0] || val[1])
+        return make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[6], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
       }
 
   directive_locations:
@@ -447,7 +447,7 @@ def parse_document
     end
     # From the tokens, build an AST
     @tracer.trace("parse", {query_string: @query_string}) do
-      if @tokens.none?
+      if @tokens.empty?
         make_node(:Document, definitions: [], filename: @filename)
       else
         do_parse

data/lib/graphql/language/printer.rb

@@ -135,7 +135,7 @@ module GraphQL
         if (schema.query.nil? || schema.query == 'Query') &&
            (schema.mutation.nil? || schema.mutation == 'Mutation') &&
            (schema.subscription.nil? || schema.subscription == 'Subscription') &&
-           (schema.directives.none?)
+           (schema.directives.empty?)
           return
         end
 
@@ -254,7 +254,7 @@ module GraphQL
         return ''.dup unless node.description
 
         description = indent != '' && !first_in_block ? "\n".dup : "".dup
-        description << GraphQL::Language::Comments.commentize(node.description, indent: indent)
+        description << GraphQL::Language::BlockString.print(node.description, indent: indent)
       end
 
       def print_field_definitions(fields)

data/lib/graphql/language/visitor.rb

@@ -3,32 +3,61 @@ module GraphQL
   module Language
     # Depth-first traversal through the tree, calling hooks at each stop.
     #
-    # @example Create a visitor, add hooks, then search a document
-    #   total_field_count = 0
-    #   visitor = GraphQL::Language::Visitor.new(document)
-    #   # Whenever you find a field, increment the field count:
-    #   visitor[GraphQL::Language::Nodes::Field] << ->(node) { total_field_count += 1 }
-    #   # When we finish, print the field count:
-    #   visitor[GraphQL::Language::Nodes::Document].leave << ->(node) { p total_field_count }
-    #   visitor.visit
-    #   # => 6
+    # @example Create a visitor counting certain field names
+    #   class NameCounter < GraphQL::Language::Visitor
+    #     def initialize(document, field_name)
+    #       super(document)
+    #       @field_name
+    #       @count = 0
+    #     end
+    #
+    #     attr_reader :count
+    #
+    #     def on_field(node, parent)
+    #       # if this field matches our search, increment the counter
+    #       if node.name == @field_name
+    #         @count = 0
+    #       end
+    #       # Continue visiting subfields:
+    #       super
+    #     end
+    #   end
     #
+    #   # Initialize a visitor
+    #   visitor = GraphQL::Language::Visitor.new(document, "name")
+    #   # Run it
+    #   visitor.visit
+    #   # Check the result
+    #   visitor.count
+    #   # => 3
     class Visitor
       # If any hook returns this value, the {Visitor} stops visiting this
       # node right away
+      # @deprecated Use `super` to continue the visit; or don't call it to halt.
       SKIP = :_skip
 
+      class DeleteNode; end
+
+      # When this is returned from a visitor method,
+      # Then the `node` passed into the method is removed from `parent`'s children.
+      DELETE_NODE = DeleteNode.new
+
       def initialize(document)
         @document = document
         @visitors = {}
+        @result = nil
       end
 
+      # @return [GraphQL::Language::Nodes::Document] The document with any modifications applied
+      attr_reader :result
+
       # Get a {NodeVisitor} for `node_class`
       # @param node_class [Class] The node class that you want to listen to
       # @return [NodeVisitor]
       #
       # @example Run a hook whenever you enter a new Field
       #   visitor[GraphQL::Language::Nodes::Field] << ->(node, parent) { p "Here's a field" }
+      # @deprecated see `on_` methods, like {#on_field}
       def [](node_class)
         @visitors[node_class] ||= NodeVisitor.new
       end
@@ -36,17 +65,131 @@ module GraphQL
       # Visit `document` and all children, applying hooks as you go
       # @return [void]
       def visit
-        visit_node(@document, nil)
+        result = on_node_with_modifications(@document, nil)
+        @result = if result.is_a?(Array)
+          result.first
+        else
+          # The node wasn't modified
+          @document
+        end
+      end
+
+      # Call the user-defined handler for `node`.
+      def visit_node(node, parent)
+        public_send(node.visit_method, node, parent)
+      end
+
+      # The default implementation for visiting an AST node.
+      # It doesn't _do_ anything, but it continues to visiting the node's children.
+      # To customize this hook, override one of its make_visit_methodes (or the base method?)
+      # in your subclasses.
+      #
+      # For compatibility, it calls hook procs, too.
+      # @param node [GraphQL::Language::Nodes::AbstractNode] the node being visited
+      # @param parent [GraphQL::Language::Nodes::AbstractNode, nil] the previously-visited node, or `nil` if this is the root node.
+      # @return [Array, nil] If there were modifications, it returns an array of new nodes, otherwise, it returns `nil`.
+      def on_abstract_node(node, parent)
+        if node == DELETE_NODE
+          # This might be passed to `super(DELETE_NODE, ...)`
+          # by a user hook, don't want to keep visiting in that case.
+          nil
+        else
+          # Run hooks if there are any
+          new_node = node
+          begin_hooks_ok = @visitors.empty? || begin_visit(new_node, parent)
+          if begin_hooks_ok
+            node.children.each do |child_node|
+              new_child_and_node = on_node_with_modifications(child_node, new_node)
+              # Reassign `node` in case the child hook makes a modification
+              if new_child_and_node.is_a?(Array)
+                new_node = new_child_and_node[1]
+              end
+            end
+          end
+          @visitors.any? && end_visit(new_node, parent)
+
+          if new_node.equal?(node)
+            nil
+          else
+            [new_node, parent]
+          end
+        end
+      end
+
+      # We don't use `alias` here because it breaks `super`
+      def self.make_visit_method(node_method)
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def #{node_method}(node, parent)
+            child_mod = on_abstract_node(node, parent)
+            # If visiting the children returned changes, continue passing those.
+            child_mod || [node, parent]
+          end
+        RUBY
       end
 
+      make_visit_method :on_argument
+      make_visit_method :on_directive
+      make_visit_method :on_directive_definition
+      make_visit_method :on_directive_location
+      make_visit_method :on_document
+      make_visit_method :on_enum
+      make_visit_method :on_enum_type_definition
+      make_visit_method :on_enum_type_extension
+      make_visit_method :on_enum_value_definition
+      make_visit_method :on_field
+      make_visit_method :on_field_definition
+      make_visit_method :on_fragment_definition
+      make_visit_method :on_fragment_spread
+      make_visit_method :on_inline_fragment
+      make_visit_method :on_input_object
+      make_visit_method :on_input_object_type_definition
+      make_visit_method :on_input_object_type_extension
+      make_visit_method :on_input_value_definition
+      make_visit_method :on_interface_type_definition
+      make_visit_method :on_interface_type_extension
+      make_visit_method :on_list_type
+      make_visit_method :on_non_null_type
+      make_visit_method :on_null_value
+      make_visit_method :on_object_type_definition
+      make_visit_method :on_object_type_extension
+      make_visit_method :on_operation_definition
+      make_visit_method :on_scalar_type_definition
+      make_visit_method :on_scalar_type_extension
+      make_visit_method :on_schema_definition
+      make_visit_method :on_schema_extension
+      make_visit_method :on_type_name
+      make_visit_method :on_union_type_definition
+      make_visit_method :on_union_type_extension
+      make_visit_method :on_variable_definition
+      make_visit_method :on_variable_identifier
+
       private
 
-      def visit_node(node, parent)
-        begin_hooks_ok = begin_visit(node, parent)
-        if begin_hooks_ok
-          node.children.each { |child| visit_node(child, node) }
+      # Run the hooks for `node`, and if the hooks return a copy of `node`,
+      # copy `parent` so that it contains the copy of that node as a child,
+      # then return the copies
+      def on_node_with_modifications(node, parent)
+        new_node_and_new_parent = visit_node(node, parent)
+        if new_node_and_new_parent.is_a?(Array)
+          new_node = new_node_and_new_parent[0]
+          new_parent = new_node_and_new_parent[1]
+          if new_node.is_a?(Nodes::AbstractNode) && !node.equal?(new_node)
+            # The user-provided hook returned a new node.
+            new_parent = new_parent && new_parent.replace_child(node, new_node)
+            return new_node, new_parent
+          elsif new_node == DELETE_NODE
+            # The user-provided hook requested to remove this node
+            new_parent = new_parent && new_parent.delete_child(node)
+            return nil, new_parent
+          else
+            new_node_and_new_parent
+          end
+        else
+          # The user-provided hook didn't make any modifications.
+          # In fact, the hook might have returned who-knows-what, so
+          # ignore the return value and use the original values.
+          new_node_and_new_parent
         end
-        end_visit(node, parent)
       end
 
       def begin_visit(node, parent)

data/lib/graphql/language.rb

@@ -9,7 +9,6 @@ require "graphql/language/nodes"
 require "graphql/language/parser"
 require "graphql/language/token"
 require "graphql/language/visitor"
-require "graphql/language/comments"
 
 module GraphQL
   module Language

data/lib/graphql/literal_validation_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module GraphQL
+  class LiteralValidationError < GraphQL::Error
+    attr_accessor :ast_value
+  end
+end

data/lib/graphql/query/arguments.rb

@@ -6,6 +6,7 @@ module GraphQL
     # {Arguments} recursively wraps the input in {Arguments} instances.
     class Arguments
       extend Forwardable
+      include GraphQL::Dig
 
       def self.construct_arguments_class(argument_owner)
         argument_definitions = argument_owner.arguments
@@ -40,7 +41,7 @@ module GraphQL
       def initialize(values, context:, defaults_used:)
         @argument_values = values.inject({}) do |memo, (inner_key, inner_value)|
           arg_name = inner_key.to_s
-          arg_defn = self.class.argument_definitions[arg_name]
+          arg_defn = self.class.argument_definitions[arg_name] || raise("Not found #{arg_name} among #{self.class.argument_definitions.keys}")
           arg_default_used = defaults_used.include?(arg_name)
           arg_value = wrap_value(inner_value, arg_defn.type, context)
           string_key = arg_defn.expose_as
@@ -167,7 +168,7 @@ module GraphQL
             memo[key] = unwrap_value(value)
             memo
           end
-        when GraphQL::Query::Arguments
+        when GraphQL::Query::Arguments, GraphQL::Schema::InputObject
           value.to_h
         else
           value

data/lib/graphql/query/arguments_cache.rb

@@ -8,7 +8,7 @@ module GraphQL
         Hash.new do |h1, irep_or_ast_node|
           h1[irep_or_ast_node] = Hash.new do |h2, definition|
             ast_node = irep_or_ast_node.is_a?(GraphQL::InternalRepresentation::Node) ? irep_or_ast_node.ast_node : irep_or_ast_node
-            h2[definition] = if definition.arguments.none?
+            h2[definition] = if definition.arguments.empty?
               GraphQL::Query::Arguments::NO_ARGS
             else
               GraphQL::Query::LiteralInput.from_arguments(

data/lib/graphql/query/context.rb

@@ -7,7 +7,7 @@ module GraphQL
     # It delegates `[]` to the hash that's passed to `GraphQL::Query#initialize`.
     class Context
       module SharedMethods
-        # @return [Object] The target for field resultion
+        # @return [Object] The target for field resolution
         attr_accessor :object
 
         # @return [Hash, Array, String, Integer, Float, Boolean, nil] The resolved value for this field
@@ -74,6 +74,12 @@ module GraphQL
         def execution_errors
           @execution_errors ||= ExecutionErrors.new(self)
         end
+
+        def lookahead
+          ast_nodes = irep_node.ast_nodes
+          field = irep_node.definition.metadata[:type_class] || raise("Lookahead is only compatible with class-based schemas")
+          Execution::Lookahead.new(query: query, ast_nodes: ast_nodes, field: field)
+        end
       end
 
       class ExecutionErrors
@@ -151,11 +157,14 @@ module GraphQL
         @context = self # for SharedMethods
       end
 
+      # @api private
+      attr_writer :interpreter
+
       # @api private
       attr_writer :value
 
-      def_delegators :@provided_values, :[], :[]=, :to_h, :key?, :fetch
-      def_delegators :@query, :trace
+      def_delegators :@provided_values, :[], :[]=, :to_h, :to_hash, :key?, :fetch, :dig
+      def_delegators :@query, :trace, :interpreter?
 
       # @!method [](key)
       #   Lookup `key` from the hash passed to {Schema#execute} as `context:`
@@ -220,9 +229,9 @@ module GraphQL
         end
 
         def_delegators :@context,
-          :[], :[]=, :key?, :fetch, :to_h, :namespace,
+          :[], :[]=, :key?, :fetch, :to_h, :namespace, :dig,
           :spawn, :warden, :errors,
-          :execution_strategy, :strategy
+          :execution_strategy, :strategy, :interpreter?
 
         # @return [GraphQL::Language::Nodes::Field] The AST node for the currently-executing field
         def ast_node

data/lib/graphql/query/executor.rb

@@ -12,7 +12,7 @@ module GraphQL
         @query = query
       end
 
-      # Evalute {operation_name} on {query}.
+      # Evaluate {operation_name} on {query}.
       # Handle {GraphQL::ExecutionError}s by putting them in the "errors" key.
       # @return [Hash] A GraphQL response, with either a "data" key or an "errors" key
       def result