All resolvers that return record should return Mongoose Document.

nodkz · nodkz · commit 1f7a285423b0 · 2016-09-06T12:31:27.000+06:00
It allows call model method for additional processing in wrappers.
diff --git a/src/definition.js b/src/definition.js
@@ -100,7 +100,6 @@ export type GraphQLResolveInfo = _GraphQLResolveInfo;
 export type ResolverMWResolveFn = _ResolverMWResolveFn;
 export type ExtendedResolveParams = ResolveParams & {
   query: MongooseQuery,
-  returnMongooseDoc: boolean,
 };
 
 
diff --git a/src/resolvers/createOne.js b/src/resolvers/createOne.js
@@ -1,16 +1,16 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
-import { recordHelperArgs } from './helpers/record';
+
 import { GraphQLObjectType } from 'graphql';
+import { Resolver, TypeComposer } from 'graphql-compose';
+import { recordHelperArgs } from './helpers/record';
+import typeStorage from '../typeStorage';
 import GraphQLMongoID from '../types/mongoid';
-
 import type {
   MongooseModelT,
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import { Resolver, TypeComposer } from 'graphql-compose';
-import typeStorage from '../typeStorage';
 
 
 export default function createOne(
@@ -60,7 +60,7 @@ export default function createOne(
       }),
     },
     resolve: (resolveParams: ExtendedResolveParams) => {
-      const recordData = resolveParams.args && resolveParams.args.record || {};
+      const recordData = (resolveParams.args && resolveParams.args.record) || {};
 
       if (!(typeof recordData === 'object')
         || Object.keys(recordData).length === 0
@@ -75,7 +75,7 @@ export default function createOne(
         .then(record => {
           if (record) {
             return {
-              record: record.toObject(),
+              record,
               recordId: typeComposer.getRecordIdFn()(record),
             };
           }
diff --git a/src/resolvers/findById.js b/src/resolvers/findById.js
@@ -1,16 +1,15 @@
 /* @flow */
 
+import { GraphQLNonNull } from 'graphql';
+import { Resolver, TypeComposer } from 'graphql-compose';
+import GraphQLMongoID from '../types/mongoid';
+import { projectionHelper } from './helpers/projection';
 import type {
   MongooseModelT,
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import { Resolver, TypeComposer } from 'graphql-compose';
 
-import { GraphQLNonNull } from 'graphql';
-import GraphQLMongoID from '../types/mongoid';
-
-import { projectionHelper } from './helpers/projection';
 
 export default function findById(
   model: MongooseModelT,
@@ -43,9 +42,7 @@ export default function findById(
       if (args._id) {
         resolveParams.query = model.findById(args._id); // eslint-disable-line
         projectionHelper(resolveParams);
-        return resolveParams.query.exec().then(res =>
-          (res && !resolveParams.returnMongooseDoc ? res.toObject() : res)
-        );
+        return resolveParams.query.exec();
       }
       return Promise.resolve(null);
     },
diff --git a/src/resolvers/findOne.js b/src/resolvers/findOne.js
@@ -2,12 +2,10 @@
 /* eslint-disable no-param-reassign */
 
 import { Resolver, TypeComposer } from 'graphql-compose';
-
 import { skipHelperArgs, skipHelper } from './helpers/skip';
 import { filterHelperArgs, filterHelper } from './helpers/filter';
 import { sortHelperArgs, sortHelper } from './helpers/sort';
 import { projectionHelper } from './helpers/projection';
-
 import type {
   MongooseModelT,
   ExtendedResolveParams,
@@ -53,9 +51,7 @@ export default function findOne(
       sortHelper(resolveParams);
       projectionHelper(resolveParams);
 
-      return resolveParams.query.exec().then(res =>
-        (res && !resolveParams.returnMongooseDoc ? res.toObject() : res)
-      );
+      return resolveParams.query.exec();
     },
   });
 }
diff --git a/src/resolvers/removeById.js b/src/resolvers/removeById.js
@@ -1,20 +1,20 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
-import { projectionHelper } from './helpers/projection';
 import {
   GraphQLObjectType,
   GraphQLNonNull,
 } from 'graphql';
+import { Resolver, TypeComposer } from 'graphql-compose';
+import { projectionHelper } from './helpers/projection';
 import GraphQLMongoID from '../types/mongoid';
 import typeStorage from '../typeStorage';
-
 import type {
   MongooseModelT,
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import { Resolver, TypeComposer } from 'graphql-compose';
+
 
 export default function removeById(
   model: MongooseModelT,
@@ -77,11 +77,11 @@ export default function removeById(
       projectionHelper(resolveParams);
 
       return resolveParams.query.exec()
-        .then(res => {
-          if (res) {
+        .then(record => {
+          if (record) {
             return {
-              record: res.toObject(),
-              recordId: typeComposer.getRecordIdFn()(res),
+              record,
+              recordId: typeComposer.getRecordIdFn()(record),
             };
           }
 
diff --git a/src/resolvers/removeOne.js b/src/resolvers/removeOne.js
@@ -2,19 +2,17 @@
 /* eslint-disable no-param-reassign */
 
 import { GraphQLObjectType } from 'graphql';
+import { Resolver, TypeComposer } from 'graphql-compose';
 import GraphQLMongoID from '../types/mongoid';
 import typeStorage from '../typeStorage';
-
 import { filterHelperArgs, filterHelper } from './helpers/filter';
 import { sortHelperArgs, sortHelper } from './helpers/sort';
 import { projectionHelper } from './helpers/projection';
-
 import type {
   MongooseModelT,
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import { Resolver, TypeComposer } from 'graphql-compose';
 
 
 export default function removeOne(
@@ -78,11 +76,11 @@ export default function removeOne(
 
       return resolveParams.query
         .exec()
-        .then(res => {
-          if (res) {
+        .then(record => {
+          if (record) {
             return {
-              record: res.toObject(),
-              recordId: typeComposer.getRecordIdFn()(res),
+              record,
+              recordId: typeComposer.getRecordIdFn()(record),
             };
           }
 
diff --git a/src/resolvers/updateById.js b/src/resolvers/updateById.js
@@ -1,9 +1,10 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
+import { GraphQLObjectType } from 'graphql';
+import { Resolver, TypeComposer } from 'graphql-compose';
 import { recordHelperArgs } from './helpers/record';
 import findById from './findById';
-import { GraphQLObjectType } from 'graphql';
 import GraphQLMongoID from '../types/mongoid';
 import typeStorage from '../typeStorage';
 
@@ -12,7 +13,7 @@ import type {
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import { Resolver, TypeComposer } from 'graphql-compose';
+
 
 export default function updateById(
   model: MongooseModelT,
@@ -69,7 +70,7 @@ export default function updateById(
       }),
     },
     resolve: (resolveParams: ExtendedResolveParams) => {
-      const recordData = resolveParams.args && resolveParams.args.record || {};
+      const recordData = (resolveParams.args && resolveParams.args.record) || {};
 
       if (!(typeof recordData === 'object')) {
         return Promise.reject(
@@ -88,9 +89,7 @@ export default function updateById(
       resolveParams.args._id = recordData._id;
       delete recordData._id;
       resolveParams.projection =
-        resolveParams.projection && resolveParams.projection.record || {};
-
-      resolveParams.returnMongooseDoc = true;
+        (resolveParams.projection && resolveParams.projection.record) || {};
 
       return findByIdResolver.resolve(resolveParams)
         // save changes to DB
@@ -108,7 +107,7 @@ export default function updateById(
         .then(record => {
           if (record) {
             return {
-              record: record.toObject(),
+              record,
               recordId: typeComposer.getRecordIdFn()(record),
             };
           }
diff --git a/src/resolvers/updateOne.js b/src/resolvers/updateOne.js
@@ -1,11 +1,13 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
+
+import { GraphQLObjectType } from 'graphql';
+import { Resolver, TypeComposer } from 'graphql-compose';
 import { skipHelperArgs } from './helpers/skip';
 import { recordHelperArgs } from './helpers/record';
 import { filterHelperArgs } from './helpers/filter';
 import { sortHelperArgs } from './helpers/sort';
 import findOne from './findOne';
-import { GraphQLObjectType } from 'graphql';
 import GraphQLMongoID from '../types/mongoid';
 import typeStorage from '../typeStorage';
 
@@ -14,7 +16,6 @@ import type {
   ExtendedResolveParams,
   genResolverOpts,
 } from '../definition';
-import { Resolver, TypeComposer } from 'graphql-compose';
 
 
 export default function updateOne(
@@ -81,8 +82,8 @@ export default function updateOne(
       ...skipHelperArgs(),
     },
     resolve: (resolveParams: ExtendedResolveParams) => {
-      const recordData = resolveParams.args && resolveParams.args.record || null;
-      const filterData = resolveParams.args && resolveParams.args.filter || {};
+      const recordData = (resolveParams.args && resolveParams.args.record) || null;
+      const filterData = (resolveParams.args && resolveParams.args.filter) || {};
 
       if (!(typeof filterData === 'object')
         || Object.keys(filterData).length === 0
@@ -94,9 +95,7 @@ export default function updateOne(
       }
 
       resolveParams.projection =
-        resolveParams.projection && resolveParams.projection.record || {};
-
-      resolveParams.returnMongooseDoc = true;
+        (resolveParams.projection && resolveParams.projection.record) || {};
 
       return findOneResolver.resolve(resolveParams)
         // save changes to DB
@@ -111,7 +110,7 @@ export default function updateOne(
         .then(record => {
           if (record) {
             return {
-              record: record.toObject(),
+              record,
               recordId: typeComposer.getRecordIdFn()(record),
             };
           }
