graphql 1.8.0.pre9 → 1.8.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2451d4a7af012ddb1bcf72ea1bd4eeb6526fbf5bd0ca64dc166c2fbb06f4eed3
-  data.tar.gz: c0b094732484e5bc79bf988afe4c72292aad624683378cef4148f5fa93897d01
+  metadata.gz: 4fbdf256acbc1259fd520d07b4368c587954b9068bdfca85ab9a998057cbfa46
+  data.tar.gz: c78d32fa1e602301a7e370b68bc881b6f4a794355742a45608d6b5c5485d2d90
 SHA512:
-  metadata.gz: 027065ef7bb22b902d5fdfbeabe2c658b38d740b2229477dbee2eb370691e0004c0daf30f44a3cfb05e2b0e81597bc7073b93967959ff5aea62173713518a6b8
-  data.tar.gz: 5c87daac7d2420c90a480135e684197be3fceec67f6ac0288e41a8ec11efb53c8103ef81e110d1c7c1a1512b14bd093ce9d61089105f1e9b9fa0f1dcedceffa9
+  metadata.gz: 014b2608ee027d52e6145648f5eaf894dee93796a75bd01b13c2c4d0f72bd04ea806f7f7e67bb91a5d5b9d2d9e03eecdd77a9e5ba0b9bed4affb5df9e4881398
+  data.tar.gz: fe1727eca3bb06acff963916a78795980295c1c5b61a040a191d7d61d26363aa1c93cf58774673bf97c051ff614d9ba6ea84ee6e632b2b2d70ae3ecc6809b2e8

data/lib/graphql/argument.rb

@@ -37,6 +37,7 @@ module GraphQL
     include GraphQL::Define::InstanceDefinable
     accepts_definitions :name, :type, :description, :default_value, :as, :prepare
     attr_accessor :type, :description, :default_value, :name, :as
+    attr_accessor :ast_node
 
     ensure_defined(:name, :description, :default_value, :type=, :type, :as, :expose_as, :prepare)
 

data/lib/graphql/base_type.rb

@@ -19,6 +19,8 @@ module GraphQL
 
     ensure_defined(:graphql_name, :name, :description, :introspection?, :default_scalar?)
 
+    attr_accessor :ast_node
+
     def initialize
       @introspection = false
       @default_scalar = false

data/lib/graphql/compatibility/query_parser_specification.rb

@@ -123,6 +123,116 @@ module GraphQL
             end
             assert_equal [1,26], [err_2.line, err_2.col]
           end
+
+          def test_enum_value_definitions_have_a_position
+            document = parse("""
+              enum Enum {
+                VALUE
+              }
+            """)
+
+            assert_equal [3, 17], document.definitions[0].values[0].position
+          end
+
+          def test_field_definitions_have_a_position
+            document = parse("""
+              type A {
+                field: String
+              }
+            """)
+
+            assert_equal [3, 17], document.definitions[0].fields[0].position
+          end
+
+          def test_input_value_definitions_have_a_position
+            document = parse("""
+              input A {
+                field: String
+              }
+            """)
+
+            assert_equal [3, 17], document.definitions[0].fields[0].position
+          end
+
+          def test_parses_when_there_are_no_interfaces
+            schema = "
+              type A {
+                a: String
+              }
+            "
+
+            document = parse(schema)
+
+            assert_equal [], document.definitions[0].interfaces.map(&:name)
+          end
+
+          def test_parses_implements_with_leading_ampersand
+            schema = "
+              type A implements & B {
+                a: String
+              }
+            "
+
+            document = parse(schema)
+
+            assert_equal ["B"], document.definitions[0].interfaces.map(&:name)
+            assert_equal [2, 35], document.definitions[0].interfaces[0].position
+          end
+
+          def test_parses_implements_with_leading_ampersand_and_multiple_interfaces
+            schema = "
+              type A implements & B & C {
+                a: String
+              }
+            "
+
+            document = parse(schema)
+
+            assert_equal ["B", "C"], document.definitions[0].interfaces.map(&:name)
+            assert_equal [2, 35], document.definitions[0].interfaces[0].position
+            assert_equal [2, 39], document.definitions[0].interfaces[1].position
+          end
+
+          def test_parses_implements_without_leading_ampersand
+            schema = "
+              type A implements B {
+                a: String
+              }
+            "
+
+            document = parse(schema)
+
+            assert_equal ["B"], document.definitions[0].interfaces.map(&:name)
+            assert_equal [2, 33], document.definitions[0].interfaces[0].position
+          end
+
+          def test_parses_implements_without_leading_ampersand_and_multiple_interfaces
+            schema = "
+              type A implements B & C {
+                a: String
+              }
+            "
+
+            document = parse(schema)
+
+            assert_equal ["B", "C"], document.definitions[0].interfaces.map(&:name)
+            assert_equal [2, 33], document.definitions[0].interfaces[0].position
+            assert_equal [2, 37], document.definitions[0].interfaces[1].position
+          end
+
+          def test_supports_old_syntax_for_parsing_multiple_interfaces
+            schema = "
+              type A implements B, C {
+                a: String
+              }
+            "
+
+            document = parse(schema)
+
+            assert_equal ["B", "C"], document.definitions[0].interfaces.map(&:name)
+            assert_equal [2, 33], document.definitions[0].interfaces[0].position
+            assert_equal [2, 36], document.definitions[0].interfaces[1].position
+          end
         end
       end
 

data/lib/graphql/deprecated_dsl.rb

@@ -13,8 +13,17 @@ module GraphQL
   #      GraphQL::DeprecatedDSL.activate
   #
   module DeprecatedDSL
+    TYPE_CLASSES = [
+      GraphQL::Schema::Scalar,
+      GraphQL::Schema::Enum,
+      GraphQL::Schema::InputObject,
+      GraphQL::Schema::Union,
+      GraphQL::Schema::Interface,
+      GraphQL::Schema::Object,
+    ]
+
     def self.activate
-      GraphQL::Schema::Member.extend(Methods)
+      TYPE_CLASSES.each { |c| c.extend(Methods) }
       GraphQL::Schema::Member::ListTypeProxy.include(Methods)
       GraphQL::Schema::Member::NonNullTypeProxy.include(Methods)
     end
@@ -23,8 +32,11 @@ module GraphQL
         to_non_null_type
       end
     end
-    refine GraphQL::Schema::Member.singleton_class do
-      include Methods
+
+    TYPE_CLASSES.each do |type_class|
+      refine type_class.singleton_class do
+        include Methods
+      end
     end
   end
 end

data/lib/graphql/directive.rb

@@ -11,6 +11,7 @@ module GraphQL
     accepts_definitions :locations, :name, :description, :arguments, :default_directive, argument: GraphQL::Define::AssignArgument
 
     attr_accessor :locations, :arguments, :name, :description, :arguments_class
+    attr_accessor :ast_node
     # @api private
     attr_writer :default_directive
     ensure_defined(:locations, :arguments, :name, :description, :default_directive?)

data/lib/graphql/enum_type.rb

@@ -74,6 +74,7 @@ module GraphQL
   class EnumType < GraphQL::BaseType
     accepts_definitions :values, value: GraphQL::Define::AssignEnumValue
     ensure_defined(:values, :validate_non_null_input, :coerce_non_null_input, :coerce_result)
+    attr_accessor :ast_node
 
     def initialize
       super
@@ -137,6 +138,7 @@ module GraphQL
       ATTRIBUTES = [:name, :description, :deprecation_reason, :value]
       accepts_definitions(*ATTRIBUTES)
       attr_accessor(*ATTRIBUTES)
+      attr_accessor :ast_node
       ensure_defined(*ATTRIBUTES)
 
       def name=(new_name)

data/lib/graphql/execution/multiplex.rb

@@ -93,7 +93,7 @@ module GraphQL
           end
         rescue StandardError
           # Assign values here so that the query's `@executed` becomes true
-          queries.map { |q| q.result_values ||= nil }
+          queries.map { |q| q.result_values ||= {} }
           raise
         end
 

data/lib/graphql/field.rb

@@ -193,6 +193,8 @@ module GraphQL
     # @return [Boolean] True if this field should be traced. By default, fields are only traced if they are not a ScalarType or EnumType.
     attr_accessor :trace
 
+    attr_accessor :ast_node
+
     # @return [Boolean]
     def connection?
       @connection

data/lib/graphql/introspection/entry_points.rb

@@ -11,7 +11,7 @@ module GraphQL
         # Apply wrapping manually since this field isn't wrapped by instrumentation
         schema = @context.query.schema
         schema_type = schema.introspection_system.schema_type
-        schema_type.metadata[:object_class].new(schema, @context)
+        schema_type.metadata[:type_class].new(schema, @context)
       end
 
       def __type(name:)
@@ -19,7 +19,7 @@ module GraphQL
         if type
           # Apply wrapping manually since this field isn't wrapped by instrumentation
           type_type = @context.schema.introspection_system.type_type
-          type_type.metadata[:object_class].new(type, @context)
+          type_type.metadata[:type_class].new(type, @context)
         else
           nil
         end

data/lib/graphql/introspection/schema_field.rb

@@ -9,7 +9,7 @@ module GraphQL
         # Apply wrapping manually since this field isn't wrapped by instrumentation
         schema = ctx.query.schema
         schema_type = schema.introspection_system.schema_type
-        schema_type.metadata[:object_class].new(schema, ctx.query.context)
+        schema_type.metadata[:type_class].new(schema, ctx.query.context)
       }
     end
   end

data/lib/graphql/introspection/type_by_name_field.rb

@@ -12,7 +12,7 @@ module GraphQL
         if type
           # Apply wrapping manually since this field isn't wrapped by instrumentation
           type_type = ctx.schema.introspection_system.type_type
-          type_type.metadata[:object_class].new(type, ctx)
+          type_type.metadata[:type_class].new(type, ctx)
         else
           nil
         end

data/lib/graphql/language/parser.rb

@@ -104,15 +104,15 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-  -127,    10,    11,    12,   140,    80,    77,   226,   140,    76,
-   130,    99,    36,    37,    38,    39,    40,    41,    42,    43,
+  -127,    10,    11,    12,   115,    10,    11,    12,   140,    10,
+    11,    12,    36,    37,    38,    39,    40,    41,    42,    43,
     44,    45,    46,    47,    48,    49,    73,    10,    11,    12,
     80,  -127,   119,  -127,   140,   140,   140,   190,    36,    37,
     38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-    48,    49,    53,    10,    11,    12,    80,    59,    80,   115,
-    10,    11,    12,    31,    36,    37,    38,    39,    40,    41,
+    48,    49,    53,    10,    11,    12,    80,    59,    80,   140,
+    77,    80,   226,    76,    36,    37,    38,    39,    40,    41,
     42,    43,    44,    45,    46,    47,    48,    49,   191,    10,
-    11,    12,   140,    59,    62,   226,    10,    11,    12,    69,
+    11,    12,   140,    59,    31,   226,   130,    99,    62,    69,
     36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
     46,    47,    48,    49,   240,    70,    10,    11,    12,    59,
     72,    84,    80,    90,   186,    80,    80,   158,    37,    38,
@@ -256,15 +256,15 @@ racc_action_table = [
     38,    39,    40,    41,    42,    43,    44,    45,   156,   157 ]
 
 racc_action_check = [
-   122,    90,    90,    90,   223,   135,    58,   223,   236,    58,
-    97,    97,    90,    90,    90,    90,    90,    90,    90,    90,
+   122,    90,    90,    90,    85,    85,    85,    85,   236,    62,
+    62,    62,    90,    90,    90,    90,    90,    90,    90,    90,
     90,    90,    90,    90,    90,    90,    52,    52,    52,    52,
    236,   122,    90,   122,   114,   142,   110,   142,    52,    52,
     52,    52,    52,    52,    52,    52,    52,    52,    52,    52,
-    52,    52,     9,     9,     9,     9,   114,    52,   110,    85,
-    85,    85,    85,     1,     9,     9,     9,     9,     9,     9,
+    52,    52,     9,     9,     9,     9,   114,    52,   110,   223,
+    58,   135,   223,    58,     9,     9,     9,     9,     9,     9,
      9,     9,     9,     9,     9,     9,     9,     9,   143,   143,
-   143,   143,   208,     9,    17,   208,    62,    62,    62,    30,
+   143,   143,   208,     9,     1,   208,    97,    97,    17,    30,
    143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
    143,   143,   143,   143,   226,    31,   226,   226,   226,   143,
     33,    60,    63,    64,   226,    65,    66,   226,   226,   226,
@@ -408,20 +408,20 @@ racc_action_check = [
    125,   125,   125,   125,   125,   125,   125,   125,   125,   125 ]
 
 racc_action_pointer = [
-   626,    63,   nil,   751,   nil,   nil,   nil,   nil,   549,    49,
-   nil,   nil,   nil,  1149,   nil,   nil,   nil,    82,   nil,   nil,
+   626,    84,   nil,   751,   nil,   nil,   nil,   nil,   549,    49,
+   nil,   nil,   nil,  1149,   nil,   nil,   nil,    86,   nil,   nil,
    nil,   nil,   nil,   nil,   874,   949,   974,  1049,  1374,  1399,
     56,   105,   nil,   103,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    23,   nil,   nil,   nil,   nil,   nil,    -1,   342,
-    96,   nil,    82,    79,    94,    82,    83,   103,   107,  1074,
+   nil,   nil,    23,   nil,   nil,   nil,   nil,   nil,    53,   342,
+    96,   nil,     5,    79,    94,    82,    83,   103,   107,  1074,
    nil,   108,   134,   nil,   nil,   111,  1224,  1274,   113,   nil,
-   599,   114,   649,   165,   724,    56,   nil,   161,   nil,   139,
-    -3,   172,   161,   175,   176,   191,   200,     2,   nil,  1424,
+   599,   114,   649,   165,   724,     1,   nil,   161,   nil,   139,
+    -3,   172,   161,   175,   176,   191,   200,    78,   nil,  1424,
    201,   198,   nil,  1124,   nil,   196,   nil,   201,   nil,   nil,
     25,  1174,   224,   nil,    23,   nil,   nil,  1199,   207,  1249,
    196,  1299,    -2,  1324,  1349,  1473,  1099,   574,   217,   nil,
-   nil,   nil,   223,   nil,   nil,   -28,   nil,   nil,   133,   nil,
+   nil,   nil,   223,   nil,   nil,    28,   nil,   nil,   133,   nil,
    nil,   232,    24,    75,   233,   nil,   674,   201,   nil,   699,
    nil,   230,   nil,   420,   nil,   202,   nil,   nil,   nil,   nil,
    nil,   221,   nil,  1450,   249,   nil,   524,   774,   799,   824,
@@ -430,7 +430,7 @@ racc_action_pointer = [
    nil,   nil,   nil,   394,   nil,   251,   nil,   nil,   899,   nil,
    nil,   nil,   924,   nil,   nil,   nil,   226,   nil,    71,   nil,
    nil,   nil,   313,   nil,   nil,   368,   nil,   254,   498,   nil,
-   nil,   999,   nil,    -7,  1024,   nil,   102,   nil,   nil,   nil,
+   nil,   999,   nil,    48,  1024,   nil,   102,   nil,   nil,   nil,
    nil,   255,   195,   nil,   nil,   275,    -3,   256,   nil,   nil,
    446,   164,   nil,   nil,   251,   nil,   nil,   nil,   nil ]
 
@@ -1146,7 +1146,7 @@ module_eval(<<'.,.,', 'parser.y', 112)
 
 module_eval(<<'.,.,', 'parser.y', 155)
   def _reduce_58(val, _values, result)
-     return make_node(:EnumValueDefinition, name: val[0], directives: val[1], description: get_description(val[0])) 
+     return make_node(:EnumValueDefinition, name: val[0], directives: val[1], description: get_description(val[0]), position_source: val[0]) 
     result
   end
 .,.,
@@ -1550,35 +1550,35 @@ module_eval(<<'.,.,', 'parser.y', 306)
 
 module_eval(<<'.,.,', 'parser.y', 309)
   def _reduce_127(val, _values, result)
-     return [make_node(:TypeName, name: val[0])] 
+     return [make_node(:TypeName, name: val[0], position_source: val[0])] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 310)
   def _reduce_128(val, _values, result)
-     val[0] << make_node(:TypeName, name: val[2]) 
+     val[0] << make_node(:TypeName, name: val[2], position_source: val[2]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 313)
   def _reduce_129(val, _values, result)
-     return [make_node(:TypeName, name: val[0])] 
+     return [make_node(:TypeName, name: val[0], position_source: val[0])] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 314)
   def _reduce_130(val, _values, result)
-     val[0] << make_node(:TypeName, name: val[1]) 
+     val[0] << make_node(:TypeName, name: val[1], position_source: val[1]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 318)
   def _reduce_131(val, _values, result)
-            return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3], directives: val[4], description: get_description(val[0]))
+            return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3], directives: val[4], description: get_description(val[0]), position_source: val[0])
       
     result
   end
@@ -1614,7 +1614,7 @@ module_eval(<<'.,.,', 'parser.y', 327)
 
 module_eval(<<'.,.,', 'parser.y', 331)
   def _reduce_136(val, _values, result)
-            return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3], directives: val[4], description: get_description(val[0]))
+            return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3], directives: val[4], description: get_description(val[0]), position_source: val[0])
       
     result
   end

data/lib/graphql/language/parser.y

@@ -153,7 +153,7 @@ rule
     | schema_keyword
 
   enum_value_definition:
-    enum_name directives_list_opt { return make_node(:EnumValueDefinition, name: val[0], directives: val[1], description: get_description(val[0])) }
+    enum_name directives_list_opt { return make_node(:EnumValueDefinition, name: val[0], directives: val[1], description: get_description(val[0]), position_source: val[0]) }
 
   enum_value_definitions:
       enum_value_definition                        { return [val[0]] }
@@ -307,16 +307,16 @@ rule
     | IMPLEMENTS legacy_interfaces_list { return val[1] }
 
   interfaces_list:
-      name                     { return [make_node(:TypeName, name: val[0])] }
-    | interfaces_list AMP name { val[0] << make_node(:TypeName, name: val[2]) }
+      name                     { return [make_node(:TypeName, name: val[0], position_source: val[0])] }
+    | interfaces_list AMP name { val[0] << make_node(:TypeName, name: val[2], position_source: val[2]) }
 
   legacy_interfaces_list:
-      name                        { return [make_node(:TypeName, name: val[0])] }
-    | legacy_interfaces_list name { val[0] << make_node(:TypeName, name: val[1]) }
+      name                        { return [make_node(:TypeName, name: val[0], position_source: val[0])] }
+    | legacy_interfaces_list name { val[0] << make_node(:TypeName, name: val[1], position_source: val[1]) }
 
   input_value_definition:
       name COLON type default_value_opt directives_list_opt {
-        return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3], directives: val[4], description: get_description(val[0]))
+        return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3], directives: val[4], description: get_description(val[0]), position_source: val[0])
       }
 
   input_value_definition_list:
@@ -329,7 +329,7 @@ rule
 
   field_definition:
       name arguments_definitions_opt COLON type directives_list_opt {
-        return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3], directives: val[4], description: get_description(val[0]))
+        return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3], directives: val[4], description: get_description(val[0]), position_source: val[0])
       }
 
   field_definition_list:

data/lib/graphql/query/arguments.rb

@@ -102,6 +102,18 @@ module GraphQL
 
       NO_ARGS = NoArguments.new({}, context: nil, defaults_used: Set.new)
 
+      # Convert this instance into valid Ruby keyword arguments
+      # @return [{Symbol=>Object}]
+      def to_kwargs
+        ruby_kwargs = {}
+
+        keys.each do |key|
+          ruby_kwargs[Schema::Member::BuildType.underscore(key).to_sym] = self[key]
+        end
+
+        ruby_kwargs
+      end
+
       private
 
       class ArgumentValue