feat: Remove graphql-js peer-dependency. Using it via graphql-compose re-export.

Author: nodkz

src/__tests__/fieldConverter-test.js

@@ -1,17 +1,7 @@
 /* @flow */
 /* eslint-disable no-unused-expressions, no-template-curly-in-string */
 
-import {
-  GraphQLString,
-  GraphQLFloat,
-  GraphQLBoolean,
-  GraphQLList,
-  GraphQLEnumType,
-  GraphQLSchema,
-  GraphQLObjectType,
-  graphql,
-} from 'graphql';
-import { GraphQLDate, GraphQLBuffer, GraphQLGeneric, GraphQLJSON } from 'graphql-compose';
+import { GraphQLDate, GraphQLBuffer, GraphQLGeneric, GraphQLJSON, graphql } from 'graphql-compose';
 import { UserModel } from '../__mocks__/userModel';
 import {
   deriveComplexType,
@@ -29,6 +19,16 @@ import {
 import { composeWithMongoose } from '../composeWithMongoose';
 import GraphQLMongoID from '../types/mongoid';
 
+const {
+  GraphQLString,
+  GraphQLFloat,
+  GraphQLBoolean,
+  GraphQLList,
+  GraphQLEnumType,
+  GraphQLSchema,
+  GraphQLObjectType,
+} = graphql;
+
 describe('fieldConverter', () => {
   const fields = getFieldsFromModel(UserModel);
   const fieldNames = Object.keys(fields);
@@ -197,7 +197,7 @@ describe('fieldConverter', () => {
         name: 'Test empty subDoc',
       });
       await user.save();
-      const result = await graphql(
+      const result = await graphql.graphql(
         schema,
         `{
         user(_id: "${user._id}") {
@@ -239,7 +239,7 @@ describe('fieldConverter', () => {
         subDoc: { field2: { field21: 'ok' } },
       });
       await user2.save();
-      const result2 = await graphql(
+      const result2 = await graphql.graphql(
         schema,
         `{
         user(_id: "${user2._id}") {
@@ -322,7 +322,7 @@ describe('fieldConverter', () => {
           someDynamic
         }
       }`;
-      const result = await graphql(schema, query);
+      const result = await graphql.graphql(schema, query);
       expect(result.data.user.name).toBe(user.name);
       expect(result.data.user.someDynamic).toEqual(user.someDynamic);
     });

src/definition.js

@@ -86,14 +86,14 @@ import type {
   GraphQLObjectType as _GraphQLObjectType,
   GraphQLOutputType as _GraphQLOutputType,
   ResolveParams as _ResolveParams,
-  GraphQLFieldConfigArgumentMap as _GraphQLFieldConfigArgumentMap,
+  ComposeFieldConfigArgumentMap as _ComposeFieldConfigArgumentMap,
   ResolverMWResolveFn as _ResolverMWResolveFn,
   GraphQLResolveInfo as _GraphQLResolveInfo,
 } from 'graphql-compose/lib/definition.js';
 
 export type GraphQLObjectType = _GraphQLObjectType;
 export type GraphQLOutputType = _GraphQLOutputType;
-export type GraphQLFieldConfigArgumentMap = _GraphQLFieldConfigArgumentMap;
+export type ComposeFieldConfigArgumentMap = _ComposeFieldConfigArgumentMap;
 export type ResolveParams<TSource, TContext> = _ResolveParams<TSource, TContext>;
 export type GraphQLResolveInfo = _GraphQLResolveInfo;
 export type ResolverMWResolveFn<TSource, TContext> = _ResolverMWResolveFn<TSource, TContext>;

src/fieldsConverter.js

@@ -9,16 +9,9 @@ import {
   GraphQLBuffer,
   GraphQLGeneric,
   GraphQLJSON,
+  graphql,
 } from 'graphql-compose';
 
-import {
-  GraphQLString,
-  GraphQLFloat,
-  GraphQLBoolean,
-  GraphQLList,
-  GraphQLEnumType,
-  GraphQLObjectType,
-} from 'graphql';
 import GraphQLMongoID from './types/mongoid';
 import typeStorage from './typeStorage';
 
@@ -32,6 +25,15 @@ import type {
   GraphQLOutputType,
 } from './definition';
 
+const {
+  GraphQLString,
+  GraphQLFloat,
+  GraphQLBoolean,
+  GraphQLList,
+  GraphQLEnumType,
+  GraphQLObjectType,
+} = graphql;
+
 export const ComplexTypes = {
   ARRAY: 'ARRAY',
   EMBEDDED: 'EMBEDDED',

src/resolvers/__tests__/count-test.js

@@ -1,12 +1,13 @@
 /* @flow */
 
-import { GraphQLInt } from 'graphql';
-import { Resolver } from 'graphql-compose';
+import { Resolver, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import count from '../count';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLInt } = graphql;
+
 describe('count() ->', () => {
   let UserTypeComposer;
 

src/resolvers/__tests__/createOne-test.js

@@ -1,14 +1,15 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
-import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
-import { Resolver, TypeComposer } from 'graphql-compose';
+import { Resolver, TypeComposer, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import createOne from '../createOne';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import GraphQLMongoID from '../../types/mongoid';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLNonNull, GraphQLObjectType } = graphql;
+
 describe('createOne() ->', () => {
   let UserTypeComposer;
 

src/resolvers/__tests__/findById-test.js

@@ -1,14 +1,15 @@
 /* @flow */
 
-import { GraphQLNonNull } from 'graphql';
-import { Resolver } from 'graphql-compose';
+import { Resolver, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import { PostModel } from '../../__mocks__/postModel';
 import findById from '../findById';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLNonNull } = graphql;
+
 describe('findById() ->', () => {
   let UserTypeComposer;
   let PostTypeComposer;

src/resolvers/__tests__/findByIds-test.js

@@ -1,14 +1,15 @@
 /* @flow */
 
-import { GraphQLNonNull, GraphQLList } from 'graphql';
-import { Resolver } from 'graphql-compose';
+import { Resolver, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import { PostModel } from '../../__mocks__/postModel';
 import findByIds from '../findByIds';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLNonNull, GraphQLList } = graphql;
+
 describe('findByIds() ->', () => {
   let UserTypeComposer;
   let PostTypeComposer;

src/resolvers/__tests__/findOne-test.js

@@ -1,12 +1,13 @@
 /* @flow */
 
-import { GraphQLNonNull } from 'graphql';
-import { Resolver } from 'graphql-compose';
+import { Resolver, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import findOne from '../findOne';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLNonNull } = graphql;
+
 describe('findOne() ->', () => {
   let UserTypeComposer;
 

src/resolvers/__tests__/removeById-test.js

@@ -1,14 +1,15 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
-import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
-import { Resolver, TypeComposer } from 'graphql-compose';
+import { Resolver, TypeComposer, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import removeById from '../removeById';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLNonNull, GraphQLObjectType } = graphql;
+
 describe('removeById() ->', () => {
   let UserTypeComposer;
 
@@ -66,7 +67,7 @@ describe('removeById() ->', () => {
           _id: user.id,
         },
       });
-      expect(result).toHaveProperty('recordId', user.id);
+      expect(result.recordId).toBe(user.id);
     });
 
     it('should return error if document does not exist', () => {

src/resolvers/__tests__/removeMany-test.js

@@ -1,13 +1,14 @@
 /* @flow */
 
-import { GraphQLInt, GraphQLNonNull, GraphQLObjectType } from 'graphql';
 import { Query } from 'mongoose';
-import { Resolver, TypeComposer } from 'graphql-compose/';
+import { Resolver, TypeComposer, graphql } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import removeMany from '../removeMany';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
+const { GraphQLInt, GraphQLNonNull, GraphQLObjectType } = graphql;
+
 describe('removeMany() ->', () => {
   let UserTypeComposer;
 
@@ -99,7 +100,7 @@ describe('removeMany() ->', () => {
           filter: { gender: 'female' },
         },
       });
-      expect(result).toHaveProperty('numAffected', 2);
+      expect(result.numAffected).toBe(2);
     });
 
     it('should call `beforeQuery` method with non-executed `query` as arg', async () => {
@@ -115,7 +116,7 @@ describe('removeMany() ->', () => {
         },
       });
       expect(beforeQueryCalled).toBe(true);
-      expect(result).toHaveProperty('numAffected', 2);
+      expect(result.numAffected).toBe(2);
     });
   });