graphql 1.7.8 → 1.7.9

data/lib/graphql/language/lexer.rl

@@ -34,6 +34,9 @@
   RBRACKET =      ']';
   COLON =         ':';
   QUOTE =         '"';
+  BLOCK_QUOTE =   '"""';
+  ESCAPED_BLOCK_QUOTE = '\\"""';
+  BLOCK_STRING_CHAR = (ESCAPED_BLOCK_QUOTE | ^'"""');
   ESCAPED_QUOTE = '\\"';
   STRING_CHAR =   (ESCAPED_QUOTE | ^'"');
   VAR_SIGN =      '$';
@@ -44,7 +47,7 @@
   PIPE =          '|';
 
   QUOTED_STRING = QUOTE STRING_CHAR* QUOTE;
-
+  BLOCK_STRING = BLOCK_QUOTE BLOCK_STRING_CHAR* BLOCK_QUOTE;
   # catch-all for anything else. must be at the bottom for precedence.
   UNKNOWN_CHAR =         /./;
 
@@ -75,7 +78,8 @@
     RBRACKET      => { emit(:RBRACKET, ts, te, meta) };
     LBRACKET      => { emit(:LBRACKET, ts, te, meta) };
     COLON         => { emit(:COLON, ts, te, meta) };
-    QUOTED_STRING => { emit_string(ts + 1, 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) };
@@ -188,8 +192,13 @@ module GraphQL
       PACK_DIRECTIVE = "c*"
       UTF_8_ENCODING = "UTF-8"
 
-      def self.emit_string(ts, te, meta)
-        value = meta[:data][ts...te - 1].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING)
+      def self.emit_string(ts, te, meta, block:)
+        quotes_length = block ? 3 : 1
+        ts += quotes_length
+        value = meta[:data][ts...te - quotes_length].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING)
+        if block
+          value = GraphQL::Language::BlockString.trim_whitespace(value)
+        end
         if value !~ VALID_STRING
           meta[:tokens] << token = GraphQL::Language::Token.new(
             name: :BAD_UNICODE_ESCAPE,

data/lib/graphql/language/nodes.rb

@@ -288,13 +288,16 @@ module GraphQL
         private
 
         def serialize_value_for_hash(value)
-          if value.is_a? InputObject
+          case value
+          when InputObject
             value.to_h
-          elsif value.is_a? Array
+          when Array
             value.map do |v|
               serialize_value_for_hash v
             end
-          elsif value.is_a? NullValue
+          when Enum
+            value.name
+          when NullValue
             nil
           else
             value

data/lib/graphql/language/printer.rb

@@ -93,7 +93,7 @@ module GraphQL
       end
 
       def print_input_object(input_object)
-        print_node(input_object.to_h)
+        "{#{input_object.arguments.map { |a| "#{a.name}: #{print(a.value)}" }.join(", ")}}"
       end
 
       def print_list_type(list_type)

data/lib/graphql/language/token.rb

@@ -12,7 +12,7 @@ module GraphQL
 
       def initialize(value:, name:, line:, col:, prev_token:)
         @name = name
-        @value = value
+        @value = value.freeze
         @line = line
         @col = col
         @prev_token = prev_token

data/lib/graphql/query.rb

@@ -157,7 +157,7 @@ module GraphQL
     def result
       if !@executed
         with_prepared_ast {
-          Execution::Multiplex.run_queries(@schema, [self])
+          Execution::Multiplex.run_queries(@schema, [self], context: @context)
         }
       end
       @result ||= Query::Result.new(query: self, values: @result_values)

data/lib/graphql/schema/build_from_definition.rb

@@ -193,6 +193,8 @@ module GraphQL
             nil
           when GraphQL::Language::Nodes::InputObject
             default_value.to_h
+          when Array
+            default_value.map { |v| build_default_value(v) }
           else
             default_value
           end

data/lib/graphql/schema/printer.rb

@@ -100,7 +100,7 @@ module GraphQL
           if reason.value == GraphQL::Directive::DEFAULT_DEPRECATION_REASON
             "@deprecated"
           else
-            "@deprecated(reason: \"#{reason.value}\")"
+            "@deprecated(reason: #{reason.value.to_s.inspect})"
           end
         else
           super

data/lib/graphql/static_validation/rules/fields_will_merge.rb

@@ -2,6 +2,9 @@
 module GraphQL
   module StaticValidation
     class FieldsWillMerge
+      # Special handling for fields without arguments
+      NO_ARGS = {}.freeze
+
       def validate(context)
         context.each_irep_node do |node|
           if node.ast_nodes.size > 1
@@ -16,15 +19,19 @@ module GraphQL
 
             # Check for incompatible / non-identical arguments on this node:
             args = node.ast_nodes.map do |n|
-              n.arguments.reduce({}) do |memo, a|
-                arg_value = a.value
-                memo[a.name] = case arg_value
-                when GraphQL::Language::Nodes::AbstractNode
-                  arg_value.to_query_string
-                else
-                  GraphQL::Language.serialize(arg_value)
+              if n.arguments.any?
+                n.arguments.reduce({}) do |memo, a|
+                  arg_value = a.value
+                  memo[a.name] = case arg_value
+                  when GraphQL::Language::Nodes::AbstractNode
+                    arg_value.to_query_string
+                  else
+                    GraphQL::Language.serialize(arg_value)
+                  end
+                  memo
                 end
-                memo
+              else
+                NO_ARGS
               end
             end
             args.uniq!

data/lib/graphql/static_validation/rules/variables_are_used_and_defined.rb

@@ -102,7 +102,17 @@ module GraphQL
       def follow_spreads(node, parent_variables, spreads_for_context, fragment_definitions, visited_fragments)
         spreads = spreads_for_context[node] - visited_fragments
         spreads.each do |spread_name|
-          def_node, variables = fragment_definitions.find { |def_node, vars| def_node.name == spread_name }
+          def_node = nil
+          variables = nil
+          # Implement `.find` by hand to avoid Ruby's internal allocations
+          fragment_definitions.each do |frag_def_node, vars|
+            if frag_def_node.name == spread_name
+              def_node = frag_def_node
+              variables = vars
+              break
+            end
+          end
+
           next if !def_node
           visited_fragments << spread_name
           variables.each do |name, child_usage|

data/lib/graphql/tracing/data_dog_tracing.rb

@@ -15,17 +15,12 @@ module GraphQL
       }
 
       def platform_trace(platform_key, key, data)
-        service = options.fetch(:service, 'ruby-graphql')
+        tracer.trace(platform_key, service: service_name) do |span|
+          span.span_type = 'custom'
 
-        pin = Datadog::Pin.get_from(self)
-        unless pin
-          pin = Datadog::Pin.new(service)
-          pin.onto(self)
-        end
-
-        pin.tracer.trace(platform_key, service: pin.service) do |span|
           if key == 'execute_multiplex'
-            span.resource = data[:multiplex].queries.map(&:selected_operation_name).join(', ')
+            operations = data[:multiplex].queries.map(&:selected_operation_name).join(', ')
+            span.resource = operations unless operations.empty?
           end
 
           if key == 'execute_query'
@@ -33,10 +28,19 @@ module GraphQL
             span.set_tag(:selected_operation_type, data[:query].selected_operation.operation_type)
             span.set_tag(:query_string, data[:query].query_string)
           end
+
           yield
         end
       end
 
+      def service_name
+        options.fetch(:service, 'ruby-graphql')
+      end
+
+      def tracer
+        options.fetch(:tracer, Datadog.tracer)
+      end
+
       def platform_field_key(type, field)
         "#{type.name}.#{field.name}"
       end

data/lib/graphql/version.rb

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

data/spec/graphql/backtrace_spec.rb

@@ -126,6 +126,16 @@ describe GraphQL::Backtrace do
       assert_includes err.message, "more lines"
     end
 
+    it "annotates errors from Query#result" do
+      query_str = "query StrField { field2 { strField } __typename }"
+      context = { backtrace: true }
+      query = GraphQL::Query.new(schema, query_str, context: context)
+      err = assert_raises(GraphQL::Backtrace::TracedError) {
+        query.result
+      }
+      assert_instance_of RuntimeError, err.cause
+    end
+
     it "annotates errors inside lazy resolution" do
       # Test context-based flag
       err = assert_raises(GraphQL::Backtrace::TracedError) {

data/spec/graphql/directive_spec.rb

@@ -31,7 +31,9 @@ describe GraphQL::Directive do
     describe "child fields" do
       let(:query_string) { <<-GRAPHQL
       {
-        __type(name: "Cheese") {
+        __type(name: """
+        Cheese
+        """) {
           fields { name }
           fields @skip(if: true) { isDeprecated }
         }

data/spec/graphql/language/block_string_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Language::BlockString do
+  describe "trimming whitespace" do
+    def trim_whitespace(str)
+      GraphQL::Language::BlockString.trim_whitespace(str)
+    end
+
+    it "matches the examples in graphql-js" do
+      # these are taken from:
+      # https://github.com/graphql/graphql-js/blob/36ec0e9d34666362ff0e2b2b18edeb98e3c9abee/src/language/__tests__/blockStringValue-test.js#L12
+      # A set of [before, after] pairs:
+      examples = [
+        [
+          # Removes common whitespace:
+          "
+          Hello,
+            World!
+
+          Yours,
+            GraphQL.
+          ",
+          "Hello,\n  World!\n\nYours,\n  GraphQL."
+        ],
+        [
+          # Removes leading and trailing newlines:
+          "
+
+          Hello,
+            World!
+
+          Yours,
+            GraphQL.
+
+          ",
+          "Hello,\n  World!\n\nYours,\n  GraphQL."
+        ],
+        [
+          # Removes blank lines (with whitespace _and_ newlines:)
+          "\n    \n
+          Hello,
+            World!
+
+          Yours,
+            GraphQL.
+
+          \n     \n",
+          "Hello,\n  World!\n\nYours,\n  GraphQL."
+        ],
+        [
+          # Retains indentation from the first line
+          "    Hello,\n      World!\n\n    Yours,\n      GraphQL.",
+          "    Hello,\n  World!\n\nYours,\n  GraphQL.",
+        ],
+        [
+          # Doesn't alter trailing spaces
+          "\n    \n    Hello,     \n      World!   \n\n    Yours,     \n      GraphQL.  ",
+          "Hello,     \n  World!   \n\nYours,     \n  GraphQL.  ",
+
+        ],
+      ]
+
+      examples.each_with_index do |(before, after), idx|
+        transformed_str = trim_whitespace(before)
+        assert_equal(after, transformed_str, "Example ##{idx + 1}")
+      end
+    end
+  end
+end

data/spec/graphql/language/lexer_spec.rb

@@ -26,6 +26,15 @@ describe GraphQL::Language::Lexer do
       assert_equal tokens[0], tokens[1].prev_token
     end
 
+    describe "block strings" do
+      let(:query_string) { %|{ a(b: """\nc\n  d\n""")}|}
+
+      it "tokenizes them" do
+        str_token = tokens[5]
+        assert_equal "c\n  d", str_token.value
+      end
+    end
+
     it "unescapes escaped characters" do
       assert_equal "\" \\ / \b \f \n \r \t", subject.tokenize('"\\" \\\\ \\/ \\b \\f \\n \\r \\t"').first.to_s
     end

data/spec/graphql/query_spec.rb

@@ -85,7 +85,7 @@ describe GraphQL::Query do
         operation_name: operation_name,
         max_depth: max_depth,
       )
-      query.query_string = '{ __type(name: "Cheese") { name } }'
+      query.query_string = '{ __type(name: """Cheese""") { name } }'
       assert_equal "Cheese", query.result["data"] ["__type"]["name"]
     end
   end

data/spec/graphql/schema/printer_spec.rb

@@ -14,7 +14,11 @@ describe GraphQL::Schema::Printer do
 
       value "FOO", value: :foo
       value "BAR", value: :bar
-      value "BAZ", deprecation_reason: 'Use "BAR".'
+      value "BAZ", deprecation_reason: <<-REASON
+Use "BAR" instead.
+
+It's the replacement for this value.
+REASON
       value "WOZ", deprecation_reason: GraphQL::Directive::DEFAULT_DEPRECATION_REASON
     end
 
@@ -352,7 +356,6 @@ SCHEMA
       custom_mutation = schema.mutation.redefine(name: "MyMutationRoot")
       custom_schema = schema.redefine(mutation: custom_mutation)
 
-
       expected = <<SCHEMA
 schema {
   query: Query
@@ -389,7 +392,7 @@ type Audio {
 
 enum Choice {
   BAR
-  BAZ @deprecated(reason: "Use "BAR".")
+  BAZ @deprecated(reason: "Use \\\"BAR\\\" instead.\\n\\nIt's the replacement for this value.\\n")
   FOO
   WOZ @deprecated
 }
@@ -438,7 +441,7 @@ interface Node {
 type Post {
   body: String!
   comments: [Comment!]
-  comments_count: Int! @deprecated(reason: "Use "comments".")
+  comments_count: Int! @deprecated(reason: "Use \\\"comments\\\".")
   id: ID!
   title: String!
 }
@@ -600,7 +603,7 @@ SCHEMA
 type Post {
   body: String!
   comments: [Comment!]
-  comments_count: Int! @deprecated(reason: "Use "comments".")
+  comments_count: Int! @deprecated(reason: "Use \\\"comments\\\".")
   id: ID!
   title: String!
 }
@@ -608,4 +611,44 @@ SCHEMA
       assert_equal expected.chomp, GraphQL::Schema::Printer.new(schema).print_type(schema.types['Post'])
     end
   end
+
+  describe "#print_directive" do
+    it "prints the deprecation reason in a single line escaped string including line breaks" do
+      expected = <<SCHEMA
+enum Choice {
+  BAR
+  BAZ @deprecated(reason: "Use \\\"BAR\\\" instead.\\n\\nIt's the replacement for this value.\\n")
+  FOO
+  WOZ @deprecated
+}
+
+type Subscription {
+}
+
+input Varied {
+  bool: Boolean
+  enum: Choice = FOO
+  float: Float
+  int: Int
+}
+SCHEMA
+
+      only_filter = ->(member, ctx) {
+        case member
+        when GraphQL::ScalarType
+          true
+        when GraphQL::BaseType
+          ctx[:names].include?(member.name)
+        when GraphQL::Argument
+          member.name != "id"
+        else
+          true
+        end
+      }
+
+      context = { names: ["Varied", "Choice", "Subscription"] }
+
+      assert_equal expected.chomp, GraphQL::Schema::Printer.new(schema, context: context, only: only_filter).print_schema
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -417,6 +431,7 @@ files:
 - lib/graphql/invalid_name_error.rb
 - lib/graphql/invalid_null_error.rb
 - lib/graphql/language.rb
+- lib/graphql/language/block_string.rb
 - lib/graphql/language/comments.rb
 - lib/graphql/language/definition_slice.rb
 - lib/graphql/language/document_from_schema_definition.rb
@@ -899,6 +914,7 @@ files:
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
+- spec/graphql/language/block_string_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
 - spec/graphql/language/document_from_schema_definition_spec.rb
 - spec/graphql/language/equality_spec.rb
@@ -1370,6 +1386,7 @@ test_files:
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
+- spec/graphql/language/block_string_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
 - spec/graphql/language/document_from_schema_definition_spec.rb
 - spec/graphql/language/equality_spec.rb