diff --git a/.eslintrc.yml b/.eslintrc.yml index 74d28bdc78..0687c304b2 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -136,7 +136,7 @@ rules: import/max-dependencies: off import/no-unassigned-import: error import/no-named-default: error - import/no-default-export: off + import/no-default-export: error import/no-named-export: off import/no-anonymous-default-export: error import/group-exports: off diff --git a/src/__testUtils__/__tests__/dedent-test.js b/src/__testUtils__/__tests__/dedent-test.js index 9ee2440bce..dade58b523 100644 --- a/src/__testUtils__/__tests__/dedent-test.js +++ b/src/__testUtils__/__tests__/dedent-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../dedent'; +import { dedent } from '../dedent'; describe('dedent', () => { it('removes indentation in typical usage', () => { diff --git a/src/__testUtils__/__tests__/genFuzzStrings-test.js b/src/__testUtils__/__tests__/genFuzzStrings-test.js index 75da1b63cc..70f267353b 100644 --- a/src/__testUtils__/__tests__/genFuzzStrings-test.js +++ b/src/__testUtils__/__tests__/genFuzzStrings-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import genFuzzStrings from '../genFuzzStrings'; +import { genFuzzStrings } from '../genFuzzStrings'; function expectFuzzStrings(options: {| allowedChars: Array, diff --git a/src/__testUtils__/__tests__/inspectStr-test.js b/src/__testUtils__/__tests__/inspectStr-test.js index b31e59b159..9c3eba3a95 100644 --- a/src/__testUtils__/__tests__/inspectStr-test.js +++ b/src/__testUtils__/__tests__/inspectStr-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import inspectStr from '../inspectStr'; +import { inspectStr } from '../inspectStr'; describe('inspectStr', () => { it('handles null and undefined values', () => { diff --git a/src/__testUtils__/__tests__/resolveOnNextTick-test.js b/src/__testUtils__/__tests__/resolveOnNextTick-test.js index 5d51eb8aa8..0916b44a0c 100644 --- a/src/__testUtils__/__tests__/resolveOnNextTick-test.js +++ b/src/__testUtils__/__tests__/resolveOnNextTick-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import resolveOnNextTick from '../resolveOnNextTick'; +import { resolveOnNextTick } from '../resolveOnNextTick'; describe('resolveOnNextTick', () => { it('resolves promise on the next tick', async () => { diff --git a/src/__testUtils__/dedent.js b/src/__testUtils__/dedent.js index c4b8e8da7b..2311f58c6f 100644 --- a/src/__testUtils__/dedent.js +++ b/src/__testUtils__/dedent.js @@ -10,7 +10,7 @@ * `; * str === "{\n test\n}\n"; */ -export default function dedent( +export function dedent( strings: $ReadOnlyArray, ...values: $ReadOnlyArray ): string { diff --git a/src/__testUtils__/genFuzzStrings.js b/src/__testUtils__/genFuzzStrings.js index 4ead99080c..86aaf96709 100644 --- a/src/__testUtils__/genFuzzStrings.js +++ b/src/__testUtils__/genFuzzStrings.js @@ -1,7 +1,7 @@ /** * Generator that produces all possible combinations of allowed characters. */ -export default function* genFuzzStrings(options: {| +export function* genFuzzStrings(options: {| allowedChars: Array, maxLength: number, |}): Generator { diff --git a/src/__testUtils__/inspectStr.js b/src/__testUtils__/inspectStr.js index a99a28150a..52e7d7f78c 100644 --- a/src/__testUtils__/inspectStr.js +++ b/src/__testUtils__/inspectStr.js @@ -1,7 +1,7 @@ /** * Special inspect function to produce readable string literal for error messages in tests */ -export default function inspectStr(str: ?string): string { +export function inspectStr(str: ?string): string { if (str == null) { return 'null'; } diff --git a/src/__testUtils__/kitchenSinkQuery.js b/src/__testUtils__/kitchenSinkQuery.js index 2ccdc9dc92..8d176686ea 100644 --- a/src/__testUtils__/kitchenSinkQuery.js +++ b/src/__testUtils__/kitchenSinkQuery.js @@ -1,5 +1,5 @@ // $FlowFixMe[incompatible-call] -const kitchenSinkQuery: string = String.raw` +export const kitchenSinkQuery: string = String.raw` query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery { whoever123is: node(id: [123, 456]) { id @@ -65,5 +65,3 @@ query { __typename } `; - -export default kitchenSinkQuery; diff --git a/src/__testUtils__/kitchenSinkSDL.js b/src/__testUtils__/kitchenSinkSDL.js index 7b171ac027..1c97bd87f8 100644 --- a/src/__testUtils__/kitchenSinkSDL.js +++ b/src/__testUtils__/kitchenSinkSDL.js @@ -1,4 +1,4 @@ -const kitchenSinkSDL: string = ` +export const kitchenSinkSDL: string = ` """This is a description of the schema as a whole.""" schema { query: QueryType @@ -156,5 +156,3 @@ extend schema @onSchema { subscription: SubscriptionType } `; - -export default kitchenSinkSDL; diff --git a/src/__testUtils__/resolveOnNextTick.js b/src/__testUtils__/resolveOnNextTick.js index b27ba839b2..6dd50b3982 100644 --- a/src/__testUtils__/resolveOnNextTick.js +++ b/src/__testUtils__/resolveOnNextTick.js @@ -1,3 +1,3 @@ -export default function resolveOnNextTick(): Promise { +export function resolveOnNextTick(): Promise { return Promise.resolve(undefined); } diff --git a/src/__tests__/starWarsSchema.js b/src/__tests__/starWarsSchema.js index e06c2cef71..16a80fcee7 100644 --- a/src/__tests__/starWarsSchema.js +++ b/src/__tests__/starWarsSchema.js @@ -1,4 +1,4 @@ -import invariant from '../jsutils/invariant'; +import { invariant } from '../jsutils/invariant'; import { GraphQLSchema } from '../type/schema'; import { GraphQLString } from '../type/scalars'; diff --git a/src/error/GraphQLError.js b/src/error/GraphQLError.js index 670bef58be..f4d955e8a0 100644 --- a/src/error/GraphQLError.js +++ b/src/error/GraphQLError.js @@ -1,7 +1,7 @@ // FIXME: // flowlint uninitialized-instance-property:off -import isObjectLike from '../jsutils/isObjectLike'; +import { isObjectLike } from '../jsutils/isObjectLike'; import type { ASTNode } from '../language/ast'; import type { Source } from '../language/source'; diff --git a/src/error/__tests__/GraphQLError-test.js b/src/error/__tests__/GraphQLError-test.js index b72d31b174..1a438748c0 100644 --- a/src/error/__tests__/GraphQLError-test.js +++ b/src/error/__tests__/GraphQLError-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { Kind } from '../../language/kinds'; import { parse } from '../../language/parser'; diff --git a/src/error/formatError.js b/src/error/formatError.js index d73cc897b0..ef59ad8df8 100644 --- a/src/error/formatError.js +++ b/src/error/formatError.js @@ -1,4 +1,4 @@ -import devAssert from '../jsutils/devAssert'; +import { devAssert } from '../jsutils/devAssert'; import type { SourceLocation } from '../language/location'; diff --git a/src/error/locatedError.js b/src/error/locatedError.js index 1b7c335070..34fd247855 100644 --- a/src/error/locatedError.js +++ b/src/error/locatedError.js @@ -1,4 +1,4 @@ -import inspect from '../jsutils/inspect'; +import { inspect } from '../jsutils/inspect'; import type { ASTNode } from '../language/ast'; diff --git a/src/execution/__tests__/executor-test.js b/src/execution/__tests__/executor-test.js index d1ea9bb49f..32464aed92 100644 --- a/src/execution/__tests__/executor-test.js +++ b/src/execution/__tests__/executor-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import inspect from '../../jsutils/inspect'; -import invariant from '../../jsutils/invariant'; +import { inspect } from '../../jsutils/inspect'; +import { invariant } from '../../jsutils/invariant'; import { Kind } from '../../language/kinds'; import { parse } from '../../language/parser'; diff --git a/src/execution/__tests__/mutations-test.js b/src/execution/__tests__/mutations-test.js index c9c51296bf..f15977cc46 100644 --- a/src/execution/__tests__/mutations-test.js +++ b/src/execution/__tests__/mutations-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import resolveOnNextTick from '../../__testUtils__/resolveOnNextTick'; +import { resolveOnNextTick } from '../../__testUtils__/resolveOnNextTick'; import { parse } from '../../language/parser'; diff --git a/src/execution/__tests__/union-interface-test.js b/src/execution/__tests__/union-interface-test.js index 1d750d273d..b887b7a220 100644 --- a/src/execution/__tests__/union-interface-test.js +++ b/src/execution/__tests__/union-interface-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { parse } from '../../language/parser'; diff --git a/src/execution/__tests__/variables-test.js b/src/execution/__tests__/variables-test.js index 9f637dd7ed..c4f968c622 100644 --- a/src/execution/__tests__/variables-test.js +++ b/src/execution/__tests__/variables-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import inspect from '../../jsutils/inspect'; -import invariant from '../../jsutils/invariant'; +import { inspect } from '../../jsutils/inspect'; +import { invariant } from '../../jsutils/invariant'; import { Kind } from '../../language/kinds'; import { parse } from '../../language/parser'; diff --git a/src/execution/execute.js b/src/execution/execute.js index c9c2c6a809..66c9bdefd5 100644 --- a/src/execution/execute.js +++ b/src/execution/execute.js @@ -1,15 +1,15 @@ import type { Path } from '../jsutils/Path'; import type { ObjMap } from '../jsutils/ObjMap'; import type { PromiseOrValue } from '../jsutils/PromiseOrValue'; -import inspect from '../jsutils/inspect'; -import memoize3 from '../jsutils/memoize3'; -import invariant from '../jsutils/invariant'; -import devAssert from '../jsutils/devAssert'; -import isPromise from '../jsutils/isPromise'; -import isObjectLike from '../jsutils/isObjectLike'; -import isCollection from '../jsutils/isCollection'; -import promiseReduce from '../jsutils/promiseReduce'; -import promiseForObject from '../jsutils/promiseForObject'; +import { inspect } from '../jsutils/inspect'; +import { memoize3 } from '../jsutils/memoize3'; +import { invariant } from '../jsutils/invariant'; +import { devAssert } from '../jsutils/devAssert'; +import { isPromise } from '../jsutils/isPromise'; +import { isObjectLike } from '../jsutils/isObjectLike'; +import { isCollection } from '../jsutils/isCollection'; +import { promiseReduce } from '../jsutils/promiseReduce'; +import { promiseForObject } from '../jsutils/promiseForObject'; import { addPath, pathToArray } from '../jsutils/Path'; import type { GraphQLFormattedError } from '../error/formatError'; diff --git a/src/execution/values.js b/src/execution/values.js index 51c0678098..d91633acd4 100644 --- a/src/execution/values.js +++ b/src/execution/values.js @@ -1,7 +1,7 @@ import type { ObjMap } from '../jsutils/ObjMap'; -import keyMap from '../jsutils/keyMap'; -import inspect from '../jsutils/inspect'; -import printPathArray from '../jsutils/printPathArray'; +import { keyMap } from '../jsutils/keyMap'; +import { inspect } from '../jsutils/inspect'; +import { printPathArray } from '../jsutils/printPathArray'; import { GraphQLError } from '../error/GraphQLError'; diff --git a/src/graphql.js b/src/graphql.js index 622be10cd5..3938b157bd 100644 --- a/src/graphql.js +++ b/src/graphql.js @@ -1,5 +1,5 @@ import type { PromiseOrValue } from './jsutils/PromiseOrValue'; -import isPromise from './jsutils/isPromise'; +import { isPromise } from './jsutils/isPromise'; import type { Source } from './language/source'; import { parse } from './language/parser'; diff --git a/src/jsutils/__tests__/didYouMean-test.js b/src/jsutils/__tests__/didYouMean-test.js index 70a4ac5237..bc01e18080 100644 --- a/src/jsutils/__tests__/didYouMean-test.js +++ b/src/jsutils/__tests__/didYouMean-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import didYouMean from '../didYouMean'; +import { didYouMean } from '../didYouMean'; describe('didYouMean', () => { it('Does accept an empty list', () => { diff --git a/src/jsutils/__tests__/identityFunc-test.js b/src/jsutils/__tests__/identityFunc-test.js index 8c7eff39bc..82a6c914d8 100644 --- a/src/jsutils/__tests__/identityFunc-test.js +++ b/src/jsutils/__tests__/identityFunc-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import identityFunc from '../identityFunc'; +import { identityFunc } from '../identityFunc'; describe('identityFunc', () => { it('returns the first argument it receives', () => { diff --git a/src/jsutils/__tests__/inspect-test.js b/src/jsutils/__tests__/inspect-test.js index ba7ca9a86c..26da61e180 100644 --- a/src/jsutils/__tests__/inspect-test.js +++ b/src/jsutils/__tests__/inspect-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import inspect from '../inspect'; -import invariant from '../invariant'; +import { inspect } from '../inspect'; +import { invariant } from '../invariant'; describe('inspect', () => { it('undefined', () => { diff --git a/src/jsutils/__tests__/invariant-test.js b/src/jsutils/__tests__/invariant-test.js index 97c293596e..2a438b69b3 100644 --- a/src/jsutils/__tests__/invariant-test.js +++ b/src/jsutils/__tests__/invariant-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../invariant'; +import { invariant } from '../invariant'; describe('invariant', () => { it('throws on false conditions', () => { diff --git a/src/jsutils/__tests__/isAsyncIterable-test.js b/src/jsutils/__tests__/isAsyncIterable-test.js index 282e6a3474..c997361056 100644 --- a/src/jsutils/__tests__/isAsyncIterable-test.js +++ b/src/jsutils/__tests__/isAsyncIterable-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import identityFunc from '../identityFunc'; -import isAsyncIterable from '../isAsyncIterable'; +import { identityFunc } from '../identityFunc'; +import { isAsyncIterable } from '../isAsyncIterable'; describe('isAsyncIterable', () => { it('should return `true` for AsyncIterable', () => { diff --git a/src/jsutils/__tests__/isCollection-test.js b/src/jsutils/__tests__/isCollection-test.js index 0277d2eb53..683e56805f 100644 --- a/src/jsutils/__tests__/isCollection-test.js +++ b/src/jsutils/__tests__/isCollection-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import identityFunc from '../identityFunc'; -import isCollection from '../isCollection'; +import { identityFunc } from '../identityFunc'; +import { isCollection } from '../isCollection'; describe('isCollection', () => { it('should return `true` for collections', () => { diff --git a/src/jsutils/__tests__/isObjectLike-test.js b/src/jsutils/__tests__/isObjectLike-test.js index 724d3ab10c..536ecb5f88 100644 --- a/src/jsutils/__tests__/isObjectLike-test.js +++ b/src/jsutils/__tests__/isObjectLike-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import identityFunc from '../identityFunc'; -import isObjectLike from '../isObjectLike'; +import { identityFunc } from '../identityFunc'; +import { isObjectLike } from '../isObjectLike'; describe('isObjectLike', () => { it('should return `true` for objects', () => { diff --git a/src/jsutils/__tests__/naturalCompare-test.js b/src/jsutils/__tests__/naturalCompare-test.js index 0aee2cae86..4c5291e579 100644 --- a/src/jsutils/__tests__/naturalCompare-test.js +++ b/src/jsutils/__tests__/naturalCompare-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import naturalCompare from '../naturalCompare'; +import { naturalCompare } from '../naturalCompare'; describe('naturalCompare', () => { it('Handles empty strings', () => { diff --git a/src/jsutils/__tests__/suggestionList-test.js b/src/jsutils/__tests__/suggestionList-test.js index 57a2d55c71..82bf6baa37 100644 --- a/src/jsutils/__tests__/suggestionList-test.js +++ b/src/jsutils/__tests__/suggestionList-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import suggestionList from '../suggestionList'; +import { suggestionList } from '../suggestionList'; function expectSuggestions(input: string, options: Array) { return expect(suggestionList(input, options)); diff --git a/src/jsutils/__tests__/toObjMap-test.js b/src/jsutils/__tests__/toObjMap-test.js index 3f5ab924f5..a0f1a2dba3 100644 --- a/src/jsutils/__tests__/toObjMap-test.js +++ b/src/jsutils/__tests__/toObjMap-test.js @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import type { ObjMapLike } from '../ObjMap'; -import toObjMap from '../toObjMap'; +import { toObjMap } from '../toObjMap'; // Workaround to make both ESLint and Flow happy const __proto__: string = '__proto__'; diff --git a/src/jsutils/devAssert.js b/src/jsutils/devAssert.js index da2adfcd00..5fcbc16eb7 100644 --- a/src/jsutils/devAssert.js +++ b/src/jsutils/devAssert.js @@ -1,4 +1,4 @@ -export default function devAssert(condition: mixed, message: string): void { +export function devAssert(condition: mixed, message: string): void { const booleanCondition = Boolean(condition); // istanbul ignore else (See transformation done in './resources/inlineInvariant.js') if (!booleanCondition) { diff --git a/src/jsutils/didYouMean.js b/src/jsutils/didYouMean.js index 45e1a93c83..ad1ef1203e 100644 --- a/src/jsutils/didYouMean.js +++ b/src/jsutils/didYouMean.js @@ -11,7 +11,7 @@ declare function didYouMean( ): string; // eslint-disable-next-line no-redeclare -export default function didYouMean(firstArg, secondArg) { +export function didYouMean(firstArg, secondArg) { const [subMessage, suggestionsArg] = typeof firstArg === 'string' ? [firstArg, secondArg] diff --git a/src/jsutils/identityFunc.js b/src/jsutils/identityFunc.js index 94cb7e1534..a249b51c34 100644 --- a/src/jsutils/identityFunc.js +++ b/src/jsutils/identityFunc.js @@ -1,6 +1,6 @@ /** * Returns the first argument it receives. */ -export default function identityFunc(x: T): T { +export function identityFunc(x: T): T { return x; } diff --git a/src/jsutils/inspect.js b/src/jsutils/inspect.js index f841f7da8d..d36a535741 100644 --- a/src/jsutils/inspect.js +++ b/src/jsutils/inspect.js @@ -6,7 +6,7 @@ const MAX_RECURSIVE_DEPTH = 2; /** * Used to print values in error messages. */ -export default function inspect(value: mixed): string { +export function inspect(value: mixed): string { return formatValue(value, []); } diff --git a/src/jsutils/instanceOf.js b/src/jsutils/instanceOf.js index e55cd13f73..01909fbe6f 100644 --- a/src/jsutils/instanceOf.js +++ b/src/jsutils/instanceOf.js @@ -9,6 +9,7 @@ declare function instanceOf( // See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production // See: https://webpack.js.org/guides/production/ +// eslint-disable-next-line import/no-default-export export default process.env.NODE_ENV === 'production' ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317') // eslint-disable-next-line no-shadow diff --git a/src/jsutils/invariant.js b/src/jsutils/invariant.js index 668f6ea426..099ffd801a 100644 --- a/src/jsutils/invariant.js +++ b/src/jsutils/invariant.js @@ -1,4 +1,4 @@ -export default function invariant(condition: mixed, message?: string): void { +export function invariant(condition: mixed, message?: string): void { const booleanCondition = Boolean(condition); // istanbul ignore else (See transformation done in './resources/inlineInvariant.js') if (!booleanCondition) { diff --git a/src/jsutils/isAsyncIterable.js b/src/jsutils/isAsyncIterable.js index 604f9e446e..50ca5b0deb 100644 --- a/src/jsutils/isAsyncIterable.js +++ b/src/jsutils/isAsyncIterable.js @@ -6,6 +6,6 @@ declare function isAsyncIterable(value: mixed): boolean %checks(value instanceof AsyncIterable); // eslint-disable-next-line no-redeclare -export default function isAsyncIterable(maybeAsyncIterable) { +export function isAsyncIterable(maybeAsyncIterable) { return typeof maybeAsyncIterable?.[Symbol.asyncIterator] === 'function'; } diff --git a/src/jsutils/isCollection.js b/src/jsutils/isCollection.js index b120bda73d..99128f4fea 100644 --- a/src/jsutils/isCollection.js +++ b/src/jsutils/isCollection.js @@ -23,7 +23,7 @@ declare function isCollection(value: mixed): boolean %checks(value instanceof Iterable); // eslint-disable-next-line no-redeclare -export default function isCollection(obj) { +export function isCollection(obj) { if (obj == null || typeof obj !== 'object') { return false; } diff --git a/src/jsutils/isObjectLike.js b/src/jsutils/isObjectLike.js index a5f9754dd7..9c182ac38d 100644 --- a/src/jsutils/isObjectLike.js +++ b/src/jsutils/isObjectLike.js @@ -2,6 +2,6 @@ * Return true if `value` is object-like. A value is object-like if it's not * `null` and has a `typeof` result of "object". */ -export default function isObjectLike(value: mixed): boolean %checks { +export function isObjectLike(value: mixed): boolean %checks { return typeof value == 'object' && value !== null; } diff --git a/src/jsutils/isPromise.js b/src/jsutils/isPromise.js index 4bbb5768e1..41998354a3 100644 --- a/src/jsutils/isPromise.js +++ b/src/jsutils/isPromise.js @@ -6,6 +6,6 @@ declare function isPromise(value: mixed): boolean %checks(value instanceof Promise); // eslint-disable-next-line no-redeclare -export default function isPromise(value) { +export function isPromise(value) { return typeof value?.then === 'function'; } diff --git a/src/jsutils/keyMap.js b/src/jsutils/keyMap.js index eb847d02c9..21c1ec3e3b 100644 --- a/src/jsutils/keyMap.js +++ b/src/jsutils/keyMap.js @@ -23,7 +23,7 @@ import type { ObjMap } from './ObjMap'; * const jennyEntry = entriesByName['Jenny'] * */ -export default function keyMap( +export function keyMap( list: $ReadOnlyArray, keyFn: (item: T) => string, ): ObjMap { diff --git a/src/jsutils/keyValMap.js b/src/jsutils/keyValMap.js index a91e90b447..1981a520cf 100644 --- a/src/jsutils/keyValMap.js +++ b/src/jsutils/keyValMap.js @@ -17,7 +17,7 @@ import type { ObjMap } from './ObjMap'; * ) * */ -export default function keyValMap( +export function keyValMap( list: $ReadOnlyArray, keyFn: (item: T) => string, valFn: (item: T) => V, diff --git a/src/jsutils/mapValue.js b/src/jsutils/mapValue.js index a2b91be2dd..09e6878442 100644 --- a/src/jsutils/mapValue.js +++ b/src/jsutils/mapValue.js @@ -1,4 +1,4 @@ -import objectEntries from '../polyfills/objectEntries'; +import { objectEntries } from '../polyfills/objectEntries'; import type { ObjMap } from './ObjMap'; @@ -6,7 +6,7 @@ import type { ObjMap } from './ObjMap'; * Creates an object map with the same keys as `map` and values generated by * running each value of `map` thru `fn`. */ -export default function mapValue( +export function mapValue( map: ObjMap, fn: (value: T, key: string) => V, ): ObjMap { diff --git a/src/jsutils/memoize3.js b/src/jsutils/memoize3.js index be73a96fb2..406deddc15 100644 --- a/src/jsutils/memoize3.js +++ b/src/jsutils/memoize3.js @@ -1,7 +1,7 @@ /** * Memoizes the provided three-argument function. */ -export default function memoize3< +export function memoize3< A1: { ... } | $ReadOnlyArray, A2: { ... } | $ReadOnlyArray, A3: { ... } | $ReadOnlyArray, diff --git a/src/jsutils/naturalCompare.js b/src/jsutils/naturalCompare.js index 5f624b70d8..f6b89be06d 100644 --- a/src/jsutils/naturalCompare.js +++ b/src/jsutils/naturalCompare.js @@ -5,7 +5,7 @@ * See: https://en.wikipedia.org/wiki/Natural_sort_order * */ -export default function naturalCompare(aStr: string, bStr: string): number { +export function naturalCompare(aStr: string, bStr: string): number { let aIdx = 0; let bIdx = 0; diff --git a/src/jsutils/printPathArray.js b/src/jsutils/printPathArray.js index 34ab13daa0..4e9e773afa 100644 --- a/src/jsutils/printPathArray.js +++ b/src/jsutils/printPathArray.js @@ -1,9 +1,7 @@ /** * Build a string describing the path. */ -export default function printPathArray( - path: $ReadOnlyArray, -): string { +export function printPathArray(path: $ReadOnlyArray): string { return path .map((key) => typeof key === 'number' ? '[' + key.toString() + ']' : '.' + key, diff --git a/src/jsutils/promiseForObject.js b/src/jsutils/promiseForObject.js index bf07e4a3f0..879d732d1f 100644 --- a/src/jsutils/promiseForObject.js +++ b/src/jsutils/promiseForObject.js @@ -7,7 +7,7 @@ import type { ObjMap } from './ObjMap'; * This is akin to bluebird's `Promise.props`, but implemented only using * `Promise.all` so it will work with any implementation of ES6 promises. */ -export default function promiseForObject( +export function promiseForObject( object: ObjMap>, ): Promise> { const keys = Object.keys(object); diff --git a/src/jsutils/promiseReduce.js b/src/jsutils/promiseReduce.js index 43d905283e..45a1d7964c 100644 --- a/src/jsutils/promiseReduce.js +++ b/src/jsutils/promiseReduce.js @@ -1,6 +1,6 @@ import type { PromiseOrValue } from './PromiseOrValue'; -import isPromise from './isPromise'; +import { isPromise } from './isPromise'; /** * Similar to Array.prototype.reduce(), however the reducing callback may return @@ -9,7 +9,7 @@ import isPromise from './isPromise'; * If the callback does not return a Promise, then this function will also not * return a Promise. */ -export default function promiseReduce( +export function promiseReduce( values: $ReadOnlyArray, callback: (U, T) => PromiseOrValue, initialValue: PromiseOrValue, diff --git a/src/jsutils/suggestionList.js b/src/jsutils/suggestionList.js index 33cc2f1dde..d500648031 100644 --- a/src/jsutils/suggestionList.js +++ b/src/jsutils/suggestionList.js @@ -1,10 +1,10 @@ -import naturalCompare from './naturalCompare'; +import { naturalCompare } from './naturalCompare'; /** * Given an invalid input string and a list of valid options, returns a filtered * list of valid options sorted based on their similarity with the input. */ -export default function suggestionList( +export function suggestionList( input: string, options: $ReadOnlyArray, ): Array { diff --git a/src/jsutils/toObjMap.js b/src/jsutils/toObjMap.js index c0dc9e2fdb..5d618793ab 100644 --- a/src/jsutils/toObjMap.js +++ b/src/jsutils/toObjMap.js @@ -1,4 +1,4 @@ -import objectEntries from '../polyfills/objectEntries'; +import { objectEntries } from '../polyfills/objectEntries'; import type { ObjMap, @@ -11,7 +11,7 @@ import type { declare function toObjMap(obj: ObjMapLike): ObjMap; declare function toObjMap(obj: ReadOnlyObjMapLike): ReadOnlyObjMap; -export default function toObjMap(obj) { +export function toObjMap(obj) { /* eslint-enable no-redeclare */ if (Object.getPrototypeOf(obj) === null) { return obj; diff --git a/src/language/__tests__/blockString-fuzz.js b/src/language/__tests__/blockString-fuzz.js index 1479aa2aa7..dc79f8aeed 100644 --- a/src/language/__tests__/blockString-fuzz.js +++ b/src/language/__tests__/blockString-fuzz.js @@ -1,10 +1,10 @@ import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import inspectStr from '../../__testUtils__/inspectStr'; -import genFuzzStrings from '../../__testUtils__/genFuzzStrings'; +import { dedent } from '../../__testUtils__/dedent'; +import { inspectStr } from '../../__testUtils__/inspectStr'; +import { genFuzzStrings } from '../../__testUtils__/genFuzzStrings'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { Lexer } from '../lexer'; import { Source } from '../source'; diff --git a/src/language/__tests__/lexer-test.js b/src/language/__tests__/lexer-test.js index 7f6317b5ca..583cd1b301 100644 --- a/src/language/__tests__/lexer-test.js +++ b/src/language/__tests__/lexer-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/language/__tests__/parser-test.js b/src/language/__tests__/parser-test.js index 3a0924680a..3dc1237493 100644 --- a/src/language/__tests__/parser-test.js +++ b/src/language/__tests__/parser-test.js @@ -1,17 +1,17 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import kitchenSinkQuery from '../../__testUtils__/kitchenSinkQuery'; +import { dedent } from '../../__testUtils__/dedent'; +import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery'; -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { Kind } from '../kinds'; import { Source } from '../source'; import { TokenKind } from '../tokenKind'; import { parse, parseValue, parseType } from '../parser'; -import toJSONDeep from './toJSONDeep'; +import { toJSONDeep } from './toJSONDeep'; function expectSyntaxError(text: string) { return expect(() => parse(text)).to.throw(); diff --git a/src/language/__tests__/printLocation-test.js b/src/language/__tests__/printLocation-test.js index 2fbcdcca4e..9911c24669 100644 --- a/src/language/__tests__/printLocation-test.js +++ b/src/language/__tests__/printLocation-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { Source } from '../source'; import { printSourceLocation } from '../printLocation'; diff --git a/src/language/__tests__/printer-test.js b/src/language/__tests__/printer-test.js index 55adc17a78..014e21b623 100644 --- a/src/language/__tests__/printer-test.js +++ b/src/language/__tests__/printer-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import kitchenSinkQuery from '../../__testUtils__/kitchenSinkQuery'; +import { dedent } from '../../__testUtils__/dedent'; +import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery'; import { parse } from '../parser'; import { print } from '../printer'; diff --git a/src/language/__tests__/schema-parser-test.js b/src/language/__tests__/schema-parser-test.js index 2e6ffbd745..bb6e92288d 100644 --- a/src/language/__tests__/schema-parser-test.js +++ b/src/language/__tests__/schema-parser-test.js @@ -1,12 +1,12 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import kitchenSinkSDL from '../../__testUtils__/kitchenSinkSDL'; +import { dedent } from '../../__testUtils__/dedent'; +import { kitchenSinkSDL } from '../../__testUtils__/kitchenSinkSDL'; import { parse } from '../parser'; -import toJSONDeep from './toJSONDeep'; +import { toJSONDeep } from './toJSONDeep'; function expectSyntaxError(text: string) { return expect(() => parse(text)).to.throw(); diff --git a/src/language/__tests__/schema-printer-test.js b/src/language/__tests__/schema-printer-test.js index 8a9505939c..2b064f05a2 100644 --- a/src/language/__tests__/schema-printer-test.js +++ b/src/language/__tests__/schema-printer-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import kitchenSinkSDL from '../../__testUtils__/kitchenSinkSDL'; +import { dedent } from '../../__testUtils__/dedent'; +import { kitchenSinkSDL } from '../../__testUtils__/kitchenSinkSDL'; import { parse } from '../parser'; import { print } from '../printer'; diff --git a/src/language/__tests__/toJSONDeep.js b/src/language/__tests__/toJSONDeep.js index 3c3fae57f3..71d543a068 100644 --- a/src/language/__tests__/toJSONDeep.js +++ b/src/language/__tests__/toJSONDeep.js @@ -1,10 +1,10 @@ -import isObjectLike from '../../jsutils/isObjectLike'; +import { isObjectLike } from '../../jsutils/isObjectLike'; /** * Deeply transforms an arbitrary value to a JSON-safe value by calling toJSON * on any nested value which defines it. */ -export default function toJSONDeep(value: mixed): mixed { +export function toJSONDeep(value: mixed): mixed { if (!isObjectLike(value)) { return value; } diff --git a/src/language/__tests__/visitor-test.js b/src/language/__tests__/visitor-test.js index 1dfce965b8..5d6473400a 100644 --- a/src/language/__tests__/visitor-test.js +++ b/src/language/__tests__/visitor-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import kitchenSinkQuery from '../../__testUtils__/kitchenSinkQuery'; +import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import type { ASTNode } from '../ast'; import { Kind } from '../kinds'; diff --git a/src/language/experimentalOnlineParser/grammar.d.ts b/src/language/experimentalOnlineParser/grammar.d.ts index 6e71a66a72..c27fdc1d8f 100644 --- a/src/language/experimentalOnlineParser/grammar.d.ts +++ b/src/language/experimentalOnlineParser/grammar.d.ts @@ -77,7 +77,7 @@ export interface GraphQLGrammarPeekConstraintCondition { end?: boolean; } -const grammar: GraphQLGrammarType = { +export const grammar: GraphQLGrammarType = { Name: { token: 'Name' }, String: { token: 'String' }, BlockString: { token: 'BlockString' }, @@ -1002,5 +1002,3 @@ const grammar: GraphQLGrammarType = { tokenName: 'EnumValue', }, }; - -export default grammar; diff --git a/src/language/experimentalOnlineParser/grammar.js b/src/language/experimentalOnlineParser/grammar.js index 0ab7788534..ff1b7018af 100644 --- a/src/language/experimentalOnlineParser/grammar.js +++ b/src/language/experimentalOnlineParser/grammar.js @@ -69,7 +69,7 @@ export interface GraphQLGrammarPeekConstraintCondition { end?: boolean; } -const grammar: GraphQLGrammarType = ({ +export const grammar: GraphQLGrammarType = ({ Name: { token: 'Name' }, String: { token: 'String' }, BlockString: { token: 'BlockString' }, @@ -995,5 +995,3 @@ const grammar: GraphQLGrammarType = ({ }, // FIXME: enforce proper typing }: any); - -export default grammar; diff --git a/src/language/experimentalOnlineParser/onlineParser.js b/src/language/experimentalOnlineParser/onlineParser.js index f296d1c8e2..b43a4f5124 100644 --- a/src/language/experimentalOnlineParser/onlineParser.js +++ b/src/language/experimentalOnlineParser/onlineParser.js @@ -1,7 +1,7 @@ import { Lexer } from '../lexer'; import { Source } from '../source'; -import GraphQLGrammar from './grammar'; +import { grammar } from './grammar'; import type { GraphQLGrammarRule, GraphQLGrammarRuleName, @@ -128,7 +128,7 @@ export class OnlineParser { name: 'Document', state: 'Document', kind: 'ListOfTypeConstraint', - ...GraphQLGrammar.Document, + ...grammar.Document, expanded: false, depth: 1, step: 1, @@ -276,7 +276,7 @@ export class OnlineParser { _parseListOfTypeConstraint(rule: ListOfTypeOnlineParserRule): Token { this._pushRule( - GraphQLGrammar[rule.listOfType], + grammar[rule.listOfType], rule.depth + 1, rule.listOfType, 1, @@ -316,7 +316,7 @@ export class OnlineParser { let { ifCondition } = constraint; if (typeof ifCondition === 'string') { - ifCondition = GraphQLGrammar[ifCondition]; + ifCondition = grammar[ifCondition]; } let token = this._lookAhead(); @@ -552,7 +552,7 @@ export class OnlineParser { case RuleKind.RULE_NAME: rule = (rule: GraphQLGrammarRuleName); this._pushRule( - GraphQLGrammar[rule], + grammar[rule], depth, (typeof name === 'string' ? name : undefined) || rule, step, diff --git a/src/language/source.js b/src/language/source.js index ae08ee8e9a..082c872005 100644 --- a/src/language/source.js +++ b/src/language/source.js @@ -1,5 +1,5 @@ -import inspect from '../jsutils/inspect'; -import devAssert from '../jsutils/devAssert'; +import { inspect } from '../jsutils/inspect'; +import { devAssert } from '../jsutils/devAssert'; import instanceOf from '../jsutils/instanceOf'; type Location = {| diff --git a/src/language/visitor.js b/src/language/visitor.js index 5e367ce4a9..ed1db5b720 100644 --- a/src/language/visitor.js +++ b/src/language/visitor.js @@ -1,4 +1,4 @@ -import inspect from '../jsutils/inspect'; +import { inspect } from '../jsutils/inspect'; import type { ASTNode, ASTKindToNode } from './ast'; import { isNode } from './ast'; diff --git a/src/polyfills/objectEntries.js b/src/polyfills/objectEntries.js index 30e5585272..907ac00537 100644 --- a/src/polyfills/objectEntries.js +++ b/src/polyfills/objectEntries.js @@ -4,7 +4,5 @@ declare function objectEntries(obj: ObjMap): Array<[string, T]>; /* eslint-disable no-redeclare */ // $FlowFixMe[name-already-bound] workaround for: https://github.com/facebook/flow/issues/4441 -const objectEntries = +export const objectEntries = Object.entries || ((obj) => Object.keys(obj).map((key) => [key, obj[key]])); - -export default objectEntries; diff --git a/src/polyfills/objectValues.js b/src/polyfills/objectValues.js index 943362a640..bcc363a24f 100644 --- a/src/polyfills/objectValues.js +++ b/src/polyfills/objectValues.js @@ -4,6 +4,5 @@ declare function objectValues(obj: ObjMap): Array; /* eslint-disable no-redeclare */ // $FlowFixMe[name-already-bound] workaround for: https://github.com/facebook/flow/issues/4441 -const objectValues = +export const objectValues = Object.values || ((obj) => Object.keys(obj).map((key) => obj[key])); -export default objectValues; diff --git a/src/subscription/__tests__/mapAsyncIterator-test.js b/src/subscription/__tests__/mapAsyncIterator-test.js index 4af866f20a..3db45226ae 100644 --- a/src/subscription/__tests__/mapAsyncIterator-test.js +++ b/src/subscription/__tests__/mapAsyncIterator-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import mapAsyncIterator from '../mapAsyncIterator'; +import { mapAsyncIterator } from '../mapAsyncIterator'; describe('mapAsyncIterator', () => { it('maps over async generator', async () => { diff --git a/src/subscription/__tests__/simplePubSub-test.js b/src/subscription/__tests__/simplePubSub-test.js index d92339687b..18f596b898 100644 --- a/src/subscription/__tests__/simplePubSub-test.js +++ b/src/subscription/__tests__/simplePubSub-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import SimplePubSub from './simplePubSub'; +import { SimplePubSub } from './simplePubSub'; describe('SimplePubSub', () => { it('subscribe async-iterator mock', async () => { diff --git a/src/subscription/__tests__/simplePubSub.js b/src/subscription/__tests__/simplePubSub.js index e12c93d0b9..c7f9639419 100644 --- a/src/subscription/__tests__/simplePubSub.js +++ b/src/subscription/__tests__/simplePubSub.js @@ -2,7 +2,7 @@ * Create an AsyncIterator from an EventEmitter. Useful for mocking a * PubSub system for tests. */ -export default class SimplePubSub { +export class SimplePubSub { _subscribers: Set<(T) => void>; constructor() { diff --git a/src/subscription/__tests__/subscribe-test.js b/src/subscription/__tests__/subscribe-test.js index c0cc0ce851..e1feb4b19c 100644 --- a/src/subscription/__tests__/subscribe-test.js +++ b/src/subscription/__tests__/subscribe-test.js @@ -1,10 +1,10 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import resolveOnNextTick from '../../__testUtils__/resolveOnNextTick'; +import { resolveOnNextTick } from '../../__testUtils__/resolveOnNextTick'; -import invariant from '../../jsutils/invariant'; -import isAsyncIterable from '../../jsutils/isAsyncIterable'; +import { invariant } from '../../jsutils/invariant'; +import { isAsyncIterable } from '../../jsutils/isAsyncIterable'; import type { DocumentNode } from '../../language/ast'; import { parse } from '../../language/parser'; @@ -17,7 +17,7 @@ import { GraphQLInt, GraphQLString, GraphQLBoolean } from '../../type/scalars'; import { createSourceEventStream, subscribe } from '../subscribe'; -import SimplePubSub from './simplePubSub'; +import { SimplePubSub } from './simplePubSub'; type Email = {| from: string, diff --git a/src/subscription/mapAsyncIterator.d.ts b/src/subscription/mapAsyncIterator.d.ts index 22e8a34ace..ecf2e51cd3 100644 --- a/src/subscription/mapAsyncIterator.d.ts +++ b/src/subscription/mapAsyncIterator.d.ts @@ -4,7 +4,7 @@ import { PromiseOrValue } from '../jsutils/PromiseOrValue'; * Given an AsyncIterable and a callback function, return an AsyncIterator * which produces values mapped via calling the callback function. */ -export default function mapAsyncIterator( +export function mapAsyncIterator( iterable: AsyncIterable, callback: (arg: T) => PromiseOrValue, rejectCallback?: (arg: any) => PromiseOrValue, diff --git a/src/subscription/mapAsyncIterator.js b/src/subscription/mapAsyncIterator.js index 5a64de54f1..75c8ff5a85 100644 --- a/src/subscription/mapAsyncIterator.js +++ b/src/subscription/mapAsyncIterator.js @@ -4,7 +4,7 @@ import type { PromiseOrValue } from '../jsutils/PromiseOrValue'; * Given an AsyncIterable and a callback function, return an AsyncIterator * which produces values mapped via calling the callback function. */ -export default function mapAsyncIterator( +export function mapAsyncIterator( iterable: AsyncIterable | AsyncGenerator, callback: (T) => PromiseOrValue, rejectCallback?: (any) => PromiseOrValue, diff --git a/src/subscription/subscribe.js b/src/subscription/subscribe.js index 4ff1b9d72a..33e375cc4c 100644 --- a/src/subscription/subscribe.js +++ b/src/subscription/subscribe.js @@ -1,5 +1,5 @@ -import inspect from '../jsutils/inspect'; -import isAsyncIterable from '../jsutils/isAsyncIterable'; +import { inspect } from '../jsutils/inspect'; +import { isAsyncIterable } from '../jsutils/isAsyncIterable'; import { addPath, pathToArray } from '../jsutils/Path'; import { GraphQLError } from '../error/GraphQLError'; @@ -23,7 +23,7 @@ import type { GraphQLFieldResolver } from '../type/definition'; import { getOperationRootType } from '../utilities/getOperationRootType'; -import mapAsyncIterator from './mapAsyncIterator'; +import { mapAsyncIterator } from './mapAsyncIterator'; export type SubscriptionArgs = {| schema: GraphQLSchema, diff --git a/src/type/__tests__/definition-test.js b/src/type/__tests__/definition-test.js index 65b176d150..faefd625d6 100644 --- a/src/type/__tests__/definition-test.js +++ b/src/type/__tests__/definition-test.js @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import inspect from '../../jsutils/inspect'; -import identityFunc from '../../jsutils/identityFunc'; +import { inspect } from '../../jsutils/inspect'; +import { identityFunc } from '../../jsutils/identityFunc'; import { parseValue } from '../../language/parser'; diff --git a/src/type/__tests__/extensions-test.js b/src/type/__tests__/extensions-test.js index 76dd0ee233..de218c3db3 100644 --- a/src/type/__tests__/extensions-test.js +++ b/src/type/__tests__/extensions-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { GraphQLSchema } from '../schema'; import { GraphQLDirective } from '../directives'; diff --git a/src/type/__tests__/introspection-test.js b/src/type/__tests__/introspection-test.js index 478cc9bd18..ee1b4e6e38 100644 --- a/src/type/__tests__/introspection-test.js +++ b/src/type/__tests__/introspection-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { buildSchema } from '../../utilities/buildASTSchema'; import { getIntrospectionQuery } from '../../utilities/getIntrospectionQuery'; diff --git a/src/type/__tests__/schema-test.js b/src/type/__tests__/schema-test.js index 783955c1f6..321e14521f 100644 --- a/src/type/__tests__/schema-test.js +++ b/src/type/__tests__/schema-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { printSchema } from '../../utilities/printSchema'; diff --git a/src/type/__tests__/validation-test.js b/src/type/__tests__/validation-test.js index a3e35443da..34939afe93 100644 --- a/src/type/__tests__/validation-test.js +++ b/src/type/__tests__/validation-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { parse } from '../../language/parser'; diff --git a/src/type/definition.js b/src/type/definition.js index 4ab794fc36..3bdfa16b84 100644 --- a/src/type/definition.js +++ b/src/type/definition.js @@ -1,4 +1,4 @@ -import objectEntries from '../polyfills/objectEntries'; +import { objectEntries } from '../polyfills/objectEntries'; import type { Path } from '../jsutils/Path'; import type { PromiseOrValue } from '../jsutils/PromiseOrValue'; @@ -7,17 +7,17 @@ import type { ReadOnlyObjMap, ReadOnlyObjMapLike, } from '../jsutils/ObjMap'; -import inspect from '../jsutils/inspect'; -import keyMap from '../jsutils/keyMap'; -import mapValue from '../jsutils/mapValue'; -import toObjMap from '../jsutils/toObjMap'; -import devAssert from '../jsutils/devAssert'; -import keyValMap from '../jsutils/keyValMap'; +import { inspect } from '../jsutils/inspect'; +import { keyMap } from '../jsutils/keyMap'; +import { mapValue } from '../jsutils/mapValue'; +import { toObjMap } from '../jsutils/toObjMap'; +import { devAssert } from '../jsutils/devAssert'; +import { keyValMap } from '../jsutils/keyValMap'; import instanceOf from '../jsutils/instanceOf'; -import didYouMean from '../jsutils/didYouMean'; -import isObjectLike from '../jsutils/isObjectLike'; -import identityFunc from '../jsutils/identityFunc'; -import suggestionList from '../jsutils/suggestionList'; +import { didYouMean } from '../jsutils/didYouMean'; +import { isObjectLike } from '../jsutils/isObjectLike'; +import { identityFunc } from '../jsutils/identityFunc'; +import { suggestionList } from '../jsutils/suggestionList'; import { GraphQLError } from '../error/GraphQLError'; diff --git a/src/type/directives.js b/src/type/directives.js index c92cc10641..af7a3ad204 100644 --- a/src/type/directives.js +++ b/src/type/directives.js @@ -1,11 +1,11 @@ -import objectEntries from '../polyfills/objectEntries'; +import { objectEntries } from '../polyfills/objectEntries'; import type { ReadOnlyObjMap, ReadOnlyObjMapLike } from '../jsutils/ObjMap'; -import inspect from '../jsutils/inspect'; -import toObjMap from '../jsutils/toObjMap'; -import devAssert from '../jsutils/devAssert'; +import { inspect } from '../jsutils/inspect'; +import { toObjMap } from '../jsutils/toObjMap'; +import { devAssert } from '../jsutils/devAssert'; import instanceOf from '../jsutils/instanceOf'; -import isObjectLike from '../jsutils/isObjectLike'; +import { isObjectLike } from '../jsutils/isObjectLike'; import type { DirectiveDefinitionNode } from '../language/ast'; import type { DirectiveLocationEnum } from '../language/directiveLocation'; diff --git a/src/type/introspection.js b/src/type/introspection.js index 4963bd9674..bbc5554d5a 100644 --- a/src/type/introspection.js +++ b/src/type/introspection.js @@ -1,7 +1,7 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; import { print } from '../language/printer'; import { DirectiveLocation } from '../language/directiveLocation'; diff --git a/src/type/scalars.js b/src/type/scalars.js index e02d2e5c6c..f737cc2cff 100644 --- a/src/type/scalars.js +++ b/src/type/scalars.js @@ -1,5 +1,5 @@ -import inspect from '../jsutils/inspect'; -import isObjectLike from '../jsutils/isObjectLike'; +import { inspect } from '../jsutils/inspect'; +import { isObjectLike } from '../jsutils/isObjectLike'; import { Kind } from '../language/kinds'; import { print } from '../language/printer'; diff --git a/src/type/schema.js b/src/type/schema.js index efb66462c9..c7f1cc6608 100644 --- a/src/type/schema.js +++ b/src/type/schema.js @@ -1,15 +1,15 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; import type { ObjMap, ReadOnlyObjMap, ReadOnlyObjMapLike, } from '../jsutils/ObjMap'; -import inspect from '../jsutils/inspect'; -import toObjMap from '../jsutils/toObjMap'; -import devAssert from '../jsutils/devAssert'; +import { inspect } from '../jsutils/inspect'; +import { toObjMap } from '../jsutils/toObjMap'; +import { devAssert } from '../jsutils/devAssert'; import instanceOf from '../jsutils/instanceOf'; -import isObjectLike from '../jsutils/isObjectLike'; +import { isObjectLike } from '../jsutils/isObjectLike'; import type { GraphQLError } from '../error/GraphQLError'; diff --git a/src/type/validate.js b/src/type/validate.js index f0075e2b9e..800a54860e 100644 --- a/src/type/validate.js +++ b/src/type/validate.js @@ -1,6 +1,6 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import inspect from '../jsutils/inspect'; +import { inspect } from '../jsutils/inspect'; import { GraphQLError } from '../error/GraphQLError'; import { locatedError } from '../error/locatedError'; diff --git a/src/utilities/__tests__/TypeInfo-test.js b/src/utilities/__tests__/TypeInfo-test.js index 73ca3d5090..9f8349449b 100644 --- a/src/utilities/__tests__/TypeInfo-test.js +++ b/src/utilities/__tests__/TypeInfo-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { parse, parseValue } from '../../language/parser'; import { print } from '../../language/printer'; diff --git a/src/utilities/__tests__/buildASTSchema-test.js b/src/utilities/__tests__/buildASTSchema-test.js index cb1794bd7a..8e570ea364 100644 --- a/src/utilities/__tests__/buildASTSchema-test.js +++ b/src/utilities/__tests__/buildASTSchema-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import type { ASTNode } from '../../language/ast'; import { Kind } from '../../language/kinds'; diff --git a/src/utilities/__tests__/buildClientSchema-test.js b/src/utilities/__tests__/buildClientSchema-test.js index b43dca09b3..28dbc33272 100644 --- a/src/utilities/__tests__/buildClientSchema-test.js +++ b/src/utilities/__tests__/buildClientSchema-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { graphqlSync } from '../../graphql'; diff --git a/src/utilities/__tests__/coerceInputValue-test.js b/src/utilities/__tests__/coerceInputValue-test.js index 05f7ca12c2..07d1514200 100644 --- a/src/utilities/__tests__/coerceInputValue-test.js +++ b/src/utilities/__tests__/coerceInputValue-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import type { GraphQLInputType } from '../../type/definition'; import { GraphQLInt } from '../../type/scalars'; diff --git a/src/utilities/__tests__/concatAST-test.js b/src/utilities/__tests__/concatAST-test.js index 089b36e9dd..622abd6b38 100644 --- a/src/utilities/__tests__/concatAST-test.js +++ b/src/utilities/__tests__/concatAST-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { parse } from '../../language/parser'; import { print } from '../../language/printer'; diff --git a/src/utilities/__tests__/extendSchema-test.js b/src/utilities/__tests__/extendSchema-test.js index 64ac885c4b..88c9829183 100644 --- a/src/utilities/__tests__/extendSchema-test.js +++ b/src/utilities/__tests__/extendSchema-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import type { ASTNode } from '../../language/ast'; import { Kind } from '../../language/kinds'; diff --git a/src/utilities/__tests__/getOperationRootType-test.js b/src/utilities/__tests__/getOperationRootType-test.js index 8ebdcdfd8b..627b0efb86 100644 --- a/src/utilities/__tests__/getOperationRootType-test.js +++ b/src/utilities/__tests__/getOperationRootType-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import type { DocumentNode } from '../../language/ast'; import { Kind } from '../../language/kinds'; diff --git a/src/utilities/__tests__/introspectionFromSchema-test.js b/src/utilities/__tests__/introspectionFromSchema-test.js index 4afbbeb855..14e72ed098 100644 --- a/src/utilities/__tests__/introspectionFromSchema-test.js +++ b/src/utilities/__tests__/introspectionFromSchema-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { GraphQLSchema } from '../../type/schema'; import { GraphQLString } from '../../type/scalars'; diff --git a/src/utilities/__tests__/lexicographicSortSchema-test.js b/src/utilities/__tests__/lexicographicSortSchema-test.js index b885733c23..f63ee9460c 100644 --- a/src/utilities/__tests__/lexicographicSortSchema-test.js +++ b/src/utilities/__tests__/lexicographicSortSchema-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { printSchema } from '../printSchema'; import { buildSchema } from '../buildASTSchema'; diff --git a/src/utilities/__tests__/printSchema-test.js b/src/utilities/__tests__/printSchema-test.js index 2bedc1478f..cdd4ca574c 100644 --- a/src/utilities/__tests__/printSchema-test.js +++ b/src/utilities/__tests__/printSchema-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; import { DirectiveLocation } from '../../language/directiveLocation'; diff --git a/src/utilities/__tests__/separateOperations-test.js b/src/utilities/__tests__/separateOperations-test.js index 1e336a6ad5..3ebe1a5f57 100644 --- a/src/utilities/__tests__/separateOperations-test.js +++ b/src/utilities/__tests__/separateOperations-test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; +import { dedent } from '../../__testUtils__/dedent'; -import mapValue from '../../jsutils/mapValue'; +import { mapValue } from '../../jsutils/mapValue'; import { parse } from '../../language/parser'; import { print } from '../../language/printer'; diff --git a/src/utilities/__tests__/stripIgnoredCharacters-fuzz.js b/src/utilities/__tests__/stripIgnoredCharacters-fuzz.js index 34a2c9a7a5..38a5a12b6e 100644 --- a/src/utilities/__tests__/stripIgnoredCharacters-fuzz.js +++ b/src/utilities/__tests__/stripIgnoredCharacters-fuzz.js @@ -1,10 +1,10 @@ import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import inspectStr from '../../__testUtils__/inspectStr'; -import genFuzzStrings from '../../__testUtils__/genFuzzStrings'; +import { dedent } from '../../__testUtils__/dedent'; +import { inspectStr } from '../../__testUtils__/inspectStr'; +import { genFuzzStrings } from '../../__testUtils__/genFuzzStrings'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { Lexer } from '../../language/lexer'; import { Source } from '../../language/source'; diff --git a/src/utilities/__tests__/stripIgnoredCharacters-test.js b/src/utilities/__tests__/stripIgnoredCharacters-test.js index fdc7d907d6..e73fa56362 100644 --- a/src/utilities/__tests__/stripIgnoredCharacters-test.js +++ b/src/utilities/__tests__/stripIgnoredCharacters-test.js @@ -1,12 +1,12 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import dedent from '../../__testUtils__/dedent'; -import inspectStr from '../../__testUtils__/inspectStr'; -import kitchenSinkSDL from '../../__testUtils__/kitchenSinkSDL'; -import kitchenSinkQuery from '../../__testUtils__/kitchenSinkQuery'; +import { dedent } from '../../__testUtils__/dedent'; +import { inspectStr } from '../../__testUtils__/inspectStr'; +import { kitchenSinkSDL } from '../../__testUtils__/kitchenSinkSDL'; +import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery'; -import invariant from '../../jsutils/invariant'; +import { invariant } from '../../jsutils/invariant'; import { Lexer } from '../../language/lexer'; import { parse } from '../../language/parser'; diff --git a/src/utilities/__tests__/valueFromAST-test.js b/src/utilities/__tests__/valueFromAST-test.js index f4dc325206..b1436edf97 100644 --- a/src/utilities/__tests__/valueFromAST-test.js +++ b/src/utilities/__tests__/valueFromAST-test.js @@ -2,8 +2,8 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import type { ObjMap } from '../../jsutils/ObjMap'; -import invariant from '../../jsutils/invariant'; -import identityFunc from '../../jsutils/identityFunc'; +import { invariant } from '../../jsutils/invariant'; +import { identityFunc } from '../../jsutils/identityFunc'; import { parseValue } from '../../language/parser'; diff --git a/src/utilities/assertValidName.js b/src/utilities/assertValidName.js index b919b61be7..3f294da39d 100644 --- a/src/utilities/assertValidName.js +++ b/src/utilities/assertValidName.js @@ -1,4 +1,4 @@ -import devAssert from '../jsutils/devAssert'; +import { devAssert } from '../jsutils/devAssert'; import { GraphQLError } from '../error/GraphQLError'; diff --git a/src/utilities/astFromValue.js b/src/utilities/astFromValue.js index da5ad95051..e9bfbb2668 100644 --- a/src/utilities/astFromValue.js +++ b/src/utilities/astFromValue.js @@ -1,9 +1,9 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; -import isObjectLike from '../jsutils/isObjectLike'; -import isCollection from '../jsutils/isCollection'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; +import { isObjectLike } from '../jsutils/isObjectLike'; +import { isCollection } from '../jsutils/isCollection'; import type { ValueNode } from '../language/ast'; import { Kind } from '../language/kinds'; diff --git a/src/utilities/buildASTSchema.js b/src/utilities/buildASTSchema.js index 7f72cb6114..420da7582a 100644 --- a/src/utilities/buildASTSchema.js +++ b/src/utilities/buildASTSchema.js @@ -1,4 +1,4 @@ -import devAssert from '../jsutils/devAssert'; +import { devAssert } from '../jsutils/devAssert'; import type { Source } from '../language/source'; import type { DocumentNode } from '../language/ast'; diff --git a/src/utilities/buildClientSchema.js b/src/utilities/buildClientSchema.js index bdf4420001..d799e1eb6e 100644 --- a/src/utilities/buildClientSchema.js +++ b/src/utilities/buildClientSchema.js @@ -1,9 +1,9 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import inspect from '../jsutils/inspect'; -import devAssert from '../jsutils/devAssert'; -import keyValMap from '../jsutils/keyValMap'; -import isObjectLike from '../jsutils/isObjectLike'; +import { inspect } from '../jsutils/inspect'; +import { devAssert } from '../jsutils/devAssert'; +import { keyValMap } from '../jsutils/keyValMap'; +import { isObjectLike } from '../jsutils/isObjectLike'; import { parseValue } from '../language/parser'; diff --git a/src/utilities/coerceInputValue.js b/src/utilities/coerceInputValue.js index 9bb1195b09..37fa1b475a 100644 --- a/src/utilities/coerceInputValue.js +++ b/src/utilities/coerceInputValue.js @@ -1,13 +1,13 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; import type { Path } from '../jsutils/Path'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; -import didYouMean from '../jsutils/didYouMean'; -import isObjectLike from '../jsutils/isObjectLike'; -import isCollection from '../jsutils/isCollection'; -import suggestionList from '../jsutils/suggestionList'; -import printPathArray from '../jsutils/printPathArray'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; +import { didYouMean } from '../jsutils/didYouMean'; +import { isObjectLike } from '../jsutils/isObjectLike'; +import { isCollection } from '../jsutils/isCollection'; +import { suggestionList } from '../jsutils/suggestionList'; +import { printPathArray } from '../jsutils/printPathArray'; import { addPath, pathToArray } from '../jsutils/Path'; import { GraphQLError } from '../error/GraphQLError'; diff --git a/src/utilities/extendSchema.js b/src/utilities/extendSchema.js index 5bdf49e03b..0d197490bb 100644 --- a/src/utilities/extendSchema.js +++ b/src/utilities/extendSchema.js @@ -1,10 +1,10 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import keyMap from '../jsutils/keyMap'; -import inspect from '../jsutils/inspect'; -import mapValue from '../jsutils/mapValue'; -import invariant from '../jsutils/invariant'; -import devAssert from '../jsutils/devAssert'; +import { keyMap } from '../jsutils/keyMap'; +import { inspect } from '../jsutils/inspect'; +import { mapValue } from '../jsutils/mapValue'; +import { invariant } from '../jsutils/invariant'; +import { devAssert } from '../jsutils/devAssert'; import type { DirectiveLocationEnum } from '../language/directiveLocation'; import type { diff --git a/src/utilities/findBreakingChanges.js b/src/utilities/findBreakingChanges.js index 9f74a2d95c..9000cc63c3 100644 --- a/src/utilities/findBreakingChanges.js +++ b/src/utilities/findBreakingChanges.js @@ -1,9 +1,9 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import keyMap from '../jsutils/keyMap'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; -import naturalCompare from '../jsutils/naturalCompare'; +import { keyMap } from '../jsutils/keyMap'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; +import { naturalCompare } from '../jsutils/naturalCompare'; import { print } from '../language/printer'; import { visit } from '../language/visitor'; diff --git a/src/utilities/introspectionFromSchema.js b/src/utilities/introspectionFromSchema.js index 45d2c042c5..782faca0a0 100644 --- a/src/utilities/introspectionFromSchema.js +++ b/src/utilities/introspectionFromSchema.js @@ -1,4 +1,4 @@ -import invariant from '../jsutils/invariant'; +import { invariant } from '../jsutils/invariant'; import { parse } from '../language/parser'; diff --git a/src/utilities/lexicographicSortSchema.js b/src/utilities/lexicographicSortSchema.js index 3c727c70f0..8dd6acd5d4 100644 --- a/src/utilities/lexicographicSortSchema.js +++ b/src/utilities/lexicographicSortSchema.js @@ -1,10 +1,10 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; import type { ObjMap } from '../jsutils/ObjMap'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; -import keyValMap from '../jsutils/keyValMap'; -import naturalCompare from '../jsutils/naturalCompare'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; +import { keyValMap } from '../jsutils/keyValMap'; +import { naturalCompare } from '../jsutils/naturalCompare'; import type { GraphQLType, diff --git a/src/utilities/printSchema.js b/src/utilities/printSchema.js index 2d02ef6fd1..205f80f5ca 100644 --- a/src/utilities/printSchema.js +++ b/src/utilities/printSchema.js @@ -1,7 +1,7 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; import { print } from '../language/printer'; import { printBlockString } from '../language/blockString'; diff --git a/src/utilities/typeFromAST.js b/src/utilities/typeFromAST.js index 6903c5287a..0337e98420 100644 --- a/src/utilities/typeFromAST.js +++ b/src/utilities/typeFromAST.js @@ -1,5 +1,5 @@ -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; import type { NamedTypeNode, diff --git a/src/utilities/valueFromAST.js b/src/utilities/valueFromAST.js index 7afed42282..abf1e6526b 100644 --- a/src/utilities/valueFromAST.js +++ b/src/utilities/valueFromAST.js @@ -1,9 +1,9 @@ -import objectValues from '../polyfills/objectValues'; +import { objectValues } from '../polyfills/objectValues'; import type { ObjMap } from '../jsutils/ObjMap'; -import keyMap from '../jsutils/keyMap'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; +import { keyMap } from '../jsutils/keyMap'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; import type { ValueNode } from '../language/ast'; import { Kind } from '../language/kinds'; diff --git a/src/utilities/valueFromASTUntyped.js b/src/utilities/valueFromASTUntyped.js index 3b70329bda..05f5db71b2 100644 --- a/src/utilities/valueFromASTUntyped.js +++ b/src/utilities/valueFromASTUntyped.js @@ -1,7 +1,7 @@ import type { ObjMap } from '../jsutils/ObjMap'; -import inspect from '../jsutils/inspect'; -import invariant from '../jsutils/invariant'; -import keyValMap from '../jsutils/keyValMap'; +import { inspect } from '../jsutils/inspect'; +import { invariant } from '../jsutils/invariant'; +import { keyValMap } from '../jsutils/keyValMap'; import { Kind } from '../language/kinds'; import type { ValueNode } from '../language/ast'; diff --git a/src/validation/__tests__/ValuesOfCorrectTypeRule-test.js b/src/validation/__tests__/ValuesOfCorrectTypeRule-test.js index 1831b4670d..1f3cbab8e0 100644 --- a/src/validation/__tests__/ValuesOfCorrectTypeRule-test.js +++ b/src/validation/__tests__/ValuesOfCorrectTypeRule-test.js @@ -1,6 +1,6 @@ import { describe, it } from 'mocha'; -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { GraphQLSchema } from '../../type/schema'; import { GraphQLString } from '../../type/scalars'; diff --git a/src/validation/rules/FieldsOnCorrectTypeRule.js b/src/validation/rules/FieldsOnCorrectTypeRule.js index 6e56c3bb22..6a1789b60f 100644 --- a/src/validation/rules/FieldsOnCorrectTypeRule.js +++ b/src/validation/rules/FieldsOnCorrectTypeRule.js @@ -1,6 +1,6 @@ -import didYouMean from '../../jsutils/didYouMean'; -import suggestionList from '../../jsutils/suggestionList'; -import naturalCompare from '../../jsutils/naturalCompare'; +import { didYouMean } from '../../jsutils/didYouMean'; +import { suggestionList } from '../../jsutils/suggestionList'; +import { naturalCompare } from '../../jsutils/naturalCompare'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/KnownArgumentNamesRule.js b/src/validation/rules/KnownArgumentNamesRule.js index b1fd082463..dbd8fb82fe 100644 --- a/src/validation/rules/KnownArgumentNamesRule.js +++ b/src/validation/rules/KnownArgumentNamesRule.js @@ -1,5 +1,5 @@ -import didYouMean from '../../jsutils/didYouMean'; -import suggestionList from '../../jsutils/suggestionList'; +import { didYouMean } from '../../jsutils/didYouMean'; +import { suggestionList } from '../../jsutils/suggestionList'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/KnownDirectivesRule.js b/src/validation/rules/KnownDirectivesRule.js index 8c2e60de88..05a0d3b261 100644 --- a/src/validation/rules/KnownDirectivesRule.js +++ b/src/validation/rules/KnownDirectivesRule.js @@ -1,5 +1,5 @@ -import inspect from '../../jsutils/inspect'; -import invariant from '../../jsutils/invariant'; +import { inspect } from '../../jsutils/inspect'; +import { invariant } from '../../jsutils/invariant'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/KnownTypeNamesRule.js b/src/validation/rules/KnownTypeNamesRule.js index 38efd5a603..3c49b3840a 100644 --- a/src/validation/rules/KnownTypeNamesRule.js +++ b/src/validation/rules/KnownTypeNamesRule.js @@ -1,5 +1,5 @@ -import didYouMean from '../../jsutils/didYouMean'; -import suggestionList from '../../jsutils/suggestionList'; +import { didYouMean } from '../../jsutils/didYouMean'; +import { suggestionList } from '../../jsutils/suggestionList'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/OverlappingFieldsCanBeMergedRule.js b/src/validation/rules/OverlappingFieldsCanBeMergedRule.js index 983f69099d..2aa25715ea 100644 --- a/src/validation/rules/OverlappingFieldsCanBeMergedRule.js +++ b/src/validation/rules/OverlappingFieldsCanBeMergedRule.js @@ -1,7 +1,7 @@ -import objectEntries from '../../polyfills/objectEntries'; +import { objectEntries } from '../../polyfills/objectEntries'; import type { ObjMap } from '../../jsutils/ObjMap'; -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/PossibleFragmentSpreadsRule.js b/src/validation/rules/PossibleFragmentSpreadsRule.js index ba4e9ca5ef..caf8575f22 100644 --- a/src/validation/rules/PossibleFragmentSpreadsRule.js +++ b/src/validation/rules/PossibleFragmentSpreadsRule.js @@ -1,4 +1,4 @@ -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/PossibleTypeExtensionsRule.js b/src/validation/rules/PossibleTypeExtensionsRule.js index 2f098191ef..0a47c7da1a 100644 --- a/src/validation/rules/PossibleTypeExtensionsRule.js +++ b/src/validation/rules/PossibleTypeExtensionsRule.js @@ -1,7 +1,7 @@ -import inspect from '../../jsutils/inspect'; -import invariant from '../../jsutils/invariant'; -import didYouMean from '../../jsutils/didYouMean'; -import suggestionList from '../../jsutils/suggestionList'; +import { inspect } from '../../jsutils/inspect'; +import { invariant } from '../../jsutils/invariant'; +import { didYouMean } from '../../jsutils/didYouMean'; +import { suggestionList } from '../../jsutils/suggestionList'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/ProvidedRequiredArgumentsRule.js b/src/validation/rules/ProvidedRequiredArgumentsRule.js index b9ff7a032b..ddcc49f49c 100644 --- a/src/validation/rules/ProvidedRequiredArgumentsRule.js +++ b/src/validation/rules/ProvidedRequiredArgumentsRule.js @@ -1,5 +1,5 @@ -import inspect from '../../jsutils/inspect'; -import keyMap from '../../jsutils/keyMap'; +import { inspect } from '../../jsutils/inspect'; +import { keyMap } from '../../jsutils/keyMap'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/ScalarLeafsRule.js b/src/validation/rules/ScalarLeafsRule.js index a0c0c6cc40..c59667d91c 100644 --- a/src/validation/rules/ScalarLeafsRule.js +++ b/src/validation/rules/ScalarLeafsRule.js @@ -1,4 +1,4 @@ -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/ValuesOfCorrectTypeRule.js b/src/validation/rules/ValuesOfCorrectTypeRule.js index d97647a000..d02d58ce1d 100644 --- a/src/validation/rules/ValuesOfCorrectTypeRule.js +++ b/src/validation/rules/ValuesOfCorrectTypeRule.js @@ -1,9 +1,9 @@ -import objectValues from '../../polyfills/objectValues'; +import { objectValues } from '../../polyfills/objectValues'; -import keyMap from '../../jsutils/keyMap'; -import inspect from '../../jsutils/inspect'; -import didYouMean from '../../jsutils/didYouMean'; -import suggestionList from '../../jsutils/suggestionList'; +import { keyMap } from '../../jsutils/keyMap'; +import { inspect } from '../../jsutils/inspect'; +import { didYouMean } from '../../jsutils/didYouMean'; +import { suggestionList } from '../../jsutils/suggestionList'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/VariablesInAllowedPositionRule.js b/src/validation/rules/VariablesInAllowedPositionRule.js index 8d0cbbf26c..1070190876 100644 --- a/src/validation/rules/VariablesInAllowedPositionRule.js +++ b/src/validation/rules/VariablesInAllowedPositionRule.js @@ -1,4 +1,4 @@ -import inspect from '../../jsutils/inspect'; +import { inspect } from '../../jsutils/inspect'; import { GraphQLError } from '../../error/GraphQLError'; diff --git a/src/validation/rules/custom/NoDeprecatedCustomRule.js b/src/validation/rules/custom/NoDeprecatedCustomRule.js index 7fe6598bc4..fd86ff0975 100644 --- a/src/validation/rules/custom/NoDeprecatedCustomRule.js +++ b/src/validation/rules/custom/NoDeprecatedCustomRule.js @@ -1,4 +1,4 @@ -import invariant from '../../../jsutils/invariant'; +import { invariant } from '../../../jsutils/invariant'; import { GraphQLError } from '../../../error/GraphQLError'; diff --git a/src/validation/validate.js b/src/validation/validate.js index c51a56a6b7..9245230ffd 100644 --- a/src/validation/validate.js +++ b/src/validation/validate.js @@ -1,4 +1,4 @@ -import devAssert from '../jsutils/devAssert'; +import { devAssert } from '../jsutils/devAssert'; import { GraphQLError } from '../error/GraphQLError';