small fixes

Author: nodkz

src/__tests__/fieldConverter-test.js

@@ -21,8 +21,8 @@ import {
   GraphQLBoolean,
   GraphQLList,
   GraphQLEnumType,
-  GraphQLID,
 } from 'graphql/type';
+import GraphQLMongoID from '../types/mongoid';
 
 import {
   GraphQLDate,
@@ -117,7 +117,7 @@ describe('fieldConverter', () => {
       expect(scalarToGraphQL({ instance: 'String' })).to.equal(GraphQLString);
       expect(scalarToGraphQL({ instance: 'Number' })).to.equal(GraphQLFloat);
       expect(scalarToGraphQL({ instance: 'Boolean' })).to.equal(GraphQLBoolean);
-      expect(scalarToGraphQL({ instance: 'ObjectID' })).to.equal(GraphQLID);
+      expect(scalarToGraphQL({ instance: 'ObjectID' })).to.equal(GraphQLMongoID);
     });
 
     it('should properly convert mongoose scalar type to scalar graphql-compose types', () => {

src/definition.js

@@ -24,6 +24,8 @@ export type MongooseModelT = {
   findById(id: mixed, projection?: Object, options?: Object): MongooseQuery,
   find(conditions: ?Object, projection?: Object, options?: Object): MongooseQuery,
   findOneAndRemove(conditions: ?Object, options?: Object): MongooseQuery,
+  where(criteria: ObjectMap): MongooseQuery,
+  findByIdAndRemove(id: mixed, options?: Object): MongooseQuery,
 }
 
 export type MongooseFieldOptionsT = {
@@ -52,6 +54,8 @@ export type MongooseQuery = {
   limit(num: number): MongooseQuery,
   select(projection: ObjectMap): MongooseQuery,
   sort(fields: ObjectMap): MongooseQuery,
+  setOptions(opts: ObjectMap): MongooseQuery,
+  update(data: ObjectMap): MongooseQuery,
 };
 
 export type MongoseDocument = {

src/resolvers/__tests__/findOne-test.js

@@ -44,19 +44,21 @@ describe('findOne() ->', () => {
     expect(resolver).to.be.instanceof(Resolver);
   });
 
-  it('Resolver object should have `filter` arg', () => {
-    const resolver = findOne(UserModel, UserType);
-    expect(resolver.hasArg('filter')).to.be.true;
-  });
+  describe('Resolver.args', () => {
+    it('should have `filter` arg', () => {
+      const resolver = findOne(UserModel, UserType);
+      expect(resolver.hasArg('filter')).to.be.true;
+    });
 
-  it('Resolver object should have `skip` arg', () => {
-    const resolver = findOne(UserModel, UserType);
-    expect(resolver.hasArg('skip')).to.be.true;
-  });
+    it('should have `skip` arg', () => {
+      const resolver = findOne(UserModel, UserType);
+      expect(resolver.hasArg('skip')).to.be.true;
+    });
 
-  it('Resolver object should have `sort` arg', () => {
-    const resolver = findOne(UserModel, UserType);
-    expect(resolver.hasArg('sort')).to.be.true;
+    it('should have `sort` arg', () => {
+      const resolver = findOne(UserModel, UserType);
+      expect(resolver.hasArg('sort')).to.be.true;
+    });
   });
 
   describe('Resolver.resolve():Promise', () => {
@@ -91,4 +93,11 @@ describe('findOne() ->', () => {
       expect(`${result1._id}`).not.equal(`${result2._id}`);
     });
   });
+
+  describe('Resolver.getOutputType()', () => {
+    it('should return model type', () => {
+      const outputType = findOne(UserModel, UserType).getOutputType();
+      expect(outputType).to.equal(UserType);
+    });
+  });
 });

src/resolvers/helpers/input.js

@@ -1,6 +1,7 @@
 /* @flow */
 
 import TypeComposer from '../../../../graphql-compose/src/typeComposer';
+import { GraphQLNonNull } from 'graphql';
 
 import type {
   GraphQLObjectType,
@@ -10,6 +11,7 @@ import type {
 export type inputHelperArgsGenOpts = {
   inputTypeName: string,
   removeFields?: string | string[],
+  requiredFields?: string | string[],
 };
 
 export const inputHelperArgsGen = (
@@ -27,6 +29,10 @@ export const inputHelperArgsGen = (
     inputComposer.removeField(opts.removeFields);
   }
 
+  if (opts.requiredFields) {
+    inputComposer.makeFieldsRequired(opts.requiredFields);
+  }
+
   return {
     input: {
       name: 'input',