emilsoftware-utilities 1.2.4 → 1.2.5

package/autobind.js

@@ -1,7 +1,7 @@
 "use strict";
-// DECORATOR
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.boundClass = exports.boundMethod = void 0;
+// DECORATOR
 /**
  * Return a descriptor removing the value and returning a getter
  * The getter will return a .bind version of the function

package/orm.d.ts

@@ -9,6 +9,7 @@ interface Orm {
     startTransaction: (db: Database) => Promise<any>;
     executeQueries: (transaction: Transaction, queries: string[], params: any[]) => any;
     commitTransaction: (transaction: Transaction) => Promise<any>;
+    rollbackTransaction: (transaction: Transaction) => Promise<any>;
 }
 export declare const Orm: Orm;
 export {};

package/orm.js

@@ -27,6 +27,7 @@ exports.Orm = void 0;
 // @ts-ignore
 var Firebird = __importStar(require("es-node-firebird"));
 var logger_1 = require("./logger");
+var utilities_1 = require("./utilities");
 var quote = function (value) {
     return "\"" + value + "\"";
 };
@@ -47,13 +48,17 @@ var testConnection = function (options) {
 };
 var query = function (options, query, parameters) {
     if (parameters === void 0) { parameters = []; }
+    var logger = new logger_1.Logger(__filename);
     return new Promise(function (resolve, reject) {
         Firebird.attach(options, function (err, db) {
             if (err) {
+                logger.error(err);
                 return reject(err);
             }
+            logger.info(utilities_1.Utilities.printQueryWithParams(query, parameters));
             db.query(query, parameters, function (error, result) {
                 if (error) {
+                    logger.error(error);
                     db.detach();
                     return reject(error);
                 }
@@ -107,6 +112,26 @@ var startTransaction = function (db) {
         });
     });
 };
+var commitTransaction = function (transaction) {
+    return new Promise(function (resolve, reject) {
+        transaction.commit(function (err) {
+            if (err)
+                return reject(err);
+            else
+                return resolve('Transaction committed successfully.');
+        });
+    });
+};
+var rollbackTransaction = function (transaction) {
+    return new Promise(function (resolve, reject) {
+        transaction.rollback(function (err) {
+            if (err)
+                return reject(err);
+            else
+                return resolve('Transaction rolled back successfully.');
+        });
+    });
+};
 var executeQueries = function (transaction, queries, params) {
     return queries.reduce(function (promiseChain, currentQuery, index) {
         return promiseChain.then(function () { return new Promise(function (resolve, reject) {
@@ -119,16 +144,6 @@ var executeQueries = function (transaction, queries, params) {
         }); });
     }, Promise.resolve());
 };
-var commitTransaction = function (transaction) {
-    return new Promise(function (resolve, reject) {
-        transaction.commit(function (err) {
-            if (err)
-                return reject(err);
-            else
-                return resolve('Transaction committed successfully.');
-        });
-    });
-};
 exports.Orm = {
     quote: quote,
     testConnection: testConnection,
@@ -138,5 +153,6 @@ exports.Orm = {
     connect: connect,
     startTransaction: startTransaction,
     executeQueries: executeQueries,
-    commitTransaction: commitTransaction
+    commitTransaction: commitTransaction,
+    rollbackTransaction: rollbackTransaction
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Utilities for EmilSoftware",
   "main": "index.js",
   "scripts": {

package/src/autobind.ts

@@ -1,5 +1,4 @@
 // DECORATOR
-
 /**
  * Return a descriptor removing the value and returning a getter
  * The getter will return a .bind version of the function

package/src/log-execution-time.ts

@@ -19,7 +19,5 @@ export default function logExecutionTime(fileName: string = "") {
             }
         };
         return descriptor;
-
     }
-
 }

package/src/orm.ts

@@ -2,6 +2,7 @@
 import * as Firebird from "es-node-firebird";
 import {Logger} from "./logger";
 import {Database, Options, Transaction} from "node-firebird";
+import {Utilities} from "./utilities";
 
 
 const quote = (value: string): string => {
@@ -23,15 +24,20 @@ const testConnection = (options: Options): Promise<any> => {
 }
 
 const query = (options: Options, query: string, parameters: any[] = []): Promise<any> => {
+    const logger: Logger = new Logger(__filename);
     return new Promise((resolve, reject): void => {
         Firebird.attach(options, (err: any, db: {
             query: (arg0: any, arg1: any[], arg2: (err: any, result: any) => void) => void; detach: () => void;
         }) => {
             if (err) {
+                logger.error(err);
                 return reject(err);
             }
+
+            logger.info(Utilities.printQueryWithParams(query, parameters));
             db.query(query, parameters, (error: any, result: any) => {
                 if (error) {
+                    logger.error(error);
                     db.detach();
                     return reject(error);
                 }
@@ -49,7 +55,6 @@ const execute = (options: Options, query: string, parameters: any = []): Promise
             if (err) {
                 return reject(err);
             }
-
             db.execute(query, parameters, (error, result): void => {
                 if (error) {
                     db.detach();
@@ -84,6 +89,24 @@ const startTransaction = (db: Database): Promise<any> => {
         });
     });
 }
+
+const commitTransaction = (transaction: Transaction): Promise<any> => {
+    return new Promise((resolve, reject): void => {
+        transaction.commit((err: any): void => {
+            if (err) return reject(err); else return resolve('Transaction committed successfully.');
+        });
+    });
+}
+
+const rollbackTransaction = (transaction: Transaction): Promise<any> => {
+    return new Promise((resolve, reject) => {
+        transaction.rollback(err => {
+            if (err) return reject(err); else return resolve('Transaction rolled back successfully.');
+        });
+    });
+}
+
+
 const executeQueries = (transaction: Transaction, queries: string[], params: any[]) => {
     return queries.reduce((promiseChain: any, currentQuery: any, index: any) => {
         return promiseChain.then(() => new Promise((resolve, reject): void => {
@@ -94,13 +117,6 @@ const executeQueries = (transaction: Transaction, queries: string[], params: any
     }, Promise.resolve());
 }
 
-const commitTransaction = (transaction: Transaction): Promise<any> => {
-    return new Promise((resolve, reject): void => {
-        transaction.commit((err: any): void => {
-            if (err) return reject(err); else return resolve('Transaction committed successfully.');
-        });
-    });
-}
 
 interface Orm {
     quote: (value: string) => string,
@@ -111,11 +127,21 @@ interface Orm {
     connect: (options: Options) => Promise<any>,
     startTransaction: (db: Database) => Promise<any>,
     executeQueries: (transaction: Transaction, queries: string[], params: any[]) => any,
-    commitTransaction: (transaction: Transaction) => Promise<any>
+    commitTransaction: (transaction: Transaction) => Promise<any>,
+    rollbackTransaction: (transaction: Transaction) => Promise<any>
 }
 
 export const Orm: Orm = {
-    quote, testConnection, query, execute, trimParam, connect, startTransaction, executeQueries, commitTransaction
+    quote,
+    testConnection,
+    query,
+    execute,
+    trimParam,
+    connect,
+    startTransaction,
+    executeQueries,
+    commitTransaction,
+    rollbackTransaction
 }