feat: Migrate on graphql-compose 2.9.0

Author: nodkz

.travis.yml

@@ -7,9 +7,9 @@ cache:
 notifications:
   email: true
 node_js:
+  - "8"
   - "7"
   - "6"
-  - "5"
   - "4"
 before_install: yarn global add greenkeeper-lockfile@1
 before_script: greenkeeper-lockfile-update

package.json

@@ -23,33 +23,33 @@
   },
   "homepage": "https://github.com/nodkz/graphql-compose-connection",
   "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.5.2",
+    "babel-preset-env": "^1.6.0",
     "cz-conventional-changelog": "^2.0.0",
-    "eslint": "^4.0.0",
-    "eslint-config-airbnb-base": "^11.2.0",
-    "eslint-config-prettier": "^2.2.0",
-    "eslint-plugin-flowtype": "^2.34.0",
-    "eslint-plugin-import": "^2.3.0",
-    "eslint-plugin-prettier": "^2.1.2",
-    "flow-bin": "^0.52.0",
-    "graphql": "^0.10.3",
-    "graphql-compose": "^2.0.0",
-    "jest": "^20.0.4",
-    "prettier": "^1.4.4",
+    "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.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.2"
+    "semantic-release": "^7.0.2"
   },
   "dependencies": {
-    "babel-runtime": "^6.23.0"
+    "babel-runtime": "^6.26.0"
   },
   "config": {
     "commitizen": {

src/__mocks__/userTypeComposer.js

@@ -3,7 +3,7 @@
 
 import { TypeComposer, Resolver, graphql } from 'graphql-compose';
 
-import type { ConnectionSortMapOpts } from '../definition';
+import type { ConnectionSortMapOpts } from '../connectionResolver';
 
 const {
   GraphQLString,

src/__tests__/connectionResolver-test.js

@@ -580,7 +580,7 @@ describe('connectionResolver', () => {
           },
         });
         expect(result.edges).toHaveLength(3);
-        const cursor = result.edges[1].cursor;
+        const { cursor } = result.edges[1];
         const prev = await connectionResolver.resolve({
           args: {
             sort: sortOptions.ID_ASC.value,
@@ -759,7 +759,7 @@ describe('connectionResolver', () => {
         },
       });
       expect(result.edges).toHaveLength(3);
-      const cursor = result.edges[1].cursor;
+      const { cursor } = result.edges[1];
       const prev = await connectionResolver.resolve({
         args: {
           sort: { name: 1 },

src/composeWithConnection.js

@@ -1,8 +1,13 @@
 /* @flow */
 
 import { TypeComposer } from 'graphql-compose';
-import type { ComposeWithConnectionOpts } from './definition';
-import { prepareConnectionResolver } from './connectionResolver';
+import { prepareConnectionResolver, type ConnectionSortMapOpts } from './connectionResolver';
+
+export type ComposeWithConnectionOpts = {
+  findResolverName: string,
+  countResolverName: string,
+  sort: ConnectionSortMapOpts,
+};
 
 export function composeWithConnection(
   typeComposer: TypeComposer,

src/connectionResolver.js

@@ -2,18 +2,67 @@
 /* eslint-disable no-param-reassign, no-use-before-define */
 
 import { Resolver, TypeComposer } from 'graphql-compose';
-import type {
-  ResolveParams,
-  ConnectionResolveParams,
-  ComposeWithConnectionOpts,
-  ConnectionSortOpts,
-  ConnectionSortMapOpts,
-  GraphQLConnectionType,
-} from './definition';
+import type { ResolveParams, ProjectionType } from 'graphql-compose';
+import type { GraphQLResolveInfo } from 'graphql-compose/lib/graphql';
 import { prepareConnectionType } from './types/connectionType';
 import { prepareSortType } from './types/sortInputType';
 import CursorType from './types/cursorType';
-import { cursorToData, dataToCursor } from './cursor';
+import { cursorToData, dataToCursor, type CursorDataType } from './cursor';
+import type { ComposeWithConnectionOpts } from './composeWithConnection';
+
+export type ConnectionSortOpts = {
+  value: any,
+  cursorFields: string[],
+  beforeCursorQuery: (
+    rawQuery: any,
+    cursorData: CursorDataType,
+    resolveParams: ConnectionResolveParams<*, *>
+  ) => any,
+  afterCursorQuery: (
+    rawQuery: any,
+    cursorData: CursorDataType,
+    resolveParams: ConnectionResolveParams<*, *>
+  ) => any,
+};
+
+export type ConnectionSortMapOpts = {
+  [sortName: string]: ConnectionSortOpts,
+};
+
+export type ConnectionResolveParams<TSource, TContext> = {
+  source: TSource,
+  args: {
+    first?: ?number,
+    after?: string,
+    last?: ?number,
+    before?: string,
+    sort?: ConnectionSortOpts,
+    filter?: { [fieldName: string]: any },
+    [argName: string]: any,
+  },
+  context: TContext,
+  info: GraphQLResolveInfo,
+  projection: $Shape<ProjectionType>,
+  [opt: string]: any,
+};
+
+export type ConnectionType = {
+  count: number,
+  edges: ConnectionEdgeType[],
+  pageInfo: PageInfoType,
+};
+
+export type ConnectionEdgeType = {
+  cursor: string,
+  node: mixed,
+};
+
+export type PageInfoType = {
+  startCursor: string,
+  endCursor: string,
+  hasPreviousPage: boolean,
+  hasNextPage: boolean,
+};
 
 export function prepareConnectionResolver<TSource, TContext>(
   typeComposer: TypeComposer,
@@ -326,7 +375,7 @@ export function prepareLimitSkipFallback(
   return [newLimit, newSkip];
 }
 
-export function emptyConnection(): GraphQLConnectionType {
+export function emptyConnection(): ConnectionType {
   return {
     count: 0,
     edges: [],

src/cursor.js

@@ -1,13 +1,17 @@
 /* @flow */
 
-import type { CursorDataType } from './definition';
+export type CursorDataType =
+  | {
+      [fieldName: string]: any,
+    }
+  | any;
 
 export function base64(i: string): string {
-  return new Buffer(i, 'ascii').toString('base64');
+  return Buffer.from(i, 'ascii').toString('base64');
 }
 
 export function unbase64(i: string): string {
-  return new Buffer(i, 'base64').toString('ascii');
+  return Buffer.from(i, 'base64').toString('ascii');
 }
 
 export function cursorToData(cursor?: string | mixed): CursorDataType | number | null {

src/definition.js

@@ -6,3 +6,6 @@ import { cursorToData, dataToCursor } from './cursor';
 export default composeWithConnection;
 
 export { composeWithConnection, cursorToData, dataToCursor };
+
+export type { ComposeWithConnectionOpts } from './composeWithConnection';
+export type { ConnectionSortOpts, ConnectionSortMapOpts } from './connectionResolver';

src/index.js

@@ -8,7 +8,7 @@ const GraphQLConnectionCursor = new GraphQLScalarType({
   name: 'ConnectionCursor',
   description:
     'The `ConnectionCursor` is String type, that represents a point of record in data set. ' +
-      ' Due this point, you may request previous or next records.',
+    ' Due this point, you may request previous or next records.',
   serialize: String,
   parseValue: String,
   parseLiteral(ast) {