Apply camelization when initializing a field; use proper types for list and non-null; and type introspection

Author: rmosolgo

lib/graphql/deprecated_dsl.rb

@@ -24,8 +24,8 @@ module DeprecatedDSL
 
     def self.activate
       TYPE_CLASSES.each { |c| c.extend(Methods) }
-      GraphQL::Schema::Member::ListTypeProxy.include(Methods)
-      GraphQL::Schema::Member::NonNullTypeProxy.include(Methods)
+      GraphQL::Schema::List.include(Methods)
+      GraphQL::Schema::NonNull.include(Methods)
     end
     module Methods
       def !

lib/graphql/schema.rb

@@ -21,6 +21,8 @@
 
 
 require "graphql/schema/member"
+require "graphql/schema/list"
+require "graphql/schema/non_null"
 require "graphql/schema/argument"
 require "graphql/schema/enum_value"
 require "graphql/schema/enum"

lib/graphql/schema/field.rb

@@ -70,7 +70,7 @@ def initialize(name, return_type_expr = nil, desc = nil, owner: nil, null: nil,
         if return_type_expr.is_a?(GraphQL::Field)
           raise ArgumentError, "A GraphQL::Field was passed as the second argument, use the `field:` keyword for this instead."
         end
-        @name = name.to_s
+        @name = camelize ? Member::BuildType.camelize(name.to_s) : name.to_s
         if description && desc
           raise ArgumentError, "Provide description as a positional argument or `description:` keyword, but not both (#{desc.inspect}, #{description.inspect})"
         end
@@ -99,7 +99,6 @@ def initialize(name, return_type_expr = nil, desc = nil, owner: nil, null: nil,
         @max_page_size = max_page_size
         @introspection = introspection
         @extras = extras
-        @camelize = camelize
         @mutation = mutation
         @mutation_class = mutation_class
         # Override the default from HasArguments
@@ -157,7 +156,7 @@ def to_graphql
           GraphQL::Field.new
         end
 
-        field_defn.name = @camelize ? Member::BuildType.camelize(name) : name
+        field_defn.name = @name
         if @return_type_expr
           field_defn.type = -> { type }
         end

lib/graphql/schema/interface.rb

@@ -7,6 +7,7 @@ module DefinitionMethods
         include GraphQL::Schema::Member::CachedGraphQLDefinition
         include GraphQL::Relay::TypeExtensions
         include GraphQL::Schema::Member::BaseDSLMethods
+        include GraphQL::Schema::Member::TypeSystemHelpers
         include GraphQL::Schema::Member::HasFields
 
         # Methods defined in this block will be:

lib/graphql/schema/list.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Schema
+    # Represents a list type in the schema.
+    # Wraps a {Schema::Member} as a list type.
+    # @see {Schema::Member::TypeSystemHelpers#to_list_type}
+    class List
+      include GraphQL::Schema::Member::CachedGraphQLDefinition
+      include GraphQL::Schema::Member::TypeSystemHelpers
+
+      # @return [Class, Module] The inner type of this list, the type of which one or more objects may be present.
+      attr_reader :of_type
+
+      def initialize(of_type)
+        @of_type = of_type
+      end
+
+      def to_graphql
+        @of_type.graphql_definition.to_list_type
+      end
+
+    end
+  end
+end

lib/graphql/schema/member.rb

@@ -3,6 +3,7 @@
 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/type_system_helpers'
 require "graphql/relay/type_extensions"
 
 module GraphQL
@@ -16,12 +17,11 @@ class Member
       extend CachedGraphQLDefinition
       extend GraphQL::Relay::TypeExtensions
       extend BaseDSLMethods
+      extend TypeSystemHelpers
     end
   end
 end
 
-require 'graphql/schema/member/list_type_proxy'
-require 'graphql/schema/member/non_null_type_proxy'
 require 'graphql/schema/member/has_arguments'
 require 'graphql/schema/member/has_fields'
 require 'graphql/schema/member/instrumentation'

lib/graphql/schema/member/base_dsl_methods.rb

@@ -67,16 +67,6 @@ def to_graphql
           raise NotImplementedError
         end
 
-        # @return [ListTypeProxy] Make a list-type representation of this type
-        def to_list_type
-          ListTypeProxy.new(self)
-        end
-
-        # @return [NonNullTypeProxy] Make a non-null-type representation of this type
-        def to_non_null_type
-          NonNullTypeProxy.new(self)
-        end
-
         def overridden_graphql_name
           @graphql_name || find_inherited_method(:overridden_graphql_name, nil)
         end

lib/graphql/schema/member/list_type_proxy.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Schema
+    class Member
+      module TypeSystemHelpers
+        # @return [Schema::NonNull] Make a non-null-type representation of this type
+        def to_non_null_type
+          GraphQL::Schema::NonNull.new(self)
+        end
+
+        # @return [Schema::List] Make a list-type representation of this type
+        def to_list_type
+          GraphQL::Schema::List.new(self)
+        end
+
+        # @return [Boolean] true if this is a non-nullable type. A nullable list of non-nullables is considered nullable.
+        def non_null?
+          false
+        end
+
+        # @return [Boolean] true if this is a list type. A non-nullable list is considered a list.
+        def list?
+          false
+        end
+      end
+    end
+  end
+end

lib/graphql/schema/member/non_null_type_proxy.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class Schema
+    # Wraps a {Schema::Member} when it is required.
+    # @see {Schema::Member::TypeSystemHelpers#to_non_null_type}
+    class NonNull
+      include GraphQL::Schema::Member::CachedGraphQLDefinition
+      include GraphQL::Schema::Member::TypeSystemHelpers
+      attr_reader :of_type
+      def initialize(of_type)
+        @of_type = of_type
+      end
+
+      def to_graphql
+        @of_type.graphql_definition.to_non_null_type
+      end
+
+      # @return [true]
+      def non_null?
+        true
+      end
+
+      # @return [Boolean] True if this type wraps a list type
+      def list?
+        @of_type.list?
+      end
+    end
+  end
+end

lib/graphql/schema/member/type_system_helpers.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::Member::TypeSystemHelpers do
+  let(:object) {
+    Class.new(GraphQL::Schema::Object) do
+      graphql_name "Thing"
+
+      field :int, Integer, null: true
+      field :int2, Integer, null: false
+      field :int_list, [Integer], null: true
+      field :int_list2, [Integer], null: false
+    end
+  }
+
+  let(:int_field) { object.fields["int"] }
+  let(:int2_field) { object.fields["int2"] }
+  let(:int_list_field) { object.fields["intList"] }
+  let(:int_list2_field) { object.fields["intList2"] }
+
+  describe "#list?" do
+    it "is true for lists, including non-null lists, otherwise false" do
+      assert int_list_field.type.list?
+      assert int_list2_field.type.list?
+      refute int_field.type.list?
+      refute int2_field.type.list?
+    end
+  end
+
+  describe "#non_null?" do
+    it "is true for required types" do
+      assert int2_field.type.non_null?
+      assert int_list2_field.type.non_null?
+      refute int_field.type.non_null?
+      refute int_list_field.type.non_null?
+    end
+  end
+end