Added 'executeSync': promise free version of execute. (#2671)

Fixes #2610
graphql · Jun 22, 2020 · 8f3d09b · 8f3d09b
1 parent 9735ac7
commit 8f3d09b
Show file tree

Hide file tree

Showing 18 changed files with 162 additions and 147 deletions.
diff --git a/src/execution/__tests__/abstract-test.js b/src/execution/__tests__/abstract-test.js
@@ -5,6 +5,8 @@ import { describe, it } from 'mocha';
 
 import invariant from '../../jsutils/invariant';
 
+import { parse } from '../../language/parser';
+
 import { GraphQLSchema } from '../../type/schema';
 import { GraphQLString, GraphQLBoolean } from '../../type/scalars';
 import {
@@ -14,7 +16,7 @@ import {
   GraphQLUnionType,
 } from '../../type/definition';
 
-import { graphqlSync } from '../../graphql';
+import { executeSync } from '../execute';
 
 class Dog {
   name: string;
@@ -88,7 +90,7 @@ describe('Execute: Handles execution of abstract types', () => {
       types: [CatType, DogType],
     });
 
-    const query = `
+    const document = parse(`
       {
         pets {
           name
@@ -100,11 +102,9 @@ describe('Execute: Handles execution of abstract types', () => {
           }
         }
       }
-    `;
-
-    const result = graphqlSync({ schema, source: query });
+    `);
 
-    expect(result).to.deep.equal({
+    expect(executeSync({ schema, document })).to.deep.equal({
       data: {
         pets: [
           {
@@ -158,7 +158,7 @@ describe('Execute: Handles execution of abstract types', () => {
       }),
     });
 
-    const query = `{
+    const document = parse(`{
       pets {
         ... on Dog {
           name
@@ -169,11 +169,9 @@ describe('Execute: Handles execution of abstract types', () => {
           meows
         }
       }
-    }`;
+    }`);
 
-    const result = graphqlSync({ schema, source: query });
-
-    expect(result).to.deep.equal({
+    expect(executeSync({ schema, document })).to.deep.equal({
       data: {
         pets: [
           {
@@ -256,7 +254,7 @@ describe('Execute: Handles execution of abstract types', () => {
       types: [CatType, DogType],
     });
 
-    const query = `
+    const document = parse(`
       {
         pets {
           name
@@ -268,9 +266,9 @@ describe('Execute: Handles execution of abstract types', () => {
           }
         }
       }
-    `;
+    `);
 
-    const result = graphqlSync({ schema, source: query });
+    const result = executeSync({ schema, document });
 
     expect(result).to.deep.equal({
       data: {
@@ -359,7 +357,7 @@ describe('Execute: Handles execution of abstract types', () => {
       }),
     });
 
-    const query = `
+    const document = parse(`
       {
         pets {
           ... on Dog {
@@ -372,9 +370,9 @@ describe('Execute: Handles execution of abstract types', () => {
           }
         }
       }
-    `;
+    `);
 
-    const result = graphqlSync({ schema, source: query });
+    const result = executeSync({ schema, document });
 
     expect(result).to.deep.equal({
       data: {
@@ -430,9 +428,9 @@ describe('Execute: Handles execution of abstract types', () => {
       types: [fooObject],
     });
 
-    const result = graphqlSync({ schema, source: '{ foo { bar } }' });
+    const document = parse('{ foo { bar } }');
 
-    expect(result).to.deep.equal({
+    expect(executeSync({ schema, document })).to.deep.equal({
       data: { foo: null },
       errors: [
         {
@@ -470,9 +468,9 @@ describe('Execute: Handles execution of abstract types', () => {
       types: [fooObject],
     });
 
-    const result = graphqlSync({ schema, source: '{ foo { bar } }' });
+    const document = parse('{ foo { bar } }');
 
-    expect(result).to.deep.equal({
+    expect(executeSync({ schema, document })).to.deep.equal({
       data: { foo: null },
       errors: [
         {
@@ -538,7 +536,7 @@ describe('Execute: Handles execution of abstract types', () => {
       types: [CatType, DogType],
     });
 
-    const query = `
+    const document = parse(`
       {
         pets {
           name
@@ -550,11 +548,9 @@ describe('Execute: Handles execution of abstract types', () => {
           }
         }
       }
-    `;
+    `);
 
-    const result = graphqlSync({ schema, source: query });
-
-    expect(result).to.deep.equal({
+    expect(executeSync({ schema, document })).to.deep.equal({
       data: {
         pets: [
           {

diff --git a/src/execution/__tests__/directives-test.js b/src/execution/__tests__/directives-test.js
@@ -9,7 +9,8 @@ import { GraphQLSchema } from '../../type/schema';
 import { GraphQLString } from '../../type/scalars';
 import { GraphQLObjectType } from '../../type/definition';
 
-import { execute } from '../execute';
+import type { ExecutionResult } from '../execute';
+import { executeSync } from '../execute';
 
 const schema = new GraphQLSchema({
   query: new GraphQLObjectType({
@@ -30,9 +31,9 @@ const rootValue = {
   },
 };
 
-function executeTestQuery(query: string) {
+function executeTestQuery(query: string): ExecutionResult {
   const document = parse(query);
-  return execute({ schema, document, rootValue });
+  return executeSync({ schema, document, rootValue });
 }
 
 describe('Execute: handles directives', () => {