@goldstack/utils-aws-http-api-local 0.3.0 → 0.3.3

package/dist/src/expressRequestToHttpApiGatewayEvent.d.ts

@@ -1,18 +1,18 @@
-import { Request, Response } from 'express';
-import { APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2, Context } from 'aws-lambda';
-import { LambdaConfig } from '@goldstack/utils-aws-lambda';
-export interface CovertToGatewayEventParams {
-    req: Request;
-    lambdaConfig: LambdaConfig;
-}
-export interface StringMap {
-    [key: string]: string;
-}
-export declare const sortPropertiesByAppearanceInPath: (params: CovertToGatewayEventParams, pathParams: StringMap) => [string, string][];
-export declare const convertToGatewayEvent: (params: CovertToGatewayEventParams) => APIGatewayProxyEventV2;
-export interface CreateContextParams {
-    functionName: string;
-}
-export declare const createContext: (params: CreateContextParams) => Context;
-export declare const injectGatewayResultIntoResponse: (result: APIGatewayProxyStructuredResultV2 | string | any, resp: Response) => void;
+import { Request, Response } from 'express';
+import { APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2, Context } from 'aws-lambda';
+import { LambdaConfig } from '@goldstack/utils-aws-lambda';
+export interface CovertToGatewayEventParams {
+    req: Request;
+    lambdaConfig: LambdaConfig;
+}
+export interface StringMap {
+    [key: string]: string;
+}
+export declare const sortPropertiesByAppearanceInPath: (params: CovertToGatewayEventParams, pathParams: StringMap) => [string, string][];
+export declare const convertToGatewayEvent: (params: CovertToGatewayEventParams) => APIGatewayProxyEventV2;
+export interface CreateContextParams {
+    functionName: string;
+}
+export declare const createContext: (params: CreateContextParams) => Context;
+export declare const injectGatewayResultIntoResponse: (result: APIGatewayProxyStructuredResultV2 | string | any, resp: Response) => void;
 //# sourceMappingURL=expressRequestToHttpApiGatewayEvent.d.ts.map

package/dist/src/expressRequestToHttpApiGatewayEvent.js

@@ -1,187 +1,187 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectGatewayResultIntoResponse = exports.createContext = exports.convertToGatewayEvent = exports.sortPropertiesByAppearanceInPath = void 0;
-const cookie_1 = __importDefault(require("cookie"));
-const sortPropertiesByAppearanceInPath = (params, pathParams) => {
-    const pathElements = Object.entries(pathParams)
-        .filter((e) => e[0] !== '0')
-        .sort((a, b) => {
-        return (params.lambdaConfig.path.indexOf(a[0]) -
-            params.lambdaConfig.path.indexOf(b[0]));
-    });
-    return pathElements;
-};
-exports.sortPropertiesByAppearanceInPath = sortPropertiesByAppearanceInPath;
-const convertToGatewayEvent = (params) => {
-    const incomingHeaders = params.req.headers;
-    const normalisedHeaders = Object.entries(incomingHeaders).reduce((prev, curr) => {
-        if (typeof curr[1] === 'string') {
-            prev[curr[0]] = curr[1];
-            return prev;
-        }
-        else if (curr[1]) {
-            prev[curr[0]] = curr[1].join(',');
-            return prev;
-        }
-        return prev;
-    }, {});
-    const expressQuery = params.req.query;
-    const lambdaQuery = Object.entries(expressQuery)
-        .map((e) => `${e[0]}=${e[1]}`)
-        .join('&');
-    const queryStringParameters = Object.entries(expressQuery).reduce((prev, curr) => {
-        if (typeof curr[1] === 'string') {
-            prev[curr[0]] = curr[1];
-        }
-        else {
-            prev[curr[0]] = curr[1].join(',');
-        }
-        return prev;
-    }, {});
-    const pathParams = { ...params.req.params };
-    // some complicated stuff happening
-    // if there was a regex/ greedy path match
-    // since express does not provide the full path
-    // but rather the 'matches' of the regex
-    if (pathParams['0']) {
-        const sortedPathParams = (0, exports.sortPropertiesByAppearanceInPath)(params, pathParams);
-        if (sortedPathParams.length > 0) {
-            const lastPathParam = sortedPathParams[sortedPathParams.length - 1];
-            const lastPathParamObject = Object.entries(pathParams).find((e) => {
-                return e[0].indexOf(lastPathParam[0]) === 0;
-            });
-            if (lastPathParamObject) {
-                // here we append the regex match to the path
-                // so the path is the full path that was matched
-                pathParams[lastPathParamObject[0]] = `${lastPathParamObject[1]}${pathParams['0']}`;
-            }
-        }
-    }
-    return {
-        version: '2.0',
-        routeKey: params.lambdaConfig.route,
-        rawPath: params.req.url.split('?')[0],
-        rawQueryString: lambdaQuery,
-        queryStringParameters,
-        pathParameters: pathParams,
-        cookies: params.req.cookies,
-        headers: {
-            accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
-            'accept-encoding': 'gzip, deflate, br',
-            'accept-language': 'en-US,en;q=0.9,de;q=0.8',
-            'content-length': '0',
-            dnt: '1',
-            'sec-ch-ua': '" Not A;Brand";v="99", "Chromium";v="96", "Google Chrome";v="96"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': '"Windows"',
-            'sec-fetch-dest': 'document',
-            'sec-fetch-mode': 'navigate',
-            'sec-fetch-site': 'none',
-            'sec-fetch-user': '?1',
-            'upgrade-insecure-requests': '1',
-            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36',
-            'x-amzn-trace-id': 'Root=1-61ce5e14-5d8a4b4e22d2e69f3af9eb20',
-            'x-forwarded-for': '120.148.16.26',
-            'x-forwarded-port': '443',
-            'x-forwarded-proto': 'https',
-            ...normalisedHeaders,
-        },
-        requestContext: {
-            accountId: '111111128371',
-            apiId: 'd5811h14p0',
-            domainName: 'localhost',
-            domainPrefix: 'localhost',
-            http: {
-                method: params.req.method,
-                path: params.req.url,
-                protocol: 'HTTP/1.1',
-                sourceIp: '120.148.16.26',
-                userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36',
-            },
-            requestId: 'LMOjOiBiPHcEMkQ=',
-            routeKey: params.lambdaConfig.route,
-            stage: '$default',
-            time: '31/Dec/2021:01:34:12 +0000',
-            timeEpoch: new Date().getTime(),
-        },
-        isBase64Encoded: false,
-        body: JSON.stringify(params.req.body),
-    };
-};
-exports.convertToGatewayEvent = convertToGatewayEvent;
-const createContext = (params) => {
-    return {
-        callbackWaitsForEmptyEventLoop: true,
-        getRemainingTimeInMillis: () => {
-            return 0;
-        },
-        done: () => { },
-        fail: () => { },
-        succeed: () => { },
-        functionVersion: '$LATEST',
-        functionName: params.functionName,
-        memoryLimitInMB: '2048',
-        logGroupName: `/aws/lambda/${params.functionName}`,
-        logStreamName: '2021/12/31/[$LATEST]11f0a4a770034f1c822a5c4c69490bb1',
-        invokedFunctionArn: `arn:aws:lambda:us-west-2:475629728374:function:${params.functionName}`,
-        awsRequestId: '8bb853aa-6c00-42cb-9877-0963bd56ae01',
-    };
-};
-exports.createContext = createContext;
-const injectGatewayResultIntoResponse = (result, resp) => {
-    // result can have three different structures https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-    var _a, _b;
-    // 1: string
-    if (typeof result === 'string') {
-        resp.status(200);
-        resp.contentType('application/json');
-        resp.json(JSON.parse(result));
-        return;
-    }
-    // 2: structured output
-    if (result.statusCode) {
-        const structuredResult = result;
-        resp.status(structuredResult.statusCode || 200);
-        if (structuredResult.headers) {
-            resp.set(structuredResult.headers);
-        }
-        const contentType = ((_a = structuredResult.headers) === null || _a === void 0 ? void 0 : _a['content-type']) ||
-            ((_b = structuredResult.headers) === null || _b === void 0 ? void 0 : _b['Content-Type']);
-        if (!contentType) {
-            resp.contentType('application/json');
-        }
-        else {
-            // content type would be set by headers above
-        }
-        if (structuredResult.cookies) {
-            structuredResult.cookies.forEach((val) => {
-                const obj = cookie_1.default.parse(val);
-                Object.entries(obj).forEach((element) => {
-                    resp.cookie(element[0], element[1]);
-                });
-            });
-        }
-        if (structuredResult.body) {
-            if (!structuredResult.isBase64Encoded) {
-                resp.send(structuredResult.body);
-            }
-            else {
-                resp.send(Buffer.from(structuredResult.body, 'base64'));
-            }
-        }
-        else {
-            resp.end();
-        }
-        return;
-    }
-    // 3: json object
-    resp.status(200);
-    resp.contentType('application/json');
-    resp.json(result);
-    return;
-};
-exports.injectGatewayResultIntoResponse = injectGatewayResultIntoResponse;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectGatewayResultIntoResponse = exports.createContext = exports.convertToGatewayEvent = exports.sortPropertiesByAppearanceInPath = void 0;
+const cookie_1 = __importDefault(require("cookie"));
+const sortPropertiesByAppearanceInPath = (params, pathParams) => {
+    const pathElements = Object.entries(pathParams)
+        .filter((e) => e[0] !== '0')
+        .sort((a, b) => {
+        return (params.lambdaConfig.path.indexOf(a[0]) -
+            params.lambdaConfig.path.indexOf(b[0]));
+    });
+    return pathElements;
+};
+exports.sortPropertiesByAppearanceInPath = sortPropertiesByAppearanceInPath;
+const convertToGatewayEvent = (params) => {
+    const incomingHeaders = params.req.headers;
+    const normalisedHeaders = Object.entries(incomingHeaders).reduce((prev, curr) => {
+        if (typeof curr[1] === 'string') {
+            prev[curr[0]] = curr[1];
+            return prev;
+        }
+        else if (curr[1]) {
+            prev[curr[0]] = curr[1].join(',');
+            return prev;
+        }
+        return prev;
+    }, {});
+    const expressQuery = params.req.query;
+    const lambdaQuery = Object.entries(expressQuery)
+        .map((e) => `${e[0]}=${e[1]}`)
+        .join('&');
+    const queryStringParameters = Object.entries(expressQuery).reduce((prev, curr) => {
+        if (typeof curr[1] === 'string') {
+            prev[curr[0]] = curr[1];
+        }
+        else {
+            prev[curr[0]] = curr[1].join(',');
+        }
+        return prev;
+    }, {});
+    const pathParams = { ...params.req.params };
+    // some complicated stuff happening
+    // if there was a regex/ greedy path match
+    // since express does not provide the full path
+    // but rather the 'matches' of the regex
+    if (pathParams['0']) {
+        const sortedPathParams = (0, exports.sortPropertiesByAppearanceInPath)(params, pathParams);
+        if (sortedPathParams.length > 0) {
+            const lastPathParam = sortedPathParams[sortedPathParams.length - 1];
+            const lastPathParamObject = Object.entries(pathParams).find((e) => {
+                return e[0].indexOf(lastPathParam[0]) === 0;
+            });
+            if (lastPathParamObject) {
+                // here we append the regex match to the path
+                // so the path is the full path that was matched
+                pathParams[lastPathParamObject[0]] = `${lastPathParamObject[1]}${pathParams['0']}`;
+            }
+        }
+    }
+    return {
+        version: '2.0',
+        routeKey: params.lambdaConfig.route,
+        rawPath: params.req.url.split('?')[0],
+        rawQueryString: lambdaQuery,
+        queryStringParameters,
+        pathParameters: pathParams,
+        cookies: params.req.cookies,
+        headers: {
+            accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+            'accept-encoding': 'gzip, deflate, br',
+            'accept-language': 'en-US,en;q=0.9,de;q=0.8',
+            'content-length': '0',
+            dnt: '1',
+            'sec-ch-ua': '" Not A;Brand";v="99", "Chromium";v="96", "Google Chrome";v="96"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'document',
+            'sec-fetch-mode': 'navigate',
+            'sec-fetch-site': 'none',
+            'sec-fetch-user': '?1',
+            'upgrade-insecure-requests': '1',
+            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36',
+            'x-amzn-trace-id': 'Root=1-61ce5e14-5d8a4b4e22d2e69f3af9eb20',
+            'x-forwarded-for': '120.148.16.26',
+            'x-forwarded-port': '443',
+            'x-forwarded-proto': 'https',
+            ...normalisedHeaders,
+        },
+        requestContext: {
+            accountId: '111111128371',
+            apiId: 'd5811h14p0',
+            domainName: 'localhost',
+            domainPrefix: 'localhost',
+            http: {
+                method: params.req.method,
+                path: params.req.url,
+                protocol: 'HTTP/1.1',
+                sourceIp: '120.148.16.26',
+                userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36',
+            },
+            requestId: 'LMOjOiBiPHcEMkQ=',
+            routeKey: params.lambdaConfig.route,
+            stage: '$default',
+            time: '31/Dec/2021:01:34:12 +0000',
+            timeEpoch: new Date().getTime(),
+        },
+        isBase64Encoded: false,
+        body: JSON.stringify(params.req.body),
+    };
+};
+exports.convertToGatewayEvent = convertToGatewayEvent;
+const createContext = (params) => {
+    return {
+        callbackWaitsForEmptyEventLoop: true,
+        getRemainingTimeInMillis: () => {
+            return 0;
+        },
+        done: () => { },
+        fail: () => { },
+        succeed: () => { },
+        functionVersion: '$LATEST',
+        functionName: params.functionName,
+        memoryLimitInMB: '2048',
+        logGroupName: `/aws/lambda/${params.functionName}`,
+        logStreamName: '2021/12/31/[$LATEST]11f0a4a770034f1c822a5c4c69490bb1',
+        invokedFunctionArn: `arn:aws:lambda:us-west-2:475629728374:function:${params.functionName}`,
+        awsRequestId: '8bb853aa-6c00-42cb-9877-0963bd56ae01',
+    };
+};
+exports.createContext = createContext;
+const injectGatewayResultIntoResponse = (result, resp) => {
+    // result can have three different structures https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
+    var _a, _b;
+    // 1: string
+    if (typeof result === 'string') {
+        resp.status(200);
+        resp.contentType('application/json');
+        resp.json(JSON.parse(result));
+        return;
+    }
+    // 2: structured output
+    if (result.statusCode) {
+        const structuredResult = result;
+        resp.status(structuredResult.statusCode || 200);
+        if (structuredResult.headers) {
+            resp.set(structuredResult.headers);
+        }
+        const contentType = ((_a = structuredResult.headers) === null || _a === void 0 ? void 0 : _a['content-type']) ||
+            ((_b = structuredResult.headers) === null || _b === void 0 ? void 0 : _b['Content-Type']);
+        if (!contentType) {
+            resp.contentType('application/json');
+        }
+        else {
+            // content type would be set by headers above
+        }
+        if (structuredResult.cookies) {
+            structuredResult.cookies.forEach((val) => {
+                const obj = cookie_1.default.parse(val);
+                Object.entries(obj).forEach((element) => {
+                    resp.cookie(element[0], element[1]);
+                });
+            });
+        }
+        if (structuredResult.body) {
+            if (!structuredResult.isBase64Encoded) {
+                resp.send(structuredResult.body);
+            }
+            else {
+                resp.send(Buffer.from(structuredResult.body, 'base64'));
+            }
+        }
+        else {
+            resp.end();
+        }
+        return;
+    }
+    // 3: json object
+    resp.status(200);
+    resp.contentType('application/json');
+    resp.json(result);
+    return;
+};
+exports.injectGatewayResultIntoResponse = injectGatewayResultIntoResponse;
 //# sourceMappingURL=expressRequestToHttpApiGatewayEvent.js.map

package/dist/src/expressRoutes.d.ts

@@ -1,10 +1,10 @@
-import { LambdaConfig } from '@goldstack/utils-aws-lambda';
-import express from 'express';
-export interface InjectRoutesParam {
-    lambdaConfigs: LambdaConfig[];
-    app: express.Application;
-}
-export declare const sortRoutesBySpecificity: (configs: LambdaConfig[]) => LambdaConfig[];
-export declare const gatewayRouteToExpressPath: (route: string) => string;
-export declare const injectRoutes: (params: InjectRoutesParam) => void;
+import { LambdaConfig } from '@goldstack/utils-aws-lambda';
+import express from 'express';
+export interface InjectRoutesParam {
+    lambdaConfigs: LambdaConfig[];
+    app: express.Application;
+}
+export declare const sortRoutesBySpecificity: (configs: LambdaConfig[]) => LambdaConfig[];
+export declare const gatewayRouteToExpressPath: (route: string) => string;
+export declare const injectRoutes: (params: InjectRoutesParam) => void;
 //# sourceMappingURL=expressRoutes.d.ts.map

package/dist/src/expressRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expressRoutes.d.ts","sourceRoot":"","sources":["../../src/expressRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEb,MAAM,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAQ9B,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC;CAC1B;AAKD,eAAO,MAAM,uBAAuB,YACzB,YAAY,EAAE,KACtB,YAAY,EA+Bd,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAAW,MAAM,KAAG,MAUzD,CAAC;AAEF,eAAO,MAAM,YAAY,WAAY,iBAAiB,KAAG,IAsBxD,CAAC"}
+{"version":3,"file":"expressRoutes.d.ts","sourceRoot":"","sources":["../../src/expressRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEb,MAAM,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAQ9B,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC;CAC1B;AAKD,eAAO,MAAM,uBAAuB,YACzB,YAAY,EAAE,KACtB,YAAY,EA+Bd,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAAW,MAAM,KAAG,MAUzD,CAAC;AAEF,eAAO,MAAM,YAAY,WAAY,iBAAiB,KAAG,IAwBxD,CAAC"}

package/dist/src/expressRoutes.js

@@ -1,65 +1,67 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectRoutes = exports.gatewayRouteToExpressPath = exports.sortRoutesBySpecificity = void 0;
-const utils_aws_lambda_1 = require("@goldstack/utils-aws-lambda");
-const expressRequestToHttpApiGatewayEvent_1 = require("./expressRequestToHttpApiGatewayEvent");
-/*
-Ensure more generic routes are handled later
-*/
-const sortRoutesBySpecificity = (configs) => {
-    const res = [...configs];
-    res.sort((first, second) => {
-        if (first.path === '$default') {
-            return 1;
-        }
-        if (second.path === '$default') {
-            return -1;
-        }
-        if (first.route.indexOf('+}') !== -1 && second.route.indexOf('+}') === -1) {
-            return 1;
-        }
-        if (second.route.indexOf('+}') !== -1 && first.route.indexOf('+}') === -1) {
-            return -1;
-        }
-        if (first.route.indexOf('}') !== -1 && second.route.indexOf('}') === -1) {
-            return 1;
-        }
-        if (second.route.indexOf('}') !== -1 && first.route.indexOf('}') === -1) {
-            return -1;
-        }
-        // ensure longer routes come first
-        return (second.route.replace(/\{(.*?)\}/g, '').length -
-            first.route.replace(/\{(.*?)\}/g, '').length);
-    });
-    return res;
-};
-exports.sortRoutesBySpecificity = sortRoutesBySpecificity;
-const gatewayRouteToExpressPath = (route) => {
-    if (route === '$default') {
-        return '*';
-    }
-    // see https://expressjs.com/en/guide/routing.html
-    let path = route;
-    // see https://stackoverflow.com/a/16829917/270662
-    path = path.replace(/\{(.*?)\+\}/g, ':$1*');
-    path = path.replace(/\{(.*?)\}/g, ':$1');
-    return path;
-};
-exports.gatewayRouteToExpressPath = gatewayRouteToExpressPath;
-const injectRoutes = (params) => {
-    const sortedConfigs = (0, exports.sortRoutesBySpecificity)(params.lambdaConfigs);
-    for (const lambdaConfig of sortedConfigs) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const script = require(lambdaConfig.absoluteFilePath);
-        const handler = script.handler;
-        const expressPath = (0, exports.gatewayRouteToExpressPath)(lambdaConfig.path);
-        params.app.all(expressPath, async (req, resp) => {
-            const result = await handler((0, expressRequestToHttpApiGatewayEvent_1.convertToGatewayEvent)({ req: req, lambdaConfig: lambdaConfig }), (0, expressRequestToHttpApiGatewayEvent_1.createContext)({
-                functionName: (0, utils_aws_lambda_1.generateFunctionName)('local', lambdaConfig),
-            }));
-            (0, expressRequestToHttpApiGatewayEvent_1.injectGatewayResultIntoResponse)(result, resp);
-        });
-    }
-};
-exports.injectRoutes = injectRoutes;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectRoutes = exports.gatewayRouteToExpressPath = exports.sortRoutesBySpecificity = void 0;
+const utils_aws_lambda_1 = require("@goldstack/utils-aws-lambda");
+const expressRequestToHttpApiGatewayEvent_1 = require("./expressRequestToHttpApiGatewayEvent");
+/*
+Ensure more generic routes are handled later
+*/
+const sortRoutesBySpecificity = (configs) => {
+    const res = [...configs];
+    res.sort((first, second) => {
+        if (first.path === '$default') {
+            return 1;
+        }
+        if (second.path === '$default') {
+            return -1;
+        }
+        if (first.route.indexOf('+}') !== -1 && second.route.indexOf('+}') === -1) {
+            return 1;
+        }
+        if (second.route.indexOf('+}') !== -1 && first.route.indexOf('+}') === -1) {
+            return -1;
+        }
+        if (first.route.indexOf('}') !== -1 && second.route.indexOf('}') === -1) {
+            return 1;
+        }
+        if (second.route.indexOf('}') !== -1 && first.route.indexOf('}') === -1) {
+            return -1;
+        }
+        // ensure longer routes come first
+        return (second.route.replace(/\{(.*?)\}/g, '').length -
+            first.route.replace(/\{(.*?)\}/g, '').length);
+    });
+    return res;
+};
+exports.sortRoutesBySpecificity = sortRoutesBySpecificity;
+const gatewayRouteToExpressPath = (route) => {
+    if (route === '$default') {
+        return '*';
+    }
+    // see https://expressjs.com/en/guide/routing.html
+    let path = route;
+    // see https://stackoverflow.com/a/16829917/270662
+    path = path.replace(/\{(.*?)\+\}/g, ':$1*');
+    path = path.replace(/\{(.*?)\}/g, ':$1');
+    return path;
+};
+exports.gatewayRouteToExpressPath = gatewayRouteToExpressPath;
+const injectRoutes = (params) => {
+    const sortedConfigs = (0, exports.sortRoutesBySpecificity)(params.lambdaConfigs);
+    for (const lambdaConfig of sortedConfigs) {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const script = require(lambdaConfig.absoluteFilePath);
+        const handler = script.handler;
+        const expressPath = (0, exports.gatewayRouteToExpressPath)(lambdaConfig.path);
+        params.app.all(expressPath, async (req, resp) => {
+            const functionName = (0, utils_aws_lambda_1.generateFunctionName)('local', lambdaConfig);
+            process.env.GOLDSTACK_FUNCTION_NAME = functionName;
+            const result = await handler((0, expressRequestToHttpApiGatewayEvent_1.convertToGatewayEvent)({ req: req, lambdaConfig: lambdaConfig }), (0, expressRequestToHttpApiGatewayEvent_1.createContext)({
+                functionName,
+            }));
+            (0, expressRequestToHttpApiGatewayEvent_1.injectGatewayResultIntoResponse)(result, resp);
+        });
+    }
+};
+exports.injectRoutes = injectRoutes;
 //# sourceMappingURL=expressRoutes.js.map

package/dist/src/expressRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"expressRoutes.js","sourceRoot":"","sources":["../../src/expressRoutes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expressRoutes.js","sourceRoot":"","sources":["../../src/expressRoutes.ts"],"names":[],"mappings":"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"}

package/dist/src/utilsAwsHttpApiLocal.d.ts

@@ -1,23 +1,23 @@
-/// <reference types="node" />
-import { Server } from 'http';
-import { LambdaConfig } from '@goldstack/utils-aws-lambda';
-declare type StaticRoutes = {
-    [key: string]: string;
-};
-export interface LocalHttpAPIOptions {
-    port: string;
-    routesDir: string;
-    cors?: string;
-    /**
-     * Maps routes to local directories
-     */
-    staticRoutes?: StaticRoutes;
-}
-export interface StartServerResult {
-    shutdown: () => Promise<void>;
-    server: Server;
-    lambdaConfig: LambdaConfig[];
-}
-export declare const startServer: (options: LocalHttpAPIOptions) => Promise<StartServerResult>;
-export {};
+/// <reference types="node" />
+import { Server } from 'http';
+import { LambdaConfig } from '@goldstack/utils-aws-lambda';
+declare type StaticRoutes = {
+    [key: string]: string;
+};
+export interface LocalHttpAPIOptions {
+    port: string;
+    routesDir: string;
+    cors?: string;
+    /**
+     * Maps routes to local directories
+     */
+    staticRoutes?: StaticRoutes;
+}
+export interface StartServerResult {
+    shutdown: () => Promise<void>;
+    server: Server;
+    lambdaConfig: LambdaConfig[];
+}
+export declare const startServer: (options: LocalHttpAPIOptions) => Promise<StartServerResult>;
+export {};
 //# sourceMappingURL=utilsAwsHttpApiLocal.d.ts.map

package/dist/src/utilsAwsHttpApiLocal.js

@@ -1,49 +1,49 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startServer = void 0;
-const express_1 = __importDefault(require("express"));
-const cors_1 = __importDefault(require("cors"));
-const utils_aws_lambda_1 = require("@goldstack/utils-aws-lambda");
-const expressRoutes_1 = require("./expressRoutes");
-const startServer = async (options) => {
-    const app = (0, express_1.default)();
-    app.use(express_1.default.json());
-    if (options.cors) {
-        app.use((0, cors_1.default)({ origin: options.cors, credentials: true }));
-    }
-    const lambdaConfig = (0, utils_aws_lambda_1.readLambdaConfig)(options.routesDir);
-    (0, expressRoutes_1.injectRoutes)({
-        app: app,
-        lambdaConfigs: lambdaConfig,
-    });
-    if (options.staticRoutes) {
-        Object.entries(options.staticRoutes).forEach((e) => {
-            app.use(e[0], express_1.default.static(e[1]));
-        });
-    }
-    const result = await new Promise((resolve) => {
-        const server = app.listen(parseInt(options.port), function () {
-            resolve(server);
-        });
-    });
-    return {
-        server: result,
-        lambdaConfig: lambdaConfig,
-        shutdown: () => {
-            return new Promise((resolve, reject) => {
-                result.close((err) => {
-                    if (err) {
-                        reject(err);
-                        return;
-                    }
-                    resolve();
-                });
-            });
-        },
-    };
-};
-exports.startServer = startServer;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startServer = void 0;
+const express_1 = __importDefault(require("express"));
+const cors_1 = __importDefault(require("cors"));
+const utils_aws_lambda_1 = require("@goldstack/utils-aws-lambda");
+const expressRoutes_1 = require("./expressRoutes");
+const startServer = async (options) => {
+    const app = (0, express_1.default)();
+    app.use(express_1.default.json());
+    if (options.cors) {
+        app.use((0, cors_1.default)({ origin: options.cors, credentials: true }));
+    }
+    const lambdaConfig = (0, utils_aws_lambda_1.readLambdaConfig)(options.routesDir);
+    (0, expressRoutes_1.injectRoutes)({
+        app: app,
+        lambdaConfigs: lambdaConfig,
+    });
+    if (options.staticRoutes) {
+        Object.entries(options.staticRoutes).forEach((e) => {
+            app.use(e[0], express_1.default.static(e[1]));
+        });
+    }
+    const result = await new Promise((resolve) => {
+        const server = app.listen(parseInt(options.port), function () {
+            resolve(server);
+        });
+    });
+    return {
+        server: result,
+        lambdaConfig: lambdaConfig,
+        shutdown: () => {
+            return new Promise((resolve, reject) => {
+                result.close((err) => {
+                    if (err) {
+                        reject(err);
+                        return;
+                    }
+                    resolve();
+                });
+            });
+        },
+    };
+};
+exports.startServer = startServer;
 //# sourceMappingURL=utilsAwsHttpApiLocal.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goldstack/utils-aws-http-api-local",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "Starts a local AWS HTTP API for testing",
   "keywords": [
     "goldstack",
@@ -45,14 +45,14 @@
     "version:apply:force": "yarn version $@ && yarn version apply"
   },
   "dependencies": {
-    "@goldstack/utils-aws-lambda": "0.3.0",
+    "@goldstack/utils-aws-lambda": "0.3.2",
     "@types/aws-lambda": "^8.10.88",
     "cookie": "^0.4.1",
     "cors": "^2.8.5",
     "express": "^4.17.1"
   },
   "devDependencies": {
-    "@goldstack/utils-git": "0.2.0",
+    "@goldstack/utils-git": "0.2.1",
     "@types/cookie": "^0",
     "@types/express": "^4.17.13",
     "@types/jest": "^28.1.8",