refactor: revert errorCatcher logic. Let's keep it one for all mutations.

I'll just extend ValidationError by one more field in next commit. And code will be simplified quite well.

Author: nodkz

src/resolvers/createMany.ts

@@ -2,7 +2,7 @@ import type { ObjectTypeComposer, Resolver } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs } from './helpers';
 import type { GenResolverOpts } from './index';
-import { addManyErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 import { validateManyAndThrow } from './helpers/validate';
 
 export default function createMany<TSource = Document, TContext = any>(
@@ -107,7 +107,7 @@ export default function createMany<TSource = Document, TContext = any>(
 
   // Add `error` field to payload which can catch resolver Error
   // and return it in mutation payload
-  addManyErrorCatcherField(resolver);
+  addErrorCatcherField(resolver);
 
   return resolver;
 }

src/resolvers/createOne.ts

@@ -2,7 +2,7 @@ import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs } from './helpers';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 import { validateAndThrow } from './helpers/validate';
 
 export default function createOne<TSource = Document, TContext = any>(

src/resolvers/helpers/addErrorCatcherField.ts renamed to src/resolvers/helpers/errorCatcher.ts

@@ -1,17 +1,27 @@
-import { Resolver, ResolverResolveParams } from 'graphql-compose';
-import {
-  getErrorInterface,
-  getManyErrorInterface,
-  MongoError,
-  ValidationError,
-  ManyValidationError,
-} from '../../errors';
+import { Resolver } from 'graphql-compose';
+import { getErrorInterface, MongoError, ValidationError } from '../../errors';
 import { GraphQLError } from 'graphql-compose/lib/graphql';
 
-export function makeHandleResolverError(childResolve: any): any {
-  return async function handleResolverError(
-    rp: ResolverResolveParams<any, any, any>
-  ): Promise<any> {
+/**
+ * This helper add `error` field in payload & wraps `resolve` method.
+ * It catches exception and return it in payload if user
+ * requested `err` field in GraphQL-query.
+ */
+export function addErrorCatcherField(resolver: Resolver<any, any, any>): void {
+  getErrorInterface(resolver.schemaComposer);
+
+  const payloadTC = resolver.getOTC();
+
+  if (!payloadTC.hasField('error')) {
+    payloadTC.setField('error', {
+      type: 'ErrorInterface',
+      description:
+        'Error that may occur during operation. If you request this field in GraphQL query, you will receive typed error in payload; otherwise error will be provided in root `errors` field of GraphQL response.',
+    });
+  }
+
+  const childResolve = resolver.resolve.bind(resolver);
+  resolver.setResolve(async (rp) => {
     try {
       const res = await childResolve(rp);
       return res;
@@ -23,12 +33,6 @@ export function makeHandleResolverError(childResolve: any): any {
           message: e.message,
           errors: e.errors,
         };
-      } else if (e instanceof ManyValidationError) {
-        error = {
-          name: 'ManyValidationError',
-          message: e.message,
-          errors: e.errors,
-        };
       } else if (e instanceof MongoError) {
         error = {
           name: 'MongoError',
@@ -61,48 +65,5 @@ export function makeHandleResolverError(childResolve: any): any {
         );
       }
     }
-  };
-}
-/**
- * This helper add `error` field in payload & wraps `resolve` method.
- * It catches exception and return it in payload if user
- * requested `err` field in GraphQL-query.
- */
-export function addErrorCatcherField(resolver: Resolver<any, any, any>): void {
-  getErrorInterface(resolver.schemaComposer);
-
-  const payloadTC = resolver.getOTC();
-
-  if (!payloadTC.hasField('error')) {
-    payloadTC.setField('error', {
-      type: 'ErrorInterface',
-      description:
-        'Error that may occur during operation. If you request this field in GraphQL query, you will receive typed error in payload; otherwise error will be provided in root `errors` field of GraphQL response.',
-    });
-  }
-
-  const childResolve = resolver.resolve.bind(resolver);
-  resolver.setResolve(makeHandleResolverError(childResolve));
-}
-
-/**
- * This helper add `error` field in payload & wraps `resolve` method.
- * It catches exception and return it in payload if user
- * requested `err` field in GraphQL-query.
- */
-export function addManyErrorCatcherField(resolver: Resolver<any, any, any>): void {
-  getManyErrorInterface(resolver.schemaComposer);
-
-  const payloadTC = resolver.getOTC();
-
-  if (!payloadTC.hasField('error')) {
-    payloadTC.setField('error', {
-      type: 'ManyErrorInterface',
-      description:
-        'Error that may occur during operation. If you request this field in GraphQL query, you will receive typed error in payload; otherwise error will be provided in root `errors` field of GraphQL response.',
-    });
-  }
-
-  const childResolve = resolver.resolve.bind(resolver);
-  resolver.setResolve(makeHandleResolverError(childResolve));
+  });
 }

src/resolvers/removeById.ts

@@ -2,7 +2,7 @@ import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import findById from './findById';
 import type { ExtendedResolveParams } from './index';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 
 export default function removeById<TSource = Document, TContext = any>(
   model: Model<any>,

src/resolvers/removeMany.ts

@@ -3,7 +3,7 @@ import type { Model, Document } from 'mongoose';
 import { filterHelperArgs, filterHelper, prepareAliases } from './helpers';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
 import { beforeQueryHelper } from './helpers/beforeQueryHelper';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 
 export default function removeMany<TSource = Document, TContext = any>(
   model: Model<any>,

src/resolvers/removeOne.ts

@@ -3,7 +3,7 @@ import type { Model, Document } from 'mongoose';
 import { filterHelperArgs, sortHelperArgs } from './helpers';
 import findOne from './findOne';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 
 export default function removeOne<TSource = Document, TContext = any>(
   model: Model<any>,

src/resolvers/updateById.ts

@@ -2,7 +2,7 @@ import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs } from './helpers/record';
 import findById from './findById';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
 import { validateAndThrow } from './helpers/validate';
 

src/resolvers/updateMany.ts

@@ -16,7 +16,7 @@ import {
 import { toMongoDottedObject } from '../utils/toMongoDottedObject';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
 import { beforeQueryHelper } from './helpers/beforeQueryHelper';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 
 export default function updateMany<TSource = Document, TContext = any>(
   model: Model<any>,

src/resolvers/updateOne.ts

@@ -3,7 +3,7 @@ import type { Model, Document } from 'mongoose';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
 import { skipHelperArgs, recordHelperArgs, filterHelperArgs, sortHelperArgs } from './helpers';
 import findOne from './findOne';
-import { addErrorCatcherField } from './helpers/addErrorCatcherField';
+import { addErrorCatcherField } from './helpers/errorCatcher';
 import { validateAndThrow } from './helpers/validate';
 
 export default function updateOne<TSource = Document, TContext = any>(