Skip to content

Commit d6c594d

Browse files
authored
🤖 Merge PR DefinitelyTyped#72064 [rascal] Fix @typescript-eslint/no-misused-promises errors on subscription events by @dejan-lukic
1 parent f70762e commit d6c594d

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

‎types/rascal/index.d.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,16 +437,20 @@ declare const testConfig: {
437437
};
438438

439439
type AckOrNack = (err?: Error, recovery?: Recovery | Recovery[]) => void;
440+
type CallbackReturn<T> = T | Promise<T>;
440441

441442
export class SubscriberSessionAsPromised extends EventEmitter {
442443
name: string;
443444
cancel(): Promise<void>;
444445

445-
on(event: "message", listener: (message: Message, content: any, ackOrNackFn: AckOrNack) => void): this;
446-
on(event: "error" | "cancelled", listener: (err: Error) => void): this;
446+
on(
447+
event: "message",
448+
listener: (message: Message, content: any, ackOrNackFn: AckOrNack) => CallbackReturn<void>,
449+
): this;
450+
on(event: "error" | "cancelled", listener: (err: Error) => CallbackReturn<void>): this;
447451
on(
448452
event: "invalid_content" | "redeliveries_exceeded" | "redeliveries_error",
449-
listener: (err: Error, message: Message, ackOrNackFn: AckOrNack) => void,
453+
listener: (err: Error, message: Message, ackOrNackFn: AckOrNack) => CallbackReturn<void>,
450454
): this;
451455
}
452456

@@ -472,11 +476,14 @@ export class SubscriptionSession extends EventEmitter {
472476
isCancelled(): boolean;
473477
cancel(next: ErrorCb): void;
474478

475-
on(event: "message", listener: (message: Message, content: any, ackOrNackFn: AckOrNack) => void): this;
476-
on(event: "error" | "cancelled", listener: (err: Error) => void): this;
479+
on(
480+
event: "message",
481+
listener: (message: Message, content: any, ackOrNackFn: AckOrNack) => CallbackReturn<void>,
482+
): this;
483+
on(event: "error" | "cancelled", listener: (err: Error) => CallbackReturn<void>): this;
477484
on(
478485
event: "invalid_content" | "redeliveries_exceeded" | "redeliveries_error",
479-
listener: (err: Error, message: Message, ackOrNackFn: AckOrNack) => void,
486+
listener: (err: Error, message: Message, ackOrNackFn: AckOrNack) => CallbackReturn<void>,
480487
): this;
481488
}
482489

0 commit comments

Comments
 (0)