graphql 1.9.18 → 1.13.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/generators/graphql/core.rb +21 -10
- data/lib/generators/graphql/enum_generator.rb +4 -10
- data/lib/generators/graphql/field_extractor.rb +31 -0
- data/lib/generators/graphql/input_generator.rb +50 -0
- data/lib/generators/graphql/install/mutation_root_generator.rb +34 -0
- data/lib/generators/graphql/{templates → install/templates}/base_mutation.erb +2 -0
- data/lib/generators/graphql/{templates → install/templates}/mutation_type.erb +2 -0
- data/lib/generators/graphql/install_generator.rb +44 -7
- data/lib/generators/graphql/interface_generator.rb +7 -7
- data/lib/generators/graphql/loader_generator.rb +1 -0
- data/lib/generators/graphql/mutation_create_generator.rb +22 -0
- data/lib/generators/graphql/mutation_delete_generator.rb +22 -0
- data/lib/generators/graphql/mutation_generator.rb +6 -30
- data/lib/generators/graphql/mutation_update_generator.rb +22 -0
- data/lib/generators/graphql/object_generator.rb +28 -12
- data/lib/generators/graphql/orm_mutations_base.rb +40 -0
- data/lib/generators/graphql/relay.rb +63 -0
- data/lib/generators/graphql/relay_generator.rb +21 -0
- data/lib/generators/graphql/scalar_generator.rb +4 -2
- data/lib/generators/graphql/templates/base_argument.erb +2 -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/base_enum.erb +2 -0
- data/lib/generators/graphql/templates/base_field.erb +2 -0
- data/lib/generators/graphql/templates/base_input_object.erb +2 -0
- data/lib/generators/graphql/templates/base_interface.erb +2 -0
- data/lib/generators/graphql/templates/base_object.erb +2 -0
- data/lib/generators/graphql/templates/base_scalar.erb +2 -0
- data/lib/generators/graphql/templates/base_union.erb +2 -0
- data/lib/generators/graphql/templates/enum.erb +7 -1
- data/lib/generators/graphql/templates/graphql_controller.erb +16 -12
- data/lib/generators/graphql/templates/input.erb +9 -0
- data/lib/generators/graphql/templates/interface.erb +6 -2
- data/lib/generators/graphql/templates/loader.erb +2 -0
- data/lib/generators/graphql/templates/mutation.erb +3 -1
- data/lib/generators/graphql/templates/mutation_create.erb +20 -0
- data/lib/generators/graphql/templates/mutation_delete.erb +20 -0
- data/lib/generators/graphql/templates/mutation_update.erb +21 -0
- data/lib/generators/graphql/templates/node_type.erb +9 -0
- data/lib/generators/graphql/templates/object.erb +7 -3
- data/lib/generators/graphql/templates/query_type.erb +3 -3
- data/lib/generators/graphql/templates/scalar.erb +5 -1
- data/lib/generators/graphql/templates/schema.erb +22 -27
- data/lib/generators/graphql/templates/union.erb +6 -2
- data/lib/generators/graphql/type_generator.rb +47 -10
- data/lib/generators/graphql/union_generator.rb +5 -5
- data/lib/graphql/analysis/analyze_query.rb +7 -0
- data/lib/graphql/analysis/ast/field_usage.rb +29 -2
- data/lib/graphql/analysis/ast/query_complexity.rb +174 -67
- data/lib/graphql/analysis/ast/visitor.rb +16 -7
- data/lib/graphql/analysis/ast.rb +21 -11
- data/lib/graphql/argument.rb +8 -36
- data/lib/graphql/backtrace/inspect_result.rb +0 -1
- data/lib/graphql/backtrace/legacy_tracer.rb +56 -0
- data/lib/graphql/backtrace/table.rb +44 -5
- data/lib/graphql/backtrace/traced_error.rb +0 -1
- data/lib/graphql/backtrace/tracer.rb +40 -9
- data/lib/graphql/backtrace.rb +28 -19
- data/lib/graphql/backwards_compatibility.rb +2 -1
- data/lib/graphql/base_type.rb +10 -4
- data/lib/graphql/boolean_type.rb +1 -1
- data/lib/graphql/compatibility/execution_specification/specification_schema.rb +2 -2
- 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/parse_error_specification.rb +5 -9
- 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 +22 -0
- data/lib/graphql/dataloader/request.rb +19 -0
- data/lib/graphql/dataloader/request_all.rb +19 -0
- data/lib/graphql/dataloader/source.rb +155 -0
- data/lib/graphql/dataloader.rb +308 -0
- data/lib/graphql/date_encoding_error.rb +16 -0
- data/lib/graphql/define/assign_enum_value.rb +1 -1
- data/lib/graphql/define/assign_global_id_field.rb +2 -2
- data/lib/graphql/define/assign_object_field.rb +1 -1
- data/lib/graphql/define/defined_object_proxy.rb +5 -8
- data/lib/graphql/define/instance_definable.rb +60 -110
- data/lib/graphql/define/type_definer.rb +5 -5
- data/lib/graphql/deprecated_dsl.rb +18 -5
- data/lib/graphql/deprecation.rb +9 -0
- data/lib/graphql/directive/deprecated_directive.rb +1 -12
- data/lib/graphql/directive/include_directive.rb +1 -1
- data/lib/graphql/directive/skip_directive.rb +1 -1
- data/lib/graphql/directive.rb +9 -6
- data/lib/graphql/enum_type.rb +14 -74
- data/lib/graphql/execution/directive_checks.rb +2 -2
- data/lib/graphql/execution/errors.rb +110 -8
- data/lib/graphql/execution/execute.rb +8 -1
- data/lib/graphql/execution/instrumentation.rb +1 -1
- data/lib/graphql/execution/interpreter/argument_value.rb +28 -0
- data/lib/graphql/execution/interpreter/arguments.rb +88 -0
- data/lib/graphql/execution/interpreter/arguments_cache.rb +105 -0
- data/lib/graphql/execution/interpreter/handles_raw_value.rb +18 -0
- data/lib/graphql/execution/interpreter/resolve.rb +37 -25
- data/lib/graphql/execution/interpreter/runtime.rb +721 -386
- data/lib/graphql/execution/interpreter.rb +42 -19
- data/lib/graphql/execution/lazy/lazy_method_map.rb +4 -0
- data/lib/graphql/execution/lazy.rb +5 -1
- data/lib/graphql/execution/lookahead.rb +39 -114
- data/lib/graphql/execution/multiplex.rb +50 -25
- data/lib/graphql/field.rb +15 -119
- data/lib/graphql/filter.rb +1 -1
- data/lib/graphql/float_type.rb +1 -1
- data/lib/graphql/function.rb +5 -30
- data/lib/graphql/id_type.rb +1 -1
- data/lib/graphql/input_object_type.rb +9 -25
- data/lib/graphql/int_type.rb +1 -1
- data/lib/graphql/integer_decoding_error.rb +17 -0
- data/lib/graphql/integer_encoding_error.rb +18 -2
- data/lib/graphql/interface_type.rb +10 -24
- data/lib/graphql/internal_representation/document.rb +2 -2
- data/lib/graphql/internal_representation/rewrite.rb +1 -1
- data/lib/graphql/internal_representation/scope.rb +2 -2
- data/lib/graphql/internal_representation/visit.rb +2 -2
- data/lib/graphql/introspection/base_object.rb +2 -5
- data/lib/graphql/introspection/directive_location_enum.rb +2 -2
- data/lib/graphql/introspection/directive_type.rb +12 -6
- data/lib/graphql/introspection/entry_points.rb +9 -9
- data/lib/graphql/introspection/enum_value_type.rb +2 -2
- data/lib/graphql/introspection/field_type.rb +9 -5
- data/lib/graphql/introspection/input_value_type.rb +41 -11
- data/lib/graphql/introspection/introspection_query.rb +6 -92
- data/lib/graphql/introspection/schema_type.rb +12 -12
- data/lib/graphql/introspection/type_type.rb +27 -17
- data/lib/graphql/introspection.rb +99 -0
- data/lib/graphql/invalid_null_error.rb +18 -0
- data/lib/graphql/language/block_string.rb +20 -5
- data/lib/graphql/language/cache.rb +37 -0
- data/lib/graphql/language/definition_slice.rb +21 -10
- data/lib/graphql/language/document_from_schema_definition.rb +116 -63
- data/lib/graphql/language/lexer.rb +53 -27
- data/lib/graphql/language/lexer.rl +5 -3
- data/lib/graphql/language/nodes.rb +67 -93
- data/lib/graphql/language/parser.rb +929 -896
- data/lib/graphql/language/parser.y +125 -102
- data/lib/graphql/language/printer.rb +11 -2
- data/lib/graphql/language/sanitized_printer.rb +222 -0
- data/lib/graphql/language/token.rb +0 -4
- data/lib/graphql/language/visitor.rb +2 -2
- data/lib/graphql/language.rb +3 -1
- data/lib/graphql/name_validator.rb +2 -7
- data/lib/graphql/non_null_type.rb +0 -10
- data/lib/graphql/object_type.rb +47 -58
- data/lib/graphql/pagination/active_record_relation_connection.rb +85 -0
- data/lib/graphql/pagination/array_connection.rb +77 -0
- data/lib/graphql/pagination/connection.rb +226 -0
- data/lib/graphql/pagination/connections.rb +160 -0
- data/lib/graphql/pagination/mongoid_relation_connection.rb +25 -0
- data/lib/graphql/pagination/relation_connection.rb +226 -0
- data/lib/graphql/pagination/sequel_dataset_connection.rb +28 -0
- data/lib/graphql/pagination.rb +6 -0
- data/lib/graphql/parse_error.rb +0 -1
- data/lib/graphql/query/arguments.rb +6 -4
- data/lib/graphql/query/arguments_cache.rb +1 -2
- data/lib/graphql/query/context.rb +52 -7
- data/lib/graphql/query/executor.rb +0 -1
- data/lib/graphql/query/fingerprint.rb +26 -0
- data/lib/graphql/query/input_validation_result.rb +32 -6
- data/lib/graphql/query/literal_input.rb +31 -11
- data/lib/graphql/query/null_context.rb +24 -8
- data/lib/graphql/query/serial_execution/field_resolution.rb +1 -1
- data/lib/graphql/query/serial_execution.rb +1 -0
- data/lib/graphql/query/validation_pipeline.rb +6 -4
- data/lib/graphql/query/variable_validation_error.rb +3 -3
- data/lib/graphql/query/variables.rb +50 -10
- data/lib/graphql/query.rb +77 -18
- data/lib/graphql/railtie.rb +9 -1
- data/lib/graphql/rake_task/validate.rb +3 -0
- data/lib/graphql/rake_task.rb +12 -9
- data/lib/graphql/relay/array_connection.rb +10 -12
- data/lib/graphql/relay/base_connection.rb +30 -13
- data/lib/graphql/relay/connection_instrumentation.rb +4 -4
- data/lib/graphql/relay/connection_type.rb +18 -4
- data/lib/graphql/relay/edge_type.rb +1 -0
- data/lib/graphql/relay/edges_instrumentation.rb +1 -2
- data/lib/graphql/relay/global_id_resolve.rb +1 -2
- data/lib/graphql/relay/mutation.rb +3 -87
- data/lib/graphql/relay/node.rb +3 -0
- data/lib/graphql/relay/page_info.rb +1 -1
- data/lib/graphql/relay/range_add.rb +27 -9
- data/lib/graphql/relay/relation_connection.rb +8 -10
- data/lib/graphql/relay/type_extensions.rb +2 -0
- data/lib/graphql/rubocop/graphql/base_cop.rb +36 -0
- data/lib/graphql/rubocop/graphql/default_null_true.rb +43 -0
- data/lib/graphql/rubocop/graphql/default_required_true.rb +43 -0
- data/lib/graphql/rubocop.rb +4 -0
- data/lib/graphql/scalar_type.rb +18 -60
- data/lib/graphql/schema/addition.rb +247 -0
- data/lib/graphql/schema/argument.rb +274 -18
- data/lib/graphql/schema/base_64_encoder.rb +2 -0
- data/lib/graphql/schema/build_from_definition/resolve_map/default_resolve.rb +1 -1
- data/lib/graphql/schema/build_from_definition/resolve_map.rb +13 -5
- data/lib/graphql/schema/build_from_definition.rb +320 -219
- data/lib/graphql/schema/built_in_types.rb +5 -5
- data/lib/graphql/schema/default_type_error.rb +2 -0
- data/lib/graphql/schema/directive/deprecated.rb +18 -0
- data/lib/graphql/schema/directive/feature.rb +1 -1
- data/lib/graphql/schema/directive/flagged.rb +57 -0
- data/lib/graphql/schema/directive/include.rb +2 -2
- data/lib/graphql/schema/directive/skip.rb +2 -2
- data/lib/graphql/schema/directive/transform.rb +14 -2
- data/lib/graphql/schema/directive.rb +130 -6
- data/lib/graphql/schema/enum.rb +121 -12
- data/lib/graphql/schema/enum_value.rb +24 -7
- data/lib/graphql/schema/field/connection_extension.rb +46 -20
- data/lib/graphql/schema/field/scope_extension.rb +1 -1
- data/lib/graphql/schema/field.rb +465 -181
- data/lib/graphql/schema/field_extension.rb +89 -2
- data/lib/graphql/schema/find_inherited_value.rb +17 -1
- data/lib/graphql/schema/finder.rb +16 -14
- data/lib/graphql/schema/input_object.rb +172 -37
- data/lib/graphql/schema/interface.rb +39 -25
- data/lib/graphql/schema/introspection_system.rb +106 -38
- data/lib/graphql/schema/late_bound_type.rb +3 -2
- data/lib/graphql/schema/list.rb +65 -1
- data/lib/graphql/schema/loader.rb +145 -102
- data/lib/graphql/schema/member/accepts_definition.rb +15 -3
- data/lib/graphql/schema/member/base_dsl_methods.rb +34 -28
- data/lib/graphql/schema/member/build_type.rb +19 -8
- data/lib/graphql/schema/member/cached_graphql_definition.rb +34 -2
- data/lib/graphql/schema/member/has_arguments.rb +206 -13
- data/lib/graphql/schema/member/has_ast_node.rb +20 -0
- 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_fields.rb +97 -32
- data/lib/graphql/schema/member/has_interfaces.rb +100 -0
- data/lib/graphql/schema/member/has_unresolved_type_error.rb +15 -0
- data/lib/graphql/schema/member/has_validators.rb +31 -0
- data/lib/graphql/schema/member/instrumentation.rb +0 -1
- data/lib/graphql/schema/member/type_system_helpers.rb +3 -3
- data/lib/graphql/schema/member/validates_input.rb +33 -0
- data/lib/graphql/schema/member.rb +11 -0
- data/lib/graphql/schema/middleware_chain.rb +1 -1
- data/lib/graphql/schema/mutation.rb +4 -0
- data/lib/graphql/schema/non_null.rb +37 -1
- data/lib/graphql/schema/object.rb +51 -38
- data/lib/graphql/schema/possible_types.rb +9 -4
- data/lib/graphql/schema/printer.rb +16 -35
- data/lib/graphql/schema/relay_classic_mutation.rb +40 -4
- data/lib/graphql/schema/resolver/has_payload_type.rb +34 -4
- data/lib/graphql/schema/resolver.rb +133 -79
- data/lib/graphql/schema/scalar.rb +43 -3
- data/lib/graphql/schema/subscription.rb +57 -21
- data/lib/graphql/schema/timeout.rb +29 -15
- data/lib/graphql/schema/timeout_middleware.rb +3 -1
- data/lib/graphql/schema/traversal.rb +2 -2
- data/lib/graphql/schema/type_expression.rb +21 -13
- data/lib/graphql/schema/type_membership.rb +19 -5
- data/lib/graphql/schema/union.rb +44 -3
- data/lib/graphql/schema/unique_within_type.rb +1 -2
- data/lib/graphql/schema/validation.rb +14 -4
- data/lib/graphql/schema/validator/allow_blank_validator.rb +29 -0
- data/lib/graphql/schema/validator/allow_null_validator.rb +26 -0
- data/lib/graphql/schema/validator/exclusion_validator.rb +33 -0
- data/lib/graphql/schema/validator/format_validator.rb +48 -0
- data/lib/graphql/schema/validator/inclusion_validator.rb +35 -0
- data/lib/graphql/schema/validator/length_validator.rb +59 -0
- data/lib/graphql/schema/validator/numericality_validator.rb +82 -0
- data/lib/graphql/schema/validator/required_validator.rb +82 -0
- data/lib/graphql/schema/validator.rb +171 -0
- data/lib/graphql/schema/warden.rb +193 -34
- data/lib/graphql/schema.rb +882 -247
- data/lib/graphql/static_validation/all_rules.rb +2 -0
- data/lib/graphql/static_validation/base_visitor.rb +17 -10
- data/lib/graphql/static_validation/definition_dependencies.rb +0 -1
- data/lib/graphql/static_validation/error.rb +3 -1
- data/lib/graphql/static_validation/literal_validator.rb +51 -26
- data/lib/graphql/static_validation/rules/argument_literals_are_compatible.rb +45 -83
- data/lib/graphql/static_validation/rules/argument_literals_are_compatible_error.rb +22 -6
- data/lib/graphql/static_validation/rules/arguments_are_defined.rb +35 -26
- data/lib/graphql/static_validation/rules/arguments_are_defined_error.rb +4 -2
- data/lib/graphql/static_validation/rules/directives_are_defined.rb +1 -1
- data/lib/graphql/static_validation/rules/directives_are_in_valid_locations.rb +2 -2
- data/lib/graphql/static_validation/rules/fields_are_defined_on_type.rb +4 -4
- data/lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb +5 -5
- data/lib/graphql/static_validation/rules/fields_will_merge.rb +94 -51
- data/lib/graphql/static_validation/rules/fields_will_merge_error.rb +25 -4
- data/lib/graphql/static_validation/rules/fragment_spreads_are_possible.rb +3 -3
- data/lib/graphql/static_validation/rules/fragments_are_finite.rb +2 -2
- data/lib/graphql/static_validation/rules/input_object_names_are_unique.rb +30 -0
- data/lib/graphql/static_validation/rules/input_object_names_are_unique_error.rb +30 -0
- data/lib/graphql/static_validation/rules/query_root_exists.rb +17 -0
- data/lib/graphql/static_validation/rules/query_root_exists_error.rb +26 -0
- data/lib/graphql/static_validation/rules/required_arguments_are_present.rb +4 -2
- data/lib/graphql/static_validation/rules/required_input_object_attributes_are_present.rb +9 -10
- data/lib/graphql/static_validation/rules/unique_directives_per_location.rb +1 -1
- data/lib/graphql/static_validation/rules/variable_default_values_are_correctly_typed.rb +12 -13
- data/lib/graphql/static_validation/rules/variable_usages_are_allowed.rb +19 -14
- data/lib/graphql/static_validation/rules/variables_are_input_types.rb +1 -1
- data/lib/graphql/static_validation/rules/variables_are_used_and_defined.rb +5 -3
- data/lib/graphql/static_validation/type_stack.rb +2 -2
- data/lib/graphql/static_validation/validation_context.rb +13 -3
- data/lib/graphql/static_validation/validation_timeout_error.rb +25 -0
- data/lib/graphql/static_validation/validator.rb +43 -9
- data/lib/graphql/static_validation.rb +1 -0
- data/lib/graphql/string_encoding_error.rb +13 -3
- data/lib/graphql/string_type.rb +1 -1
- data/lib/graphql/subscriptions/action_cable_subscriptions.rb +123 -22
- data/lib/graphql/subscriptions/broadcast_analyzer.rb +81 -0
- data/lib/graphql/subscriptions/default_subscription_resolve_extension.rb +21 -0
- data/lib/graphql/subscriptions/event.rb +84 -30
- data/lib/graphql/subscriptions/instrumentation.rb +10 -6
- data/lib/graphql/subscriptions/serialize.rb +53 -6
- data/lib/graphql/subscriptions/subscription_root.rb +15 -5
- data/lib/graphql/subscriptions.rb +117 -49
- data/lib/graphql/tracing/active_support_notifications_tracing.rb +8 -17
- data/lib/graphql/tracing/appoptics_tracing.rb +173 -0
- data/lib/graphql/tracing/appsignal_tracing.rb +23 -0
- data/lib/graphql/tracing/data_dog_tracing.rb +32 -15
- data/lib/graphql/tracing/new_relic_tracing.rb +9 -12
- data/lib/graphql/tracing/notifications_tracing.rb +59 -0
- data/lib/graphql/tracing/platform_tracing.rb +66 -10
- data/lib/graphql/tracing/prometheus_tracing/graphql_collector.rb +4 -1
- data/lib/graphql/tracing/prometheus_tracing.rb +8 -0
- data/lib/graphql/tracing/scout_tracing.rb +19 -0
- data/lib/graphql/tracing/skylight_tracing.rb +9 -1
- data/lib/graphql/tracing/statsd_tracing.rb +42 -0
- data/lib/graphql/tracing.rb +15 -35
- data/lib/graphql/types/big_int.rb +5 -1
- data/lib/graphql/types/int.rb +10 -3
- data/lib/graphql/types/iso_8601_date.rb +16 -8
- data/lib/graphql/types/iso_8601_date_time.rb +32 -10
- data/lib/graphql/types/relay/base_connection.rb +6 -88
- data/lib/graphql/types/relay/base_edge.rb +2 -34
- data/lib/graphql/types/relay/connection_behaviors.rb +174 -0
- data/lib/graphql/types/relay/default_relay.rb +31 -0
- data/lib/graphql/types/relay/edge_behaviors.rb +64 -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 +3 -22
- data/lib/graphql/types/relay/nodes_field.rb +16 -18
- 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/types/string.rb +8 -2
- data/lib/graphql/unauthorized_error.rb +2 -2
- data/lib/graphql/union_type.rb +5 -25
- data/lib/graphql/unresolved_type_error.rb +2 -2
- 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 +87 -31
- data/readme.md +3 -6
- metadata +126 -124
- data/lib/graphql/execution/interpreter/hash_response.rb +0 -46
- data/lib/graphql/literal_validation_error.rb +0 -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
|
@@ -10,6 +10,7 @@ module GraphQL
|
|
|
10
10
|
#
|
|
11
11
|
# Original Algorithm: https://github.com/graphql/graphql-js/blob/master/src/validation/rules/OverlappingFieldsCanBeMerged.js
|
|
12
12
|
NO_ARGS = {}.freeze
|
|
13
|
+
|
|
13
14
|
Field = Struct.new(:node, :definition, :owner_type, :parents)
|
|
14
15
|
FragmentSpread = Struct.new(:name, :parents)
|
|
15
16
|
|
|
@@ -17,24 +18,47 @@ module GraphQL
|
|
|
17
18
|
super
|
|
18
19
|
@visited_fragments = {}
|
|
19
20
|
@compared_fragments = {}
|
|
21
|
+
@conflict_count = 0
|
|
20
22
|
end
|
|
21
23
|
|
|
22
24
|
def on_operation_definition(node, _parent)
|
|
23
|
-
conflicts_within_selection_set(node, type_definition)
|
|
25
|
+
setting_errors { conflicts_within_selection_set(node, type_definition) }
|
|
24
26
|
super
|
|
25
27
|
end
|
|
26
28
|
|
|
27
29
|
def on_field(node, _parent)
|
|
28
|
-
conflicts_within_selection_set(node, type_definition)
|
|
30
|
+
setting_errors { conflicts_within_selection_set(node, type_definition) }
|
|
29
31
|
super
|
|
30
32
|
end
|
|
31
33
|
|
|
32
34
|
private
|
|
33
35
|
|
|
36
|
+
def field_conflicts
|
|
37
|
+
@field_conflicts ||= Hash.new do |errors, field|
|
|
38
|
+
errors[field] = GraphQL::StaticValidation::FieldsWillMergeError.new(kind: :field, field_name: field)
|
|
39
|
+
end
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
def arg_conflicts
|
|
43
|
+
@arg_conflicts ||= Hash.new do |errors, field|
|
|
44
|
+
errors[field] = GraphQL::StaticValidation::FieldsWillMergeError.new(kind: :argument, field_name: field)
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def setting_errors
|
|
49
|
+
@field_conflicts = nil
|
|
50
|
+
@arg_conflicts = nil
|
|
51
|
+
|
|
52
|
+
yield
|
|
53
|
+
# don't initialize these if they weren't initialized in the block:
|
|
54
|
+
@field_conflicts && @field_conflicts.each_value { |error| add_error(error) }
|
|
55
|
+
@arg_conflicts && @arg_conflicts.each_value { |error| add_error(error) }
|
|
56
|
+
end
|
|
57
|
+
|
|
34
58
|
def conflicts_within_selection_set(node, parent_type)
|
|
35
59
|
return if parent_type.nil?
|
|
36
60
|
|
|
37
|
-
fields, fragment_spreads = fields_and_fragments_from_selection(node, owner_type: parent_type, parents:
|
|
61
|
+
fields, fragment_spreads = fields_and_fragments_from_selection(node, owner_type: parent_type, parents: nil)
|
|
38
62
|
|
|
39
63
|
# (A) Find find all conflicts "within" the fields of this selection set.
|
|
40
64
|
find_conflicts_within(fields)
|
|
@@ -93,8 +117,8 @@ module GraphQL
|
|
|
93
117
|
|
|
94
118
|
return if fragment1.nil? || fragment2.nil?
|
|
95
119
|
|
|
96
|
-
fragment_type1 = context.
|
|
97
|
-
fragment_type2 = context.
|
|
120
|
+
fragment_type1 = context.warden.get_type(fragment1.type.name)
|
|
121
|
+
fragment_type2 = context.warden.get_type(fragment2.type.name)
|
|
98
122
|
|
|
99
123
|
return if fragment_type1.nil? || fragment_type2.nil?
|
|
100
124
|
|
|
@@ -146,7 +170,7 @@ module GraphQL
|
|
|
146
170
|
fragment = context.fragments[fragment_name]
|
|
147
171
|
return if fragment.nil?
|
|
148
172
|
|
|
149
|
-
fragment_type = context.
|
|
173
|
+
fragment_type = context.warden.get_type(fragment.type.name)
|
|
150
174
|
return if fragment_type.nil?
|
|
151
175
|
|
|
152
176
|
fragment_fields, fragment_spreads = fields_and_fragments_from_selection(fragment, owner_type: fragment_type, parents: [*fragment_spread.parents, fragment_type])
|
|
@@ -174,15 +198,21 @@ module GraphQL
|
|
|
174
198
|
response_keys.each do |key, fields|
|
|
175
199
|
next if fields.size < 2
|
|
176
200
|
# find conflicts within nodes
|
|
177
|
-
|
|
178
|
-
|
|
201
|
+
i = 0
|
|
202
|
+
while i < fields.size
|
|
203
|
+
j = i + 1
|
|
204
|
+
while j < fields.size
|
|
179
205
|
find_conflict(key, fields[i], fields[j])
|
|
206
|
+
j += 1
|
|
180
207
|
end
|
|
208
|
+
i += 1
|
|
181
209
|
end
|
|
182
210
|
end
|
|
183
211
|
end
|
|
184
212
|
|
|
185
213
|
def find_conflict(response_key, field1, field2, mutually_exclusive: false)
|
|
214
|
+
return if @conflict_count >= context.max_errors
|
|
215
|
+
|
|
186
216
|
node1 = field1.node
|
|
187
217
|
node2 = field2.node
|
|
188
218
|
|
|
@@ -191,27 +221,21 @@ module GraphQL
|
|
|
191
221
|
|
|
192
222
|
if !are_mutually_exclusive
|
|
193
223
|
if node1.name != node2.name
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
field_name: response_key,
|
|
201
|
-
conflicts: errored_nodes
|
|
202
|
-
)
|
|
224
|
+
conflict = field_conflicts[response_key]
|
|
225
|
+
|
|
226
|
+
conflict.add_conflict(node1, node1.name)
|
|
227
|
+
conflict.add_conflict(node2, node2.name)
|
|
228
|
+
|
|
229
|
+
@conflict_count += 1
|
|
203
230
|
end
|
|
204
231
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
field_name: response_key,
|
|
213
|
-
conflicts: args.map { |arg| GraphQL::Language.serialize(arg) }.join(" or ")
|
|
214
|
-
)
|
|
232
|
+
if !same_arguments?(node1, node2)
|
|
233
|
+
conflict = arg_conflicts[response_key]
|
|
234
|
+
|
|
235
|
+
conflict.add_conflict(node1, GraphQL::Language.serialize(serialize_field_args(node1)))
|
|
236
|
+
conflict.add_conflict(node2, GraphQL::Language.serialize(serialize_field_args(node2)))
|
|
237
|
+
|
|
238
|
+
@conflict_count += 1
|
|
215
239
|
end
|
|
216
240
|
end
|
|
217
241
|
|
|
@@ -223,7 +247,9 @@ module GraphQL
|
|
|
223
247
|
end
|
|
224
248
|
|
|
225
249
|
def find_conflicts_between_sub_selection_sets(field1, field2, mutually_exclusive:)
|
|
226
|
-
return if field1.definition.nil? ||
|
|
250
|
+
return if field1.definition.nil? ||
|
|
251
|
+
field2.definition.nil? ||
|
|
252
|
+
(field1.node.selections.empty? && field2.node.selections.empty?)
|
|
227
253
|
|
|
228
254
|
return_type1 = field1.definition.type.unwrap
|
|
229
255
|
return_type2 = field2.definition.type.unwrap
|
|
@@ -303,6 +329,7 @@ module GraphQL
|
|
|
303
329
|
if node.selections.empty?
|
|
304
330
|
NO_SELECTIONS
|
|
305
331
|
else
|
|
332
|
+
parents ||= []
|
|
306
333
|
fields, fragment_spreads = find_fields_and_fragments(node.selections, owner_type: owner_type, parents: parents, fields: [], fragment_spreads: [])
|
|
307
334
|
response_keys = fields.group_by { |f| f.node.alias || f.node.name }
|
|
308
335
|
[response_keys, fragment_spreads]
|
|
@@ -313,10 +340,10 @@ module GraphQL
|
|
|
313
340
|
selections.each do |node|
|
|
314
341
|
case node
|
|
315
342
|
when GraphQL::Language::Nodes::Field
|
|
316
|
-
definition = context.
|
|
343
|
+
definition = context.query.get_field(owner_type, node.name)
|
|
317
344
|
fields << Field.new(node, definition, owner_type, parents)
|
|
318
345
|
when GraphQL::Language::Nodes::InlineFragment
|
|
319
|
-
fragment_type = node.type ? context.
|
|
346
|
+
fragment_type = node.type ? context.warden.get_type(node.type.name) : owner_type
|
|
320
347
|
find_fields_and_fragments(node.selections, parents: [*parents, fragment_type], owner_type: owner_type, fields: fields, fragment_spreads: fragment_spreads) if fragment_type
|
|
321
348
|
when GraphQL::Language::Nodes::FragmentSpread
|
|
322
349
|
fragment_spreads << FragmentSpread.new(node.name, parents)
|
|
@@ -326,20 +353,19 @@ module GraphQL
|
|
|
326
353
|
[fields, fragment_spreads]
|
|
327
354
|
end
|
|
328
355
|
|
|
329
|
-
def
|
|
356
|
+
def same_arguments?(field1, field2)
|
|
330
357
|
# Check for incompatible / non-identical arguments on this node:
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
end.uniq
|
|
358
|
+
arguments1 = field1.arguments
|
|
359
|
+
arguments2 = field2.arguments
|
|
360
|
+
|
|
361
|
+
return false if arguments1.length != arguments2.length
|
|
362
|
+
|
|
363
|
+
arguments1.all? do |argument1|
|
|
364
|
+
argument2 = arguments2.find { |argument| argument.name == argument1.name }
|
|
365
|
+
return false if argument2.nil?
|
|
366
|
+
|
|
367
|
+
serialize_arg(argument1.value) == serialize_arg(argument2.value)
|
|
368
|
+
end
|
|
343
369
|
end
|
|
344
370
|
|
|
345
371
|
def serialize_arg(arg_value)
|
|
@@ -353,6 +379,14 @@ module GraphQL
|
|
|
353
379
|
end
|
|
354
380
|
end
|
|
355
381
|
|
|
382
|
+
def serialize_field_args(field)
|
|
383
|
+
serialized_args = {}
|
|
384
|
+
field.arguments.each do |argument|
|
|
385
|
+
serialized_args[argument.name] = serialize_arg(argument.value)
|
|
386
|
+
end
|
|
387
|
+
serialized_args
|
|
388
|
+
end
|
|
389
|
+
|
|
356
390
|
def compared_fragments_key(frag1, frag2, exclusive)
|
|
357
391
|
# Cache key to not compare two fragments more than once.
|
|
358
392
|
# The key includes both fragment names sorted (this way we
|
|
@@ -365,17 +399,26 @@ module GraphQL
|
|
|
365
399
|
# In this context, `parents` represends the "self scope" of the field,
|
|
366
400
|
# what types may be found at this point in the query.
|
|
367
401
|
def mutually_exclusive?(parents1, parents2)
|
|
368
|
-
parents1.
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
402
|
+
if parents1.empty? || parents2.empty?
|
|
403
|
+
false
|
|
404
|
+
elsif parents1.length == parents2.length
|
|
405
|
+
parents1.length.times.any? do |i|
|
|
406
|
+
type1 = parents1[i - 1]
|
|
407
|
+
type2 = parents2[i - 1]
|
|
408
|
+
if type1 == type2
|
|
409
|
+
# If the types we're comparing are the same type,
|
|
410
|
+
# then they aren't mutually exclusive
|
|
411
|
+
false
|
|
412
|
+
else
|
|
413
|
+
# Check if these two scopes have _any_ types in common.
|
|
414
|
+
possible_right_types = context.query.possible_types(type1)
|
|
415
|
+
possible_left_types = context.query.possible_types(type2)
|
|
416
|
+
(possible_right_types & possible_left_types).empty?
|
|
374
417
|
end
|
|
375
418
|
end
|
|
419
|
+
else
|
|
420
|
+
true
|
|
376
421
|
end
|
|
377
|
-
|
|
378
|
-
false
|
|
379
422
|
end
|
|
380
423
|
end
|
|
381
424
|
end
|
|
@@ -3,12 +3,33 @@ module GraphQL
|
|
|
3
3
|
module StaticValidation
|
|
4
4
|
class FieldsWillMergeError < StaticValidation::Error
|
|
5
5
|
attr_reader :field_name
|
|
6
|
-
attr_reader :
|
|
6
|
+
attr_reader :kind
|
|
7
|
+
|
|
8
|
+
def initialize(kind:, field_name:)
|
|
9
|
+
super(nil)
|
|
7
10
|
|
|
8
|
-
def initialize(message, path: nil, nodes: [], field_name:, conflicts:)
|
|
9
|
-
super(message, path: path, nodes: nodes)
|
|
10
11
|
@field_name = field_name
|
|
11
|
-
@
|
|
12
|
+
@kind = kind
|
|
13
|
+
@conflicts = []
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def message
|
|
17
|
+
"Field '#{field_name}' has #{kind == :argument ? 'an' : 'a'} #{kind} conflict: #{conflicts}?"
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
def path
|
|
21
|
+
[]
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
def conflicts
|
|
25
|
+
@conflicts.join(' or ')
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
def add_conflict(node, conflict_str)
|
|
29
|
+
return if nodes.include?(node)
|
|
30
|
+
|
|
31
|
+
@nodes << node
|
|
32
|
+
@conflicts << conflict_str
|
|
12
33
|
end
|
|
13
34
|
|
|
14
35
|
# A hash representation of this Message
|
|
@@ -50,12 +50,12 @@ module GraphQL
|
|
|
50
50
|
if child_types.none? { |c| parent_types.include?(c) }
|
|
51
51
|
name = node.respond_to?(:name) ? " #{node.name}" : ""
|
|
52
52
|
add_error(GraphQL::StaticValidation::FragmentSpreadsArePossibleError.new(
|
|
53
|
-
"Fragment#{name} on #{child_type.
|
|
53
|
+
"Fragment#{name} on #{child_type.graphql_name} can't be spread inside #{parent_type.graphql_name}",
|
|
54
54
|
nodes: node,
|
|
55
55
|
path: path,
|
|
56
56
|
fragment_name: name.empty? ? "unknown" : name,
|
|
57
|
-
type: child_type.
|
|
58
|
-
parent: parent_type.
|
|
57
|
+
type: child_type.graphql_name,
|
|
58
|
+
parent: parent_type.graphql_name
|
|
59
59
|
))
|
|
60
60
|
end
|
|
61
61
|
end
|
|
@@ -7,12 +7,12 @@ module GraphQL
|
|
|
7
7
|
dependency_map = context.dependencies
|
|
8
8
|
dependency_map.cyclical_definitions.each do |defn|
|
|
9
9
|
if defn.node.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
|
|
10
|
-
|
|
10
|
+
add_error(GraphQL::StaticValidation::FragmentsAreFiniteError.new(
|
|
11
11
|
"Fragment #{defn.name} contains an infinite loop",
|
|
12
12
|
nodes: defn.node,
|
|
13
13
|
path: defn.path,
|
|
14
14
|
name: defn.name
|
|
15
|
-
)
|
|
15
|
+
))
|
|
16
16
|
end
|
|
17
17
|
end
|
|
18
18
|
end
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
module GraphQL
|
|
3
|
+
module StaticValidation
|
|
4
|
+
module InputObjectNamesAreUnique
|
|
5
|
+
def on_input_object(node, parent)
|
|
6
|
+
validate_input_fields(node)
|
|
7
|
+
super
|
|
8
|
+
end
|
|
9
|
+
|
|
10
|
+
private
|
|
11
|
+
|
|
12
|
+
def validate_input_fields(node)
|
|
13
|
+
input_field_defns = node.arguments
|
|
14
|
+
input_fields_by_name = Hash.new { |h, k| h[k] = [] }
|
|
15
|
+
input_field_defns.each { |a| input_fields_by_name[a.name] << a }
|
|
16
|
+
|
|
17
|
+
input_fields_by_name.each do |name, defns|
|
|
18
|
+
if defns.size > 1
|
|
19
|
+
error = GraphQL::StaticValidation::InputObjectNamesAreUniqueError.new(
|
|
20
|
+
"There can be only one input field named \"#{name}\"",
|
|
21
|
+
nodes: defns,
|
|
22
|
+
name: name
|
|
23
|
+
)
|
|
24
|
+
add_error(error)
|
|
25
|
+
end
|
|
26
|
+
end
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
end
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
module GraphQL
|
|
3
|
+
module StaticValidation
|
|
4
|
+
class InputObjectNamesAreUniqueError < StaticValidation::Error
|
|
5
|
+
attr_reader :name
|
|
6
|
+
|
|
7
|
+
def initialize(message, path: nil, nodes: [], name:)
|
|
8
|
+
super(message, path: path, nodes: nodes)
|
|
9
|
+
@name = name
|
|
10
|
+
end
|
|
11
|
+
|
|
12
|
+
# A hash representation of this Message
|
|
13
|
+
def to_h
|
|
14
|
+
extensions = {
|
|
15
|
+
"code" => code,
|
|
16
|
+
"name" => name
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
super.merge({
|
|
20
|
+
"extensions" => extensions
|
|
21
|
+
})
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
def code
|
|
25
|
+
"inputFieldNotUnique"
|
|
26
|
+
end
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
module GraphQL
|
|
3
|
+
module StaticValidation
|
|
4
|
+
module QueryRootExists
|
|
5
|
+
def on_operation_definition(node, _parent)
|
|
6
|
+
if (node.operation_type == 'query' || node.operation_type.nil?) && context.warden.root_type_for_operation("query").nil?
|
|
7
|
+
add_error(GraphQL::StaticValidation::QueryRootExistsError.new(
|
|
8
|
+
'Schema is not configured for queries',
|
|
9
|
+
nodes: node
|
|
10
|
+
))
|
|
11
|
+
else
|
|
12
|
+
super
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
end
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
module GraphQL
|
|
3
|
+
module StaticValidation
|
|
4
|
+
class QueryRootExistsError < StaticValidation::Error
|
|
5
|
+
|
|
6
|
+
def initialize(message, path: nil, nodes: [])
|
|
7
|
+
super(message, path: path, nodes: nodes)
|
|
8
|
+
end
|
|
9
|
+
|
|
10
|
+
# A hash representation of this Message
|
|
11
|
+
def to_h
|
|
12
|
+
extensions = {
|
|
13
|
+
"code" => code,
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
super.merge({
|
|
17
|
+
"extensions" => extensions
|
|
18
|
+
})
|
|
19
|
+
end
|
|
20
|
+
|
|
21
|
+
def code
|
|
22
|
+
"missingQueryConfiguration"
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
end
|
|
26
|
+
end
|
|
@@ -8,7 +8,7 @@ module GraphQL
|
|
|
8
8
|
end
|
|
9
9
|
|
|
10
10
|
def on_directive(node, _parent)
|
|
11
|
-
directive_defn = context.
|
|
11
|
+
directive_defn = context.schema_directives[node.name]
|
|
12
12
|
assert_required_args(node, directive_defn)
|
|
13
13
|
super
|
|
14
14
|
end
|
|
@@ -16,9 +16,11 @@ module GraphQL
|
|
|
16
16
|
private
|
|
17
17
|
|
|
18
18
|
def assert_required_args(ast_node, defn)
|
|
19
|
+
args = defn.arguments(context.query.context)
|
|
20
|
+
return if args.empty?
|
|
19
21
|
present_argument_names = ast_node.arguments.map(&:name)
|
|
20
22
|
required_argument_names = context.warden.arguments(defn)
|
|
21
|
-
.select { |a| a.type.kind.non_null? && !a.default_value? }
|
|
23
|
+
.select { |a| a.type.kind.non_null? && !a.default_value? && context.warden.get_argument(defn, a.name) }
|
|
22
24
|
.map(&:name)
|
|
23
25
|
|
|
24
26
|
missing_names = required_argument_names - present_argument_names
|
|
@@ -23,11 +23,10 @@ module GraphQL
|
|
|
23
23
|
defn = if arg_defn && arg_defn.type.unwrap.kind.input_object?
|
|
24
24
|
arg_defn.type.unwrap
|
|
25
25
|
else
|
|
26
|
-
context.field_definition
|
|
26
|
+
context.directive_definition || context.field_definition
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
-
parent_type = context.warden.
|
|
30
|
-
.find{|f| f.name == parent_name(parent, defn) }
|
|
29
|
+
parent_type = context.warden.get_argument(defn, parent_name(parent, defn))
|
|
31
30
|
parent_type ? parent_type.type.unwrap : nil
|
|
32
31
|
end
|
|
33
32
|
|
|
@@ -35,21 +34,21 @@ module GraphQL
|
|
|
35
34
|
parent_type = get_parent_type(context, parent)
|
|
36
35
|
return unless parent_type && parent_type.kind.input_object?
|
|
37
36
|
|
|
38
|
-
required_fields =
|
|
39
|
-
.select{|
|
|
40
|
-
.
|
|
37
|
+
required_fields = context.warden.arguments(parent_type)
|
|
38
|
+
.select{|arg| arg.type.kind.non_null?}
|
|
39
|
+
.map(&:graphql_name)
|
|
41
40
|
|
|
42
41
|
present_fields = ast_node.arguments.map(&:name)
|
|
43
42
|
missing_fields = required_fields - present_fields
|
|
44
43
|
|
|
45
44
|
missing_fields.each do |missing_field|
|
|
46
45
|
path = [*context.path, missing_field]
|
|
47
|
-
missing_field_type = parent_type
|
|
46
|
+
missing_field_type = context.warden.get_argument(parent_type, missing_field).type
|
|
48
47
|
add_error(RequiredInputObjectAttributesArePresentError.new(
|
|
49
|
-
"Argument '#{missing_field}' on InputObject '#{parent_type}' is required. Expected type #{missing_field_type}",
|
|
48
|
+
"Argument '#{missing_field}' on InputObject '#{parent_type.to_type_signature}' is required. Expected type #{missing_field_type.to_type_signature}",
|
|
50
49
|
argument_name: missing_field,
|
|
51
|
-
argument_type: missing_field_type.
|
|
52
|
-
input_object_type: parent_type.
|
|
50
|
+
argument_type: missing_field_type.to_type_signature,
|
|
51
|
+
input_object_type: parent_type.to_type_signature,
|
|
53
52
|
path: path,
|
|
54
53
|
nodes: ast_node,
|
|
55
54
|
))
|
|
@@ -40,7 +40,7 @@ module GraphQL
|
|
|
40
40
|
nodes: [used_directives[directive_name], ast_directive],
|
|
41
41
|
directive: directive_name,
|
|
42
42
|
))
|
|
43
|
-
|
|
43
|
+
elsif !((dir_defn = context.schema_directives[directive_name]) && dir_defn.repeatable?)
|
|
44
44
|
used_directives[directive_name] = ast_directive
|
|
45
45
|
end
|
|
46
46
|
end
|
|
@@ -13,27 +13,26 @@ module GraphQL
|
|
|
13
13
|
error_type: VariableDefaultValuesAreCorrectlyTypedError::VIOLATIONS[:INVALID_ON_NON_NULL]
|
|
14
14
|
))
|
|
15
15
|
else
|
|
16
|
-
type = context.schema.type_from_ast(node.type)
|
|
16
|
+
type = context.schema.type_from_ast(node.type, context: context)
|
|
17
17
|
if type.nil?
|
|
18
18
|
# This is handled by another validator
|
|
19
19
|
else
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
20
|
+
validation_result = context.validate_literal(value, type)
|
|
21
|
+
|
|
22
|
+
if !validation_result.valid?
|
|
23
|
+
problems = validation_result.problems
|
|
24
|
+
first_problem = problems && problems.first
|
|
25
|
+
if first_problem
|
|
26
|
+
error_message = first_problem["message"]
|
|
27
|
+
end
|
|
27
28
|
|
|
28
|
-
|
|
29
|
-
error_message ||= "Default value for $#{node.name} doesn't match type #{type}"
|
|
30
|
-
VariableDefaultValuesAreCorrectlyTypedError
|
|
29
|
+
error_message ||= "Default value for $#{node.name} doesn't match type #{type.to_type_signature}"
|
|
31
30
|
add_error(GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTypedError.new(
|
|
32
31
|
error_message,
|
|
33
32
|
nodes: node,
|
|
34
33
|
name: node.name,
|
|
35
|
-
type: type.
|
|
36
|
-
error_type: VariableDefaultValuesAreCorrectlyTypedError::VIOLATIONS[:INVALID_TYPE]
|
|
34
|
+
type: type.to_type_signature,
|
|
35
|
+
error_type: VariableDefaultValuesAreCorrectlyTypedError::VIOLATIONS[:INVALID_TYPE],
|
|
37
36
|
))
|
|
38
37
|
end
|
|
39
38
|
end
|
|
@@ -22,15 +22,15 @@ module GraphQL
|
|
|
22
22
|
node_values = node_values.select { |value| value.is_a? GraphQL::Language::Nodes::VariableIdentifier }
|
|
23
23
|
|
|
24
24
|
if node_values.any?
|
|
25
|
-
|
|
25
|
+
argument_owner = case parent
|
|
26
26
|
when GraphQL::Language::Nodes::Field
|
|
27
|
-
context.field_definition
|
|
27
|
+
context.field_definition
|
|
28
28
|
when GraphQL::Language::Nodes::Directive
|
|
29
|
-
context.directive_definition
|
|
29
|
+
context.directive_definition
|
|
30
30
|
when GraphQL::Language::Nodes::InputObject
|
|
31
31
|
arg_type = context.argument_definition.type.unwrap
|
|
32
|
-
if arg_type.
|
|
33
|
-
|
|
32
|
+
if arg_type.kind.input_object?
|
|
33
|
+
arg_type
|
|
34
34
|
else
|
|
35
35
|
# This is some kind of error
|
|
36
36
|
nil
|
|
@@ -43,7 +43,7 @@ module GraphQL
|
|
|
43
43
|
var_defn_ast = @declared_variables[node_value.name]
|
|
44
44
|
# Might be undefined :(
|
|
45
45
|
# VariablesAreUsedAndDefined can't finalize its search until the end of the document.
|
|
46
|
-
var_defn_ast &&
|
|
46
|
+
var_defn_ast && argument_owner && validate_usage(argument_owner, node, var_defn_ast)
|
|
47
47
|
end
|
|
48
48
|
end
|
|
49
49
|
super
|
|
@@ -51,24 +51,29 @@ module GraphQL
|
|
|
51
51
|
|
|
52
52
|
private
|
|
53
53
|
|
|
54
|
-
def validate_usage(
|
|
55
|
-
var_type = context.schema.type_from_ast(ast_var.type)
|
|
54
|
+
def validate_usage(argument_owner, arg_node, ast_var)
|
|
55
|
+
var_type = context.schema.type_from_ast(ast_var.type, context: context)
|
|
56
56
|
if var_type.nil?
|
|
57
57
|
return
|
|
58
58
|
end
|
|
59
59
|
if !ast_var.default_value.nil?
|
|
60
|
-
unless var_type.
|
|
60
|
+
unless var_type.kind.non_null?
|
|
61
61
|
# If the value is required, but the argument is not,
|
|
62
62
|
# and yet there's a non-nil default, then we impliclty
|
|
63
63
|
# make the argument also a required type.
|
|
64
|
-
|
|
65
|
-
var_type = GraphQL::NonNullType.new(of_type: var_type)
|
|
64
|
+
var_type = var_type.to_non_null_type
|
|
66
65
|
end
|
|
67
66
|
end
|
|
68
67
|
|
|
69
|
-
arg_defn =
|
|
68
|
+
arg_defn = context.warden.get_argument(argument_owner, arg_node.name)
|
|
70
69
|
arg_defn_type = arg_defn.type
|
|
71
70
|
|
|
71
|
+
# If the argument is non-null, but it was given a default value,
|
|
72
|
+
# then treat it as nullable in practice, see https://github.com/rmosolgo/graphql-ruby/issues/3793
|
|
73
|
+
if arg_defn_type.non_null? && arg_defn.default_value?
|
|
74
|
+
arg_defn_type = arg_defn_type.of_type
|
|
75
|
+
end
|
|
76
|
+
|
|
72
77
|
var_inner_type = var_type.unwrap
|
|
73
78
|
arg_inner_type = arg_defn_type.unwrap
|
|
74
79
|
|
|
@@ -85,10 +90,10 @@ module GraphQL
|
|
|
85
90
|
|
|
86
91
|
def create_error(error_message, var_type, ast_var, arg_defn, arg_node)
|
|
87
92
|
add_error(GraphQL::StaticValidation::VariableUsagesAreAllowedError.new(
|
|
88
|
-
"#{error_message} on variable $#{ast_var.name} and argument #{arg_node.name} (#{var_type.
|
|
93
|
+
"#{error_message} on variable $#{ast_var.name} and argument #{arg_node.name} (#{var_type.to_type_signature} / #{arg_defn.type.to_type_signature})",
|
|
89
94
|
nodes: arg_node,
|
|
90
95
|
name: ast_var.name,
|
|
91
|
-
type: var_type.
|
|
96
|
+
type: var_type.to_type_signature,
|
|
92
97
|
argument: arg_node.name,
|
|
93
98
|
error: error_message
|
|
94
99
|
))
|
|
@@ -15,7 +15,7 @@ module GraphQL
|
|
|
15
15
|
))
|
|
16
16
|
elsif !type.kind.input?
|
|
17
17
|
add_error(GraphQL::StaticValidation::VariablesAreInputTypesError.new(
|
|
18
|
-
"#{type.
|
|
18
|
+
"#{type.graphql_name} isn't a valid input type (on $#{node.name})",
|
|
19
19
|
nodes: node,
|
|
20
20
|
name: node.name,
|
|
21
21
|
type: type_name
|