@middy/core 2.5.0 → 2.5.4

package/index.d.ts

@@ -1,11 +1,12 @@
 import {
   Context as LambdaContext,
-  Handler as LambdaHandler
+  Handler as LambdaHandler,
+  Callback as LambdaCallback
 } from 'aws-lambda'
 
 declare type PluginHook = () => void
 declare type PluginHookWithMiddlewareName = (middlewareName: string) => void
-declare type PluginHookPromise = () => Promise<any>
+declare type PluginHookPromise = (request: Request) => Promise<unknown> | unknown
 
 interface PluginObject {
   beforePrefetch?: PluginHook
@@ -17,7 +18,7 @@ interface PluginObject {
   requestEnd?: PluginHookPromise
 }
 
-interface Request<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> {
+interface Request<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> {
   event: TEvent
   context: TContext
   response: TResult | null
@@ -27,17 +28,19 @@ interface Request<TEvent = any, TResult = any, TErr = Error, TContext extends La
   }
 }
 
-declare type MiddlewareFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> = (request: Request<TEvent, TResult, TErr, TContext>) => any
+declare type MiddlewareFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> = (request: Request<TEvent, TResult, TErr, TContext>) => any
 
-export interface MiddlewareObj<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> {
+export interface MiddlewareObj<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> {
   before?: MiddlewareFn<TEvent, TResult, TErr, TContext>
   after?: MiddlewareFn<TEvent, TResult, TErr, TContext>
-  onError?: MiddlewareFn<TEvent, TResult, TErr>
+  onError?: MiddlewareFn<TEvent, TResult, TErr, TContext>
 }
 
-type MiddyInputHandler<TEvent, TResult, TContext> = (event: TEvent, context: TContext) => Promise<TResult>
+// The AWS provided Handler type uses void | Promise<TResult> so we have no choice but to follow and suppress the linter warning
+// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+type MiddyInputHandler<TEvent, TResult, TContext extends LambdaContext = LambdaContext> = (event: TEvent, context: TContext, callback: LambdaCallback<TResult>) => void | Promise<TResult>
 
-export interface MiddyfiedHandler<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> extends MiddyInputHandler<TEvent, TResult, TContext> {
+export interface MiddyfiedHandler<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> extends MiddyInputHandler<TEvent, TResult, TContext> {
   use: UseFn<TEvent, TResult, TErr, TContext>
   applyMiddleware: AttachMiddlewareObj<TEvent, TResult, TErr, TContext>
   before: AttachMiddlewareFn<TEvent, TResult, TErr, TContext>
@@ -48,19 +51,18 @@ export interface MiddyfiedHandler<TEvent = any, TResult = any, TErr = Error, TCo
     after: Array<MiddlewareFn<TEvent, TResult, TErr, TContext>>
     onError: Array<MiddlewareFn<TEvent, TResult, TErr, TContext>>
   }
-  (event: TEvent, context: TContext): Promise<TResult>
 }
 
-declare type AttachMiddlewareFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> = (middleware: MiddlewareFn) => MiddyfiedHandler<TEvent, TResult, TErr, TContext>
+declare type AttachMiddlewareFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> = (middleware: MiddlewareFn) => MiddyfiedHandler<TEvent, TResult, TErr, TContext>
 
-declare type AttachMiddlewareObj<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> = (middleware: MiddlewareObj) => MiddyfiedHandler<TEvent, TResult, TErr, TContext>
+declare type AttachMiddlewareObj<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> = (middleware: MiddlewareObj) => MiddyfiedHandler<TEvent, TResult, TErr, TContext>
 
-declare type UseFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> =
+declare type UseFn<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> =
   (middlewares: MiddlewareObj<TEvent, TResult, TErr, TContext> | Array<MiddlewareObj<TEvent, TResult, TErr, TContext>>) => MiddyfiedHandler<TEvent, TResult, TErr, TContext>
 
-declare type MiddlewareHandler<THandler extends LambdaHandler<any, any>, TContext> =
+declare type MiddlewareHandler<THandler extends LambdaHandler<any, any>, TContext extends LambdaContext = LambdaContext> =
   THandler extends LambdaHandler<infer TEvent, infer TResult> // always true
-    ? (event: TEvent, context: TContext) => Promise<TResult>
+    ? MiddyInputHandler<TEvent, TResult, TContext>
     : never
 
 /**
@@ -68,7 +70,7 @@ declare type MiddlewareHandler<THandler extends LambdaHandler<any, any>, TContex
  * @param handler your original AWS Lambda function
  * @param plugin wraps around each middleware and handler to add custom lifecycle behaviours (e.g. to profile performance)
  */
-declare function middy<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = any> (handler?: MiddlewareHandler<LambdaHandler<TEvent, TResult>, TContext>, plugin?: PluginObject): MiddyfiedHandler<TEvent, TResult, TErr, TContext>
+declare function middy<TEvent = any, TResult = any, TErr = Error, TContext extends LambdaContext = LambdaContext> (handler?: MiddlewareHandler<LambdaHandler<TEvent, TResult>, TContext>, plugin?: PluginObject): MiddyfiedHandler<TEvent, TResult, TErr, TContext>
 
 declare namespace middy {
   export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/core",
-  "version": "2.5.0",
+  "version": "2.5.4",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda (core package)",
   "type": "commonjs",
   "engines": {
@@ -45,5 +45,5 @@
     "@types/aws-lambda": "^8.10.76",
     "@types/node": "^16.0.0"
   },
-  "gitHead": "76d2bc02b48a4bbd054904538f5c4798ba3c4f7f"
+  "gitHead": "a4134a579c757a9fdfed3006877ba2c0ec8a2cfa"
 }