refactor: migrate code to [email protected]

Author: nodkz

src/__tests__/composeWithPagination-test.js

@@ -16,6 +16,7 @@ describe('composeWithRelay', () => {
   describe('basic checks', () => {
     it('should return ObjectTypeComposer', () => {
       expect(userComposer).toBeInstanceOf(ObjectTypeComposer);
+      expect(userComposer).toBe(UserTC);
     });
 
     it('should throw error if first arg is not ObjectTypeComposer', () => {
@@ -165,8 +166,8 @@ describe('composeWithRelay', () => {
   });
 
   it('should pass `countResolveParams` to top resolverParams', async () => {
+    // first build
     let topResolveParams: any = {};
-
     schemaComposer.Query.setField(
       'userPagination',
       UserTC.getResolver('pagination').wrapResolve(next => rp => {
@@ -181,13 +182,41 @@ describe('composeWithRelay', () => {
         count
       }
     }`;
-    await graphql(schema, query);
-
+    const res = await graphql(schema, query);
+    expect(res).toEqual({ data: { userPagination: { count: 15 } } });
     expect(Object.keys(topResolveParams.countResolveParams)).toEqual(
       expect.arrayContaining(['source', 'args', 'context', 'info', 'projection'])
     );
     expect(topResolveParams.countResolveParams.args).toEqual({
       filter: { age: 45 },
+      perPage: 5,
+    });
+
+    // second build
+    let topResolveParams2: any = {};
+    schemaComposer.Query.setField(
+      'userPagination',
+      UserTC.getResolver('pagination').wrapResolve(next => rp => {
+        const result = next(rp);
+        topResolveParams2 = rp;
+        return result;
+      })
+    );
+
+    const schema2 = schemaComposer.buildSchema();
+    const query2 = `{
+      userPagination(filter: { age: 333 }) {
+        count
+      }
+    }`;
+    const res2 = await graphql(schema2, query2);
+    expect(res2).toEqual({ data: { userPagination: { count: 15 } } });
+    expect(Object.keys(topResolveParams2.countResolveParams)).toEqual(
+      expect.arrayContaining(['source', 'args', 'context', 'info', 'projection'])
+    );
+    expect(topResolveParams2.countResolveParams.args).toEqual({
+      filter: { age: 333 },
+      perPage: 5,
     });
   });
 
@@ -204,18 +233,19 @@ describe('composeWithRelay', () => {
     );
     const schema = schemaComposer.buildSchema();
     const query = `{
-      userPagination(filter: { age: 45 }) {
+      userPagination(filter: { age: 55 }) {
         count
       }
     }`;
-    await graphql(schema, query);
+    const res = await graphql(schema, query);
+    expect(res).toEqual({ data: { userPagination: { count: 15 } } });
 
     expect(Object.keys(topResolveParams.findManyResolveParams)).toEqual(
       expect.arrayContaining(['source', 'args', 'context', 'info', 'projection'])
     );
 
     expect(topResolveParams.findManyResolveParams.args).toEqual({
-      filter: { age: 45 },
+      filter: { age: 55 },
       limit: 6,
       perPage: 5,
     });

src/__tests__/paginationResolver-test.js

@@ -337,7 +337,12 @@ describe('paginationResolver', () => {
       expect(spyCountResolve.mock.calls).toEqual([
         [
           {
-            args: { filter: {} },
+            args: {
+              filter: {},
+              sort: {
+                _id: 1,
+              },
+            },
             projection: { count: true, items: { name: true } },
             rawQuery: undefined,
           },

src/paginationResolver.js

@@ -4,7 +4,7 @@
 import type {
   Resolver,
   ObjectTypeComposer,
-  ResolveParams, // eslint-disable-line
+  ResolverResolveParams, // eslint-disable-line
   ProjectionType,
 } from 'graphql-compose';
 import type { GraphQLResolveInfo } from 'graphql-compose/lib/graphql';
@@ -128,9 +128,6 @@ export function preparePaginationResolver<TSource, TContext>(
       let countPromise;
       let findManyPromise;
       const { projection = {}, args, rawQuery } = rp;
-      const findManyParams: $Shape<ResolveParams<TSource, TContext, any>> = {
-        ...rp,
-      };
 
       const page = parseInt(args.page, 10) || 1;
       if (page <= 0) {
@@ -141,10 +138,11 @@ export function preparePaginationResolver<TSource, TContext>(
         throw new Error('Argument `perPage` should be positive number.');
       }
 
-      const countParams: $Shape<ResolveParams<TSource, TContext, any>> = {
+      const countParams: $Shape<ResolverResolveParams<TSource, TContext, any>> = {
         ...rp,
         rawQuery,
         args: {
+          ...rp.args,
           filter: { ...rp.args.filter },
         },
       };
@@ -158,6 +156,10 @@ export function preparePaginationResolver<TSource, TContext>(
         countPromise = Promise.resolve(0);
       }
 
+      const findManyParams: $Shape<ResolverResolveParams<TSource, TContext, any>> = {
+        ...rp,
+      };
+
       if (projection && projection.items) {
         // combine top level projection
         // (maybe somebody add additional fields via rp.projection)

src/types/__tests__/preparePaginationType-test.js

@@ -54,13 +54,6 @@ describe('preparePaginationTC()', () => {
     expect(items.name).toEqual('User');
   });
 
-  it('should have `ofType` property (like GraphQLList, GraphQLNonNull)', () => {
-    // this behavior needed for `graphql-compose` module in `projection` helper
-    // otherwise it incorrectly construct projectionMapper for tricky fields
-    const connectionType: any = preparePaginationTC(UserTC).getType();
-    expect(connectionType.ofType).toEqual(UserTC.getType());
-  });
-
   it('should return same type for same Type in ObjectTypeComposer', () => {
     const t1 = preparePaginationTC(UserTC);
     const t2 = preparePaginationTC(UserTC);

src/types/preparePaginationType.js

@@ -43,7 +43,6 @@ export function preparePaginationTC<TSource, TContext>(
 ): ObjectTypeComposer<TSource, TContext> {
   const schemaComposer = tc.schemaComposer;
   const name = `${tc.getTypeName()}${upperFirst(resolverName || 'pagination')}`;
-  const type = tc.getType();
 
   if (schemaComposer.has(name)) {
     return schemaComposer.getOTC(name);
@@ -68,10 +67,5 @@ export function preparePaginationTC<TSource, TContext>(
     },
   });
 
-  // This is small HACK for providing to graphql-compose/src/projection.js
-  // information about required fields in projection and relations
-  // $FlowFixMe
-  paginationTC.gqType.ofType = type;
-
   return paginationTC;
 }