Skip to content

validation: Simplify 'ValuesOfCorrectType' rule #2158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2019
Merged

validation: Simplify 'ValuesOfCorrectType' rule #2158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 36 additions & 37 deletions src/validation/rules/ValuesOfCorrectType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import suggestionList from '../../jsutils/suggestionList';

import { GraphQLError } from '../../error/GraphQLError';

import { type ValueNode } from '../../language/ast';
import { Kind } from '../../language/kinds';
import { print } from '../../language/printer';
import { type ValueNode } from '../../language/ast';
import { type ASTVisitor } from '../../language/visitor';

import {
Expand Down Expand Up @@ -76,27 +77,19 @@ export function unknownFieldMessage(
*/
export function ValuesOfCorrectType(context: ValidationContext): ASTVisitor {
return {
NullValue(node) {
const type = context.getInputType();
if (isNonNullType(type)) {
context.reportError(
new GraphQLError(badValueMessage(inspect(type), print(node)), node),
);
}
},
ListValue(node) {
// Note: TypeInfo will traverse into a list's item type, so look to the
// parent input type to check if it is a list.
const type = getNullableType(context.getParentInputType());
if (!isListType(type)) {
isValidScalar(context, node);
isValidValueNode(context, node);
return false; // Don't traverse further.
}
},
ObjectValue(node) {
const type = getNamedType(context.getInputType());
if (!isInputObjectType(type)) {
isValidScalar(context, node);
isValidValueNode(context, node);
return false; // Don't traverse further.
}
// Ensure every required field exists.
Expand Down Expand Up @@ -130,35 +123,27 @@ export function ValuesOfCorrectType(context: ValidationContext): ASTVisitor {
);
}
},
EnumValue(node) {
const type = getNamedType(context.getInputType());
if (!isEnumType(type)) {
isValidScalar(context, node);
} else if (!type.getValue(node.value)) {
NullValue(node) {
const type = context.getInputType();
if (isNonNullType(type)) {
context.reportError(
new GraphQLError(
badEnumValueMessage(
type.name,
print(node),
enumTypeSuggestion(type, node),
),
node,
),
new GraphQLError(badValueMessage(inspect(type), print(node)), node),
);
}
},
IntValue: node => isValidScalar(context, node),
FloatValue: node => isValidScalar(context, node),
StringValue: node => isValidScalar(context, node),
BooleanValue: node => isValidScalar(context, node),
EnumValue: node => isValidValueNode(context, node),
IntValue: node => isValidValueNode(context, node),
FloatValue: node => isValidValueNode(context, node),
StringValue: node => isValidValueNode(context, node),
BooleanValue: node => isValidValueNode(context, node),
};
}

/**
* Any value literal may be a valid representation of a Scalar, depending on
* that scalar type.
*/
function isValidScalar(context: ValidationContext, node: ValueNode): void {
function isValidValueNode(context: ValidationContext, node: ValueNode): void {
// Report any error at the full type expected by the location.
const locationType = context.getInputType();
if (!locationType) {
Expand All @@ -167,15 +152,29 @@ function isValidScalar(context: ValidationContext, node: ValueNode): void {

const type = getNamedType(locationType);

if (isEnumType(type)) {
if (node.kind !== Kind.ENUM || !type.getValue(node.value)) {
context.reportError(
new GraphQLError(
badEnumValueMessage(
type.name,
print(node),
enumTypeSuggestion(type, node),
),
node,
),
);
}
return;
}

if (!isScalarType(type)) {
const message = isEnumType(type)
? badEnumValueMessage(
inspect(locationType),
print(node),
enumTypeSuggestion(type, node),
)
: badValueMessage(inspect(locationType), print(node));
context.reportError(new GraphQLError(message, node));
context.reportError(
new GraphQLError(
badValueMessage(inspect(locationType), print(node)),
node,
),
);
return;
}

Expand Down