@yopdev/dev-server 3.0.3-alpha.1 → 3.0.3-beta.1

package/dist/src/cloudformation-lambda-http-proxy.d.ts

@@ -4,11 +4,10 @@ import { HttpSettings } from './http-server';
 import { Authorizer, Route } from './lambda-http-proxy';
 import { Callback, Service, Startable } from './services';
 import { LambdaPayloadVersion } from './mappers';
-import { APIGatewayAuthorizerResult } from 'aws-lambda';
-export declare const newLambdaProxyFromCloudFormationTemplate: <Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event_1, HandlerResponse>(name: string, settings: HttpSettings, payloadVersion: LambdaPayloadVersion<AuthorizerContext, Event_1, HandlerResponse>, config: CloudFormationLambdaProxyConfig<Context, AuthorizerContext, Event_1, HandlerResponse>, callback: Callback<string>) => Startable<Service<string>>;
-type CloudFormationLambdaProxyConfig<Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse> = {
-    authorizer?: (config: DevServerConfig) => Authorizer<AuthorizerContext> | undefined;
-    extraRoutes: Route<Context, AuthorizerContext, Event, HandlerResponse>[];
+export declare const newLambdaProxyFromCloudFormationTemplate: <Context, Event_1, HandlerResponse>(name: string, settings: HttpSettings, payloadVersion: LambdaPayloadVersion<Event_1, HandlerResponse>, config: CloudFormationLambdaProxyConfig<Context, Event_1, HandlerResponse>, callback: Callback<string>) => Startable<Service<string>>;
+type CloudFormationLambdaProxyConfig<Context, Event, HandlerResponse> = {
+    authorizer?: (config: DevServerConfig) => Authorizer | undefined;
+    extraRoutes: Route<Context, Event, HandlerResponse>[];
     prepare?: (config: DevServerConfig) => Promise<void>;
     context?: () => Context;
 } & CloudFormationSetupConfig;

package/dist/src/cloudformation-lambda-http-proxy.js

@@ -11,7 +11,7 @@ const newLambdaProxyFromCloudFormationTemplate = (name, settings, payloadVersion
 exports.newLambdaProxyFromCloudFormationTemplate = newLambdaProxyFromCloudFormationTemplate;
 class CloudFormationLambdaProxy extends cloudformation_1.CloudFormationSetup {
     constructor(name, settings, extraRoutes, payloadVersion, config, callback) {
-        super(name, (event) => event.Type === 'HttpApi', async (event, handler) => Promise.resolve(this.pathWithCapturingGroups(event.Properties.Path)).then((pathWithCapturingGroups) => ({
+        super(name, (event) => event.Type === 'HttpApi' || event.Type === 'Api', async (event, handler) => Promise.resolve(this.pathWithCapturingGroups(event.Properties.Path)).then((pathWithCapturingGroups) => ({
             method: new RegExp(this.method(event.Properties.Method)),
             path: new RegExp(`^${pathWithCapturingGroups}${QUERY_STRING_OR_LOCATION_REG_EXP}?$`),
             weight: this.computeWeight(pathWithCapturingGroups),

package/dist/src/index.d.ts

@@ -1,7 +1,7 @@
 export { DevServer } from './dev-server';
 export { newHttpServer as httpServer, HttpSettings } from './http-server';
-export { newLambdaHttpProxy as lambdaHttpProxy } from './lambda-http-proxy';
-export { v1 as v1LambdaProxyPayload, v2 as v2LambdaProxyPayload } from './mappers';
+export { newLambdaHttpProxy as lambdaHttpProxy, Route } from './lambda-http-proxy';
+export { v1 as v1LambdaProxyPayload, v2 as v2LambdaProxyPayload, LambdaPayloadVersion } from './mappers';
 export { newLambdaProxyFromCloudFormationTemplate as cloudFormationLambdaProxy } from './cloudformation-lambda-http-proxy';
 export { newDynamoDbTableFromCloudFormationTemplate as cloudFormationDynamoDbTable } from './cloudformation-dynamodb-table';
 export { newSnsHttpProxy as snsHttpProxy } from './sns-http-proxy';

package/dist/src/lambda-http-proxy.d.ts

@@ -3,11 +3,11 @@ import { HttpSettings } from "./http-server";
 import { LambdaMapperFactory } from "./mappers";
 import { Service, Callback } from "./services";
 import { APIGatewayAuthorizerResult } from "aws-lambda";
-export declare const newLambdaHttpProxy: <Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event_1, HandlerResponse>(name: string, config: {
+export declare const newLambdaHttpProxy: <Context, Event_1, HandlerResponse>(name: string, config: {
     settings: HttpSettings;
-    routes: Route<Context, AuthorizerContext, Event_1, HandlerResponse>[];
-    mapper: LambdaMapperFactory<AuthorizerContext, Event_1, HandlerResponse>;
-    authorizer?: Authorizer<AuthorizerContext>;
+    routes: Route<Context, Event_1, HandlerResponse>[];
+    mapper: LambdaMapperFactory<Event_1, HandlerResponse>;
+    authorizer?: Authorizer;
     context?: () => Context;
 }, callback?: Callback<string>) => Service<string>;
 export declare abstract class Response {
@@ -18,11 +18,11 @@ export declare abstract class Response {
     constructor(statusCode: number, contentType: string | undefined, location: string | undefined, cookies: string[] | undefined);
     body: () => string | Buffer | undefined;
 }
-export type Route<Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse> = {
+export type Route<Context, Event, HandlerResponse> = {
     method: RegExp;
     path: RegExp;
     weight: number;
-    authorizer?: Authorizer<AuthorizerContext>;
+    authorizer?: Authorizer;
     handler: (event: Event, context: Context) => Promise<HandlerResponse>;
 };
-export type Authorizer<Context extends APIGatewayAuthorizerResult> = (authorization: string) => Promise<Context | undefined>;
+export type Authorizer = (authorization: string) => Promise<APIGatewayAuthorizerResult | undefined>;

package/dist/src/lambda-http-proxy.js

@@ -20,7 +20,7 @@ class LambdaHttpProxy {
         this.handler = (authorizer, lambdaHandler) => (request, body, response) => this.mapper.newInstance(request, body)
             .then(async (mapper) => authorizer(mapper.authorization())
             .then(async (context) => context?.policyDocument?.Statement?.find((s) => s.Effect === 'Deny') === undefined
-            ? { ...context, lambda: context }
+            ? context
             : Promise.reject(UNAUTHORIZED))
             .then((context) => lambdaHandler(mapper.event(context), this.context())
             .then((lambda) => {

package/dist/src/mappers.d.ts

@@ -1,24 +1,22 @@
 /// <reference types="node" />
 import { Message } from "@aws-sdk/client-sqs";
-import { APIGatewayProxyEvent, APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, SQSRecord } from "aws-lambda";
+import { APIGatewayAuthorizerResult, APIGatewayProxyEvent, APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, SQSRecord } from "aws-lambda";
 import { IncomingMessage } from "http";
 import { Response } from "./lambda-http-proxy";
 export declare const mapToLambdaSqsRecord: (message: Message) => SQSRecord;
-export type LambdaPayloadVersion<AuthorizerContext, Event, HandlerResponse> = {
-    mapper: LambdaMapperFactory<AuthorizerContext, Event, HandlerResponse>;
+export type LambdaPayloadVersion<Event, HandlerResponse> = {
+    mapper: LambdaMapperFactory<Event, HandlerResponse>;
     resolver: PathParameterResolver<Event>;
 };
-export declare const v1: <AuthorizerContext>() => LambdaPayloadVersion<AuthorizerContext, APIGatewayProxyEvent, APIGatewayProxyResult>;
-export declare const v2: <AuthorizerContext>() => LambdaPayloadVersion<AuthorizerContext, APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2>;
-interface LambdaMapper<AuthorizerContext, Event, HandlerResponse> {
-    event(context: {
-        [name: string]: any;
-    } & AuthorizerContext): Event;
+export declare const v1: () => LambdaPayloadVersion<APIGatewayProxyEvent, APIGatewayProxyResult>;
+export declare const v2: () => LambdaPayloadVersion<APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2>;
+interface LambdaMapper<Event, HandlerResponse> {
+    event(context: APIGatewayAuthorizerResult): Event;
     authorization(): string;
     toResponse: (response: HandlerResponse) => Response;
 }
-export interface LambdaMapperFactory<AuthorizerContext, Event, LambdaResponse> {
-    newInstance(request: IncomingMessage, body: string): Promise<LambdaMapper<AuthorizerContext, Event, LambdaResponse>>;
+export interface LambdaMapperFactory<Event, LambdaResponse> {
+    newInstance(request: IncomingMessage, body: string): Promise<LambdaMapper<Event, LambdaResponse>>;
 }
 export type PathParameterResolver<Event> = {
     locate: (event: Event) => string;

package/dist/src/mappers.js

@@ -70,7 +70,7 @@ class DefaultLambdaMapper {
             }
             return [];
         };
-        this.event = (context) => ({
+        this.event = (authorizerResult) => ({
             version: '2.0',
             rawPath: this.url.pathname,
             rawQueryString: this.url.search,
@@ -102,7 +102,11 @@ class DefaultLambdaMapper {
                 timeEpoch: this.time,
                 accountId: '',
                 apiId: '',
-                authorizer: context,
+                authorizer: {
+                    ...authorizerResult,
+                    ...authorizerResult?.context,
+                    lambda: authorizerResult?.context,
+                },
                 httpMethod: '',
                 identity: {
                     accessKey: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "3.0.3-alpha.1",
+  "version": "3.0.3-beta.1",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",

package/src/cloudformation-lambda-http-proxy.ts

@@ -4,21 +4,20 @@ import { HttpSettings } from './http-server';
 import { Authorizer, Route, newLambdaHttpProxy } from './lambda-http-proxy';
 import { Callback, Service, Startable } from './services';
 import { LambdaMapperFactory, LambdaPayloadVersion, PathParameterResolver } from './mappers';
-import { APIGatewayAuthorizerResult } from 'aws-lambda';
 
 const PATH_VARIABLE_CAPTURE = /{(.*?)}/g;
 const QUERY_STRING_OR_LOCATION_REG_EXP = '(?:([?#].*))?';
 const PROXY_PATH_PARAM = 'proxy';
 const NOOP_AUTHORIZER = async () => undefined
-export const newLambdaProxyFromCloudFormationTemplate = <Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse>(
+export const newLambdaProxyFromCloudFormationTemplate = <Context, Event, HandlerResponse>(
     name: string,
     settings: HttpSettings,
-    payloadVersion: LambdaPayloadVersion<AuthorizerContext, Event, HandlerResponse>,
-    config: CloudFormationLambdaProxyConfig<Context, AuthorizerContext, Event, HandlerResponse>,
+    payloadVersion: LambdaPayloadVersion<Event, HandlerResponse>,
+    config: CloudFormationLambdaProxyConfig<Context, Event, HandlerResponse>,
     callback: Callback<string>,
 ): Startable<Service<string>> => new CloudFormationLambdaProxy(name, settings, config.extraRoutes, payloadVersion, config, callback);
 
-class CloudFormationLambdaProxy<Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse> extends CloudFormationSetup<
+class CloudFormationLambdaProxy<Context, Event, HandlerResponse> extends CloudFormationSetup<
     {
         Path: string;
         Method: string;
@@ -27,24 +26,24 @@ class CloudFormationLambdaProxy<Context, AuthorizerContext extends APIGatewayAut
         }
     },
     (event: Event) => Promise<HandlerResponse>,
-    Route<Context, AuthorizerContext, Event, HandlerResponse>,
+    Route<Context, Event, HandlerResponse>,
     Service<string>
 > {
-    private mapper: LambdaMapperFactory<AuthorizerContext, Event, HandlerResponse>;
-    private authorizer: (cfg: DevServerConfig) => Authorizer<AuthorizerContext>;
+    private mapper: LambdaMapperFactory<Event, HandlerResponse>;
+    private authorizer: (cfg: DevServerConfig) => Authorizer;
     private pathParameterResolver: PathParameterResolver<Event>
 
     constructor(
         name: string,
         private readonly settings: HttpSettings,
-        private readonly extraRoutes: Route<Context, AuthorizerContext, Event, HandlerResponse>[],
-        payloadVersion: LambdaPayloadVersion<AuthorizerContext, Event, HandlerResponse>,
-        config: CloudFormationLambdaProxyConfig<Context, AuthorizerContext, Event, HandlerResponse>,
+        private readonly extraRoutes: Route<Context, Event, HandlerResponse>[],
+        payloadVersion: LambdaPayloadVersion<Event, HandlerResponse>,
+        config: CloudFormationLambdaProxyConfig<Context, Event, HandlerResponse>,
         private readonly callback?: Callback<string>,
     ) {
         super(
             name,
-            (event) => event.Type === 'HttpApi',
+            (event) => event.Type === 'HttpApi' || event.Type === 'Api',
             async (event, handler) =>
                 Promise.resolve(this.pathWithCapturingGroups(event.Properties.Path)).then(
                     (pathWithCapturingGroups) => ({
@@ -53,7 +52,7 @@ class CloudFormationLambdaProxy<Context, AuthorizerContext extends APIGatewayAut
                         weight: this.computeWeight(pathWithCapturingGroups),
                         handler: this.pathParameterCapture(new RegExp(pathWithCapturingGroups), handler, config.context),
                         authorizer: event.Properties?.Auth?.Authorizer === 'NONE' ? NOOP_AUTHORIZER : undefined,
-                    } satisfies Route<Context, AuthorizerContext, Event, HandlerResponse>),
+                    } satisfies Route<Context, Event, HandlerResponse>),
                 ),
             config.prepare,
             config,
@@ -63,7 +62,7 @@ class CloudFormationLambdaProxy<Context, AuthorizerContext extends APIGatewayAut
         this.pathParameterResolver = payloadVersion.resolver;
     }
 
-    protected afterStart = (name: string, cfg: DevServerConfig, routes: Route<Context, AuthorizerContext, Event, HandlerResponse>[]) =>
+    protected afterStart = (name: string, cfg: DevServerConfig, routes: Route<Context, Event, HandlerResponse>[]) =>
         newLambdaHttpProxy(
             `${name}:apigw`,
             {
@@ -80,7 +79,7 @@ class CloudFormationLambdaProxy<Context, AuthorizerContext extends APIGatewayAut
     private segments = (path: string) => path.split('/').length;
     private variables = (path: string) => path.split('(?<').length;
 
-    logHandler(handler: Route<Context, AuthorizerContext, Event, HandlerResponse>): string {
+    logHandler(handler: Route<Context, Event, HandlerResponse>): string {
         return `detected handler for ${handler.method} on ${handler.path} with weight ${handler.weight}`;
     }
 
@@ -123,9 +122,9 @@ class CloudFormationLambdaProxy<Context, AuthorizerContext extends APIGatewayAut
     }
 }
 
-type CloudFormationLambdaProxyConfig<Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse> = {
-    authorizer?: (config: DevServerConfig) => Authorizer<AuthorizerContext> | undefined,
-    extraRoutes: Route<Context, AuthorizerContext, Event, HandlerResponse>[],
+type CloudFormationLambdaProxyConfig<Context, Event, HandlerResponse> = {
+    authorizer?: (config: DevServerConfig) => Authorizer | undefined,
+    extraRoutes: Route<Context, Event, HandlerResponse>[],
     prepare?: (config: DevServerConfig) => Promise<void>,
     context?: () => Context,
 } & CloudFormationSetupConfig;

package/src/index.ts

@@ -1,7 +1,7 @@
 export { DevServer } from './dev-server' 
 export { newHttpServer as httpServer, HttpSettings } from './http-server' 
-export { newLambdaHttpProxy as lambdaHttpProxy } from './lambda-http-proxy'
-export { v1 as v1LambdaProxyPayload, v2 as v2LambdaProxyPayload } from './mappers'
+export { newLambdaHttpProxy as lambdaHttpProxy, Route } from './lambda-http-proxy'
+export { v1 as v1LambdaProxyPayload, v2 as v2LambdaProxyPayload, LambdaPayloadVersion } from './mappers'
 export { newLambdaProxyFromCloudFormationTemplate as cloudFormationLambdaProxy } from './cloudformation-lambda-http-proxy'
 export { newDynamoDbTableFromCloudFormationTemplate as cloudFormationDynamoDbTable } from './cloudformation-dynamodb-table'
 export { newSnsHttpProxy as snsHttpProxy } from './sns-http-proxy'

package/src/lambda-http-proxy.ts

@@ -7,17 +7,17 @@ import { Lifecycle, Service, Callback } from "./services";
 import { APIGatewayAuthorizerResult } from "aws-lambda";
 
 const UNAUTHORIZED = new Error('UNAUTHORIZED');
-export const newLambdaHttpProxy = <Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse>(
+export const newLambdaHttpProxy = <Context, Event, HandlerResponse>(
     name: string,
     config: {
         settings: HttpSettings,
-        routes: Route<Context, AuthorizerContext, Event, HandlerResponse>[],
-        mapper: LambdaMapperFactory<AuthorizerContext, Event, HandlerResponse>,
-        authorizer?: Authorizer<AuthorizerContext>
+        routes: Route<Context, Event, HandlerResponse>[],
+        mapper: LambdaMapperFactory<Event, HandlerResponse>,
+        authorizer?: Authorizer
         context?: () => Context
     },
     callback?: Callback<string>,
-) => new Service(new LambdaHttpProxy<Context, AuthorizerContext, Event, HandlerResponse>(
+) => new Service(new LambdaHttpProxy<Context, Event, HandlerResponse>(
     name,
     config.settings,
     config.routes,
@@ -26,16 +26,16 @@ export const newLambdaHttpProxy = <Context, AuthorizerContext extends APIGateway
     config.context,
 ), callback)
 
-class LambdaHttpProxy<Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse> implements Lifecycle<string> {
+class LambdaHttpProxy<Context, Event, HandlerResponse> implements Lifecycle<string> {
     private LOGGER: Logger
     private readonly server: HttpServer
 
     constructor(
         readonly name: string,
         settings: HttpSettings,
-        private readonly routes: Route<Context, AuthorizerContext, Event, HandlerResponse>[],
-        private readonly mapper: LambdaMapperFactory<AuthorizerContext, Event, HandlerResponse>,
-        private readonly defaultAuthorizer: Authorizer<AuthorizerContext>,
+        private readonly routes: Route<Context, Event, HandlerResponse>[],
+        private readonly mapper: LambdaMapperFactory<Event, HandlerResponse>,
+        private readonly defaultAuthorizer: Authorizer,
         private readonly context: () => Context = () => undefined,
     ) {
         this.server = new HttpServer(name, settings, this.resolveRoute)
@@ -48,7 +48,7 @@ class LambdaHttpProxy<Context, AuthorizerContext extends APIGatewayAuthorizerRes
     stop = () => this.server.stop()
 
     private handler = (
-        authorizer: Authorizer<AuthorizerContext>,
+        authorizer: Authorizer,
         lambdaHandler: (event: Event, context: Context) => Promise<HandlerResponse>
     ) =>
         (request: IncomingMessage, body: string, response: ServerResponse) =>
@@ -57,7 +57,7 @@ class LambdaHttpProxy<Context, AuthorizerContext extends APIGatewayAuthorizerRes
                     authorizer(mapper.authorization())
                         .then(async (context) =>
                             context?.policyDocument?.Statement?.find((s) => s.Effect === 'Deny') === undefined
-                                ? { ...context, lambda: context }
+                                ? context
                                 : Promise.reject(UNAUTHORIZED),
                         )
                         .then((context) =>
@@ -106,12 +106,12 @@ export abstract class Response {
     body: () => string | Buffer | undefined
 }
 
-export type Route<Context, AuthorizerContext extends APIGatewayAuthorizerResult, Event, HandlerResponse> = {
+export type Route<Context, Event, HandlerResponse> = {
     method: RegExp;
     path: RegExp;
     weight: number;
-    authorizer?: Authorizer<AuthorizerContext>;
+    authorizer?: Authorizer;
     handler: (event: Event, context: Context) => Promise<HandlerResponse>;
 };
 
-export type Authorizer<Context extends APIGatewayAuthorizerResult> = (authorization: string) => Promise<Context | undefined>;
+export type Authorizer = (authorization: string) => Promise<APIGatewayAuthorizerResult | undefined>;

package/src/mappers.ts

@@ -1,5 +1,5 @@
 import { Message } from "@aws-sdk/client-sqs";
-import { APIGatewayEventRequestContextV2WithAuthorizer, APIGatewayProxyEvent, APIGatewayProxyEventHeaders, APIGatewayProxyEventPathParameters, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyEventV2, APIGatewayProxyEventV2WithRequestContext, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, SQSRecord } from "aws-lambda";
+import { APIGatewayAuthorizerResult, APIGatewayEventRequestContextV2WithAuthorizer, APIGatewayProxyEvent, APIGatewayProxyEventHeaders, APIGatewayProxyEventPathParameters, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyEventV2, APIGatewayProxyEventV2WithRequestContext, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, SQSRecord } from "aws-lambda";
 import { IncomingMessage } from "http";
 import { URL } from "url";
 import { Response } from "./lambda-http-proxy";
@@ -25,12 +25,12 @@ export const mapToLambdaSqsRecord = (message: Message): SQSRecord => {
     };
 }
 
-const payloadV1JwtAuthorizerLambdaMapper = <AuthorizerContext>(): LambdaMapperFactory<AuthorizerContext, APIGatewayProxyEvent, APIGatewayProxyResult> => ({
-    newInstance: (request, body) => Promise.resolve(new DefaultLambdaMapper<AuthorizerContext>(request, body))
+const payloadV1JwtAuthorizerLambdaMapper = (): LambdaMapperFactory<APIGatewayProxyEvent, APIGatewayProxyResult> => ({
+    newInstance: (request, body) => Promise.resolve(new DefaultLambdaMapper(request, body))
 })
 
-const payloadV2LambdaAuthorizerLambdaMapper = <AuthorizerContext>(): LambdaMapperFactory<AuthorizerContext, APIGatewayEventRequestContextV2WithGenericAuthorizer<AuthorizerContext>, APIGatewayProxyStructuredResultV2> => ({
-    newInstance: (request, body) => Promise.resolve(new DefaultLambdaMapper<AuthorizerContext>(request, body))
+const payloadV2LambdaAuthorizerLambdaMapper = (): LambdaMapperFactory<APIGatewayEventRequestContextV2WithGenericAuthorizer, APIGatewayProxyStructuredResultV2> => ({
+    newInstance: (request, body) => Promise.resolve(new DefaultLambdaMapper(request, body))
 })
 
 const payloadV1PathParameterResolver: PathParameterResolver<APIGatewayProxyEvent> = {
@@ -43,22 +43,22 @@ const payloadV2PathParameterResolver: PathParameterResolver<APIGatewayProxyEvent
     store: (event: APIGatewayProxyEventV2, params: APIGatewayProxyEventPathParameters) => event.pathParameters = params
 }
 
-export type LambdaPayloadVersion<AuthorizerContext, Event, HandlerResponse> = {
-    mapper: LambdaMapperFactory<AuthorizerContext, Event, HandlerResponse>,
+export type LambdaPayloadVersion<Event, HandlerResponse> = {
+    mapper: LambdaMapperFactory<Event, HandlerResponse>,
     resolver: PathParameterResolver<Event>,
 }
 
-export const v1 = <AuthorizerContext>(): LambdaPayloadVersion<AuthorizerContext, APIGatewayProxyEvent, APIGatewayProxyResult> => ({
-    mapper: payloadV1JwtAuthorizerLambdaMapper<AuthorizerContext>(),
+export const v1 = (): LambdaPayloadVersion<APIGatewayProxyEvent, APIGatewayProxyResult> => ({
+    mapper: payloadV1JwtAuthorizerLambdaMapper(),
     resolver: payloadV1PathParameterResolver,
 })
 
-export const v2 = <AuthorizerContext>(): LambdaPayloadVersion<AuthorizerContext, APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2> => ({
-    mapper: payloadV2LambdaAuthorizerLambdaMapper<AuthorizerContext>(),
+export const v2 = (): LambdaPayloadVersion<APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2> => ({
+    mapper: payloadV2LambdaAuthorizerLambdaMapper(),
     resolver: payloadV2PathParameterResolver,
 })
 
-class DefaultLambdaMapper<AuthorizerContext> implements LambdaMapper<AuthorizerContext, APIGatewayProxyEvent & APIGatewayEventRequestContextV2WithGenericAuthorizer<AuthorizerContext>, APIGatewayProxyResult & APIGatewayProxyStructuredResultV2> {
+class DefaultLambdaMapper implements LambdaMapper<APIGatewayProxyEvent & APIGatewayEventRequestContextV2WithGenericAuthorizer, APIGatewayProxyResult & APIGatewayProxyStructuredResultV2> {
     private readonly url: URL
     private readonly authorizationHeaderValue: string
     private readonly time: number
@@ -120,7 +120,7 @@ class DefaultLambdaMapper<AuthorizerContext> implements LambdaMapper<AuthorizerC
         return [];
     };
 
-    event = (context: { [name: string]: any; } & AuthorizerContext): APIGatewayProxyEvent & APIGatewayEventRequestContextV2WithGenericAuthorizer<AuthorizerContext> => ({
+    event = (authorizerResult: APIGatewayAuthorizerResult): APIGatewayProxyEvent & APIGatewayEventRequestContextV2WithGenericAuthorizer => ({
         version: '2.0',
         rawPath: this.url.pathname,
         rawQueryString: this.url.search,
@@ -152,7 +152,11 @@ class DefaultLambdaMapper<AuthorizerContext> implements LambdaMapper<AuthorizerC
             timeEpoch: this.time,
             accountId: '',
             apiId: '',
-            authorizer: context,
+            authorizer: {
+                ...authorizerResult,
+                ...authorizerResult?.context,
+                lambda: authorizerResult?.context,
+            },
             httpMethod: '',
             identity: {
                 accessKey: '',
@@ -189,14 +193,14 @@ class DefaultLambdaMapper<AuthorizerContext> implements LambdaMapper<AuthorizerC
 
     authorization = () => this.authorizationHeaderValue
 }
-interface LambdaMapper<AuthorizerContext, Event, HandlerResponse> {
-    event(context: { [name: string]: any; } & AuthorizerContext): Event
+interface LambdaMapper<Event, HandlerResponse> {
+    event(context: APIGatewayAuthorizerResult): Event
     authorization(): string
     toResponse: (response: HandlerResponse) => Response
 }
 
-export interface LambdaMapperFactory<AuthorizerContext, Event, LambdaResponse> {
-    newInstance(request: IncomingMessage, body: string): Promise<LambdaMapper<AuthorizerContext, Event, LambdaResponse>>;
+export interface LambdaMapperFactory<Event, LambdaResponse> {
+    newInstance(request: IncomingMessage, body: string): Promise<LambdaMapper<Event, LambdaResponse>>;
 }
 
 class StringResponse extends Response {
@@ -229,7 +233,7 @@ class Base64EncodedResponse extends Response {
     }
 }
 
-type APIGatewayEventRequestContextV2WithGenericAuthorizer<AuthorizerContext> = APIGatewayProxyEventV2WithRequestContext<APIGatewayEventRequestContextV2WithAuthorizer<AuthorizerContext>>;
+type APIGatewayEventRequestContextV2WithGenericAuthorizer = APIGatewayProxyEventV2WithRequestContext<APIGatewayEventRequestContextV2WithAuthorizer<APIGatewayAuthorizerResult>>;
 
 export type PathParameterResolver<Event> = {
     locate: (event: Event) => string