Skip to content

Scoped support include/skip #2

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.

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

Open
wants to merge 3 commits into
base: scoped-master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@500px/graphql-query-complexity",
"version": "0.4.1",
"version": "0.5.0-rc2",
"description": "Validation rule for GraphQL query complexity analysis",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
33 changes: 32 additions & 1 deletion src/QueryComplexity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@

import {
getArgumentValues,
getDirectiveValues,
} from 'graphql/execution/values';

import {
ValidationContext,
FragmentDefinitionNode,
OperationDefinitionNode,
DirectiveNode,
FieldNode,
FragmentSpreadNode,
InlineFragmentNode,
assertCompositeType,
GraphQLField, isCompositeType, GraphQLCompositeType, GraphQLFieldMap,
GraphQLSchema, DocumentNode, TypeInfo,
visit, visitWithTypeInfo
visit, visitWithTypeInfo,
GraphQLDirective,
} from 'graphql';
import {
GraphQLUnionType,
Expand Down Expand Up @@ -102,6 +105,8 @@ export default class QueryComplexity {
options: QueryComplexityOptions;
OperationDefinition: Object;
estimators: Array<ComplexityEstimator>;
includeDirectiveDef: GraphQLDirective;
skipDirectiveDef: GraphQLDirective;

constructor(
context: ValidationContext,
Expand All @@ -115,6 +120,9 @@ export default class QueryComplexity {
this.complexity = 0;
this.options = options;

this.includeDirectiveDef = this.context.getSchema().getDirective('include');
this.skipDirectiveDef = this.context.getSchema().getDirective('skip');

if (!options.estimators) {
console.warn(
'DEPRECATION WARNING: Estimators should be configured in the queryComplexity options.'
Expand Down Expand Up @@ -183,6 +191,29 @@ export default class QueryComplexity {
(total: number, childNode: FieldNode | FragmentSpreadNode | InlineFragmentNode) => {
let nodeComplexity = 0;

let includeNode = true;
let skipNode = false;

childNode.directives.forEach((directive: DirectiveNode) => {
const directiveName = directive.name.value;
switch (directiveName) {
case 'include': {
const values = getDirectiveValues(this.includeDirectiveDef, childNode, this.options.variables || {});
includeNode = values.if;
break;
}
case 'skip': {
const values = getDirectiveValues(this.skipDirectiveDef, childNode, this.options.variables || {});
skipNode = values.if;
break;
}
}
});

if (!includeNode || skipNode) {
return total;
}

switch (childNode.kind) {
case Kind.FIELD: {
const field = fields[childNode.name.value];
Expand Down
87 changes: 86 additions & 1 deletion src/__tests__/QueryComplexity-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,91 @@ describe('QueryComplexity analysis', () => {
expect(complexity).to.equal(1);
});

it('should respect @include(if: false)', () => {
const ast = parse(`
query {
variableScalar(count: 10) @include(if: false)
}
`);

const complexity = getComplexity({
estimators: [
simpleEstimator({defaultComplexity: 1})
],
schema,
query: ast
});
expect(complexity).to.equal(0);
});

it('should respect @include(if: true)', () => {
const ast = parse(`
query {
variableScalar(count: 10) @include(if: true)
}
`);

const complexity = getComplexity({
estimators: [
simpleEstimator({defaultComplexity: 1})
],
schema,
query: ast
});
expect(complexity).to.equal(1);
});

it('should respect @skip(if: true)', () => {
const ast = parse(`
query {
variableScalar(count: 10) @skip(if: true)
}
`);

const complexity = getComplexity({
estimators: [
simpleEstimator({defaultComplexity: 1})
],
schema,
query: ast
});
expect(complexity).to.equal(0);
});

it('should respect @skip(if: false)', () => {
const ast = parse(`
query {
variableScalar(count: 10) @skip(if: false)
}
`);

const complexity = getComplexity({
estimators: [
simpleEstimator({defaultComplexity: 1})
],
schema,
query: ast
});
expect(complexity).to.equal(1);
});

it('should respect @skip(if: false) @include(if: true)', () => {
const ast = parse(`
query {
variableScalar(count: 10) @skip(if: false) @include(if: true)
}
`);

const complexity = getComplexity({
estimators: [
simpleEstimator({defaultComplexity: 1})
],
schema,
query: ast
});
expect(complexity).to.equal(1);
});

it('should calculate complexity with variables', () => {
const ast = parse(`
query Q($count: Int) {
Expand Down Expand Up @@ -341,7 +426,7 @@ describe('QueryComplexity analysis', () => {
});
expect(Number.isNaN(complexity)).to.equal(true);
});

it('should skip complexity calculation by directiveEstimator when no astNode available on field', () => {
const ast = parse(`
query {
Expand Down