Skip to content

[validation] Allow differing directives. #230

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
Nov 13, 2015
Merged

[validation] Allow differing directives. #230

Show file tree
Hide file tree
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
72 changes: 12 additions & 60 deletions src/validation/__tests__/OverlappingFieldsCanBeMerged.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,18 @@ describe('Validate: Overlapping fields can be merged', () => {
`);
});

it('different skip/include directives accepted', () => {
// Note: Differing skip/include directives don't create an ambiguous return
// value and are acceptable in conditions where differing runtime values
// may have the same desired effect of including or skipping a field.
expectPassesRule(OverlappingFieldsCanBeMerged, `
fragment differentDirectivesWithDifferentAliases on Dog {
name @include(if: true)
name @include(if: false)
}
`);
});

it('Same aliases with different field targets', () => {
expectFailsRule(OverlappingFieldsCanBeMerged, `
fragment sameAliasesWithDifferentFieldTargets on Dog {
Expand Down Expand Up @@ -191,66 +203,6 @@ describe('Validate: Overlapping fields can be merged', () => {
`);
});

it('conflicting directives', () => {
expectFailsRule(OverlappingFieldsCanBeMerged, `
fragment conflictingDirectiveArgs on Dog {
name @include(if: true)
name @skip(if: false)
}
`, [
{ message: fieldsConflictMessage(
'name',
'they have differing directives'
),
locations: [ { line: 3, column: 9 }, { line: 4, column: 9 } ] }
]);
});

it('conflicting directive args', () => {
expectFailsRule(OverlappingFieldsCanBeMerged, `
fragment conflictingDirectiveArgs on Dog {
name @include(if: true)
name @include(if: false)
}
`, [
{ message: fieldsConflictMessage(
'name',
'they have differing directives'
),
locations: [ { line: 3, column: 9 }, { line: 4, column: 9 } ] }
]);
});

it('conflicting args with matching directives', () => {
expectFailsRule(OverlappingFieldsCanBeMerged, `
fragment conflictingArgsWithMatchingDirectiveArgs on Dog {
doesKnowCommand(dogCommand: SIT) @include(if: true)
doesKnowCommand(dogCommand: HEEL) @include(if: true)
}
`, [
{ message: fieldsConflictMessage(
'doesKnowCommand',
'they have differing arguments'
),
locations: [ { line: 3, column: 9 }, { line: 4, column: 9 } ] }
]);
});

it('conflicting directives with matching args', () => {
expectFailsRule(OverlappingFieldsCanBeMerged, `
fragment conflictingDirectiveArgsWithMatchingArgs on Dog {
doesKnowCommand(dogCommand: SIT) @include(if: true)
doesKnowCommand(dogCommand: SIT) @skip(if: false)
}
`, [
{ message: fieldsConflictMessage(
'doesKnowCommand',
'they have differing directives'
),
locations: [ { line: 3, column: 9 }, { line: 4, column: 9 } ] }
]);
});

it('encounters conflict in fragments', () => {
expectFailsRule(OverlappingFieldsCanBeMerged, `
{
Expand Down
31 changes: 0 additions & 31 deletions src/validation/rules/OverlappingFieldsCanBeMerged.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import type {
SelectionSet,
Field,
Argument,
Directive
} from '../../language/ast';
import { FIELD, INLINE_FRAGMENT, FRAGMENT_SPREAD } from '../../language/kinds';
import { print } from '../../language/printer';
Expand Down Expand Up @@ -136,14 +135,6 @@ export function OverlappingFieldsCanBeMerged(context: ValidationContext): any {
];
}

if (!sameDirectives(ast1.directives || [], ast2.directives || [])) {
return [
[ responseName, 'they have differing directives' ],
[ ast1 ],
[ ast2 ]
];
}

var selectionSet1 = ast1.selectionSet;
var selectionSet2 = ast2.selectionSet;
if (selectionSet1 && selectionSet2) {
Expand Down Expand Up @@ -209,28 +200,6 @@ type ConflictReason = [ string, ConflictReasonMessage ];
// Reason is a string, or a nested list of conflicts.
type ConflictReasonMessage = string | Array<ConflictReason>;

function sameDirectives(
directives1: Array<Directive>,
directives2: Array<Directive>
): boolean {
if (directives1.length !== directives2.length) {
return false;
}
return directives1.every(directive1 => {
var directive2 = find(
directives2,
directive => directive.name.value === directive1.name.value
);
if (!directive2) {
return false;
}
return sameArguments(
directive1.arguments || [],
directive2.arguments || []
);
});
}

function sameArguments(
arguments1: Array<Argument>,
arguments2: Array<Argument>
Expand Down