fix(types): limit recursion in types using ternary statements (#929)

octokit · Nov 22, 2023 · 1124632 · 1124632
1 parent becc4a5
commit 1124632
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/event-handler/index.ts b/src/event-handler/index.ts
@@ -20,7 +20,13 @@ interface EventHandler<TTransformed> {
     event: E | E[],
     callback: HandlerFunction<E, TTransformed>,
   ): void;
-  onAny(handler: (event: EmitterWebhookEvent & TTransformed) => any): void;
+  onAny(
+    handler: (
+      event: TTransformed extends unknown
+        ? EmitterWebhookEvent
+        : EmitterWebhookEvent & TTransformed,
+    ) => any,
+  ): void;
   onError(
     handler: (event: WebhookEventHandlerError<TTransformed>) => any,
   ): void;

diff --git a/src/event-handler/on.ts b/src/event-handler/on.ts
@@ -51,7 +51,11 @@ export function receiverOn(
 
 export function receiverOnAny<TTransformed>(
   state: State,
-  handler: (event: EmitterWebhookEvent & TTransformed) => any,
+  handler: (
+    event: TTransformed extends unknown
+      ? EmitterWebhookEvent
+      : EmitterWebhookEvent & TTransformed,
+  ) => any,
 ) {
   handleEventHandlers(state, "*", handler);
 }

diff --git a/src/index.ts b/src/index.ts
@@ -26,7 +26,11 @@ class Webhooks<TTransformed = unknown> {
     callback: HandlerFunction<E, TTransformed>,
   ) => void;
   public onAny: (
-    callback: (event: EmitterWebhookEvent & TTransformed) => any,
+    callback: (
+      event: TTransformed extends unknown
+        ? EmitterWebhookEvent
+        : EmitterWebhookEvent & TTransformed,
+    ) => any,
   ) => void;
   public onError: (
     callback: (event: WebhookEventHandlerError<TTransformed>) => any,

diff --git a/src/types.ts b/src/types.ts
@@ -64,7 +64,9 @@ export type WebhookError = Error & Partial<RequestError>;
 // todo: rename to "EmitterErrorEvent"
 export interface WebhookEventHandlerError<TTransformed = unknown>
   extends AggregateError<WebhookError> {
-  event: EmitterWebhookEvent & TTransformed;
+  event: TTransformed extends unknown
+    ? EmitterWebhookEvent
+    : EmitterWebhookEvent & TTransformed;
 }
 
 /**