Ignore fields without complexity directive in directiveEstimator #15

Author: ivome

src/QueryComplexity.ts

@@ -195,7 +195,7 @@ export default class QueryComplexity {
               const validScore = this.estimators.find(estimator => {
                 const tmpComplexity = estimator(estimatorArgs);
 
-                if (typeof tmpComplexity === 'number') {
+                if (typeof tmpComplexity === 'number' && !isNaN(tmpComplexity)) {
                   nodeComplexity = tmpComplexity;
                   return true;
                 }
@@ -205,7 +205,7 @@ export default class QueryComplexity {
               if (!validScore) {
                 return this.context.reportError(
                   new GraphQLError(
-                    `No complexity could be calculated for field ${typeDef.astNode}.${field.name}. ` +
+                    `No complexity could be calculated for field ${typeDef.name}.${field.name}. ` +
                     'At least one complexity estimator has to return a complexity score.'
                   )
                 );

src/__tests__/QueryComplexity-test.ts

@@ -258,7 +258,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(context.getErrors().length).to.equal(1);
     expect(context.getErrors()[0].message).to.equal(
-      'No complexity could be calculated for field undefined.scalar. ' +
+      'No complexity could be calculated for field Query.scalar. ' +
       'At least one complexity estimator has to return a complexity score.'
     );
   });
@@ -279,7 +279,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(context.getErrors().length).to.equal(1);
     expect(context.getErrors()[0].message).to.equal(
-      'No complexity could be calculated for field undefined.scalar. ' +
+      'No complexity could be calculated for field Query.scalar. ' +
       'At least one complexity estimator has to return a complexity score.'
     );
   });

src/estimators/directive/__tests__/directiveEstimator-test.ts

@@ -223,4 +223,26 @@ describe('directiveEstimator analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(10);
   });
+
+  it('ignores fields without compexity directive', () => {
+    const ast = parse(`
+      query {
+        noDirective
+      }
+    `);
+
+    const context = new ValidationContext(schema, ast, typeInfo);
+    const visitor = new ComplexityVisitor(context, {
+      maximumComplexity: 100,
+      estimators: [
+        directiveEstimator()
+      ]
+    });
+
+    visit(ast, visitWithTypeInfo(typeInfo, visitor));
+    expect(visitor.context.getErrors().length).to.equal(1);
+    expect(visitor.context.getErrors()[0].message).to.include(
+      'No complexity could be calculated for field Query.noDirective',
+    );
+  });
 });

src/estimators/directive/__tests__/fixtures/schema.ts

@@ -22,6 +22,8 @@ type Query {
   negativeCostScalar: String @complexity(value: -20)
   multiDirective: String @cost(value: 1) @complexity(value: 2)
   
+  noDirective: Boolean
+  
   childList(
     limit: Int, 
     ids: [ID],

src/estimators/directive/index.ts

@@ -30,6 +30,11 @@ export default function (options?: {}): ComplexityEstimator {
   return (args: ComplexityEstimatorArgs) => {
     const values = getDirectiveValues(directive, args.field.astNode);
 
+    // Ignore if no directive set
+    if (!values) {
+      return;
+    }
+
     // Get multipliers
     let totalMultiplier = 1;
     if (values.multipliers) {