Using direct imports in test files (#2060)

graphql · Jul 29, 2019 · e67f2e5 · e67f2e5
1 parent 5c9946b
commit e67f2e5
Show file tree

Hide file tree

Showing 60 changed files with 264 additions and 233 deletions.
diff --git a/src/__tests__/starWarsSchema.js b/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';
 

diff --git a/src/error/__tests__/GraphQLError-test.js b/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`
   {

diff --git a/src/execution/__tests__/abstract-promise-test.js b/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;

diff --git a/src/execution/__tests__/abstract-test.js b/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;

diff --git a/src/execution/__tests__/directives-test.js b/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';
 

diff --git a/src/execution/__tests__/executor-test.js b/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';
 

diff --git a/src/execution/__tests__/lists-test.js b/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';
 

diff --git a/src/execution/__tests__/mutations-test.js b/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';
 

diff --git a/src/execution/__tests__/nonnull-test.js b/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';

diff --git a/src/execution/__tests__/resolve-test.js b/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) {

diff --git a/src/execution/__tests__/schema-test.js b/src/execution/__tests__/schema-test.js
@@ -3,18 +3,20 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
+import { parse } from '../../language/parser';
 
+import { GraphQLSchema } from '../../type/schema';
 import {
-  GraphQLSchema,
-  GraphQLObjectType,
   GraphQLList,
   GraphQLNonNull,
+  GraphQLObjectType,
+} from '../../type/definition';
+import {
+  GraphQLID,
   GraphQLInt,
   GraphQLString,
   GraphQLBoolean,
-  GraphQLID,
-} from '../../type';
+} from '../../type/scalars';
 
 import { execute } from '../execute';
 

diff --git a/src/execution/__tests__/sync-test.js b/src/execution/__tests__/sync-test.js
@@ -3,9 +3,14 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
+import { parse } from '../../language/parser';
+
 import { validate } from '../../validation/validate';
-import { GraphQLSchema, GraphQLObjectType, GraphQLString } from '../../type';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString } from '../../type/scalars';
+import { GraphQLObjectType } from '../../type/definition';
+
 import { graphqlSync } from '../../graphql';
 
 import { execute } from '../execute';

diff --git a/src/execution/__tests__/union-interface-test.js b/src/execution/__tests__/union-interface-test.js
@@ -3,16 +3,16 @@
 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, GraphQLBoolean } from '../../type/scalars';
 import {
-  GraphQLSchema,
+  GraphQLList,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
-  GraphQLList,
-  GraphQLString,
-  GraphQLBoolean,
-} from '../../type';
+} from '../../type/definition';
 
 import { execute } from '../execute';
 

diff --git a/src/execution/__tests__/variables-test.js b/src/execution/__tests__/variables-test.js
@@ -5,17 +5,18 @@ import { describe, it } from 'mocha';
 
 import inspect from '../../jsutils/inspect';
 
-import { parse } from '../../language';
+import { parse } from '../../language/parser';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLString } from '../../type/scalars';
 import {
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLInputObjectType,
   GraphQLList,
-  GraphQLString,
   GraphQLNonNull,
   GraphQLScalarType,
+  GraphQLObjectType,
+  GraphQLInputObjectType,
   GraphQLEnumType,
-} from '../../type';
+} from '../../type/definition';
 
 import { execute } from '../execute';
 

diff --git a/src/language/__tests__/lexer-test.js b/src/language/__tests__/lexer-test.js
@@ -8,7 +8,7 @@ import { describe, it } from 'mocha';
 import dedent from '../../jsutils/dedent';
 import inspect from '../../jsutils/inspect';
 
-import { GraphQLError } from '../../error';
+import { GraphQLError } from '../../error/GraphQLError';
 
 import { Source } from '../source';
 import { TokenKind } from '../tokenKind';

diff --git a/src/language/__tests__/printLocation-test.js b/src/language/__tests__/printLocation-test.js
@@ -5,8 +5,7 @@ import { describe, it } from 'mocha';
 
 import dedent from '../../jsutils/dedent';
 
-import { Source } from '../../language';
-
+import { Source } from '../source';
 import { printSourceLocation } from '../printLocation';
 
 describe('printSourceLocation', () => {

diff --git a/src/language/__tests__/visitor-test.js b/src/language/__tests__/visitor-test.js
@@ -3,7 +3,7 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { getNamedType, isCompositeType } from '../../type';
+import { getNamedType, isCompositeType } from '../../type/definition';
 import { TypeInfo } from '../../utilities/TypeInfo';
 
 import { Kind } from '../kinds';

diff --git a/src/subscription/__tests__/subscribe-test.js b/src/subscription/__tests__/subscribe-test.js
@@ -5,16 +5,13 @@ import EventEmitter from 'events';
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { parse } from '../../language';
-import { GraphQLError } from '../../error';
-import {
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLList,
-  GraphQLBoolean,
-  GraphQLInt,
-  GraphQLString,
-} from '../../type';
+import { parse } from '../../language/parser';
+
+import { GraphQLError } from '../../error/GraphQLError';
+
+import { GraphQLSchema } from '../../type/schema';
+import { GraphQLList, GraphQLObjectType } from '../../type/definition';
+import { GraphQLInt, GraphQLString, GraphQLBoolean } from '../../type/scalars';
 
 import { createSourceEventStream, subscribe } from '../subscribe';
 

diff --git a/src/type/__tests__/directive-test.js b/src/type/__tests__/directive-test.js
@@ -3,7 +3,8 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { GraphQLDirective, GraphQLString, GraphQLInt } from '../';
+import { GraphQLDirective } from '../directives';
+import { GraphQLString, GraphQLInt } from '../scalars';
 
 describe('Type System: Directive', () => {
   it('defines a directive with no args', () => {

diff --git a/src/type/__tests__/enumType-test.js b/src/type/__tests__/enumType-test.js
@@ -3,16 +3,12 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import {
-  graphqlSync,
-  GraphQLSchema,
-  GraphQLEnumType,
-  GraphQLObjectType,
-  GraphQLInt,
-  GraphQLString,
-  GraphQLBoolean,
-  introspectionFromSchema,
-} from '../../';
+import { graphqlSync } from '../../graphql';
+import { introspectionFromSchema } from '../../utilities/introspectionFromSchema';
+
+import { GraphQLSchema } from '../schema';
+import { GraphQLEnumType, GraphQLObjectType } from '../definition';
+import { GraphQLInt, GraphQLString, GraphQLBoolean } from '../scalars';
 
 const ColorType = new GraphQLEnumType({
   name: 'Color',