graphql 1.9.17 → 1.11.7

data/lib/graphql/language/document_from_schema_definition.rb

@@ -23,10 +23,16 @@ module GraphQL
         @include_built_in_scalars = include_built_in_scalars
         @include_built_in_directives = include_built_in_directives
 
+        filter = GraphQL::Filter.new(only: only, except: except)
+        if @schema.respond_to?(:visible?)
+          filter = filter.merge(only: @schema.method(:visible?))
+        end
+
+        schema_context = schema.context_class.new(query: nil, object: nil, schema: schema, values: context)
         @warden = GraphQL::Schema::Warden.new(
-          GraphQL::Filter.new(only: only, except: except),
+          filter,
           schema: @schema,
-          context: context,
+          context: schema_context,
         )
       end
 
@@ -38,88 +44,77 @@ module GraphQL
 
       def build_schema_node
         GraphQL::Language::Nodes::SchemaDefinition.new(
-          query: warden.root_type_for_operation("query"),
-          mutation: warden.root_type_for_operation("mutation"),
-          subscription: warden.root_type_for_operation("subscription"),
+          query: (q = warden.root_type_for_operation("query")) && q.graphql_name,
+          mutation: (m = warden.root_type_for_operation("mutation")) && m.graphql_name,
+          subscription: (s = warden.root_type_for_operation("subscription")) && s.graphql_name,
           # This only supports directives from parsing,
           # use a custom printer to add to this list.
-          directives: @schema.ast_node ? @schema.ast_node.directives : [],
+          directives: ast_directives(@schema),
         )
       end
 
       def build_object_type_node(object_type)
         GraphQL::Language::Nodes::ObjectTypeDefinition.new(
-          name: object_type.name,
-          interfaces: warden.interfaces(object_type).sort_by(&:name).map { |iface| build_type_name_node(iface) },
+          name: object_type.graphql_name,
+          interfaces: warden.interfaces(object_type).sort_by(&:graphql_name).map { |iface| build_type_name_node(iface) },
           fields: build_field_nodes(warden.fields(object_type)),
           description: object_type.description,
+          directives: ast_directives(object_type),
         )
       end
 
       def build_field_node(field)
-        field_node = GraphQL::Language::Nodes::FieldDefinition.new(
-          name: field.name,
+        GraphQL::Language::Nodes::FieldDefinition.new(
+          name: field.graphql_name,
           arguments: build_argument_nodes(warden.arguments(field)),
           type: build_type_name_node(field.type),
           description: field.description,
+          directives: ast_directives(field),
         )
-
-        if field.deprecation_reason
-          field_node = field_node.merge_directive(
-            name: GraphQL::Directive::DeprecatedDirective.name,
-            arguments: [GraphQL::Language::Nodes::Argument.new(name: "reason", value: field.deprecation_reason)]
-          )
-        end
-
-        field_node
       end
 
       def build_union_type_node(union_type)
         GraphQL::Language::Nodes::UnionTypeDefinition.new(
-          name: union_type.name,
+          name: union_type.graphql_name,
           description: union_type.description,
-          types: warden.possible_types(union_type).sort_by(&:name).map { |type| build_type_name_node(type) }
+          types: warden.possible_types(union_type).sort_by(&:graphql_name).map { |type| build_type_name_node(type) },
+          directives: ast_directives(union_type),
         )
       end
 
       def build_interface_type_node(interface_type)
         GraphQL::Language::Nodes::InterfaceTypeDefinition.new(
-          name: interface_type.name,
+          name: interface_type.graphql_name,
           description: interface_type.description,
-          fields: build_field_nodes(warden.fields(interface_type))
+          fields: build_field_nodes(warden.fields(interface_type)),
+          directives: ast_directives(interface_type),
         )
       end
 
       def build_enum_type_node(enum_type)
         GraphQL::Language::Nodes::EnumTypeDefinition.new(
-          name: enum_type.name,
-          values: warden.enum_values(enum_type).sort_by(&:name).map do |enum_value|
+          name: enum_type.graphql_name,
+          values: warden.enum_values(enum_type).sort_by(&:graphql_name).map do |enum_value|
             build_enum_value_node(enum_value)
           end,
           description: enum_type.description,
+          directives: ast_directives(enum_type),
         )
       end
 
       def build_enum_value_node(enum_value)
-        enum_value_node = GraphQL::Language::Nodes::EnumValueDefinition.new(
-          name: enum_value.name,
+        GraphQL::Language::Nodes::EnumValueDefinition.new(
+          name: enum_value.graphql_name,
           description: enum_value.description,
+          directives: ast_directives(enum_value),
         )
-
-        if enum_value.deprecation_reason
-          enum_value_node = enum_value_node.merge_directive(
-            name: GraphQL::Directive::DeprecatedDirective.name,
-            arguments: [GraphQL::Language::Nodes::Argument.new(name: "reason", value: enum_value.deprecation_reason)]
-          )
-        end
-
-        enum_value_node
       end
 
       def build_scalar_type_node(scalar_type)
         GraphQL::Language::Nodes::ScalarTypeDefinition.new(
-          name: scalar_type.name,
+          name: scalar_type.graphql_name,
           description: scalar_type.description,
+          directives: ast_directives(scalar_type),
         )
       end
 
@@ -131,10 +126,11 @@ module GraphQL
         end
 
         argument_node = GraphQL::Language::Nodes::InputValueDefinition.new(
-          name: argument.name,
+          name: argument.graphql_name,
           description: argument.description,
           type: build_type_name_node(argument.type),
           default_value: default_value,
+          directives: ast_directives(argument),
         )
 
         argument_node
@@ -142,15 +138,16 @@ module GraphQL
 
       def build_input_object_node(input_object)
         GraphQL::Language::Nodes::InputObjectTypeDefinition.new(
-          name: input_object.name,
+          name: input_object.graphql_name,
           fields: build_argument_nodes(warden.arguments(input_object)),
           description: input_object.description,
+          directives: ast_directives(input_object),
         )
       end
 
       def build_directive_node(directive)
         GraphQL::Language::Nodes::DirectiveDefinition.new(
-          name: directive.name,
+          name: directive.graphql_name,
           arguments: build_argument_nodes(warden.arguments(directive)),
           locations: build_directive_location_nodes(directive.locations),
           description: directive.description,
@@ -168,17 +165,17 @@ module GraphQL
       end
 
       def build_type_name_node(type)
-        case type
-        when GraphQL::ListType
+        case type.kind.name
+        when "LIST"
           GraphQL::Language::Nodes::ListType.new(
             of_type: build_type_name_node(type.of_type)
           )
-        when GraphQL::NonNullType
+        when "NON_NULL"
           GraphQL::Language::Nodes::NonNullType.new(
             of_type: build_type_name_node(type.of_type)
           )
         else
-          GraphQL::Language::Nodes::TypeName.new(name: type.name)
+          GraphQL::Language::Nodes::TypeName.new(name: type.graphql_name)
         end
       end
 
@@ -187,24 +184,24 @@ module GraphQL
           return GraphQL::Language::Nodes::NullValue.new(name: "null")
         end
 
-        case type
-        when GraphQL::ScalarType
+        case type.kind.name
+        when "SCALAR"
           type.coerce_isolated_result(default_value)
-        when EnumType
+        when "ENUM"
           GraphQL::Language::Nodes::Enum.new(name: type.coerce_isolated_result(default_value))
-        when InputObjectType
+        when "INPUT_OBJECT"
           GraphQL::Language::Nodes::InputObject.new(
             arguments: default_value.to_h.map do |arg_name, arg_value|
-              arg_type = type.input_fields.fetch(arg_name.to_s).type
+              arg_type = type.arguments.fetch(arg_name.to_s).type
               GraphQL::Language::Nodes::Argument.new(
-                name: arg_name,
+                name: arg_name.to_s,
                 value: build_default_value(arg_value, arg_type)
               )
             end
           )
-        when NonNullType
+        when "NON_NULL"
           build_default_value(default_value, type.of_type)
-        when ListType
+        when "LIST"
           default_value.to_a.map { |v| build_default_value(v, type.of_type) }
         else
           raise GraphQL::RequiredImplementationMissingError, "Unexpected default value type #{type.inspect}"
@@ -212,18 +209,18 @@ module GraphQL
       end
 
       def build_type_definition_node(type)
-        case type
-        when GraphQL::ObjectType
+        case type.kind.name
+        when "OBJECT"
           build_object_type_node(type)
-        when GraphQL::UnionType
+        when "UNION"
           build_union_type_node(type)
-        when GraphQL::InterfaceType
+        when "INTERFACE"
           build_interface_type_node(type)
-        when GraphQL::ScalarType
+        when "SCALAR"
           build_scalar_type_node(type)
-        when GraphQL::EnumType
+        when "ENUM"
           build_enum_type_node(type)
-        when GraphQL::InputObjectType
+        when "INPUT_OBJECT"
           build_input_object_node(type)
         else
           raise TypeError
@@ -250,7 +247,7 @@ module GraphQL
         definitions = []
         definitions << build_schema_node if include_schema_node?
         definitions += build_directive_nodes(warden.directives)
-        definitions += build_type_definition_nodes(warden.types)
+        definitions += build_type_definition_nodes(warden.reachable_types)
         definitions
       end
 
@@ -260,7 +257,7 @@ module GraphQL
         end
 
         if !include_built_in_scalars
-          types = types.reject { |type| type.default_scalar? }
+          types = types.reject { |type| type.kind.scalar? && type.default_scalar? }
         end
 
         types
@@ -281,9 +278,37 @@ module GraphQL
       end
 
       def schema_respects_root_name_conventions?(schema)
-        (schema.query.nil? || schema.query.name == 'Query') &&
-        (schema.mutation.nil? || schema.mutation.name == 'Mutation') &&
-        (schema.subscription.nil? || schema.subscription.name == 'Subscription')
+        (schema.query.nil? || schema.query.graphql_name == 'Query') &&
+        (schema.mutation.nil? || schema.mutation.graphql_name == 'Mutation') &&
+        (schema.subscription.nil? || schema.subscription.graphql_name == 'Subscription')
+      end
+
+      def ast_directives(member)
+        ast_directives = member.ast_node ? member.ast_node.directives : []
+
+        # If this schema was built from IDL, it will already have `@deprecated` in `ast_node.directives`
+        if member.respond_to?(:deprecation_reason) &&
+            (reason = member.deprecation_reason) &&
+            ast_directives.none? { |d| d.name == "deprecated" }
+
+          arguments = []
+
+          if reason != GraphQL::Schema::Directive::DEFAULT_DEPRECATION_REASON
+            arguments << GraphQL::Language::Nodes::Argument.new(
+              name: "reason",
+              value: reason
+            )
+          end
+
+          ast_directives += [
+            GraphQL::Language::Nodes::Directive.new(
+              name: GraphQL::Directive::DeprecatedDirective.graphql_name,
+              arguments: arguments
+            )
+          ]
+        end
+
+        ast_directives
       end
 
       attr_reader :schema, :warden, :always_include_schema,

data/lib/graphql/language/lexer.rb

@@ -3,6 +3,10 @@
 module GraphQL
 module Language
 module Lexer
+if !String.method_defined?(:match?)
+	using GraphQL::StringMatchBackport
+end
+
 def self.tokenize(query_string)
 	run_lexer(query_string)
 end
@@ -163,7 +167,7 @@ end
 self.graphql_lexer_en_main  = 23;
 
 def self.run_lexer(query_string)
-	data = query_string.unpack("c*")
+	data = query_string.unpack(PACK_DIRECTIVE)
 	eof = data.length
 	
 	# Since `Lexer` is a module, store all lexer state
@@ -1421,13 +1425,13 @@ def self.emit_string(ts, te, meta, block:)
 quotes_length = block ? 3 : 1
 value = meta[:data][ts + quotes_length, te - ts - 2 * quotes_length].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING) || ''
 line_incr = 0
-if block && !value.length.zero?
+if block && !value.empty?
 line_incr = value.count("\n")
 value = GraphQL::Language::BlockString.trim_whitespace(value)
 end
 # TODO: replace with `String#match?` when we support only Ruby 2.4+
 # (It's faster: https://bugs.ruby-lang.org/issues/8110)
-if !value.valid_encoding? || value !~ VALID_STRING
+if !value.valid_encoding? || !value.match?(VALID_STRING)
 meta[:tokens] << token = GraphQL::Language::Token.new(
 :BAD_UNICODE_ESCAPE,
 value,

data/lib/graphql/language/lexer.rl

@@ -121,6 +121,10 @@
 module GraphQL
   module Language
     module Lexer
+      if !String.method_defined?(:match?)
+        using GraphQL::StringMatchBackport
+      end
+
       def self.tokenize(query_string)
         run_lexer(query_string)
       end
@@ -138,7 +142,7 @@ module GraphQL
       %% write data;
 
       def self.run_lexer(query_string)
-        data = query_string.unpack("c*")
+        data = query_string.unpack(PACK_DIRECTIVE)
         eof = data.length
 
         # Since `Lexer` is a module, store all lexer state
@@ -213,13 +217,13 @@ module GraphQL
         quotes_length = block ? 3 : 1
         value = meta[:data][ts + quotes_length, te - ts - 2 * quotes_length].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING) || ''
         line_incr = 0
-        if block && !value.length.zero?
+        if block && !value.empty?
           line_incr = value.count("\n")
           value = GraphQL::Language::BlockString.trim_whitespace(value)
         end
         # TODO: replace with `String#match?` when we support only Ruby 2.4+
         # (It's faster: https://bugs.ruby-lang.org/issues/8110)
-        if !value.valid_encoding? || value !~ VALID_STRING
+        if !value.valid_encoding? || !value.match?(VALID_STRING)
           meta[:tokens] << token = GraphQL::Language::Token.new(
             :BAD_UNICODE_ESCAPE,
             value,