Sane executor arguments.

This matches the order of arguments of the main graphql function to the execute function. It also renames some variables to better match how we describe them elsewhere.

Author: leebyron

src/executor/__tests__/directives.js

@@ -34,7 +34,7 @@ var data = {
 };
 
 async function executeTestQuery(doc) {
-  return await execute(schema, data, parse(doc));
+  return await execute(schema, parse(doc), data);
 }
 
 describe('Execute: handles directives', () => {

src/executor/__tests__/executor.js

@@ -136,7 +136,7 @@ describe('Execute: Handles basic execution tasks', () => {
     });
 
     expect(
-      await execute(schema, data, ast, 'Example', { size: 100 })
+      await execute(schema, ast, data, { size: 100 }, 'Example')
     ).to.deep.equal(expected);
   });
 
@@ -167,7 +167,7 @@ describe('Execute: Handles basic execution tasks', () => {
     var schema = new GraphQLSchema({ query: Type });
 
     expect(
-      await execute(schema, null, ast)
+      await execute(schema, ast)
     ).to.deep.equal({
       data: {
         a: 'Apple',
@@ -205,7 +205,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    await execute(schema, data, parse(doc), 'Example', {});
+    await execute(schema, parse(doc), data);
 
     expect(resolvedContext.contextThing).to.equal('thing');
   });
@@ -237,7 +237,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    await execute(schema, null, parse(doc), 'Example', {});
+    await execute(schema, parse(doc));
 
     expect(resolvedArgs.numArg).to.equal(123);
     expect(resolvedArgs.stringArg).to.equal('foo');
@@ -296,7 +296,7 @@ describe('Execute: Handles basic execution tasks', () => {
       }
     };
 
-    let docAst = parse(doc);
+    let ast = parse(doc);
     var schema = new GraphQLSchema({
       query: new GraphQLObjectType({
         name: 'Type',
@@ -314,7 +314,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    var result = await execute(schema, data, docAst);
+    var result = await execute(schema, ast, data);
 
     expect(result.data).to.deep.equal({
       sync: 'sync',
@@ -359,7 +359,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    var result = await execute(schema, data, ast);
+    var result = await execute(schema, ast, data);
 
     expect(result).to.deep.equal({data: {a: 'b'}});
   });
@@ -377,7 +377,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    var result = await execute(schema, data, ast);
+    var result = await execute(schema, ast, data);
 
     expect(result).to.deep.equal({data: {a: 'b'}});
   });
@@ -395,7 +395,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    expect(() => execute(schema, data, ast)).to.throw(
+    expect(() => execute(schema, ast, data)).to.throw(
       'Must provide operation name if query contains multiple operations.'
     );
   });
@@ -419,7 +419,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    var queryResult = await execute(schema, data, ast, 'Q');
+    var queryResult = await execute(schema, ast, data, {}, 'Q');
 
     expect(queryResult).to.deep.equal({data: {a: 'b'}});
   });
@@ -443,7 +443,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    var mutationResult = await execute(schema, data, ast, 'M');
+    var mutationResult = await execute(schema, ast, data, {}, 'M');
 
     expect(mutationResult).to.deep.equal({data: {c: 'd'}});
   });
@@ -475,7 +475,7 @@ describe('Execute: Handles basic execution tasks', () => {
       },
     };
 
-    var docAst = parse(doc);
+    var ast = parse(doc);
     var schema = new GraphQLSchema({
       query: new GraphQLObjectType({
         name: 'Type',
@@ -489,7 +489,7 @@ describe('Execute: Handles basic execution tasks', () => {
       })
     });
 
-    var result = await execute(schema, data, docAst);
+    var result = await execute(schema, ast, data);
 
     expect(result).to.deep.equal({
       data: {
@@ -528,7 +528,7 @@ describe('Execute: Handles basic execution tasks', () => {
       }),
     });
 
-    var queryResult = await execute(schema, data, ast, 'Q');
+    var queryResult = await execute(schema, ast, data, {}, 'Q');
 
     expect(queryResult).to.deep.equal({data: {a: 'b'}});
   });
@@ -553,7 +553,7 @@ describe('Execute: Handles basic execution tasks', () => {
       }),
     });
 
-    var mutationResult = await execute(schema, null, ast);
+    var mutationResult = await execute(schema, ast);
 
     expect(mutationResult).to.deep.equal({
       data: {

src/executor/__tests__/executor_schema.js

@@ -156,7 +156,7 @@ describe('Execute: Handles execution with a complex schema', () => {
     // Note: this is intentionally not validating to ensure appropriate
     // behavior occurs when executing an invalid query.
     return expect(
-      await execute(BlogSchema, null, parse(request))
+      await execute(BlogSchema, parse(request))
     ).to.deep.equal({
       data: {
         feed: [

src/executor/__tests__/lists.js

@@ -50,7 +50,7 @@ function check(testType, testData, expected) {
 
     var ast = parse('{ nest { test } }');
 
-    var response = await execute(schema, data, ast);
+    var response = await execute(schema, ast, data);
     // Formatting errors for ease of test writing.
     var result = response.errors;
     if (response.errors) {

src/executor/__tests__/mutations.js

@@ -129,8 +129,9 @@ describe('Execute: Handles mutation execution ordering', () => {
         theNumber
       }
     }`;
-    var ast = parse(doc);
-    var mutationResult = await execute(schema, new Root(6), ast, 'M');
+
+    var mutationResult = await execute(schema, parse(doc), new Root(6));
+
     return expect(mutationResult).to.deep.equal({
       data: {
         first: {
@@ -152,7 +153,7 @@ describe('Execute: Handles mutation execution ordering', () => {
     });
   });
 
-  it('evaluates mutations correctly in the presense of a failed mutation', () => {
+  it('evaluates mutations correctly in the presense of a failed mutation', async () => {
     var doc = `mutation M {
       first: immediatelyChangeTheNumber(newNumber: 1) {
         theNumber
@@ -173,33 +174,32 @@ describe('Execute: Handles mutation execution ordering', () => {
         theNumber
       }
     }`;
-    var ast = parse(doc);
 
-    return execute(schema, new Root(6), ast, 'M').then(result => {
-      expect(result.data).to.deep.equal({
-        first: {
-          theNumber: 1
-        },
-        second: {
-          theNumber: 2
-        },
-        third: null,
-        fourth: {
-          theNumber: 4
-        },
-        fifth: {
-          theNumber: 5
-        },
-        sixth: null,
-      });
+    var result = await execute(schema, parse(doc), new Root(6));
 
-      expect(result.errors).to.have.length(2);
-      expect(result.errors).to.containSubset([
-        { message: 'Cannot change the number',
-          locations: [ { line: 8, column: 7 } ] },
-        { message: 'Cannot change the number',
-          locations: [ { line: 17, column: 7 } ] }
-      ]);
+    expect(result.data).to.deep.equal({
+      first: {
+        theNumber: 1
+      },
+      second: {
+        theNumber: 2
+      },
+      third: null,
+      fourth: {
+        theNumber: 4
+      },
+      fifth: {
+        theNumber: 5
+      },
+      sixth: null,
     });
+
+    expect(result.errors).to.have.length(2);
+    expect(result.errors).to.containSubset([
+      { message: 'Cannot change the number',
+        locations: [ { line: 8, column: 7 } ] },
+      { message: 'Cannot change the number',
+        locations: [ { line: 17, column: 7 } ] }
+    ]);
   });
 });