Skip to content

feat(event-handler): remove undefined from Router's resolve type signature #4463

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

Merged
merged 1 commit into from
Sep 10, 2025
Merged

feat(event-handler): remove undefined from Router's resolve type signature #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/event-handler/src/rest/Router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ class Router {
* @param event - The Lambda event to resolve
* @param context - The Lambda context
* @param options - Optional resolve options for scope binding
* @returns An API Gateway proxy result or undefined for incompatible events
* @returns An API Gateway proxy result
*/
public async resolve(
event: unknown,
context: Context,
options?: ResolveOptions
): Promise<APIGatewayProxyResult | undefined> {
): Promise<APIGatewayProxyResult> {
if (!isAPIGatewayProxyEvent(event)) {
this.logger.error(
'Received an event that is not compatible with this resolver'
Expand Down
6 changes: 3 additions & 3 deletions packages/event-handler/tests/unit/rest/Router/basic-routing.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ describe('Class: Router - Basic Routing', () => {
context
);

expect(result?.statusCode).toBe(HttpErrorCodes.METHOD_NOT_ALLOWED);
expect(result?.body).toEqual('');
expect(result.statusCode).toBe(HttpErrorCodes.METHOD_NOT_ALLOWED);
expect(result.body).toEqual('');
}
);

Expand Down Expand Up @@ -99,7 +99,7 @@ describe('Class: Router - Basic Routing', () => {

// Act
const result = await app.resolve(testEvent, context);
const actual = JSON.parse(result?.body ?? '{}');
const actual = JSON.parse(result.body);

// Assess
expect(actual.hasRequest).toBe(true);
Expand Down
4 changes: 2 additions & 2 deletions packages/event-handler/tests/unit/rest/Router/decorators.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ describe('Class: Router - Decorators', () => {

// Act
const result = await lambda.handler(testEvent, context);
const actual = JSON.parse(result?.body ?? '{}');
const actual = JSON.parse(result.body);

// Assess
expect(actual.hasRequest).toBe(true);
Expand Down Expand Up @@ -452,7 +452,7 @@ describe('Class: Router - Decorators', () => {

// Act
const result = await lambda.handler(testEvent, context);
const body = JSON.parse(result?.body ?? '{}');
const body = JSON.parse(result.body);

// Assess
expect(body.hasRequest).toBe(true);
Expand Down
20 changes: 10 additions & 10 deletions packages/event-handler/tests/unit/rest/Router/error-handling.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ describe('Class: Router - Error Handling', () => {
const result = await app.resolve(createTestEvent('/test', 'GET'), context);

// Assess
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result?.body ?? '{}');
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result.body);
expect(body.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(body.error).toBe('Internal Server Error');
expect(body.message).toBe('Internal Server Error');
Expand All @@ -140,8 +140,8 @@ describe('Class: Router - Error Handling', () => {
const result = await app.resolve(createTestEvent('/test', 'GET'), context);

// Assess
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result?.body ?? '{}');
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result.body);
expect(body.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(body.error).toBe('Internal Server Error');
expect(body.message).toBe('Internal Server Error');
Expand Down Expand Up @@ -220,8 +220,8 @@ describe('Class: Router - Error Handling', () => {
const result = await app.resolve(createTestEvent('/test', 'GET'), context);

// Assess
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result?.body ?? '{}');
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result.body);
expect(body.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(body.error).toBe('Internal Server Error');
expect(body.message).toBe('Internal Server Error');
Expand All @@ -242,8 +242,8 @@ describe('Class: Router - Error Handling', () => {
const result = await app.resolve(createTestEvent('/test', 'GET'), context);

// Assess
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result?.body ?? '{}');
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result.body);
expect(body.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(body.error).toBe('Internal Server Error');
expect(body.message).toBe('debug error details');
Expand Down Expand Up @@ -363,7 +363,7 @@ describe('Class: Router - Error Handling', () => {
const result = await app.resolve(createTestEvent('/test', 'GET'), context);

// Assess
expect(result?.headers?.['content-type']).toBe('application/json');
expect(result.headers?.['content-type']).toBe('application/json');
});

it('passes request, event, and context to functional error handlers', async () => {
Expand All @@ -386,7 +386,7 @@ describe('Class: Router - Error Handling', () => {

// Act
const result = await app.resolve(testEvent, context);
const body = JSON.parse(result?.body ?? '{}');
const body = JSON.parse(result.body);

// Assess
expect(body.hasRequest).toBe(true);
Expand Down
24 changes: 12 additions & 12 deletions packages/event-handler/tests/unit/rest/Router/middleware.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ describe('Class: Router - Middleware', () => {
'middleware2',
'middleware1-end',
]);
expect(result?.statusCode).toBe(401);
expect(result?.body).toBe('Short-circuited');
expect(result.statusCode).toBe(401);
expect(result.body).toBe('Short-circuited');
});

it('passes params and options to middleware', async () => {
Expand Down Expand Up @@ -175,8 +175,8 @@ describe('Class: Router - Middleware', () => {
);

// Assess
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result?.body ?? '{}');
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
const body = JSON.parse(result.body);
expect(body.message).toContain('next() called multiple times');
});

Expand Down Expand Up @@ -207,7 +207,7 @@ describe('Class: Router - Middleware', () => {

// Assess
expect(executionOrder).toEqual(['middleware1']);
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
});

it('handles errors thrown in middleware after next()', async () => {
Expand Down Expand Up @@ -239,7 +239,7 @@ describe('Class: Router - Middleware', () => {
'handler',
'middleware1-end',
]);
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
});

it('propagates handler errors through middleware chain', async () => {
Expand Down Expand Up @@ -267,7 +267,7 @@ describe('Class: Router - Middleware', () => {
'middleware2-start',
'handler',
]);
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
});

it('handles middleware not calling next()', async () => {
Expand All @@ -291,7 +291,7 @@ describe('Class: Router - Middleware', () => {

// Assess
expect(executionOrder).toEqual(['middleware1']);
expect(result?.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
expect(result.statusCode).toBe(HttpErrorCodes.INTERNAL_SERVER_ERROR);
});

it('handles middleware returning JSON objects', async () => {
Expand Down Expand Up @@ -324,8 +324,8 @@ describe('Class: Router - Middleware', () => {
'middleware2',
'middleware1-end',
]);
expect(result?.statusCode).toBe(200);
const body = JSON.parse(result?.body ?? '{}');
expect(result.statusCode).toBe(200);
const body = JSON.parse(result.body);
expect(body).toEqual({
statusCode: 202,
message: 'Accepted by middleware',
Expand Down Expand Up @@ -619,8 +619,8 @@ describe('Class: Router - Middleware', () => {
'route-middleware',
'global-middleware-end',
]);
expect(result?.statusCode).toBe(403);
expect(result?.body).toBe('Route middleware response');
expect(result.statusCode).toBe(403);
expect(result.body).toBe('Route middleware response');
});
});
});
Loading