aws-lambda-api-tools 0.1.3 → 0.1.5

package/bin/generate-swagger.js

@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+
+/*
+Usage:
+npm run generate-swagger --args path/to/config/file output/directory
+*/
+
+const minimist = require('minimist');
+const path = require('path');
+const argv = minimist(process.argv.slice(2));
+const fs = require('fs');
+
+if (argv._.length === 0) {
+  argv._ = [undefined, undefined];
+} else if (argv._.length === 1) {
+  argv._.push(undefined);
+}
+
+console.log(JSON.stringify(argv._));
+
+const [configFile = './dist/routes-config.js', outputFile = './route-modules-oas.json'] = argv._;
+
+const swaggerModulePath = path.join('.', '../dist/lib/swagger-route-specification-generator');
+const { generateRouteSwaggerSpec } = require(swaggerModulePath);
+
+const configFilePath = path.join(process.cwd(), configFile);
+console.log(`config file path: ${configFilePath}`);
+const { config, routesBaseUrlPath } = require(configFilePath);
+
+const swaggerSpec = { paths: {}, components: {} };
+const swaggerPaths = {};
+const swaggerModels = {};
+
+config.routes.filter(r => r.generateOpenApiDocs).forEach(r => {
+
+  const routeHandlerModulePath = r.handlerPath.replace(process.cwd(), '.').replace('src/', 'dist/');
+
+  const loadedModule = require(path.join(process.cwd(), routeHandlerModulePath));
+  const { routeSchema } = loadedModule.default || loadedModule;
+
+  const { path: swaggerPathAndMethodSpec, components } = generateRouteSwaggerSpec(routeSchema, r);
+  swaggerPathAndMethodSpec.tags = [routesBaseUrlPath.replace('/','.')];
+  let pathMethodItems = swaggerSpec.paths[r.path];
+  if (!pathMethodItems) {
+    pathMethodItems = swaggerSpec.paths[r.path] = {};
+  }
+  pathMethodItems[r.method.toLowerCase()] = swaggerPathAndMethodSpec;
+  swaggerSpec.paths[r.path] = { ...swaggerSpec.paths[r.path], ...pathMethodItems };
+  swaggerSpec.components.schemas = { ...swaggerSpec.components.schemas, ...components.schemas };
+});
+fs.writeFileSync(path.join(process.cwd(), outputFile), JSON.stringify(swaggerSpec));
+console.log(JSON.stringify(swaggerSpec));
+
+// require('../lib')(argv);

package/dist/lib/cf-yaml-helper.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Parser and schema for CloudFormation YAML template tags.
+ *
+ * There are some existing modules out there:
+ *    https://github.com/yyolk/cloudformation-js-yaml-schema
+ *    https://github.com/KoharaKazuya/js-yaml-schema-cfn
+ * But both are poorly documented, with insufficient tests, and don't fully work.
+ *
+ * This implementation is based on the official AWS python client:
+ * https://github.com/aws/aws-cli/blob/develop/awscli/customizations/cloudformation/yamlhelper.py
+ */
+import jsYaml from 'js-yaml';
+/**
+ * The actual js-yaml schema, extending the DEFAULT_SAFE_SCHEMA.
+ */
+export declare const schema: jsYaml.Schema;
+/**
+ * Convenience function to parse the given yaml input.
+ */
+export declare const parse: (input: any) => unknown;
+/**
+ * Convenience function to serialize the given object to Yaml.
+ */
+export declare const dump: (input: any) => string;
+export declare const updateCFYamlPropertyInplace: (pathToYaml: string, propertyPath: string, propertyValue: string) => void;
+//# sourceMappingURL=cf-yaml-helper.d.ts.map

package/dist/lib/cf-yaml-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cf-yaml-helper.d.ts","sourceRoot":"","sources":["../../src/lib/cf-yaml-helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,MAAM,MAAM,SAAS,CAAC;AAsF5B;;GAEG;AACH,eAAO,MAAM,MAAM,eAGjB,CAAC;AAGH;;GAEG;AACH,eAAO,MAAM,KAAK,UAAW,GAAG,YAA2C,CAAC;AAE5E;;GAEG;AACH,eAAO,MAAM,IAAI,UAAW,GAAG,WAA2C,CAAC;AAG5E,eAAO,MAAM,2BAA2B,eAAgB,MAAM,gBAAgB,MAAM,iBAAiB,MAAM,SAU1G,CAAC"}

package/dist/lib/cf-yaml-helper.js

@@ -0,0 +1,148 @@
+"use strict";
+/**
+ * Parser and schema for CloudFormation YAML template tags.
+ *
+ * There are some existing modules out there:
+ *    https://github.com/yyolk/cloudformation-js-yaml-schema
+ *    https://github.com/KoharaKazuya/js-yaml-schema-cfn
+ * But both are poorly documented, with insufficient tests, and don't fully work.
+ *
+ * This implementation is based on the official AWS python client:
+ * https://github.com/aws/aws-cli/blob/develop/awscli/customizations/cloudformation/yamlhelper.py
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateCFYamlPropertyInplace = exports.dump = exports.parse = exports.schema = void 0;
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const fs = __importStar(require("fs"));
+const _ = __importStar(require("lodash"));
+/**
+ * Split a string on the given separator just once, returning an array of two parts, or null.
+ */
+const splitOne = (str, sep) => {
+    let index = str.indexOf(sep);
+    return index < 0 ? null : [str.slice(0, index), str.slice(index + sep.length)];
+};
+/**
+ * Returns true if obj is a representation of a CloudFormation intrinsic, i.e. an object with a
+ * single property at key keyName.
+ */
+const checkType = (obj, keyName) => {
+    return obj && typeof obj === 'object' && Object.keys(obj).length === 1 &&
+        obj.hasOwnProperty(keyName);
+};
+const overrides = {
+    // ShortHand notation for !GetAtt accepts Resource.Attribute format while the standard notation
+    // is to use an array [Resource, Attribute]. Convert shorthand to standard format.
+    GetAtt: {
+        parse: (data) => typeof data === 'string' ? splitOne(data, '.') : data,
+        dump: (data) => data.join('.')
+    }
+};
+const applyOverrides = (data, tag, method) => {
+    return overrides[tag] ? overrides[tag][method](data) : data;
+};
+/**
+ * Generic tag-creating helper. For the given name of the form 'Fn::Something' (or just
+ * 'Something'), creates a js-yaml Type object that can parse and dump this type. It creates it
+ * for all types of values, for simplicity and because that's how the official Python version
+ * works.
+ */
+const makeTagTypes = (name) => {
+    const parts = splitOne(name, '::');
+    const tag = parts ? parts[1] : name;
+    // Translate in the same way for all types, to match Python's generic translation.
+    return ['scalar', 'sequence', 'mapping'].map((kind) => new js_yaml_1.default.Type('!' + tag, {
+        kind: kind,
+        construct: (data) => ({ [name]: applyOverrides(data, tag, 'parse') }),
+        predicate: (obj) => checkType(obj, name),
+        represent: (obj) => applyOverrides(obj[name], tag, 'dump'),
+    }));
+};
+/**
+ * This list is from
+ * http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html
+ * Note that the Python version handles ANY tag that starts with ! in the same way (translating it
+ * to Fn:: prefix, but js-yaml requires listing tags explicitly.
+ */
+const supportedFunctions = [
+    'Fn::Base64',
+    'Fn::Cidr',
+    'Fn::FindInMap',
+    'Fn::GetAtt',
+    'Fn::GetAZs',
+    'Fn::ImportValue',
+    'Fn::Join',
+    'Fn::Select',
+    'Fn::Split',
+    'Fn::Sub',
+    'Fn::Transform',
+    'Ref',
+    'Condition',
+    'Fn::And',
+    'Fn::Equals',
+    'Fn::If',
+    'Fn::Not',
+    'Fn::Or',
+];
+const allTagTypes = [];
+for (let name of supportedFunctions) {
+    allTagTypes.push(...makeTagTypes(name));
+}
+/**
+ * The actual js-yaml schema, extending the DEFAULT_SAFE_SCHEMA.
+ */
+exports.schema = js_yaml_1.default.CORE_SCHEMA.extend({
+    implicit: [],
+    explicit: allTagTypes,
+});
+/**
+ * Convenience function to parse the given yaml input.
+ */
+const parse = (input) => js_yaml_1.default.load(input, { schema: exports.schema });
+exports.parse = parse;
+;
+/**
+ * Convenience function to serialize the given object to Yaml.
+ */
+const dump = (input) => js_yaml_1.default.dump(input, { schema: exports.schema });
+exports.dump = dump;
+const updateCFYamlPropertyInplace = (pathToYaml, propertyPath, propertyValue) => {
+    try {
+        const doc = (0, exports.parse)(fs.readFileSync(pathToYaml, 'utf8'));
+        // console.log(`${doc}`);
+        _.set(doc, propertyPath, propertyValue);
+        fs.writeFileSync(pathToYaml, (0, exports.dump)(doc));
+    }
+    catch (e) {
+        console.log('--- ERROR: Could not perform yaml update. ---');
+        console.log(JSON.stringify(e));
+    }
+};
+exports.updateCFYamlPropertyInplace = updateCFYamlPropertyInplace;
+//# sourceMappingURL=cf-yaml-helper.js.map

package/dist/lib/cf-yaml-helper.js.map

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

package/dist/lib/custom-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom-error.d.ts","sourceRoot":"","sources":["../../src/lib/custom-error.ts"],"names":[],"mappings":"AACA,qBAAa,WAAY,SAAQ,KAAK;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;gBAEL,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAM/C,IAAI,cAAc,WAEjB;IAED,IAAa,OAAO,WAEnB;CACF"}
+{"version":3,"file":"custom-error.d.ts","sourceRoot":"","sources":["../../src/lib/custom-error.ts"],"names":[],"mappings":"AACE,qBAAa,WAAY,SAAQ,KAAK;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;gBAEL,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAM/C,IAAI,cAAc,WAEjB;IAED,IAAa,OAAO,WAEnB;CACF"}

package/dist/lib/custom-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-error.js","sourceRoot":"","sources":["../../src/lib/custom-error.ts"],"names":[],"mappings":";;;AACA,MAAa,WAAY,SAAQ,KAAK;IAIpC,YAAY,OAAe,EAAE,UAAkB;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,eAAe,GAAG,UAAU,IAAI,GAAG,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAjBD,kCAiBC;AAAA,CAAC"}
+{"version":3,"file":"custom-error.js","sourceRoot":"","sources":["../../src/lib/custom-error.ts"],"names":[],"mappings":";;;AACE,MAAa,WAAY,SAAQ,KAAK;IAIpC,YAAY,OAAe,EAAE,UAAkB;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,eAAe,GAAG,UAAU,IAAI,GAAG,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAjBD,kCAiBC;AAAA,CAAC"}

package/dist/lib/lambda-route-proxy-entry-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-route-proxy-entry-handler.d.ts","sourceRoot":"","sources":["../../src/lib/lambda-route-proxy-entry-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAoB,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAYpG,eAAO,MAAM,cAAc,WAAY,WAAW,UAAU,MAAM,QAAQ,MAAM;;MAAkD,WAUjI,CAAC;AAEF,eAAO,MAAM,oBAAoB,mBAA0B,WAAW,YAAY,cAAc,KAAG,QAAQ,GAAG,CAM7G,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAAY,WAAW;;oDAuC7D,CAAC"}
+{"version":3,"file":"lambda-route-proxy-entry-handler.d.ts","sourceRoot":"","sources":["../../src/lib/lambda-route-proxy-entry-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAoB,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAYpG,eAAO,MAAM,cAAc,WAAY,WAAW,UAAU,MAAM,QAAQ,MAAM;;MAAkD,WAUjI,CAAC;AAEF,eAAO,MAAM,oBAAoB,mBAA0B,WAAW,YAAY,cAAc,KAAG,QAAQ,GAAG,CAM7G,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAAY,WAAW;;oDAgD7D,CAAC"}

package/dist/lib/lambda-route-proxy-entry-handler.js

@@ -29,18 +29,23 @@ const getRouteModuleResult = async ({ routeChain }, incoming) => {
 exports.getRouteModuleResult = getRouteModuleResult;
 const lambdaRouteProxyEntryHandler = (config, availableRouteModules) => async (event) => {
     console.log(`Event Data: ${JSON.stringify(event)}`);
-    const { routeKey, queryStringParameters, pathParameters, body, } = event;
+    const { routeKey, queryStringParameters, pathParameters, body, isBase64Encoded, } = event;
     let retVal = {};
     try {
-        const [method, path] = routeKey.split(' ');
+        const [method = '', path = ''] = routeKey.split(' ');
         if (shouldAuthorizeRoute(config, getRouteConfigEntry(config, method, path))) {
             await (0, authorization_helper_1.authorizeRoute)(event);
         }
         const routeModule = (0, exports.getRouteModule)(config, method, path, availableRouteModules);
+        console.log(`isBase64Encoded: ${isBase64Encoded}`);
+        console.log(`body: ${body}`);
+        const decodedBody = isBase64Encoded ? Buffer.from(body, 'base64').toString('utf-8') : undefined;
+        console.log(`decodedBody:
+      ${decodedBody}`);
         retVal = await (0, exports.getRouteModuleResult)(routeModule, {
             query: queryStringParameters,
             params: pathParameters,
-            body: body ? JSON.parse(body) : undefined,
+            body: body ? decodedBody || JSON.parse(body) : undefined,
             rawEvent: event,
         });
     }

package/dist/lib/lambda-route-proxy-entry-handler.js.map

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

package/dist/lib/lambda-route-proxy-path-not-found.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-route-proxy-path-not-found.d.ts","sourceRoot":"","sources":["../../src/lib/lambda-route-proxy-path-not-found.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAsBhC,eAAO,MAAM,4BAA4B,EAAE,WAG1C,CAAC"}
+{"version":3,"file":"lambda-route-proxy-path-not-found.d.ts","sourceRoot":"","sources":["../../src/lib/lambda-route-proxy-path-not-found.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAiBhC,eAAO,MAAM,4BAA4B,EAAE,WAG1C,CAAC"}

package/dist/lib/lambda-route-proxy-path-not-found.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lambdaRouteProxyPathNotFound = void 0;
 const handler = async (input) => {
-    console.log('--- NOT FOUND HANDLER ---');
-    console.log(input.rawEvent.requestContext.http.method);
     if (input.rawEvent.requestContext.http.method === 'OPTIONS') {
         return {
             statusCode: 200,
@@ -12,10 +10,7 @@ const handler = async (input) => {
                 'Access-Control-Allow-Methods': '*',
                 'Access-Control-Allow-Headers': '*',
                 'Access-Control-Max-Age': 300,
-                'Access-Control-Expose-Headers': 'Access-Control-Allow-Origin',
-                'Access-Control-Allow-Credentials': true,
-                'Content-Type': 'application/json',
-            },
+            }
         };
     }
     return { statusCode: 404, body: JSON.stringify('Not found') };

package/dist/lib/lambda-route-proxy-path-not-found.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-route-proxy-path-not-found.js","sourceRoot":"","sources":["../../src/lib/lambda-route-proxy-path-not-found.ts"],"names":[],"mappings":";;;AAKA,MAAM,OAAO,GAAG,KAAK,EAAE,KAAqB,EAAgB,EAAE;IAC5D,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,IAAI,KAAK,CAAC,QAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;QAC5D,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE;gBACP,6BAA6B,EAAE,GAAG;gBAClC,8BAA8B,EAAE,GAAG;gBACnC,8BAA8B,EAAE,GAAG;gBACnC,wBAAwB,EAAE,GAAG;gBAC7B,+BAA+B,EAAE,6BAA6B;gBAC9D,kCAAkC,EAAE,IAAI;gBACxC,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC;KACH;IACD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AAEW,QAAA,4BAA4B,GAAgB;IACvD,UAAU,EAAE,CAAC,OAAO,CAAC;IACrB,WAAW,EAAE,EAAE;CAChB,CAAC"}
+{"version":3,"file":"lambda-route-proxy-path-not-found.js","sourceRoot":"","sources":["../../src/lib/lambda-route-proxy-path-not-found.ts"],"names":[],"mappings":";;;AAKA,MAAM,OAAO,GAAG,KAAK,EAAE,KAAqB,EAAgB,EAAE;IAC5D,IAAI,KAAK,CAAC,QAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;QAC5D,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE;gBACP,6BAA6B,EAAE,GAAG;gBAClC,8BAA8B,EAAE,GAAG;gBACnC,8BAA8B,EAAE,GAAG;gBACnC,wBAAwB,EAAE,GAAG;aAC9B;SACF,CAAC;KACH;IACD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AAEW,QAAA,4BAA4B,GAAgB;IACvD,UAAU,EAAE,CAAC,OAAO,CAAC;IACrB,WAAW,EAAE,EAAE;CAChB,CAAC"}

package/dist/lib/swagger-route-specification-generator.d.ts

@@ -1,78 +1,18 @@
-import { APIGatewayProxyEventV2 } from 'aws-lambda';
-import { Schema } from 'joi';
+import { ComponentsSchema } from 'joi-to-swagger';
+import { ConfigRouteEntry, RouteSchema } from './types-and-interfaces';
 import * as swaggerTypes from './swagger-specification-types';
-export type ConfigRouteEntry = {
-    functionName?: string;
-    description: string;
-    swaggerMethodName?: string;
-    path: string;
-    method: 'ANY' | 'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'PATCH' | 'POST' | 'PUT';
-    generateOpenApiDocs: boolean;
-    handlerPath: string;
-    authorizeRoute?: boolean;
-};
-export type RouteConfig = {
-    authorizeAllRoutes?: boolean;
-    routes: Array<ConfigRouteEntry>;
-};
-export type RouteArguments = {
-    params?: any;
-    body?: any;
-    query?: any;
-    form?: any;
-    rawEvent?: APIGatewayProxyEventV2;
-    routeData?: any;
-};
-export interface RouteSchema {
-    params?: {
-        [key: string]: Schema<any>;
-    };
-    query?: {
-        [key: string]: Schema<any>;
-    };
-    form?: {
-        [key: string]: Schema<any>;
+type RouteSpecType = {
+    path: {
+        description: string;
+        operationId?: string;
+        parameters?: Array<swaggerTypes.ParameterObject>;
+        requestBody?: swaggerTypes.RequestBody;
+        responses?: Record<string, swaggerTypes.ResponseObject>;
     };
-    requestBody?: Schema<any> | {
-        [key: string]: Schema<any>;
+    components: {
+        schemas: Record<string, ComponentsSchema>;
     };
-    responseBody?: Schema<any> | {
-        [key: string]: Schema<any>;
-    };
-}
-export interface BaseResponseObject extends swaggerTypes.ResponseObject {
-}
-export interface ResponseError extends swaggerTypes.ResponseObject {
-    error: {
-        statusCode: string;
-        message: string;
-    };
-}
-export interface ResponseData extends swaggerTypes.ResponseObject {
-    data: any;
-}
-export type ResponseObject<T> = ResponseData | ResponseError;
-export type BaseRouteResponse<T> = {
-    [key in '201' | '202' | '203' | '204' | '205' | '206' | '400' | '401' | '402' | '403' | '404' | '405' | '406' | '407' | '408' | '409' | '410' | '411' | '412' | '413' | '414' | '415' | '416' | '417' | '418' | '419']: ResponseObject<T>;
 };
-export interface RouteResponse<T> extends BaseRouteResponse<T> {
-    '200': ResponseObject<T>;
-}
-export type MiddlewareSchemaInputFunction = (input: RouteSchema) => RouteArguments;
-export type MiddlewareArgumentsInputFunction = (input: RouteArguments) => any;
-export type MiddlewareChain = Array<MiddlewareArgumentsInputFunction>;
-export type RouteModule = {
-    routeChain: MiddlewareChain;
-    routeSchema: RouteSchema;
-};
-export interface Permission {
-    id: string;
-    systemPermission: string;
-    enabled: boolean;
-    humanReadableName: string;
-    entity: {
-        level: string;
-        humanReadableName: string;
-    };
-}
+export declare const generateRouteSwaggerSpec: (schema: RouteSchema, routeEntry: ConfigRouteEntry) => RouteSpecType;
+export {};
 //# sourceMappingURL=swagger-route-specification-generator.d.ts.map

package/dist/lib/swagger-route-specification-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-route-specification-generator.d.ts","sourceRoot":"","sources":["../../src/lib/swagger-route-specification-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swagger-route-specification-generator.d.ts","sourceRoot":"","sources":["../../src/lib/swagger-route-specification-generator.ts"],"names":[],"mappings":"AACA,OAAqB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAE9D,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE;QACJ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QACjD,WAAW,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;KACzD,CAAC;IACF,UAAU,EAAE;QACV,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KAC3C,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,wBAAwB,WAAY,WAAW,cAAc,gBAAgB,KAAG,aAsF5F,CAAC"}

package/dist/lib/swagger-route-specification-generator.js

@@ -1,3 +1,115 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateRouteSwaggerSpec = void 0;
+const joi = __importStar(require("joi"));
+const joi_to_swagger_1 = __importDefault(require("joi-to-swagger"));
+const generateRouteSwaggerSpec = (schema, routeEntry) => {
+    const { requestBody: requestBodyJoiSchema, query: queryJoiSchema, params: pathParamsJoiSchema, responseBody: responseBodyJoiSchema } = { requestBody: {}, query: {}, params: {}, responseBody: {}, ...schema };
+    const { description, swaggerMethodName } = routeEntry;
+    // console.log('schema:')
+    // console.log(schema);
+    let parameters = [];
+    let requestBody = undefined;
+    let responseBody = { description: 'Default response' };
+    // let requestBodyRefKey: string | undefined;
+    // let responseBodyRefKey: string | undefined;
+    let componentSchemas = {};
+    if (pathParamsJoiSchema && Object.keys(pathParamsJoiSchema).length > 0) {
+        const pathParamsKeys = Object.keys(pathParamsJoiSchema);
+        const pathParamsSwaggerParameters = pathParamsKeys.map((key) => ({
+            name: key,
+            in: 'path',
+            required: true,
+            schema: (0, joi_to_swagger_1.default)(pathParamsJoiSchema[key]).swagger,
+        }));
+        parameters = Array().concat(parameters, pathParamsSwaggerParameters);
+    }
+    if (queryJoiSchema && Object.keys(queryJoiSchema).length > 0) {
+        const queryKeys = Object.keys(queryJoiSchema);
+        const queryParamsSwaggerParameters = queryKeys.map((key) => {
+            const { presence } = queryJoiSchema[key]._flags;
+            return {
+                name: key,
+                in: 'query',
+                required: presence === 'required',
+                schema: (0, joi_to_swagger_1.default)(queryJoiSchema[key]).swagger,
+            };
+        });
+        parameters = Array().concat(parameters, queryParamsSwaggerParameters);
+    }
+    if (requestBodyJoiSchema && Object.keys(requestBodyJoiSchema).length > 0) {
+        const { swagger, components: requestComponent } = (0, joi_to_swagger_1.default)(joi.isSchema(requestBodyJoiSchema) ? requestBodyJoiSchema : joi.object(requestBodyJoiSchema));
+        requestBody = {
+            description: 'Default response body',
+            content: {
+                'application/json': {
+                    schema: swagger,
+                },
+            },
+        };
+        // console.log(swagger);
+        if (swagger.$ref || (swagger.items && swagger.items.$ref)) {
+            // requestBodyRefKey = swagger.$ref.split('/').reverse()[0];
+            componentSchemas = { ...componentSchemas, ...requestComponent.schemas };
+        }
+    }
+    if (responseBodyJoiSchema && Object.keys(responseBodyJoiSchema).length > 0) {
+        const { swagger, components: responseComponent } = (0, joi_to_swagger_1.default)(joi.isSchema(responseBodyJoiSchema) ? responseBodyJoiSchema : joi.object(responseBodyJoiSchema));
+        // console.log(JSON.stringify(j2s, null, 2));
+        // console.log(swagger);
+        responseBody = {
+            description: 'Default response body',
+            content: {
+                'application/json': {
+                    schema: swagger,
+                },
+            },
+        };
+        if (swagger.$ref || (swagger.items && swagger.items.$ref)) {
+            // responseBodyRefKey = swagger.$ref.split('/').reverse()[0];
+            componentSchemas = { ...componentSchemas, ...responseComponent.schemas };
+        }
+    }
+    return {
+        path: {
+            description,
+            operationId: swaggerMethodName || undefined,
+            parameters,
+            requestBody,
+            responses: {
+                '200': responseBody,
+            },
+        },
+        components: {
+            schemas: componentSchemas,
+        },
+    };
+};
+exports.generateRouteSwaggerSpec = generateRouteSwaggerSpec;
 //# sourceMappingURL=swagger-route-specification-generator.js.map

package/dist/lib/swagger-route-specification-generator.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-lambda-api-tools",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -9,7 +9,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "bump-version": "npm run build && npm version patch -m 'Updated version to %s'",
+    "bump-version": "npm run build && npm version patch -m 'Updated version to %s [skip ci]'",
     "test": "jest",
     "generate-swagger": "node -r ts-node/register bin/generate-swagger.js"
   },
@@ -37,10 +37,22 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
+    "@types/atob": "^2.1.2",
+    "@types/aws-lambda": "^8.10.81",
+    "@types/formidable": "^1.2.3",
+    "@types/jest": "^26.0.23",
+    "@types/js-yaml": "^4.0.5",
+    "@types/lodash": "^4.14.182",
+    "@types/minimist": "^1.2.2",
+    "@types/node-fetch": "^2.5.12",
     "atob": "^2.1.2",
-    "joi": "^17.13.3",
-    "joi-to-swagger": "^5.2.0",
-    "minimist": "^1.2.8"
+    "axios": "^1.6.3",
+    "joi": "^17.12.3",
+    "joi-to-swagger": "6.2.0",
+    "joi-to-typescript": "^4.11.0",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
+    "minimist": "^1.2.6"
   },
   "files": [
     "bin",