import graphql-compose as normal module, rather than dev relative path

Author: nodkz

.flowconfig

@@ -4,7 +4,7 @@
 .*/dist/.*
 .*/coverage/.*
 .*/resources/.*
-.*/node_modules/graphql.*
+.*/node_modules/graphql/.*
 
 [include]
 ../graphql-compose/src
@@ -15,5 +15,7 @@
 [options]
 esproposal.class_instance_fields=enable
 suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
-module.name_mapper='^graphql\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose/__forks__/graphql-js/src\1'
-module.name_mapper='graphql-compose\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose\1'
+module.name_mapper='^graphql-compose/lib/definition.js$' -> '/Users/nod/www/_npm/graphql-compose/src/definition.js'
+module.name_mapper='^graphql-compose\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose/src\1'
+module.name_mapper='^graphql$' -> '/Users/nod/www/_npm/graphql-compose/__forks__/graphql-js/src'
+module.name_mapper='^graphql/type/definition.js$' -> '/Users/nod/www/_npm/graphql-compose/__forks__/graphql-js/src/type/definition.js'

src/__tests__/fieldConverter-test.js

@@ -20,7 +20,7 @@ import {
   GraphQLBoolean,
   GraphQLList,
   GraphQLEnumType,
-} from 'graphql/type';
+} from 'graphql';
 import GraphQLMongoID from '../types/mongoid';
 
 import {

src/definition.js

@@ -80,7 +80,7 @@ import type {
   GraphQLFieldConfigArgumentMap as _GraphQLFieldConfigArgumentMap,
   ResolverMWResolveFn as _ResolverMWResolveFn,
   GraphQLResolveInfo as _GraphQLResolveInfo,
-} from 'graphql-compose/lib/definition';
+} from 'graphql-compose/lib/definition.js';
 
 export type GraphQLObjectType = _GraphQLObjectType;
 export type GraphQLOutputType = _GraphQLOutputType;

src/fieldsConverter.js

@@ -3,7 +3,13 @@
 
 import mongoose from 'mongoose';
 import objectPath from 'object-path';
-import TypeComposer from 'graphql-compose/lib/typeComposer';
+import {
+  TypeComposer,
+  GraphQLDate,
+  GraphQLBuffer,
+  GraphQLGeneric,
+  GQLReference,
+} from 'graphql-compose';
 
 import {
   GraphQLString,
@@ -12,16 +18,9 @@ import {
   GraphQLList,
   GraphQLEnumType,
   GraphQLObjectType,
-} from 'graphql/type';
+} from 'graphql';
 import GraphQLMongoID from './types/mongoid';
 
-import {
-  GraphQLDate,
-  GraphQLBuffer,
-  GraphQLGeneric,
-  GQLReference,
-} from 'graphql-compose/lib/type';
-
 import type {
   MongooseModelT,
   MongooseFieldT,

src/modelConverter.js

@@ -2,8 +2,7 @@
 /* eslint-disable no-use-before-define */
 
 import { convertModelToGraphQL } from './fieldsConverter';
-import TypeComposer from 'graphql-compose/lib/typeComposer';
-import type InputTypeComposer from 'graphql-compose/lib/inputTypeComposer';
+import { TypeComposer, InputTypeComposer } from 'graphql-compose';
 import * as resolvers from './resolvers';
 
 import type {

src/resolvers/__tests__/createOne-test.js

@@ -7,7 +7,7 @@ import Resolver from 'graphql-compose/lib/resolver/resolver';
 import TypeComposer from 'graphql-compose/lib/typeComposer';
 import { convertModelToGraphQL } from '../../fieldsConverter';
 import GraphQLMongoID from '../../types/mongoid';
-import { GraphQLNonNull } from 'graphql/type';
+import { GraphQLNonNull } from 'graphql';
 
 const UserType = convertModelToGraphQL(UserModel, 'User');
 

src/resolvers/__tests__/updateOne-test.js

@@ -7,7 +7,7 @@ import Resolver from 'graphql-compose/lib/resolver/resolver';
 import TypeComposer from 'graphql-compose/lib/typeComposer';
 import { convertModelToGraphQL } from '../../fieldsConverter';
 import GraphQLMongoID from '../../types/mongoid';
-import { GraphQLNonNull } from 'graphql/type';
+import { GraphQLNonNull } from 'graphql';
 
 const UserType = convertModelToGraphQL(UserModel, 'User');
 

src/resolvers/count.js

@@ -6,7 +6,7 @@ import type {
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import Resolver from 'graphql-compose/lib/resolver/resolver';
+import { Resolver } from 'graphql-compose';
 import { GraphQLInt, GraphQLObjectType } from 'graphql';
 
 import { filterHelperArgs, filterHelper } from './helpers/filter';

src/resolvers/createOne.js

@@ -9,7 +9,7 @@ import type {
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import Resolver from 'graphql-compose/lib/resolver/resolver';
+import { Resolver } from 'graphql-compose';
 
 
 export default function createOne(

src/resolvers/findById.js

@@ -5,7 +5,7 @@ import type {
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import Resolver from 'graphql-compose/lib/resolver/resolver';
+import { Resolver } from 'graphql-compose';
 
 import {
   GraphQLNonNull,