feat(createOne, updateById, updateOne): Pass resolveParams to beforeRecordMutate callback

Now you may made some context spicific checks right before apply updates to the document. Eg. check ownership
User.find('$updateOne').wrapResolve(next => rp => {
  rp.beforeRecordMutate = (doc, rp) => {
    return rp.context.userId === doc.userId
      ? doc
      : Promise.reject(new Error('Access denied. You should be owner of this record'));
  }
  return next(rp);
});

Author: nodkz

.eslintrc

@@ -5,7 +5,7 @@
     "no-underscore-dangle": 0,
     "no-unused-expressions": 0,
     "arrow-body-style": 0,
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["*-test.js"]}]
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": true}]
   },
   "env": {
     "mocha": true

src/definition.js

@@ -2,7 +2,6 @@
 /* eslint-disable */
 
 import type { TypeComposer } from 'graphql-compose';
-import type { ProjectionType } from 'graphql-compose/lib/definition';
 import type { connectionSortMapOpts as _connectionSortMapOpts} from 'graphql-compose-connection/lib/definition';
 export type connectionSortMapOpts = _connectionSortMapOpts;
 
@@ -86,7 +85,6 @@ export type MongoseDocument = {
 import type {
   GraphQLObjectType as _GraphQLObjectType,
   GraphQLOutputType as _GraphQLOutputType,
-  InputObjectConfigFieldMap as _InputObjectConfigFieldMap,
   ResolveParams as _ResolveParams,
   GraphQLFieldConfigArgumentMap as _GraphQLFieldConfigArgumentMap,
   ResolverMWResolveFn as _ResolverMWResolveFn,
@@ -95,16 +93,14 @@ import type {
 
 export type GraphQLObjectType = _GraphQLObjectType;
 export type GraphQLOutputType = _GraphQLOutputType;
-export type InputObjectConfigFieldMap = _InputObjectConfigFieldMap;
 export type GraphQLFieldConfigArgumentMap = _GraphQLFieldConfigArgumentMap;
 export type ResolveParams = _ResolveParams;
 export type GraphQLResolveInfo = _GraphQLResolveInfo;
 export type ResolverMWResolveFn = _ResolverMWResolveFn;
 export type ExtendedResolveParams = ResolveParams & {
   query: MongooseQuery,
-  projection: ProjectionType,
-  beforeQuery(query: mixed): Promise<*>,
-  beforeRecordMutate(record: mixed): Promise<*>,
+  beforeQuery?: (query: mixed, rp: ExtendedResolveParams) => Promise<*>,
+  beforeRecordMutate?: (record: mixed, rp: ExtendedResolveParams) => Promise<*>,
 };
 
 

src/resolvers/__tests__/createOne-test.js

@@ -1,4 +1,5 @@
 /* @flow */
+/* eslint-disable no-param-reassign */
 
 import { expect } from 'chai';
 import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
@@ -96,16 +97,19 @@ describe('createOne() ->', () => {
       expect(result).property('record').instanceof(UserModel);
     });
 
-    it('should call `beforeRecordMutate` method with created `record` as arg', async () => {
+    it('should call `beforeRecordMutate` method with created `record` and `resolveParams` as args', async () => {
       const result = await createOne(UserModel, UserTypeComposer).resolve({
         args: { record: { name: 'NewUser' } },
-        beforeRecordMutate: (record) => {
+        context: { ip: '1.1.1.1' },
+        beforeRecordMutate: (record, rp) => {
           record.name = 'OverridedName';
+          record.someDynamic = rp.context.ip;
           return record;
-        }
+        },
       });
       expect(result).property('record').instanceof(UserModel);
       expect(result).have.deep.property('record.name', 'OverridedName');
+      expect(result).have.deep.property('record.someDynamic', '1.1.1.1');
     });
   });
 

src/resolvers/__tests__/updateById-test.js

@@ -1,4 +1,5 @@
 /* @flow */
+/* eslint-disable no-param-reassign */
 
 import { expect } from 'chai';
 import {
@@ -152,16 +153,19 @@ describe('updateById() ->', () => {
       expect(result.record).instanceof(UserModel);
     });
 
-    it('should call `beforeRecordMutate` method with founded `record` as arg', async () => {
+    it('should call `beforeRecordMutate` method with founded `record` and `resolveParams` as args', async () => {
       let beforeMutationId;
       const result = await updateById(UserModel, UserTypeComposer).resolve({
         args: { record: { _id: user1.id } },
-        beforeRecordMutate: (record) => {
+        context: { ip: '1.1.1.1' },
+        beforeRecordMutate: (record, rp) => {
           beforeMutationId = record.id;
+          record.someDynamic = rp.context.ip;
           return record;
-        }
+        },
       });
       expect(result.record).instanceof(UserModel);
+      expect(result).have.deep.property('record.someDynamic', '1.1.1.1');
       expect(beforeMutationId).to.equal(user1.id);
     });
   });

src/resolvers/__tests__/updateOne-test.js

@@ -1,4 +1,5 @@
 /* @flow */
+/* eslint-disable no-param-reassign */
 
 import { expect } from 'chai';
 import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
@@ -177,16 +178,19 @@ describe('updateOne() ->', () => {
       expect(result.record).instanceof(UserModel);
     });
 
-    it('should call `beforeRecordMutate` method with founded `record` as arg', async () => {
+    it('should call `beforeRecordMutate` method with founded `record`  and `resolveParams` as args', async () => {
       let beforeMutationId;
       const result = await updateOne(UserModel, UserTypeComposer).resolve({
         args: { filter: { _id: user1.id } },
-        beforeRecordMutate: (record) => {
+        context: { ip: '1.1.1.1' },
+        beforeRecordMutate: (record, rp) => {
           beforeMutationId = record.id;
+          record.someDynamic = rp.context.ip;
           return record;
         },
       });
       expect(result.record).instanceof(UserModel);
+      expect(result).have.deep.property('record.someDynamic', '1.1.1.1');
       expect(beforeMutationId).to.equal(user1.id);
     });
   });

src/resolvers/createOne.js

@@ -1,5 +1,5 @@
 /* @flow */
-/* eslint-disable no-param-reassign */
+/* eslint-disable no-param-reassign, new-cap */
 
 import { GraphQLObjectType } from 'graphql';
 import { Resolver, TypeComposer } from 'graphql-compose';
@@ -59,6 +59,7 @@ export default function createOne(
         ...(opts && opts.record),
       }),
     },
+    // $FlowFixMe
     resolve: (resolveParams: ExtendedResolveParams) => {
       const recordData = (resolveParams.args && resolveParams.args.record) || {};
 
@@ -73,14 +74,15 @@ export default function createOne(
 
       // $FlowFixMe
       return Promise.resolve(new model(recordData))
-        .then(doc => {
+        .then((doc) => {
+          // $FlowFixMe
           if (resolveParams.beforeRecordMutate) {
-            return resolveParams.beforeRecordMutate(doc);
+            return resolveParams.beforeRecordMutate(doc, resolveParams);
           }
           return doc;
         })
         .then(doc => doc.save())
-        .then(record => {
+        .then((record) => {
           if (record) {
             return {
               record,

src/resolvers/helpers/filter.js

@@ -54,7 +54,7 @@ export const filterHelperArgs = (
 
   if (opts.onlyIndexed) {
     const indexedFieldNames = getIndexedFieldNames(model);
-    Object.keys(typeComposer.getFields()).forEach(fieldName => {
+    Object.keys(typeComposer.getFields()).forEach((fieldName) => {
       if (indexedFieldNames.indexOf(fieldName) === -1) {
         removeFields.push(fieldName);
       }
@@ -106,17 +106,17 @@ export function filterHelper(resolveParams: ExtendedResolveParams): void {
       if (modelFields[key]) {
         clearedFilter[key] = filter[key];
       }
-    })
+    });
     if (Object.keys(clearedFilter).length > 0) {
       resolveParams.query = resolveParams.query.where(toDottedObject(clearedFilter)); // eslint-disable-line
     }
 
     if (filter[OPERATORS_FIELDNAME]) {
       const operatorFields = filter[OPERATORS_FIELDNAME];
-      Object.keys(operatorFields).forEach(fieldName => {
+      Object.keys(operatorFields).forEach((fieldName) => {
         const fieldOperators = Object.assign({}, operatorFields[fieldName]);
         const criteria = {};
-        Object.keys(fieldOperators).forEach(operatorName => {
+        Object.keys(fieldOperators).forEach((operatorName) => {
           criteria[`$${operatorName}`] = fieldOperators[operatorName];
         });
         if (Object.keys(criteria).length > 0) {
@@ -172,13 +172,13 @@ export function addFieldsWithOperator(
   // then fill it up with indexed fields
   const indexedFields = getIndexedFieldNames(model);
   if (operatorsOpts !== false && Object.keys(operatorsOpts).length === 0) {
-    indexedFields.forEach(fieldName => {
+    indexedFields.forEach((fieldName) => {
       operatorsOpts[fieldName] = availableOperators; // eslint-disable-line
     });
   }
 
   const existedFields = inputComposer.getFields();
-  Object.keys(existedFields).forEach(fieldName => {
+  Object.keys(existedFields).forEach((fieldName) => {
     if (operatorsOpts[fieldName] && operatorsOpts[fieldName] !== false) {
       const fields = {};
       let operators;
@@ -187,7 +187,7 @@ export function addFieldsWithOperator(
       } else {
         operators = availableOperators;
       }
-      operators.forEach(operatorName => {
+      operators.forEach((operatorName) => {
         // unwrap from GraphQLNonNull and GraphQLList, if present
         const namedType = getNamedType(existedFields[fieldName].type);
         if (namedType) {

src/resolvers/updateById.js

@@ -69,6 +69,7 @@ export default function updateById(
         ...(opts && opts.record),
       }),
     },
+    // $FlowFixMe
     resolve: (resolveParams: ExtendedResolveParams) => {
       const recordData = (resolveParams.args && resolveParams.args.record) || {};
 
@@ -94,10 +95,12 @@ export default function updateById(
       // So empty projection returns all fields.
       resolveParams.projection = {};
 
+      // $FlowFixMe
       return findByIdResolver.resolve(resolveParams)
         .then((doc) => {
+          // $FlowFixMe
           if (resolveParams.beforeRecordMutate) {
-            return resolveParams.beforeRecordMutate(doc);
+            return resolveParams.beforeRecordMutate(doc, resolveParams);
           }
           return doc;
         })

src/resolvers/updateOne.js

@@ -81,6 +81,7 @@ export default function updateOne(
       }),
       ...skipHelperArgs(),
     },
+    // $FlowFixMe
     resolve: (resolveParams: ExtendedResolveParams) => {
       const recordData = (resolveParams.args && resolveParams.args.record) || null;
       const filterData = (resolveParams.args && resolveParams.args.filter) || {};
@@ -99,10 +100,12 @@ export default function updateOne(
       // So empty projection returns all fields.
       resolveParams.projection = {};
 
+      // $FlowFixMe
       return findOneResolver.resolve(resolveParams)
         .then((doc) => {
+          // $FlowFixMe
           if (resolveParams.beforeRecordMutate) {
-            return resolveParams.beforeRecordMutate(doc);
+            return resolveParams.beforeRecordMutate(doc, resolveParams);
           }
           return doc;
         })