fix: Flowtype definitions for graphql-compose@3.0.0

Author: nodkz

package.json

@@ -28,7 +28,7 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-eslint": "^8.2.1",
-    "babel-jest": "^22.2.0",
+    "babel-jest": "^22.2.2",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -42,8 +42,8 @@
     "eslint-plugin-prettier": "^2.6.0",
     "flow-bin": "^0.65.0",
     "graphql": "0.13.0",
-    "graphql-compose": "^3.0.0-beta.3",
-    "jest": "^22.2.1",
+    "graphql-compose": "^3.0.0-beta.5",
+    "jest": "^22.2.2",
     "prettier": "^1.10.2",
     "rimraf": "^2.6.2",
     "semantic-release": "^12.4.1"

src/__tests__/composeWithConnection-test.js

@@ -64,16 +64,14 @@ describe('composeWithRelay', () => {
     it('should has ConnectionType as type', () => {
       expect(type).toBeTruthy();
       expect(tc.getFieldNames()).toEqual(expect.arrayContaining(['count', 'pageInfo', 'edges']));
-      expect(tc.getFieldType('edges')).toBeInstanceOf(GraphQLNonNull);
-      expect(tc.getFieldType('edges').ofType).toBeInstanceOf(GraphQLList);
+      const edgesType: any = tc.getFieldType('edges');
+      expect(edgesType).toBeInstanceOf(GraphQLNonNull);
+      expect(edgesType.ofType).toBeInstanceOf(GraphQLList);
     });
   });
 
   it('should apply first sort ID_ASC by default', async () => {
-    rootQueryTC.setField(
-      'userConnection',
-      userTypeComposer.getResolver('connection').getFieldConfig()
-    );
+    rootQueryTC.setField('userConnection', userTypeComposer.getResolver('connection'));
     const schema = new GraphQLSchema({
       query: rootQueryTC.getType(),
     });
@@ -123,10 +121,7 @@ describe('composeWithRelay', () => {
   });
 
   it('should able to change `sort` on AGE_ID_DESC', async () => {
-    rootQueryTC.setField(
-      'userConnection',
-      userTypeComposer.getResolver('connection').getFieldConfig()
-    );
+    rootQueryTC.setField('userConnection', userTypeComposer.getResolver('connection'));
     const schema = new GraphQLSchema({
       query: rootQueryTC.getType(),
     });
@@ -178,10 +173,7 @@ describe('composeWithRelay', () => {
 
   describe('fragments fields projection of graphql-compose', () => {
     it('should return object', async () => {
-      rootQueryTC.setField(
-        'userConnection',
-        userTypeComposer.getResolver('connection').getFieldConfig()
-      );
+      rootQueryTC.setField('userConnection', userTypeComposer.getResolver('connection'));
       const schema = new GraphQLSchema({
         query: rootQueryTC.getType(),
       });
@@ -246,14 +238,11 @@ describe('composeWithRelay', () => {
 
     rootQueryTC.setField(
       'userConnection',
-      userTypeComposer
-        .getResolver('connection')
-        .wrapResolve(next => rp => {
-          const result = next(rp);
-          topResolveParams = rp;
-          return result;
-        })
-        .getFieldConfig()
+      userTypeComposer.getResolver('connection').wrapResolve(next => rp => {
+        const result = next(rp);
+        topResolveParams = rp;
+        return result;
+      })
     );
     const schema = new GraphQLSchema({
       query: rootQueryTC.getType(),
@@ -279,14 +268,11 @@ describe('composeWithRelay', () => {
 
     rootQueryTC.setField(
       'userConnection',
-      userTypeComposer
-        .getResolver('connection')
-        .wrapResolve(next => rp => {
-          const result = next(rp);
-          topResolveParams = rp;
-          return result;
-        })
-        .getFieldConfig()
+      userTypeComposer.getResolver('connection').wrapResolve(next => rp => {
+        const result = next(rp);
+        topResolveParams = rp;
+        return result;
+      })
     );
     const schema = new GraphQLSchema({
       query: rootQueryTC.getType(),

src/connectionResolver.js

@@ -66,7 +66,7 @@ export type PageInfoType = {
 export function prepareConnectionResolver<TSource, TContext>(
   typeComposer: TypeComposer,
   opts: ComposeWithConnectionOpts
-): Resolver<TSource, TContext> {
+): Resolver {
   if (!typeComposer || typeComposer.constructor.name !== 'TypeComposer') {
     throw new Error('First arg for prepareConnectionResolver() should be instance of TypeComposer');
   }

src/types/__tests__/connectionType-test.js

@@ -25,8 +25,9 @@ describe('types/connectionType.js', () => {
 
     it('should have field `node` with provided Type', () => {
       const tc = new TypeComposer(prepareEdgeType(userTypeComposer));
-      expect(tc.getFieldType('node')).toBeInstanceOf(GraphQLNonNull);
-      expect(tc.getFieldType('node').ofType).toBe(userTypeComposer.getType());
+      const nodeType: any = tc.getFieldType('node');
+      expect(nodeType).toBeInstanceOf(GraphQLNonNull);
+      expect(nodeType.ofType).toBe(userTypeComposer.getType());
     });
 
     it('should have field `cursor` with GraphQLNonNull(GraphQLString)', () => {
@@ -60,8 +61,9 @@ describe('types/connectionType.js', () => {
 
     it('should have field `count` with provided Type', () => {
       const tc = new TypeComposer(prepareConnectionType(userTypeComposer));
-      expect(tc.getFieldType('count')).toBeInstanceOf(GraphQLNonNull);
-      expect(tc.getFieldType('count').ofType).toBe(GraphQLInt);
+      const countType: any = tc.getFieldType('count');
+      expect(countType).toBeInstanceOf(GraphQLNonNull);
+      expect(countType.ofType).toBe(GraphQLInt);
     });
 
     it('should have field `pageInfo` with GraphQLNonNull(PageInfoType)', () => {
@@ -74,8 +76,9 @@ describe('types/connectionType.js', () => {
 
     it('should have field `edges` with GraphQLList(EdgeType)', () => {
       const tc = new TypeComposer(prepareConnectionType(userTypeComposer));
-      expect(tc.getFieldType('edges')).toBeInstanceOf(GraphQLNonNull);
-      expect(tc.getFieldType('edges').ofType).toBeInstanceOf(GraphQLList);
+      const edgesType: any = tc.getFieldType('edges');
+      expect(edgesType).toBeInstanceOf(GraphQLNonNull);
+      expect(edgesType.ofType).toBeInstanceOf(GraphQLList);
 
       const edges: any = getNamedType(tc.getFieldType('edges'));
       expect(edges.name).toEqual('UserEdge');