Unionise the Console, Event and Queue Explorers into a single explorer.

lib/console/index.ts

@@ -3,7 +3,6 @@ export * from './decorators';
 export * from './logger';
 export * from './inquirer';
 export * from './commands';
-export * from './explorer';
 export * from './runner';
 export * from './interfaces';
 export * from './consoleIO';

lib/database/repositories/database.ts

@@ -82,6 +82,7 @@ export class DatabaseRepository<T extends BaseModel>
     }
 
     for (const key in inputs) {
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       Array.isArray(inputs[key] as unknown as any)
         ? query.whereIn(
             key,
@@ -201,6 +202,7 @@ export class DatabaseRepository<T extends BaseModel>
     const query = this.query();
 
     for (const key in inputs) {
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       Array.isArray(inputs[key])
         ? query.whereIn(key, inputs[key] as unknown as any[])
         : query.where(key, inputs[key] as unknown as any);
@@ -229,7 +231,6 @@ export class DatabaseRepository<T extends BaseModel>
     payload: number | string | Array<number | string> | Record<string, any>,
   ): Promise<void> {
     await model.$relatedQuery(relation).relate(payload);
-    return;
   }
 
   /**
@@ -247,7 +248,6 @@ export class DatabaseRepository<T extends BaseModel>
     if (Array.isArray(payload) && payload.length > 0) {
       await model.$relatedQuery(relation).relate(payload);
     }
-    return;
   }
 
   /**
@@ -261,7 +261,6 @@ export class DatabaseRepository<T extends BaseModel>
     const query = this.query();
     query.where(where);
     await query.chunk(cb, size);
-    return;
   }
 
   /**

lib/events/helpers.ts

@@ -6,7 +6,6 @@ export async function Emit(...events: EmitsEvent[]): Promise<void> {
     promises.push(event.emit());
   }
   await Promise.allSettled(promises);
-  return;
 }
 
 export async function EmitIf(
@@ -18,7 +17,6 @@ export async function EmitIf(
     promises.push(event.emitIf(condition));
   }
   await Promise.allSettled(promises);
-  return;
 }
 
 export async function emitUnless(
@@ -30,7 +28,6 @@ export async function emitUnless(
     promises.push(event.emitUnless(condition));
   }
   await Promise.allSettled(promises);
-  return;
 }
 
 export function difference<T>(arr1: T[], arr2: T[]): T[] {

lib/events/index.ts

@@ -1,7 +1,6 @@
 export * from './event';
 export * from './decorator';
 export * from './metadata';
-export * from './explorer';
 export * from './interfaces';
 export * from './helpers';
 export * from './jobListener';

lib/console/explorer.ts → lib/explorer.ts

@@ -1,12 +1,15 @@
 import { Injectable } from '@nestjs/common';
 import { DiscoveryService, MetadataScanner } from '@nestjs/core';
-import { GenericFunction } from '../interfaces';
-import { ConsoleConstants } from './constants';
-import { CommandMetaOptions } from './interfaces';
-import { CommandMeta } from './metadata';
+import { CommandMeta, CommandMetaOptions } from './console';
+import { ConsoleConstants } from './console/constants';
+import { EventMetadata } from './events';
+import { IntentEventConstants } from './events/constants';
+import { GenericFunction } from './interfaces';
+import { JOB_NAME, JOB_OPTIONS } from './queue/constants';
+import { QueueMetadata } from './queue/metadata';
 
 @Injectable()
-export class ConsoleExplorer {
+export class IntentExplorer {
   constructor(
     private readonly discovery: DiscoveryService,
     private readonly metadataScanner: MetadataScanner,
@@ -27,11 +30,42 @@ export class ConsoleExplorer {
       this.metadataScanner.scanFromPrototype(
         instance,
         Object.getPrototypeOf(instance),
-        (key: string) => this.lookupConsoleCommands(instance, key),
+        (key: string) => {
+          this.lookupJobs(instance, key);
+          this.lookupListeners(instance, key);
+          this.lookupConsoleCommands(instance, key);
+        },
       );
     });
   }
 
+  lookupJobs(instance: Record<string, GenericFunction>, key: string) {
+    const methodRef = instance[key];
+    const hasJobMeta = Reflect.hasMetadata(JOB_NAME, instance, key);
+    if (!hasJobMeta) return;
+    const jobName = Reflect.getMetadata(JOB_NAME, instance, key);
+    QueueMetadata.addJob(jobName, {
+      options: Reflect.getMetadata(JOB_OPTIONS, instance, key),
+      target: methodRef.bind(instance),
+    });
+  }
+
+  lookupListeners(instance: Record<string, any>, key: string) {
+    const methodRef = instance[key];
+    const hasEventMeta = Reflect.hasMetadata(
+      IntentEventConstants.eventName,
+      instance,
+      key,
+    );
+    if (!hasEventMeta) return;
+    const eventName = Reflect.getMetadata(
+      IntentEventConstants.eventName,
+      instance,
+      key,
+    );
+    EventMetadata.addListener(eventName, methodRef.bind(instance));
+  }
+
   lookupConsoleCommands(
     instance: Record<string, GenericFunction>,
     key: string,

lib/module.ts

@@ -6,34 +6,31 @@ import { CodegenCommand } from './codegen/command';
 import { CodegenService } from './codegen/service';
 import { ViewConfigCommand } from './config/command';
 import { IntentConfig } from './config/service';
-import { ConsoleExplorer, ListCommands } from './console';
+import { ListCommands } from './console';
 import { ObjectionService } from './database';
 import { DbOperationsCommand } from './database/commands/migrations';
-import { EventExplorer } from './events';
 import { EventQueueWorker } from './events/jobListener';
+import { IntentExplorer } from './explorer';
 import { GenericFunction } from './interfaces';
 import { LocalizationService } from './localization';
 import { LoggerService } from './logger/service';
 import { MailerService } from './mailer';
 import { QueueService } from './queue';
 import { QueueConsoleCommands } from './queue/console';
-import { QueueExplorer } from './queue/explorer';
 import { QueueMetadata } from './queue/metadata';
 import { StorageService } from './storage/service';
 import { ExistsConstraint } from './validator/decorators/exists';
 import { IsUniqueConstraint } from './validator/decorators/isUnique';
 
 const providers = [
-  ConsoleExplorer,
+  IntentExplorer,
   ListCommands,
   DbOperationsCommand,
   ObjectionService,
-  EventExplorer,
   StorageService,
   CacheService,
   QueueService,
   QueueConsoleCommands,
-  QueueExplorer,
   CodegenCommand,
   CodegenService,
   ViewConfigCommand,