graphql 1.11.10 → 1.12.0

data/lib/graphql/types/relay/node_behaviors.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Types
+    module Relay
+      module NodeBehaviors
+        def self.included(child_module)
+          child_module.extend(DefaultRelay)
+          child_module.description("An object with an ID.")
+          child_module.field(:id, ID, null: false, description: "ID of the object.")
+        end
+      end
+    end
+  end
+end

data/lib/graphql/types/relay/node_field.rb

@@ -19,25 +19,7 @@ module GraphQL
       #     context.schema.object_from_id(id, context)
       #   end
       #
-      NodeField = GraphQL::Schema::Field.new(
-        name: "node",
-        owner: nil,
-        type: GraphQL::Types::Relay::Node,
-        null: true,
-        description: "Fetches an object given its ID.",
-        relay_node_field: true,
-      ) do
-        argument :id, "ID!", required: true,
-          description: "ID of the object."
-
-        def resolve(obj, args, ctx)
-          ctx.schema.object_from_id(args[:id], ctx)
-        end
-
-        def resolve_field(obj, args, ctx)
-          resolve(obj, args, ctx)
-        end
-      end
+      NodeField = GraphQL::Schema::Field.new(**HasNodeField.field_options, &HasNodeField.field_block)
     end
   end
 end

data/lib/graphql/types/relay/nodes_field.rb

@@ -21,25 +21,7 @@ module GraphQL
       #     end
       #   end
       #
-      NodesField = GraphQL::Schema::Field.new(
-        name: "nodes",
-        owner: nil,
-        type: [GraphQL::Types::Relay::Node, null: true],
-        null: false,
-        description: "Fetches a list of objects given a list of IDs.",
-        relay_nodes_field: true,
-      ) do
-        argument :ids, "[ID!]!", required: true,
-          description: "IDs of the objects."
-
-        def resolve(obj, args, ctx)
-          args[:ids].map { |id| ctx.schema.object_from_id(id, ctx) }
-        end
-
-        def resolve_field(obj, args, ctx)
-          resolve(obj, args, ctx)
-        end
-      end
+      NodesField = GraphQL::Schema::Field.new(**HasNodesField.field_options, &HasNodesField.field_block)
     end
   end
 end

data/lib/graphql/types/relay/page_info.rb

@@ -3,20 +3,8 @@ module GraphQL
   module Types
     module Relay
       # The return type of a connection's `pageInfo` field
-      class PageInfo < Types::Relay::BaseObject
-        default_relay true
-        description "Information about pagination in a connection."
-        field :has_next_page, Boolean, null: false,
-          description: "When paginating forwards, are there more items?"
-
-        field :has_previous_page, Boolean, null: false,
-          description: "When paginating backwards, are there more items?"
-
-        field :start_cursor, String, null: true,
-          description: "When paginating backwards, the cursor to continue."
-
-        field :end_cursor, String, null: true,
-          description: "When paginating forwards, the cursor to continue."
+      class PageInfo < GraphQL::Schema::Object
+        include PageInfoBehaviors
       end
     end
   end

data/lib/graphql/types/relay/page_info_behaviors.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module GraphQL
+  module Types
+    module Relay
+      module PageInfoBehaviors
+        def self.included(child_class)
+          child_class.extend GraphQL::Types::Relay::DefaultRelay
+
+          child_class.description "Information about pagination in a connection."
+          child_class.field :has_next_page, Boolean, null: false,
+            description: "When paginating forwards, are there more items?"
+
+          child_class.field :has_previous_page, Boolean, null: false,
+            description: "When paginating backwards, are there more items?"
+
+          child_class.field :start_cursor, String, null: true,
+            description: "When paginating backwards, the cursor to continue."
+
+          child_class.field :end_cursor, String, null: true,
+            description: "When paginating forwards, the cursor to continue."
+        end
+      end
+    end
+  end
+end

data/lib/graphql/types/relay.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
-require "graphql/types/relay/base_field"
-require "graphql/types/relay/base_object"
-require "graphql/types/relay/base_interface"
+
+# behavior modules:
+require "graphql/types/relay/default_relay"
+require "graphql/types/relay/connection_behaviors"
+require "graphql/types/relay/edge_behaviors"
+require "graphql/types/relay/node_behaviors"
+require "graphql/types/relay/page_info_behaviors"
+require "graphql/types/relay/has_node_field"
+require "graphql/types/relay/has_nodes_field"
+
+# concrete classes based on the gem defaults:
 require "graphql/types/relay/page_info"
 require "graphql/types/relay/base_connection"
 require "graphql/types/relay/base_edge"

data/lib/graphql/union_type.rb

@@ -2,6 +2,8 @@
 module GraphQL
   # @api deprecated
   class UnionType < GraphQL::BaseType
+    extend Define::InstanceDefinable::DeprecatedDefine
+
     # Rubocop was unhappy about the syntax when this was a proc literal
     class AcceptPossibleTypesDefinition
       def self.call(target, possible_types, options = {})

data/lib/graphql/upgrader/member.rb

@@ -771,6 +771,7 @@ module GraphQL
 
     class Member
       def initialize(member, skip: SkipOnNullKeyword, type_transforms: DEFAULT_TYPE_TRANSFORMS, field_transforms: DEFAULT_FIELD_TRANSFORMS, clean_up_transforms: DEFAULT_CLEAN_UP_TRANSFORMS)
+        warn "#{self.class} will be removed from GraphQL-Ruby 2.0 (but there's no point in using it after you've transformed your code, anyways)"
         @member = member
         @skip = skip
         @type_transforms = type_transforms

data/lib/graphql/upgrader/schema.rb

@@ -4,6 +4,7 @@ module GraphQL
   module Upgrader
     class Schema
       def initialize(schema)
+        warn "#{self.class} will be removed from GraphQL-Ruby 2.0 (but there's no point in using it after you've transformed your code, anyways)"
         @schema = schema
       end
 

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -110,6 +110,7 @@ require "graphql/execution"
 require "graphql/runtime_type_error"
 require "graphql/unresolved_type_error"
 require "graphql/invalid_null_error"
+require "graphql/pagination"
 require "graphql/schema"
 require "graphql/query"
 require "graphql/directive"
@@ -124,6 +125,9 @@ require "graphql/string_type"
 require "graphql/schema/built_in_types"
 require "graphql/schema/loader"
 require "graphql/schema/printer"
+require "graphql/filter"
+require "graphql/internal_representation"
+require "graphql/static_validation"
 require "graphql/introspection"
 
 require "graphql/analysis_error"
@@ -132,12 +136,9 @@ require "graphql/invalid_name_error"
 require "graphql/integer_decoding_error"
 require "graphql/integer_encoding_error"
 require "graphql/string_encoding_error"
-require "graphql/internal_representation"
-require "graphql/static_validation"
 require "graphql/version"
 require "graphql/compatibility"
 require "graphql/function"
-require "graphql/filter"
 require "graphql/subscriptions"
 require "graphql/parse_error"
 require "graphql/backtrace"
@@ -147,4 +148,37 @@ require "graphql/authorization"
 require "graphql/unauthorized_error"
 require "graphql/unauthorized_field_error"
 require "graphql/load_application_object_failed_error"
-require "graphql/pagination"
+require "graphql/dataloader"
+
+
+module GraphQL
+  # Ruby has `deprecate_constant`,
+  # but I don't see a way to give a nice error message in that case,
+  # so I'm doing this instead.
+  DEPRECATED_INT_TYPE = INT_TYPE
+  DEPRECATED_FLOAT_TYPE = FLOAT_TYPE
+  DEPRECATED_STRING_TYPE = STRING_TYPE
+  DEPRECATED_BOOLEAN_TYPE = BOOLEAN_TYPE
+  DEPRECATED_ID_TYPE = ID_TYPE
+
+  remove_const :INT_TYPE
+  remove_const :FLOAT_TYPE
+  remove_const :STRING_TYPE
+  remove_const :BOOLEAN_TYPE
+  remove_const :ID_TYPE
+
+  def self.const_missing(const_name)
+    deprecated_const_name = :"DEPRECATED_#{const_name}"
+    if const_defined?(deprecated_const_name)
+      deprecated_type = const_get(deprecated_const_name)
+      deprecated_caller = caller(1, 1).first
+      # Don't warn about internal uses, like `types.Int`
+      if !deprecated_caller.include?("lib/graphql")
+        warn "GraphQL::#{const_name} is deprecated and will be removed in GraphQL-Ruby 2.0, use GraphQL::Types::#{deprecated_type.graphql_name} instead. (from #{deprecated_caller})"
+      end
+      deprecated_type
+    else
+      super
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.11.10
+  version: 1.12.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -334,8 +334,11 @@ files:
 - lib/generators/graphql/loader_generator.rb
 - lib/generators/graphql/mutation_generator.rb
 - lib/generators/graphql/object_generator.rb
+- lib/generators/graphql/relay_generator.rb
 - lib/generators/graphql/scalar_generator.rb
 - lib/generators/graphql/templates/base_argument.erb
+- lib/generators/graphql/templates/base_connection.erb
+- lib/generators/graphql/templates/base_edge.erb
 - lib/generators/graphql/templates/base_enum.erb
 - lib/generators/graphql/templates/base_field.erb
 - lib/generators/graphql/templates/base_input_object.erb
@@ -350,6 +353,7 @@ files:
 - lib/generators/graphql/templates/loader.erb
 - lib/generators/graphql/templates/mutation.erb
 - lib/generators/graphql/templates/mutation_type.erb
+- lib/generators/graphql/templates/node_type.erb
 - lib/generators/graphql/templates/object.erb
 - lib/generators/graphql/templates/query_type.erb
 - lib/generators/graphql/templates/scalar.erb
@@ -379,6 +383,7 @@ files:
 - lib/graphql/authorization.rb
 - lib/graphql/backtrace.rb
 - lib/graphql/backtrace/inspect_result.rb
+- lib/graphql/backtrace/legacy_tracer.rb
 - lib/graphql/backtrace/table.rb
 - lib/graphql/backtrace/traced_error.rb
 - lib/graphql/backtrace/tracer.rb
@@ -396,6 +401,11 @@ files:
 - lib/graphql/compatibility/query_parser_specification/parse_error_specification.rb
 - lib/graphql/compatibility/query_parser_specification/query_assertions.rb
 - lib/graphql/compatibility/schema_parser_specification.rb
+- lib/graphql/dataloader.rb
+- lib/graphql/dataloader/null_dataloader.rb
+- lib/graphql/dataloader/request.rb
+- lib/graphql/dataloader/request_all.rb
+- lib/graphql/dataloader/source.rb
 - lib/graphql/define.rb
 - lib/graphql/define/assign_argument.rb
 - lib/graphql/define/assign_connection.rb
@@ -555,6 +565,7 @@ files:
 - lib/graphql/schema/directive.rb
 - lib/graphql/schema/directive/deprecated.rb
 - lib/graphql/schema/directive/feature.rb
+- lib/graphql/schema/directive/flagged.rb
 - lib/graphql/schema/directive/include.rb
 - lib/graphql/schema/directive/skip.rb
 - lib/graphql/schema/directive/transform.rb
@@ -581,9 +592,12 @@ files:
 - lib/graphql/schema/member/graphql_type_names.rb
 - lib/graphql/schema/member/has_arguments.rb
 - lib/graphql/schema/member/has_ast_node.rb
+- lib/graphql/schema/member/has_deprecation_reason.rb
+- lib/graphql/schema/member/has_directives.rb
 - lib/graphql/schema/member/has_fields.rb
 - lib/graphql/schema/member/has_path.rb
 - lib/graphql/schema/member/has_unresolved_type_error.rb
+- lib/graphql/schema/member/has_validators.rb
 - lib/graphql/schema/member/instrumentation.rb
 - lib/graphql/schema/member/relay_shortcuts.rb
 - lib/graphql/schema/member/scoped.rb
@@ -610,6 +624,13 @@ files:
 - lib/graphql/schema/union.rb
 - lib/graphql/schema/unique_within_type.rb
 - lib/graphql/schema/validation.rb
+- lib/graphql/schema/validator.rb
+- lib/graphql/schema/validator/exclusion_validator.rb
+- lib/graphql/schema/validator/format_validator.rb
+- lib/graphql/schema/validator/inclusion_validator.rb
+- lib/graphql/schema/validator/length_validator.rb
+- lib/graphql/schema/validator/numericality_validator.rb
+- lib/graphql/schema/validator/required_validator.rb
 - lib/graphql/schema/warden.rb
 - lib/graphql/schema/wrapper.rb
 - lib/graphql/static_validation.rb
@@ -716,13 +737,17 @@ files:
 - lib/graphql/types/relay.rb
 - lib/graphql/types/relay/base_connection.rb
 - lib/graphql/types/relay/base_edge.rb
-- lib/graphql/types/relay/base_field.rb
-- lib/graphql/types/relay/base_interface.rb
-- lib/graphql/types/relay/base_object.rb
+- lib/graphql/types/relay/connection_behaviors.rb
+- lib/graphql/types/relay/default_relay.rb
+- lib/graphql/types/relay/edge_behaviors.rb
+- lib/graphql/types/relay/has_node_field.rb
+- lib/graphql/types/relay/has_nodes_field.rb
 - lib/graphql/types/relay/node.rb
+- lib/graphql/types/relay/node_behaviors.rb
 - lib/graphql/types/relay/node_field.rb
 - lib/graphql/types/relay/nodes_field.rb
 - lib/graphql/types/relay/page_info.rb
+- lib/graphql/types/relay/page_info_behaviors.rb
 - lib/graphql/types/string.rb
 - lib/graphql/unauthorized_error.rb
 - lib/graphql/unauthorized_field_error.rb
@@ -756,7 +781,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby

data/lib/graphql/types/relay/base_field.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module GraphQL
-  module Types
-    module Relay
-      class BaseField < GraphQL::Schema::Field
-        def initialize(edge_class: nil, **rest, &block)
-          @edge_class = edge_class
-          super(**rest, &block)
-        end
-
-        def to_graphql
-          field = super
-          if @edge_class
-            field.edge_class = @edge_class
-          end
-          field
-        end
-      end
-    end
-  end
-end

data/lib/graphql/types/relay/base_interface.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module GraphQL
-  module Types
-    module Relay
-      module BaseInterface
-        include GraphQL::Schema::Interface
-
-        field_class(Types::Relay::BaseField)
-
-        definition_methods do
-          def default_relay(new_value)
-            @default_relay = new_value
-          end
-
-          def default_relay?
-            !!@default_relay
-          end
-
-          def to_graphql
-            type_defn = super
-            type_defn.default_relay = default_relay?
-            type_defn
-          end
-        end
-      end
-    end
-  end
-end

data/lib/graphql/types/relay/base_object.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module GraphQL
-  module Types
-    module Relay
-      class BaseObject < GraphQL::Schema::Object
-        field_class(Types::Relay::BaseField)
-        class << self
-          def default_relay(new_value)
-            @default_relay = new_value
-          end
-
-          def default_relay?
-            !!@default_relay
-          end
-
-          def to_graphql
-            type_defn = super
-            type_defn.default_relay = default_relay?
-            type_defn
-          end
-        end
-      end
-    end
-  end
-end