Merge branch 'prod'

Author: nodkz

.eslintignore

@@ -0,0 +1,2 @@
+lib/*
+es/*

.flowconfig

@@ -4,7 +4,7 @@
 .*/dist/.*
 .*/coverage/.*
 .*/resources/.*
-.*/node_modules/graphql.*
+.*/node_modules/graphql/.*
 
 [include]
 ../graphql-compose/src
@@ -15,5 +15,7 @@
 [options]
 esproposal.class_instance_fields=enable
 suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
-module.name_mapper='^graphql\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose/__forks__/graphql-js/src\1'
-module.name_mapper='graphql-compose\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose\1'
+module.name_mapper='^graphql-compose/lib/definition.js$' -> '/Users/nod/www/_npm/graphql-compose/src/definition.js'
+module.name_mapper='^graphql-compose\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose/src\1'
+module.name_mapper='^graphql$' -> '/Users/nod/www/_npm/graphql-compose/__forks__/graphql-js/src'
+module.name_mapper='^graphql/type/definition.js$' -> '/Users/nod/www/_npm/graphql-compose/__forks__/graphql-js/src/type/definition.js'

README.md

@@ -7,6 +7,7 @@ Example
 Live demo: [https://graphql-compose-mongoose.herokuapp.com/](https://graphql-compose-mongoose.herokuapp.com/?query=%7B%0A%20%20userMany(limit%3A%205)%20%7B%0A%20%20%20%20_id%0A%20%20%20%20name%0A%20%20%20%20age%0A%20%20%7D%0A%7D)
 
 Source code: https://github.com/nodkz/graphql-compose-mongoose-example
+
 ```js
 import mongoose from 'mongoose';
 import mongooseToTypeComposer from 'graphql-compose-mongoose';

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-compose-mongoose",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Plugin for `graphql-compose` which derive a graphql type from a mongoose model.",
   "files": [
     "es",

src/__mocks__/userModel.js

@@ -93,7 +93,7 @@ UserSchema.virtual('nameVirtual').get(function () { // eslint-disable-line
 });
 
 
-const UserModel = mongoose.model('UserModel', UserSchema);
+const UserModel = mongoose.model('User', UserSchema);
 
 export {
   UserSchema,

src/__tests__/fieldConverter-test.js

@@ -20,14 +20,14 @@ import {
   GraphQLBoolean,
   GraphQLList,
   GraphQLEnumType,
-} from 'graphql/type';
+} from 'graphql';
 import GraphQLMongoID from '../types/mongoid';
 
 import {
   GraphQLDate,
   GraphQLBuffer,
   GraphQLGeneric,
-} from '../../../graphql-compose/src/type';
+} from 'graphql-compose';
 
 /*
 Object.prototype.getClassName = function getClassName() {

src/__tests__/modelConverter-test.js

@@ -3,9 +3,7 @@
 import { expect } from 'chai';
 import { UserModel } from '../__mocks__/userModel.js';
 import { mongooseModelToTypeComposer as mm2tc } from '../modelConverter';
-
-import TypeComposer from '../../../graphql-compose/src/typeComposer';
-import InputTypeComposer from '../../../graphql-compose/src/inputTypeComposer';
+import { TypeComposer, InputTypeComposer } from 'graphql-compose';
 
 
 describe('modelConverter', () => {

src/definition.js

@@ -80,7 +80,7 @@ import type {
   GraphQLFieldConfigArgumentMap as _GraphQLFieldConfigArgumentMap,
   ResolverMWResolveFn as _ResolverMWResolveFn,
   GraphQLResolveInfo as _GraphQLResolveInfo,
-} from '../../graphql-compose/src/definition';
+} from 'graphql-compose/lib/definition.js';
 
 export type GraphQLObjectType = _GraphQLObjectType;
 export type GraphQLOutputType = _GraphQLOutputType;

src/fieldsConverter.js

@@ -3,7 +3,13 @@
 
 import mongoose from 'mongoose';
 import objectPath from 'object-path';
-import TypeComposer from '../../graphql-compose/src/typeComposer';
+import {
+  TypeComposer,
+  GraphQLDate,
+  GraphQLBuffer,
+  GraphQLGeneric,
+  GQLReference,
+} from 'graphql-compose';
 
 import {
   GraphQLString,
@@ -12,16 +18,9 @@ import {
   GraphQLList,
   GraphQLEnumType,
   GraphQLObjectType,
-} from 'graphql/type';
+} from 'graphql';
 import GraphQLMongoID from './types/mongoid';
 
-import {
-  GraphQLDate,
-  GraphQLBuffer,
-  GraphQLGeneric,
-  GQLReference,
-} from '../../graphql-compose/src/type';
-
 import type {
   MongooseModelT,
   MongooseFieldT,

src/modelConverter.js

@@ -2,23 +2,21 @@
 /* eslint-disable no-use-before-define */
 
 import { convertModelToGraphQL } from './fieldsConverter';
-import TypeComposer from '../../graphql-compose/src/typeComposer';
-import type InputTypeComposer from '../../graphql-compose/src/inputTypeComposer';
+import { TypeComposer, InputTypeComposer } from 'graphql-compose';
 import * as resolvers from './resolvers';
 
 import type {
   MongooseModelT,
   typeConverterOpts,
   typeConverterResolversOpts,
-  GraphQLObjectType,
   typeConverterInputTypeOpts,
 } from './definition';
 
 
 export function mongooseModelToTypeComposer(
   model: MongooseModelT,
   opts: typeConverterOpts = {}
-): GraphQLObjectType {
+): TypeComposer {
   const name: string = (opts && opts.name) || model.modelName;
 
   const type = convertModelToGraphQL(model, name);
@@ -32,6 +30,8 @@ export function mongooseModelToTypeComposer(
     prepareFields(typeComposer, opts.fields);
   }
 
+  typeComposer.setRecordIdFn((source) => `${source._id}`);
+
   createInputType(typeComposer, opts.inputType);
 
   if (!opts.hasOwnProperty('resolvers') || opts.resolvers !== false) {
@@ -113,7 +113,7 @@ export function createResolvers(
       const createResolverFn = resolvers[resolverName];
       const resolver = createResolverFn(
         model,
-        typeComposer.getType(),
+        typeComposer,
         opts[resolverName] || {}
       );
       typeComposer.setResolver(resolver);