Skip to content

Commit

Permalink
Validate directive arguments
Browse files Browse the repository at this point in the history
Fix #110

Argument validation was assuming field arguments which led to spurious error.
  • Loading branch information
leebyron committed Aug 7, 2015
1 parent bd94446 commit 742bfa4
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 12 deletions.
27 changes: 26 additions & 1 deletion src/validation/__tests__/KnownArgumentNames.js
Expand Up @@ -10,7 +10,7 @@
import { describe, it } from 'mocha';
import { expectPassesRule, expectFailsRule } from './harness';
import KnownArgumentNames from '../rules/KnownArgumentNames';
import { unknownArgMessage } from '../errors';
import { unknownArgMessage, unknownDirectiveArgMessage } from '../errors';

function unknownArg(argName, fieldName, typeName, line, column) {
return {
Expand All @@ -19,6 +19,13 @@ function unknownArg(argName, fieldName, typeName, line, column) {
};
}

function unknownDirectiveArg(argName, directiveName, line, column) {
return {
message: unknownDirectiveArgMessage(argName, directiveName),
locations: [ { line, column } ],
};
}

describe('Validate: Known argument names', () => {

it('single arg is known', () => {
Expand Down Expand Up @@ -78,6 +85,24 @@ describe('Validate: Known argument names', () => {
`);
});

it('directive args are known', () => {
expectPassesRule(KnownArgumentNames, `
{
dog @skip(if: true)
}
`);
});

it('undirective args are invalid', () => {
expectFailsRule(KnownArgumentNames, `
{
dog @skip(unless: true)
}
`, [
unknownDirectiveArg('unless', 'skip', 3, 19),
]);
});

it('invalid arg name', () => {
expectFailsRule(KnownArgumentNames, `
fragment invalidArgName on Dog {
Expand Down
4 changes: 4 additions & 0 deletions src/validation/errors.js
Expand Up @@ -50,6 +50,10 @@ export function unknownArgMessage(argName, fieldName, typeName) {
`of type ${typeName}.`;
}

export function unknownDirectiveArgMessage(argName, fieldName) {
return `Unknown argument ${argName} on directive ${fieldName}.`;
}

export function unknownTypeMessage(typeName) {
return `Unknown type ${typeName}.`;
}
Expand Down
46 changes: 35 additions & 11 deletions src/validation/rules/KnownArgumentNames.js
Expand Up @@ -10,7 +10,7 @@

import type { ValidationContext } from '../index';
import { GraphQLError } from '../../error';
import { unknownArgMessage } from '../errors';
import { unknownArgMessage, unknownDirectiveArgMessage } from '../errors';
import invariant from '../../jsutils/invariant';
import find from '../../jsutils/find';

Expand All @@ -23,17 +23,41 @@ import find from '../../jsutils/find';
*/
export default function KnownArgumentNames(context: ValidationContext): any {
return {
Argument(node) {
var fieldDef = context.getFieldDef();
if (fieldDef) {
var argDef = find(fieldDef.args, arg => arg.name === node.name.value);
if (!argDef) {
var parentType = context.getParentType();
invariant(parentType);
return new GraphQLError(
unknownArgMessage(node.name.value, fieldDef.name, parentType.name),
[node]
Argument(node, key, parent, path, ancestors) {
var argumentOf = ancestors[ancestors.length - 1];
if (argumentOf.kind === 'Field') {
var fieldDef = context.getFieldDef();
if (fieldDef) {
var fieldArgDef = find(
fieldDef.args,
arg => arg.name === node.name.value
);
if (!fieldArgDef) {
var parentType = context.getParentType();
invariant(parentType);
return new GraphQLError(
unknownArgMessage(
node.name.value,
fieldDef.name,
parentType.name
),
[node]
);
}
}
} else if (argumentOf.kind === 'Directive') {
var directive = context.getDirective();
if (directive) {
var directiveArgDef = find(
directive.args,
arg => arg.name === node.name.value
);
if (!directiveArgDef) {
return new GraphQLError(
unknownDirectiveArgMessage(node.name.value, directive.name),
[node]
);
}
}
}
}
Expand Down

0 comments on commit 742bfa4

Please sign in to comment.