graphql 1.8.1 → 1.8.2

data/lib/graphql/subscriptions/instrumentation.rb

@@ -44,7 +44,10 @@ module GraphQL
 
         # Wrap the proc with subscription registration logic
         def call(obj, args, ctx)
+          @inner_proc.call(obj, args, ctx) if @inner_proc && !@inner_proc.is_a?(GraphQL::Field::Resolve::BuiltInResolve)
+
           events = ctx.namespace(:subscriptions)[:events]
+
           if events
             # This is the first execution, so gather an Event
             # for the backend to register:

data/lib/graphql/version.rb

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

data/spec/generators/graphql/enum_generator_spec.rb

@@ -7,8 +7,7 @@ class GraphQLGeneratorsEnumGeneratorTest < BaseGeneratorTest
 
   test "it generate enums with values" do
     expected_content = <<-RUBY
-Types::FamilyType = GraphQL::EnumType.define do
-  name "Family"
+class Types::FamilyType < Types::BaseEnum
   value "NIGHTSHADE"
   value "BRASSICA", value: Family::COLE
   value "UMBELLIFER", value: :umbellifer

data/spec/generators/graphql/install_generator_spec.rb

@@ -19,6 +19,9 @@ class GraphQLGeneratorsInstallGeneratorTest < Rails::Generators::TestCase
 
     assert_file "app/graphql/types/.keep"
     assert_file "app/graphql/mutations/.keep"
+    ["base_object", "base_input_object", "base_enum", "base_union", "base_interface"].each do |base_type|
+      assert_file "app/graphql/types/#{base_type}.rb"
+    end
     expected_query_route = %|post "/graphql", to: "graphql#execute"|
     expected_graphiql_route = %|
   if Rails.env.development?
@@ -36,7 +39,7 @@ class GraphQLGeneratorsInstallGeneratorTest < Rails::Generators::TestCase
     end
 
     expected_schema = <<-RUBY
-DummySchema = GraphQL::Schema.define do
+class DummySchema < GraphQL::Schema
   mutation(Types::MutationType)
   query(Types::QueryType)
 end
@@ -45,17 +48,15 @@ RUBY
 
 
     expected_query_type = <<-RUBY
-Types::QueryType = GraphQL::ObjectType.define do
-  name "Query"
+class Types::QueryType < Types::BaseObject
   # Add root-level fields here.
   # They will be entry points for queries on your schema.
 
   # TODO: remove me
-  field :testField, types.String do
-    description \"An example field added by the generator\"
-    resolve ->(obj, args, ctx) {
-      \"Hello World!\"
-    }
+  field :test_field, String, null: false,
+    description: \"An example field added by the generator\"
+  def test_field
+    \"Hello World!\"
   end
 end
 RUBY
@@ -79,20 +80,18 @@ RUBY
     end
 
     expected_query_type = <<-RUBY
-Types::QueryType = GraphQL::ObjectType.define do
-  name "Query"
+class Types::QueryType < Types::BaseObject
   # Add root-level fields here.
   # They will be entry points for queries on your schema.
 
   # TODO: remove me
-  field :testField, types.String do
-    description \"An example field added by the generator\"
-    resolve ->(obj, args, ctx) {
-      \"Hello World!\"
-    }
+  field :test_field, String, null: false,
+    description: \"An example field added by the generator\"
+  def test_field
+    \"Hello World!\"
   end
 
-  field :node, GraphQL::Relay::Node.field
+  field :node, field: GraphQL::Relay::Node.field
 end
 RUBY
 
@@ -126,7 +125,7 @@ RUBY
       refute_includes contents, "GraphiQL::Rails"
     end
 
-    assert_file "app/graphql/custom_schema.rb", /CustomSchema = GraphQL::Schema\.define/
+    assert_file "app/graphql/custom_schema.rb", /class CustomSchema < GraphQL::Schema/
     assert_file "app/controllers/graphql_controller.rb", /CustomSchema\.execute/
   end
 
@@ -167,36 +166,36 @@ end
 RUBY
 
   EXPECTED_RELAY_BATCH_SCHEMA = <<-RUBY
-DummySchema = GraphQL::Schema.define do
+class DummySchema < GraphQL::Schema
 
   mutation(Types::MutationType)
   query(Types::QueryType)
   # Relay Object Identification:
 
   # Return a string UUID for `object`
-  id_from_object ->(object, type_definition, query_ctx) {
+  def self.id_from_object(object, type_definition, query_ctx)
     # Here's a simple implementation which:
     # - joins the type name & object.id
     # - encodes it with base64:
     # GraphQL::Schema::UniqueWithinType.encode(type_definition.name, object.id)
-  }
+  end
 
   # Given a string UUID, find the object
-  object_from_id ->(id, query_ctx) {
+  def self.object_from_id(id, query_ctx)
     # For example, to decode the UUIDs generated above:
     # type_name, item_id = GraphQL::Schema::UniqueWithinType.decode(id)
     #
     # Then, based on `type_name` and `id`
     # find an object in your application
     # ...
-  }
+  end
 
   # Object Resolution
-  resolve_type -> (type, obj, ctx) {
+  def self.resolve_type(type, obj, ctx)
     # TODO: Implement this function
     # to return the correct type for `obj`
     raise(NotImplementedError)
-  }
+  end
 
   # GraphQL::Batch setup:
   use GraphQL::Batch

data/spec/generators/graphql/interface_generator_spec.rb

@@ -10,16 +10,15 @@ class GraphQLGeneratorsInterfaceGeneratorTest < BaseGeneratorTest
       # GraphQL-style:
       ["Bird", "wingspan:Int!", "foliage:[Color]"],
       # Ruby-style:
-      ["BirdType", "wingspan:!types.Int", "foliage:types[Types::ColorType]"],
+      ["BirdType", "wingspan:Integer!", "foliage:[Types::ColorType]"],
       # Mixed
-      ["BirdType", "wingspan:!Int", "foliage:types[Color]"],
+      ["BirdType", "wingspan:!Int", "foliage:[Color]"],
     ]
 
     expected_content = <<-RUBY
-Types::BirdType = GraphQL::InterfaceType.define do
-  name "Bird"
-  field :wingspan, !types.Int
-  field :foliage, types[Types::ColorType]
+class Types::BirdType < Types::BaseInterface
+  field :wingspan, Integer, null: false
+  field :foliage, [Types::ColorType], null: true
 end
 RUBY
 

data/spec/generators/graphql/mutation_generator_spec.rb

@@ -19,47 +19,30 @@ class GraphQLGeneratorsMutationGeneratorTest < BaseGeneratorTest
     end
   end
 
-  test "it generates an empty resolver by name" do
-    setup
-    run_generator(["UpdateName"])
-
-    expected_content = <<-RUBY
-Mutations::UpdateName = GraphQL::Relay::Mutation.define do
-  name "UpdateName"
+  UPDATE_NAME_MUTATION = <<-RUBY
+class Mutations::UpdateName < GraphQL::Schema::RelayClassicMutation
   # TODO: define return fields
   # return_field :post, Types::PostType
 
   # TODO: define arguments
   # input_field :name, !types.String
 
-  resolve ->(obj, args, ctx) {
-    # TODO: define resolve function
-  }
+  def resolve(**inputs)
+    # TODO: define resolve method
+  end
 end
 RUBY
 
-    assert_file "app/graphql/mutations/update_name.rb", expected_content
+  test "it generates an empty resolver by name" do
+    setup
+    run_generator(["UpdateName"])
+    assert_file "app/graphql/mutations/update_name.rb", UPDATE_NAME_MUTATION
   end
 
   test "it allows for user-specified directory" do
     setup "app/mydirectory"
     run_generator(["UpdateName", "--directory", "app/mydirectory"])
 
-    expected_content = <<-RUBY
-Mutations::UpdateName = GraphQL::Relay::Mutation.define do
-  name "UpdateName"
-  # TODO: define return fields
-  # return_field :post, Types::PostType
-
-  # TODO: define arguments
-  # input_field :name, !types.String
-
-  resolve ->(obj, args, ctx) {
-    # TODO: define resolve function
-  }
-end
-RUBY
-
-    assert_file "app/mydirectory/mutations/update_name.rb", expected_content
+    assert_file "app/mydirectory/mutations/update_name.rb", UPDATE_NAME_MUTATION
   end
 end

data/spec/generators/graphql/object_generator_spec.rb

@@ -10,16 +10,15 @@ class GraphQLGeneratorsObjectGeneratorTest < BaseGeneratorTest
       # GraphQL-style:
       ["Bird", "wingspan:Int!", "foliage:[Color]"],
       # Ruby-style:
-      ["BirdType", "wingspan:!types.Int", "foliage:types[Types::ColorType]"],
+      ["BirdType", "wingspan:!Integer", "foliage:[Types::ColorType]"],
       # Mixed
-      ["BirdType", "wingspan:!Int", "foliage:types[Color]"],
+      ["BirdType", "wingspan:!Int", "foliage:[Color]"],
     ]
 
     expected_content = <<-RUBY
-Types::BirdType = GraphQL::ObjectType.define do
-  name "Bird"
-  field :wingspan, !types.Int
-  field :foliage, types[Types::ColorType]
+class Types::BirdType < Types::BaseObject
+  field :wingspan, Integer, null: false
+  field :foliage, [Types::ColorType], null: true
 end
 RUBY
 
@@ -33,8 +32,7 @@ RUBY
   test "it generates classifed file" do
     run_generator(["page"])
     assert_file "app/graphql/types/page_type.rb", <<-RUBY
-Types::PageType = GraphQL::ObjectType.define do
-  name "Page"
+class Types::PageType < Types::BaseObject
 end
 RUBY
   end
@@ -42,8 +40,7 @@ RUBY
   test "it makes Relay nodes" do
     run_generator(["Page", "--node"])
     assert_file "app/graphql/types/page_type.rb", <<-RUBY
-Types::PageType = GraphQL::ObjectType.define do
-  name "Page"
+class Types::PageType < Types::BaseObject
   implements GraphQL::Relay::Node.interface
 end
 RUBY

data/spec/generators/graphql/union_generator_spec.rb

@@ -14,8 +14,7 @@ class GraphQLGeneratorsUnionGeneratorTest < BaseGeneratorTest
     ]
 
     expected_content = <<-RUBY
-Types::WingedCreatureType = GraphQL::UnionType.define do
-  name "WingedCreature"
+class Types::WingedCreatureType < Types::BaseUnion
   possible_types [Types::InsectType, Types::BirdType]
 end
 RUBY
@@ -36,8 +35,7 @@ RUBY
     ]
 
     expected_content = <<-RUBY
-Types::WingedCreatureType = GraphQL::UnionType.define do
-  name "WingedCreature"
+class Types::WingedCreatureType < Types::BaseUnion
 end
 RUBY
 
@@ -52,8 +50,7 @@ RUBY
     command = ["WingedCreature", "--directory", "app/mydirectory"]
 
     expected_content = <<-RUBY
-Types::WingedCreatureType = GraphQL::UnionType.define do
-  name "WingedCreature"
+class Types::WingedCreatureType < Types::BaseUnion
 end
 RUBY
 

data/spec/graphql/execution/execute_spec.rb

@@ -77,6 +77,103 @@ describe GraphQL::Execution::Execute do
     end
   end
 
+  describe "when a member of a list of non-null type returns nil" do
+    let(:schema) {
+      node_type = GraphQL::ObjectType.define do
+        name "Node"
+
+        field :id, types.ID, "" do
+          resolve ->(obj, args, ctx) {
+            obj[:id]
+          }
+        end
+      end
+
+      query_type = GraphQL::ObjectType.define do
+        name "Query"
+
+        field :nonNullListWithNullStrings, types[!types.String], "" do
+          resolve ->(obj, args, ctx) {
+            [nil]
+          }
+        end
+
+        field :nonNullListWithNullStringsLazy, types[!types.String], "" do
+          resolve ->(obj, args, ctx) {
+            LazyHelpers::Wrapper.new([nil])
+          }
+        end
+
+        field :nonNullListWithNullTypes, types[!node_type], "" do
+          resolve ->(obj, args, ctx) {
+            [{ id: 1 }, nil, { id: 2 }]
+          }
+        end
+
+        field :listWithNullStrings, types[types.String], "" do
+          resolve ->(obj, args, ctx) {
+            [nil, "hello"]
+          }
+        end
+
+        field :listWithNullTypes, types[node_type], "" do
+          resolve ->(obj, args, ctx) {
+            [nil, { id: 1 }, nil]
+          }
+        end
+
+        field :nonNullList, !types[!types.String], "" do
+          resolve ->(obj, args, ctx) {
+            [nil]
+          }
+        end
+      end
+
+      GraphQL::Schema.define do
+        query query_type
+        lazy_resolve(LazyHelpers::Wrapper, :item)
+      end
+    }
+
+    it "propagates null for non-lazy resolvers" do
+      query = <<-GRAPHQL
+      {
+        nonNullListWithNullStrings
+        nonNullListWithNullTypes {
+          id
+        }
+        listWithNullStrings
+        listWithNullTypes {
+          id
+        }
+      }
+      GRAPHQL
+
+      result = schema.execute(query).to_h
+
+      assert_equal ["nonNullListWithNullStrings", "nonNullListWithNullTypes", "listWithNullStrings", "listWithNullTypes"], result["data"].keys
+
+      assert_equal nil, result["data"]["nonNullListWithNullStrings"]
+      assert_equal nil, result["data"]["nonNullListWithNullTypes"]
+      assert_equal [nil, "hello"], result["data"]["listWithNullStrings"]
+      assert_equal [nil, { "id" => "1" }, nil], result["data"]["listWithNullTypes"]
+    end
+
+    it "propagates null for lazy resolvers" do
+      result = schema.execute("{ nonNullListWithNullStringsLazy }").to_h
+
+      assert_equal ["nonNullListWithNullStringsLazy"], result["data"].keys
+
+      assert_equal nil, result["data"]["nonNullListWithNullStringsLazy"]
+    end
+
+    it "propagates null for non-null lists of non-null types" do
+      result = schema.execute("{ nonNullList }").to_h
+
+      assert_equal nil, result["data"]
+    end
+  end
+
   describe "when a list member raises an error" do
     let(:schema) {
       thing_type = GraphQL::ObjectType.define do

data/spec/graphql/schema/input_object_spec.rb

@@ -108,4 +108,36 @@ describe GraphQL::Schema::InputObject do
       assert_equal expected_info, res["data"]["inspectInput"]
     end
   end
+
+  describe "#to_h" do
+    module InputObjectToHTest
+      class TestInput1 < GraphQL::Schema::InputObject
+        graphql_name "TestInput1"
+        argument :d, Int, required: true
+        argument :e, Int, required: true
+      end
+
+      class TestInput2 < GraphQL::Schema::InputObject
+        graphql_name "TestInput2"
+        argument :a, Int, required: true
+        argument :b, Int, required: true
+        argument :c, TestInput1, as: :inputObject, required: true
+      end
+
+      TestInput1.to_graphql
+      TestInput2.to_graphql
+    end
+
+    it "returns a symbolized, aliased, ruby keyword style hash" do
+      arg_values = {a: 1, b: 2, c: { d: 3, e: 4 }}
+
+      input_object = InputObjectToHTest::TestInput2.new(
+        arg_values,
+        context: nil,
+        defaults_used: Set.new
+      )
+
+      assert_equal({ a: 1, b: 2, input_object: { d: 3, e: 4 } }, input_object.to_h)
+    end
+  end
 end

data/spec/graphql/schema/relay_classic_mutation_spec.rb

@@ -35,4 +35,20 @@ describe GraphQL::Schema::RelayClassicMutation do
       assert mutation.null
     end
   end
+
+  describe "execution" do
+    it "works with no arguments" do
+      res = Jazz::Schema.execute <<-GRAPHQL
+      mutation {
+        addSitar(input: {}) {
+          instrument {
+            name
+          }
+        }
+      }
+      GRAPHQL
+
+      assert_equal "Sitar", res["data"]["addSitar"]["instrument"]["name"]
+    end
+  end
 end