refactor: remove proxy args

Author: Boris

example/src/declarations/Context.ts

@@ -1,5 +1,6 @@
 import { Queue } from 'bullmq';
 
+//TODO: Потом заюзать:
 export interface Context {
   Queues: Map<string, Queue>;
   [key: string]: any;

example/src/declarations/MutationsDependencies.ts

@@ -1,4 +1 @@
-export * from './MutationsDependencies';
-export * from './QueriesDependencies';
-export * from './gqlCompose';
 export * from './Context';

example/src/declarations/QueriesDependencies.ts

@@ -1,20 +1,14 @@
 import { schemaComposer } from 'graphql-compose';
-import createTypes from './types';
 import { createQueryFields } from './query';
 import { createMutationFields } from './mutation';
 
-const { JobTC, QueueTC, JobOptionsInputTC, JobStatusEnumTC } = createTypes({ schemaComposer });
-
 schemaComposer.Query.addFields({
-  ...createQueryFields({ QueueTC, JobTC }),
+  ...createQueryFields(schemaComposer),
 });
 
 schemaComposer.Mutation.addFields({
   ...createMutationFields({
     schemaComposer,
-    JobTC,
-    JobOptionsInputTC,
-    JobStatusEnumTC,
   }),
 });
 

example/src/declarations/errors.ts

@@ -0,0 +1,8 @@
+import { ErrorCodeEnum } from '../types';
+
+export class MutationError extends Error {
+  constructor(message: string, public code: ErrorCodeEnum) {
+    super(message);
+    Object.setPrototypeOf(this, MutationError.prototype);
+  }
+}

example/src/declarations/gqlCompose.ts

@@ -6,13 +6,18 @@ import {
   ObjectTypeComposerFieldConfigAsObjectDefinition,
   ObjectTypeComposerAsObjectDefinition,
 } from 'graphql-compose';
-import { PayloadStatusEnum, ErrorCodeEnum } from '../types/enums';
-import { PayloadError } from '../../declarations/errors';
+import {
+  MutationStatusEnum,
+  ErrorCodeEnum,
+  getMutationStatusEnumTC,
+  getMutationErrorCodeEnumTC,
+} from '../types';
+import { MutationError } from './Error';
 
 export function getQueue(queueName: string, context: any): Queue {
   const queue = context?.Queues?.get(queueName);
   if (!queue) {
-    throw new PayloadError('Queue not found!', ErrorCodeEnum.QUEUE_NOT_FOUND);
+    throw new MutationError('Queue not found!', ErrorCodeEnum.QUEUE_NOT_FOUND);
   }
   return queue;
 }
@@ -37,10 +42,10 @@ export function createGenerateHelper(schemaComposer: SchemaComposer<any>): Gener
     }
 
     type.addFields({
-      status: 'PayloadStatusEnum!',
+      status: getMutationStatusEnumTC(schemaComposer),
       query: 'Query!',
       error: 'String',
-      errorCode: 'ErrorCodeEnum',
+      errorCode: getMutationErrorCodeEnumTC(schemaComposer),
     });
 
     const subResolve = fieldConfig.resolve || (() => ({}));
@@ -49,17 +54,17 @@ export function createGenerateHelper(schemaComposer: SchemaComposer<any>): Gener
         const subResult = await subResolve(source, args, context, info);
         return {
           query: {},
-          status: PayloadStatusEnum.OK,
+          status: MutationStatusEnum.OK,
           ...subResult,
         };
       } catch (e) {
         const requestedFields = getFlatProjectionFromAST(info);
         if (requestedFields?.error || requestedFields?.errorCode || requestedFields?.status) {
           return {
             query: {},
-            status: PayloadStatusEnum.ERROR,
+            status: MutationStatusEnum.ERROR,
             error: e.message,
-            errorCode: e instanceof PayloadError ? e.code : ErrorCodeEnum.OTHER_ERROR,
+            errorCode: e instanceof MutationError ? e.code : ErrorCodeEnum.OTHER_ERROR,
           };
         } else {
           throw e;

example/src/declarations/index.ts

@@ -14,25 +14,20 @@ import { createJobLogAddFC } from './jobLogAdd';
 
 import { createGenerateHelper } from './_helpers';
 
-export function createMutationFields({
-  schemaComposer,
-  JobTC,
-  JobStatusEnumTC,
-  JobOptionsInputTC,
-}): any {
+export function createMutationFields({ schemaComposer }): any {
   const generateHelper = createGenerateHelper(schemaComposer);
   //TODO: пропустить через map это
   return {
-    queueClean: generateHelper(createQueueCleanFC({ schemaComposer, JobStatusEnumTC })),
+    queueClean: generateHelper(createQueueCleanFC({ schemaComposer })),
     queuePause: generateHelper(createQueuePauseFC()),
     queueResume: generateHelper(createQueueResumeFC()),
     queueRemoveRepeatable: generateHelper(createRemoveRepeatableFC()),
-    jobAdd: generateHelper(createJobAddFC({ JobTC, JobOptionsInputTC })),
-    jobDiscard: generateHelper(createJobDiscardFC({ JobStatusEnumTC })),
-    jobPromote: generateHelper(createjobPromoteFC({ JobStatusEnumTC })),
-    jobRemove: generateHelper(createJobRremoveFC({ JobTC })),
-    jobRetry: generateHelper(createJobRetryFC({ JobStatusEnumTC })),
-    jobUpdate: generateHelper(createJobUpdateFC({ JobTC })),
-    jobLogAdd: generateHelper(createJobLogAddFC({ JobStatusEnumTC })),
+    jobAdd: generateHelper(createJobAddFC(schemaComposer)),
+    jobDiscard: generateHelper(createJobDiscardFC({ schemaComposer })),
+    jobPromote: generateHelper(createjobPromoteFC({ schemaComposer })),
+    jobRemove: generateHelper(createJobRremoveFC(schemaComposer)),
+    jobRetry: generateHelper(createJobRetryFC({ schemaComposer })),
+    jobUpdate: generateHelper(createJobUpdateFC(schemaComposer)),
+    jobLogAdd: generateHelper(createJobLogAddFC({ schemaComposer })),
   };
 }