graphql 1.9.8 → 1.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b6424d74c67296edb56f74eb9214313dd9556f1c1ba5e5797c58099afea8958
-  data.tar.gz: ae10d626a73f8dc873f2b9b2678bfc3ffc1cd80301ddd15a255e4447c728d285
+  metadata.gz: 0d591b26a453b53597b0fdbd363cf87ff174835672d1922499ec24bf0a219a9a
+  data.tar.gz: aad2c15974f1f58cf03fbf620513b4f2de6e8ae26f615937523089e8a2a4b52d
 SHA512:
-  metadata.gz: 51b253d7218b850a4189affeee6e298d1367e8781289ca2f828ab6bbd70d6a1de205f29531ff697d70807d8107f62c3b9cbfc6325f7847116836ab4f500206ce
-  data.tar.gz: f9a81a828f9835ce1222021d0ae3f251c576eba5845df2034e8330456765d2920a28850fa24b7f58cbc7d3e1442bd405995cc3a4bf8d7e17277a73ba8fdb8ab6
+  metadata.gz: d9058ce614080bcaa58692aef2287c5b67d63f8ed6fb27462976343801dc9e573cbc9a0e7e54dc545698d442ac66b832aa8ddda1f79dd30703aaed66fddf7564
+  data.tar.gz: b42bfa78dd4c0e71a02efbfdc1ee26e8fe00e2db43849728a2775ff1db2e062bd4fb17d95808c692a82b3c73982a368610e163abb3b7dc938913ff622d79fc30

data/lib/graphql/language/nodes.rb

@@ -73,7 +73,11 @@ module GraphQL
         end
 
         def to_query_string(printer: GraphQL::Language::Printer.new)
-          printer.print(self)
+          if printer.is_a?(GraphQL::Language::Printer)
+            @query_string ||= printer.print(self)
+          else
+            printer.print(self)
+          end
         end
 
         # This creates a copy of `self`, with `new_options` applied.
@@ -83,6 +87,9 @@ module GraphQL
           copied_self = dup
           new_options.each do |key, value|
             copied_self.instance_variable_set(:"@#{key}", value)
+            if copied_self.instance_variable_defined?(:@query_string)
+              copied_self.instance_variable_set(:@query_string, nil)
+            end
           end
           copied_self
         end

data/lib/graphql/schema.rb

@@ -85,7 +85,6 @@ module GraphQL
     extend GraphQL::Schema::FindInheritedValue
 
     accepts_definitions \
-      :query, :mutation, :subscription,
       :query_execution_strategy, :mutation_execution_strategy, :subscription_execution_strategy,
       :max_depth, :max_complexity, :default_max_page_size,
       :orphan_types, :resolve_type, :type_error, :parse_error,
@@ -94,6 +93,10 @@ module GraphQL
       :object_from_id, :id_from_object,
       :default_mask,
       :cursor_encoder,
+      # If these are given as classes, normalize them. Accept `nil` when building from string.
+      query: ->(schema, t) { schema.query = t.respond_to?(:graphql_definition) ? t.graphql_definition : t },
+      mutation: ->(schema, t) { schema.mutation = t.respond_to?(:graphql_definition) ? t.graphql_definition : t },
+      subscription: ->(schema, t) { schema.subscription = t.respond_to?(:graphql_definition) ? t.graphql_definition : t },
       disable_introspection_entry_points: ->(schema) { schema.disable_introspection_entry_points = true },
       directives: ->(schema, directives) { schema.directives = directives.reduce({}) { |m, d| m[d.name] = d; m } },
       directive: ->(schema, directive) { schema.directives[directive.graphql_name] = directive },

data/lib/graphql/tracing/platform_tracing.rb

@@ -21,6 +21,7 @@ module GraphQL
       def trace(key, data)
         case key
         when "lex", "parse", "validate", "analyze_query", "analyze_multiplex", "execute_query", "execute_query_lazy", "execute_multiplex"
+          data.fetch(:query).context.namespace(self.class)[:platform_key_cache] = {} if key == "execute_query"
           platform_key = @platform_keys.fetch(key)
           platform_trace(platform_key, key, data) do
             yield
@@ -32,9 +33,11 @@ module GraphQL
             trace_field = true # implemented with instrumenter
           else
             field = data[:field]
-            owner = data[:owner]
-            # Lots of duplicated work here, can this be done ahead of time?
-            platform_key = platform_field_key(owner, field)
+            platform_key_cache = data.fetch(:query).context.namespace(self.class).fetch(:platform_key_cache)
+            platform_key = platform_key_cache.fetch(field) do
+              platform_key_cache[field] = platform_field_key(data[:owner], field)
+            end
+
             return_type = field.type.unwrap
             # Handle LateBoundTypes, which don't have `#kind`
             trace_field = if return_type.respond_to?(:kind) && (return_type.kind.scalar? || return_type.kind.enum?)

data/lib/graphql/version.rb

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

data/spec/graphql/schema_spec.rb

@@ -4,13 +4,13 @@ require "spec_helper"
 describe GraphQL::Schema do
   describe "inheritance" do
     class DummyFeature1 < GraphQL::Schema::Directive::Feature
-      
+
     end
 
     class DummyFeature2 < GraphQL::Schema::Directive::Feature
 
     end
-    
+
     let(:base_schema) do
       Class.new(GraphQL::Schema) do
         query GraphQL::Schema::Object
@@ -132,4 +132,38 @@ describe GraphQL::Schema do
       assert_equal 3, schema.middleware.steps.size
     end
   end
+
+  describe "when mixing define and class-based" do
+    module MixedSchema
+      class Query < GraphQL::Schema::Object
+        field :int, Int, null: false
+      end
+
+      class Mutation < GraphQL::Schema::Object
+        field :int, Int, null: false
+      end
+
+      class Subscription < GraphQL::Schema::Object
+        field :int, Int, null: false
+      end
+
+      Schema = GraphQL::Schema.define do
+        query(Query)
+        mutation(Mutation)
+        subscription(Subscription)
+      end
+    end
+
+    it "includes root types properly" do
+      res = MixedSchema::Schema.as_json
+      assert_equal "Query", res["data"]["__schema"]["queryType"]["name"]
+      assert_includes res["data"]["__schema"]["types"].map { |t| t["name"] }, "Query"
+
+      assert_equal "Mutation", res["data"]["__schema"]["mutationType"]["name"]
+      assert_includes res["data"]["__schema"]["types"].map { |t| t["name"] }, "Mutation"
+
+      assert_equal "Subscription", res["data"]["__schema"]["subscriptionType"]["name"]
+      assert_includes res["data"]["__schema"]["types"].map { |t| t["name"] }, "Subscription"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips