refactor: fix typescript typings

nodkz · nodkz · commit 27c9bddb4ae6 · 2020-04-09T18:55:10.000+06:00
diff --git a/example/src/schema/types/job/logs.ts b/example/src/schema/types/job/logs.ts
@@ -1,17 +1,23 @@
 import { Job } from 'bullmq';
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 
-export function createLogsFC(schemaComposer: SchemaComposer<any>) {
+export function createLogsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: schemaComposer.createObjectTC({
       name: 'JobLogs',
       fields: {
         count: 'Int',
-        logs: '[String!]!',
+        logs: '[String!]',
       },
     }),
-    resolve: async (job: Job) => {
-      return await job.queue.getJobLogs(job.id);
+    resolve: (job: Job) => {
+      // `queue` is private property of Job instance
+      // so here we are not guarantee that log will be avaliable in the future
+      if ((job as any).queue) {
+        return (job as any).queue.getJobLogs(job.id);
+      }
     },
   };
 }
diff --git a/example/src/schema/types/job/state.ts b/example/src/schema/types/job/state.ts
@@ -1,8 +1,10 @@
 import { Job } from 'bullmq';
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { getJobStatusEnumTC } from '../enums';
 
-export function createStateFC(schemaComposer: SchemaComposer<any>) {
+export function createStateFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobStatusEnumTC(schemaComposer),
     resolve: async (job: Job) => {
diff --git a/example/src/schema/types/queue/activeJobs.ts b/example/src/schema/types/queue/activeJobs.ts
@@ -1,8 +1,10 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job';
 
-export function createActiveJobsFC(schemaComposer: SchemaComposer<any>) {
+export function createActiveJobsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobTC(schemaComposer).getTypePlural(),
     args: {
diff --git a/example/src/schema/types/queue/completedJobs.ts b/example/src/schema/types/queue/completedJobs.ts
@@ -1,8 +1,10 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job';
 
-export function createCompletedJobsFC(schemaComposer: SchemaComposer<any>) {
+export function createCompletedJobsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobTC(schemaComposer).getTypePlural(),
     args: {
diff --git a/example/src/schema/types/queue/delayedJobs.ts b/example/src/schema/types/queue/delayedJobs.ts
@@ -1,8 +1,10 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job';
 
-export function createDelayedJobsFC(schemaComposer: SchemaComposer<any>) {
+export function createDelayedJobsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobTC(schemaComposer).getTypePlural(),
     args: {
diff --git a/example/src/schema/types/queue/failedJobs.ts b/example/src/schema/types/queue/failedJobs.ts
@@ -1,8 +1,10 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job';
 
-export function createFailedJobsFC(schemaComposer: SchemaComposer<any>) {
+export function createFailedJobsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobTC(schemaComposer).getTypePlural(),
     args: {
diff --git a/example/src/schema/types/queue/jobCounts.ts b/example/src/schema/types/queue/jobCounts.ts
@@ -1,7 +1,10 @@
 import { JobStatusEnum } from '../enums';
 import { Queue } from 'bullmq';
+import { ObjectTypeComposerFieldConfigDefinition, SchemaComposer } from 'graphql-compose';
 
-export function createJobCountFC(schemaComposer) {
+export function createJobCountFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: schemaComposer.createObjectTC({
       name: 'JobCounts',
diff --git a/example/src/schema/types/queue/jobs.ts b/example/src/schema/types/queue/jobs.ts
@@ -1,9 +1,11 @@
 import { Queue } from 'bullmq';
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { getJobStatusEnumTC } from '../enums';
 import { getJobTC } from '../job';
 
-export function createJobsFC(schemaComposer: SchemaComposer<any>) {
+export function createJobsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobTC(schemaComposer).getTypePlural(),
     args: {
diff --git a/example/src/schema/types/queue/repeatables.ts b/example/src/schema/types/queue/repeatables.ts
@@ -1,6 +1,9 @@
 import { Queue } from 'bullmq';
+import { ObjectTypeComposerFieldConfigDefinition, SchemaComposer } from 'graphql-compose';
 
-export function createRepeatablesFC(schemaComposer) {
+export function createRepeatablesFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: schemaComposer.createObjectTC({
       name: 'RepeatableJobInformation',
diff --git a/example/src/schema/types/queue/waitingJobs.ts b/example/src/schema/types/queue/waitingJobs.ts
@@ -1,8 +1,10 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 import { getJobTC } from '../job';
 
-export function createWaitingJobsFC(schemaComposer: SchemaComposer<any>) {
+export function createWaitingJobsFC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: getJobTC(schemaComposer).getTypePlural(),
     args: {
diff --git a/example/src/schema/types/queue/workers.ts b/example/src/schema/types/queue/workers.ts
@@ -1,21 +1,23 @@
-import { SchemaComposer } from 'graphql-compose';
+import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 import { Queue } from 'bullmq';
 
-export function createWorkersTC(schemaComposer: SchemaComposer<any>) {
+export function createWorkersTC(
+  schemaComposer: SchemaComposer<any>
+): ObjectTypeComposerFieldConfigDefinition<any, any> {
   return {
     type: schemaComposer
       .createObjectTC({
-        //https://redis.io/commands/client-list
+        // see https://redis.io/commands/client-list
         name: 'QueueWorker',
         fields: {
-          clientId: 'String',
+          id: 'String',
           addr: 'String',
-          fileDescr: 'String',
+          fd: 'String',
           name: 'String',
           age: 'Int',
           idle: 'Int',
-          clientFlags: 'String',
-          dbId: 'Int',
+          flags: 'String',
+          db: 'Int',
           sub: 'Int',
           psub: 'Int',
           multi: 'Int',
@@ -32,25 +34,9 @@ export function createWorkersTC(schemaComposer: SchemaComposer<any>) {
     args: {},
     resolve: async (queue: Queue) => {
       const workers = await queue.getWorkers();
-      return workers.map((worker) => ({
-        clientId: worker.id,
-        addr: worker.addr,
-        fileDescr: worker.fd,
-        name: worker.name,
-        age: worker.age,
-        idle: worker.idle,
-        clientFlags: worker.flags,
-        dbId: worker.db,
-        sub: worker.sub,
-        psub: worker.psub,
-        multi: worker.multi,
-        qbuf: worker.qbuf,
-        qbufFree: worker['qbuf-free'],
-        obl: worker.obl,
-        oll: worker.id,
-        omem: worker.omem,
-        events: worker.events,
-        cmd: worker.cmd,
+      return workers.map((w) => ({
+        ...w,
+        qbufFree: w['qbuf-free'],
       }));
     },
   };
