emilsoftware-utilities 1.2.7 → 1.2.9

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,10 +1,10 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <Languages>
-        <language minSize="63" name="TypeScript" />
-      </Languages>
-    </inspection_tool>
-  </profile>
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="63" name="TypeScript" />
+      </Languages>
+    </inspection_tool>
+  </profile>
 </component>

package/orm.js

@@ -147,16 +147,33 @@ var rollbackTransaction = function (transaction) {
     });
 };
 var executeQueries = function (transaction, queries, params) {
-    return queries.reduce(function (promiseChain, currentQuery, index) {
-        return promiseChain.then(function () { return new Promise(function (resolve, reject) {
-            transaction.query(currentQuery, params[index], function (err, result) {
-                if (err)
-                    return reject(err);
-                else
-                    return resolve(result);
+    try {
+        return queries.reduce(function (promiseChain, currentQuery, index) {
+            return promiseChain.then(function () { return new Promise(function (resolve, reject) {
+                transaction.query(currentQuery, params[index], function (err, result) {
+                    if (err)
+                        return reject(err);
+                    else
+                        return resolve(result);
+                });
+            }); });
+        }, Promise.resolve())
+            .catch(function (error) {
+            return new Promise(function (resolve, reject) {
+                transaction.rollback(function (rollbackErr) {
+                    if (rollbackErr) {
+                        return reject(rollbackErr);
+                    }
+                    else {
+                        return reject(error);
+                    }
+                });
             });
-        }); });
-    }, Promise.resolve());
+        });
+    }
+    catch (error) {
+        throw error;
+    }
 };
 exports.Orm = {
     quote: quote,

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "emilsoftware-utilities",
-  "version": "1.2.7",
-  "description": "Utilities for EmilSoftware",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mttdev382/emilsoftware-utilities.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/mttdev382/emilsoftware-utilities/issues"
-  },
-  "homepage": "https://github.com/mttdev382/emilsoftware-utilities#readme",
-  "dependencies": {
-    "es-node-firebird": "^1.1.8",
-    "winston": "^3.11.0"
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.21",
-    "@types/node": "^20.10.5",
-    "typescript": "^5.3.3"
-  }
-}
+{
+  "name": "emilsoftware-utilities",
+  "version": "1.2.9",
+  "description": "Utilities for EmilSoftware",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mttdev382/emilsoftware-utilities.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/mttdev382/emilsoftware-utilities/issues"
+  },
+  "homepage": "https://github.com/mttdev382/emilsoftware-utilities#readme",
+  "dependencies": {
+    "es-node-firebird": "^1.2.0",
+    "winston": "^3.11.0"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.10.5",
+    "typescript": "^5.3.3"
+  }
+}

package/src/orm.ts

@@ -116,16 +116,31 @@ const rollbackTransaction = (transaction: Transaction): Promise<any> => {
 }
 
 
-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 => {
-            transaction.query(currentQuery, params[index], (err: any, result: any): void => {
-                if (err) return reject(err); else return resolve(result);
+const executeQueries = (transaction: Transaction, queries: string[], params: any[]): Promise<any> => {
+    try {
+        return queries.reduce((promiseChain: Promise<any>, currentQuery: string, index: number) => {
+            return promiseChain.then(() => new Promise((resolve, reject) => {
+                transaction.query(currentQuery, params[index], (err: any, result: any): void => {
+                    if (err) return reject(err);
+                    else return resolve(result);
+                });
+            }));
+        }, Promise.resolve())
+            .catch(error => {
+                return new Promise((resolve, reject) => {
+                    transaction.rollback((rollbackErr: any) => {
+                        if (rollbackErr) {
+                            return reject(rollbackErr);
+                        } else {
+                            return reject(error);
+                        }
+                    });
+                });
             });
-        }));
-    }, Promise.resolve());
-}
-
+    } catch (error) {
+        throw error;
+    }
+};
 
 interface Orm {
     quote: (value: string) => string,