refactor: after review

Author: nodkz

example/src/config.ts

@@ -1,13 +1,7 @@
-import { BULL_REDIS_URI, BULL_HOST_ID } from '../config';
 import { Queue, Worker, QueueScheduler } from 'bullmq';
 import { createBullConnection } from '../connectRedis';
 
-if (!BULL_REDIS_URI) {
-  throw new Error(`Env var BULL_REDIS_URI is empty. Cannot init task ${__filename}.`);
-}
-
 export const queueSettings = {
-  hostId: BULL_HOST_ID,
   name: 'fetch_metrics',
   prefix: 'bull.demo',
 };
@@ -62,7 +56,6 @@ metricsWorker.on('failed', (job, err) => {
 
 export default {
   name: queueSettings.name as string,
-  hostId: queueSettings.hostId as string,
   prefix: queueSettings.prefix as string,
   bullQueue: metricsQueue,
   jobNames: ['fetch_metrics_every_5m'],

example/src/demo_queues/fetchMetrics.ts

@@ -1,8 +1,4 @@
-import {
-  schemaComposer,
-  SchemaComposer,
-  ObjectTypeComposerFieldConfigAsObjectDefinition,
-} from 'graphql-compose';
+import { schemaComposer, SchemaComposer } from 'graphql-compose';
 import { Options } from './definitions';
 import { getQueueTC, getJobTC } from './types';
 import { createQueuesFC, createQueueKeysFC, createQueueFC, createJobFC } from './query';
@@ -23,42 +19,11 @@ import {
   createJobUpdateFC,
   createJobLogAddFC,
 } from './mutation';
-import { wrapMutationFC, wrapQueueArgs } from './helpers';
+import { wrapMutationFC, wrapQueueArgs, composeFC } from './helpers';
 
 export function composeBull(opts: Options & { schemaComposer?: SchemaComposer<any> }) {
   const sc = opts?.schemaComposer || schemaComposer;
 
-  type FC = ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>;
-
-  type Middleare = (fc: FC, sc: SchemaComposer<any>, opts: Options) => FC;
-
-  type Creator = (sc: SchemaComposer<any>, opts: Options) => FC;
-
-  type Wrapper = (creator: Creator) => FC;
-
-  type ComposeFCResult = (...args: Middleare[]) => Wrapper;
-
-  type ComposeFC = (sc: SchemaComposer<any>, opts: Options) => ComposeFCResult;
-
-  /**
-   * Compose several FC creator with middlewares
-   *  Eg. composeFC(sc, opts)(createQueueKeysFC, wrapQueueArgs, wrapOtherMiddleware)
-   *  Will work like the following code:
-   *    let fc = createQueueKeysFC(sc, opts);
-   *    fc = wrapQueueArgs(fc, sc, opts)
-   *    fc = wrapOtherMiddleware(fc, sc, opts)
-   *    return fc;
-   */
-  function composeFC(sc: SchemaComposer<any>, opts: Options): ComposeFCResult {
-    return (...middlewares: Middleare[]): Wrapper => (creator: Creator): FC => {
-      let fc = creator(sc, opts);
-      for (let i = 0; i < middlewares.length; i++) {
-        fc = middlewares[i](fc, sc, opts);
-      }
-      return fc;
-    };
-  }
-
   const wrapQuery = composeFC(sc, opts)(wrapQueueArgs);
   const wrapMutation = composeFC(sc, opts)(wrapMutationFC, wrapQueueArgs);
 

src/composeBull.ts

@@ -5,8 +5,8 @@ export type Options = {
   typePrefix: string;
   jobDataTC?: string | ObjectTypeComposer<any, any>;
   queue?: {
-    name: string;
-    prefix: string;
+    name?: string;
+    prefix?: string;
   };
   redis?: RedisOptions | IORedis.Redis;
 };

src/definitions.ts

@@ -0,0 +1,25 @@
+import { SchemaComposer, ObjectTypeComposerFieldConfigAsObjectDefinition } from 'graphql-compose';
+import { Options } from '../definitions';
+
+type FC = ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>;
+
+type Middleare = (fc: FC, sc: SchemaComposer<any>, opts: Options) => FC;
+
+type Creator = (sc: SchemaComposer<any>, opts: Options) => FC;
+
+type Wrapper = (creator: Creator) => FC;
+
+type ComposeFCResult = (...args: Middleare[]) => Wrapper;
+
+/**
+ * Compose several FC creator with middlewares
+ */
+export function composeFC(sc: SchemaComposer<any>, opts: Options): ComposeFCResult {
+  return (...middlewares: Middleare[]): Wrapper => (creator: Creator): FC => {
+    let fc = creator(sc, opts);
+    for (let i = 0; i < middlewares.length; i++) {
+      fc = middlewares[i](fc, sc, opts);
+    }
+    return fc;
+  };
+}

src/helpers/composeFC.ts

@@ -4,3 +4,4 @@ export * from './MutationError';
 export * from './normalizePrefixGlob';
 export * from './wrapMutationFC';
 export * from './wrapQueueArgs';
+export * from './composeFC';