@yopdev/dev-server 2.0.0-beta.1 → 2.0.0-beta.3

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

@@ -3,14 +3,12 @@ import { DevServerConfig } from './config';
 import { HttpSettings } from './http-server';
 import { Authorizer, Route } from './lambda-http-proxy';
 import { Callback, Service, Startable } from './services';
-import { LambdaMapperFactory, PathParameterResolver } from './mappers';
-export declare const newLambdaProxyFromCloudFormationTemplate: <Context, AuthorizerContext, Event_1, HandlerResponse>(name: string, settings: HttpSettings, config: CloudFormationLambdaProxyConfig<Context, AuthorizerContext, Event_1, HandlerResponse>, callback: Callback<string>) => Startable<Service<string>>;
+import { LambdaPayloadVersion } from './mappers';
+export declare const newLambdaProxyFromCloudFormationTemplate: <Context, AuthorizerContext, 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, Event, HandlerResponse> = {
     authorizer?: (config: DevServerConfig) => Authorizer<AuthorizerContext> | undefined;
     extraRoutes: Route<Context, AuthorizerContext, Event, HandlerResponse>[];
-    pathParameterResolver: PathParameterResolver<Event>;
     prepare?: (config: DevServerConfig) => Promise<void>;
     context?: () => Context;
-    mapper?: LambdaMapperFactory<AuthorizerContext, Event, HandlerResponse>;
 } & CloudFormationSetupConfig;
 export {};

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

@@ -6,10 +6,10 @@ const lambda_http_proxy_1 = require("./lambda-http-proxy");
 const PATH_VARIABLE_CAPTURE = /{(.*?)}/g;
 const QUERY_STRING_OR_LOCATION_REG_EXP = '(?:([?#].*))?';
 const PROXY_PATH_PARAM = 'proxy';
-const newLambdaProxyFromCloudFormationTemplate = (name, settings, config, callback) => new CloudFormationLambdaProxy(name, settings, config.extraRoutes, config, callback);
+const newLambdaProxyFromCloudFormationTemplate = (name, settings, payloadVersion, config, callback) => new CloudFormationLambdaProxy(name, settings, config.extraRoutes, payloadVersion, config, callback);
 exports.newLambdaProxyFromCloudFormationTemplate = newLambdaProxyFromCloudFormationTemplate;
 class CloudFormationLambdaProxy extends cloudformation_1.CloudFormationSetup {
-    constructor(name, settings, extraRoutes, config, callback) {
+    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) => ({
             method: new RegExp(event.Properties.Method),
             path: new RegExp(`^${pathWithCapturingGroups}${QUERY_STRING_OR_LOCATION_REG_EXP}?$`),
@@ -36,9 +36,9 @@ class CloudFormationLambdaProxy extends cloudformation_1.CloudFormationSetup {
                 .map(([k, v]) => [k, decodeURIComponent(v)])));
             return handler(event, context?.());
         };
-        this.mapper = config?.mapper;
+        this.mapper = payloadVersion.mapper;
         this.authorizer = config?.authorizer;
-        this.pathParameterResolver = config?.pathParameterResolver;
+        this.pathParameterResolver = payloadVersion.resolver;
     }
     logHandler(handler) {
         return `detected handler for ${handler.method} on ${handler.path} with weight ${handler.weight}`;

package/dist/src/mappers.d.ts

@@ -1,17 +1,15 @@
 /// <reference types="node" />
 import { Message } from "@aws-sdk/client-sqs";
-import { APIGatewayEventRequestContextV2WithAuthorizer, APIGatewayProxyEvent, APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2, APIGatewayProxyEventV2WithRequestContext, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, SQSRecord } from "aws-lambda";
+import { 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 declare const v1: {
-    mapper: LambdaMapperFactory<unknown, APIGatewayProxyEvent, APIGatewayProxyResult>;
-    resolver: PathParameterResolver<APIGatewayProxyEvent>;
-};
-export declare const v2: {
-    mapper: LambdaMapperFactory<unknown, APIGatewayEventRequestContextV2WithGenericAuthorizer<unknown>, APIGatewayProxyStructuredResultV2>;
-    resolver: PathParameterResolver<APIGatewayProxyEventV2>;
+export type LambdaPayloadVersion<AuthorizerContext, Event, HandlerResponse> = {
+    mapper: LambdaMapperFactory<AuthorizerContext, 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: AuthorizerContext): Event;
     authorization(): string;
@@ -20,7 +18,6 @@ interface LambdaMapper<AuthorizerContext, Event, HandlerResponse> {
 export interface LambdaMapperFactory<AuthorizerContext, Event, LambdaResponse> {
     newInstance(request: IncomingMessage, body: string): Promise<LambdaMapper<AuthorizerContext, Event, LambdaResponse>>;
 }
-type APIGatewayEventRequestContextV2WithGenericAuthorizer<AuthorizerContext> = APIGatewayProxyEventV2WithRequestContext<APIGatewayEventRequestContextV2WithAuthorizer<AuthorizerContext>>;
 export type PathParameterResolver<Event> = {
     locate: (event: Event) => string;
     store: (event: Event, params: APIGatewayProxyEventPathParameters) => void;

package/dist/src/mappers.js

@@ -38,14 +38,16 @@ const payloadV2PathParameterResolver = {
     locate: (event) => event.rawPath,
     store: (event, params) => event.pathParameters = params
 };
-exports.v1 = {
+const v1 = () => ({
     mapper: payloadV1JwtAuthorizerLambdaMapper(),
     resolver: payloadV1PathParameterResolver,
-};
-exports.v2 = {
+});
+exports.v1 = v1;
+const v2 = () => ({
     mapper: payloadV2LambdaAuthorizerLambdaMapper(),
     resolver: payloadV2PathParameterResolver,
-};
+});
+exports.v2 = v2;
 class DefaultLambdaMapper {
     constructor(request, body) {
         this.body = body;
@@ -129,8 +131,11 @@ class DefaultLambdaMapper {
             headers['content-type'] = request.headers['content-type'];
         if (request.headers['accept'])
             headers['accept'] = request.headers['accept'];
-        if (request.headers['authorization'])
-            headers['authorization'] = request.headers['authorization'];
+        const authorizationHeaderValue = request.headers['authorization'];
+        if (authorizationHeaderValue) {
+            headers['authorization'] = authorizationHeaderValue;
+            this.authorizationHeaderValue = authorizationHeaderValue;
+        }
         this.headers = headers;
         this.url = url;
         this.time = 1428582896000;

package/package.json

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