graphql-client 0.16.0 → 0.26.0

data/lib/graphql/client.rb

@@ -2,6 +2,7 @@
 require "active_support/inflector"
 require "active_support/notifications"
 require "graphql"
+require "graphql/client/type_stack"
 require "graphql/client/collocated_enforcement"
 require "graphql/client/definition_variables"
 require "graphql/client/definition"
@@ -49,12 +50,12 @@ module GraphQL
       when GraphQL::Schema, Class
         schema
       when Hash
-        GraphQL::Schema::Loader.load(schema)
+        GraphQL::Schema.from_introspection(schema)
       when String
         if schema.end_with?(".json") && File.exist?(schema)
           load_schema(File.read(schema))
         elsif schema =~ /\A\s*{/
-          load_schema(JSON.parse(schema))
+          load_schema(JSON.parse(schema, freeze: true))
         end
       else
         if schema.respond_to?(:execute)
@@ -90,15 +91,41 @@ module GraphQL
       result
     end
 
-    def initialize(schema:, execute: nil, enforce_collocated_callers: false)
+    def initialize(schema:, execute: nil, enforce_collocated_callers: false, raise_on_unknown_enum_value: true)
       @schema = self.class.load_schema(schema)
       @execute = execute
       @document = GraphQL::Language::Nodes::Document.new(definitions: [])
       @document_tracking_enabled = false
       @allow_dynamic_queries = false
       @enforce_collocated_callers = enforce_collocated_callers
+      if schema.is_a?(Class)
+        @possible_types = schema.possible_types
+        key, _types = @possible_types.first
+        # GraphQL-Ruby 2.3.5+ has classes here instead of strings
+        if key.is_a?(Module)
+          @possible_types = @possible_types.transform_keys(&:graphql_name)
+        end
+      end
+      @types = Schema.generate(@schema, raise_on_unknown_enum_value: raise_on_unknown_enum_value)
+    end
 
-      @types = Schema.generate(@schema)
+    # A cache of the schema's merged possible types
+    # @param type_condition [Class, String] a type definition or type name
+    def possible_types(type_condition = nil)
+      if type_condition
+        if defined?(@possible_types)
+          if type_condition.respond_to?(:graphql_name)
+            type_condition = type_condition.graphql_name
+          end
+          @possible_types[type_condition]
+        else
+          @schema.possible_types(type_condition)
+        end
+      elsif defined?(@possible_types)
+        @possible_types
+      else
+        @schema.possible_types(type_condition)
+      end
     end
 
     def parse(str, filename = nil, lineno = nil)
@@ -135,11 +162,7 @@ module GraphQL
           # which corresponds to the spread.
           # We depend on ActiveSupport to either find the already-loaded
           # constant, or to load the constant by name
-          begin
-            fragment = ActiveSupport::Inflector.constantize(const_name)
-          rescue NameError
-            fragment = nil
-          end
+          fragment = ActiveSupport::Inflector.safe_constantize(const_name)
 
           case fragment
           when FragmentDefinition
@@ -173,12 +196,8 @@ module GraphQL
 
       doc.definitions.each do |node|
         if node.name.nil?
-          if node.respond_to?(:merge) # GraphQL 1.9 +
-            node_with_name = node.merge(name: "__anonymous__")
-            doc = doc.replace_child(node, node_with_name)
-          else
-            node.name = "__anonymous__"
-          end
+          node_with_name = node.merge(name: "__anonymous__")
+          doc = doc.replace_child(node, node_with_name)
         end
       end
 
@@ -200,37 +219,13 @@ module GraphQL
         raise error
       end
 
-      definitions = {}
-      doc.definitions.each do |node|
-        sliced_document = Language::DefinitionSlice.slice(document_dependencies, node.name)
-        definition = Definition.for(
-          client: self,
-          ast_node: node,
-          document: sliced_document,
-          source_document: doc,
-          source_location: source_location
-        )
-        definitions[node.name] = definition
-      end
+      definitions = sliced_definitions(document_dependencies, doc, source_location: source_location)
 
-      if @document.respond_to?(:merge) # GraphQL 1.9+
-        visitor = RenameNodeVisitor.new(document_dependencies, definitions: definitions)
-        visitor.visit
-      else
-        name_hook = RenameNodeHook.new(definitions)
-        visitor = Language::Visitor.new(document_dependencies)
-        visitor[Language::Nodes::FragmentDefinition].leave << name_hook.method(:rename_node)
-        visitor[Language::Nodes::OperationDefinition].leave << name_hook.method(:rename_node)
-        visitor[Language::Nodes::FragmentSpread].leave << name_hook.method(:rename_node)
-        visitor.visit
-      end
+      visitor = RenameNodeVisitor.new(document_dependencies, definitions: definitions)
+      visitor.visit
 
       if document_tracking_enabled
-        if @document.respond_to?(:merge) # GraphQL 1.9+
-          @document = @document.merge(definitions: @document.definitions + doc.definitions)
-        else
-          @document.definitions.concat(doc.definitions)
-        end
+        @document = @document.merge(definitions: @document.definitions + doc.definitions)
       end
 
       if definitions["__anonymous__"]
@@ -276,27 +271,9 @@ module GraphQL
       end
     end
 
-    class RenameNodeHook
-      def initialize(definitions)
-        @definitions = definitions
-      end
-
-      def rename_node(node, _parent)
-        definition = @definitions[node.name]
-        if definition
-          node.extend(LazyName)
-          node._definition = definition
-        end
-      end
-    end
-
     # Public: A wrapper to use the more-efficient `.get_type` when it's available from GraphQL-Ruby (1.10+)
     def get_type(type_name)
-      if @schema.respond_to?(:get_type)
-        @schema.get_type(type_name)
-      else
-        @schema.types[type_name]
-      end
+      @schema.get_type(type_name)
     end
 
     # Public: Create operation definition from a fragment definition.
@@ -366,7 +343,7 @@ module GraphQL
       end
 
       if allow_dynamic_queries == false && definition.name.nil?
-        raise DynamicQueryError, "expected definition to be assigned to a static constant https://git.io/vXXSE"
+        raise DynamicQueryError, "expected definition to be assigned to a static constant https://github.com/github-community-projects/graphql-client/blob/master/guides/dynamic-query-error.md"
       end
 
       variables = deep_stringify_keys(variables)
@@ -403,12 +380,12 @@ module GraphQL
         error_payload = payload.merge(message: error["message"], error: error)
         ActiveSupport::Notifications.instrument("error.graphql", error_payload)
       end
-
       Response.new(
         result,
         data: definition.new(data, Errors.new(errors, ["data"])),
         errors: Errors.new(errors),
-        extensions: extensions
+        extensions: extensions,
+        full_response: execute.respond_to?("last_response") ? execute.last_response : nil
       )
     end
 
@@ -424,6 +401,57 @@ module GraphQL
 
     private
 
+    def sliced_definitions(document_dependencies, doc, source_location:)
+      dependencies = document_dependencies.definitions.map do |node|
+        [node.name, find_definition_dependencies(node)]
+      end.to_h
+
+      doc.definitions.map do |node|
+        deps = Set.new
+
+        queue = [node.name]
+        while name = queue.shift
+          next if deps.include?(name)
+          deps.add(name)
+          queue.concat dependencies[name]
+        end
+
+        definitions = document_dependencies.definitions.select { |x| deps.include?(x.name)  }
+        sliced_document = Language::Nodes::Document.new(definitions: definitions)
+        definition = Definition.for(
+          client: self,
+          ast_node: node,
+          document: sliced_document,
+          source_document: doc,
+          source_location: source_location
+        )
+
+        [node.name, definition]
+      end.to_h
+    end
+
+    class GatherNamesVisitor < GraphQL::Language::Visitor
+      def initialize(node)
+        @names = []
+        super
+      end
+
+      attr_reader :names
+
+      def on_fragment_spread(node, parent)
+        @names << node.name
+        super
+      end
+    end
+
+    def find_definition_dependencies(node)
+      visitor = GatherNamesVisitor.new(node)
+      visitor.visit
+      names = visitor.names
+      names.uniq!
+      names
+    end
+
     def deep_freeze_json_object(obj)
       case obj
       when String

data/lib/rubocop/cop/graphql/heredoc.rb

@@ -5,7 +5,7 @@ module RuboCop
   module Cop
     module GraphQL
       # Public: Cop for enforcing non-interpolated GRAPHQL heredocs.
-      class Heredoc < Cop
+      class Heredoc < Base
         def on_dstr(node)
           check_str(node)
         end
@@ -19,11 +19,11 @@ module RuboCop
           return unless node.location.expression.source =~ /^<<(-|~)?GRAPHQL/
 
           node.each_child_node(:begin) do |begin_node|
-            add_offense(begin_node, location: :expression, message: "Do not interpolate variables into GraphQL queries, " \
+            add_offense(begin_node, message: "Do not interpolate variables into GraphQL queries, " \
               "used variables instead.")
           end
 
-          add_offense(node, location: :expression, message: "GraphQL heredocs should be quoted. <<-'GRAPHQL'")
+          add_offense(node, message: "GraphQL heredocs should be quoted. <<-'GRAPHQL'")
         end
 
         def autocorrect(node)

data/lib/rubocop/cop/graphql/overfetch.rb

@@ -8,7 +8,7 @@ module RuboCop
   module Cop
     module GraphQL
       # Public: Rubocop for catching overfetched fields in ERB templates.
-      class Overfetch < Cop
+      class Overfetch < Base
         if defined?(RangeHelp)
           # rubocop 0.53 moved the #source_range method into this module
           include RangeHelp
@@ -21,19 +21,12 @@ module RuboCop
           query, = ::GraphQL::Client::ViewModule.extract_graphql_section(erb)
           return unless query
 
-          aliases = {}
-          fields = {}
-          ranges = {}
-
           # TODO: Use GraphQL client parser
           document = ::GraphQL.parse(query.gsub(/::/, "__"))
-
-          visitor = ::GraphQL::Language::Visitor.new(document)
-          visitor[::GraphQL::Language::Nodes::Field] << ->(node, _parent) do
-            name = node.alias || node.name
-            fields[name] ||= 0
-            field_aliases(name).each { |n| (aliases[n] ||= []) << name }
-            ranges[name] ||= source_range(processed_source.buffer, node.line, 0)
+          visitor = OverfetchVisitor.new(document) do |line_num|
+            # `source_range` is private to this object,
+            # so yield back out to it to get this info:
+            source_range(processed_source.buffer, line_num, 0)
           end
           visitor.visit
 
@@ -41,30 +34,53 @@ module RuboCop
             method_names = method_names_for(*node)
 
             method_names.each do |method_name|
-              aliases.fetch(method_name, []).each do |field_name|
-                fields[field_name] += 1
+              visitor.aliases.fetch(method_name, []).each do |field_name|
+                visitor.fields[field_name] += 1
               end
             end
           end
 
-          fields.each do |field, count|
+          visitor.fields.each do |field, count|
             next if count > 0
-            add_offense(nil, location: ranges[field], message: "GraphQL field '#{field}' query but was not used in template.")
+            add_offense(visitor.ranges[field], message: "GraphQL field '#{field}' query but was not used in template.")
           end
         end
 
-        def field_aliases(name)
-          names = Set.new
+        class OverfetchVisitor < ::GraphQL::Language::Visitor
+          def initialize(doc, &range_for_line)
+            super(doc)
+            @range_for_line = range_for_line
+            @fields = {}
+            @aliases = {}
+            @ranges = {}
+          end
+
+          attr_reader :fields, :aliases, :ranges
+
+          def on_field(node, parent)
+            name = node.alias || node.name
+            fields[name] ||= 0
+            field_aliases(name).each { |n| (aliases[n] ||= []) << name }
+            ranges[name] ||= @range_for_line.call(node.line)
+            super
+          end
 
-          names << name
-          names << "#{name}?"
+          private
 
-          names << underscore_name = ActiveSupport::Inflector.underscore(name)
-          names << "#{underscore_name}?"
+          def field_aliases(name)
+            names = Set.new
 
-          names
+            names << name
+            names << "#{name}?"
+
+            names << underscore_name = ActiveSupport::Inflector.underscore(name)
+            names << "#{underscore_name}?"
+
+            names
+          end
         end
 
+
         def method_names_for(*node)
           receiver, method_name, *_args = node
           method_names = []

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.26.0
 platform: ruby
 authors:
 - GitHub
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +27,16 @@ dependencies:
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +99,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 13.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: rubocop-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: 1.75.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: 1.75.8
 description: A Ruby library for declaring, composing and executing GraphQL queries
 email: engineering@github.com
 executables: []
@@ -176,14 +175,15 @@ files:
 - lib/graphql/client/schema/scalar_type.rb
 - lib/graphql/client/schema/skip_directive.rb
 - lib/graphql/client/schema/union_type.rb
+- lib/graphql/client/type_stack.rb
 - lib/graphql/client/view_module.rb
 - lib/rubocop/cop/graphql/heredoc.rb
 - lib/rubocop/cop/graphql/overfetch.rb
-homepage: https://github.com/github/graphql-client
+homepage: https://github.com/github-community-projects/graphql-client
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -198,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: GraphQL Client
 test_files: []