serverless-simple-middleware 0.0.57 → 0.0.59

package/dist/middleware/build.js

@@ -1,234 +1,107 @@
-"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);
-};
-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 };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = require("../utils/logger");
-var utils_1 = require("../utils");
-var base_1 = require("./base");
-var logger = logger_1.getLogger(__filename);
-var HandlerMiddleware = /** @class */ (function () {
-    function HandlerMiddleware(plugins) {
-        var _this = this;
-        this.createAuxPromise = function () {
-            return !_this.plugins || _this.plugins.length === 0
+import { getLogger } from '../utils/index.js';
+import { stringifyError } from '../utils/index.js';
+import { HandlerRequest, HandlerResponse, } from './base.js';
+const logger = getLogger(__filename);
+class HandlerMiddleware {
+    constructor(plugins) {
+        this.createAuxPromise = () => {
+            return !this.plugins || this.plugins.length === 0
                 ? Promise.resolve({}) // tslint:disable-line
-                : Promise.all(_this.plugins.map(function (plugin) {
-                    var maybePromise = plugin.create();
+                : Promise.all(this.plugins.map(plugin => {
+                    const maybePromise = plugin.create();
                     return maybePromise instanceof Promise
                         ? maybePromise
                         : Promise.resolve(maybePromise);
-                })).then(function (auxes) { return auxes.reduce(function (all, each) { return (__assign({}, all, each)); }, {}); });
+                })).then(auxes => auxes.reduce((all, each) => ({ ...all, ...each }), {}));
         };
         this.plugins = plugins;
         this.auxPromise = this.createAuxPromise();
     }
-    return HandlerMiddleware;
-}());
-var HandlerProxy = /** @class */ (function () {
-    function HandlerProxy(event, context, callback) {
-        var _this = this;
-        this.call = function (middleware, handler) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, error_1, actualHandler, beginHandlers, endHandlers, errorHandlers, iterate, results, _b, _c, _d, _i, results_1, each;
-            var _this = this;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        _e.trys.push([0, 2, , 3]);
-                        _a = this;
-                        return [4 /*yield*/, middleware.auxPromise];
-                    case 1:
-                        _a.aux = _e.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        error_1 = _e.sent();
-                        logger.error("Error while initializing plugins' aux: " + utils_1.stringifyError(error_1));
-                        this.response.fail(error_1 instanceof Error ? { error: error_1.message } : error_1);
-                        return [2 /*return*/, [error_1]];
-                    case 3:
-                        actualHandler = [this.generateDelegator(handler)];
-                        beginHandlers = middleware.plugins.map(function (plugin) {
-                            return _this.generateDelegator(plugin.begin);
-                        });
-                        endHandlers = middleware.plugins.map(function (plugin) {
-                            return _this.generateDelegator(plugin.end);
-                        });
-                        errorHandlers = middleware.plugins.map(function (plugin) {
-                            return _this.generateDelegator(plugin.error);
-                        });
-                        iterate = function (handlers, okResponsible) {
-                            if (okResponsible === void 0) { okResponsible = false; }
-                            return __awaiter(_this, void 0, void 0, function () {
-                                var _this = this;
-                                return __generator(this, function (_a) {
-                                    return [2 /*return*/, Promise.all(handlers.map(function (each) { return _this.safeCall(each, okResponsible, errorHandlers); }))];
-                                });
-                            });
-                        };
-                        return [4 /*yield*/, iterate(beginHandlers)];
-                    case 4:
-                        _c = (_b = (_e.sent())).concat;
-                        return [4 /*yield*/, iterate(actualHandler, true)];
-                    case 5:
-                        _d = [(_e.sent())];
-                        return [4 /*yield*/, iterate(endHandlers)];
-                    case 6:
-                        results = _c.apply(_b, _d.concat([(_e.sent())])).filter(function (x) { return x; });
-                        // In test phase, throws any exception if there was.
-                        if (process.env.NODE_ENV === 'test') {
-                            for (_i = 0, results_1 = results; _i < results_1.length; _i++) {
-                                each = results_1[_i];
-                                if (each instanceof Error) {
-                                    logger.error("Error occurred: " + utils_1.stringifyError(each));
-                                    throw each;
-                                }
-                            }
-                        }
-                        results.forEach(function (result) {
-                            return logger.silly("middleware result : " + JSON.stringify(result));
-                        });
-                        return [2 /*return*/];
-                }
-            });
-        }); };
-        this.safeCall = function (delegator, okResponsible, errorHandlers) { return __awaiter(_this, void 0, void 0, function () {
-            var result, error_2, handled;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 4]);
-                        return [4 /*yield*/, delegator(okResponsible)];
-                    case 1:
-                        result = _a.sent();
-                        return [2 /*return*/, result];
-                    case 2:
-                        error_2 = _a.sent();
-                        return [4 /*yield*/, this.handleError(error_2, errorHandlers)];
-                    case 3:
-                        handled = _a.sent();
-                        return [2 /*return*/, handled];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        }); };
-        this.generateDelegator = function (handler) { return function (okResponsible) { return __awaiter(_this, void 0, void 0, function () {
-            var maybePromise, result, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        maybePromise = handler({
-                            request: this.request,
-                            response: this.response,
-                            aux: this.aux,
-                        });
-                        if (!(maybePromise instanceof Promise)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, maybePromise];
-                    case 1:
-                        _a = _b.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        _a = maybePromise;
-                        _b.label = 3;
-                    case 3:
-                        result = _a;
-                        logger.stupid("result", result);
-                        if (!this.response.completed && okResponsible) {
-                            this.response.ok(result);
-                        }
-                        return [2 /*return*/, result];
+}
+class HandlerProxy {
+    constructor(event, context, callback) {
+        this.call = async (middleware, handler) => {
+            try {
+                this.aux = await middleware.auxPromise;
+            }
+            catch (error) {
+                logger.error(`Error while initializing plugins' aux: ${stringifyError(error)}`);
+                this.response.fail(error instanceof Error ? { error: error.message } : error);
+                return [error];
+            }
+            const actualHandler = [this.generateDelegator(handler)];
+            const beginHandlers = middleware.plugins.map(plugin => this.generateDelegator(plugin.begin));
+            const endHandlers = middleware.plugins.map(plugin => this.generateDelegator(plugin.end));
+            const errorHandlers = middleware.plugins.map(plugin => this.generateDelegator(plugin.error));
+            const iterate = async (handlers, okResponsible = false) => Promise.all(handlers.map(each => this.safeCall(each, okResponsible, errorHandlers)));
+            const results = [
+                ...(await iterate(beginHandlers)),
+                ...(await iterate(actualHandler, true)),
+                ...(await iterate(endHandlers)),
+            ].filter(x => x);
+            // In test phase, throws any exception if there was.
+            if (process.env.NODE_ENV === 'test') {
+                for (const each of results) {
+                    if (each instanceof Error) {
+                        logger.error(`Error occurred: ${stringifyError(each)}`);
+                        throw each;
+                    }
                 }
+            }
+            results.forEach(result => logger.silly(`middleware result : ${JSON.stringify(result)}`));
+        };
+        this.safeCall = async (delegator, okResponsible, errorHandlers) => {
+            try {
+                const result = await delegator(okResponsible);
+                return result;
+            }
+            catch (error) {
+                const handled = await this.handleError(error, errorHandlers);
+                return handled;
+            }
+        };
+        this.generateDelegator = (handler) => async (okResponsible) => {
+            const maybePromise = handler({
+                request: this.request,
+                response: this.response,
+                aux: this.aux,
             });
-        }); }; };
-        this.handleError = function (error, errorHandlers) { return __awaiter(_this, void 0, void 0, function () {
-            var _i, errorHandlers_1, handler, ignorable_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logger.error(error);
-                        this.request.lastError = error;
-                        if (!errorHandlers) return [3 /*break*/, 6];
-                        _i = 0, errorHandlers_1 = errorHandlers;
-                        _a.label = 1;
-                    case 1:
-                        if (!(_i < errorHandlers_1.length)) return [3 /*break*/, 6];
-                        handler = errorHandlers_1[_i];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, handler(false)];
-                    case 3:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
-                        ignorable_1 = _a.sent();
-                        logger.error(ignorable_1);
-                        return [3 /*break*/, 5];
-                    case 5:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 6:
-                        if (!this.response.completed) {
-                            this.response.fail(error instanceof Error ? { error: error.message } : error);
-                        }
-                        return [2 /*return*/, error];
+            const result = maybePromise instanceof Promise ? await maybePromise : maybePromise;
+            logger.stupid(`result`, result);
+            if (!this.response.completed && okResponsible) {
+                this.response.ok(result);
+            }
+            return result;
+        };
+        this.handleError = async (error, errorHandlers) => {
+            logger.error(error);
+            this.request.lastError = error;
+            if (errorHandlers) {
+                for (const handler of errorHandlers) {
+                    try {
+                        await handler(false);
+                    }
+                    catch (ignorable) {
+                        logger.error(ignorable);
+                    }
                 }
-            });
-        }); };
-        logger.stupid("event", event);
-        this.request = new base_1.HandlerRequest(event, context);
-        this.response = new base_1.HandlerResponse(callback);
+            }
+            if (!this.response.completed) {
+                this.response.fail(error instanceof Error ? { error: error.message } : error);
+            }
+            return error;
+        };
+        logger.stupid(`event`, event);
+        this.request = new HandlerRequest(event, context);
+        this.response = new HandlerResponse(callback);
         this.aux = {}; // tslint:disable-line
     }
-    return HandlerProxy;
-}());
+}
 // It will break type safety because there is no relation between Aux and Plugin.
-var build = function (plugins) {
-    var middleware = new HandlerMiddleware(plugins);
-    return function (handler) { return function (event, context, callback) {
+const build = (plugins) => {
+    const middleware = new HandlerMiddleware(plugins);
+    return (handler) => (event, context, callback) => {
         new HandlerProxy(event, context, callback).call(middleware, handler);
-    }; };
+    };
 };
-exports.default = build;
+export default build;

package/dist/middleware/index.d.ts

@@ -1,12 +1,12 @@
 export declare const middleware: {
-    build: <Aux extends import("./base").HandlerAuxBase>(plugins: import("./base").HandlerPluginBase<any>[]) => (handler: import("./base").Handler<Aux>) => (event: any, context: any, callback: any) => void;
-    aws: (options?: import("./aws").AWSPluginOptions | undefined) => import("./aws").AWSPlugin;
-    trace: (options: import("./trace").TracerPluginOptions) => import("./trace").TracerPlugin;
-    logger: (options: import("./logger").LoggerPluginOptions) => import("./logger").LoggerPlugin;
-    mysql: (options: import("./mysql").MySQLPluginOptions) => import("./mysql").MySQLPlugin;
+    build: <Aux extends import("./base.js").HandlerAuxBase>(plugins: import("./base.js").HandlerPluginBase<any>[]) => (handler: import("./base.js").Handler<Aux>) => (event: any, context: any, callback: any) => void;
+    aws: (options?: import("./aws.js").AWSPluginOptions | undefined) => import("./aws.js").AWSPlugin;
+    trace: (options: import("./trace.js").TracerPluginOptions) => import("./trace.js").TracerPlugin;
+    logger: (options: import("./logger.js").LoggerPluginOptions) => import("./logger.js").LoggerPlugin;
+    mysql: <T = unknown>(options: import("./mysql.js").MySQLPluginOptions) => import("./mysql.js").MySQLPlugin<T>;
 };
-export * from './base';
-export * from './aws';
-export * from './trace';
-export * from './logger';
-export * from './mysql';
+export * from './base.js';
+export * from './aws.js';
+export * from './trace.js';
+export * from './logger.js';
+export * from './mysql.js';

package/dist/middleware/index.js

@@ -1,22 +1,17 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-var build_1 = require("./build");
-var aws_1 = require("./aws");
-var logger_1 = require("./logger");
-var mysql_1 = require("./mysql");
-var trace_1 = require("./trace");
-exports.middleware = {
-    build: build_1.default,
-    aws: aws_1.default,
-    trace: trace_1.default,
-    logger: logger_1.default,
-    mysql: mysql_1.default,
+import build from './build.js';
+import aws from './aws.js';
+import logger from './logger.js';
+import mysql from './mysql.js';
+import trace from './trace.js';
+export const middleware = {
+    build,
+    aws,
+    trace,
+    logger,
+    mysql,
 };
-__export(require("./base"));
-__export(require("./aws"));
-__export(require("./trace"));
-__export(require("./logger"));
-__export(require("./mysql"));
+export * from './base.js';
+export * from './aws.js';
+export * from './trace.js';
+export * from './logger.js';
+export * from './mysql.js';

package/dist/middleware/logger.d.ts

@@ -1,5 +1,5 @@
-import { Logger, LogLevel } from '../utils';
-import { HandlerAuxBase, HandlerPluginBase } from './base';
+import { Logger, LogLevel } from '../utils/index.js';
+import { HandlerAuxBase, HandlerPluginBase } from './base.js';
 export interface LoggerPluginOptions {
     name: string;
     level?: LogLevel;

package/dist/middleware/logger.js

@@ -1,71 +1,14 @@
-"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 __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 };
+import { getLogger } from '../utils/index.js';
+import { HandlerPluginBase } from './base.js';
+export class LoggerPlugin extends HandlerPluginBase {
+    constructor(options) {
+        super();
+        this.create = async () => {
+            const { name, level } = this.options;
+            return { logger: getLogger(name, level) };
+        };
+        this.options = options;
     }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var utils_1 = require("../utils");
-var base_1 = require("./base");
-var LoggerPlugin = /** @class */ (function (_super) {
-    __extends(LoggerPlugin, _super);
-    function LoggerPlugin(options) {
-        var _this = _super.call(this) || this;
-        _this.create = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a, name, level;
-            return __generator(this, function (_b) {
-                _a = this.options, name = _a.name, level = _a.level;
-                return [2 /*return*/, { logger: utils_1.getLogger(name, level) }];
-            });
-        }); };
-        _this.options = options;
-        return _this;
-    }
-    return LoggerPlugin;
-}(base_1.HandlerPluginBase));
-exports.LoggerPlugin = LoggerPlugin;
-var build = function (options) { return new LoggerPlugin(options); };
-exports.default = build;
+}
+const build = (options) => new LoggerPlugin(options);
+export default build;

package/dist/middleware/mysql.d.ts

@@ -1,5 +1,6 @@
+import { Kysely } from 'kysely';
 import * as mysql from 'mysql';
-import { HandlerAuxBase, HandlerPluginBase } from './base';
+import { HandlerAuxBase, HandlerPluginBase } from './base.js';
 export interface MySQLPluginOptions {
     config: mysql.ConnectionConfig;
     schema?: {
@@ -17,9 +18,9 @@ export declare class ConnectionProxy {
     private initialized;
     private dbName?;
     constructor(config: MySQLPluginOptions);
-    query: <T>(sql: string, params?: any[] | undefined) => Promise<T | undefined>;
-    fetch: <T>(sql: string, params?: any[] | undefined) => Promise<T[]>;
-    fetchOne: <T>(sql: string, params?: any[] | undefined, defaultValue?: T | undefined) => Promise<T>;
+    query: <T>(sql: string, params?: any[]) => Promise<T | undefined>;
+    fetch: <T>(sql: string, params?: any[]) => Promise<T[]>;
+    fetchOne: <T>(sql: string, params?: any[], defaultValue?: T | undefined) => Promise<T>;
     beginTransaction: () => Promise<void>;
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
@@ -29,16 +30,20 @@ export declare class ConnectionProxy {
     private changeDatabase;
     private tryToInitializeSchema;
 }
-export interface MySQLPluginAux extends HandlerAuxBase {
+export type SQLClient<T = unknown> = Kysely<T>;
+export interface MySQLPluginAux<T = unknown> extends HandlerAuxBase {
     db: ConnectionProxy;
+    database: SQLClient<T>;
 }
-export declare class MySQLPlugin extends HandlerPluginBase<MySQLPluginAux> {
+export declare class MySQLPlugin<T = unknown> extends HandlerPluginBase<MySQLPluginAux<T>> {
     private proxy;
+    private sqlClient;
     constructor(options: MySQLPluginOptions);
     create: () => Promise<{
         db: ConnectionProxy;
+        database: SQLClient<T>;
     }>;
     end: () => void;
 }
-declare const build: (options: MySQLPluginOptions) => MySQLPlugin;
+declare const build: <T = unknown>(options: MySQLPluginOptions) => MySQLPlugin<T>;
 export default build;