refactor: after review

nodkz · nodkz · commit 0056d91e3140 · 2020-04-13T20:55:33.000+06:00
diff --git a/example/src/schema/definitions.ts b/example/src/schema/definitions.ts
diff --git a/example/src/schema/index.ts b/example/src/schema/index.ts
@@ -1,22 +1,10 @@
-import { Options } from './OptionsType';
-import {
-  schemaComposer,
-  SchemaComposer,
-  ObjectTypeComposer,
-  ObjectTypeComposerFieldConfigMapDefinition,
-} from 'graphql-compose';
+import { Options } from './definitions';
+import { schemaComposer, SchemaComposer } from 'graphql-compose';
 import { createQueryFields } from './query';
 import { createMutationFields } from './mutation';
 import { getQueueTC, getJobTC } from './types';
 
-export function composeBull(
-  opts: Options & { schemaComposer?: SchemaComposer<any> }
-): {
-  QueueTC: ObjectTypeComposer<any, any>;
-  JobTC: ObjectTypeComposer<any, any>;
-  queryFields: ObjectTypeComposerFieldConfigMapDefinition<any, any>;
-  mutationFields: ObjectTypeComposerFieldConfigMapDefinition<any, any>;
-} {
+export function composeBull(opts: Options & { schemaComposer?: SchemaComposer<any> }) {
   const sc = opts?.schemaComposer || schemaComposer;
 
   return {
@@ -30,7 +18,7 @@ export function composeBull(
 //---------------------------------------------------------
 
 const jobDataTC = schemaComposer.createObjectTC({
-  name: 'MyJobCounts',
+  name: 'MyJobData',
   fields: {
     fieldA: 'String!',
     fieldB: 'String',
diff --git a/example/src/schema/mutation/helpers/wrapMutationFC.ts b/example/src/schema/mutation/helpers/wrapMutationFC.ts
@@ -1,4 +1,4 @@
-import { Options } from './../../OptionsType';
+import { Options } from './../../definitions';
 import {
   SchemaComposer,
   getFlatProjectionFromAST,
diff --git a/example/src/schema/mutation/index.ts b/example/src/schema/mutation/index.ts
@@ -18,9 +18,9 @@ import { createJobUpdateFC } from './jobUpdate';
 import { createJobLogAddFC } from './jobLogAdd';
 
 import { createGenerateHelper } from './helpers/wrapMutationFC';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
-export function createMutationFields(schemaComposer: SchemaComposer<any>, opts: Options): any {
+export function createMutationFields(schemaComposer: SchemaComposer<any>, opts: Options) {
   const generateHelper = createGenerateHelper(schemaComposer, opts);
 
   function generateWrappedFC(
diff --git a/example/src/schema/mutation/jobAdd.ts b/example/src/schema/mutation/jobAdd.ts
@@ -1,7 +1,8 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
+import { createJobDataITC } from '../types/job/JobInput';
 
 export function createJobAddFC(
   sc: SchemaComposer<any>,
@@ -23,7 +24,9 @@ export function createJobAddFC(
       },
       queueName: 'String!',
       jobName: 'String!',
-      data: 'JSON!',
+      data: {
+        type: () => createJobDataITC(sc, opts),
+      },
       options: sc.createInputTC({
         name: `${typePrefix}JobOptionsInput`,
         fields: {
diff --git a/example/src/schema/mutation/jobAddBulk.ts b/example/src/schema/mutation/jobAddBulk.ts
@@ -1,7 +1,7 @@
 import { findQueue } from './helpers/queueFind';
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobAddBulkFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobAddCron.ts b/example/src/schema/mutation/jobAddCron.ts
@@ -1,7 +1,7 @@
 import { findQueue } from './helpers/queueFind';
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobAddCronFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobAddEvery.ts b/example/src/schema/mutation/jobAddEvery.ts
@@ -1,7 +1,7 @@
 import { findQueue } from './helpers/queueFind';
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobAddEveryFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobDiscard.ts b/example/src/schema/mutation/jobDiscard.ts
@@ -2,7 +2,7 @@ import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from
 import { MutationError, ErrorCodeEnum } from './helpers/Error';
 import { getJobStatusEnumTC } from '../types';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobDiscardFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobLogAdd.ts b/example/src/schema/mutation/jobLogAdd.ts
@@ -2,7 +2,7 @@ import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from
 import { MutationError, ErrorCodeEnum } from './helpers/Error';
 import { getJobStatusEnumTC } from '../types';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobLogAddFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobMoveToCompleted.ts b/example/src/schema/mutation/jobMoveToCompleted.ts
@@ -1,7 +1,7 @@
 import { findQueue } from './helpers/queueFind';
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function jobMoveToCompletedFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobPromote.ts b/example/src/schema/mutation/jobPromote.ts
@@ -2,7 +2,7 @@ import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from
 import { MutationError, ErrorCodeEnum } from './helpers/Error';
 import { getJobStatusEnumTC } from '../types';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createjobPromoteFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobRemove.ts b/example/src/schema/mutation/jobRemove.ts
@@ -1,7 +1,7 @@
 import { findQueue } from './helpers/queueFind';
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobRremoveFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobRetry.ts b/example/src/schema/mutation/jobRetry.ts
@@ -2,7 +2,7 @@ import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from
 import { MutationError, ErrorCodeEnum } from './helpers/Error';
 import { JobStatusEnum, getJobStatusEnumTC } from '../types';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobRetryFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/jobUpdate.ts b/example/src/schema/mutation/jobUpdate.ts
@@ -2,7 +2,7 @@ import { MutationError, ErrorCodeEnum } from './helpers/Error';
 import { findQueue } from './helpers/queueFind';
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createJobUpdateFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/queueClean.ts b/example/src/schema/mutation/queueClean.ts
@@ -1,7 +1,7 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { findQueue } from './helpers/queueFind';
 import { getJobStatusEnumTC } from '../types';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createQueueCleanFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/queueDrain.ts b/example/src/schema/mutation/queueDrain.ts
@@ -1,6 +1,6 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createQueueDrainFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/queuePause.ts b/example/src/schema/mutation/queuePause.ts
@@ -1,6 +1,6 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createQueuePauseFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/queueRemoveRepeatable.ts b/example/src/schema/mutation/queueRemoveRepeatable.ts
@@ -1,6 +1,6 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createRemoveRepeatableFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/mutation/queueResume.ts b/example/src/schema/mutation/queueResume.ts
@@ -1,6 +1,6 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { findQueue } from './helpers/queueFind';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
 export function createQueueResumeFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/query/index.ts b/example/src/schema/query/index.ts
@@ -3,9 +3,9 @@ import { createQueueKeysFC } from './queueKeys';
 import { createQueueFC } from './queue';
 import { createJobFC } from './job';
 import { SchemaComposer } from 'graphql-compose';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
-export function createQueryFields(sc: SchemaComposer<any>, opts: Options): any {
+export function createQueryFields(sc: SchemaComposer<any>, opts: Options) {
   return {
     queueKeys: createQueueKeysFC(sc, opts),
     queues: createQueuesFC(sc, opts),
diff --git a/example/src/schema/query/job.ts b/example/src/schema/query/job.ts
@@ -1,9 +1,12 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getJobTC } from '../types/job/Job';
 import { getQueue } from './_helpers';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
-export function createJobFC(sc: SchemaComposer<any>, opts: Options) {
+export function createJobFC(
+  sc: SchemaComposer<any>,
+  opts: Options
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: getJobTC(sc, opts),
     args: {
diff --git a/example/src/schema/query/queue.ts b/example/src/schema/query/queue.ts
@@ -1,9 +1,12 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getQueueTC } from '../types/queue/Queue';
 import { getQueue } from './_helpers';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
-export function createQueueFC(sc: SchemaComposer<any>, opts: Options) {
+export function createQueueFC(
+  sc: SchemaComposer<any>,
+  opts: Options
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: getQueueTC(sc, opts),
     args: {
diff --git a/example/src/schema/query/queueKeys.ts b/example/src/schema/query/queueKeys.ts
@@ -1,8 +1,11 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { normalizePrefixGlob, fetchQueueTitles } from './_helpers';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
-export function createQueueKeysFC(sc: SchemaComposer<any>, opts: Options) {
+export function createQueueKeysFC(
+  sc: SchemaComposer<any>,
+  opts: Options
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   const { typePrefix } = opts;
   return {
     type: sc
diff --git a/example/src/schema/query/queues.ts b/example/src/schema/query/queues.ts
@@ -1,9 +1,12 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
 import { getQueueTC } from '../types/queue/Queue';
 import { fetchQueueTitles, getQueues } from './_helpers';
-import { Options } from '../OptionsType';
+import { Options } from '../definitions';
 
-export function createQueuesFC(sc: SchemaComposer<any>, opts: Options) {
+export function createQueuesFC(
+  sc: SchemaComposer<any>,
+  opts: Options
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
     type: getQueueTC(sc, opts).getTypeNonNull().getTypePlural(),
     args: {
diff --git a/example/src/schema/types/job/Job.logs.ts b/example/src/schema/types/job/Job.logs.ts
@@ -1,6 +1,6 @@
 import { Job, Queue } from 'bullmq';
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createLogsFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/job/Job.opts.repeat.ts b/example/src/schema/types/job/Job.opts.repeat.ts
@@ -1,5 +1,5 @@
 import { isObject, SchemaComposer } from 'graphql-compose';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createRepeatOptionsTC(sc: SchemaComposer<any>, opts: Options) {
   const { typePrefix } = opts;
diff --git a/example/src/schema/types/job/Job.state.ts b/example/src/schema/types/job/Job.state.ts
@@ -1,7 +1,7 @@
 import { Job } from 'bullmq';
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { getJobStatusEnumTC } from '../scalars/JobStatusEnum';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createStateFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/job/Job.ts b/example/src/schema/types/job/Job.ts
@@ -2,7 +2,7 @@ import { createLogsFC } from './Job.logs';
 import { createStateFC } from './Job.state';
 import { createRepeatOptionsTC } from './Job.opts.repeat';
 import { SchemaComposer } from 'graphql-compose';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function getJobTC(sc: SchemaComposer<any>, opts: Options) {
   const { typePrefix, jobDataTC = 'JSON!' } = opts;
diff --git a/example/src/schema/types/job/JobInput.ts b/example/src/schema/types/job/JobInput.ts
@@ -0,0 +1,24 @@
+import { SchemaComposer, ObjectTypeComposer, ComposeInputTypeDefinition } from 'graphql-compose';
+import { Options } from '../../definitions';
+
+export function createJobDataITC(
+  sc: SchemaComposer<any>,
+  opts: Options
+): ComposeInputTypeDefinition {
+  if (opts?.jobDataTC) {
+    let someTC;
+    if (typeof opts?.jobDataTC === 'string') {
+      someTC = sc.getAnyTC(opts.jobDataTC) as any;
+    } else {
+      someTC = opts.jobDataTC;
+    }
+
+    if (someTC instanceof ObjectTypeComposer) {
+      someTC = someTC.getInputTypeComposer();
+    }
+
+    return someTC.getTypeNonNull();
+  } else {
+    return 'JSON!';
+  }
+}
diff --git a/example/src/schema/types/queue/Queue.activeJobs.ts b/example/src/schema/types/queue/Queue.activeJobs.ts
@@ -1,7 +1,7 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job/Job';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createActiveJobsFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.completedJobs.ts b/example/src/schema/types/queue/Queue.completedJobs.ts
@@ -1,7 +1,7 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job/Job';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createCompletedJobsFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.delayedJobs.ts b/example/src/schema/types/queue/Queue.delayedJobs.ts
@@ -1,7 +1,7 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job/Job';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createDelayedJobsFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.failedJobs.ts b/example/src/schema/types/queue/Queue.failedJobs.ts
@@ -1,7 +1,7 @@
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job/Job';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createFailedJobsFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.jobCounts.ts b/example/src/schema/types/queue/Queue.jobCounts.ts
@@ -1,7 +1,7 @@
 import { JobStatusEnum } from '../scalars/JobStatusEnum';
 import { Queue } from 'bullmq';
 import { ObjectTypeComposerFieldConfigDefinition, SchemaComposer } from 'graphql-compose';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createJobCountFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.jobs.ts b/example/src/schema/types/queue/Queue.jobs.ts
@@ -2,7 +2,7 @@ import { Queue } from 'bullmq';
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { getJobStatusEnumTC } from '../scalars/JobStatusEnum';
 import { getJobTC } from '../job/Job';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createJobsFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.repeatables.ts b/example/src/schema/types/queue/Queue.repeatables.ts
@@ -1,6 +1,6 @@
 import { Queue } from 'bullmq';
 import { ObjectTypeComposerFieldConfigDefinition, SchemaComposer } from 'graphql-compose';
-import { Options } from '../../OptionsType';
+import { Options } from '../../definitions';
 
 export function createRepeatablesFC(
   sc: SchemaComposer<any>,
diff --git a/example/src/schema/types/queue/Queue.ts b/example/src/schema/types/queue/Queue.ts
diff --git a/example/src/schema/types/queue/Queue.waitingJobs.ts b/example/src/schema/types/queue/Queue.waitingJobs.ts
diff --git a/example/src/schema/types/queue/Queue.workers.ts b/example/src/schema/types/queue/Queue.workers.ts
diff --git a/example/src/schema/types/scalars/JobStatusEnum.ts b/example/src/schema/types/scalars/JobStatusEnum.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Options } from './../../OptionsType';`
	`1`	`+import { Options } from './../../definitions';`
`2`	`2`	`import {`
`3`	`3`	`SchemaComposer,`
`4`	`4`	`getFlatProjectionFromAST,`