graphql 1.8.0.pre9 → 1.8.0.pre10

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.8.0.pre9"
+  VERSION = "1.8.0.pre10"
 end

data/spec/fixtures/upgrader/delete_project.original.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Platform
+  module Mutations
+    DeleteProject = GraphQL::Relay::Mutation.define do
+      name "DeleteProject"
+      description "Deletes a project."
+
+      minimum_accepted_scopes ["public_repo"]
+
+      input_field :projectId, !types.ID, "The Project ID to update."
+      return_field :owner, !Interfaces::ProjectOwner, "The repository or organization the project was removed from."
+
+      resolve ->(root_obj, inputs, context) do
+        project =  Platform::Helpers::NodeIdentification.typed_object_from_id(
+          [Objects::Project], inputs[:projectId], context
+        )
+
+        context[:permission].can_modify?("DeleteProject", project).sync
+        context[:abilities].authorize_content(:project, :destroy, owner: project.owner)
+
+        project.enqueue_delete(actor: context[:viewer])
+
+        { owner: project.owner }
+      end
+    end
+  end
+end

data/spec/fixtures/upgrader/delete_project.transformed.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Platform
+  module Mutations
+    class DeleteProject < Mutations::BaseMutation
+      description "Deletes a project."
+
+      minimum_accepted_scopes ["public_repo"]
+
+      argument :project_id, ID, "The Project ID to update.", required: true
+      field :owner, Interfaces::ProjectOwner, "The repository or organization the project was removed from.", null: false
+
+      def resolve(**inputs)
+        project =  Platform::Helpers::NodeIdentification.typed_object_from_id(
+          [Objects::Project], inputs[:project_id], @context
+        )
+
+        @context[:permission].can_modify?("DeleteProject", project).sync
+        @context[:abilities].authorize_content(:project, :destroy, owner: project.owner)
+
+        project.enqueue_delete(actor: @context[:viewer])
+
+        { owner: project.owner }
+      end
+    end
+  end
+end

data/spec/fixtures/upgrader/increment_count.original.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Platform
+  module Mutations
+    IncrementThing = GraphQL::Relay::Mutation.define do
+      name "IncrementThing"
+      description "increments the thing by 1."
+      visibility :internal
+      minimum_accepted_scopes ["repo"]
+
+      input_field(:thingId,
+        !types.ID,
+        "Thing ID to log.",
+        option: :setting)
+
+      return_field(
+        :thingId,
+        !types.ID,
+        "Thing ID to log."
+      )
+
+      resolve ->(root_obj, inputs, context) do
+        if some_early_check
+          return { thingId: "000" }
+        end
+
+        # These shouldn't be modified:
+        { abcDef: 1 }
+        some_method do { xyzAbc: 1 } end
+
+        thing = Platform::Helpers::NodeIdentification.typed_object_from_id(Objects::Thing, inputs[:thingId], context)
+        raise Errors::Validation.new("Thing not found.") unless thing
+
+        ThingActivity.track(thing.id, Time.now.change(min: 0, sec: 0))
+
+
+        if random_condition
+          { thingId: thing.global_relay_id }
+        elsif other_random_thing
+          { :thingId => "abc" }
+        elsif something_else
+          method_with_block {
+            { thingId: "pqr" }
+          }
+        elsif yet_another_thing
+          begin
+            { thingId: "987" }
+          rescue
+            { thingId: "789" }
+          end
+        else
+          return {
+            thingId: "xyz"
+          }
+        end
+      end
+    end
+  end
+end

data/spec/fixtures/upgrader/increment_count.transformed.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Platform
+  module Mutations
+    class IncrementThing < Mutations::BaseMutation
+      description "increments the thing by 1."
+      visibility :internal
+      minimum_accepted_scopes ["repo"]
+
+      argument :thing_id, ID, "Thing ID to log.", option: :setting, required: true
+
+      field :thing_id, ID, "Thing ID to log.", null: false
+
+      def resolve(**inputs)
+        if some_early_check
+          return { thing_id: "000" }
+        end
+
+        # These shouldn't be modified:
+        { abcDef: 1 }
+        some_method do { xyzAbc: 1 } end
+
+        thing = Platform::Helpers::NodeIdentification.typed_object_from_id(Objects::Thing, inputs[:thing_id], @context)
+        raise Errors::Validation.new("Thing not found.") unless thing
+
+        ThingActivity.track(thing.id, Time.now.change(min: 0, sec: 0))
+
+        if random_condition
+          { thing_id: thing.global_relay_id }
+        elsif other_random_thing
+          { :thing_id => "abc" }
+        elsif something_else
+          method_with_block {
+            { thing_id: "pqr" }
+          }
+        elsif yet_another_thing
+          begin
+            { thing_id: "987" }
+          rescue
+            { thing_id: "789" }
+          end
+        else
+          return {
+            thing_id: "xyz"
+          }
+        end
+      end
+    end
+  end
+end

data/spec/graphql/execution/multiplex_spec.rb

@@ -176,7 +176,7 @@ describe GraphQL::Execution::Multiplex do
       assert_raises(GraphQL::Error) do
         InspectSchema.execute("{ raiseError }")
       end
-      unhandled_err_json = 'null'
+      unhandled_err_json = '{}'
       assert_equal unhandled_err_json, InspectQueryInstrumentation.last_json
     end
   end

data/spec/graphql/language/parser_spec.rb

@@ -44,80 +44,6 @@ describe GraphQL::Language::Parser do
     assert_equal schema_string, document.to_query_string
   end
 
-  describe "implements" do
-    it "parses when there are no interfaces" do
-      schema = "
-        type A {
-          a: String
-        }
-      "
-
-      document = subject.parse(schema)
-
-      assert_equal [], document.definitions[0].interfaces.map(&:name)
-    end
-
-    it "parses with leading ampersand" do
-      schema = "
-        type A implements & B {
-          a: String
-        }
-      "
-
-      document = subject.parse(schema)
-
-      assert_equal ["B"], document.definitions[0].interfaces.map(&:name)
-    end
-
-    it "parses with leading ampersand and multiple interfaces" do
-      schema = "
-        type A implements & B & C {
-          a: String
-        }
-      "
-
-      document = subject.parse(schema)
-
-      assert_equal ["B", "C"], document.definitions[0].interfaces.map(&:name)
-    end
-
-    it "parses without leading ampersand" do
-      schema = "
-        type A implements B {
-          a: String
-        }
-      "
-
-      document = subject.parse(schema)
-
-      assert_equal ["B"], document.definitions[0].interfaces.map(&:name)
-    end
-
-    it "parses without leading ampersand and multiple interfaces" do
-      schema = "
-        type A implements B & C {
-          a: String
-        }
-      "
-
-      document = subject.parse(schema)
-
-      assert_equal ["B", "C"], document.definitions[0].interfaces.map(&:name)
-    end
-
-    it "supports the old way of parsing multiple interfaces for backwards compatibility" do
-      schema = "
-        type A implements B, C {
-          a: String
-        }
-      "
-
-      document = subject.parse(schema)
-
-      assert_equal ["B", "C"], document.definitions[0].interfaces.map(&:name)
-    end
-  end
-
   describe ".parse_file" do
     it "assigns filename to all nodes" do
       example_filename = "spec/support/parser/filename_example.graphql"

data/spec/graphql/query/serial_execution/value_resolution_spec.rb

@@ -86,10 +86,7 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
 
       it "raises an error" do
         err = assert_raises(GraphQL::UnresolvedTypeError) { result }
-        expected_message = "The value from \"resolvesToNilInterface\" on \"Query\" could not be resolved to \"SomeInterface\". " \
-          "(Received: `nil`, Expected: [SomeObject]) " \
-          "Make sure you have defined a `type_from_object` proc on your schema and that value `1337` " \
-          "gets resolved to a valid type."
+        expected_message = "The value from \"resolvesToNilInterface\" on \"Query\" could not be resolved to \"SomeInterface\". (Received: `nil`, Expected: [SomeObject]) Make sure you have defined a `resolve_type` proc on your schema and that value `1337` gets resolved to a valid type. You may need to add your type to `orphan_types` if it implements an interface but isn't a return type of any other field."
         assert_equal expected_message, err.message
       end
     end
@@ -103,10 +100,7 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
 
       it "raises an error" do
         err = assert_raises(GraphQL::UnresolvedTypeError) { result }
-        expected_message = "The value from \"resolvesToWrongTypeInterface\" on \"Query\" could not be resolved to \"SomeInterface\". " \
-          "(Received: `OtherObject`, Expected: [SomeObject]) " \
-          "Make sure you have defined a `type_from_object` proc on your schema and that value `:something` " \
-          "gets resolved to a valid type."
+        expected_message = "The value from \"resolvesToWrongTypeInterface\" on \"Query\" could not be resolved to \"SomeInterface\". (Received: `OtherObject`, Expected: [SomeObject]) Make sure you have defined a `resolve_type` proc on your schema and that value `:something` gets resolved to a valid type. You may need to add your type to `orphan_types` if it implements an interface but isn't a return type of any other field."
         assert_equal expected_message, err.message
       end
     end

data/spec/graphql/query_spec.rb

@@ -253,6 +253,32 @@ describe GraphQL::Query do
         assert_equal [nil], Instrumenter::ERROR_LOG
       end
     end
+
+    describe "when an error propagated through execution" do
+      module ExtensionsInstrumenter
+        LOG = []
+        def self.before_query(q); end;
+
+        def self.after_query(q)
+          q.result["extensions"] = { "a" => 1 }
+          LOG << :ok
+        end
+      end
+
+      let(:schema) {
+        Dummy::Schema.redefine {
+          instrument(:query, ExtensionsInstrumenter)
+        }
+      }
+
+      it "can add to extensions" do
+        ExtensionsInstrumenter::LOG.clear
+        assert_raises(RuntimeError) do
+          schema.execute "{ error }"
+        end
+        assert_equal [:ok], ExtensionsInstrumenter::LOG
+      end
+    end
   end
 
   it "uses root_value as the object for the root type" do

data/spec/graphql/relay/mutation_spec.rb

@@ -108,9 +108,9 @@ describe GraphQL::Relay::Mutation do
 
   it "inserts itself into the derived objects' metadata" do
     assert_equal StarWars::IntroduceShipMutation, StarWars::IntroduceShipMutation.field.mutation
-    assert_equal StarWars::IntroduceShipMutation, StarWars::IntroduceShipMutation.return_type.mutation
+    assert_equal StarWars::IntroduceShipMutation, StarWars::IntroduceShipMutation.graphql_field.mutation
+    assert_equal StarWars::IntroduceShipMutation, StarWars::IntroduceShipMutation.payload_type.mutation
     assert_equal StarWars::IntroduceShipMutation, StarWars::IntroduceShipMutation.input_type.mutation
-    assert_equal StarWars::IntroduceShipMutation, StarWars::IntroduceShipMutation.result_class.mutation
   end
 
   describe "return_field ... property:" do

data/spec/graphql/schema/build_from_definition_spec.rb

@@ -612,6 +612,65 @@ type Query {
 
       build_schema_and_compare_output(schema.chop)
     end
+
+    it "tracks original AST node" do
+      schema_definition = <<-GRAPHQL
+schema {
+  query: Query
+}
+
+enum Enum {
+  VALUE
+}
+
+type Query {
+  field(argument: String): String
+  deprecatedField(argument: String): String @deprecated(reason: "Test")
+}
+
+interface Interface {
+  field(argument: String): String
+}
+
+union Union = Query
+
+scalar Scalar
+
+input Input {
+  argument: String
+}
+
+directive @Directive (
+  # Argument
+  argument: String
+) on SCHEMA
+
+type Type implements Interface {
+  field(argument: String): String
+}
+      GRAPHQL
+
+      schema = GraphQL::Schema.from_definition(schema_definition)
+
+      assert_equal [1, 1], schema.ast_node.position
+      assert_equal [5, 1], schema.types["Enum"].ast_node.position
+      assert_equal [6, 3], schema.types["Enum"].values["VALUE"].ast_node.position
+      assert_equal [9, 1], schema.types["Query"].ast_node.position
+      assert_equal [10, 3], schema.types["Query"].fields["field"].ast_node.position
+      assert_equal [10, 9], schema.types["Query"].fields["field"].arguments["argument"].ast_node.position
+      assert_equal [11, 45], schema.types["Query"].fields["deprecatedField"].ast_node.directives[0].position
+      assert_equal [11, 57], schema.types["Query"].fields["deprecatedField"].ast_node.directives[0].arguments[0].position
+      assert_equal [14, 1], schema.types["Interface"].ast_node.position
+      assert_equal [15, 3], schema.types["Interface"].fields["field"].ast_node.position
+      assert_equal [15, 9], schema.types["Interface"].fields["field"].arguments["argument"].ast_node.position
+      assert_equal [18, 1], schema.types["Union"].ast_node.position
+      assert_equal [20, 1], schema.types["Scalar"].ast_node.position
+      assert_equal [22, 1], schema.types["Input"].ast_node.position
+      assert_equal [22, 1], schema.types["Input"].arguments["argument"].ast_node.position
+      assert_equal [26, 1], schema.directives["Directive"].ast_node.position
+      assert_equal [28, 3], schema.directives["Directive"].arguments["argument"].ast_node.position
+      assert_equal [31, 22], schema.types["Type"].ast_node.interfaces[0].position
+    end
   end
 
   describe 'Failures' do

data/spec/graphql/schema/field_spec.rb

@@ -46,6 +46,14 @@ describe GraphQL::Schema::Field do
       assert_equal "A Description.", object.fields["test"].description
     end
 
+    it "accepts anonymous classes as type" do
+      type = Class.new(GraphQL::Schema::Object) do
+        graphql_name 'MyType'
+      end
+      field = GraphQL::Schema::Field.new(:my_field, type, owner: nil, null: true)
+      assert_equal type.to_graphql, field.to_graphql.type
+    end
+
     describe "extras" do
       it "can get errors, which adds path" do
         query_str = <<-GRAPHQL
@@ -140,4 +148,20 @@ describe GraphQL::Schema::Field do
       end
     end
   end
+
+  describe "build type errors" do
+    it "includes the full name" do
+      thing = Class.new(GraphQL::Schema::Object) do
+        graphql_name "Thing"
+        # `Set` is a class but not a GraphQL type
+        field :stuff, Set, null: false
+      end
+
+      err = assert_raises ArgumentError do
+        thing.fields["stuff"].to_graphql.type
+      end
+
+      assert_includes err.message, "Thing.stuff"
+    end
+  end
 end

data/spec/graphql/schema/input_object_spec.rb

@@ -46,6 +46,7 @@ describe GraphQL::Schema::InputObject do
         "hi, ABC, 4, (hi, xyz, -, (-))",
         "ABC",
         "ABC",
+        "true",
         "ABC",
       ]
       assert_equal expected_info, res["data"]["inspectInput"]