graphql 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347eef5d121c7ccb7f0c217370e2a02285d36096
-  data.tar.gz: e2b7083f415d77f05dcb888c121075617c93e677
+  metadata.gz: a043673bcabc1f7cbcc834d71919a4a61dd36a6a
+  data.tar.gz: efc89423aa48aecce87434a1f0e4567fdf4de290
 SHA512:
-  metadata.gz: 07a84a28ba76c6b7f0586b1c4e73745ae4d279482cab00b2a1ae6d087e566156359f993d325cc102c7af3ed23b0dc3f381d29635fef85ebe73d71ed103d7e0f2
-  data.tar.gz: d5b0dcfeb682086a666c839ebf4d0dcfd695201682016cc55d16d28d6f487012ac8f82e6360ea58780e3a6874c4eee52b49d0e8f44d37817e0672decdb27753f
+  metadata.gz: d379a08ef187cef29cec03dfb570d3064bc762ff117a5f4e912ef2b5e4cd6f512f1317b42a1e0ae5ccb0510eb505ab36e0ef8ff61c7331326523b7d49889d7d7
+  data.tar.gz: 58ddefe960ea3e4d75d9c55ba06403632974a796f6fa5a3869977b2733d5dad17e0037390848cdd738b605b89e22807e47508d64a03f4c8978f46d714cc393f0

data/lib/generators/graphql/core.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+require 'rails/generators/base'
+
+module Graphql
+  module Generators
+    module Core
+      def insert_root_type(type, name)
+        log :add_root_type, type
+        sentinel = /GraphQL\:\:Schema\.define do\s*\n/m
+
+        in_root do
+          inject_into_file schema_file_path, "  #{type}(Types::#{name})\n", after: sentinel, verbose: false, force: false
+        end
+      end
+
+      def create_mutation_root_type
+        create_dir("app/graphql/mutations")
+        template("mutation_type.erb", "app/graphql/types/mutation_type.rb", { skip: true })
+        insert_root_type('mutation', 'MutationType')
+      end
+
+      def schema_file_path
+        "app/graphql/#{schema_name.underscore}.rb"
+      end
+
+      def create_dir(dir)
+        empty_directory(dir)
+        if !options[:skip_keeps]
+          create_file("#{dir}/.keep")
+        end
+      end
+
+      private
+
+      def schema_name
+        @schema_name ||= begin
+          if options[:schema]
+            options[:schema]
+          else
+            require File.expand_path("config/application", destination_root)
+            "#{Rails.application.class.parent_name}Schema"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/graphql/install_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'rails/generators/base'
+require_relative 'core'
 
 module Graphql
   module Generators
@@ -40,6 +41,8 @@ module Graphql
     #
     # Use `--no-graphiql` to skip `graphiql-rails` installation.
     class InstallGenerator < Rails::Generators::Base
+      include Core
+
       desc "Install GraphQL folder structure and boilerplate code"
       source_root File.expand_path('../templates', __FILE__)
 
@@ -58,6 +61,11 @@ module Graphql
         default: false,
         desc: "Skip graphiql-rails installation"
 
+      class_option :skip_mutation_root_type,
+        type: :boolean,
+        default: false,
+        desc: "Skip creation of the mutation root type"
+
       class_option :relay,
         type: :boolean,
         default: false,
@@ -81,10 +89,15 @@ if Rails.env.development?
 RUBY
 
       def create_folder_structure
-        create_dir("app/graphql/mutations")
         create_dir("app/graphql/types")
+        template("schema.erb", schema_file_path)
+
+        # Note: Yuo can't have a schema without the query type, otherwise introspection breaks
         template("query_type.erb", "app/graphql/types/query_type.rb")
-        template("schema.erb", "app/graphql/#{schema_name.underscore}.rb")
+        insert_root_type('query', 'QueryType')
+
+        create_mutation_root_type unless options.skip_mutation_root_type?
+
         template("graphql_controller.erb", "app/controllers/graphql_controller.rb")
         route('post "/graphql", to: "graphql#execute"')
 
@@ -121,24 +134,6 @@ RUBY
         @gemfile_modified = true
         super(*args)
       end
-
-      def create_dir(dir)
-        empty_directory(dir)
-        if !options[:skip_keeps]
-          create_file("#{dir}/.keep")
-        end
-      end
-
-      def schema_name
-        @schema_name ||= begin
-          if options[:schema]
-            options[:schema]
-          else
-            require File.expand_path("config/application", destination_root)
-            "#{Rails.application.class.parent_name}Schema"
-          end
-        end
-      end
     end
   end
 end

data/lib/generators/graphql/mutation_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'rails/generators/named_base'
+require_relative 'core'
 
 module Graphql
   module Generators
@@ -7,12 +8,41 @@ module Graphql
     #
     # @example Generate a `Relay::Mutation` by name
     #     rails g graphql:mutation CreatePostMutation
-    class MutationGenerator < Rails::Generators::NamedBase
+    class MutationGenerator < Rails::Generators::Base
+      include Core
+
       desc "Create a Relay mutation by name"
       source_root File.expand_path('../templates', __FILE__)
 
+      argument :name, type: :string
+
+      def initialize(args, *options) #:nodoc:
+        # Unfreeze name in case it's given as a frozen string
+        args[0] = args[0].dup if args[0].is_a?(String) && args[0].frozen?
+        super
+
+        assign_names!(name)
+      end
+
+      attr_reader :file_name, :mutation_name, :field_name
+
       def create_mutation_file
+        create_mutation_root_type
         template "mutation.erb", "app/graphql/mutations/#{file_name}.rb"
+
+        sentinel = /name "Mutation"\s*\n/m
+        in_root do
+          gsub_file "app/graphql/types/mutation_type.rb", /  \# TODO\: Add Mutations as fields\s*\n/m, ""
+          inject_into_file "app/graphql/types/mutation_type.rb", "  field :#{field_name}, Mutations::#{mutation_name}.field\n", after: sentinel, verbose: false, force: false
+        end
+      end
+
+      private
+
+      def assign_names!(name)
+        @field_name = name.camelize(:lower)
+        @mutation_name = name.camelize(:upper)
+        @file_name = name.camelize.underscore
       end
     end
   end

data/lib/generators/graphql/templates/mutation.erb

@@ -1,5 +1,5 @@
-Mutations::<%= name %> = GraphQL::Relay::Mutation.define do
-  name "<%= name %>"
+Mutations::<%= mutation_name %> = GraphQL::Relay::Mutation.define do
+  name "<%= mutation_name %>"
   # TODO: define return fields
   # return_field :post, Types::PostType
 

data/lib/generators/graphql/templates/mutation_type.erb

@@ -0,0 +1,5 @@
+Types::MutationType = GraphQL::ObjectType.define do
+  name "Mutation"
+
+  # TODO: Add Mutations as fields
+end

data/lib/generators/graphql/templates/schema.erb

@@ -1,5 +1,4 @@
 <%= schema_name %> = GraphQL::Schema.define do
-  query(Types::QueryType)
 <% if options[:relay] %>
   # Relay Object Identification:
 

data/lib/graphql/argument.rb

@@ -96,11 +96,11 @@ module GraphQL
 
     NO_DEFAULT_VALUE = Object.new
     # @api private
-    def self.from_dsl(name, type = nil, description = nil, default_value: NO_DEFAULT_VALUE, as: nil, prepare: DefaultPrepare, &block)
+    def self.from_dsl(name, type = nil, description = nil, default_value: NO_DEFAULT_VALUE, as: nil, prepare: DefaultPrepare, **kwargs, &block)
       argument = if block_given?
         GraphQL::Argument.define(&block)
       else
-        GraphQL::Argument.new
+        GraphQL::Argument.define(**kwargs)
       end
 
       argument.name = name.to_s
@@ -109,9 +109,10 @@ module GraphQL
       if default_value != NO_DEFAULT_VALUE
         argument.default_value = default_value
       end
-      argument.as = as
-      argument.prepare = prepare
-
+      as && argument.as = as
+      if prepare != DefaultPrepare
+        argument.prepare = prepare
+      end
 
       argument
     end

data/lib/graphql/backwards_compatibility.rb

@@ -8,7 +8,9 @@ module GraphQL
     # check its arity, and if needed, apply a wrapper so that
     # it can be called with `to` arguments.
     # If a wrapper is applied, warn the application with `name`.
-    def wrap_arity(callable, from:, to:, name:)
+    #
+    # If `last`, then use the last arguments to call the function.
+    def wrap_arity(callable, from:, to:, name:, last: false)
       arity = get_arity(callable)
       case arity
       when to
@@ -16,8 +18,13 @@ module GraphQL
         callable
       when from
         # It has the old arity, so wrap it with an arity converter
-        warn("#{name} with #{from} arguments is deprecated, it now accepts #{to} arguments")
-        ArityWrapper.new(callable, from)
+        message ="#{name} with #{from} arguments is deprecated, it now accepts #{to} arguments, see:"
+        backtrace = caller(0, 20)
+        # Find the first line in the trace that isn't library internals:
+        user_line = backtrace.find {|l| l !~ /lib\/graphql/ }
+        warn(message + "\n" + user_line + "\n")
+        wrapper = last ? LastArgumentsWrapper : FirstArgumentsWrapper
+        wrapper.new(callable, from)
       else
         raise "Can't wrap #{callable} (arity: #{arity}) to have arity #{to}"
       end
@@ -32,7 +39,7 @@ module GraphQL
       end
     end
 
-    class ArityWrapper
+    class FirstArgumentsWrapper
       def initialize(callable, old_arity)
         @callable = callable
         @old_arity = old_arity
@@ -43,5 +50,12 @@ module GraphQL
         @callable.call(*backwards_compat_args)
       end
     end
+
+    class LastArgumentsWrapper < FirstArgumentsWrapper
+      def call(*args)
+        backwards_compat_args = args.last(@old_arity)
+        @callable.call(*backwards_compat_args)
+      end
+    end
   end
 end

data/lib/graphql/base_type.rb

@@ -86,7 +86,7 @@ module GraphQL
 
     # Find out which possible type to use for `value`.
     # Returns self if there are no possible types (ie, not Union or Interface)
-    def resolve_type(value)
+    def resolve_type(value, ctx)
       self
     end
 

data/lib/graphql/compatibility/execution_specification/counter_schema.rb

@@ -40,7 +40,7 @@ module GraphQL
 
           schema = GraphQL::Schema.define(
             query: query_type,
-            resolve_type: ->(o, c) { o == :counter ? counter_type : nil },
+            resolve_type: ->(t, o, c) { o == :counter ? counter_type : nil },
             orphan_types: [alt_counter_type, counter_type],
             query_execution_strategy: execution_strategy,
           )

data/lib/graphql/compatibility/execution_specification/specification_schema.rb

@@ -178,7 +178,7 @@ module GraphQL
             query_execution_strategy execution_strategy
             query query_type
 
-            resolve_type ->(obj, ctx) {
+            resolve_type ->(type, obj, ctx) {
               if obj.respond_to?(:birthdate)
                 person_type
               elsif obj.respond_to?(:leader_id)

data/lib/graphql/compatibility/lazy_execution_specification.rb

@@ -24,11 +24,17 @@ module GraphQL
               p2: push(value: 2) {
                 push(value: 3) {
                   value
+                  push(value: 21) {
+                    value
+                  }
                 }
               }
               p3: push(value: 4) {
                 push(value: 5) {
                   value
+                  push(value: 22) {
+                    value
+                  }
                 }
               }
             }
@@ -37,14 +43,15 @@ module GraphQL
 
             expected_data = {
               "p1"=>{"value"=>1},
-              "p2"=>{"push"=>{"value"=>3}},
-              "p3"=>{"push"=>{"value"=>5}},
+              "p2"=>{"push"=>{"value"=>3, "push"=>{"value"=>21}}},
+              "p3"=>{"push"=>{"value"=>5, "push"=>{"value"=>22}}},
             }
             assert_equal expected_data, res["data"]
 
             expected_pushes = [
               [1,2,4], # first level
               [3,5], # second level
+              [21, 22],
             ]
             assert_equal expected_pushes, pushes
           end

data/lib/graphql/define.rb

@@ -7,6 +7,7 @@ require "graphql/define/assign_mutation_function"
 require "graphql/define/assign_object_field"
 require "graphql/define/defined_object_proxy"
 require "graphql/define/instance_definable"
+require "graphql/define/no_definition_error"
 require "graphql/define/non_null_with_bang"
 require "graphql/define/type_definer"
 

data/lib/graphql/define/defined_object_proxy.rb

@@ -38,7 +38,7 @@ module GraphQL
           definition.call(@target, *args, &block)
         else
           msg = "#{@target.class.name} can't define '#{name}'"
-          raise NoMethodError, msg, caller
+          raise NoDefinitionError, msg, caller
         end
       end
 

data/lib/graphql/define/no_definition_error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+module GraphQL
+  module Define
+    class NoDefinitionError < GraphQL::Error
+    end
+  end
+end

data/lib/graphql/enum_type.rb

@@ -93,6 +93,10 @@ module GraphQL
 
     # @param enum_value [EnumValue] A value to add to this type's set of values
     def add_value(enum_value)
+      if @values_by_name.key?(enum_value.name)
+        raise "Enum value names must be unique. `#{enum_value.name}` already exists."
+      end
+
       @values_by_name[enum_value.name] = enum_value
     end
 

data/lib/graphql/execution/execute.rb

@@ -76,8 +76,8 @@ module GraphQL
             selection: selection,
           )
 
-          arguments = query.arguments_for(selection, field)
           raw_value = begin
+            arguments = query.arguments_for(selection, field)
             query_ctx.schema.middleware.invoke([parent_type, object, field, arguments, field_ctx])
           rescue GraphQL::ExecutionError => err
             err
@@ -116,7 +116,7 @@ module GraphQL
 
           case raw_value
           when GraphQL::ExecutionError
-            raw_value.ast_node = field_ctx.ast_node
+            raw_value.ast_node ||= field_ctx.ast_node
             raw_value.path = field_ctx.path
             query.context.errors.push(raw_value)
           when Array
@@ -210,7 +210,7 @@ module GraphQL
               )
             when GraphQL::TypeKinds::UNION, GraphQL::TypeKinds::INTERFACE
               query = field_ctx.query
-              resolved_type = query.resolve_type(value)
+              resolved_type = field_type.resolve_type(value, field_ctx)
               possible_types = query.possible_types(field_type)
 
               if !possible_types.include?(resolved_type)

data/lib/graphql/execution/field_result.rb

@@ -47,7 +47,7 @@ module GraphQL
       end
 
       def inspect
-        "#<FieldResult #{value.inspect} (#{field.type})>"
+        "#<FieldResult #{value.inspect} (#{@type})>"
       end
     end
   end

data/lib/graphql/execution/lazy/resolve.rb

@@ -35,14 +35,14 @@ module GraphQL
           if acc.empty?
             Lazy::NullResult
           else
-            acc.each_with_index do |field_result, idx|
-              acc[idx] = field_result.value.then do |inner_v|
+            Lazy.new {
+              acc.each_with_index { |field_result, idx|
+                inner_v = field_result.value.value
                 field_result.value = inner_v
-                resolve_in_place(inner_v)
-              end
-            end
-
-            Lazy.new { acc.each_with_index { |l, idx| acc[idx] = l.value }; acc }
+                acc[idx] = inner_v
+              }
+              resolve_in_place(acc)
+            }
           end
         end
 
@@ -62,9 +62,10 @@ module GraphQL
             end
           when FieldResult
             field_value = value.value
-            if field_value.is_a?(Lazy)
+            case field_value
+            when Lazy
               acc = acc << value
-            else
+            when SelectionResult
               acc = each_lazy(acc, field_value)
             end
           end