Using direct imports in test files (#2060)

Author: IvanGoncharov

src/__tests__/starWarsSchema.js

@@ -1,14 +1,14 @@
 // @flow strict
 
+import { GraphQLSchema } from '../type/schema';
+import { GraphQLString } from '../type/scalars';
 import {
+  GraphQLList,
+  GraphQLNonNull,
   GraphQLEnumType,
   GraphQLInterfaceType,
   GraphQLObjectType,
-  GraphQLList,
-  GraphQLNonNull,
-  GraphQLSchema,
-  GraphQLString,
-} from '../type';
+} from '../type/definition';
 
 import { getFriends, getHero, getHuman, getDroid } from './starWarsData';
 

src/error/__tests__/GraphQLError-test.js

@@ -6,14 +6,12 @@ import { describe, it } from 'mocha';
 import dedent from '../../jsutils/dedent';
 import invariant from '../../jsutils/invariant';
 
-import {
-  Kind,
-  parse,
-  Source,
-  GraphQLError,
-  printError,
-  formatError,
-} from '../../';
+import { Kind } from '../../language/kinds';
+import { parse } from '../../language/parser';
+import { Source } from '../../language/source';
+
+import { formatError } from '../formatError';
+import { GraphQLError, printError } from '../GraphQLError';
 
 const source = new Source(dedent`
   {

src/execution/__tests__/abstract-promise-test.js

@@ -3,16 +3,16 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString, GraphQLBoolean } from '../../type/scalars';
 import {
-  graphql,
-  GraphQLSchema,
+  GraphQLList,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
-  GraphQLList,
-  GraphQLString,
-  GraphQLBoolean,
-} from '../../';
+} from '../../type/definition';
+
+import { graphql } from '../../graphql';
 
 class Dog {
   name: string;

src/execution/__tests__/abstract-test.js

@@ -3,16 +3,16 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString, GraphQLBoolean } from '../../type/scalars';
 import {
-  graphqlSync,
-  GraphQLSchema,
+  GraphQLList,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
-  GraphQLList,
-  GraphQLString,
-  GraphQLBoolean,
-} from '../../';
+} from '../../type/definition';
+
+import { graphqlSync } from '../../graphql';
 
 class Dog {
   name: string;

src/execution/__tests__/directives-test.js

@@ -3,8 +3,11 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
-import { GraphQLSchema, GraphQLObjectType, GraphQLString } from '../../type';
+import { parse } from '../../language/parser';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString } from '../../type/scalars';
+import { GraphQLObjectType } from '../../type/definition';
 
 import { execute } from '../execute';
 

src/execution/__tests__/executor-test.js

@@ -6,17 +6,17 @@ import { describe, it } from 'mocha';
 import inspect from '../../jsutils/inspect';
 import invariant from '../../jsutils/invariant';
 
-import { Kind, parse } from '../../language';
+import { Kind } from '../../language/kinds';
+import { parse } from '../../language/parser';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLInt, GraphQLBoolean, GraphQLString } from '../../type/scalars';
 import {
-  GraphQLSchema,
-  GraphQLInterfaceType,
-  GraphQLObjectType,
   GraphQLList,
-  GraphQLBoolean,
-  GraphQLInt,
-  GraphQLString,
   GraphQLNonNull,
-} from '../../type';
+  GraphQLInterfaceType,
+  GraphQLObjectType,
+} from '../../type/definition';
 
 import { execute } from '../execute';
 

src/execution/__tests__/lists-test.js

@@ -3,15 +3,15 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
+import { parse } from '../../language/parser';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString, GraphQLInt } from '../../type/scalars';
 import {
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLString,
-  GraphQLInt,
   GraphQLList,
   GraphQLNonNull,
-} from '../../type';
+  GraphQLObjectType,
+} from '../../type/definition';
 
 import { execute } from '../execute';
 

src/execution/__tests__/mutations-test.js

@@ -3,8 +3,11 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
-import { GraphQLSchema, GraphQLObjectType, GraphQLInt } from '../../type';
+import { parse } from '../../language/parser';
+
+import { GraphQLInt } from '../../type/scalars';
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLObjectType } from '../../type/definition';
 
 import { execute } from '../execute';
 

src/execution/__tests__/nonnull-test.js

@@ -3,13 +3,12 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
-import {
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLString,
-  GraphQLNonNull,
-} from '../../type';
+import { parse } from '../../language/parser';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString } from '../../type/scalars';
+import { GraphQLNonNull, GraphQLObjectType } from '../../type/definition';
+
 import { buildSchema } from '../../utilities/buildASTSchema';
 
 import { execute } from '../execute';

src/execution/__tests__/resolve-test.js

@@ -3,13 +3,11 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import {
-  graphqlSync,
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLString,
-  GraphQLInt,
-} from '../../';
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLObjectType } from '../../type/definition';
+import { GraphQLInt, GraphQLString } from '../../type/scalars';
+
+import { graphqlSync } from '../../graphql';
 
 describe('Execute: resolve function', () => {
   function testSchema(testField) {