fixing middyjs#1228

jerizm · Sep 18, 2024 · febb6bf · febb6bf
1 parent 4ad95ba
commit febb6bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
@@ -96,12 +96,12 @@ export interface MiddyfiedHandler<
  before: AttachMiddlewareFn<TEvent, TResult, TErr, TContext, TInternal>
  after: AttachMiddlewareFn<TEvent, TResult, TErr, TContext, TInternal>
  onError: AttachMiddlewareFn<TEvent, TResult, TErr, TContext, TInternal>
- handler: <TInputHandlerEventProps = TEvent, TInputHandlerResultProps = TResult>(
+ handler: <TInputHandlerEventProps = TEvent>(
  handler: MiddlewareHandler<
- LambdaHandler<TInputHandlerEventProps, TInputHandlerResultProps>,
+ LambdaHandler<TInputHandlerEventProps, TResult>,
  TContext
  >
- ) => MiddyfiedHandler<TInputHandlerEventProps, TInputHandlerResultProps, TErr, TContext, TInternal>
+ ) => MiddyfiedHandler<TInputHandlerEventProps, TResult, TErr, TContext, TInternal>
 }
 
 declare type AttachMiddlewareFn<

diff --git a/packages/core/index.test-d.ts b/packages/core/index.test-d.ts
@@ -409,3 +409,21 @@ const s3Handler = async (event: S3Event): Promise<void> => {
 
 const handler1182 = middy().handler(s3Handler)
 expectType<MiddyfiedHandler<S3Event, void, Error, Context, {}>>(handler1182)
+
+let handler1228 = middy<APIGatewayProxyEvent, APIGatewayProxyResult, Error, Context>();
+// @ts-expect-error - should enforce the return type
+handler1228.handler(async (req, context) => {
+ return '123';
+});
+
+handler1228.handler(async (event) => {
+ return { 
+ statusCode: 200,
+ body: `Hello from ${event.path}`
+ };
+});
+
+// @ts-expect-error - should enforce the return type
+handler1228.handler<APIGatewayProxyEvent>(async (req, context) => {
+ return '123';
+});