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.

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

Add type for srv.on('error') and fix srv.send overload #9

Merged
merged 4 commits into from
Jan 8, 2024

Conversation

johannes-vogel
Copy link
Contributor

No description provided.

@@ -171,7 +171,7 @@ export class Service extends QueryAPI {
<T = any>(details: { event: types.event; data?: object; headers?: object }): Promise<T>
<T = any>(details: { query: ConstructedQuery; data?: object; headers?: object }): Promise<T>
<T = any>(details: { method: types.eventName; path: string; data?: object; headers?: object }): Promise<T>
<T = any>(details: { event: types.eventName; entity: LinkedDefinition | string; data?: object; params?: object }): Promise<T>
<T = any>(details: { event: types.eventName; entity: LinkedDefinition | string; data?: object; params?: object; headers?: object }): Promise<T>
Copy link
Contributor

@daogrady daogrady Jan 8, 2024

Choose a reason for hiding this comment

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

headers appears to be a recurring parameter type throughout the services definition. If I gather this from CAPire correctly, we are referring to general HTTP headers here, is that correct? If so, we could probably use import type { IncomingHttpHeaders } from 'node:http' type across all signatures. That would give us a nice, strict typing, consistency (currently we have a mix of object and {}), and code completion:

Screenshot 2024-01-08 at 07 45 01

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For most use cases, I think that would be an options. However, the messages of headers are of a different format.
Here, we'd need to have additional type, I suppose.

Copy link
Contributor

@daogrady daogrady Jan 8, 2024

Choose a reason for hiding this comment

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

I see. I think for this PR where you are adding a missing signature it is absolutely fine.
For the long run I am strongly in favour of adding a dedicated type for these headers. Maybe we can use the existing type from node:http to derive ours. But let's postpone this as well.

@@ -290,6 +291,10 @@ interface OnEventHandler {
(req: Request, next: Function): Promise<any> | any | void
}

interface OnErrorHandler {
(err: Error, req: Request): any | void
Copy link
Contributor

Choose a reason for hiding this comment

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

Perfectly in line with all our other handler signatures, so this is absolutely fine. I am just wondering: can we stricten the return type for handlers in any way in general? Can it maybe be derived from the parameters?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The return type does not matter for before/after/on('error').
Promises are awaited.

For regular on-handlers the return type might be undefined or an instance or array of "Books" or a promise resolving to one of them.

I don't know if that's somehow expressable.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, we should be able to express this using TypedRequest<T>. It would then look more or less like this:

interface FooHandler<T> {
  (..., req: TypedRequest<T>): T | Promise<T> 
}

which would basically mean "T in, T out". But lets postpone this into a separate issue, as it seems to be beyond the scope of your actual fix.

Copy link
Contributor

@daogrady daogrady left a comment

Choose a reason for hiding this comment

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

Thanks for this addition to the types! The change itself looks fine; I will create follow-up issues for the two bullet points we discussed in the comments.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants