Skip to content

Commit

Permalink
Merge pull request #1198 from middyjs/fix/ts-compiler-error-1176
Browse files Browse the repository at this point in the history
fix(types): typescript compile error
  • Loading branch information
willfarrell committed May 9, 2024
2 parents 72f32d4 + 932ed4c commit fd6c3c2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"speedscope": "^1.0.0",
"tinybench": "^2.5.1",
"ts-standard": "^12.0.0",
"tsd": "^0.30.0"
"tsd": "^0.30.0",
"typescript": "^5.4.3"
},
"workspaces": [
"packages/*"
Expand Down
1 change: 1 addition & 0 deletions packages/core/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ declare function middy<
TInternal extends Record<string, unknown> = {}
> (
handler?:
| LambdaHandler<TEvent, TResult>
| MiddlewareHandler<LambdaHandler<TEvent, TResult>, TContext>
| PluginObject,
plugin?: PluginObject
Expand Down
12 changes: 10 additions & 2 deletions packages/core/index.test-d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expectType, expectAssignable } from 'tsd'
import middy from '.'
import middy, { MiddyfiedHandler } from '.'
import {
APIGatewayProxyEvent,
APIGatewayProxyResult,
Expand Down Expand Up @@ -64,7 +64,7 @@ expectType<Handler>(handler)
expectAssignable<AWSLambdaHandler<APIGatewayProxyEvent, APIGatewayProxyResult>>(handler)

// Middy handlers third argument is an object containing a abort signal
middy((event, context, { signal }) => expectType<AbortSignal>(signal))
middy((_event: any, _context: any, { signal }: { signal: AbortSignal }) => expectType<AbortSignal>(signal))

// invokes the handler to test that it is callable
// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
Expand Down Expand Up @@ -392,3 +392,11 @@ expectType<middy.MiddyfiedHandler<unknown>>(syncedStreamifiedResponseHandler)

syncedStreamifiedResponseHandler.handler(syncedLambdaHandler)
syncedStreamifiedResponseHandler.use(middlewareObj)

// Issue #1176
const baseHandler: AWSLambdaHandler = async (event) => {
console.log('Hello world')
}

const handler1176 = middy(baseHandler)
expectType<MiddyfiedHandler<any, any, Error, Context, {}>>(handler1176)

0 comments on commit fd6c3c2

Please sign in to comment.