fix(Dependencies): Fix due changes in [email protected]

Author: nodkz

package.json

@@ -56,18 +56,6 @@
     "sane": "1.4.1",
     "semantic-release": "4.3.5"
   },
-  "scripts": {
-    "build": "npm run build-cjs && npm run build-flow && npm run build-es",
-    "build-cjs": "rimraf lib && babel src --ignore __tests__,__mocks__ -d lib",
-    "build-es": "rimraf es && BABEL_ENV=es babel src --ignore __tests__,__mocks__ -d es",
-    "build-flow": "find ./src -name '*.js' -not -path '*/__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\/lib\\//g'`.flow; done",
-    "coverage": "nyc npm run test",
-    "lint": "eslint src test *.js",
-    "test": "babel-node ./node_modules/.bin/_mocha --compilers js:babel-core/register --reporter dot --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
-    "watch": "babel-node ./resources/watch.js",
-    "link": "npm link graphql && npm link graphql-compose && npm link",
-    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
-  },
   "dependencies": {
     "babel-runtime": "6.11.6"
   },
@@ -87,5 +75,17 @@
       "lcov",
       "text"
     ]
+  },
+  "scripts": {
+    "build": "npm run build-cjs && npm run build-flow && npm run build-es",
+    "build-cjs": "rimraf lib && babel src --ignore __tests__,__mocks__ -d lib",
+    "build-es": "rimraf es && BABEL_ENV=es babel src --ignore __tests__,__mocks__ -d es",
+    "build-flow": "find ./src -name '*.js' -not -path '*/__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\/lib\\//g'`.flow; done",
+    "coverage": "nyc npm run test",
+    "lint": "eslint src test *.js",
+    "test": "babel-node ./node_modules/.bin/_mocha --compilers js:babel-core/register --reporter dot --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
+    "watch": "babel-node ./resources/watch.js",
+    "link": "npm link graphql && npm link graphql-compose && npm link",
+    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   }
 }

resources/watch.js

@@ -128,7 +128,7 @@ function runTests(filepaths) {
       ['src/**/__tests__/**/*-test.js']
   );
   // console.log(cmd);
-  return exec('babel-node', cmd).catch(() => false);
+  return exec('node', cmd).catch(() => false);
 }
 
 function lintFiles(filepaths) {

src/__mocks__/userTypeComposer.js

@@ -130,7 +130,7 @@ function sortUserList(list, sortValue = {}) {
   return list;
 }
 
-export const findManyResolver = new Resolver(userTypeComposer, {
+export const findManyResolver = new Resolver({
   name: 'findMany',
   kind: 'query',
   outputType: UserType,
@@ -167,8 +167,10 @@ export const findManyResolver = new Resolver(userTypeComposer, {
     return Promise.resolve(list);
   },
 });
+userTypeComposer.setResolver('findMany', findManyResolver);
 
-export const countResolver = new Resolver(userTypeComposer, {
+
+export const countResolver = new Resolver({
   name: 'count',
   kind: 'query',
   outputType: GraphQLInt,
@@ -184,6 +186,7 @@ export const countResolver = new Resolver(userTypeComposer, {
     );
   },
 });
+userTypeComposer.setResolver('count', countResolver);
 
 
 export const sortOptions = {

src/resolvers/__tests__/connectionResolver-test.js renamed to src/__tests__/connectionResolver-test.js

@@ -3,14 +3,14 @@
 import { expect } from 'chai';
 import { GraphQLInt } from 'graphql';
 import { Resolver } from 'graphql-compose';
-import { userTypeComposer, userList, sortOptions } from '../../__mocks__/userTypeComposer';
-import { dataToCursor } from '../../cursor';
+import { userTypeComposer, userList, sortOptions } from '../__mocks__/userTypeComposer';
+import { dataToCursor } from '../cursor';
 import {
   prepareConnectionResolver,
   prepareFilter,
   preparePageInfo,
 } from '../connectionResolver';
-import Cursor from '../../types/cursorType';
+import Cursor from '../types/cursorType';
 
 
 describe('connectionResolver', () => {

src/composeWithConnection.js

@@ -4,7 +4,7 @@ import { TypeComposer } from 'graphql-compose';
 import type {
   composeWithConnectionOpts,
 } from './definition.js';
-import { prepareConnectionResolver } from './resolvers/connectionResolver';
+import { prepareConnectionResolver } from './connectionResolver';
 
 export function composeWithConnection(
   typeComposer: TypeComposer,
@@ -27,6 +27,6 @@ export function composeWithConnection(
     opts
   );
 
-  typeComposer.addResolver(resolver);
+  typeComposer.setResolver('connection', resolver);
   return typeComposer;
 }

src/resolvers/connectionResolver.js renamed to src/connectionResolver.js

@@ -9,11 +9,11 @@ import type {
   composeWithConnectionOpts,
   connectionSortOpts,
   GraphQLConnectionType,
-} from '../definition';
-import { prepareConnectionType } from '../types/connectionType';
-import { prepareSortType } from '../types/sortInputType';
-import CursorType from '../types/cursorType';
-import { cursorToData, dataToCursor } from '../cursor';
+} from './definition';
+import { prepareConnectionType } from './types/connectionType';
+import { prepareSortType } from './types/sortInputType';
+import CursorType from './types/cursorType';
+import { cursorToData, dataToCursor } from './cursor';
 
 export function prepareConnectionResolver(
   typeComposer: TypeComposer,
@@ -33,7 +33,7 @@ export function prepareConnectionResolver(
                   + `should have resolver with name '${opts.countResolverName}' `
                   + 'due opts.countResolverName.');
   }
-  const countResolve = countResolver.composeResolve();
+  const countResolve = countResolver.getResolve();
 
   if (!opts.findResolverName) {
     throw new Error(`TypeComposer(${typeComposer.getTypeName()}) provided to composeWithConnection `
@@ -45,7 +45,7 @@ export function prepareConnectionResolver(
                   + `should have resolver with name '${opts.findResolverName}' `
                   + 'due opts.countResolverName.');
   }
-  const findManyResolve = findManyResolver.composeResolve();
+  const findManyResolve = findManyResolver.getResolve();
 
   const additionalArgs = {};
   if (findManyResolver.hasArg('filter')) {
@@ -54,7 +54,7 @@ export function prepareConnectionResolver(
 
   const sortEnumType = prepareSortType(typeComposer, opts);
 
-  return new Resolver(typeComposer, {
+  return new Resolver({
     outputType: prepareConnectionType(typeComposer),
     name: 'connection',
     kind: 'query',

src/index.js

@@ -3,3 +3,7 @@
 import { composeWithConnection } from './composeWithConnection';
 
 export default composeWithConnection;
+
+export {
+  composeWithConnection
+};