fix(GlobalId) use normal fields for global id fields

Author: rmosolgo

lib/graphql/define/assign_global_id_field.rb

@@ -3,7 +3,8 @@ module Define
     module AssignGlobalIdField
       def self.call(type_defn, field_name)
         type_defn.name || raise("You must define the type's name before creating a GlobalIdField")
-        GraphQL::Define::AssignObjectField.call(type_defn, field_name, field: GraphQL::Relay::GlobalIdField.new(type_defn.name))
+        resolve = GraphQL::Relay::GlobalIdResolve.new(type_name: type_defn.name, property: field_name)
+        GraphQL::Define::AssignObjectField.call(type_defn, field_name, type: GraphQL::ID_TYPE.to_non_null_type, resolve: resolve)
       end
     end
   end

lib/graphql/relay.rb

@@ -7,7 +7,7 @@
 require 'graphql/relay/base_connection'
 require 'graphql/relay/array_connection'
 require 'graphql/relay/relation_connection'
-require 'graphql/relay/global_id_field'
+require 'graphql/relay/global_id_resolve'
 require 'graphql/relay/mutation'
 require 'graphql/relay/connection_field'
 require 'graphql/relay/connection_type'

lib/graphql/relay/global_id_field.rb

@@ -0,0 +1,15 @@
+module GraphQL
+  module Relay
+    class GlobalIdResolve
+      def initialize(type_name:, property:)
+        @property = property
+        @type_name = type_name
+      end
+
+      def call(obj, args, ctx)
+        id_value = obj.public_send(@property)
+        ctx.query.schema.node_identification.to_global_id(@type_name, id_value)
+      end
+    end
+  end
+end

lib/graphql/relay/global_id_resolve.rb

@@ -187,6 +187,30 @@
     end
   end
 
+  describe "relay types" do
+    let(:query) { GraphQL::Query.new(StarWarsSchema, query_string) }
+    let(:query_string) {%|
+    {
+      rebels {
+        ships {
+          edges {
+            node {
+              id
+            }
+          }
+          pageInfo {
+            hasNextPage
+          }
+        }
+      }
+    }
+    |}
+
+    it "gets the complexity" do
+      reduce_result
+      assert_equal 7, complexities.last
+    end
+  end
 
   describe "custom complexities" do
     let(:query) { GraphQL::Query.new(complexity_schema, query_string) }

spec/graphql/analysis/query_complexity_spec.rb

@@ -30,8 +30,7 @@
 Ship = GraphQL::ObjectType.define do
   name "Ship"
   interfaces [NodeIdentification.interface]
-  # Explict alternative to `global_id_field` helper:
-  field :id, field: GraphQL::Relay::GlobalIdField.new("Ship")
+  global_id_field :id
   field :name, types.String
 end
 
@@ -83,7 +82,8 @@ def upcased_parent_name
 Faction = GraphQL::ObjectType.define do
   name "Faction"
   interfaces [NodeIdentification.interface]
-  field :id, field: GraphQL::Relay::GlobalIdField.new("Faction")
+
+  field :id, !types.ID, resolve: GraphQL::Relay::GlobalIdResolve.new(type_name: "Faction", property: :id)
   field :name, types.String
   connection :ships, Ship.connection_type do
     resolve -> (obj, args, ctx) {