github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-22 19:58:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Emitter emits event in the meta (#14203)

Browse Source 
* Emitter emits event in the meta

* Update unit test
This commit is contained in:
ian
2022-06-30 22:12:42 +08:00
committed by GitHub
parent 184d312f84
commit e14a6ea401
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/emitter.ts
View File

@@ -29,14 +29,19 @@ export class Emitter {
context: EventContext
): Promise<T> {
const events = Array.isArray(event) ? event : [event];
const listeners = events.flatMap((event) => this.filterEmitter.listeners(event) as FilterHandler<T>[]);
const eventListeners = events.map((event) => ({
event,
listeners: this.filterEmitter.listeners(event) as FilterHandler<T>[],
}));
let updatedPayload = payload;
for (const listener of listeners) {
const result = await listener(updatedPayload, meta, context);
for (const { event, listeners } of eventListeners) {
for (const listener of listeners) {
const result = await listener(updatedPayload, { event, ...meta }, context);
if (result !== undefined) {
updatedPayload = result;
if (result !== undefined) {
updatedPayload = result;
}
}
}
@@ -47,7 +52,7 @@ export class Emitter {
const events = Array.isArray(event) ? event : [event];
for (const event of events) {
this.actionEmitter.emitAsync(event, meta, context).catch((err) => {
this.actionEmitter.emitAsync(event, { event, ...meta }, context).catch((err) => {
logger.warn(`An error was thrown while executing action "${event}"`);
logger.warn(err);
});
@@ -56,7 +61,7 @@ export class Emitter {
public async emitInit(event: string, meta: Record<string, any>): Promise<void> {
try {
await this.initEmitter.emitAsync(event, meta);
await this.initEmitter.emitAsync(event, { event, ...meta });
} catch (err: any) {
logger.warn(`An error was thrown while executing init "${event}"`);
logger.warn(err);

4
api/tests/cli/index.test.ts
View File

@@ -57,10 +57,10 @@ describe('cli hooks', () => {
const program = await setup();
expect(beforeHook).toHaveBeenCalledTimes(1);
expect(beforeHook).toHaveBeenCalledWith({ program });
expect(beforeHook).toHaveBeenCalledWith({ event: 'cli.before', program });
expect(afterHook).toHaveBeenCalledTimes(1);
expect(afterHook).toHaveBeenCalledWith({ program });
expect(afterHook).toHaveBeenCalledWith({ event: 'cli.after', program });
});
test('should be able to add a custom cli command', async () => {