fix(Dependencies): Fix due changes in graphql-compose@1.0.0

Author: nodkz

package.json

@@ -25,12 +25,11 @@
   "homepage": "https://github.com/nodkz/graphql-compose-mongoose",
   "dependencies": {
     "babel-runtime": "6.11.6",
-    "graphql-type-json": "0.1.3",
     "object-path": "0.11.2"
   },
   "peerDependencies": {
     "graphql": ">=0.7.1 || >=0.8.0",
-    "graphql-compose": ">=0.1.0 || >=1.0.0",
+    "graphql-compose": ">=1.0.0",
     "graphql-compose-connection": ">=1.0.0",
     "mongoose": ">=4.0.0"
   },
@@ -62,18 +61,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 --timeout 20000 --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
-    "watch": "babel-node ./resources/watch.js",
-    "link": "npm link graphql && npm link graphql-compose && npm link graphql-compose-connection && npm link mongoose && npm link",
-    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
-  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
@@ -90,5 +77,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 --timeout 20000 --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
+    "watch": "babel-node ./resources/watch.js",
+    "link": "npm link graphql && npm link graphql-compose && npm link graphql-compose-connection && npm link mongoose && npm link",
+    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   }
 }

src/__mocks__/mongooseCommon.js

@@ -14,6 +14,9 @@ mongoose.connection.on('error', (err) => {
   throw new Error(err);
 });
 
+mongoose.connection.on('connected', () => {
+  console.log('Mongoose default connection open to ' + uri);
+});
 
 function dropDBs(done) {
   mongoose.connection.db.dropDatabase(() => {

src/__tests__/composeWithMongoose-test.js

@@ -129,14 +129,14 @@ describe('composeWithMongoose ->', () => {
     describe('createResolvers()', () => {
       it('should not be called if opts.resolvers === false', () => {
         const tc = composeWithMongoose(UserModel, { resolvers: false });
-        expect(tc.getResolvers().getKeys()).is.empty;
+        expect(tc.getResolvers().keys()).is.empty;
       });
 
       it('should be called if opts.resolvers not exists or has value', () => {
         const tc = composeWithMongoose(UserModel);
-        expect(tc.getResolvers().getKeys()).is.not.empty;
+        expect(Array.from(tc.getResolvers().keys())).is.not.empty;
         const tc2 = composeWithMongoose(UserModel, { resolvers: {} });
-        expect(tc2.getResolvers().getKeys()).is.not.empty;
+        expect(Array.from(tc2.getResolvers().keys())).is.not.empty;
       });
 
       it('should not provide resolver if opts.resolvers.[resolverName] === false', () => {
@@ -149,7 +149,7 @@ describe('composeWithMongoose ->', () => {
             },
           },
         });
-        const resolverKeys = tc2.getResolvers().getKeys();
+        const resolverKeys = Array.from(tc2.getResolvers().keys());
         expect(resolverKeys).to.not.include('removeById');
         expect(resolverKeys).include.members(['findMany', 'updateOne', 'updateMany']);
       });

src/__tests__/fieldConverter-test.js

@@ -11,13 +11,13 @@ import {
   GraphQLObjectType,
   graphql,
 } from 'graphql';
-import GraphQLJSON from 'graphql-type-json';
 import {
   GraphQLDate,
   GraphQLBuffer,
   GraphQLGeneric,
+  GraphQLJSON,
 } from 'graphql-compose';
-import { UserModel } from '../__mocks__/userModel.js';
+import { UserModel } from '../__mocks__/userModel';
 import {
   deriveComplexType,
   getFieldsFromModel,
@@ -33,14 +33,6 @@ import {
 import { composeWithMongoose } from '../composeWithMongoose';
 import GraphQLMongoID from '../types/mongoid';
 
-/*
-Object.prototype.getClassName = function getClassName() {
-  const funcNameRegex = /function (.{1,})\(/;
-  const results = (funcNameRegex).exec((this).constructor.toString());
-  return (results && results.length > 1) ? results[1] : '';
-};
-*/
-
 describe('fieldConverter', () => {
   const fields = getFieldsFromModel(UserModel);
   const fieldNames = Object.keys(fields);

src/composeWithMongoose.js

@@ -37,7 +37,7 @@ export function composeWithMongoose(
 
   createInputType(typeComposer, opts.inputType);
 
-  if (!opts.hasOwnProperty('resolvers') || opts.resolvers !== false) {
+  if (!{}.hasOwnProperty.call(opts, 'resolvers') || opts.resolvers !== false) {
     createResolvers(model, typeComposer, opts.resolvers || {});
   }
 
@@ -111,21 +111,21 @@ export function createResolvers(
   opts: typeConverterResolversOpts
 ): void {
   const names = resolvers.getAvailableNames();
-  names.forEach(resolverName => {
-    if (!opts.hasOwnProperty(resolverName) || opts[resolverName] !== false) {
+  names.forEach((resolverName) => {
+    if (!{}.hasOwnProperty.call(opts, resolverName) || opts[resolverName] !== false) {
       const createResolverFn = resolvers[resolverName];
       if (createResolverFn) {
         const resolver = createResolverFn(
           model,
           typeComposer,
           opts[resolverName] || {}
         );
-        typeComposer.setResolver(resolver);
+        typeComposer.setResolver(resolverName, resolver);
       }
     }
   });
 
-  if (!opts.hasOwnProperty('connection') || opts.connection !== false) {
+  if (!{}.hasOwnProperty.call(opts, 'connection') || opts.connection !== false) {
     prepareConnectionResolver(typeComposer, opts.connection ? opts.connection : {});
   }
 }

src/fieldsConverter.js

@@ -8,6 +8,7 @@ import {
   GraphQLDate,
   GraphQLBuffer,
   GraphQLGeneric,
+  GraphQLJSON,
   GQLReference,
 } from 'graphql-compose';
 
@@ -19,7 +20,6 @@ import {
   GraphQLEnumType,
   GraphQLObjectType,
 } from 'graphql';
-import GraphQLJSON from 'graphql-type-json';
 import GraphQLMongoID from './types/mongoid';
 import typeStorage from './typeStorage';
 

src/index.js

@@ -7,5 +7,6 @@ export default composeWithMongoose;
 
 export * from './fieldsConverter';
 export {
+  composeWithMongoose,
   typeStorage as mongooseTypeStorage,
 };

src/resolvers/__tests__/count-test.js

@@ -3,7 +3,7 @@
 import { expect } from 'chai';
 import { GraphQLInt } from 'graphql';
 import { Resolver } from 'graphql-compose';
-import { UserModel } from '../../__mocks__/userModel.js';
+import { UserModel } from '../../__mocks__/userModel';
 import count from '../count';
 import { composeWithMongoose } from '../../composeWithMongoose';
 

src/resolvers/__tests__/createOne-test.js

@@ -1,9 +1,9 @@
 /* @flow */
 
 import { expect } from 'chai';
-import { GraphQLNonNull } from 'graphql';
+import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
 import { Resolver, TypeComposer } from 'graphql-compose';
-import { UserModel } from '../../__mocks__/userModel.js';
+import { UserModel } from '../../__mocks__/userModel';
 import createOne from '../createOne';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import GraphQLMongoID from '../../types/mongoid';
@@ -130,9 +130,13 @@ describe('createOne() ->', () => {
 
     it('should reuse existed outputType', () => {
       const outputTypeName = `CreateOne${UserTypeComposer.getTypeName()}Payload`;
-      typeStorage.set(outputTypeName, 'EXISTED_TYPE');
+      const existedType = new GraphQLObjectType({
+        name: outputTypeName,
+        fields: () => ({}),
+      });
+      typeStorage.set(outputTypeName, existedType);
       const outputType = createOne(UserModel, UserTypeComposer).getOutputType();
-      expect(outputType).to.equal('EXISTED_TYPE');
+      expect(outputType).to.equal(existedType);
     });
   });
 });

src/resolvers/__tests__/findById-test.js

@@ -3,7 +3,7 @@
 import { expect } from 'chai';
 import { GraphQLNonNull } from 'graphql';
 import { Resolver } from 'graphql-compose';
-import { UserModel } from '../../__mocks__/userModel.js';
+import { UserModel } from '../../__mocks__/userModel';
 import findById from '../findById';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';