fix: types and tests

middyjs · Aug 2, 2022 · 0993757 · 0993757
1 parent eb104a2
commit 0993757
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/packages/cloudwatch-metrics/index.test-d.ts b/packages/cloudwatch-metrics/index.test-d.ts
@@ -4,11 +4,11 @@ import cloudwatchMetrics, { Context } from '.'
 
 // use with default options
 let middleware = cloudwatchMetrics()
-expectType<middy.MiddlewareObj<unknown, any, any, Context>>(middleware)
+expectType<middy.MiddlewareObj<unknown, any, Error, Context>>(middleware)
 
 // use with all options
 middleware = cloudwatchMetrics({
   namespace: 'myApp',
   dimensions: [{ Action: 'Buy' }]
 })
-expectType<middy.MiddlewareObj<unknown, any, any, Context>>(middleware)
+expectType<middy.MiddlewareObj<unknown, any, Error, Context>>(middleware)
diff --git a/packages/s3-object-response/index.d.ts b/packages/s3-object-response/index.d.ts
@@ -26,6 +26,6 @@ export type Context<TOptions extends Options | undefined> = LambdaContext & {
 
 declare function s3ObjectResponse<TOptions extends Options | undefined> (
   options?: TOptions
-): middy.MiddlewareObj<unknown, any, any, Context<TOptions>>
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default s3ObjectResponse
diff --git a/packages/s3-object-response/index.test-d.ts b/packages/s3-object-response/index.test-d.ts
@@ -6,7 +6,7 @@ import s3ObjectResponse, { Context } from '.'
 
 // use with default options
 let middleware = s3ObjectResponse()
-expectType<middy.MiddlewareObj<unknown, any, any, Context<undefined>>>(
+expectType<middy.MiddlewareObj<unknown, any, Error, Context<undefined>>>(
   middleware
 )
 
@@ -16,6 +16,6 @@ middleware = s3ObjectResponse({
   awsClientCapture: captureAWSClient,
   disablePrefetch: true
 })
-expectType<middy.MiddlewareObj<unknown, any, any, Context<undefined>>>(
+expectType<middy.MiddlewareObj<unknown, any, Error, Context<undefined>>>(
   middleware
 )
diff --git a/packages/secrets-manager/index.d.ts b/packages/secrets-manager/index.d.ts
@@ -14,6 +14,6 @@ export type Context<TOptions extends Options | undefined> = TOptions extends {
 
 declare function secretsManager<TOptions extends Options | undefined> (
   options?: TOptions
-): middy.MiddlewareObj<unknown, any, any, Context<TOptions>>
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default secretsManager
diff --git a/packages/secrets-manager/index.test-d.ts b/packages/secrets-manager/index.test-d.ts
@@ -5,7 +5,7 @@ import { expectType } from 'tsd'
 import rdsSigner, { Context } from '.'
 
 // use with default options
-expectType<middy.MiddlewareObj<unknown, any, any, Context<undefined>>>(
+expectType<middy.MiddlewareObj<unknown, any, Error, Context<undefined>>>(
   rdsSigner()
 )
 
@@ -24,6 +24,6 @@ const options = {
 }
 
 // use with all options
-expectType<middy.MiddlewareObj<unknown, any, any, Context<typeof options>>>(
+expectType<middy.MiddlewareObj<unknown, any, Error, Context<typeof options>>>(
   rdsSigner(options)
 )
diff --git a/packages/ssm/index.d.ts b/packages/ssm/index.d.ts
@@ -7,8 +7,11 @@ import { JsonValue } from 'type-fest'
 interface Options<S = SSM>
   extends MiddyOptions<S, SSM.Types.ClientConfiguration> {}
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type Basename<T> = T extends `${infer _P}/${infer _S}` ? Basename<_S> : T
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type ExtractPaths<T> = T extends `${infer _P}/${infer _S}` ? T : never
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type ExtractSingles<T> = T extends `${infer _P}/${infer _S}` ? never : T
 
 export type Context<TOptions extends Options | undefined> = TOptions extends {
@@ -21,6 +24,6 @@ export type Context<TOptions extends Options | undefined> = TOptions extends {
 
 declare function ssm<TOptions extends Options> (
   options?: TOptions
-): middy.MiddlewareObj<unknown, any, any, Context<TOptions>>
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default ssm
diff --git a/packages/sts/index.d.ts b/packages/sts/index.d.ts
@@ -30,6 +30,8 @@ export type Context<TOptions extends Options | undefined> = TOptions extends {
   >
   : LambdaContext
 
-declare function sts (options?: Options): middy.MiddlewareObj
+declare function sts<TOptions extends Options> (
+  options?: TOptions
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default sts