Fix modules import order

Author: nodkz

src/__mocks__/rootMutationTypeComposer.js

@@ -1,7 +1,7 @@
-import { TypeComposer } from 'graphql-compose';
 import {
   GraphQLObjectType,
 } from 'graphql';
+import { TypeComposer } from 'graphql-compose';
 
 const RootMutation = new GraphQLObjectType({
   name: 'RootMutation',

src/__mocks__/rootQueryTypeComposer.js

@@ -1,7 +1,7 @@
-import { TypeComposer } from 'graphql-compose';
 import {
   GraphQLObjectType,
 } from 'graphql';
+import { TypeComposer } from 'graphql-compose';
 
 const RootQuery = new GraphQLObjectType({
   name: 'RootQuery',

src/__mocks__/userTypeComposer.js

@@ -1,11 +1,11 @@
-import { TypeComposer, Resolver } from 'graphql-compose';
 import {
   GraphQLString,
   GraphQLObjectType,
   GraphQLInputObjectType,
   GraphQLNonNull,
   GraphQLInt,
 } from 'graphql';
+import { TypeComposer, Resolver } from 'graphql-compose';
 
 export const UserType = new GraphQLObjectType({
   name: 'User',
@@ -82,7 +82,7 @@ export const createOneResolver = new Resolver(userTypeComposer, {
   resolve: (resolveParams) => {
     return Promise.resolve({
       recordId: resolveParams.args.input.id,
-      record: resolveParams.args && resolveParams.args.input || {},
+      record: (resolveParams.args && resolveParams.args.input) || {},
     });
   },
 });
@@ -122,7 +122,7 @@ export const manyArgsWithInputResolver = new Resolver(userTypeComposer, {
   resolve: (resolveParams) => {
     return Promise.resolve({
       recordId: resolveParams.args.input.id,
-      record: resolveParams.args && resolveParams.args.input || {},
+      record: (resolveParams.args && resolveParams.args.input) || {},
     });
   },
 });
@@ -151,7 +151,7 @@ export const manyArgsWithoutInputResolver = new Resolver(userTypeComposer, {
   resolve: (resolveParams) => {
     return Promise.resolve({
       recordId: resolveParams.args.input.id,
-      record: resolveParams.args && resolveParams.args.input || {},
+      record: (resolveParams.args && resolveParams.args.input) || {},
     });
   },
 });

src/__tests__/composeWithRelay-test.js

@@ -1,16 +1,17 @@
 import { expect } from 'chai';
-import { TypeComposer } from 'graphql-compose';
-import { composeWithRelay } from '../composeWithRelay';
-import { userTypeComposer } from '../__mocks__/userTypeComposer';
-import { rootQueryTypeComposer } from '../__mocks__/rootQueryTypeComposer';
-import { rootMutationTypeComposer } from '../__mocks__/rootMutationTypeComposer';
-import { toGlobalId } from '../globalId';
 import {
   graphql,
   GraphQLInterfaceType,
   GraphQLSchema,
   GraphQLNonNull,
 } from 'graphql';
+import { TypeComposer } from 'graphql-compose';
+import { composeWithRelay } from '../composeWithRelay';
+import { userTypeComposer } from '../__mocks__/userTypeComposer';
+import { rootQueryTypeComposer } from '../__mocks__/rootQueryTypeComposer';
+import { rootMutationTypeComposer } from '../__mocks__/rootMutationTypeComposer';
+import { toGlobalId } from '../globalId';
+
 
 describe('composeWithRelay', () => {
   const userComposer = composeWithRelay(userTypeComposer);

src/__tests__/globalId-test.js

@@ -6,6 +6,7 @@ import {
   fromGlobalId,
 } from '../globalId';
 
+
 describe('globalId', () => {
   it('should have correct method base64()', () => {
     expect(base64('123')).to.equal('MTIz');

src/__tests__/mutationMiddleware-test.js

@@ -1,14 +1,15 @@
 import { expect } from 'chai';
-import { TypeComposer, InputTypeComposer } from 'graphql-compose';
-import { composeWithRelay } from '../composeWithRelay';
-import { userTypeComposer } from '../__mocks__/userTypeComposer';
-import { toGlobalId } from '../globalId';
 import {
   GraphQLString,
   GraphQLID,
   GraphQLNonNull,
   getNamedType,
 } from 'graphql';
+import { TypeComposer, InputTypeComposer } from 'graphql-compose';
+import { composeWithRelay } from '../composeWithRelay';
+import { userTypeComposer } from '../__mocks__/userTypeComposer';
+import { toGlobalId } from '../globalId';
+
 
 describe('MutationMiddleware', () => {
   composeWithRelay(userTypeComposer);

src/__tests__/nodeFieldConfig-test.js

@@ -1,11 +1,12 @@
 import { expect } from 'chai';
-import { findByIdResolver } from '../__mocks__/userTypeComposer';
-import { toGlobalId } from '../globalId';
-import { getNodeFieldConfig } from '../nodeFieldConfig';
 import {
   GraphQLInterfaceType,
   GraphQLNonNull,
 } from 'graphql';
+import { findByIdResolver } from '../__mocks__/userTypeComposer';
+import { toGlobalId } from '../globalId';
+import { getNodeFieldConfig } from '../nodeFieldConfig';
+
 
 describe('nodeFieldConfig', () => {
   const typeToFindByIdMap = {

src/composeWithRelay.js

@@ -1,11 +1,11 @@
 /* @flow */
 /* eslint-disable no-use-before-define */
 
+import { GraphQLID, GraphQLNonNull } from 'graphql';
 import { TypeComposer } from 'graphql-compose';
 import NodeInterface from './nodeInterface';
 import MutationMiddleware from './mutationMiddleware';
 import { toGlobalId } from './globalId';
-import { GraphQLID, GraphQLNonNull } from 'graphql';
 import { getNodeFieldConfig } from './nodeFieldConfig';
 
 // all wrapped typeComposers with Relay, stored in this variable

src/definition.js

@@ -12,6 +12,14 @@ import type {
   GraphQLResolveInfo as _GraphQLResolveInfo,
 } from 'graphql-compose/lib/definition.js';
 
+import type {
+  TypeComposer as _TypeComposer,
+  Resolver as _Resolver,
+} from 'graphql-compose';
+
+
+export type ObjectMap = { [optName: string]: mixed };
+
 export type ResolverMWArgsFn = _ResolverMWArgsFn;
 export type ResolverMWArgs = _ResolverMWArgs;
 
@@ -23,11 +31,6 @@ export type ResolverMWOutputType = _ResolverMWOutputType;
 
 export type GraphQLResolveInfo = _GraphQLResolveInfo;
 
-import type {
-  TypeComposer as _TypeComposer,
-  Resolver as _Resolver,
-} from 'graphql-compose';
-
 export type Resolver = _Resolver;
 export type ResolveParams = _ResolveParams;
 export type TypeComposer = _TypeComposer;

src/nodeFieldConfig.js

@@ -7,6 +7,7 @@ import { fromGlobalId } from './globalId';
 import NodeInterface from './nodeInterface';
 import type { TypeFindByIdMap, GraphQLResolveInfo } from './definition.js';
 
+
 // this fieldConfig must be set to RootQuery.node field
 export function getNodeFieldConfig(typeToFindByIdMap: TypeFindByIdMap) {
   return {