chore(lint): pin eslint-plugin-import to 2.22.0

To avoid windows import/order error,

see: import-js/eslint-plugin-import#1643

package.json

@@ -78,7 +78,7 @@
     "dataloader": "^2.0.0",
     "dateformat": "^3.0.3",
     "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-import": "2.20.0",
     "eslint-watch": "^6.0.1",
     "express": "^4.17.1",
     "express-graphql": "^0.9.0",

src/Interfaces.ts

@@ -1,6 +1,3 @@
-import { SchemaDirectiveVisitor } from './utils/SchemaDirectiveVisitor';
-import { SchemaVisitor } from './utils/SchemaVisitor';
-
 import {
   GraphQLSchema,
   GraphQLField,
@@ -29,9 +26,11 @@ import {
 } from 'graphql';
 
 import { TypeMap } from 'graphql/type/schema';
-
 import { ApolloLink } from 'apollo-link';
 
+import { SchemaVisitor } from './utils/SchemaVisitor';
+import { SchemaDirectiveVisitor } from './utils/SchemaDirectiveVisitor';
+
 /* TODO: Add documentation */
 
 export type UnitOrList<Type> = Type | Array<Type>;

src/generate/addResolversToSchema.ts

@@ -1,9 +1,19 @@
+import {
+  GraphQLField,
+  GraphQLEnumType,
+  GraphQLScalarType,
+  GraphQLSchema,
+  GraphQLObjectType,
+  GraphQLInterfaceType,
+  isSpecifiedScalarType,
+  GraphQLUnionType,
+} from 'graphql';
+
 import {
   IResolvers,
   IResolverValidationOptions,
   IAddResolversToSchemaOptions,
 } from '../Interfaces';
-
 import {
   parseInputValue,
   serializeInputValue,
@@ -16,17 +26,6 @@ import SchemaError from './SchemaError';
 import checkForResolveTypeResolver from './checkForResolveTypeResolver';
 import extendResolversFromInterfaces from './extendResolversFromInterfaces';
 
-import {
-  GraphQLField,
-  GraphQLEnumType,
-  GraphQLScalarType,
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLInterfaceType,
-  isSpecifiedScalarType,
-  GraphQLUnionType,
-} from 'graphql';
-
 function addResolversToSchema(
   schemaOrOptions: GraphQLSchema | IAddResolversToSchemaOptions,
   legacyInputResolvers?: IResolvers,

src/generate/assertResolversPresent.ts

@@ -1,15 +1,15 @@
-import { IResolverValidationOptions } from '../Interfaces';
-import { forEachField } from '../utils';
-
-import SchemaError from './SchemaError';
-
 import {
   GraphQLSchema,
   GraphQLField,
   getNamedType,
   GraphQLScalarType,
 } from 'graphql';
 
+import { IResolverValidationOptions } from '../Interfaces';
+import { forEachField } from '../utils';
+
+import SchemaError from './SchemaError';
+
 function assertResolversPresent(
   schema: GraphQLSchema,
   resolverValidationOptions: IResolverValidationOptions = {},

src/generate/attachConnectorsToContext.ts

@@ -1,10 +1,10 @@
+import { deprecated } from 'deprecated-decorator';
+import { GraphQLSchema, GraphQLFieldResolver } from 'graphql';
+
 import { IConnectors, IConnector, IConnectorCls } from '../Interfaces';
 
 import addSchemaLevelResolver from './addSchemaLevelResolver';
 
-import { deprecated } from 'deprecated-decorator';
-import { GraphQLSchema, GraphQLFieldResolver } from 'graphql';
-
 // takes a GraphQL-JS schema and an object of connectors, then attaches
 // the connectors to the context by wrapping each query or mutation resolve
 // function with a function that attaches connectors if they don't exist.

src/generate/attachDirectiveResolvers.ts

@@ -1,8 +1,8 @@
+import { GraphQLSchema, GraphQLField, defaultFieldResolver } from 'graphql';
+
 import { IDirectiveResolvers } from '../Interfaces';
 import { SchemaDirectiveVisitor } from '../utils/SchemaDirectiveVisitor';
 
-import { GraphQLSchema, GraphQLField, defaultFieldResolver } from 'graphql';
-
 function attachDirectiveResolvers(
   schema: GraphQLSchema,
   directiveResolvers: IDirectiveResolvers,

src/generate/checkForResolveTypeResolver.ts

@@ -1,7 +1,7 @@
-import SchemaError from './SchemaError';
-
 import { GraphQLInterfaceType, GraphQLUnionType, GraphQLSchema } from 'graphql';
 
+import SchemaError from './SchemaError';
+
 // If we have any union or interface types throw if no there is no resolveType or isTypeOf resolvers
 function checkForResolveTypeResolver(
   schema: GraphQLSchema,

src/generate/concatenateTypeDefs.ts

@@ -1,9 +1,9 @@
+import { print, ASTNode } from 'graphql';
+
 import { ITypedef } from '../Interfaces';
 
 import SchemaError from './SchemaError';
 
-import { print, ASTNode } from 'graphql';
-
 function concatenateTypeDefs(
   typeDefinitionsAry: Array<ITypedef>,
   calledFunctionRefs = [] as any,

src/generate/decorateWithLogger.ts

@@ -1,7 +1,7 @@
-import { ILogger } from '../Interfaces';
-
 import { defaultFieldResolver, GraphQLFieldResolver } from 'graphql';
 
+import { ILogger } from '../Interfaces';
+
 /*
  * fn: The function to decorate with the logger
  * logger: an object instance of type Logger

src/generate/extendResolversFromInterfaces.ts

@@ -1,7 +1,7 @@
-import { IResolvers } from '../Interfaces';
-
 import { GraphQLObjectType, GraphQLSchema } from 'graphql';
 
+import { IResolvers } from '../Interfaces';
+
 function extendResolversFromInterfaces(
   schema: GraphQLSchema,
   resolvers: IResolvers,

src/makeExecutableSchema.ts

@@ -1,11 +1,15 @@
-import { IExecutableSchemaDefinition, ILogger } from './Interfaces';
+import {
+  defaultFieldResolver,
+  GraphQLSchema,
+  GraphQLFieldResolver,
+} from 'graphql';
 
+import { IExecutableSchemaDefinition, ILogger } from './Interfaces';
 import {
   SchemaDirectiveVisitor,
   forEachField,
   mergeDeep
 } from './utils';
-
 import {
   attachDirectiveResolvers,
   assertResolversPresent,
@@ -17,11 +21,6 @@ import {
   SchemaError
 } from './generate';
 
-import {
-  defaultFieldResolver,
-  GraphQLSchema,
-  GraphQLFieldResolver,
-} from 'graphql';
 
 export function makeExecutableSchema<TContext = any>({
   typeDefs,

src/mock.ts

@@ -1,15 +1,3 @@
-import { buildSchemaFromTypeDefinitions } from './makeExecutableSchema';
-import { forEachField } from './utils';
-
-import {
-  IMocks,
-  IMockServer,
-  IMockOptions,
-  IMockFn,
-  IMockTypeFn,
-  ITypeDefinitions,
-} from './Interfaces';
-
 import {
   graphql,
   GraphQLSchema,
@@ -30,6 +18,18 @@ import {
 } from 'graphql';
 import { v4 as uuid } from 'uuid';
 
+import { buildSchemaFromTypeDefinitions } from './makeExecutableSchema';
+import { forEachField } from './utils';
+
+import {
+  IMocks,
+  IMockServer,
+  IMockOptions,
+  IMockFn,
+  IMockTypeFn,
+  ITypeDefinitions,
+} from './Interfaces';
+
 // This function wraps addMocksToSchema for more convenience
 function mockServer(
   schema: GraphQLSchema | ITypeDefinitions,

src/stitching/checkResultAndHandleErrors.ts

@@ -1,20 +1,3 @@
-import {
-  SubschemaConfig,
-  IGraphQLToolsResolveInfo,
-  isSubschemaConfig,
-  MergedTypeInfo,
-} from '../Interfaces';
-
-import {
-  relocatedError,
-  combineErrors,
-  getErrorsByPathSegment,
-} from './errors';
-import { getResponseKeyFromInfo } from './getResponseKeyFromInfo';
-import resolveFromParentTypename from './resolveFromParentTypename';
-import { setErrors, setObjectSubschema } from './proxiedResult';
-import { mergeFields } from './mergeFields';
-
 import {
   GraphQLResolveInfo,
   responsePathAsArray,
@@ -35,6 +18,24 @@ import {
 } from 'graphql';
 import { collectFields, ExecutionContext } from 'graphql/execution/execute';
 
+import {
+  SubschemaConfig,
+  IGraphQLToolsResolveInfo,
+  isSubschemaConfig,
+  MergedTypeInfo,
+} from '../Interfaces';
+
+import {
+  relocatedError,
+  combineErrors,
+  getErrorsByPathSegment,
+} from './errors';
+import { getResponseKeyFromInfo } from './getResponseKeyFromInfo';
+import resolveFromParentTypename from './resolveFromParentTypename';
+import { setErrors, setObjectSubschema } from './proxiedResult';
+import { mergeFields } from './mergeFields';
+
+
 export function checkResultAndHandleErrors(
   result: ExecutionResult,
   context: Record<string, any>,

src/stitching/createRequest.ts

@@ -1,12 +1,3 @@
-import {
-  ICreateRequestFromInfo,
-  Operation,
-  Request,
-  SubschemaConfig,
-  isSubschemaConfig,
-} from '../Interfaces';
-import { serializeInputValue } from '../utils';
-
 import {
   ArgumentNode,
   FieldNode,
@@ -30,6 +21,15 @@ import {
   SelectionSetNode,
 } from 'graphql';
 
+import {
+  ICreateRequestFromInfo,
+  Operation,
+  Request,
+  SubschemaConfig,
+  isSubschemaConfig,
+} from '../Interfaces';
+import { serializeInputValue } from '../utils';
+
 export function getDelegatingOperation(
   parentType: GraphQLObjectType,
   schema: GraphQLSchema

src/stitching/defaultMergedResolver.ts

@@ -1,11 +1,11 @@
+import { defaultFieldResolver } from 'graphql';
+
 import { IGraphQLToolsResolveInfo } from '../Interfaces';
 
 import { getErrors, getSubschema } from './proxiedResult';
 import { handleResult } from './checkResultAndHandleErrors';
 import { getResponseKeyFromInfo } from './getResponseKeyFromInfo';
 
-import { defaultFieldResolver } from 'graphql';
-
 // Resolver that knows how to:
 // a) handle aliases for proxied schemas
 // b) handle errors from proxied schemas

src/stitching/delegateToSchema.ts

@@ -1,3 +1,14 @@
+import { isAsyncIterable } from 'iterall';
+import { ApolloLink, execute as executeLink } from 'apollo-link';
+import {
+  subscribe,
+  execute,
+  validate,
+  GraphQLSchema,
+  ExecutionResult,
+  GraphQLOutputType,
+} from 'graphql';
+
 import {
   IDelegateToSchemaOptions,
   IDelegateRequestOptions,
@@ -29,17 +40,6 @@ import { observableToAsyncIterable } from './observableToAsyncIterable';
 import mapAsyncIterator from './mapAsyncIterator';
 import { combineErrors } from './errors';
 
-import { isAsyncIterable } from 'iterall';
-import { ApolloLink, execute as executeLink } from 'apollo-link';
-import {
-  subscribe,
-  execute,
-  validate,
-  GraphQLSchema,
-  ExecutionResult,
-  GraphQLOutputType,
-} from 'graphql';
-
 export default function delegateToSchema(
   options: IDelegateToSchemaOptions | GraphQLSchema,
 ): any {

src/stitching/linkToFetcher.ts

@@ -1,12 +1,12 @@
-import { Fetcher, IFetcherOperation } from '../Interfaces';
-
 import {
   ApolloLink,
   toPromise,
   execute,
   ExecutionResult,
 } from 'apollo-link';
 
+import { Fetcher, IFetcherOperation } from '../Interfaces';
+
 export { execute } from 'apollo-link';
 
 export default function linkToFetcher(link: ApolloLink): Fetcher {

src/stitching/makeMergedType.ts

@@ -1,13 +1,13 @@
-import defaultMergedResolver from './defaultMergedResolver';
-import resolveFromParentTypename from './resolveFromParentTypename';
-
 import {
   GraphQLType,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
 } from 'graphql';
 
+import defaultMergedResolver from './defaultMergedResolver';
+import resolveFromParentTypename from './resolveFromParentTypename';
+
 export function makeMergedType(type: GraphQLType): void {
   if (type instanceof GraphQLObjectType) {
     type.isTypeOf = undefined;