Merge branch 'Piefayth-required-args'

Author: ivome

src/QueryComplexity.js

@@ -138,7 +138,12 @@ export default class QueryComplexity {
               const fieldType = getNamedType(field.type);
 
               // Get arguments
-              const args = getArgumentValues(field, childNode, this.options.variables || {});
+              let args;
+              try {
+                args = getArgumentValues(field, childNode, this.options.variables || {});
+              } catch (e) {
+                return this.context.reportError(e);
+              }
 
               // Check if we have child complexity
               let childComplexity = 0;

src/__tests__/QueryComplexity-test.js

@@ -20,7 +20,7 @@ import ComplexityVisitor from '../QueryComplexity';
 
 describe('QueryComplexity analysis', () => {
   const typeInfo = new TypeInfo(schema);
-  
+
   it('should consider default scalar cost', () => {
     const ast = parse(`
       query {
@@ -36,7 +36,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(1);
   });
-  
+
   it('should consider custom scalar cost', () => {
     const ast = parse(`
       query {
@@ -52,7 +52,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(20);
   });
-  
+
   it('should consider variable scalar cost', () => {
     const ast = parse(`
       query {
@@ -68,7 +68,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(1000);
   });
-  
+
   it('should not allow negative cost', () => {
     const ast = parse(`
       query {
@@ -84,7 +84,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(0);
   });
-  
+
   it('should report error above threshold', () => {
     const ast = parse(`
       query {
@@ -104,7 +104,7 @@ describe('QueryComplexity analysis', () => {
       'The query exceeds the maximum complexity of 100. Actual complexity is 1000'
     );
   });
-  
+
   it('should add inline fragments', () => {
     const ast = parse(`
       query {
@@ -124,14 +124,14 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(52);
   });
-  
+
   it('should add fragments', () => {
     const ast = parse(`
       query {
         scalar
         ...QueryFragment
       }
-      
+
       fragment QueryFragment on Query {
         variableScalar(count: 2)
       }
@@ -145,7 +145,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(21);
   });
-  
+
   it('should add complexity for union types', () => {
     const ast = parse(`
       query {
@@ -166,7 +166,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(22);
   });
-  
+
   it('should add complexity for interface types', () => {
     const ast = parse(`
       query {
@@ -187,7 +187,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(3);
   });
-  
+
   it('should add complexity for inline fragments without type condition', () => {
     const ast = parse(`
       query {
@@ -207,7 +207,7 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(2);
   });
-  
+
   it('should add complexity for enum types', () => {
     const ast = parse(`
       query {
@@ -223,4 +223,19 @@ describe('QueryComplexity analysis', () => {
     visit(ast, visitWithTypeInfo(typeInfo, visitor));
     expect(visitor.complexity).to.equal(1);
   });
+
+  it('should error on a missing non-null argument', () => {
+    const ast = parse(`
+        query {
+            requiredArgs
+        }
+      `);
+    const context = new ValidationContext(schema, ast, typeInfo);
+    const visitor = new ComplexityVisitor(context, {
+      maximumComplexity: 100
+    });
+    visit(ast, visitWithTypeInfo(typeInfo, visitor));
+    expect(context.getErrors().length).to.equal(1);
+    expect(context.getErrors()[0].message).to.equal('Argument "count" of required type "Int!" was not provided.');
+  });
 });

src/__tests__/fixtures/schema.js

@@ -119,6 +119,14 @@ const Query = new GraphQLObjectType({
       type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Item))),
       resolve: () => [],
     },
+    requiredArgs: {
+      type: Item,
+      args: {
+        count: {
+          type: new GraphQLNonNull(GraphQLInt)
+        }
+      }
+    }
   }),
 });