graphql 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2aa5dc86bfb37cc0c46b7974618bddc91b203b0
-  data.tar.gz: 92979d239d0fbd9a010261dec5d0b1285c617c3f
+  metadata.gz: c8642c253947a56246003a995f373e3088b70848
+  data.tar.gz: 0e027e906d12ff726e144220849ac216b66dc56d
 SHA512:
-  metadata.gz: 26ccb7f54465c14158a933a4bbc52eaba9576725ea06ce1a5425128fd39ad133013383ffa650bc6bbbdf16030bf232ab021da6a1c39ee20933d294b49d5d8d57
-  data.tar.gz: 7ec6717d6a3cf091189269e92d991cd49fdec20802d68cb7c83d60b9ab615535ad626c8163a5022e713f4c9f875bfaec1430b51098ec3e55eca5e91ff6e1a622
+  metadata.gz: cfabff78ee8e8bb710ee73bfcb191d7b040a55eb042a2b94cf8d8d3169671b954aa13901c095124a516d593f49d21f1c9f2f63ed2731308e77e74fbffad9d726
+  data.tar.gz: d924393eea98ab77207c0fa35abc579373f650000e66b82cd181f1e5286b58d8794e29fcc4f3796f3b8db6f0dec0c7293e8244275cdceb0f45f39bde556f8f89

data/lib/graphql/enum_type.rb

@@ -147,6 +147,10 @@ module GraphQL
         GraphQL::NameValidator.validate!(new_name)
         @name = new_name
       end
+
+      def graphql_name
+        name
+      end
     end
 
     class UnresolvedValueError < GraphQL::Error

data/lib/graphql/execution/multiplex.rb

@@ -91,7 +91,7 @@ module GraphQL
             # Get the Query::Result, not the Hash
             query.result
           end
-        rescue StandardError
+        rescue Exception
           # Assign values here so that the query's `@executed` becomes true
           queries.map { |q| q.result_values ||= {} }
           raise

data/lib/graphql/schema/argument.rb

@@ -4,6 +4,7 @@ module GraphQL
     class Argument
       include GraphQL::Schema::Member::CachedGraphQLDefinition
       include GraphQL::Schema::Member::AcceptsDefinition
+      include GraphQL::Schema::Member::HasPath
 
       NO_DEFAULT = :__no_default__
 

data/lib/graphql/schema/enum_value.rb

@@ -27,6 +27,7 @@ module GraphQL
     #   end
     class EnumValue < GraphQL::Schema::Member
       include GraphQL::Schema::Member::AcceptsDefinition
+      include GraphQL::Schema::Member::HasPath
 
       attr_reader :graphql_name
 

data/lib/graphql/schema/field.rb

@@ -6,6 +6,7 @@ module GraphQL
       include GraphQL::Schema::Member::CachedGraphQLDefinition
       include GraphQL::Schema::Member::AcceptsDefinition
       include GraphQL::Schema::Member::HasArguments
+      include GraphQL::Schema::Member::HasPath
 
       # @return [String] the GraphQL name for this field, camelized unless `camelize: false` is provided
       attr_reader :name

data/lib/graphql/schema/interface.rb

@@ -9,6 +9,7 @@ module GraphQL
         include GraphQL::Schema::Member::BaseDSLMethods
         include GraphQL::Schema::Member::TypeSystemHelpers
         include GraphQL::Schema::Member::HasFields
+        include GraphQL::Schema::Member::HasPath
         include GraphQL::Schema::Member::RelayShortcuts
         include GraphQL::Schema::Member::Scoped
 

data/lib/graphql/schema/member.rb

@@ -3,6 +3,7 @@ require 'graphql/schema/member/accepts_definition'
 require 'graphql/schema/member/base_dsl_methods'
 require 'graphql/schema/member/cached_graphql_definition'
 require 'graphql/schema/member/graphql_type_names'
+require 'graphql/schema/member/has_path'
 require 'graphql/schema/member/relay_shortcuts'
 require 'graphql/schema/member/scoped'
 require 'graphql/schema/member/type_system_helpers'
@@ -22,6 +23,7 @@ module GraphQL
       extend TypeSystemHelpers
       extend Scoped
       extend RelayShortcuts
+      extend HasPath
     end
   end
 end

data/lib/graphql/schema/member/has_path.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Schema
+    class Member
+      module HasPath
+        # @return [String] A description of this member's place in the GraphQL schema
+        def path
+          path_str = if self.respond_to?(:graphql_name)
+            self.graphql_name
+          elsif self.class.respond_to?(:graphql_name)
+            # Instances of resolvers
+            self.class.graphql_name
+          end
+
+          if self.respond_to?(:owner) && owner.respond_to?(:path)
+            path_str = "#{owner.path}.#{path_str}"
+          end
+
+          path_str
+        end
+      end
+    end
+  end
+end

data/lib/graphql/schema/relay_classic_mutation.rb

@@ -25,20 +25,14 @@ module GraphQL
       # Relay classic default:
       null(true)
 
-      # Override {GraphQL::Schema::Mutation#resolve_mutation} to
+      # Override {GraphQL::Schema::Resolver#resolve_with_support} to
       # delete `client_mutation_id` from the kwargs.
-      def resolve_mutation(**kwargs)
+      def resolve_with_support(**kwargs)
         # This is handled by Relay::Mutation::Resolve, a bit hacky, but here we are.
         kwargs.delete(:client_mutation_id)
-        if kwargs.any?
-          resolve(**kwargs)
-        else
-          resolve
-        end
+        super
       end
 
-      resolve_method(:resolve_mutation)
-
       class << self
         # The base class for generated input object types
         # @param new_class [Class] The base class to use for generating input object definitions

data/lib/graphql/schema/resolver.rb

@@ -23,6 +23,8 @@ module GraphQL
       # Really we only need description from here, but:
       extend Schema::Member::BaseDSLMethods
       extend GraphQL::Schema::Member::HasArguments
+      include Schema::Member::HasPath
+      extend Schema::Member::HasPath
 
       # @param object [Object] the initialize object, pass to {Query.initialize} as `root_value`
       # @param context [GraphQL::Query::Context]
@@ -72,7 +74,6 @@ module GraphQL
               else
                 authorized?
               end
-              authorized?(loaded_args)
               context.schema.after_lazy(authorized_val) do |(authorized_result, early_return)|
                 # If the `authorized?` returned two values, `false, early_return`,
                 # then use the early return value instead of continuing
@@ -323,13 +324,32 @@ module GraphQL
         # @see {GraphQL::Schema::Argument#initialize} for the signature
         def argument(name, type, *rest, loads: nil, **kwargs, &block)
           if loads
-            arg_keyword = name.to_s.sub(/_id$/, "").to_sym
-            kwargs[:as] = arg_keyword
-            own_arguments_loads_as_type[arg_keyword] = loads
+            name_as_string = name.to_s
+
+            inferred_arg_name = case name_as_string
+            when /_id$/
+              name_as_string.sub(/_id$/, "").to_sym
+            when /_ids$/
+              name_as_string.sub(/_ids$/, "")
+                .sub(/([^s])$/, "\\1s")
+                .to_sym
+            else
+              name
+            end
+
+            kwargs[:as] ||= inferred_arg_name
+            own_arguments_loads_as_type[kwargs[:as]] = loads
           end
+
           arg_defn = super(name, type, *rest, **kwargs, &block)
 
-          if loads
+          if loads && arg_defn.type.list?
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def load_#{arg_defn.keyword}(values)
+              GraphQL::Execution::Lazy.all(values.map { |value| load_application_object(:#{arg_defn.keyword}, value) })
+            end
+            RUBY
+          elsif loads
             class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def load_#{arg_defn.keyword}(value)
               load_application_object(:#{arg_defn.keyword}, value)

data/lib/graphql/subscriptions/action_cable_subscriptions.rb

@@ -39,7 +39,7 @@ module GraphQL
     #       })
     #
     #       payload = {
-    #         result: result.subscription? ? nil : result.to_h,
+    #         result: result.subscription? ? { data: nil } : result.to_h,
     #         more: result.subscription?,
     #       }
     #
@@ -54,9 +54,28 @@ module GraphQL
     #
     #     def unsubscribed
     #       @subscription_ids.each { |sid|
-    #         CardsSchema.subscriptions.delete_subscription(sid)
+    #         MySchema.subscriptions.delete_subscription(sid)
     #       }
     #     end
+    #
+    #     private
+    #
+    #       def ensure_hash(ambiguous_param)
+    #         case ambiguous_param
+    #         when String
+    #           if ambiguous_param.present?
+    #             ensure_hash(JSON.parse(ambiguous_param))
+    #           else
+    #             {}
+    #           end
+    #         when Hash, ActionController::Parameters
+    #           ambiguous_param
+    #         when nil
+    #           {}
+    #         else
+    #           raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
+    #         end
+    #       end
     #   end
     #
     class ActionCableSubscriptions < GraphQL::Subscriptions

data/lib/graphql/upgrader/member.rb

@@ -19,6 +19,7 @@ module GraphQL
       # Recursively transform a `.define`-DSL-based type expression into a class-ready expression, for example:
       #
       # - `types[X]` -> `[X, null: true]`
+      # - `types[X.to_non_null_type]` -> `[X]`
       # - `Int` -> `Integer`
       # - `X!` -> `X`
       #
@@ -37,6 +38,9 @@ module GraphQL
           if inner_type.start_with?("!")
             nullable = false
             inner_type = inner_type[1..-1]
+          elsif inner_type.end_with?(".to_non_null_type")
+            nullable = false
+            inner_type = inner_type[0...-17]
           else
             nullable = true
           end
@@ -647,6 +651,7 @@ module GraphQL
 
             if return_type
               non_nullable = return_type.sub! /(^|[^\[])!/, '\1'
+              non_nullable ||= return_type.sub! /([^\[])\.to_non_null_type([^\]]|$)/, '\1'
               nullable = !non_nullable
               return_type = normalize_type_expression(return_type)
             else

data/lib/graphql/version.rb

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

data/spec/dummy/Gemfile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'rails'
+gem 'rails', '~> 5.2.1'
 gem 'puma'
 gem 'capybara'
 gem 'selenium-webdriver'

data/spec/graphql/enum_type_spec.rb

@@ -130,6 +130,11 @@ describe GraphQL::EnumType do
     assert_equal({ "COW" => cow, "GOAT" => goat }, enum.values)
   end
 
+  it "values respond to graphql_name" do
+    cow = GraphQL::EnumType::EnumValue.define(name: "COW")
+    assert_equal("COW", cow.graphql_name)
+  end
+
   describe "#dup" do
     it "copies the values map without altering the original" do
       enum_2 = enum.dup

data/spec/graphql/execution/execute_spec.rb

@@ -236,7 +236,7 @@ describe GraphQL::Execution::Execute do
   end
 
   describe "tracing" do
-    if rails_should_be_installed?
+    if defined?(Rails)
       it "emits traces" do
         query_string = <<-GRAPHQL
         query Bases($id1: ID!, $id2: ID!){

data/spec/graphql/execution/multiplex_spec.rb

@@ -160,6 +160,19 @@ describe GraphQL::Execution::Multiplex do
           raise GraphQL::Error, "Crash"
         }
       end
+
+      field :raiseSyntaxError, types.String do
+        resolve ->(object, args, ctx) {
+          raise SyntaxError
+        }
+      end
+
+      field :raiseException, types.String do
+        resolve ->(object, args, ctx) {
+          raise Exception
+        }
+      end
+
     end
 
     InspectSchema = GraphQL::Schema.define do
@@ -167,6 +180,8 @@ describe GraphQL::Execution::Multiplex do
       instrument(:query, InspectQueryInstrumentation)
     end
 
+    unhandled_err_json = '{}'
+
     it "can access the query results" do
       InspectSchema.execute("{ raiseExecutionError }")
       handled_err_json = '{"data":{"raiseExecutionError":null},"errors":[{"message":"Whoops","locations":[{"line":1,"column":3}],"path":["raiseExecutionError"]}]}'
@@ -176,7 +191,19 @@ describe GraphQL::Execution::Multiplex do
       assert_raises(GraphQL::Error) do
         InspectSchema.execute("{ raiseError }")
       end
-      unhandled_err_json = '{}'
+
+      assert_equal unhandled_err_json, InspectQueryInstrumentation.last_json
+    end
+
+    it "can access the query results when the error is not a StandardError" do
+      assert_raises(SyntaxError) do
+        InspectSchema.execute("{ raiseSyntaxError }")
+      end
+      assert_equal unhandled_err_json, InspectQueryInstrumentation.last_json
+
+      assert_raises(Exception) do
+        InspectSchema.execute("{ raiseException }")
+      end
       assert_equal unhandled_err_json, InspectQueryInstrumentation.last_json
     end
   end

data/spec/graphql/internal_representation/rewrite_spec.rb

@@ -124,7 +124,9 @@ describe GraphQL::InternalRepresentation::Rewrite do
 
       nut_selections = plant_selection.typed_children[schema.types["Nut"]]
       # `... on Tree`, `... on Nut`, and `NutFields`, but not `... on Fruit { ... on Tree }`
+
       assert_equal 3, nut_selections["leafType"].ast_nodes.size
+
       # Multi-level merging when including fragments:
       habitats_selections = nut_selections["habitats"].typed_children[schema.types["Habitat"]]
       assert_equal ["averageWeight", "seasons"], habitats_selections.keys

data/spec/graphql/schema/argument_spec.rb

@@ -29,7 +29,11 @@ describe GraphQL::Schema::Argument do
     end
   end
 
-
+  describe "#path" do
+    it "includes type, field and argument names" do
+      assert_equal "Query.field.argWithBlock", SchemaArgumentTest::Query.fields["field"].arguments["argWithBlock"].path
+    end
+  end
 
   describe "#name" do
     it "reflects camelization" do

data/spec/graphql/schema/enum_spec.rb

@@ -3,6 +3,13 @@ require "spec_helper"
 
 describe GraphQL::Schema::Enum do
   let(:enum) { Jazz::Family }
+
+  describe ".path" do
+    it "is the name" do
+      assert_equal "Family", enum.path
+    end
+  end
+
   describe "type info" do
     it "tells about the definition" do
       assert_equal "Family", enum.graphql_name

data/spec/graphql/schema/enum_value_spec.rb

@@ -2,6 +2,17 @@
 require "spec_helper"
 
 describe GraphQL::Schema::EnumValue do
+  describe "#path" do
+    it "Has the owner name too" do
+      enum = Class.new(GraphQL::Schema::Enum) do
+        graphql_name "Abc"
+        value(:XYZ)
+      end
+
+      assert_equal "Abc.XYZ", enum.values["XYZ"].path
+    end
+  end
+
   describe "#deprecation_reason" do
     it "can be written and read" do
       enum_value = GraphQL::Schema::EnumValue.new(:x, owner: nil)

data/spec/graphql/schema/field_spec.rb

@@ -6,6 +6,13 @@ describe GraphQL::Schema::Field do
     let(:object_class) { Jazz::Query }
     let(:field) { object_class.fields["inspectInput"] }
 
+    describe "path" do
+      it "is the object/interface and field name" do
+        assert_equal "Query.inspectInput", field.path
+        assert_equal "GloballyIdentifiable.id", Jazz::GloballyIdentifiableType.fields["id"].path
+      end
+    end
+
     it "uses the argument class" do
       arg_defn = field.graphql_definition.arguments.values.first
       assert_equal :ok, arg_defn.metadata[:custom]

data/spec/graphql/schema/input_object_spec.rb

@@ -3,6 +3,17 @@ require "spec_helper"
 
 describe GraphQL::Schema::InputObject do
   let(:input_object) { Jazz::EnsembleInput }
+
+  describe ".path" do
+    it "is the name" do
+      assert_equal "EnsembleInput", input_object.path
+    end
+
+    it "is used in argument paths" do
+      assert_equal "EnsembleInput.name", input_object.arguments["name"].path
+    end
+  end
+
   describe "type info" do
     it "has it" do
       assert_equal "EnsembleInput", input_object.graphql_name

data/spec/graphql/schema/interface_spec.rb

@@ -4,6 +4,12 @@ require "spec_helper"
 describe GraphQL::Schema::Interface do
   let(:interface) { Jazz::GloballyIdentifiableType }
 
+  describe ".path" do
+    it "is the name" do
+      assert_equal "GloballyIdentifiable", interface.path
+    end
+  end
+
   describe "type info" do
     it "tells its type info" do
       assert_equal "GloballyIdentifiable", interface.graphql_name