Commit a39f6c0

committed

Add fallback for missing child complexity in simple estimator

1 parent a940f94 commit a39f6c0Copy full SHA for a39f6c0

File tree

+51

-1

lines changed

+51

-1

lines changed

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import {`
`12`	`12`	`GraphQLEnumType,`
`13`	`13`	`GraphQLUnionType,`
`14`	`14`	`GraphQLInterfaceType,`
	`15`	`+ GraphQLScalarType,`
`15`	`16`	`} from 'graphql';`
`16`	`17`
`17`	`18`	`const Item: GraphQLObjectType = new GraphQLObjectType({`
`@@ -70,6 +71,28 @@ const Union = new GraphQLUnionType({`
`70`	`71`	`resolveType: () => Item,`
`71`	`72`	`});`
`72`	`73`
	`74`	`+const ErrorThrower = new GraphQLObjectType({`
	`75`	`+ name: 'ErrorType',`
	`76`	`+ fields: {`
	`77`	`+ errorScalar: {`
	`78`	`+ type: new GraphQLObjectType({`
	`79`	`+ name: 'ErrorScalar',`
	`80`	`+ fields: { irrelevant: { type: GraphQLString } },`
	`81`	`+ }),`
	`82`	`+ args: {`
	`83`	`+ throws: {`
	`84`	`+ type: new GraphQLScalarType({`
	`85`	`+ name: 'Throws',`
	`86`	`+ parseValue() {`
	`87`	`+ throw new Error('Scalar parse error');`
	`88`	`+ },`
	`89`	`+ }),`
	`90`	`+ },`
	`91`	`+ },`
	`92`	`+ },`
	`93`	`+ },`
	`94`	`+});`
	`95`	`+`
`73`	`96`	`const Query = new GraphQLObjectType({`
`74`	`97`	`name: 'Query',`
`75`	`98`	`fields: () => ({`
`@@ -111,6 +134,9 @@ const Query = new GraphQLObjectType({`
`111`	`134`	`},`
`112`	`135`	`},`
`113`	`136`	`},`
	`137`	`+ errorThrower: {`
	`138`	`+ type: ErrorThrower,`
	`139`	`+ },`
`114`	`140`	`}),`
`115`	`141`	`});`
`116`	`142`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -210,4 +210,25 @@ describe('simple estimator', () => {`
`210`	`210`	`visit(ast, visitWithTypeInfo(typeInfo, visitor));`
`211`	`211`	`expect(visitor.complexity).to.equal(1);`
`212`	`212`	`});`
	`213`	`+`
	`214`	`+ it('should fall back on default complexity when child complexity cannot be computed', () => {`
	`215`	+ const ast = parse(`
	`216`	`+ query {`
	`217`	`+ errorThrower {`
	`218`	`+ errorScalar(throws: "an error") {`
	`219`	`+ irrelevant`
	`220`	`+ }`
	`221`	`+ }`
	`222`	`+ }`
	`223`	+ `);
	`224`	`+`
	`225`	`+ const context = new CompatibleValidationContext(schema, ast, typeInfo);`
	`226`	`+ const visitor = new ComplexityVisitor(context, {`
	`227`	`+ maximumComplexity: 100,`
	`228`	`+ estimators: [simpleEstimator({ defaultComplexity: 1 })],`
	`229`	`+ });`
	`230`	`+`
	`231`	`+ visit(ast, visitWithTypeInfo(typeInfo, visitor));`
	`232`	`+ expect(visitor.complexity).to.equal(1);`
	`233`	`+ });`
`213`	`234`	`});`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ export default function (options?: {`
`11`	`11`	`? options.defaultComplexity`
`12`	`12`	`: 1;`
`13`	`13`	`return (args: ComplexityEstimatorArgs): number \| void => {`
`14`		`- return defaultComplexity + args.childComplexity;`
	`14`	`+ const { childComplexity } = args;`
	`15`	`+ return (`
	`16`	`+ defaultComplexity + (Number.isNaN(childComplexity) ? 0 : childComplexity)`
	`17`	`+ );`
`15`	`18`	`};`
`16`	`19`	`}`

Comments

(0)