From 029bd4c025e1c28bdcffe07fccb9ed2e14db905a Mon Sep 17 00:00:00 2001
From: Gregor Martynus <39992+gr2m@users.noreply.github.com>
Date: Thu, 4 Feb 2021 11:44:08 -0800
Subject: [PATCH 1/2] test: remove `new Webhooks` type arguments

---
 test/typescript-validate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/typescript-validate.ts b/test/typescript-validate.ts
index dc8da134..9002b77e 100644
--- a/test/typescript-validate.ts
+++ b/test/typescript-validate.ts
@@ -91,7 +91,7 @@ export default async function () {
   });
 
   // Check all supported options
-  const webhooks = new Webhooks<EmitterWebhookEvent, { foo: string }>({
+  const webhooks = new Webhooks({
     secret: "bleh",
     path: "/webhooks",
     transform: (event) => {

From ec315da2fca147a7ede25ce2e68460b0b3c26983 Mon Sep 17 00:00:00 2001
From: Gareth Jones <jones258@gmail.com>
Date: Fri, 5 Feb 2021 14:22:09 +1300
Subject: [PATCH 2/2] fix(typescript): pass `TTransformed` generic around to
 allow inference

---
 src/index.ts | 2 +-
 src/types.ts | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index e76ebe07..a46c876e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -47,7 +47,7 @@ class Webhooks<
     options: EmitterWebhookEventMap[WebhookEventName] & { signature: string }
   ) => Promise<void>;
 
-  constructor(options?: Options<E>) {
+  constructor(options?: Options<E, TTransformed>) {
     if (!options || !options.secret) {
       throw new Error("[@octokit/webhooks] options.secret required");
     }
diff --git a/src/types.ts b/src/types.ts
index 50bd481a..d63120ed 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -37,10 +37,10 @@ interface BaseWebhookEvent<
   payload: EmitterEventPayloadMap[TName];
 }
 
-export interface Options<T extends EmitterWebhookEvent> {
+export interface Options<T extends EmitterWebhookEvent, TTransformed> {
   path?: string;
   secret?: string;
-  transform?: TransformMethod<T>;
+  transform?: TransformMethod<T, TTransformed>;
 }
 
 type TransformMethod<T extends EmitterWebhookEvent, V = T> = (
@@ -65,7 +65,8 @@ type Hooks = {
   [key: string]: Function[];
 };
 
-export interface State extends Options<any> {
+export interface State<TTransformed = unknown>
+  extends Options<any, TTransformed> {
   eventHandler?: any;
   hooks: Hooks;
 }