feat: Migrate on graphql-compose 2.9.0

Author: nodkz

package.json

@@ -24,33 +24,33 @@
   },
   "homepage": "https://github.com/nodkz/graphql-compose-pagination",
   "peerDependencies": {
-    "graphql-compose": ">=1.20.3 || >=2.0.0"
+    "graphql-compose": ">=1.20.3 || >=2.9.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
+    "babel-cli": "^6.26.0",
     "babel-eslint": "^7.2.3",
-    "babel-jest": "^20.0.3",
+    "babel-jest": "^21.0.0",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
     "cz-conventional-changelog": "^2.0.0",
-    "eslint": "^4.4.0",
-    "eslint-config-airbnb-base": "^11.3.1",
-    "eslint-config-prettier": "^2.3.0",
-    "eslint-plugin-flowtype": "^2.35.0",
+    "eslint": "^4.6.1",
+    "eslint-config-airbnb-base": "^12.0.0",
+    "eslint-config-prettier": "^2.4.0",
+    "eslint-plugin-flowtype": "^2.35.1",
     "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-prettier": "^2.1.2",
-    "flow-bin": "^0.52.0",
-    "graphql": "^0.10.5",
-    "graphql-compose": "^2.2.0",
-    "jest": "^20.0.4",
-    "prettier": "^1.5.3",
+    "eslint-plugin-prettier": "^2.2.0",
+    "flow-bin": "^0.54.1",
+    "graphql": "^0.11.3",
+    "graphql-compose": "^2.9.0",
+    "jest": "^21.0.1",
+    "prettier": "^1.6.1",
     "rimraf": "^2.6.1",
-    "semantic-release": "^6.3.6"
+    "semantic-release": "^7.0.2"
   },
   "dependencies": {
-    "babel-runtime": "^6.25.0"
+    "babel-runtime": "^6.26.0"
   },
   "config": {
     "commitizen": {

src/composeWithPagination.js

@@ -1,9 +1,14 @@
 /* @flow */
 
 import { TypeComposer } from 'graphql-compose';
-import type { ComposeWithPaginationOpts } from './definition';
 import { preparePaginationResolver } from './paginationResolver';
 
+export type ComposeWithPaginationOpts = {
+  findResolverName: string,
+  countResolverName: string,
+  perPage?: number,
+};
+
 export function composeWithPagination(
   typeComposer: TypeComposer,
   opts: ComposeWithPaginationOpts

src/definition.js

@@ -5,3 +5,5 @@ import { composeWithPagination } from './composeWithPagination';
 export default composeWithPagination;
 
 export { composeWithPagination };
+
+export type { ComposeWithPaginationOpts } from './composeWithPagination';

src/index.js

@@ -2,15 +2,42 @@
 /* eslint-disable no-param-reassign, no-use-before-define */
 
 import { Resolver, TypeComposer } from 'graphql-compose';
-import type {
-  ResolveParams,
-  PaginationResolveParams,
-  GraphQLPaginationType,
-  ComposeWithPaginationOpts,
-} from './definition';
+import type { ResolveParams, ProjectionType } from 'graphql-compose';
+import type { GraphQLResolveInfo } from 'graphql-compose/lib/graphql';
+import type { ComposeWithPaginationOpts } from './composeWithPagination';
 import preparePaginationType from './types/paginationType';
 
-const defaultPerPage = 20;
+const DEFAULT_PER_PAGE = 20;
+
+export type PaginationResolveParams<TSource, TContext> = {
+  source: TSource,
+  args: {
+    page?: ?number,
+    perPage?: ?number,
+    sort?: any,
+    filter?: { [fieldName: string]: any },
+    [argName: string]: any,
+  },
+  context: TContext,
+  info: GraphQLResolveInfo,
+  projection: $Shape<ProjectionType>,
+  [opt: string]: any,
+};
+
+export type PaginationType = {|
+  count: number,
+  items: any[],
+  pageInfo: PaginationInfoType,
+|};
+
+export type PaginationInfoType = {|
+  currentPage: number,
+  perPage: number,
+  itemCount: number,
+  pageCount: number,
+  hasPreviousPage: boolean,
+  hasNextPage: boolean,
+|};
 
 export function preparePaginationResolver<TSource, TContext>(
   typeComposer: TypeComposer,
@@ -78,7 +105,7 @@ export function preparePaginationResolver<TSource, TContext>(
       perPage: {
         type: 'Int',
         description: '',
-        defaultValue: opts.perPage || defaultPerPage,
+        defaultValue: opts.perPage || DEFAULT_PER_PAGE,
       },
       ...additionalArgs,
     },
@@ -95,7 +122,7 @@ export function preparePaginationResolver<TSource, TContext>(
       if (page <= 0) {
         throw new Error('Argument `page` should be positive number.');
       }
-      const perPage = parseInt(args.perPage, 10) || opts.perPage || defaultPerPage;
+      const perPage = parseInt(args.perPage, 10) || opts.perPage || DEFAULT_PER_PAGE;
       if (perPage <= 0) {
         throw new Error('Argument `perPage` should be positive number.');
       }
@@ -147,7 +174,7 @@ export function preparePaginationResolver<TSource, TContext>(
       }
 
       return Promise.all([findManyPromise, countPromise]).then(([items, count]) => {
-        const result: GraphQLPaginationType = {
+        const result: PaginationType = {
           count,
           items: items.length > limit ? items.slice(0, limit) : items,
           pageInfo: {