serverless-simple-middleware 0.0.58 → 0.0.59

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './aws';
-export * from './middleware';
-export * from './utils';
+export * from './aws/index.js';
+export * from './middleware/index.js';
+export * from './utils/index.js';

package/dist/index.js

@@ -1,8 +1,3 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./aws"));
-__export(require("./middleware"));
-__export(require("./utils"));
+export * from './aws/index.js';
+export * from './middleware/index.js';
+export * from './utils/index.js';

package/dist/middleware/aws.d.ts

@@ -1,6 +1,6 @@
-import { SimpleAWS, SimpleAWSConfig, SimpleAWSConfigLoadParam } from '../aws';
-import { HandlerAuxBase, HandlerPluginBase } from './base';
-declare type InitializerMapper = (aws: SimpleAWS, env: {}) => {
+import { SimpleAWS, SimpleAWSConfig, SimpleAWSConfigLoadParam } from '../aws/index.js';
+import { HandlerAuxBase, HandlerPluginBase } from './base.js';
+type InitializerMapper = (aws: SimpleAWS, env: {}) => {
     [name: string]: () => Promise<boolean>;
 };
 export interface AWSPluginOptions {
@@ -21,5 +21,5 @@ export declare class AWSPlugin extends HandlerPluginBase<AWSPluginAux> {
         awsConfig: SimpleAWSConfig;
     }>;
 }
-declare const build: (options?: AWSPluginOptions | undefined) => AWSPlugin;
+declare const build: (options?: AWSPluginOptions) => AWSPlugin;
 export default build;

package/dist/middleware/aws.js

@@ -1,128 +1,41 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
+import { loadAWSConfig, SimpleAWS, SimpleAWSConfig, } from '../aws/index.js';
+import { getLogger } from '../utils/index.js';
+import { HandlerPluginBase } from './base.js';
+const logger = getLogger(__filename);
+const initialize = async (aws, mapper) => {
+    const env = process.env;
+    const mapping = mapper(aws, env);
+    const successes = await Promise.all(Object.keys(mapping).map(name => mapping[name]()));
+    return Object.keys(mapping).reduce((result, name, index) => ({ ...result, [name]: successes[index] }), {});
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var _this = this;
-Object.defineProperty(exports, "__esModule", { value: true });
-var aws_1 = require("../aws");
-var utils_1 = require("../utils");
-var base_1 = require("./base");
-var logger = utils_1.getLogger(__filename);
-var initialize = function (aws, mapper) { return __awaiter(_this, void 0, void 0, function () {
-    var env, mapping, successes;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                env = process.env;
-                mapping = mapper(aws, env);
-                return [4 /*yield*/, Promise.all(Object.keys(mapping).map(function (name) { return mapping[name](); }))];
-            case 1:
-                successes = _a.sent();
-                return [2 /*return*/, Object.keys(mapping).reduce(function (result, name, index) {
-                        var _a;
-                        return (__assign({}, result, (_a = {}, _a[name] = successes[index], _a)));
-                    }, {})];
-        }
-    });
-}); };
-var AWSPlugin = /** @class */ (function (_super) {
-    __extends(AWSPlugin, _super);
-    function AWSPlugin(options) {
-        var _this = _super.call(this) || this;
-        _this.create = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a, config, mapper, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (!!this.aws) return [3 /*break*/, 4];
-                        _a = this.options || {
-                            config: undefined,
-                            mapper: undefined,
-                        }, config = _a.config, mapper = _a.mapper;
-                        if (!config) return [3 /*break*/, 2];
-                        logger.debug("Load aws config from " + config);
-                        _b = this;
-                        return [4 /*yield*/, aws_1.loadAWSConfig(config)];
-                    case 1:
-                        _b.config = _c.sent();
-                        _c.label = 2;
-                    case 2:
-                        this.aws = new aws_1.SimpleAWS(this.config);
-                        if (!mapper) return [3 /*break*/, 4];
-                        logger.debug("Initialize aws components with mapper.");
-                        return [4 /*yield*/, initialize(this.aws, mapper)];
-                    case 3:
-                        _c.sent();
-                        _c.label = 4;
-                    case 4: return [2 /*return*/, {
-                            aws: this.aws,
-                            awsConfig: this.config,
-                        }];
+export class AWSPlugin extends HandlerPluginBase {
+    constructor(options) {
+        super();
+        this.create = async () => {
+            // Setup only once.
+            if (!this.aws) {
+                const { config, mapper } = this.options || {
+                    config: undefined,
+                    mapper: undefined,
+                };
+                if (config) {
+                    logger.debug(`Load aws config from ${config}`);
+                    this.config = await loadAWSConfig(config);
+                }
+                this.aws = new SimpleAWS(this.config);
+                if (mapper) {
+                    logger.debug(`Initialize aws components with mapper.`);
+                    await initialize(this.aws, mapper);
                 }
-            });
-        }); };
-        _this.options = options;
-        _this.config = new aws_1.SimpleAWSConfig();
-        return _this;
+            }
+            return {
+                aws: this.aws,
+                awsConfig: this.config,
+            };
+        };
+        this.options = options;
+        this.config = new SimpleAWSConfig();
     }
-    return AWSPlugin;
-}(base_1.HandlerPluginBase));
-exports.AWSPlugin = AWSPlugin;
-var build = function (options) { return new AWSPlugin(options); };
-exports.default = build;
+}
+const build = (options) => new AWSPlugin(options);
+export default build;

package/dist/middleware/base.d.ts

@@ -3,17 +3,17 @@ export interface RequestAuxBase {
     [pluginName: string]: any;
 }
 export declare class HandlerRequest {
-    event: awsTypes.APIGatewayEvent;
+    event: awsTypes.APIGatewayProxyEvent;
     context: awsTypes.APIGatewayEventRequestContext;
     lastError: Error | string | undefined;
     private lazyBody?;
     constructor(event: any, context: any);
-    readonly body: any;
-    readonly path: {
-        [key: string]: string;
+    get body(): any;
+    get path(): {
+        [key: string]: string | undefined;
     };
-    readonly query: {
-        [key: string]: string;
+    get query(): {
+        [key: string]: string | undefined;
     };
     header(key: string): string | undefined;
     records<T, U>(selector?: (each: T) => U): T[] | U[];
@@ -29,7 +29,7 @@ export declare class HandlerResponse {
     ok(body?: {}, code?: number): any;
     fail(body?: {}, code?: number): any;
     addCookie(key: string, value: string, domain?: string, specifyCrossOrigin?: true, path?: string): void;
-    setCrossOrigin: (origin?: string | undefined) => void;
+    setCrossOrigin: (origin?: string) => void;
 }
 export interface HandlerAuxBase {
     [key: string]: any;
@@ -39,7 +39,7 @@ export interface HandlerContext<A extends HandlerAuxBase> {
     response: HandlerResponse;
     aux: A;
 }
-export declare type Handler<A extends HandlerAuxBase> = (context: HandlerContext<A>) => any | Promise<any> | undefined;
+export type Handler<A extends HandlerAuxBase> = (context: HandlerContext<A>) => any | Promise<any> | undefined;
 export interface HandlerPlugin<A extends HandlerAuxBase> {
     create: () => Promise<A> | A;
     begin: Handler<A>;
@@ -47,7 +47,7 @@ export interface HandlerPlugin<A extends HandlerAuxBase> {
     error: Handler<A>;
 }
 export declare class HandlerPluginBase<A extends HandlerAuxBase> implements HandlerPlugin<A> {
-    create: () => A | Promise<A>;
+    create: () => Promise<A> | A;
     begin: (_: HandlerContext<A>) => void;
     end: (_: HandlerContext<A>) => void;
     error: (_: HandlerContext<A>) => void;

package/dist/middleware/base.js

@@ -1,68 +1,40 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = require("../utils/logger");
-var logger = logger_1.getLogger(__filename);
-var HandlerRequest = /** @class */ (function () {
-    function HandlerRequest(event, context) {
+import { getLogger } from '../utils/index.js';
+const logger = getLogger(__filename);
+export class HandlerRequest {
+    constructor(event, context) {
         this.event = event;
         this.context = context;
         this.lastError = undefined;
     }
-    Object.defineProperty(HandlerRequest.prototype, "body", {
-        get: function () {
-            if (!this.event.body) {
-                return {};
-            }
-            if (this.lazyBody === undefined) {
-                this.lazyBody = JSON.parse(this.event.body);
-            }
-            return this.lazyBody || {};
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(HandlerRequest.prototype, "path", {
-        get: function () {
-            return this.event.pathParameters || {};
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(HandlerRequest.prototype, "query", {
-        get: function () {
-            return this.event.queryStringParameters || {};
-        },
-        enumerable: true,
-        configurable: true
-    });
-    HandlerRequest.prototype.header = function (key) {
+    get body() {
+        if (!this.event.body) {
+            return {};
+        }
+        if (this.lazyBody === undefined) {
+            this.lazyBody = JSON.parse(this.event.body);
+        }
+        return this.lazyBody || {};
+    }
+    get path() {
+        return this.event.pathParameters || {};
+    }
+    get query() {
+        return this.event.queryStringParameters || {};
+    }
+    header(key) {
         return this.event.headers
             ? this.event.headers[key] || this.event.headers[key.toLowerCase()]
             : undefined;
-    };
-    HandlerRequest.prototype.records = function (selector) {
-        var target = (this.event.Records || []);
+    }
+    records(selector) {
+        const target = (this.event.Records || []);
         return selector === undefined ? target : target.map(selector);
-    };
-    return HandlerRequest;
-}());
-exports.HandlerRequest = HandlerRequest;
-var HandlerResponse = /** @class */ (function () {
-    function HandlerResponse(callback) {
-        var _this = this;
-        this.setCrossOrigin = function (origin) {
-            _this.crossOrigin = origin;
+    }
+}
+export class HandlerResponse {
+    constructor(callback) {
+        this.setCrossOrigin = (origin) => {
+            this.crossOrigin = origin;
         };
         this.callback = callback;
         this.completed = false;
@@ -73,68 +45,62 @@ var HandlerResponse = /** @class */ (function () {
         };
         this.cookies = [];
     }
-    HandlerResponse.prototype.ok = function (body, code) {
-        if (body === void 0) { body = {}; }
-        if (code === void 0) { code = 200; }
-        logger.stupid("ok", body);
-        var headers = __assign({}, this.corsHeaders);
+    ok(body = {}, code = 200) {
+        logger.stupid(`ok`, body);
+        const headers = {
+            ...this.corsHeaders,
+        };
         if (this.crossOrigin) {
             headers['Access-Control-Allow-Origin'] = this.crossOrigin;
         }
-        var multiValueHeaders = undefined;
+        let multiValueHeaders = undefined;
         if (this.cookies.length > 0) {
             multiValueHeaders = { 'Set-Cookie': this.cookies };
         }
-        var result = this.callback(null, {
+        const result = this.callback(null, {
             statusCode: code,
-            headers: headers,
-            multiValueHeaders: multiValueHeaders,
+            headers,
+            multiValueHeaders,
             body: JSON.stringify(body),
         });
         this.completed = true;
         return result;
-    };
-    HandlerResponse.prototype.fail = function (body, code) {
-        if (body === void 0) { body = {}; }
-        if (code === void 0) { code = 500; }
-        logger.stupid("fail", body);
-        var result = this.callback(null, {
+    }
+    fail(body = {}, code = 500) {
+        logger.stupid(`fail`, body);
+        const result = this.callback(null, {
             statusCode: code,
             headers: this.corsHeaders,
             body: JSON.stringify(body),
         });
         this.completed = true;
         return result;
-    };
-    HandlerResponse.prototype.addCookie = function (key, value, domain, specifyCrossOrigin, path) {
-        var keyValueStr = key + "=" + value;
-        var domainStr = domain ? "Domain=" + domain : '';
-        var sameSiteStr = specifyCrossOrigin ? 'SameSite=None' : '';
-        var secureStr = specifyCrossOrigin ? 'Secure' : '';
-        var pathStr = path !== undefined ? "Path=" + path : '';
-        var cookieStr = [keyValueStr, domainStr, sameSiteStr, secureStr, pathStr]
-            .filter(function (x) { return x; })
+    }
+    addCookie(key, value, domain, specifyCrossOrigin, path) {
+        const keyValueStr = `${key}=${value}`;
+        const domainStr = domain ? `Domain=${domain}` : '';
+        const sameSiteStr = specifyCrossOrigin ? 'SameSite=None' : '';
+        const secureStr = specifyCrossOrigin ? 'Secure' : '';
+        const pathStr = path !== undefined ? `Path=${path}` : '';
+        const cookieStr = [keyValueStr, domainStr, sameSiteStr, secureStr, pathStr]
+            .filter(x => x)
             .join('; ');
         this.cookies.push(cookieStr);
-    };
-    return HandlerResponse;
-}());
-exports.HandlerResponse = HandlerResponse;
-var HandlerPluginBase = /** @class */ (function () {
-    function HandlerPluginBase() {
-        this.create = function () {
+    }
+}
+export class HandlerPluginBase {
+    constructor() {
+        this.create = () => {
             throw new Error('Not yet implemented');
         };
-        this.begin = function (_) {
+        this.begin = (_) => {
             // do nothing
         };
-        this.end = function (_) {
+        this.end = (_) => {
             // do nothing
         };
-        this.error = function (_) {
+        this.error = (_) => {
             // do nothing
         };
     }
-    return HandlerPluginBase;
-}());
-exports.HandlerPluginBase = HandlerPluginBase;
+}

package/dist/middleware/build.d.ts

@@ -1,3 +1,3 @@
-import { Handler, HandlerAuxBase, HandlerPluginBase } from './base';
-declare const build: <Aux extends HandlerAuxBase>(plugins: HandlerPluginBase<any>[]) => (handler: Handler<Aux>) => (event: any, context: any, callback: any) => void;
+import { Handler, HandlerAuxBase, HandlerPluginBase } from './base.js';
+declare const build: <Aux extends HandlerAuxBase>(plugins: Array<HandlerPluginBase<any>>) => (handler: Handler<Aux>) => (event: any, context: any, callback: any) => void;
 export default build;