@autofleet/sequelize-utils 5.1.2 → 5.1.4

package/dist/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,12 +10,12 @@ const log = debug_1.default('sequelize-utils');
 const rollbackErrorText = 'rollback has been called on this transaction';
 const abortErrorText = 'Transaction cancelled due to request cancellation';
 exports.default = (sequelize) => {
-    const transactionWithRetry = (funcToRun, retriesCount = 2) => __awaiter(void 0, void 0, void 0, function* () {
+    const transactionWithRetry = async (funcToRun, retriesCount = 2, options) => {
         try {
-            const transValue = yield sequelize.transaction((transaction) => __awaiter(void 0, void 0, void 0, function* () {
-                const funcValue = yield funcToRun(transaction);
+            const transValue = await sequelize.transaction(options || {}, async (transaction) => {
+                const funcValue = await funcToRun(transaction);
                 return funcValue;
-            }));
+            });
             return transValue;
         }
         catch (e) {
@@ -38,22 +29,22 @@ exports.default = (sequelize) => {
             }
             throw e;
         }
-    });
+    };
     // eslint-disable-next-line @typescript-eslint/ban-types
     const httpBasedTransaction = (req, cb) => {
         if (req.socket.destroyed) {
             log(abortErrorText);
             throw new Error(abortErrorText);
         }
-        return sequelize.transaction((transaction) => __awaiter(void 0, void 0, void 0, function* () {
+        return sequelize.transaction(async (transaction) => {
             // https://github.com/nodejs/node/blob/e46c680bf2b211bbd52cf959ca17ee98c7f657f5/test/parallel/test-http-aborted.js#L9
-            const rollback = () => __awaiter(void 0, void 0, void 0, function* () {
+            const rollback = async () => {
                 log(abortErrorText);
-                yield transaction.rollback();
-            });
+                await transaction.rollback();
+            };
             req.socket.once('close', rollback);
             try {
-                const response = yield cb(transaction);
+                const response = await cb(transaction);
                 req.socket.removeListener('close', rollback);
                 return response;
             }
@@ -64,7 +55,7 @@ exports.default = (sequelize) => {
                 req.socket.removeListener('close', rollback);
                 throw e;
             }
-        }));
+        });
     };
     return {
         httpBasedTransaction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sequelize-utils",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -11,12 +11,13 @@ export default (sequelize: Sequelize): {
   transactionWithRetry: any,
   httpBasedTransaction: any
 } => {
-  const transactionWithRetry = async (funcToRun: any, retriesCount = 2): Promise<any> => {
+  const transactionWithRetry = async (funcToRun: any, retriesCount = 2, options?: any): Promise<any> => {
     try {
-      const transValue = await sequelize.transaction(async (transaction) => {
-        const funcValue = await funcToRun(transaction);
-        return funcValue;
-      });
+      const transValue = await sequelize.transaction(options || {},
+        async (transaction) => {
+          const funcValue = await funcToRun(transaction);
+          return funcValue;
+        });
       return transValue;
     } catch (e) {
       if (e instanceof DatabaseError) {

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es2020",
     "module": "commonjs",
     "declaration": true,
     "outDir": "./dist",