diff --git a/src/__tests__/starWarsSchema.js b/src/__tests__/starWarsSchema.js index e4650d5ae7..5e6c1d3203 100644 --- 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 index beb12c7a7a..e05f643aa8 100644 --- 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 index 0e057194e8..5080a92a0e 100644 --- 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 index a248b93fb3..047677847b 100644 --- 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 index 18ca401beb..810cd51b68 100644 --- 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 index 4f39b13297..7f84a55c67 100644 --- 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 index e56a209d96..a3a4089be1 100644 --- 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 index 940259eb5e..6e3567cb16 100644 --- 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 index 9186d8a2e4..1dd26ea56f 100644 --- 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 index 8a161331fa..5b3ace2e96 100644 --- 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 index 4017cff7c3..41dcd0ccab 100644 --- 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 index 84d7f0f21b..9c1f0db0ab 100644 --- 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 index 86e6e54c01..ace2a7b8d4 100644 --- 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 index 0a5952d889..17a4fe6f9b 100644 --- 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 index 5161af302a..a9a0ee11a3 100644 --- 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 index 4df39eb7e1..5667035437 100644 --- 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 index 8f8ef2c02f..ccbd333d05 100644 --- 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 index a6363d4eb9..606c7eae35 100644 --- 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 index fd1ea2d02b..ff410b0f30 100644 --- 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 index a125cb7d88..ce107ea185 100644 --- 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', diff --git a/src/type/__tests__/introspection-test.js b/src/type/__tests__/introspection-test.js index 857571e249..592d6efdca 100644 --- a/src/type/__tests__/introspection-test.js +++ b/src/type/__tests__/introspection-test.js @@ -5,17 +5,17 @@ import { describe, it } from 'mocha'; import { missingFieldArgMessage } from '../../validation/rules/ProvidedRequiredArguments'; +import { graphqlSync } from '../../graphql'; +import { getIntrospectionQuery } from '../../utilities/introspectionQuery'; + +import { GraphQLSchema } from '../schema'; +import { GraphQLString } from '../scalars'; import { - graphqlSync, - GraphQLSchema, - GraphQLObjectType, GraphQLList, + GraphQLObjectType, GraphQLInputObjectType, - GraphQLString, GraphQLEnumType, -} from '../../'; - -import { getIntrospectionQuery } from '../../utilities/introspectionQuery'; +} from '../definition'; describe('Introspection', () => { it('executes an introspection query', () => { diff --git a/src/type/__tests__/predicate-test.js b/src/type/__tests__/predicate-test.js index ab50388b22..7e655a7bab 100644 --- a/src/type/__tests__/predicate-test.js +++ b/src/type/__tests__/predicate-test.js @@ -4,12 +4,24 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import { - GraphQLScalarType, - GraphQLBoolean, + GraphQLDirective, + GraphQLSkipDirective, + GraphQLIncludeDirective, + GraphQLDeprecatedDirective, + assertDirective, + isDirective, + isSpecifiedDirective, +} from '../directives'; +import { GraphQLID, GraphQLInt, GraphQLFloat, GraphQLString, + GraphQLBoolean, + isSpecifiedScalarType, +} from '../scalars'; +import { + GraphQLScalarType, GraphQLEnumType, GraphQLInputObjectType, GraphQLInterfaceType, @@ -17,13 +29,8 @@ import { GraphQLUnionType, GraphQLList, GraphQLNonNull, - GraphQLDirective, - GraphQLIncludeDirective, - GraphQLSkipDirective, - GraphQLDeprecatedDirective, isType, isScalarType, - isSpecifiedScalarType, isObjectType, isInterfaceType, isUnionType, @@ -41,8 +48,6 @@ import { isNamedType, isRequiredArgument, isRequiredInputField, - isDirective, - isSpecifiedDirective, assertType, assertScalarType, assertObjectType, @@ -60,10 +65,9 @@ import { assertWrappingType, assertNullableType, assertNamedType, - assertDirective, getNullableType, getNamedType, -} from '../'; +} from '../definition'; const ObjectType = new GraphQLObjectType({ name: 'Object', fields: {} }); const InterfaceType = new GraphQLInterfaceType({ diff --git a/src/type/__tests__/schema-test.js b/src/type/__tests__/schema-test.js index 2cb5a00816..3174624937 100644 --- a/src/type/__tests__/schema-test.js +++ b/src/type/__tests__/schema-test.js @@ -5,20 +5,18 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; +import { printSchema } from '../../utilities/schemaPrinter'; + +import { GraphQLSchema } from '../schema'; +import { GraphQLDirective } from '../directives'; +import { GraphQLInt, GraphQLString, GraphQLBoolean } from '../scalars'; import { - GraphQLSchema, + GraphQLList, GraphQLScalarType, GraphQLObjectType, - GraphQLInt, - GraphQLString, - GraphQLBoolean, GraphQLInterfaceType, GraphQLInputObjectType, - GraphQLDirective, - GraphQLList, -} from '../'; - -import { printSchema } from '../../utilities/schemaPrinter'; +} from '../definition'; describe('Type System: Schema', () => { it('Define sample schema', () => { diff --git a/src/type/__tests__/serialization-test.js b/src/type/__tests__/serialization-test.js index 3fc16cda3d..a8b636ea55 100644 --- a/src/type/__tests__/serialization-test.js +++ b/src/type/__tests__/serialization-test.js @@ -9,7 +9,7 @@ import { GraphQLFloat, GraphQLString, GraphQLBoolean, -} from '../'; +} from '../scalars'; describe('Type System: Scalar coercion', () => { it('serializes output as Int', () => { diff --git a/src/type/__tests__/validation-test.js b/src/type/__tests__/validation-test.js index d0438f032c..10dcd8453e 100644 --- a/src/type/__tests__/validation-test.js +++ b/src/type/__tests__/validation-test.js @@ -7,21 +7,21 @@ import inspect from '../../jsutils/inspect'; import { parse } from '../../language/parser'; +import { GraphQLSchema } from '../../type/schema'; +import { GraphQLString } from '../../type/scalars'; import { type GraphQLNamedType, type GraphQLInputType, type GraphQLOutputType, - GraphQLSchema, + GraphQLList, + GraphQLNonNull, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType, - GraphQLList, - GraphQLNonNull, - GraphQLString, -} from '../../'; +} from '../../type/definition'; import { extendSchema } from '../../utilities/extendSchema'; import { buildSchema } from '../../utilities/buildASTSchema'; diff --git a/src/utilities/__tests__/astFromValue-test.js b/src/utilities/__tests__/astFromValue-test.js index 0476b99556..862ba46aae 100644 --- a/src/utilities/__tests__/astFromValue-test.js +++ b/src/utilities/__tests__/astFromValue-test.js @@ -4,16 +4,18 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import { - GraphQLEnumType, - GraphQLInputObjectType, - GraphQLList, + GraphQLID, GraphQLInt, GraphQLFloat, GraphQLString, GraphQLBoolean, - GraphQLID, +} from '../../type/scalars'; +import { + GraphQLList, GraphQLNonNull, -} from '../../type'; + GraphQLEnumType, + GraphQLInputObjectType, +} from '../../type/definition'; import { astFromValue } from '../astFromValue'; diff --git a/src/utilities/__tests__/buildASTSchema-benchmark.js b/src/utilities/__tests__/buildASTSchema-benchmark.js index 6a25fafbe3..58f65dd5cf 100644 --- a/src/utilities/__tests__/buildASTSchema-benchmark.js +++ b/src/utilities/__tests__/buildASTSchema-benchmark.js @@ -1,6 +1,6 @@ // @flow strict -import { parse } from '../../'; +import { parse } from '../../language/parser'; import { buildASTSchema } from '../buildASTSchema'; diff --git a/src/utilities/__tests__/buildASTSchema-test.js b/src/utilities/__tests__/buildASTSchema-test.js index fb4d1b6431..abcbd91063 100644 --- a/src/utilities/__tests__/buildASTSchema-test.js +++ b/src/utilities/__tests__/buildASTSchema-test.js @@ -6,28 +6,34 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; import invariant from '../../jsutils/invariant'; -import { parse, print } from '../../language'; import { Kind } from '../../language/kinds'; +import { parse } from '../../language/parser'; +import { print } from '../../language/printer'; +import { validateSchema } from '../../type/validate'; import { assertDirective, + GraphQLSkipDirective, + GraphQLIncludeDirective, + GraphQLDeprecatedDirective, +} from '../../type/directives'; +import { + GraphQLID, + GraphQLInt, + GraphQLFloat, + GraphQLString, + GraphQLBoolean, +} from '../../type/scalars'; +import { assertObjectType, assertInputObjectType, assertEnumType, assertUnionType, assertInterfaceType, assertScalarType, - graphqlSync, - validateSchema, - GraphQLID, - GraphQLInt, - GraphQLFloat, - GraphQLString, - GraphQLBoolean, - GraphQLSkipDirective, - GraphQLIncludeDirective, - GraphQLDeprecatedDirective, -} from '../../'; +} from '../../type/definition'; + +import { graphqlSync } from '../../graphql'; import { printSchema } from '../schemaPrinter'; import { buildASTSchema, buildSchema } from '../buildASTSchema'; diff --git a/src/utilities/__tests__/buildClientSchema-test.js b/src/utilities/__tests__/buildClientSchema-test.js index 370e16a09c..3eca5702fe 100644 --- a/src/utilities/__tests__/buildClientSchema-test.js +++ b/src/utilities/__tests__/buildClientSchema-test.js @@ -5,21 +5,24 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; +import { graphqlSync } from '../../graphql'; + +import { GraphQLSchema } from '../../type/schema'; import { - buildSchema, - printSchema, - graphqlSync, assertEnumType, - GraphQLSchema, GraphQLObjectType, GraphQLEnumType, +} from '../../type/definition'; +import { GraphQLInt, GraphQLFloat, GraphQLString, GraphQLBoolean, GraphQLID, -} from '../../'; +} from '../../type/scalars'; +import { printSchema } from '../schemaPrinter'; +import { buildSchema } from '../buildASTSchema'; import { buildClientSchema } from '../buildClientSchema'; import { introspectionFromSchema } from '../introspectionFromSchema'; diff --git a/src/utilities/__tests__/concatAST-test.js b/src/utilities/__tests__/concatAST-test.js index 8cf8d7f0a9..71b0fa4a02 100644 --- a/src/utilities/__tests__/concatAST-test.js +++ b/src/utilities/__tests__/concatAST-test.js @@ -5,7 +5,9 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; -import { Source, parse, print } from '../../language'; +import { parse } from '../../language/parser'; +import { print } from '../../language/printer'; +import { Source } from '../../language/source'; import { concatAST } from '../concatAST'; diff --git a/src/utilities/__tests__/extendSchema-test.js b/src/utilities/__tests__/extendSchema-test.js index 836effcac5..360cd82d34 100644 --- a/src/utilities/__tests__/extendSchema-test.js +++ b/src/utilities/__tests__/extendSchema-test.js @@ -7,36 +7,42 @@ import dedent from '../../jsutils/dedent'; import invariant from '../../jsutils/invariant'; import { Kind } from '../../language/kinds'; -import { parse, print, DirectiveLocation } from '../../language'; +import { parse } from '../../language/parser'; +import { print } from '../../language/printer'; +import { DirectiveLocation } from '../../language/directiveLocation'; -import { graphqlSync } from '../../'; +import { graphqlSync } from '../../graphql'; +import { GraphQLSchema } from '../../type/schema'; +import { validateSchema } from '../../type/validate'; import { assertDirective, + GraphQLDirective, + specifiedDirectives, +} from '../../type/directives'; +import { + GraphQLID, + GraphQLInt, + GraphQLFloat, + GraphQLString, + GraphQLBoolean, +} from '../../type/scalars'; +import { assertObjectType, assertInputObjectType, assertEnumType, assertUnionType, assertInterfaceType, assertScalarType, - GraphQLSchema, + GraphQLList, + GraphQLNonNull, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, - GraphQLID, - GraphQLInt, - GraphQLFloat, - GraphQLString, - GraphQLBoolean, GraphQLEnumType, GraphQLInputObjectType, - GraphQLNonNull, - GraphQLList, - GraphQLDirective, - validateSchema, - specifiedDirectives, -} from '../../type'; +} from '../../type/definition'; import { printSchema } from '../schemaPrinter'; import { extendSchema } from '../extendSchema'; diff --git a/src/utilities/__tests__/findBreakingChanges-test.js b/src/utilities/__tests__/findBreakingChanges-test.js index 789d71e9a5..56bfc05661 100644 --- a/src/utilities/__tests__/findBreakingChanges-test.js +++ b/src/utilities/__tests__/findBreakingChanges-test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { GraphQLSchema } from '../../type'; +import { GraphQLSchema } from '../../type/schema'; import { GraphQLSkipDirective, GraphQLIncludeDirective, diff --git a/src/utilities/__tests__/findDeprecatedUsages-test.js b/src/utilities/__tests__/findDeprecatedUsages-test.js index d0da589f8d..73a5b4f5ea 100644 --- a/src/utilities/__tests__/findDeprecatedUsages-test.js +++ b/src/utilities/__tests__/findDeprecatedUsages-test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { parse } from '../../language'; +import { parse } from '../../language/parser'; import { buildSchema } from '../buildASTSchema'; import { findDeprecatedUsages } from '../findDeprecatedUsages'; diff --git a/src/utilities/__tests__/getOperationAST-test.js b/src/utilities/__tests__/getOperationAST-test.js index 7ddf293d37..6367eda9a0 100644 --- a/src/utilities/__tests__/getOperationAST-test.js +++ b/src/utilities/__tests__/getOperationAST-test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { parse } from '../../language'; +import { parse } from '../../language/parser'; import { getOperationAST } from '../getOperationAST'; diff --git a/src/utilities/__tests__/getOperationRootType-test.js b/src/utilities/__tests__/getOperationRootType-test.js index d7709be92f..862f35be67 100644 --- a/src/utilities/__tests__/getOperationRootType-test.js +++ b/src/utilities/__tests__/getOperationRootType-test.js @@ -5,13 +5,12 @@ import { describe, it } from 'mocha'; import invariant from '../../jsutils/invariant'; -import { - Kind, - parse, - GraphQLSchema, - GraphQLObjectType, - GraphQLString, -} from '../../'; +import { Kind } from '../../language/kinds'; +import { parse } from '../../language/parser'; + +import { GraphQLSchema } from '../../type/schema'; +import { GraphQLString } from '../../type/scalars'; +import { GraphQLObjectType } from '../../type/definition'; import { getOperationRootType } from '../getOperationRootType'; diff --git a/src/utilities/__tests__/introspectionFromSchema-benchmark.js b/src/utilities/__tests__/introspectionFromSchema-benchmark.js index 517e13a5b0..8aa33d9a60 100644 --- a/src/utilities/__tests__/introspectionFromSchema-benchmark.js +++ b/src/utilities/__tests__/introspectionFromSchema-benchmark.js @@ -1,6 +1,7 @@ // @flow strict -import { execute, parse } from '../../'; +import { parse } from '../../language/parser'; +import { execute } from '../../execution/execute'; import { buildSchema } from '../buildASTSchema'; import { getIntrospectionQuery } from '../introspectionQuery'; diff --git a/src/utilities/__tests__/introspectionFromSchema-test.js b/src/utilities/__tests__/introspectionFromSchema-test.js index 5bd1a18bf8..35df3af544 100644 --- a/src/utilities/__tests__/introspectionFromSchema-test.js +++ b/src/utilities/__tests__/introspectionFromSchema-test.js @@ -5,7 +5,9 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; -import { GraphQLSchema, GraphQLObjectType, GraphQLString } from '../../type'; +import { GraphQLSchema } from '../../type/schema'; +import { GraphQLString } from '../../type/scalars'; +import { GraphQLObjectType } from '../../type/definition'; import { printSchema } from '../schemaPrinter'; import { buildClientSchema } from '../buildClientSchema'; diff --git a/src/utilities/__tests__/isValidLiteralValue-test.js b/src/utilities/__tests__/isValidLiteralValue-test.js index 1f2b30e8a4..2447fb1fb9 100644 --- a/src/utilities/__tests__/isValidLiteralValue-test.js +++ b/src/utilities/__tests__/isValidLiteralValue-test.js @@ -3,8 +3,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { parseValue } from '../../language'; -import { GraphQLInt } from '../../type'; +import { parseValue } from '../../language/parser'; +import { GraphQLInt } from '../../type/scalars'; import { isValidLiteralValue } from '../isValidLiteralValue'; diff --git a/src/utilities/__tests__/schemaPrinter-test.js b/src/utilities/__tests__/schemaPrinter-test.js index f937483953..850e47f94f 100644 --- a/src/utilities/__tests__/schemaPrinter-test.js +++ b/src/utilities/__tests__/schemaPrinter-test.js @@ -7,22 +7,20 @@ import dedent from '../../jsutils/dedent'; import { DirectiveLocation } from '../../language/directiveLocation'; +import { GraphQLSchema } from '../../type/schema'; +import { GraphQLDirective } from '../../type/directives'; +import { GraphQLInt, GraphQLString, GraphQLBoolean } from '../../type/scalars'; import { assertObjectType, - GraphQLSchema, - GraphQLInputObjectType, + GraphQLList, + GraphQLNonNull, GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, - GraphQLString, - GraphQLInt, - GraphQLBoolean, - GraphQLList, - GraphQLNonNull, -} from '../../'; -import { GraphQLDirective } from '../../type/directives'; + GraphQLInputObjectType, +} from '../../type/definition'; import { buildSchema } from '../buildASTSchema'; import { printSchema, printIntrospectionSchema } from '../schemaPrinter'; diff --git a/src/utilities/__tests__/separateOperations-test.js b/src/utilities/__tests__/separateOperations-test.js index d7c943ef0e..cbdfd02fa7 100644 --- a/src/utilities/__tests__/separateOperations-test.js +++ b/src/utilities/__tests__/separateOperations-test.js @@ -5,7 +5,8 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; -import { parse, print } from '../../language'; +import { parse } from '../../language/parser'; +import { print } from '../../language/printer'; import { separateOperations } from '../separateOperations'; diff --git a/src/utilities/__tests__/stripIgnoredCharacters-test.js b/src/utilities/__tests__/stripIgnoredCharacters-test.js index 81c226b417..6c6ff34414 100644 --- a/src/utilities/__tests__/stripIgnoredCharacters-test.js +++ b/src/utilities/__tests__/stripIgnoredCharacters-test.js @@ -6,7 +6,9 @@ import { describe, it } from 'mocha'; import dedent from '../../jsutils/dedent'; import invariant from '../../jsutils/invariant'; -import { parse, createLexer, Source } from '../../language'; +import { parse } from '../../language/parser'; +import { Source } from '../../language/source'; +import { createLexer } from '../../language/lexer'; import { stripIgnoredCharacters } from '../stripIgnoredCharacters'; diff --git a/src/utilities/__tests__/typeComparators-test.js b/src/utilities/__tests__/typeComparators-test.js index 8068ce263b..12b19f58e2 100644 --- a/src/utilities/__tests__/typeComparators-test.js +++ b/src/utilities/__tests__/typeComparators-test.js @@ -3,17 +3,15 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; +import { GraphQLSchema } from '../../type/schema'; +import { GraphQLString, GraphQLInt, GraphQLFloat } from '../../type/scalars'; import { - GraphQLSchema, - GraphQLString, - GraphQLInt, - GraphQLFloat, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, -} from '../../type'; +} from '../../type/definition'; import { isEqualType, isTypeSubTypeOf } from '../typeComparators'; diff --git a/src/utilities/__tests__/valueFromAST-test.js b/src/utilities/__tests__/valueFromAST-test.js index 34d1d36e63..7b8511475f 100644 --- a/src/utilities/__tests__/valueFromAST-test.js +++ b/src/utilities/__tests__/valueFromAST-test.js @@ -3,18 +3,20 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { parseValue } from '../../language'; +import { parseValue } from '../../language/parser'; import { - GraphQLEnumType, - GraphQLInputObjectType, - GraphQLList, GraphQLInt, GraphQLFloat, GraphQLString, GraphQLBoolean, GraphQLID, +} from '../../type/scalars'; +import { + GraphQLEnumType, + GraphQLInputObjectType, + GraphQLList, GraphQLNonNull, -} from '../../type'; +} from '../../type/definition'; import { valueFromAST } from '../valueFromAST'; diff --git a/src/utilities/__tests__/valueFromASTUntyped-test.js b/src/utilities/__tests__/valueFromASTUntyped-test.js index 061850d801..ff1cce73b6 100644 --- a/src/utilities/__tests__/valueFromASTUntyped-test.js +++ b/src/utilities/__tests__/valueFromASTUntyped-test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { parseValue } from '../../language'; +import { parseValue } from '../../language/parser'; import { valueFromASTUntyped } from '../valueFromASTUntyped'; diff --git a/src/validation/__tests__/KnownArgumentNames-test.js b/src/validation/__tests__/KnownArgumentNames-test.js index 7fea8e7b8e..df6d9672d8 100644 --- a/src/validation/__tests__/KnownArgumentNames-test.js +++ b/src/validation/__tests__/KnownArgumentNames-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { KnownArgumentNames, diff --git a/src/validation/__tests__/KnownDirectives-test.js b/src/validation/__tests__/KnownDirectives-test.js index 837dbb5504..4cbed91f96 100644 --- a/src/validation/__tests__/KnownDirectives-test.js +++ b/src/validation/__tests__/KnownDirectives-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { KnownDirectives, diff --git a/src/validation/__tests__/KnownTypeNames-test.js b/src/validation/__tests__/KnownTypeNames-test.js index 78db470e79..7d38236a18 100644 --- a/src/validation/__tests__/KnownTypeNames-test.js +++ b/src/validation/__tests__/KnownTypeNames-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { KnownTypeNames, unknownTypeMessage } from '../rules/KnownTypeNames'; diff --git a/src/validation/__tests__/LoneSchemaDefinition-test.js b/src/validation/__tests__/LoneSchemaDefinition-test.js index 5dfcdb7699..6384f58f85 100644 --- a/src/validation/__tests__/LoneSchemaDefinition-test.js +++ b/src/validation/__tests__/LoneSchemaDefinition-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { LoneSchemaDefinition, diff --git a/src/validation/__tests__/OverlappingFieldsCanBeMerged-test.js b/src/validation/__tests__/OverlappingFieldsCanBeMerged-test.js index eb7bf9d800..c608b992ec 100644 --- a/src/validation/__tests__/OverlappingFieldsCanBeMerged-test.js +++ b/src/validation/__tests__/OverlappingFieldsCanBeMerged-test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { buildSchema } from '../../'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { OverlappingFieldsCanBeMerged, diff --git a/src/validation/__tests__/PossibleTypeExtensions-test.js b/src/validation/__tests__/PossibleTypeExtensions-test.js index f752f48ff9..a0c89f8c6c 100644 --- a/src/validation/__tests__/PossibleTypeExtensions-test.js +++ b/src/validation/__tests__/PossibleTypeExtensions-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { PossibleTypeExtensions, diff --git a/src/validation/__tests__/ProvidedRequiredArguments-test.js b/src/validation/__tests__/ProvidedRequiredArguments-test.js index 8c37c809f4..158ee5a1e5 100644 --- a/src/validation/__tests__/ProvidedRequiredArguments-test.js +++ b/src/validation/__tests__/ProvidedRequiredArguments-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { ProvidedRequiredArguments, diff --git a/src/validation/__tests__/UniqueDirectiveNames-test.js b/src/validation/__tests__/UniqueDirectiveNames-test.js index fb67a722eb..2682314ba0 100644 --- a/src/validation/__tests__/UniqueDirectiveNames-test.js +++ b/src/validation/__tests__/UniqueDirectiveNames-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { UniqueDirectiveNames, diff --git a/src/validation/__tests__/UniqueEnumValueNames-test.js b/src/validation/__tests__/UniqueEnumValueNames-test.js index 375ff38ebe..06384d1fe7 100644 --- a/src/validation/__tests__/UniqueEnumValueNames-test.js +++ b/src/validation/__tests__/UniqueEnumValueNames-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { UniqueEnumValueNames, diff --git a/src/validation/__tests__/UniqueFieldDefinitionNames-test.js b/src/validation/__tests__/UniqueFieldDefinitionNames-test.js index c4d8bb348e..cd33954146 100644 --- a/src/validation/__tests__/UniqueFieldDefinitionNames-test.js +++ b/src/validation/__tests__/UniqueFieldDefinitionNames-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { UniqueFieldDefinitionNames, diff --git a/src/validation/__tests__/UniqueOperationTypes-test.js b/src/validation/__tests__/UniqueOperationTypes-test.js index 7b87a08cc1..b5330626bb 100644 --- a/src/validation/__tests__/UniqueOperationTypes-test.js +++ b/src/validation/__tests__/UniqueOperationTypes-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { UniqueOperationTypes, diff --git a/src/validation/__tests__/UniqueTypeNames-test.js b/src/validation/__tests__/UniqueTypeNames-test.js index 8c6afe43e9..9a9134599d 100644 --- a/src/validation/__tests__/UniqueTypeNames-test.js +++ b/src/validation/__tests__/UniqueTypeNames-test.js @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; -import { buildSchema } from '../../utilities'; +import { buildSchema } from '../../utilities/buildASTSchema'; import { UniqueTypeNames, diff --git a/src/validation/__tests__/harness.js b/src/validation/__tests__/harness.js index 0289f243bf..c4f313504d 100644 --- a/src/validation/__tests__/harness.js +++ b/src/validation/__tests__/harness.js @@ -4,16 +4,23 @@ import { expect } from 'chai'; import inspect from '../../jsutils/inspect'; -import { parse } from '../../language'; +import { parse } from '../../language/parser'; -import { GraphQLScalarType } from '../../type/definition'; +import { GraphQLSchema } from '../../type/schema'; import { GraphQLDirective, GraphQLIncludeDirective, GraphQLSkipDirective, } from '../../type/directives'; import { - GraphQLSchema, + GraphQLInt, + GraphQLFloat, + GraphQLString, + GraphQLBoolean, + GraphQLID, +} from '../../type/scalars'; +import { + GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, @@ -21,12 +28,7 @@ import { GraphQLInputObjectType, GraphQLList, GraphQLNonNull, - GraphQLInt, - GraphQLFloat, - GraphQLString, - GraphQLBoolean, - GraphQLID, -} from '../../type'; +} from '../../type/definition'; import { validate, validateSDL } from '../validate'; import { diff --git a/src/validation/__tests__/validateGQL-benchmark.js b/src/validation/__tests__/validateGQL-benchmark.js index 8516467a73..fce3b0f2e9 100644 --- a/src/validation/__tests__/validateGQL-benchmark.js +++ b/src/validation/__tests__/validateGQL-benchmark.js @@ -1,6 +1,8 @@ // @flow strict -import { parse, getIntrospectionQuery, buildSchema } from '../../'; +import { parse } from '../../language/parser'; +import { buildSchema } from '../../utilities/buildASTSchema'; +import { getIntrospectionQuery } from '../../utilities/introspectionQuery'; import { validate } from '../validate'; diff --git a/src/validation/__tests__/validateSDL-benchmark.js b/src/validation/__tests__/validateSDL-benchmark.js index 601d267f10..921ce506e7 100644 --- a/src/validation/__tests__/validateSDL-benchmark.js +++ b/src/validation/__tests__/validateSDL-benchmark.js @@ -1,6 +1,6 @@ // @flow strict -import { parse } from '../../'; +import { parse } from '../../language/parser'; import { validateSDL } from '../validate'; diff --git a/src/validation/__tests__/validation-test.js b/src/validation/__tests__/validation-test.js index e28668183c..067255e2fa 100644 --- a/src/validation/__tests__/validation-test.js +++ b/src/validation/__tests__/validation-test.js @@ -3,10 +3,11 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { parse } from '../../language'; +import { parse } from '../../language/parser'; import { TypeInfo } from '../../utilities/TypeInfo'; -import { validate, specifiedRules } from '../'; +import { validate } from '../validate'; +import { specifiedRules } from '../specifiedRules'; import { testSchema } from './harness';