graphql-client 0.15.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7ced5b5ef5fb8e496d8c221867165c4629670a5f8ecf1e44f8c523e5774ae2
-  data.tar.gz: 49453ec41a714dca5774c32b24139527beb7623a8c99a2368e789f9b1443c79a
+  metadata.gz: 82b89599e02036868b2249fbd3ac2aeb89b6043b19040bdaeaf66f31b5f1b28e
+  data.tar.gz: 2e168f61452bd5041aa01dce3a09c99959b629afeb2880ca629d1034f22fb0d9
 SHA512:
-  metadata.gz: b69902cbed392a6ad77d5e124db8196439b17750ecb369fc3189a93593857f5e1cf80ade820edb5abc0e11cade056832c733726e2e4202207496d7435eb6ebfa
-  data.tar.gz: a918d43558b2f75ce3627a7dd003ba76e083b9c087f15c36e4df7e571d5eef71a4760fe929a7d6d93eb78a22b4f310c8ef75f9737a719a516c659eb70117026e
+  metadata.gz: 3f14f21ff57e8dc29dbef6e5fb2ee6d2fb552075986ef57c8f89a3d7ce5b2faa8e2965b20a5b8f7735394b3ee13cdc8e55923bda0dd02fa8625f7e2b824dab7b
+  data.tar.gz: ee04576697c258bdc3959366d0cccef720e24eb2358ecbb28c020d912c5b241ac7ba195a8240656c6f825109c23a321ef2449892b4d893e29802c03b6580f557

data/README.md

@@ -1,4 +1,4 @@
-# graphql-client [![Gem Version](https://badge.fury.io/rb/graphql-client.svg)](https://badge.fury.io/rb/graphql-client) [![Build Status](https://travis-ci.org/github/graphql-client.svg?branch=master)](https://travis-ci.org/github/graphql-client)
+# graphql-client [![Gem Version](https://badge.fury.io/rb/graphql-client.svg)](https://badge.fury.io/rb/graphql-client) [![CI](https://github.com/github/graphql-client/workflows/CI/badge.svg)](https://github.com/github/graphql-client/actions?query=workflow)
 
 GraphQL Client is a Ruby library for declaring, composing and executing GraphQL queries.
 

data/lib/graphql/client/collocated_enforcement.rb

@@ -12,6 +12,8 @@ module GraphQL
 
     # Enforcements collocated object access best practices.
     module CollocatedEnforcement
+      extend self
+
       # Public: Ignore collocated caller enforcement for the scope of the block.
       def allow_noncollocated_callers
         Thread.current[:query_result_caller_location_ignore] = true
@@ -20,6 +22,23 @@ module GraphQL
         Thread.current[:query_result_caller_location_ignore] = nil
       end
 
+      def verify_collocated_path(location, path, method = "method")
+        return yield if Thread.current[:query_result_caller_location_ignore]
+
+        if (location.path != path) && !(WHITELISTED_GEM_NAMES.any? { |g| location.path.include?("gems/#{g}") })
+          error = NonCollocatedCallerError.new("#{method} was called outside of '#{path}' https://git.io/v1syX")
+          error.set_backtrace(caller(2))
+          raise error
+        end
+
+        begin
+          Thread.current[:query_result_caller_location_ignore] = true
+          yield
+        ensure
+          Thread.current[:query_result_caller_location_ignore] = nil
+        end
+      end
+
       # Internal: Decorate method with collocated caller enforcement.
       #
       # mod - Target Module/Class
@@ -31,21 +50,9 @@ module GraphQL
         mod.prepend(Module.new do
           methods.each do |method|
             define_method(method) do |*args, &block|
-              return super(*args, &block) if Thread.current[:query_result_caller_location_ignore]
-
-              locations = caller_locations(1, 1)
-
-              if (locations.first.path != path) && !(caller_locations.any? { |cl| WHITELISTED_GEM_NAMES.any? { |g| cl.path.include?("gems/#{g}") } })
-                error = NonCollocatedCallerError.new("#{method} was called outside of '#{path}' https://git.io/v1syX")
-                error.set_backtrace(caller(1))
-                raise error
-              end
-
-              begin
-                Thread.current[:query_result_caller_location_ignore] = true
+              location = caller_locations(1, 1)[0]
+              CollocatedEnforcement.verify_collocated_path(location, path, method) do
                 super(*args, &block)
-              ensure
-                Thread.current[:query_result_caller_location_ignore] = nil
               end
             end
           end

data/lib/graphql/client/definition.rb

@@ -45,7 +45,7 @@ module GraphQL
             raise "Unexpected operation_type: #{ast_node.operation_type}"
           end
         when GraphQL::Language::Nodes::FragmentDefinition
-          @client.schema.types[ast_node.type.name]
+          @client.get_type(ast_node.type.name)
         else
           raise "Unexpected ast_node: #{ast_node}"
         end
@@ -115,9 +115,24 @@ module GraphQL
           else
             cast_object(obj)
           end
+        when GraphQL::Client::Schema::ObjectType::WithDefinition
+          case obj
+          when schema_class.klass
+            if obj._definer == schema_class
+              obj
+            else
+              cast_object(obj)
+            end
+          when nil
+            nil
+          when Hash
+            schema_class.new(obj, errors)
+          else
+            cast_object(obj)
+          end
         when GraphQL::Client::Schema::ObjectType
           case obj
-          when NilClass, schema_class
+          when nil, schema_class
             obj
           when Hash
             schema_class.new(obj, errors)
@@ -144,8 +159,8 @@ module GraphQL
 
         def cast_object(obj)
           if obj.class.is_a?(GraphQL::Client::Schema::ObjectType)
-            unless obj.class._spreads.include?(definition_node.name)
-              raise TypeError, "#{definition_node.name} is not included in #{obj.class.source_definition.name}"
+            unless obj._spreads.include?(definition_node.name)
+              raise TypeError, "#{definition_node.name} is not included in #{obj.source_definition.name}"
             end
             schema_class.cast(obj.to_h, obj.errors)
           else
@@ -170,16 +185,18 @@ module GraphQL
         end
 
         def flatten_spreads(node)
-          node.selections.flat_map do |selection|
+          spreads = []
+          node.selections.each do |selection|
             case selection
             when Language::Nodes::FragmentSpread
-              selection
+              spreads << selection
             when Language::Nodes::InlineFragment
-              flatten_spreads(selection)
+              spreads.concat(flatten_spreads(selection))
             else
-              []
+              # Do nothing, not a spread
             end
           end
+          spreads
         end
 
         def index_node_definitions(visitor)

data/lib/graphql/client/definition_variables.rb

@@ -14,7 +14,7 @@ module GraphQL
       #
       # Returns a Hash[Symbol] to GraphQL::Type objects.
       def self.variables(schema, document, definition_name = nil)
-        unless schema.is_a?(GraphQL::Schema)
+        unless schema.is_a?(GraphQL::Schema) || (schema.is_a?(Class) && schema < GraphQL::Schema)
           raise TypeError, "expected schema to be a GraphQL::Schema, but was #{schema.class}"
         end
 
@@ -35,7 +35,7 @@ module GraphQL
 
             if existing_type && existing_type.unwrap != definition.type.unwrap
               raise GraphQL::Client::ValidationError, "$#{node.name} was already declared as #{existing_type.unwrap}, but was #{definition.type.unwrap}"
-            elsif !existing_type.is_a?(GraphQL::NonNullType)
+            elsif !(existing_type && existing_type.kind.non_null?)
               variables[node.name.to_sym] = definition.type
             end
           end
@@ -66,13 +66,13 @@ module GraphQL
       #
       # Returns GraphQL::Language::Nodes::Type.
       def self.variable_node(type)
-        case type
-        when GraphQL::NonNullType
+        case type.kind.name
+        when "NON_NULL"
           GraphQL::Language::Nodes::NonNullType.new(of_type: variable_node(type.of_type))
-        when GraphQL::ListType
+        when "LIST"
           GraphQL::Language::Nodes::ListType.new(of_type: variable_node(type.of_type))
         else
-          GraphQL::Language::Nodes::TypeName.new(name: type.name)
+          GraphQL::Language::Nodes::TypeName.new(name: type.graphql_name)
         end
       end
     end

data/lib/graphql/client/document_types.rb

@@ -12,7 +12,7 @@ module GraphQL
       #
       # Returns a Hash[Language::Nodes::Node] to GraphQL::Type objects.
       def self.analyze_types(schema, document)
-        unless schema.is_a?(GraphQL::Schema)
+        unless schema.is_a?(GraphQL::Schema) || (schema.is_a?(Class) && schema < GraphQL::Schema)
           raise TypeError, "expected schema to be a GraphQL::Schema, but was #{schema.class}"
         end
 
@@ -40,7 +40,10 @@ module GraphQL
         visitor.visit
 
         fields
-      rescue StandardError
+      rescue StandardError => err
+        if err.is_a?(TypeError)
+          raise
+        end
         # FIXME: TypeStack my crash on invalid documents
         fields
       end

data/lib/graphql/client/http.rb

@@ -7,7 +7,7 @@ module GraphQL
   class Client
     # Public: Basic HTTP network adapter.
     #
-    #   GraphQL::Client::Client.new(
+    #   GraphQL::Client.new(
     #     execute: GraphQL::Client::HTTP.new("http://graphql-swapi.parseapp.com/")
     #   )
     #

data/lib/graphql/client/query_typename.rb

@@ -28,8 +28,8 @@ module GraphQL
             type = @types[node]
             type = type && type.unwrap
 
-            if (node.selections.any? && (type.nil? || type.is_a?(GraphQL::InterfaceType) || type.is_a?(GraphQL::UnionType))) ||
-              (node.selections.none? && type.is_a?(GraphQL::ObjectType))
+            if (node.selections.any? && (type.nil? || type.kind.interface? || type.kind.union?)) ||
+              (node.selections.none? && (type && type.kind.object?))
               names = QueryTypename.node_flatten_selections(node.selections).map { |s| s.respond_to?(:name) ? s.name : nil }
               names = Set.new(names.compact)
 

data/lib/graphql/client/schema/enum_type.rb

@@ -41,8 +41,8 @@ module GraphQL
         #
         # type - GraphQL::EnumType instance
         def initialize(type)
-          unless type.is_a?(GraphQL::EnumType)
-            raise "expected type to be a GraphQL::EnumType, but was #{type.class}"
+          unless type.kind.enum?
+            raise "expected type to be an Enum, but was #{type.class}"
           end
 
           @type = type

data/lib/graphql/client/schema/interface_type.rb

@@ -9,8 +9,8 @@ module GraphQL
         include BaseType
 
         def initialize(type)
-          unless type.is_a?(GraphQL::InterfaceType)
-            raise "expected type to be a GraphQL::InterfaceType, but was #{type.class}"
+          unless type.kind.interface?
+            raise "expected type to be an Interface, but was #{type.class}"
           end
 
           @type = type
@@ -21,7 +21,7 @@ module GraphQL
         end
 
         def define_class(definition, ast_nodes)
-          possible_type_names = definition.client.schema.possible_types(type).map(&:graphql_name)
+          possible_type_names = definition.client.possible_types(type).map(&:graphql_name)
           possible_types = possible_type_names.map { |concrete_type_name|
             schema_module.get_class(concrete_type_name).define_class(definition, ast_nodes)
           }

data/lib/graphql/client/schema/object_type.rb

@@ -16,6 +16,53 @@ module GraphQL
 
             define_singleton_method(:type) { type }
             define_singleton_method(:fields) { fields }
+
+            const_set(:READERS, {})
+            const_set(:PREDICATES, {})
+          end
+        end
+
+        class WithDefinition
+          include BaseType
+          include ObjectType
+
+          EMPTY_SET = Set.new.freeze
+
+          attr_reader :klass, :defined_fields, :definition
+
+          def type
+            @klass.type
+          end
+
+          def fields
+            @klass.fields
+          end
+
+          def spreads
+            if defined?(@spreads)
+              @spreads
+            else
+              EMPTY_SET
+            end
+          end
+
+          def initialize(klass, defined_fields, definition, spreads)
+            @klass = klass
+            @defined_fields = defined_fields.map do |k, v|
+              [-k.to_s, v]
+            end.to_h
+            @definition = definition
+            @spreads = spreads unless spreads.empty?
+
+            @defined_fields.keys.each do |attr|
+              name = ActiveSupport::Inflector.underscore(attr)
+              @klass::READERS[:"#{name}"] ||= attr
+              @klass::PREDICATES[:"#{name}?"] ||= attr
+            end
+          end
+
+          def new(data = {}, errors = Errors.new)
+            @klass.new(data, errors, self)
           end
         end
 
@@ -41,61 +88,14 @@ module GraphQL
           field_nodes.each do |result_name, field_ast_nodes|
             # `result_name` might be an alias, so make sure to get the proper name
             field_name = field_ast_nodes.first.name
-            field_definition = definition.client.schema.get_field(type.name, field_name)
+            field_definition = definition.client.schema.get_field(type.graphql_name, field_name)
             field_return_type = field_definition.type
             field_classes[result_name.to_sym] = schema_module.define_class(definition, field_ast_nodes, field_return_type)
           end
 
-          klass = Class.new(self)
-          klass.define_fields(field_classes)
-          klass.instance_variable_set(:@source_definition, definition)
-          klass.instance_variable_set(:@_spreads, definition.indexes[:spreads][ast_nodes.first])
-
-          if definition.client.enforce_collocated_callers
-            keys = field_classes.keys.map { |key| ActiveSupport::Inflector.underscore(key) }
-            Client.enforce_collocated_callers(klass, keys, definition.source_location[0])
-          end
-
-          klass
-        end
-
-        PREDICATE_CACHE = Hash.new { |h, name|
-          h[name] = -> { @data[name] ? true : false }
-        }
+          spreads = definition.indexes[:spreads][ast_nodes.first]
 
-        METHOD_CACHE = Hash.new { |h, key|
-          h[key] = -> {
-            name = key.to_s
-            type = self.class::FIELDS[key]
-            @casted_data.fetch(name) do
-              @casted_data[name] = type.cast(@data[name], @errors.filter_by_path(name))
-            end
-          }
-        }
-
-        MODULE_CACHE = Hash.new do |h, fields|
-          h[fields] = Module.new do
-            fields.each do |name|
-              GraphQL::Client::Schema::ObjectType.define_cached_field(name, self)
-            end
-          end
-        end
-
-        FIELDS_CACHE = Hash.new { |h, k| h[k] = k }
-
-        def define_fields(fields)
-          const_set :FIELDS, FIELDS_CACHE[fields]
-          mod = MODULE_CACHE[fields.keys.sort]
-          include mod
-        end
-
-        def self.define_cached_field(name, ctx)
-          key = name
-          name = -name.to_s
-          method_name = ActiveSupport::Inflector.underscore(name)
-
-          ctx.send(:define_method, method_name, &METHOD_CACHE[key])
-          ctx.send(:define_method, "#{method_name}?", &PREDICATE_CACHE[name])
+          WithDefinition.new(self, field_classes, definition, spreads)
         end
 
         def define_field(name, type)
@@ -134,9 +134,8 @@ module GraphQL
             continue_selection = if selected_ast_node.type.nil?
               true
             else
-              schema = definition.client.schema
-              type_condition = schema.types[selected_ast_node.type.name]
-              applicable_types = schema.possible_types(type_condition)
+              type_condition = definition.client.get_type(selected_ast_node.type.name)
+              applicable_types = definition.client.possible_types(type_condition)
               # continue if this object type is one of the types matching the fragment condition
               applicable_types.include?(type)
             end
@@ -150,10 +149,8 @@ module GraphQL
             fragment_definition = definition.document.definitions.find do |defn|
               defn.is_a?(GraphQL::Language::Nodes::FragmentDefinition) && defn.name == selected_ast_node.name
             end
-
-            schema = definition.client.schema
-            type_condition = schema.types[fragment_definition.type.name]
-            applicable_types = schema.possible_types(type_condition)
+            type_condition = definition.client.get_type(fragment_definition.type.name)
+            applicable_types = definition.client.possible_types(type_condition)
             # continue if this object type is one of the types matching the fragment condition
             continue_selection = applicable_types.include?(type)
 
@@ -177,17 +174,16 @@ module GraphQL
       end
 
       class ObjectClass
-        module ClassMethods
-          attr_reader :source_definition
-          attr_reader :_spreads
-        end
-
-        extend ClassMethods
-
-        def initialize(data = {}, errors = Errors.new)
+        def initialize(data = {}, errors = Errors.new, definer = nil)
           @data = data
           @casted_data = {}
           @errors = errors
+
+          # If we are not provided a definition, we can use this empty default
+          definer ||= ObjectType::WithDefinition.new(self.class, {}, nil, [])
+
+          @definer = definer
+          @enforce_collocated_callers = source_definition && source_definition.client.enforce_collocated_callers
         end
 
         # Public: Returns the raw response data
@@ -197,41 +193,85 @@ module GraphQL
           @data
         end
 
-        # Public: Return errors associated with data.
-        #
-        # Returns Errors collection.
-        attr_reader :errors
+        def _definer
+          @definer
+        end
 
-        def method_missing(*args)
-          super
-        rescue NoMethodError => e
-          type = self.class.type
+        def _spreads
+          @definer.spreads
+        end
 
-          if ActiveSupport::Inflector.underscore(e.name.to_s) != e.name.to_s
-            raise e
-          end
+        def source_definition
+          @definer.definition
+        end
 
-          field = type.all_fields.find do |f|
-            f.name == e.name.to_s || ActiveSupport::Inflector.underscore(f.name) == e.name.to_s
+        def respond_to_missing?(name, priv)
+          if (attr = self.class::READERS[name]) || (attr = self.class::PREDICATES[name])
+            @definer.defined_fields.key?(attr) || super
+          else
+            super
           end
+        end
 
-          unless field
-            raise UnimplementedFieldError, "undefined field `#{e.name}' on #{type} type. https://git.io/v1y3m"
+        # Public: Return errors associated with data.
+        #
+        # It's possible to define "errors" as a field. Ideally this shouldn't
+        # happen, but if it does we should prefer the field rather than the
+        # builtin error type.
+        #
+        # Returns Errors collection.
+        def errors
+          if type = @definer.defined_fields["errors"]
+            read_attribute("errors", type)
+          else
+            @errors
           end
+        end
 
-          if @data.key?(field.name)
-            error_class = ImplicitlyFetchedFieldError
-            message = "implicitly fetched field `#{field.name}' on #{type} type. https://git.io/v1yGL"
+        def method_missing(name, *args)
+          if (attr = self.class::READERS[name]) && (type = @definer.defined_fields[attr])
+            if @enforce_collocated_callers
+              verify_collocated_path do
+                read_attribute(attr, type)
+              end
+            else
+              read_attribute(attr, type)
+            end
+          elsif (attr = self.class::PREDICATES[name]) && @definer.defined_fields[attr]
+            has_attribute?(attr)
           else
-            error_class = UnfetchedFieldError
-            message = "unfetched field `#{field.name}' on #{type} type. https://git.io/v1y3U"
-          end
+            begin
+              super
+            rescue NoMethodError => e
+              type = self.class.type
 
-          raise error_class, message
+              if ActiveSupport::Inflector.underscore(e.name.to_s) != e.name.to_s
+                raise e
+              end
+
+              all_fields = type.respond_to?(:all_fields) ? type.all_fields : type.fields.values
+              field = all_fields.find do |f|
+                f.name == e.name.to_s || ActiveSupport::Inflector.underscore(f.name) == e.name.to_s
+              end
+
+              unless field
+                raise UnimplementedFieldError, "undefined field `#{e.name}' on #{type.graphql_name} type. https://git.io/v1y3m"
+              end
+
+              if @data.key?(field.name)
+                raise ImplicitlyFetchedFieldError, "implicitly fetched field `#{field.name}' on #{type} type. https://git.io/v1yGL"
+              else
+                raise UnfetchedFieldError, "unfetched field `#{field.name}' on #{type} type. https://git.io/v1y3U"
+              end
+            end
+          end
         end
 
         def inspect
-          parent = self.class.ancestors.select { |m| m.is_a?(ObjectType) }.last
+          parent = self.class
+          until parent.superclass == ObjectClass
+            parent = parent.superclass
+          end
 
           ivars = @data.map { |key, value|
             if value.is_a?(Hash) || value.is_a?(Array)
@@ -246,6 +286,26 @@ module GraphQL
           buf << ">"
           buf
         end
+
+        private
+
+        def verify_collocated_path
+          location = caller_locations(2, 1)[0]
+
+          CollocatedEnforcement.verify_collocated_path(location, source_definition.source_location[0]) do
+            yield
+          end
+        end
+
+        def read_attribute(attr, type)
+          @casted_data.fetch(attr) do
+            @casted_data[attr] = type.cast(@data[attr], @errors.filter_by_path(attr))
+          end
+        end
+
+        def has_attribute?(attr)
+          !!@data[attr]
+        end
       end
     end
   end

data/lib/graphql/client/schema/possible_types.rb

@@ -22,7 +22,7 @@ module GraphQL
             unless klass.is_a?(ObjectType)
               raise TypeError, "expected type to be #{ObjectType}, but was #{type.class}"
             end
-            @possible_types[klass.type.name] = klass
+            @possible_types[klass.type.graphql_name] = klass
           end
         end
 

data/lib/graphql/client/schema/scalar_type.rb

@@ -12,8 +12,8 @@ module GraphQL
         #
         # type - GraphQL::BaseType instance
         def initialize(type)
-          unless type.is_a?(GraphQL::ScalarType)
-            raise "expected type to be a GraphQL::ScalarType, but was #{type.class}"
+          unless type.kind.scalar?
+            raise "expected type to be a Scalar, but was #{type.class}"
           end
 
           @type = type

data/lib/graphql/client/schema/union_type.rb

@@ -9,8 +9,8 @@ module GraphQL
         include BaseType
 
         def initialize(type)
-          unless type.is_a?(GraphQL::UnionType)
-            raise "expected type to be a GraphQL::UnionType, but was #{type.class}"
+          unless type.kind.union?
+            raise "expected type to be a Union, but was #{type.class}"
           end
 
           @type = type
@@ -21,7 +21,7 @@ module GraphQL
         end
 
         def define_class(definition, ast_nodes)
-          possible_type_names = definition.client.schema.possible_types(type).map(&:graphql_name)
+          possible_type_names = definition.client.possible_types(type).map(&:graphql_name)
           possible_types = possible_type_names.map { |concrete_type_name|
             schema_module.get_class(concrete_type_name).define_class(definition, ast_nodes)
           }

data/lib/graphql/client/schema.rb

@@ -16,13 +16,13 @@ module GraphQL
     module Schema
       module ClassMethods
         def define_class(definition, ast_nodes, type)
-          type_class = case type
-          when GraphQL::NonNullType
+          type_class = case type.kind.name
+          when "NON_NULL"
             define_class(definition, ast_nodes, type.of_type).to_non_null_type
-          when GraphQL::ListType
+          when "LIST"
             define_class(definition, ast_nodes, type.of_type).to_list_type
           else
-            get_class(type.name).define_class(definition, ast_nodes)
+            get_class(type.graphql_name).define_class(definition, ast_nodes)
           end
 
           ast_nodes.each do |ast_node|
@@ -62,7 +62,7 @@ module GraphQL
         private
 
         def normalize_type_name(type_name)
-          type_name =~ /\A[A-Z]/ ? type_name : type_name.camelize
+          /\A[A-Z]/.match?(type_name) ? type_name : type_name.camelize
         end
       end
 
@@ -85,18 +85,18 @@ module GraphQL
       def self.class_for(schema, type, cache)
         return cache[type] if cache[type]
 
-        case type
-        when GraphQL::InputObjectType
+        case type.kind.name
+        when "INPUT_OBJECT"
           nil
-        when GraphQL::ScalarType
+        when "SCALAR"
           cache[type] = ScalarType.new(type)
-        when GraphQL::EnumType
+        when "ENUM"
           cache[type] = EnumType.new(type)
-        when GraphQL::ListType
+        when "LIST"
           cache[type] = class_for(schema, type.of_type, cache).to_list_type
-        when GraphQL::NonNullType
+        when "NON_NULL"
           cache[type] = class_for(schema, type.of_type, cache).to_non_null_type
-        when GraphQL::UnionType
+        when "UNION"
           klass = cache[type] = UnionType.new(type)
 
           type.possible_types.each do |possible_type|
@@ -105,22 +105,23 @@ module GraphQL
           end
 
           klass
-        when GraphQL::InterfaceType
+        when "INTERFACE"
           cache[type] = InterfaceType.new(type)
-        when GraphQL::ObjectType
+        when "OBJECT"
           klass = cache[type] = ObjectType.new(type)
 
           type.interfaces.each do |interface|
             klass.send :include, class_for(schema, interface, cache)
           end
-
-          type.all_fields.each do |field|
+          # Legacy objects have `.all_fields`
+          all_fields = type.respond_to?(:all_fields) ? type.all_fields : type.fields.values
+          all_fields.each do |field|
             klass.fields[field.name.to_sym] = class_for(schema, field.type, cache)
           end
 
           klass
         else
-          raise TypeError, "unexpected #{type.class}"
+          raise TypeError, "unexpected #{type.class} (#{type.inspect})"
         end
       end
     end

data/lib/graphql/client/view_module.rb

@@ -133,7 +133,7 @@ module GraphQL
 
         remove_const(name) if placeholder
         const_set(name, mod)
-        mod.unloadable
+        mod.unloadable if mod.respond_to?(:unloadable)
         mod
       end
 

data/lib/graphql/client.rb

@@ -46,15 +46,15 @@ module GraphQL
 
     def self.load_schema(schema)
       case schema
-      when GraphQL::Schema
+      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)
@@ -97,10 +97,31 @@ module GraphQL
       @document_tracking_enabled = false
       @allow_dynamic_queries = false
       @enforce_collocated_callers = enforce_collocated_callers
-
+      if schema.is_a?(Class)
+        @possible_types = schema.possible_types
+      end
       @types = Schema.generate(@schema)
     end
 
+    # 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)
       if filename.nil? && lineno.nil?
         location = caller_locations(1, 1).first
@@ -135,11 +156,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 +190,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,32 +213,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)
 
-      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 = 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__"]
@@ -239,12 +233,30 @@ module GraphQL
       end
     end
 
-    class RenameNodeHook
-      def initialize(definitions)
+    class RenameNodeVisitor < GraphQL::Language::Visitor
+      def initialize(document, definitions:)
+        super(document)
         @definitions = definitions
       end
 
-      def rename_node(node, _parent)
+      def on_fragment_definition(node, _parent)
+        rename_node(node)
+        super
+      end
+
+      def on_operation_definition(node, _parent)
+        rename_node(node)
+        super
+      end
+
+      def on_fragment_spread(node, _parent)
+        rename_node(node)
+        super
+      end
+
+      private
+
+      def rename_node(node)
         definition = @definitions[node.name]
         if definition
           node.extend(LazyName)
@@ -253,6 +265,10 @@ module GraphQL
       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)
+      @schema.get_type(type_name)
+    end
 
     # Public: Create operation definition from a fragment definition.
     #
@@ -288,15 +304,15 @@ module GraphQL
       variables = GraphQL::Client::DefinitionVariables.operation_variables(self.schema, fragment.document, fragment.definition_name)
       type_name = fragment.definition_node.type.name
 
-      if schema.query && type_name == schema.query.name
+      if schema.query && type_name == schema.query.graphql_name
         operation_type = "query"
-      elsif schema.mutation && type_name == schema.mutation.name
+      elsif schema.mutation && type_name == schema.mutation.graphql_name
         operation_type = "mutation"
-      elsif schema.subscription && type_name == schema.subscription.name
+      elsif schema.subscription && type_name == schema.subscription.graphql_name
         operation_type = "subscription"
       else
         types = [schema.query, schema.mutation, schema.subscription].compact
-        raise Error, "Fragment must be defined on #{types.map(&:name).join(", ")}"
+        raise Error, "Fragment must be defined on #{types.map(&:graphql_name).join(", ")}"
       end
 
       doc_ast = GraphQL::Language::Nodes::Document.new(definitions: [
@@ -379,6 +395,44 @@ 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
+        definitions = document_dependencies.definitions.map { |x| [x.name, x] }.to_h
+
+        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
+
+    def find_definition_dependencies(node)
+      names = []
+      visitor = Language::Visitor.new(node)
+      visitor[Language::Nodes::FragmentSpread] << -> (node, parent) { names << node.name }
+      visitor.visit
+      names.uniq
+    end
+
     def deep_freeze_json_object(obj)
       case obj
       when String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,6 +125,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: GraphQL Client