chore: reverts unnecessary changes and adds some cleanups

middyjs · Aug 25, 2023 · 385d007 · 385d007
1 parent 475444a
commit 385d007
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
@@ -43,15 +43,14 @@ declare type MiddlewareFn<
   TEvent = any,
   TResult = any,
   TErr = Error,
-  TContext extends LambdaContext = LambdaContext
+  TContext extends LambdaContext = LambdaContext,
 > = (request: Request<TEvent, TResult, TErr, TContext>) => any
 
 export interface MiddlewareObj<
   TEvent = unknown,
   TResult = any,
   TErr = Error,
   TContext extends LambdaContext = LambdaContext,
-  TInternal = {}
 > {
   before?: MiddlewareFn<TEvent, TResult, TErr, TContext>
   after?: MiddlewareFn<TEvent, TResult, TErr, TContext>

diff --git a/packages/ssm/index.d.ts b/packages/ssm/index.d.ts
@@ -12,7 +12,7 @@ type ExtractSingles<T> = T extends `/${infer _}` ? never : T
 
 export type Internal<TOptions extends Options> = Record<ExtractSingles<keyof TOptions['fetchData']>, JsonValue>
 
-export type Context<TOptions extends Options | undefined> = TOptions extends {
+export type Context<TOptions extends Options | undefined = undefined> = TOptions extends {
   setToContext: true
 }
   ? LambdaContext &
@@ -25,6 +25,6 @@ export type Context<TOptions extends Options | undefined> = TOptions extends {
 
 declare function ssm<TOptions extends Options> (
   options?: TOptions
-): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>, Internal<TOptions>>
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default ssm
diff --git a/packages/ssm/index.test-d.ts b/packages/ssm/index.test-d.ts
@@ -1,12 +1,12 @@
 import middy from '@middy/core'
 import { SSMClient } from '@aws-sdk/client-ssm'
 import { captureAWSv3Client } from 'aws-xray-sdk'
-import { expectType } from 'tsd'
+import { expectType, expectAssignable } from 'tsd'
 import ssm, { Context } from '.'
 import { JsonValue } from 'type-fest'
 
 // use with default options
-expectType<middy.MiddlewareObj<unknown, any, Error, Context<undefined>>>(ssm())
+expectType<middy.MiddlewareObj<unknown, any, Error, Context>>(ssm())
 
 // use with all options
 const options = {
@@ -40,9 +40,9 @@ middy()
   )
   .before((request) => {
     // checks that the context is correctly enriched in before
-    expectType<Record<'accessToken' | 'dbParams' | 'defaults', JsonValue>>(request.context)
+    expectAssignable<Context & Record<'accessToken' | 'dbParams' | 'defaults', JsonValue>>(request.context)
   })
   .handler(async (req, context) => {
     // checks that the context is correctly enriched in handler
-    expectType<Record<'accessToken' | 'dbParams' | 'defaults', JsonValue>>(context)
+    expectAssignable<Record<'accessToken' | 'dbParams' | 'defaults', JsonValue>>(context)
   })