graphql 1.11.10 → 1.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/generators/graphql/install_generator.rb +5 -5
- data/lib/generators/graphql/relay_generator.rb +63 -0
- data/lib/generators/graphql/templates/base_connection.erb +8 -0
- data/lib/generators/graphql/templates/base_edge.erb +8 -0
- data/lib/generators/graphql/templates/node_type.erb +9 -0
- data/lib/generators/graphql/templates/object.erb +1 -1
- data/lib/generators/graphql/templates/query_type.erb +1 -3
- data/lib/generators/graphql/templates/schema.erb +8 -35
- data/lib/graphql/analysis/analyze_query.rb +7 -0
- data/lib/graphql/analysis/ast/visitor.rb +9 -1
- data/lib/graphql/analysis/ast.rb +11 -2
- data/lib/graphql/backtrace/legacy_tracer.rb +56 -0
- data/lib/graphql/backtrace/table.rb +22 -2
- data/lib/graphql/backtrace/tracer.rb +40 -9
- data/lib/graphql/backtrace.rb +28 -19
- data/lib/graphql/backwards_compatibility.rb +1 -0
- data/lib/graphql/compatibility/execution_specification.rb +1 -0
- data/lib/graphql/compatibility/lazy_execution_specification.rb +2 -0
- data/lib/graphql/compatibility/query_parser_specification.rb +2 -0
- data/lib/graphql/compatibility/schema_parser_specification.rb +2 -0
- data/lib/graphql/dataloader/null_dataloader.rb +21 -0
- data/lib/graphql/dataloader/request.rb +24 -0
- data/lib/graphql/dataloader/request_all.rb +22 -0
- data/lib/graphql/dataloader/source.rb +93 -0
- data/lib/graphql/dataloader.rb +197 -0
- data/lib/graphql/define/assign_global_id_field.rb +1 -1
- data/lib/graphql/define/instance_definable.rb +32 -2
- data/lib/graphql/define/type_definer.rb +5 -5
- data/lib/graphql/deprecated_dsl.rb +5 -0
- data/lib/graphql/enum_type.rb +2 -0
- data/lib/graphql/execution/errors.rb +4 -0
- data/lib/graphql/execution/execute.rb +7 -0
- data/lib/graphql/execution/interpreter/arguments.rb +51 -14
- data/lib/graphql/execution/interpreter/handles_raw_value.rb +0 -7
- data/lib/graphql/execution/interpreter/runtime.rb +210 -124
- data/lib/graphql/execution/interpreter.rb +10 -6
- data/lib/graphql/execution/multiplex.rb +20 -6
- data/lib/graphql/function.rb +4 -0
- data/lib/graphql/input_object_type.rb +2 -0
- data/lib/graphql/interface_type.rb +3 -1
- data/lib/graphql/language/document_from_schema_definition.rb +50 -23
- data/lib/graphql/object_type.rb +2 -0
- data/lib/graphql/pagination/connection.rb +5 -1
- data/lib/graphql/pagination/connections.rb +6 -16
- data/lib/graphql/query/context.rb +4 -0
- data/lib/graphql/query/serial_execution.rb +1 -0
- data/lib/graphql/query/validation_pipeline.rb +1 -1
- data/lib/graphql/query.rb +2 -0
- data/lib/graphql/relay/base_connection.rb +7 -0
- data/lib/graphql/relay/connection_instrumentation.rb +4 -4
- data/lib/graphql/relay/connection_type.rb +1 -1
- data/lib/graphql/relay/mutation.rb +1 -0
- data/lib/graphql/relay/node.rb +3 -0
- data/lib/graphql/relay/type_extensions.rb +2 -0
- data/lib/graphql/scalar_type.rb +2 -0
- data/lib/graphql/schema/argument.rb +25 -7
- data/lib/graphql/schema/build_from_definition.rb +139 -51
- data/lib/graphql/schema/directive/flagged.rb +57 -0
- data/lib/graphql/schema/directive.rb +76 -0
- data/lib/graphql/schema/enum.rb +3 -0
- data/lib/graphql/schema/enum_value.rb +12 -6
- data/lib/graphql/schema/field/connection_extension.rb +3 -2
- data/lib/graphql/schema/field.rb +28 -9
- data/lib/graphql/schema/input_object.rb +33 -22
- data/lib/graphql/schema/interface.rb +1 -0
- data/lib/graphql/schema/member/base_dsl_methods.rb +1 -0
- data/lib/graphql/schema/member/build_type.rb +3 -3
- data/lib/graphql/schema/member/has_arguments.rb +24 -6
- data/lib/graphql/schema/member/has_deprecation_reason.rb +25 -0
- data/lib/graphql/schema/member/has_directives.rb +98 -0
- data/lib/graphql/schema/member/has_validators.rb +31 -0
- data/lib/graphql/schema/member/type_system_helpers.rb +1 -1
- data/lib/graphql/schema/member.rb +4 -0
- data/lib/graphql/schema/object.rb +11 -0
- data/lib/graphql/schema/printer.rb +5 -4
- data/lib/graphql/schema/resolver/has_payload_type.rb +2 -0
- data/lib/graphql/schema/resolver.rb +7 -0
- data/lib/graphql/schema/subscription.rb +19 -1
- data/lib/graphql/schema/timeout_middleware.rb +2 -0
- data/lib/graphql/schema/validation.rb +2 -0
- data/lib/graphql/schema/validator/exclusion_validator.rb +31 -0
- data/lib/graphql/schema/validator/format_validator.rb +49 -0
- data/lib/graphql/schema/validator/inclusion_validator.rb +33 -0
- data/lib/graphql/schema/validator/length_validator.rb +57 -0
- data/lib/graphql/schema/validator/numericality_validator.rb +71 -0
- data/lib/graphql/schema/validator/required_validator.rb +68 -0
- data/lib/graphql/schema/validator.rb +163 -0
- data/lib/graphql/schema.rb +72 -49
- data/lib/graphql/static_validation/base_visitor.rb +0 -3
- data/lib/graphql/static_validation/rules/fields_will_merge.rb +4 -4
- data/lib/graphql/static_validation/rules/fragments_are_finite.rb +2 -2
- data/lib/graphql/static_validation/validation_context.rb +1 -6
- data/lib/graphql/static_validation/validator.rb +12 -14
- data/lib/graphql/subscriptions.rb +17 -20
- data/lib/graphql/tracing/appoptics_tracing.rb +3 -1
- data/lib/graphql/tracing/platform_tracing.rb +3 -1
- data/lib/graphql/tracing/skylight_tracing.rb +1 -1
- data/lib/graphql/tracing.rb +2 -2
- data/lib/graphql/types/relay/base_connection.rb +2 -92
- data/lib/graphql/types/relay/base_edge.rb +2 -35
- data/lib/graphql/types/relay/connection_behaviors.rb +123 -0
- data/lib/graphql/types/relay/default_relay.rb +27 -0
- data/lib/graphql/types/relay/edge_behaviors.rb +42 -0
- data/lib/graphql/types/relay/has_node_field.rb +41 -0
- data/lib/graphql/types/relay/has_nodes_field.rb +41 -0
- data/lib/graphql/types/relay/node.rb +2 -4
- data/lib/graphql/types/relay/node_behaviors.rb +15 -0
- data/lib/graphql/types/relay/node_field.rb +1 -19
- data/lib/graphql/types/relay/nodes_field.rb +1 -19
- data/lib/graphql/types/relay/page_info.rb +2 -14
- data/lib/graphql/types/relay/page_info_behaviors.rb +25 -0
- data/lib/graphql/types/relay.rb +11 -3
- data/lib/graphql/union_type.rb +2 -0
- data/lib/graphql/upgrader/member.rb +1 -0
- data/lib/graphql/upgrader/schema.rb +1 -0
- data/lib/graphql/version.rb +1 -1
- data/lib/graphql.rb +38 -4
- metadata +31 -6
- data/lib/graphql/types/relay/base_field.rb +0 -22
- data/lib/graphql/types/relay/base_interface.rb +0 -29
- data/lib/graphql/types/relay/base_object.rb +0 -26
@@ -0,0 +1,57 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module GraphQL
|
4
|
+
class Schema
|
5
|
+
class Validator
|
6
|
+
# Use this to enforce a `.length` restriction on incoming values. It works for both Strings and Lists.
|
7
|
+
#
|
8
|
+
# @example Allow no more than 10 IDs
|
9
|
+
#
|
10
|
+
# argument :ids, [ID], required: true, validates: { length: { maximum: 10 } }
|
11
|
+
#
|
12
|
+
# @example Require three selections
|
13
|
+
#
|
14
|
+
# argument :ice_cream_preferences, [ICE_CREAM_FLAVOR], required: true, validates: { length: { is: 3 } }
|
15
|
+
#
|
16
|
+
class LengthValidator < Validator
|
17
|
+
# @param maximum [Integer]
|
18
|
+
# @param too_long [String] Used when `maximum` is exceeded or value is greater than `within`
|
19
|
+
# @param minimum [Integer]
|
20
|
+
# @param too_short [String] Used with value is less than `minimum` or less than `within`
|
21
|
+
# @param is [Integer] Exact length requirement
|
22
|
+
# @param wrong_length [String] Used when value doesn't match `is`
|
23
|
+
# @param within [Range] An allowed range (becomes `minimum:` and `maximum:` under the hood)
|
24
|
+
# @param message [String]
|
25
|
+
def initialize(
|
26
|
+
maximum: nil, too_long: "%{validated} is too long (maximum is %{count})",
|
27
|
+
minimum: nil, too_short: "%{validated} is too short (minimum is %{count})",
|
28
|
+
is: nil, within: nil, wrong_length: "%{validated} is the wrong length (should be %{count})",
|
29
|
+
message: nil,
|
30
|
+
**default_options
|
31
|
+
)
|
32
|
+
if within && (minimum || maximum)
|
33
|
+
raise ArgumentError, "`length: { ... }` may include `within:` _or_ `minimum:`/`maximum:`, but not both"
|
34
|
+
end
|
35
|
+
# Under the hood, `within` is decomposed into `minimum` and `maximum`
|
36
|
+
@maximum = maximum || (within && within.max)
|
37
|
+
@too_long = message || too_long
|
38
|
+
@minimum = minimum || (within && within.min)
|
39
|
+
@too_short = message || too_short
|
40
|
+
@is = is
|
41
|
+
@wrong_length = message || wrong_length
|
42
|
+
super(**default_options)
|
43
|
+
end
|
44
|
+
|
45
|
+
def validate(_object, _context, value)
|
46
|
+
if @maximum && value.length > @maximum
|
47
|
+
partial_format(@too_long, { count: @maximum })
|
48
|
+
elsif @minimum && value.length < @minimum
|
49
|
+
partial_format(@too_short, { count: @minimum })
|
50
|
+
elsif @is && value.length != @is
|
51
|
+
partial_format(@wrong_length, { count: @is })
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
@@ -0,0 +1,71 @@
|
|
1
|
+
module GraphQL
|
2
|
+
class Schema
|
3
|
+
class Validator
|
4
|
+
# Use this to assert numerical comparisons hold true for inputs.
|
5
|
+
#
|
6
|
+
# @example Require a number between 0 and 1
|
7
|
+
#
|
8
|
+
# argument :batting_average, Float, required: true, validates: { numericality: { within: 0..1 } }
|
9
|
+
#
|
10
|
+
# @example Require the number 42
|
11
|
+
#
|
12
|
+
# argument :the_answer, Integer, required: true, validates: { numericality: { equal_to: 42 } }
|
13
|
+
#
|
14
|
+
# @example Require a real number
|
15
|
+
#
|
16
|
+
# argument :items_count, Integer, required: true, validates: { numericality: { greater_than_or_equal_to: 0 } }
|
17
|
+
#
|
18
|
+
class NumericalityValidator < Validator
|
19
|
+
# @param greater_than [Integer]
|
20
|
+
# @param greater_than_or_equal_to [Integer]
|
21
|
+
# @param less_than [Integer]
|
22
|
+
# @param less_than_or_equal_to [Integer]
|
23
|
+
# @param equal_to [Integer]
|
24
|
+
# @param other_than [Integer]
|
25
|
+
# @param odd [Boolean]
|
26
|
+
# @param even [Boolean]
|
27
|
+
# @param message [String] used for all validation failures
|
28
|
+
def initialize(
|
29
|
+
greater_than: nil, greater_than_or_equal_to: nil,
|
30
|
+
less_than: nil, less_than_or_equal_to: nil,
|
31
|
+
equal_to: nil, other_than: nil,
|
32
|
+
odd: nil, even: nil,
|
33
|
+
message: "%{validated} must be %{comparison} %{target}",
|
34
|
+
**default_options
|
35
|
+
)
|
36
|
+
|
37
|
+
@greater_than = greater_than
|
38
|
+
@greater_than_or_equal_to = greater_than_or_equal_to
|
39
|
+
@less_than = less_than
|
40
|
+
@less_than_or_equal_to = less_than_or_equal_to
|
41
|
+
@equal_to = equal_to
|
42
|
+
@other_than = other_than
|
43
|
+
@odd = odd
|
44
|
+
@even = even
|
45
|
+
@message = message
|
46
|
+
super(**default_options)
|
47
|
+
end
|
48
|
+
|
49
|
+
def validate(object, context, value)
|
50
|
+
if @greater_than && value <= @greater_than
|
51
|
+
partial_format(@message, { comparison: "greater than", target: @greater_than })
|
52
|
+
elsif @greater_than_or_equal_to && value < @greater_than_or_equal_to
|
53
|
+
partial_format(@message, { comparison: "greater than or equal to", target: @greater_than_or_equal_to })
|
54
|
+
elsif @less_than && value >= @less_than
|
55
|
+
partial_format(@message, { comparison: "less than", target: @less_than })
|
56
|
+
elsif @less_than_or_equal_to && value > @less_than_or_equal_to
|
57
|
+
partial_format(@message, { comparison: "less than or equal to", target: @less_than_or_equal_to })
|
58
|
+
elsif @equal_to && value != @equal_to
|
59
|
+
partial_format(@message, { comparison: "equal to", target: @equal_to })
|
60
|
+
elsif @other_than && value == @other_than
|
61
|
+
partial_format(@message, { comparison: "something other than", target: @other_than })
|
62
|
+
elsif @even && !value.even?
|
63
|
+
(partial_format(@message, { comparison: "even", target: "" })).strip
|
64
|
+
elsif @odd && !value.odd?
|
65
|
+
(partial_format(@message, { comparison: "odd", target: "" })).strip
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
@@ -0,0 +1,68 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module GraphQL
|
4
|
+
class Schema
|
5
|
+
class Validator
|
6
|
+
# Use this validator to require _one_ of the named arguments to be present.
|
7
|
+
# Or, use Arrays of symbols to name a valid _set_ of arguments.
|
8
|
+
#
|
9
|
+
# (This is for specifying mutually exclusive sets of arguments.)
|
10
|
+
#
|
11
|
+
# @example Require exactly one of these arguments
|
12
|
+
#
|
13
|
+
# field :update_amount, IngredientAmount, null: false do
|
14
|
+
# argument :ingredient_id, ID, required: true
|
15
|
+
# argument :cups, Integer, required: false
|
16
|
+
# argument :tablespoons, Integer, required: false
|
17
|
+
# argument :teaspoons, Integer, required: true
|
18
|
+
# validates required: { one_of: [:cups, :tablespoons, :teaspoons] }
|
19
|
+
# end
|
20
|
+
#
|
21
|
+
# @example Require one of these _sets_ of arguments
|
22
|
+
#
|
23
|
+
# field :find_object, Node, null: true do
|
24
|
+
# argument :node_id, ID, required: false
|
25
|
+
# argument :object_type, String, required: false
|
26
|
+
# argument :object_id, Integer, required: false
|
27
|
+
# # either a global `node_id` or an `object_type`/`object_id` pair is required:
|
28
|
+
# validates required: { one_of: [:node_id, [:object_type, :object_id]] }
|
29
|
+
# end
|
30
|
+
#
|
31
|
+
class RequiredValidator < Validator
|
32
|
+
# @param one_of [Symbol, Array<Symbol>] An argument, or a list of arguments, that represents a valid set of inputs for this field
|
33
|
+
# @param message [String]
|
34
|
+
def initialize(one_of:, message: "%{validated} has the wrong arguments", **default_options)
|
35
|
+
@one_of = one_of
|
36
|
+
@message = message
|
37
|
+
super(**default_options)
|
38
|
+
end
|
39
|
+
|
40
|
+
def validate(_object, _context, value)
|
41
|
+
matched_conditions = 0
|
42
|
+
|
43
|
+
@one_of.each do |one_of_condition|
|
44
|
+
case one_of_condition
|
45
|
+
when Symbol
|
46
|
+
if value.key?(one_of_condition)
|
47
|
+
matched_conditions += 1
|
48
|
+
end
|
49
|
+
when Array
|
50
|
+
if one_of_condition.all? { |k| value.key?(k) }
|
51
|
+
matched_conditions += 1
|
52
|
+
break
|
53
|
+
end
|
54
|
+
else
|
55
|
+
raise ArgumentError, "Unknown one_of condition: #{one_of_condition.inspect}"
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
if matched_conditions == 1
|
60
|
+
nil # OK
|
61
|
+
else
|
62
|
+
@message
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
@@ -0,0 +1,163 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module GraphQL
|
4
|
+
class Schema
|
5
|
+
class Validator
|
6
|
+
# The thing being validated
|
7
|
+
# @return [GraphQL::Schema::Argument, GraphQL::Schema::Field, GraphQL::Schema::Resolver, Class<GraphQL::Schema::InputObject>]
|
8
|
+
attr_reader :validated
|
9
|
+
|
10
|
+
# TODO should this implement `if:` and `unless:` ?
|
11
|
+
# @param validated [GraphQL::Schema::Argument, GraphQL::Schema::Field, GraphQL::Schema::Resolver, Class<GraphQL::Schema::InputObject>] The argument or argument owner this validator is attached to
|
12
|
+
# @param allow_blank [Boolean] if `true`, then objects that respond to `.blank?` and return true for `.blank?` will skip this validation
|
13
|
+
# @param allow_null [Boolean] if `true`, then incoming `null`s will skip this validation
|
14
|
+
def initialize(validated:, allow_blank: false, allow_null: false)
|
15
|
+
@validated = validated
|
16
|
+
@allow_blank = allow_blank
|
17
|
+
@allow_null = allow_null
|
18
|
+
end
|
19
|
+
|
20
|
+
# @param object [Object] The application object that this argument's field is being resolved for
|
21
|
+
# @param context [GraphQL::Query::Context]
|
22
|
+
# @param value [Object] The client-provided value for this argument (after parsing and coercing by the input type)
|
23
|
+
# @return [nil, Array<String>, String] Error message or messages to add
|
24
|
+
def validate(object, context, value)
|
25
|
+
raise GraphQL::RequiredImplementationMissingError, "Validator classes should implement #validate"
|
26
|
+
end
|
27
|
+
|
28
|
+
# This is called by the validation system and eventually calls {#validate}.
|
29
|
+
# @api private
|
30
|
+
def apply(object, context, value)
|
31
|
+
if value.nil?
|
32
|
+
if @allow_null
|
33
|
+
nil # skip this
|
34
|
+
else
|
35
|
+
"%{validated} can't be null"
|
36
|
+
end
|
37
|
+
elsif value.respond_to?(:blank?) && value.blank?
|
38
|
+
if @allow_blank
|
39
|
+
nil # skip this
|
40
|
+
else
|
41
|
+
"%{validated} can't be blank"
|
42
|
+
end
|
43
|
+
else
|
44
|
+
validate(object, context, value)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
# This is like `String#%`, but it supports the case that only some of `string`'s
|
49
|
+
# values are present in `substitutions`
|
50
|
+
def partial_format(string, substitutions)
|
51
|
+
substitutions.each do |key, value|
|
52
|
+
sub_v = value.is_a?(String) ? value : value.to_s
|
53
|
+
string = string.gsub("%{#{key}}", sub_v)
|
54
|
+
end
|
55
|
+
string
|
56
|
+
end
|
57
|
+
|
58
|
+
# @param schema_member [GraphQL::Schema::Field, GraphQL::Schema::Argument, Class<GraphQL::Schema::InputObject>]
|
59
|
+
# @param validates_hash [Hash{Symbol => Hash}, Hash{Class => Hash} nil] A configuration passed as `validates:`
|
60
|
+
# @return [Array<Validator>]
|
61
|
+
def self.from_config(schema_member, validates_hash)
|
62
|
+
if validates_hash.nil? || validates_hash.empty?
|
63
|
+
EMPTY_ARRAY
|
64
|
+
else
|
65
|
+
validates_hash.map do |validator_name, options|
|
66
|
+
validator_class = case validator_name
|
67
|
+
when Class
|
68
|
+
validator_name
|
69
|
+
else
|
70
|
+
all_validators[validator_name] || raise(ArgumentError, "unknown validation: #{validator_name.inspect}")
|
71
|
+
end
|
72
|
+
validator_class.new(validated: schema_member, **options)
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
# Add `validator_class` to be initialized when `validates:` is given `name`.
|
78
|
+
# (It's initialized with whatever options are given by the key `name`).
|
79
|
+
# @param name [Symbol]
|
80
|
+
# @param validator_class [Class]
|
81
|
+
# @return [void]
|
82
|
+
def self.install(name, validator_class)
|
83
|
+
all_validators[name] = validator_class
|
84
|
+
nil
|
85
|
+
end
|
86
|
+
|
87
|
+
# Remove whatever validator class is {.install}ed at `name`, if there is one
|
88
|
+
# @param name [Symbol]
|
89
|
+
# @return [void]
|
90
|
+
def self.uninstall(name)
|
91
|
+
all_validators.delete(name)
|
92
|
+
nil
|
93
|
+
end
|
94
|
+
|
95
|
+
class << self
|
96
|
+
attr_accessor :all_validators
|
97
|
+
end
|
98
|
+
|
99
|
+
self.all_validators = {}
|
100
|
+
|
101
|
+
include Schema::FindInheritedValue::EmptyObjects
|
102
|
+
|
103
|
+
class ValidationFailedError < GraphQL::ExecutionError
|
104
|
+
attr_reader :errors
|
105
|
+
|
106
|
+
def initialize(errors:)
|
107
|
+
@errors = errors
|
108
|
+
super(errors.join(", "))
|
109
|
+
end
|
110
|
+
end
|
111
|
+
|
112
|
+
# @param validators [Array<Validator>]
|
113
|
+
# @param object [Object]
|
114
|
+
# @param context [Query::Context]
|
115
|
+
# @param value [Object]
|
116
|
+
# @return [void]
|
117
|
+
# @raises [ValidationFailedError]
|
118
|
+
def self.validate!(validators, object, context, value, as: nil)
|
119
|
+
# Assuming the default case is no errors, reduce allocations in that case.
|
120
|
+
# This will be replaced with a mutable array if we actually get any errors.
|
121
|
+
all_errors = EMPTY_ARRAY
|
122
|
+
|
123
|
+
validators.each do |validator|
|
124
|
+
validated = as || validator.validated
|
125
|
+
errors = validator.apply(object, context, value)
|
126
|
+
if errors &&
|
127
|
+
(errors.is_a?(Array) && errors != EMPTY_ARRAY) ||
|
128
|
+
(errors.is_a?(String))
|
129
|
+
if all_errors.frozen? # It's empty
|
130
|
+
all_errors = []
|
131
|
+
end
|
132
|
+
interpolation_vars = { validated: validated.graphql_name }
|
133
|
+
if errors.is_a?(String)
|
134
|
+
all_errors << (errors % interpolation_vars)
|
135
|
+
else
|
136
|
+
errors = errors.map { |e| e % interpolation_vars }
|
137
|
+
all_errors.concat(errors)
|
138
|
+
end
|
139
|
+
end
|
140
|
+
end
|
141
|
+
|
142
|
+
if all_errors.any?
|
143
|
+
raise ValidationFailedError.new(errors: all_errors)
|
144
|
+
end
|
145
|
+
nil
|
146
|
+
end
|
147
|
+
end
|
148
|
+
end
|
149
|
+
end
|
150
|
+
|
151
|
+
|
152
|
+
require "graphql/schema/validator/length_validator"
|
153
|
+
GraphQL::Schema::Validator.install(:length, GraphQL::Schema::Validator::LengthValidator)
|
154
|
+
require "graphql/schema/validator/numericality_validator"
|
155
|
+
GraphQL::Schema::Validator.install(:numericality, GraphQL::Schema::Validator::NumericalityValidator)
|
156
|
+
require "graphql/schema/validator/format_validator"
|
157
|
+
GraphQL::Schema::Validator.install(:format, GraphQL::Schema::Validator::FormatValidator)
|
158
|
+
require "graphql/schema/validator/inclusion_validator"
|
159
|
+
GraphQL::Schema::Validator.install(:inclusion, GraphQL::Schema::Validator::InclusionValidator)
|
160
|
+
require "graphql/schema/validator/exclusion_validator"
|
161
|
+
GraphQL::Schema::Validator.install(:exclusion, GraphQL::Schema::Validator::ExclusionValidator)
|
162
|
+
require "graphql/schema/validator/required_validator"
|
163
|
+
GraphQL::Schema::Validator.install(:required, GraphQL::Schema::Validator::RequiredValidator)
|
data/lib/graphql/schema.rb
CHANGED
@@ -21,6 +21,7 @@ require "graphql/schema/validation"
|
|
21
21
|
require "graphql/schema/warden"
|
22
22
|
require "graphql/schema/build_from_definition"
|
23
23
|
|
24
|
+
require "graphql/schema/validator"
|
24
25
|
require "graphql/schema/member"
|
25
26
|
require "graphql/schema/wrapper"
|
26
27
|
require "graphql/schema/list"
|
@@ -40,6 +41,7 @@ require "graphql/schema/directive/deprecated"
|
|
40
41
|
require "graphql/schema/directive/include"
|
41
42
|
require "graphql/schema/directive/skip"
|
42
43
|
require "graphql/schema/directive/feature"
|
44
|
+
require "graphql/schema/directive/flagged"
|
43
45
|
require "graphql/schema/directive/transform"
|
44
46
|
require "graphql/schema/type_membership"
|
45
47
|
|
@@ -80,6 +82,7 @@ module GraphQL
|
|
80
82
|
extend GraphQL::Schema::Member::AcceptsDefinition
|
81
83
|
extend GraphQL::Schema::Member::HasAstNode
|
82
84
|
include GraphQL::Define::InstanceDefinable
|
85
|
+
extend GraphQL::Define::InstanceDefinable::DeprecatedDefine
|
83
86
|
extend GraphQL::Schema::FindInheritedValue
|
84
87
|
|
85
88
|
class DuplicateTypeNamesError < GraphQL::Error
|
@@ -157,7 +160,7 @@ module GraphQL
|
|
157
160
|
|
158
161
|
accepts_definitions \
|
159
162
|
:query_execution_strategy, :mutation_execution_strategy, :subscription_execution_strategy,
|
160
|
-
:validate_timeout, :
|
163
|
+
:validate_timeout, :max_depth, :max_complexity, :default_max_page_size,
|
161
164
|
:orphan_types, :resolve_type, :type_error, :parse_error,
|
162
165
|
:error_bubbling,
|
163
166
|
:raise_definition_error,
|
@@ -196,7 +199,7 @@ module GraphQL
|
|
196
199
|
attr_accessor \
|
197
200
|
:query, :mutation, :subscription,
|
198
201
|
:query_execution_strategy, :mutation_execution_strategy, :subscription_execution_strategy,
|
199
|
-
:validate_timeout, :
|
202
|
+
:validate_timeout, :max_depth, :max_complexity, :default_max_page_size,
|
200
203
|
:orphan_types, :directives,
|
201
204
|
:query_analyzers, :multiplex_analyzers, :instrumenters, :lazy_methods,
|
202
205
|
:cursor_encoder,
|
@@ -281,11 +284,11 @@ module GraphQL
|
|
281
284
|
@lazy_methods = GraphQL::Execution::Lazy::LazyMethodMap.new
|
282
285
|
@lazy_methods.set(GraphQL::Execution::Lazy, :value)
|
283
286
|
@cursor_encoder = Base64Encoder
|
284
|
-
#
|
287
|
+
# For schema instances, default to legacy runtime modules
|
285
288
|
@analysis_engine = GraphQL::Analysis
|
286
|
-
@query_execution_strategy =
|
287
|
-
@mutation_execution_strategy =
|
288
|
-
@subscription_execution_strategy =
|
289
|
+
@query_execution_strategy = GraphQL::Execution::Execute
|
290
|
+
@mutation_execution_strategy = GraphQL::Execution::Execute
|
291
|
+
@subscription_execution_strategy = GraphQL::Execution::Execute
|
289
292
|
@default_mask = GraphQL::Schema::NullMask
|
290
293
|
@rebuilding_artifacts = false
|
291
294
|
@context_class = GraphQL::Query::Context
|
@@ -300,12 +303,11 @@ module GraphQL
|
|
300
303
|
|
301
304
|
# @return [Boolean] True if using the new {GraphQL::Execution::Interpreter}
|
302
305
|
def interpreter?
|
303
|
-
|
306
|
+
query_execution_strategy == GraphQL::Execution::Interpreter &&
|
307
|
+
mutation_execution_strategy == GraphQL::Execution::Interpreter &&
|
308
|
+
subscription_execution_strategy == GraphQL::Execution::Interpreter
|
304
309
|
end
|
305
310
|
|
306
|
-
# @api private
|
307
|
-
attr_writer :interpreter
|
308
|
-
|
309
311
|
def inspect
|
310
312
|
"#<#{self.class.name} ...>"
|
311
313
|
end
|
@@ -366,11 +368,11 @@ module GraphQL
|
|
366
368
|
validator_opts = { schema: self }
|
367
369
|
rules && (validator_opts[:rules] = rules)
|
368
370
|
validator = GraphQL::StaticValidation::Validator.new(**validator_opts)
|
369
|
-
res = validator.validate(query, timeout: validate_timeout
|
371
|
+
res = validator.validate(query, timeout: validate_timeout)
|
370
372
|
res[:errors]
|
371
373
|
end
|
372
374
|
|
373
|
-
def
|
375
|
+
def deprecated_define(**kwargs, &block)
|
374
376
|
super
|
375
377
|
ensure_defined
|
376
378
|
# Assert that all necessary configs are present:
|
@@ -709,7 +711,7 @@ module GraphQL
|
|
709
711
|
alias :_schema_class :class
|
710
712
|
def_delegators :_schema_class, :unauthorized_object, :unauthorized_field, :inaccessible_fields
|
711
713
|
def_delegators :_schema_class, :directive
|
712
|
-
def_delegators :_schema_class, :error_handler
|
714
|
+
def_delegators :_schema_class, :error_handler, :rescues
|
713
715
|
|
714
716
|
|
715
717
|
# Given this schema member, find the class-based definition object
|
@@ -787,9 +789,8 @@ module GraphQL
|
|
787
789
|
# @param default_resolve [<#call(type, field, obj, args, ctx)>] A callable for handling field resolution
|
788
790
|
# @param parser [Object] An object for handling definition string parsing (must respond to `parse`)
|
789
791
|
# @param using [Hash] Plugins to attach to the created schema with `use(key, value)`
|
790
|
-
# @param interpreter [Boolean] If false, the legacy {Execution::Execute} runtime will be used
|
791
792
|
# @return [Class] the schema described by `document`
|
792
|
-
def self.from_definition(definition_or_path, default_resolve: nil,
|
793
|
+
def self.from_definition(definition_or_path, default_resolve: nil, parser: GraphQL.default_parser, using: {})
|
793
794
|
# If the file ends in `.graphql`, treat it like a filepath
|
794
795
|
if definition_or_path.end_with?(".graphql")
|
795
796
|
GraphQL::Schema::BuildFromDefinition.from_definition_path(
|
@@ -797,7 +798,6 @@ module GraphQL
|
|
797
798
|
default_resolve: default_resolve,
|
798
799
|
parser: parser,
|
799
800
|
using: using,
|
800
|
-
interpreter: interpreter,
|
801
801
|
)
|
802
802
|
else
|
803
803
|
GraphQL::Schema::BuildFromDefinition.from_definition(
|
@@ -805,7 +805,6 @@ module GraphQL
|
|
805
805
|
default_resolve: default_resolve,
|
806
806
|
parser: parser,
|
807
807
|
using: using,
|
808
|
-
interpreter: interpreter,
|
809
808
|
)
|
810
809
|
end
|
811
810
|
end
|
@@ -951,7 +950,6 @@ module GraphQL
|
|
951
950
|
schema_defn.mutation = mutation && mutation.graphql_definition
|
952
951
|
schema_defn.subscription = subscription && subscription.graphql_definition
|
953
952
|
schema_defn.validate_timeout = validate_timeout
|
954
|
-
schema_defn.validate_max_errors = validate_max_errors
|
955
953
|
schema_defn.max_complexity = max_complexity
|
956
954
|
schema_defn.error_bubbling = error_bubbling
|
957
955
|
schema_defn.max_depth = max_depth
|
@@ -1120,15 +1118,14 @@ module GraphQL
|
|
1120
1118
|
type.possible_types(context: context)
|
1121
1119
|
else
|
1122
1120
|
stored_possible_types = own_possible_types[type.graphql_name]
|
1123
|
-
visible_possible_types =
|
1124
|
-
|
1125
|
-
|
1126
|
-
|
1127
|
-
|
1128
|
-
|
1129
|
-
|
1130
|
-
|
1131
|
-
end
|
1121
|
+
visible_possible_types = stored_possible_types.select do |possible_type|
|
1122
|
+
next true unless type.kind.interface?
|
1123
|
+
next true unless possible_type.kind.object?
|
1124
|
+
|
1125
|
+
# Use `.graphql_name` comparison to match legacy vs class-based types.
|
1126
|
+
# When we don't need to support legacy `.define` types, use `.include?(type)` instead.
|
1127
|
+
possible_type.interfaces(context).any? { |interface| interface.graphql_name == type.graphql_name }
|
1128
|
+
end if stored_possible_types
|
1132
1129
|
visible_possible_types ||
|
1133
1130
|
introspection_system.possible_types[type.graphql_name] ||
|
1134
1131
|
(
|
@@ -1159,6 +1156,14 @@ module GraphQL
|
|
1159
1156
|
end
|
1160
1157
|
end
|
1161
1158
|
|
1159
|
+
# @api private
|
1160
|
+
# @see GraphQL::Dataloader
|
1161
|
+
def dataloader_class
|
1162
|
+
@dataloader_class || GraphQL::Dataloader::NullDataloader
|
1163
|
+
end
|
1164
|
+
|
1165
|
+
attr_writer :dataloader_class
|
1166
|
+
|
1162
1167
|
def references_to(to_type = nil, from: nil)
|
1163
1168
|
@own_references_to ||= Hash.new { |h, k| h[k] = [] }
|
1164
1169
|
if to_type
|
@@ -1287,19 +1292,6 @@ module GraphQL
|
|
1287
1292
|
end
|
1288
1293
|
end
|
1289
1294
|
|
1290
|
-
attr_writer :validate_max_errors
|
1291
|
-
|
1292
|
-
def validate_max_errors(new_validate_max_errors = nil)
|
1293
|
-
if new_validate_max_errors
|
1294
|
-
@validate_max_errors = new_validate_max_errors
|
1295
|
-
elsif defined?(@validate_max_errors)
|
1296
|
-
@validate_max_errors
|
1297
|
-
else
|
1298
|
-
find_inherited_value(:validate_max_errors)
|
1299
|
-
end
|
1300
|
-
end
|
1301
|
-
|
1302
|
-
|
1303
1295
|
attr_writer :max_complexity
|
1304
1296
|
|
1305
1297
|
def max_complexity(max_complexity = nil)
|
@@ -1315,7 +1307,7 @@ module GraphQL
|
|
1315
1307
|
attr_writer :analysis_engine
|
1316
1308
|
|
1317
1309
|
def analysis_engine
|
1318
|
-
@analysis_engine || find_inherited_value(:analysis_engine,
|
1310
|
+
@analysis_engine || find_inherited_value(:analysis_engine, self.default_analysis_engine)
|
1319
1311
|
end
|
1320
1312
|
|
1321
1313
|
def using_ast_analysis?
|
@@ -1323,11 +1315,9 @@ module GraphQL
|
|
1323
1315
|
end
|
1324
1316
|
|
1325
1317
|
def interpreter?
|
1326
|
-
|
1327
|
-
|
1328
|
-
|
1329
|
-
find_inherited_value(:interpreter?, false)
|
1330
|
-
end
|
1318
|
+
query_execution_strategy == GraphQL::Execution::Interpreter &&
|
1319
|
+
mutation_execution_strategy == GraphQL::Execution::Interpreter &&
|
1320
|
+
subscription_execution_strategy == GraphQL::Execution::Interpreter
|
1331
1321
|
end
|
1332
1322
|
|
1333
1323
|
attr_writer :interpreter
|
@@ -1411,7 +1401,15 @@ module GraphQL
|
|
1411
1401
|
if superclass <= GraphQL::Schema
|
1412
1402
|
superclass.default_execution_strategy
|
1413
1403
|
else
|
1414
|
-
@default_execution_strategy ||= GraphQL::Execution::
|
1404
|
+
@default_execution_strategy ||= GraphQL::Execution::Interpreter
|
1405
|
+
end
|
1406
|
+
end
|
1407
|
+
|
1408
|
+
def default_analysis_engine
|
1409
|
+
if superclass <= GraphQL::Schema
|
1410
|
+
superclass.default_analysis_engine
|
1411
|
+
else
|
1412
|
+
@default_analysis_engine ||= GraphQL::Analysis::AST
|
1415
1413
|
end
|
1416
1414
|
end
|
1417
1415
|
|
@@ -1565,6 +1563,10 @@ module GraphQL
|
|
1565
1563
|
end
|
1566
1564
|
|
1567
1565
|
def instrument(instrument_step, instrumenter, options = {})
|
1566
|
+
if instrument_step == :field
|
1567
|
+
warn "Field instrumentation (#{instrumenter.inspect}) will be removed in GraphQL-Ruby 2.0, please upgrade to field extensions: https://graphql-ruby.org/type_definitions/field_extensions.html"
|
1568
|
+
end
|
1569
|
+
|
1568
1570
|
step = if instrument_step == :field && options[:after_built_ins]
|
1569
1571
|
:field_after_built_ins
|
1570
1572
|
else
|
@@ -1586,9 +1588,12 @@ module GraphQL
|
|
1586
1588
|
|
1587
1589
|
# Attach a single directive to this schema
|
1588
1590
|
# @param new_directive [Class]
|
1591
|
+
# @return void
|
1589
1592
|
def directive(new_directive)
|
1590
|
-
|
1591
|
-
|
1593
|
+
own_directives[new_directive.graphql_name] ||= begin
|
1594
|
+
add_type_and_traverse(new_directive, root: false)
|
1595
|
+
new_directive
|
1596
|
+
end
|
1592
1597
|
end
|
1593
1598
|
|
1594
1599
|
def default_directives
|
@@ -1620,6 +1625,7 @@ module GraphQL
|
|
1620
1625
|
|
1621
1626
|
def middleware(new_middleware = nil)
|
1622
1627
|
if new_middleware
|
1628
|
+
warn "Middleware will be removed in GraphQL-Ruby 2.0, please upgrade to Field Extensions: https://graphql-ruby.org/type_definitions/field_extensions.html"
|
1623
1629
|
own_middleware << new_middleware
|
1624
1630
|
else
|
1625
1631
|
# TODO make sure this is cached when running a query
|
@@ -1719,6 +1725,7 @@ module GraphQL
|
|
1719
1725
|
else
|
1720
1726
|
@lazy_methods = GraphQL::Execution::Lazy::LazyMethodMap.new
|
1721
1727
|
@lazy_methods.set(GraphQL::Execution::Lazy, :value)
|
1728
|
+
@lazy_methods.set(GraphQL::Dataloader::Request, :load)
|
1722
1729
|
end
|
1723
1730
|
end
|
1724
1731
|
@lazy_methods
|
@@ -1915,13 +1922,16 @@ module GraphQL
|
|
1915
1922
|
end
|
1916
1923
|
else
|
1917
1924
|
own_types[type.graphql_name] = type
|
1925
|
+
add_directives_from(type)
|
1918
1926
|
if type.kind.fields?
|
1919
1927
|
type.fields.each do |name, field|
|
1920
1928
|
field_type = field.type.unwrap
|
1921
1929
|
references_to(field_type, from: field)
|
1922
1930
|
field_path = path + [name]
|
1923
1931
|
add_type(field_type, owner: field, late_types: late_types, path: field_path)
|
1932
|
+
add_directives_from(field)
|
1924
1933
|
field.arguments.each do |arg_name, arg|
|
1934
|
+
add_directives_from(arg)
|
1925
1935
|
arg_type = arg.type.unwrap
|
1926
1936
|
references_to(arg_type, from: arg)
|
1927
1937
|
add_type(arg_type, owner: arg, late_types: late_types, path: field_path + [arg_name])
|
@@ -1930,6 +1940,7 @@ module GraphQL
|
|
1930
1940
|
end
|
1931
1941
|
if type.kind.input_object?
|
1932
1942
|
type.arguments.each do |arg_name, arg|
|
1943
|
+
add_directives_from(arg)
|
1933
1944
|
arg_type = arg.type.unwrap
|
1934
1945
|
references_to(arg_type, from: arg)
|
1935
1946
|
add_type(arg_type, owner: arg, late_types: late_types, path: path + [arg_name])
|
@@ -1967,8 +1978,20 @@ module GraphQL
|
|
1967
1978
|
end
|
1968
1979
|
end
|
1969
1980
|
end
|
1981
|
+
|
1982
|
+
def add_directives_from(owner)
|
1983
|
+
owner.directives.each { |dir| directive(dir.class) }
|
1984
|
+
end
|
1970
1985
|
end
|
1971
1986
|
|
1987
|
+
def dataloader_class
|
1988
|
+
self.class.dataloader_class
|
1989
|
+
end
|
1990
|
+
|
1991
|
+
# Install these here so that subclasses will also install it.
|
1992
|
+
use(GraphQL::Execution::Errors)
|
1993
|
+
use(GraphQL::Pagination::Connections)
|
1994
|
+
|
1972
1995
|
protected
|
1973
1996
|
|
1974
1997
|
def rescues?
|