@stackpress/inquire-mysql2 0.1.3 → 0.2.2

package/dist/Connection.d.ts

@@ -1,15 +1,18 @@
 import type { ResultSetHeader, Connection as Database } from 'mysql2/promise';
-import type { Dialect, Connection, QueryObject } from '@stackpress/inquire/dist/types';
+import type { Dialect, Connection, QueryObject, Transaction } from '@stackpress/inquire/dist/types';
 import type { Results } from './types';
 export default class Mysql2Connection implements Connection {
     readonly dialect: Dialect;
     readonly resource: Database;
+    protected _lastId?: number | string;
+    get lastId(): string | number | undefined;
     constructor(resource: Database);
-    query<R = unknown>(queries: QueryObject[]): Promise<R[]>;
-    raw<R = unknown>(queries: QueryObject[]): Promise<[ResultSetHeader, undefined] | Results<R>>;
-    protected _format(request: QueryObject): {
+    format(request: QueryObject): {
         query: string;
         values: import("@stackpress/inquire/dist/types").Value[];
     };
+    query<R = unknown>(request: QueryObject): Promise<R[]>;
+    raw<R = unknown>(request: QueryObject): Promise<[ResultSetHeader, undefined] | Results<R>>;
+    transaction<R = unknown>(callback: Transaction<R>): Promise<R[]>;
     protected _query<R = unknown>(request: QueryObject): Promise<Results<R> | [ResultSetHeader, undefined]>;
 }

package/dist/Connection.js

@@ -13,47 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Mysql_1 = __importDefault(require("@stackpress/inquire/dist/dialect/Mysql"));
-const Exception_1 = __importDefault(require("@stackpress/inquire/dist/Exception"));
 class Mysql2Connection {
+    get lastId() {
+        return this._lastId;
+    }
     constructor(resource) {
         this.dialect = Mysql_1.default;
         this.resource = resource;
     }
-    query(queries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const results = yield this.raw(queries);
-            return Array.isArray(results[0]) ? results[0] : [];
-        });
-    }
-    raw(queries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (queries.length === 0) {
-                throw Exception_1.default.for('No queries to execute.');
-            }
-            const queue = queries.slice();
-            const last = queue.pop();
-            if (queue.length === 0) {
-                const formatted = this._format(last);
-                return yield this._query(formatted);
-            }
-            try {
-                yield this.resource.query('START TRANSACTION');
-                for (const request of queries) {
-                    const formatted = this._format(request);
-                    yield this._query(formatted);
-                }
-                const formatted = this._format(last);
-                const results = yield this._query(formatted);
-                yield this.resource.query('COMMIT');
-                return results;
-            }
-            catch (e) {
-                yield this.resource.query('ROLLBACK');
-                throw e;
-            }
-        });
-    }
-    _format(request) {
+    format(request) {
         let { query, values = [] } = request;
         for (let i = 0; i < values.length; i++) {
             const value = values[i];
@@ -69,6 +37,35 @@ class Mysql2Connection {
         }
         return { query, values };
     }
+    query(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield this.raw(request);
+            if (!Array.isArray(results[0]) && results[0].insertId) {
+                this._lastId = results[0].insertId;
+            }
+            return Array.isArray(results[0]) ? results[0] : [];
+        });
+    }
+    raw(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const formatted = this.format(request);
+            return yield this._query(formatted);
+        });
+    }
+    transaction(callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.resource.beginTransaction();
+                const results = yield callback(this);
+                yield this.resource.commit();
+                return results;
+            }
+            catch (e) {
+                yield this.resource.rollback();
+                throw e;
+            }
+        });
+    }
     _query(request) {
         return __awaiter(this, void 0, void 0, function* () {
             const { query, values = [] } = request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackpress/inquire-mysql2",
-  "version": "0.1.3",
+  "version": "0.2.2",
   "license": "Apache-2.0",
   "description": "Generic typed mysql2",
   "author": "Chris <chris@incept.asia>",
@@ -19,7 +19,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@stackpress/inquire": "0.1.3"
+    "@stackpress/inquire": "0.2.2"
   },
   "peerDependencies": {
     "mysql2": "^3.11.5"