Commit 6e0e3ff

committed

Add node to ComplexityEstimatorArgs

1 parent d2fc8b3 commit 6e0e3ffCopy full SHA for 6e0e3ff

File tree

+32

-1

lines changed

+32

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,9 @@ type ComplexityEstimatorArgs = {`
`100`	`100`	`// The GraphQLField that is being evaluated`
`101`	`101`	`field: GraphQLField<any, any>,`
`102`	`102`
	`103`	`+ // The GraphQL node that is being evaluated`
	`104`	`+ node: FieldNode,`
	`105`	`+`
`103`	`106`	`// The input arguments of the field`
`104`	`107`	`args: {[key: string]: any},`
`105`	`108`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import {`
`33`	`33`	`export type ComplexityEstimatorArgs = {`
`34`	`34`	`type: GraphQLCompositeType,`
`35`	`35`	`field: GraphQLField<any, any>,`
	`36`	`+ node: FieldNode,`
`36`	`37`	`args: {[key: string]: any},`
`37`	`38`	`childComplexity: number`
`38`	`39`	`}`
`@@ -250,6 +251,7 @@ export default class QueryComplexity {`
`250`	`251`	`childComplexity,`
`251`	`252`	`args,`
`252`	`253`	`field,`
	`254`	`+ node: childNode,`
`253`	`255`	`type: typeDef`
`254`	`256`	`};`
`255`	`257`	`const validScore = this.estimators.find(estimator => {`

Lines changed: 27 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import {expect} from 'chai';`
`13`	`13`
`14`	`14`	`import schema from './fixtures/schema';`
`15`	`15`
`16`		`-import ComplexityVisitor, {getComplexity} from '../QueryComplexity';`
	`16`	`+import ComplexityVisitor, {getComplexity,ComplexityEstimator} from '../QueryComplexity';`
`17`	`17`	`import {`
`18`	`18`	`simpleEstimator,`
`19`	`19`	`directiveEstimator,`
`@@ -758,4 +758,30 @@ describe('QueryComplexity analysis', () => {`
`758`	`758`	`});`
`759`	`759`	`expect(complexity).to.equal(41); // 1 for interface, 20 * 2 for complexScalar`
`760`	`760`	`});`
	`761`	`+`
	`762`	`+ it('should include the current node in the estimator args', () => {`
	`763`	+ const ast = parse(`
	`764`	`+ query {`
	`765`	`+ nonNullItem {`
	`766`	`+ scalar`
	`767`	`+ complexScalar`
	`768`	`+ variableScalar(count: 10)`
	`769`	`+ }`
	`770`	`+ }`
	`771`	+ `);
	`772`	`+`
	`773`	`+ const fieldCountEstimator: ComplexityEstimator = ({ node }) => {`
	`774`	`+ if (node.selectionSet) {`
	`775`	`+ return 10 * node.selectionSet.selections.length;`
	`776`	`+ }`
	`777`	`+ return 0;`
	`778`	`+ };`
	`779`	`+`
	`780`	`+ const complexity = getComplexity({`
	`781`	`+ estimators: [ fieldCountEstimator ],`
	`782`	`+ schema,`
	`783`	`+ query: ast`
	`784`	`+ });`
	`785`	`+ expect(complexity).to.equal(30); // 3 fields on nonNullItem * 10`
	`786`	`+ });`
`761`	`787`	`});`

Comments

(0)