graphql 2.0.16 → 2.0.18

data/lib/graphql/type_kinds.rb

@@ -5,12 +5,13 @@ module GraphQL
     # These objects are singletons, eg `GraphQL::TypeKinds::UNION`, `GraphQL::TypeKinds::SCALAR`.
     class TypeKind
       attr_reader :name, :description
-      def initialize(name, abstract: false, fields: false, wraps: false, input: false, description: nil)
+      def initialize(name, abstract: false, leaf: false, fields: false, wraps: false, input: false, description: nil)
         @name = name
         @abstract = abstract
         @fields = fields
         @wraps = wraps
         @input = input
+        @leaf = leaf
         @composite = fields? || abstract?
         @description = description
       end
@@ -27,6 +28,8 @@ module GraphQL
       # Is this TypeKind a valid query input?
       def input?;     @input;     end
       def to_s;       @name;      end
+      # Is this TypeKind a primitive value?
+      def leaf?; @leaf; end
       # Is this TypeKind composed of many values?
       def composite?; @composite; end
 
@@ -64,11 +67,11 @@ module GraphQL
     end
 
     TYPE_KINDS = [
-      SCALAR =        TypeKind.new("SCALAR", input: true, description: 'Indicates this type is a scalar.'),
+      SCALAR =        TypeKind.new("SCALAR", input: true, leaf: true, description: 'Indicates this type is a scalar.'),
       OBJECT =        TypeKind.new("OBJECT", fields: true, description: 'Indicates this type is an object. `fields` and `interfaces` are valid fields.'),
       INTERFACE =     TypeKind.new("INTERFACE", abstract: true, fields: true, description: 'Indicates this type is an interface. `fields` and `possibleTypes` are valid fields.'),
       UNION =         TypeKind.new("UNION", abstract: true, description: 'Indicates this type is a union. `possibleTypes` is a valid field.'),
-      ENUM =          TypeKind.new("ENUM", input: true, description: 'Indicates this type is an enum. `enumValues` is a valid field.'),
+      ENUM =          TypeKind.new("ENUM", input: true, leaf: true, description: 'Indicates this type is an enum. `enumValues` is a valid field.'),
       INPUT_OBJECT =  TypeKind.new("INPUT_OBJECT", input: true, description: 'Indicates this type is an input object. `inputFields` is a valid field.'),
       LIST =          TypeKind.new("LIST", wraps: true, description: 'Indicates this type is a list. `ofType` is a valid field.'),
       NON_NULL =      TypeKind.new("NON_NULL", wraps: true, description: 'Indicates this type is a non-null. `ofType` is a valid field.'),

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

@@ -79,10 +79,6 @@ module GraphQL
             true # Let nodes be filtered out
           end
 
-          def accessible?(ctx)
-            node_type.accessible?(ctx)
-          end
-
           def visible?(ctx)
             # if this is an abstract base class, there may be no `node_type`
             node_type ? node_type.visible?(ctx) : super

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

@@ -41,10 +41,6 @@ module GraphQL
             true
           end
 
-          def accessible?(ctx)
-            node_type.accessible?(ctx)
-          end
-
           def visible?(ctx)
             node_type.visible?(ctx)
           end

data/lib/graphql/types/string.rb

@@ -7,7 +7,7 @@ module GraphQL
 
       def self.coerce_result(value, ctx)
         str = value.to_s
-        if str.encoding == Encoding::UTF_8
+        if str.encoding == Encoding::UTF_8 || str.ascii_only?
           str
         elsif str.frozen?
           str.encode(Encoding::UTF_8)

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -42,8 +42,8 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
   # Turn a query string or schema definition into an AST
   # @param graphql_string [String] a GraphQL query string or schema definition
   # @return [GraphQL::Language::Nodes::Document]
-  def self.parse(graphql_string, tracer: GraphQL::Tracing::NullTracer)
-    parse_with_racc(graphql_string, tracer: tracer)
+  def self.parse(graphql_string, trace: GraphQL::Tracing::NullTrace)
+    parse_with_racc(graphql_string, trace: trace)
   end
 
   # Read the contents of `filename` and parse them as GraphQL
@@ -54,18 +54,17 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
     parse_with_racc(content, filename: filename)
   end
 
-  def self.parse_with_racc(string, filename: nil, tracer: GraphQL::Tracing::NullTracer)
-    GraphQL::Language::Parser.parse(string, filename: filename, tracer: tracer)
+  def self.parse_with_racc(string, filename: nil, trace: GraphQL::Tracing::NullTrace)
+    GraphQL::Language::Parser.parse(string, filename: filename, trace: trace)
   end
 
   # @return [Array<GraphQL::Language::Token>]
   def self.scan(graphql_string)
-    scan_with_ragel(graphql_string)
-  end
-
-  def self.scan_with_ragel(graphql_string)
     GraphQL::Language::Lexer.tokenize(graphql_string)
   end
+
+  NOT_CONFIGURED = Object.new
+  private_constant :NOT_CONFIGURED
 end
 
 # Order matters for these:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.18
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -317,6 +317,7 @@ files:
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution_error.rb
 - lib/graphql/filter.rb
+- lib/graphql/graphql_ext.bundle
 - lib/graphql/integer_decoding_error.rb
 - lib/graphql/integer_encoding_error.rb
 - lib/graphql/introspection.rb
@@ -341,7 +342,7 @@ files:
 - lib/graphql/language/document_from_schema_definition.rb
 - lib/graphql/language/generation.rb
 - lib/graphql/language/lexer.rb
-- lib/graphql/language/lexer.rl
+- lib/graphql/language/lexer.ri
 - lib/graphql/language/nodes.rb
 - lib/graphql/language/parser.rb
 - lib/graphql/language/parser.y
@@ -534,16 +535,26 @@ files:
 - lib/graphql/subscriptions/instrumentation.rb
 - lib/graphql/subscriptions/serialize.rb
 - lib/graphql/tracing.rb
+- lib/graphql/tracing/active_support_notifications_trace.rb
 - lib/graphql/tracing/active_support_notifications_tracing.rb
+- lib/graphql/tracing/appoptics_trace.rb
 - lib/graphql/tracing/appoptics_tracing.rb
+- lib/graphql/tracing/appsignal_trace.rb
 - lib/graphql/tracing/appsignal_tracing.rb
+- lib/graphql/tracing/data_dog_trace.rb
 - lib/graphql/tracing/data_dog_tracing.rb
+- lib/graphql/tracing/new_relic_trace.rb
 - lib/graphql/tracing/new_relic_tracing.rb
+- lib/graphql/tracing/notifications_trace.rb
 - lib/graphql/tracing/notifications_tracing.rb
+- lib/graphql/tracing/platform_trace.rb
 - lib/graphql/tracing/platform_tracing.rb
+- lib/graphql/tracing/prometheus_trace.rb
 - lib/graphql/tracing/prometheus_tracing.rb
 - lib/graphql/tracing/prometheus_tracing/graphql_collector.rb
+- lib/graphql/tracing/scout_trace.rb
 - lib/graphql/tracing/scout_tracing.rb
+- lib/graphql/tracing/statsd_trace.rb
 - lib/graphql/tracing/statsd_tracing.rb
 - lib/graphql/type_kinds.rb
 - lib/graphql/types.rb
@@ -597,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby

data/lib/graphql/language/lexer.rl

@@ -1,280 +0,0 @@
-%%{
-  machine graphql_lexer;
-
-  IDENTIFIER =    [_A-Za-z][_0-9A-Za-z]*;
-  NEWLINE =       [\c\r\n];
-  BLANK   =       [, \t]+;
-  COMMENT =       '#' [^\n\r]*;
-  INT =           '-'? ('0'|[1-9][0-9]*);
-  FLOAT_DECIMAL = '.'[0-9]+;
-  FLOAT_EXP =     ('e' | 'E')?('+' | '-')?[0-9]+;
-  FLOAT =         INT FLOAT_DECIMAL? FLOAT_EXP?;
-  ON =            'on';
-  FRAGMENT =      'fragment';
-  TRUE =          'true';
-  FALSE =         'false';
-  NULL =          'null';
-  QUERY =         'query';
-  MUTATION =      'mutation';
-  SUBSCRIPTION =  'subscription';
-  SCHEMA =        'schema';
-  SCALAR =        'scalar';
-  TYPE =          'type';
-  EXTEND =        'extend';
-  IMPLEMENTS =    'implements';
-  INTERFACE =     'interface';
-  UNION =         'union';
-  ENUM =          'enum';
-  INPUT =         'input';
-  DIRECTIVE =     'directive';
-  REPEATABLE =    'repeatable';
-  LCURLY =        '{';
-  RCURLY =        '}';
-  LPAREN =        '(';
-  RPAREN =        ')';
-  LBRACKET =      '[';
-  RBRACKET =      ']';
-  COLON =         ':';
-  QUOTE =         '"';
-  BACKSLASH = '\\';
-  # Could limit to hex here, but “bad unicode escape” on 0XXF is probably a
-  # more helpful error than “unknown char”
-  UNICODE_DIGIT = [0-9A-Za-z];
-  FOUR_DIGIT_UNICODE = UNICODE_DIGIT{4};
-  N_DIGIT_UNICODE = LCURLY UNICODE_DIGIT{4,} RCURLY;
-  UNICODE_ESCAPE = '\\u' (FOUR_DIGIT_UNICODE | N_DIGIT_UNICODE);
-  # https://graphql.github.io/graphql-spec/June2018/#sec-String-Value
-  STRING_ESCAPE = '\\' [\\/bfnrt];
-  BLOCK_QUOTE =   '"""';
-  ESCAPED_BLOCK_QUOTE = '\\"""';
-  BLOCK_STRING_CHAR = (ESCAPED_BLOCK_QUOTE | ^QUOTE | QUOTE{1,2} ^QUOTE);
-  ESCAPED_QUOTE = '\\"';
-  STRING_CHAR =   ((ESCAPED_QUOTE | ^QUOTE) - BACKSLASH) | UNICODE_ESCAPE | STRING_ESCAPE;
-  VAR_SIGN =      '$';
-  DIR_SIGN =      '@';
-  ELLIPSIS =      '...';
-  EQUALS =        '=';
-  BANG =          '!';
-  PIPE =          '|';
-  AMP =           '&';
-
-  QUOTED_STRING = QUOTE STRING_CHAR* QUOTE;
-  BLOCK_STRING = BLOCK_QUOTE BLOCK_STRING_CHAR* QUOTE{0,2} BLOCK_QUOTE;
-  # catch-all for anything else. must be at the bottom for precedence.
-  UNKNOWN_CHAR =         /./;
-
-  # Used with ragel -V for graphviz visualization
-  str := |*
-      QUOTED_STRING => { emit_string(ts, te, meta, block: false) };
-  *|;
-
-  main := |*
-    INT           => { emit(:INT, ts, te, meta) };
-    FLOAT         => { emit(:FLOAT, ts, te, meta) };
-    ON            => { emit(:ON, ts, te, meta, "on") };
-    FRAGMENT      => { emit(:FRAGMENT, ts, te, meta, "fragment") };
-    TRUE          => { emit(:TRUE, ts, te, meta, "true") };
-    FALSE         => { emit(:FALSE, ts, te, meta, "false") };
-    NULL          => { emit(:NULL, ts, te, meta, "null") };
-    QUERY         => { emit(:QUERY, ts, te, meta, "query") };
-    MUTATION      => { emit(:MUTATION, ts, te, meta, "mutation") };
-    SUBSCRIPTION  => { emit(:SUBSCRIPTION, ts, te, meta, "subscription") };
-    SCHEMA        => { emit(:SCHEMA, ts, te, meta) };
-    SCALAR        => { emit(:SCALAR, ts, te, meta) };
-    TYPE          => { emit(:TYPE, ts, te, meta) };
-    EXTEND        => { emit(:EXTEND, ts, te, meta) };
-    IMPLEMENTS    => { emit(:IMPLEMENTS, ts, te, meta) };
-    INTERFACE     => { emit(:INTERFACE, ts, te, meta) };
-    UNION         => { emit(:UNION, ts, te, meta) };
-    ENUM          => { emit(:ENUM, ts, te, meta) };
-    INPUT         => { emit(:INPUT, ts, te, meta) };
-    DIRECTIVE     => { emit(:DIRECTIVE, ts, te, meta) };
-    REPEATABLE    => { emit(:REPEATABLE, ts, te, meta, "repeatable") };
-    RCURLY        => { emit(:RCURLY, ts, te, meta, "}") };
-    LCURLY        => { emit(:LCURLY, ts, te, meta, "{") };
-    RPAREN        => { emit(:RPAREN, ts, te, meta, ")") };
-    LPAREN        => { emit(:LPAREN, ts, te, meta, "(")};
-    RBRACKET      => { emit(:RBRACKET, ts, te, meta, "]") };
-    LBRACKET      => { emit(:LBRACKET, ts, te, meta, "[") };
-    COLON         => { emit(:COLON, ts, te, meta, ":") };
-    QUOTED_STRING => { emit_string(ts, te, meta, block: false) };
-    BLOCK_STRING  => { emit_string(ts, te, meta, block: true) };
-    VAR_SIGN      => { emit(:VAR_SIGN, ts, te, meta, "$") };
-    DIR_SIGN      => { emit(:DIR_SIGN, ts, te, meta, "@") };
-    ELLIPSIS      => { emit(:ELLIPSIS, ts, te, meta, "...") };
-    EQUALS        => { emit(:EQUALS, ts, te, meta, "=") };
-    BANG          => { emit(:BANG, ts, te, meta, "!") };
-    PIPE          => { emit(:PIPE, ts, te, meta, "|") };
-    AMP           => { emit(:AMP, ts, te, meta, "&") };
-    IDENTIFIER    => { emit(:IDENTIFIER, ts, te, meta) };
-    COMMENT       => { record_comment(ts, te, meta) };
-
-    NEWLINE => {
-      meta[:line] += 1
-      meta[:col] = 1
-    };
-
-    BLANK   => { meta[:col] += te - ts };
-
-    UNKNOWN_CHAR => { emit(:UNKNOWN_CHAR, ts, te, meta) };
-
-  *|;
-}%%
-
-# frozen_string_literal: true
-
-module GraphQL
-  module Language
-    module Lexer
-      def self.tokenize(query_string)
-        run_lexer(query_string)
-      end
-
-      # Replace any escaped unicode or whitespace with the _actual_ characters
-      # To avoid allocating more strings, this modifies the string passed into it
-      def self.replace_escaped_characters_in_place(raw_string)
-        raw_string.gsub!(ESCAPES, ESCAPES_REPLACE)
-        raw_string.gsub!(UTF_8) do |_matched_str|
-          codepoint_1 = ($1 || $2).to_i(16)
-          codepoint_2 = $3
-
-          if codepoint_2
-            codepoint_2 = codepoint_2.to_i(16)
-            if (codepoint_1 >= 0xD800 && codepoint_1 <= 0xDBFF) && # leading surrogate
-                (codepoint_2 >= 0xDC00 && codepoint_2 <= 0xDFFF) # trailing surrogate
-              # A surrogate pair
-              combined = ((codepoint_1 - 0xD800) * 0x400) + (codepoint_2 - 0xDC00) + 0x10000
-              [combined].pack('U'.freeze)
-            else
-              # Two separate code points
-              [codepoint_1].pack('U'.freeze) + [codepoint_2].pack('U'.freeze)
-            end
-          else
-            [codepoint_1].pack('U'.freeze)
-          end
-        end
-        nil
-      end
-
-      private
-
-      %% write data;
-
-      def self.run_lexer(query_string)
-        data = query_string.unpack(PACK_DIRECTIVE)
-        eof = data.length
-
-        # Since `Lexer` is a module, store all lexer state
-        # in this local variable:
-        meta = {
-          line: 1,
-          col: 1,
-          data: data,
-          tokens: [],
-          previous_token: nil,
-        }
-
-        p ||= 0
-        pe ||= data.length
-
-        %% write init;
-
-        %% write exec;
-
-        meta[:tokens]
-      end
-
-      def self.record_comment(ts, te, meta)
-        token = GraphQL::Language::Token.new(
-          :COMMENT,
-          meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
-          meta[:line],
-          meta[:col],
-          meta[:previous_token],
-        )
-
-        meta[:previous_token] = token
-
-        meta[:col] += te - ts
-      end
-
-      def self.emit(token_name, ts, te, meta, token_value = nil)
-        token_value ||= meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING)
-        meta[:tokens] << token = GraphQL::Language::Token.new(
-          token_name,
-          token_value,
-          meta[:line],
-          meta[:col],
-          meta[:previous_token],
-        )
-        meta[:previous_token] = token
-        # Bump the column counter for the next token
-        meta[:col] += te - ts
-      end
-
-      ESCAPES = /\\["\\\/bfnrt]/
-      ESCAPES_REPLACE = {
-        '\\"' => '"',
-        "\\\\" => "\\",
-        "\\/" => '/',
-        "\\b" => "\b",
-        "\\f" => "\f",
-        "\\n" => "\n",
-        "\\r" => "\r",
-        "\\t" => "\t",
-      }
-
-      UTF_8 = /\\u(?:([\dAa-f]{4})|\{([\da-f]{4,})\})(?:\\u([\dAa-f]{4}))?/i
-
-
-      VALID_STRING = /\A(?:[^\\]|#{ESCAPES}|#{UTF_8})*\z/o
-
-      PACK_DIRECTIVE = "c*"
-      UTF_8_ENCODING = "UTF-8"
-
-      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.empty?
-          line_incr = value.count("\n")
-          value = GraphQL::Language::BlockString.trim_whitespace(value)
-        end
-
-        if !value.valid_encoding? || !value.match?(VALID_STRING)
-          meta[:tokens] << token = GraphQL::Language::Token.new(
-            :BAD_UNICODE_ESCAPE,
-            value,
-            meta[:line],
-            meta[:col],
-            meta[:previous_token],
-          )
-        else
-          replace_escaped_characters_in_place(value)
-
-          if !value.valid_encoding?
-            meta[:tokens] << token = GraphQL::Language::Token.new(
-              :BAD_UNICODE_ESCAPE,
-              value,
-              meta[:line],
-              meta[:col],
-              meta[:previous_token],
-            )
-          else
-            meta[:tokens] << token = GraphQL::Language::Token.new(
-              :STRING,
-              value,
-              meta[:line],
-              meta[:col],
-              meta[:previous_token],
-            )
-          end
-        end
-
-        meta[:previous_token] = token
-        meta[:col] += te - ts
-        meta[:line] += line_incr
-      end
-    end
-  end
-end