graphql-client 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7ced5b5ef5fb8e496d8c221867165c4629670a5f8ecf1e44f8c523e5774ae2
-  data.tar.gz: 49453ec41a714dca5774c32b24139527beb7623a8c99a2368e789f9b1443c79a
+  metadata.gz: 6810301cbdd84362dc4b8584e24deec3aec4248f4471734748cf1a33feaa5232
+  data.tar.gz: bb68c48d70c276c0443da6620506b37dbe152e20fb931a2ecf3a0cba45050f96
 SHA512:
-  metadata.gz: b69902cbed392a6ad77d5e124db8196439b17750ecb369fc3189a93593857f5e1cf80ade820edb5abc0e11cade056832c733726e2e4202207496d7435eb6ebfa
-  data.tar.gz: a918d43558b2f75ce3627a7dd003ba76e083b9c087f15c36e4df7e571d5eef71a4760fe929a7d6d93eb78a22b4f310c8ef75f9737a719a516c659eb70117026e
+  metadata.gz: 6b7f114d4330ae5168669d7a663a0afdbd508ba056aa252a206efca9071f558c8749ecfd809ca0677ab9e3a5e95cc90eec3a6bcc2e4020875aab6621d9059dd8
+  data.tar.gz: b1a24192dc4ee004ae6d546d4d724d0c49da4a17a4fb86a1a7e81d1aefbe16618f32ed27a63a8c2297bd4074ec8dd91794ab057d3826d08ccfefe21d689e7e76

data/lib/graphql/client.rb

@@ -46,7 +46,7 @@ module GraphQL
 
     def self.load_schema(schema)
       case schema
-      when GraphQL::Schema
+      when GraphQL::Schema, Class
         schema
       when Hash
         GraphQL::Schema::Loader.load(schema)
@@ -213,12 +213,17 @@ module GraphQL
         definitions[node.name] = definition
       end
 
-      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
+      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
 
       if document_tracking_enabled
         if @document.respond_to?(:merge) # GraphQL 1.9+
@@ -239,6 +244,38 @@ module GraphQL
       end
     end
 
+    class RenameNodeVisitor < GraphQL::Language::Visitor
+      def initialize(document, definitions:)
+        super(document)
+        @definitions = definitions
+      end
+
+      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)
+          node._definition = definition
+        end
+      end
+    end
+
     class RenameNodeHook
       def initialize(definitions)
         @definitions = definitions
@@ -253,6 +290,14 @@ 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)
+      if @schema.respond_to?(:get_type)
+        @schema.get_type(type_name)
+      else
+        @schema.types[type_name]
+      end
+    end
 
     # Public: Create operation definition from a fragment definition.
     #
@@ -288,15 +333,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: [

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
@@ -170,16 +170,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/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.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/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

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

@@ -41,7 +41,7 @@ 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
@@ -135,7 +135,7 @@ module GraphQL
               true
             else
               schema = definition.client.schema
-              type_condition = schema.types[selected_ast_node.type.name]
+              type_condition = definition.client.get_type(selected_ast_node.type.name)
               applicable_types = schema.possible_types(type_condition)
               # continue if this object type is one of the types matching the fragment condition
               applicable_types.include?(type)
@@ -152,7 +152,7 @@ module GraphQL
             end
 
             schema = definition.client.schema
-            type_condition = schema.types[fragment_definition.type.name]
+            type_condition = definition.client.get_type(fragment_definition.type.name)
             applicable_types = schema.possible_types(type_condition)
             # continue if this object type is one of the types matching the fragment condition
             continue_selection = applicable_types.include?(type)
@@ -211,12 +211,13 @@ module GraphQL
             raise e
           end
 
-          field = type.all_fields.find do |f|
+          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} type. https://git.io/v1y3m"
+            raise UnimplementedFieldError, "undefined field `#{e.name}' on #{type.graphql_name} type. https://git.io/v1y3m"
           end
 
           if @data.key?(field.name)

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport