Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP fix(types): transform method only accepts current event type #492

Closed
wants to merge 7 commits into from
Closed

WIP fix(types): transform method only accepts current event type #492

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12afb27
fix(types): transform method only accepts current event type
oscard0m Mar 12, 2021
fc8fded
test(event-handler-test): expected-error because typing becomes more …
oscard0m Mar 12, 2021
147fb7c
fix(types): proper type fixing applied
oscard0m Mar 13, 2021
0b41d7f
test(event-handler): restore string type in L138
oscard0m Mar 13, 2021
3d7b192
refactor(types): move any default values to type definition
oscard0m Mar 13, 2021
84a841e
refactor(types): infer any from Options as default value
oscard0m Mar 13, 2021
8d69e0b
Merge branch 'master' into transform-method-only-accepts-current-even…
oscard0m Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/event-handler/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import { receiverHandle as receive } from "./receive";
import { removeListener } from "./remove-listener";

interface EventHandler<T extends Options> {
interface EventHandler<T extends Options<EmitterWebhookEventName>> {
on<E extends EmitterWebhookEventName>(
event: E | E[],
callback: HandlerFunction<E, T["transform"]>
Expand All @@ -29,7 +29,7 @@ interface EventHandler<T extends Options> {
receive(event: EmitterWebhookEvent): Promise<void>;
}

export function createEventHandler<T extends Options>(
export function createEventHandler<T extends Options<EmitterWebhookEventName>>(
options?: T
): EventHandler<T> {
const state: State = {
Expand Down
7 changes: 5 additions & 2 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ interface BaseWebhookEvent<TName extends WebhookEventName> {
payload: WebhookEventMap[TName];
}

export interface Options<TTransformed = unknown> {
export interface Options<
E extends EmitterWebhookEventName = any,
TTransformed extends EmitterWebhookEvent<E> = any
Comment on lines +25 to +26
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to improve these any default values here. Is it possible?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can default to EmitterWebhookEventName, it's done elsewhere in the code

> {
path?: string;
secret?: string;
transform?: TransformMethod<TTransformed>;
Expand All @@ -43,7 +46,7 @@ type Hooks = {
[key: string]: Function[];
};

export interface State extends Options<any> {
export interface State extends Options {
eventHandler?: any;
hooks: Hooks;
log: Logger;
Expand Down